Basic functionality for export/import playlists #112
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package dev.brahmkshatriya.echo.ui.extensions.export | ||
|
|
||
| import dev.brahmkshatriya.echo.common.clients.PlaylistEditClient | ||
| import dev.brahmkshatriya.echo.common.models.Track | ||
| import dev.brahmkshatriya.echo.common.models.Feed.Companion.loadAll | ||
| import dev.brahmkshatriya.echo.utils.Serializer.toData | ||
| import dev.brahmkshatriya.echo.utils.Serializer.toJson | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class ExportPlaylist( | ||
| val title: String, | ||
| val description: String? = null, | ||
| val tracks: List<Track>, | ||
| ) | ||
|
|
||
| class ExportPlaylistUtils { | ||
| companion object { | ||
| suspend fun PlaylistEditClient.serializePlaylists(): String { | ||
| val playlists = this.listEditablePlaylists(null) | ||
| val exportPlaylists = playlists.map { ExportPlaylist( | ||
| it.first.title, | ||
| it.first.description, | ||
| this.loadTracks(it.first).loadAll(), | ||
| ) } | ||
| return exportPlaylists.toJson() | ||
| } | ||
|
|
||
| suspend fun PlaylistEditClient.deserializePlaylists(playlistJson: String) { | ||
| val exportPlaylists = playlistJson.toData<List<ExportPlaylist>>() | ||
| exportPlaylists.forEach { | ||
| val playlist = this.createPlaylist(it.title, it.description) | ||
| this.addTracksToPlaylist(playlist, emptyList(), 0, it.tracks) | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| package dev.brahmkshatriya.echo.ui.extensions.export | ||
|
|
||
| import android.content.Context | ||
| import android.content.Intent | ||
| import android.net.Uri | ||
| import android.os.Bundle | ||
| import androidx.activity.result.contract.ActivityResultContracts | ||
| import androidx.appcompat.app.AppCompatActivity | ||
|
|
||
| class PickerActivity : AppCompatActivity() { | ||
| sealed interface PickerType { | ||
| object Folder : PickerType | ||
| object File : PickerType | ||
| } | ||
|
Comment on lines
+11
to
+14
Owner
There was a problem hiding this comment. Use an enum class instead |
||
|
|
||
| interface Callback { | ||
| fun onSelected(uri: Uri) | ||
| fun onCancelled() {} | ||
| } | ||
|
|
||
| companion object { | ||
| private var callback: Callback? = null | ||
| private var pickerType: PickerType? = null | ||
|
|
||
| fun openFolder(context: Context, callback: Callback) { | ||
| open(context, PickerType.Folder, callback) | ||
| } | ||
|
|
||
| fun openFolder(context: Context, onSelected: (Uri) -> Unit) { | ||
| openFolder(context, object : Callback { | ||
| override fun onSelected(uri: Uri) = onSelected(uri) | ||
| }) | ||
| } | ||
|
|
||
| fun openFile(context: Context, callback: Callback) { | ||
| open(context, PickerType.File, callback) | ||
| } | ||
|
|
||
| fun openFile(context: Context, onSelected: (Uri) -> Unit) { | ||
| openFile(context, object : Callback { | ||
| override fun onSelected(uri: Uri) = onSelected(uri) | ||
| }) | ||
| } | ||
|
|
||
| private fun open(context: Context, pickerType: PickerType, callback: Callback) { | ||
| this.callback = callback | ||
| this.pickerType = pickerType | ||
|
Comment on lines
+46
to
+47
Owner
There was a problem hiding this comment. you should put the picker type data inside a Bundle, |
||
| Intent(context, PickerActivity::class.java).apply { | ||
| addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) | ||
| context.startActivity(this) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private val pickerLauncher = registerForActivityResult( | ||
| ActivityResultContracts.StartActivityForResult() | ||
| ) { result -> | ||
| try { | ||
| when { | ||
| result.resultCode == RESULT_OK && result.data?.data != null -> { | ||
| callback?.onSelected(result.data!!.data!!) | ||
| } | ||
| else -> callback?.onCancelled() | ||
| } | ||
| } finally { | ||
| callback = null | ||
| pickerType = null | ||
| finish() | ||
| } | ||
| } | ||
|
Comment on lines
+55
to
+70
Owner
There was a problem hiding this comment. This should be created inside
Contributor
Author
There was a problem hiding this comment. I tried to put the code in
Owner
There was a problem hiding this comment. Try using this |
||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| val intent = when (pickerType) { | ||
| PickerType.Folder -> Intent(Intent.ACTION_OPEN_DOCUMENT_TREE).apply { | ||
| addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION) | ||
| } | ||
| PickerType.File -> Intent(Intent.ACTION_OPEN_DOCUMENT).apply { | ||
| addCategory(Intent.CATEGORY_OPENABLE) | ||
| type = "application/json" | ||
| putExtra(Intent.EXTRA_MIME_TYPES, arrayOf("application/json")) | ||
| addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) | ||
| } | ||
| null -> { | ||
| callback?.onCancelled() | ||
| finish() | ||
| return | ||
| } | ||
| } | ||
| pickerLauncher.launch(intent) | ||
| } | ||
|
|
||
| override fun onDestroy() { | ||
| callback?.onCancelled() | ||
| callback = null | ||
| pickerType = null | ||
| super.onDestroy() | ||
| } | ||
|
Comment on lines
+93
to
+98
Owner
There was a problem hiding this comment. wont be required after the pickerLaucher changes |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package dev.brahmkshatriya.echo.utils.ui.prefs | ||
|
|
||
| import android.content.Context | ||
| import androidx.preference.Preference | ||
| import androidx.preference.PreferenceViewHolder | ||
|
|
||
| open class ClickPreference(context:Context) : Preference(context) { | ||
| private var onClickListener: (() -> Unit)? = null | ||
|
|
||
| fun setOnClickListener(listener: () -> Unit) { | ||
| onClickListener = listener | ||
| } | ||
| override fun onBindViewHolder(holder: PreferenceViewHolder) { | ||
| super.onBindViewHolder(holder) | ||
|
|
||
| val listener = onClickListener ?: return | ||
| holder.itemView.setOnClickListener { | ||
| listener.invoke() | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove, client is not needed here