From c37d4644036082ee8ef5804e649eceadf149b2d2 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Mon, 4 Dec 2023 20:07:14 +0100 Subject: [PATCH 1/4] Refs --- app/src/unstable/assets/sources/youtube | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/unstable/assets/sources/youtube b/app/src/unstable/assets/sources/youtube index 8f10daba..07aa5a9a 160000 --- a/app/src/unstable/assets/sources/youtube +++ b/app/src/unstable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 8f10daba1ef9cbcd99f3c640d86808f8c94aa84a +Subproject commit 07aa5a9aab441657f89ae14ff3cfd9d9ca977fe6 From c9d5508018556db214cc905763332ae841874e74 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Mon, 4 Dec 2023 20:08:29 +0100 Subject: [PATCH 2/4] Refs --- app/src/stable/assets/sources/youtube | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/stable/assets/sources/youtube b/app/src/stable/assets/sources/youtube index 8f10daba..07aa5a9a 160000 --- a/app/src/stable/assets/sources/youtube +++ b/app/src/stable/assets/sources/youtube @@ -1 +1 @@ -Subproject commit 8f10daba1ef9cbcd99f3c640d86808f8c94aa84a +Subproject commit 07aa5a9aab441657f89ae14ff3cfd9d9ca977fe6 From 7ee4f411cbf5abb2b98531f0b79df6302fba0201 Mon Sep 17 00:00:00 2001 From: Kelvin Date: Mon, 4 Dec 2023 22:18:07 +0100 Subject: [PATCH 3/4] Import dialog --- .../java/com/futo/platformplayer/Settings.kt | 48 +++--- .../java/com/futo/platformplayer/UIDialogs.kt | 7 + .../futo/platformplayer/UISlideOverlays.kt | 11 -- .../platformplayer/activities/MainActivity.kt | 23 ++- .../activities/SettingsActivity.kt | 4 + .../dialogs/ImportOptionsDialog.kt | 73 ++++++++ .../futo/platformplayer/states/StateApp.kt | 23 ++- .../futo/platformplayer/states/StateBackup.kt | 67 ++++++-- .../views/overlays/slideup/SlideUpMenuItem.kt | 2 +- app/src/main/res/layout/activity_settings.xml | 160 ++++++++++-------- .../main/res/layout/dialog_import_options.xml | 48 ++++-- 11 files changed, 321 insertions(+), 145 deletions(-) create mode 100644 app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt index db6bfd52..2870f4d7 100644 --- a/app/src/main/java/com/futo/platformplayer/Settings.kt +++ b/app/src/main/java/com/futo/platformplayer/Settings.kt @@ -23,6 +23,7 @@ import com.futo.platformplayer.views.fields.FormField import com.futo.platformplayer.views.fields.FieldForm import com.futo.platformplayer.views.fields.FormFieldButton import com.futo.platformplayer.views.fields.FormFieldWarning +import com.futo.platformplayer.views.overlays.slideup.SlideUpMenuItem import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -30,7 +31,6 @@ import kotlinx.serialization.* import kotlinx.serialization.json.* import java.io.File import java.time.OffsetDateTime -import java.util.Locale @Serializable data class MenuBottomBarSetting(val id: Int, var enabled: Boolean); @@ -45,7 +45,7 @@ class Settings : FragmentedStorageFileJson() { @Transient val onTabsChanged = Event0(); - @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -5) + @FormField(R.string.manage_polycentric_identity, FieldForm.BUTTON, R.string.manage_your_polycentric_identity, -6) @FormFieldButton(R.drawable.ic_person) fun managePolycentricIdentity() { SettingsActivity.getActivity()?.let { @@ -57,7 +57,7 @@ class Settings : FragmentedStorageFileJson() { } } - @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -4) + @FormField(R.string.show_faq, FieldForm.BUTTON, R.string.get_answers_to_common_questions, -5) @FormFieldButton(R.drawable.ic_quiz) fun openFAQ() { try { @@ -67,7 +67,7 @@ class Settings : FragmentedStorageFileJson() { //Ignored } } - @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -3) + @FormField(R.string.show_issues, FieldForm.BUTTON, R.string.a_list_of_user_reported_and_self_reported_issues, -4) @FormFieldButton(R.drawable.ic_data_alert) fun openIssues() { try { @@ -99,7 +99,7 @@ class Settings : FragmentedStorageFileJson() { } }*/ - @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -2) + @FormField(R.string.manage_tabs, FieldForm.BUTTON, R.string.change_tabs_visible_on_the_home_screen, -3) @FormFieldButton(R.drawable.ic_tabs) fun manageTabs() { try { @@ -111,6 +111,17 @@ class Settings : FragmentedStorageFileJson() { } } + + + @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, -2) + @FormFieldButton(R.drawable.ic_move_up) + fun import() { + val act = SettingsActivity.getActivity() ?: return; + val intent = MainActivity.getImportOptionsIntent(act); + intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK; + act.startActivity(intent); + } + @FormField(R.string.link_handling, FieldForm.BUTTON, R.string.allow_grayjay_to_handle_links, -1) @FormFieldButton(R.drawable.ic_link) fun manageLinks() { @@ -709,25 +720,16 @@ class Settings : FragmentedStorageFileJson() { @FormField(R.string.export_data, FieldForm.BUTTON, R.string.creates_a_zip_file_with_your_data_which_can_be_imported_by_opening_it_with_grayjay, 3) fun export() { - StateBackup.startExternalBackup(); + val activity = SettingsActivity.getActivity() ?: return; + UISlideOverlays.showOverlay(activity.overlay, "Select export type", null, {}, + SlideUpMenuItem(activity, R.drawable.ic_share, "Share", "", null, { + StateBackup.shareExternalBackup(); + }), + SlideUpMenuItem(activity, R.drawable.ic_download, "File", "", null, { + StateBackup.saveExternalBackup(activity); + }) + ) } - - - /* - @FormField(R.string.import_data, FieldForm.BUTTON, R.string.import_data_description, 4) - fun import() { - val act = SettingsActivity.getActivity() ?: return; - StateApp.instance.requestFileReadAccess(act, null) { - if(it != null && it.exists()) { - val name = it.name; - val contents = it.readBytes(act); - if(contents != null) { - if(name != null && name.endsWith(".zip", true)) - StateBackup.importZipBytes(act, act.lifecycleScope, contents); - } - } - } - }*/ } @FormField(R.string.payment, FieldForm.GROUP, -1, 17) diff --git a/app/src/main/java/com/futo/platformplayer/UIDialogs.kt b/app/src/main/java/com/futo/platformplayer/UIDialogs.kt index 86d73e28..920150c1 100644 --- a/app/src/main/java/com/futo/platformplayer/UIDialogs.kt +++ b/app/src/main/java/com/futo/platformplayer/UIDialogs.kt @@ -13,6 +13,7 @@ import android.view.View import android.view.ViewGroup.LayoutParams.WRAP_CONTENT import android.widget.* import androidx.core.content.ContextCompat +import com.futo.platformplayer.activities.MainActivity import com.futo.platformplayer.api.media.models.comments.IPlatformComment import com.futo.platformplayer.casting.StateCasting import com.futo.platformplayer.dialogs.* @@ -326,6 +327,12 @@ class UIDialogs { dialog.setOnDismissListener { registerDialogClosed(dialog) }; dialog.show(); } + fun showImportOptionsDialog(context: MainActivity) { + val dialog = ImportOptionsDialog(context); + registerDialogOpened(dialog); + dialog.setOnDismissListener { registerDialogClosed(dialog) }; + dialog.show(); + } fun showCastingDialog(context: Context) { diff --git a/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt b/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt index 6b401f1c..80f33705 100644 --- a/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt +++ b/app/src/main/java/com/futo/platformplayer/UISlideOverlays.kt @@ -1,30 +1,21 @@ package com.futo.platformplayer import android.content.ContentResolver -import android.graphics.Color -import android.util.TypedValue import android.view.View import android.view.ViewGroup -import android.widget.FrameLayout -import android.widget.ImageButton -import android.widget.LinearLayout -import android.widget.TextView import com.futo.platformplayer.api.http.ManagedHttpClient import com.futo.platformplayer.api.media.models.ResultCapabilities import com.futo.platformplayer.api.media.models.streams.VideoUnMuxedSourceDescriptor import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantAudioUrlSource -import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantSubtitleUrlSource import com.futo.platformplayer.api.media.models.streams.sources.HLSVariantVideoUrlSource import com.futo.platformplayer.api.media.models.streams.sources.IAudioUrlSource import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestAudioSource import com.futo.platformplayer.api.media.models.streams.sources.IHLSManifestSource import com.futo.platformplayer.api.media.models.streams.sources.IVideoUrlSource -import com.futo.platformplayer.api.media.models.streams.sources.SubtitleRawSource import com.futo.platformplayer.api.media.models.subtitles.ISubtitleSource import com.futo.platformplayer.api.media.models.video.IPlatformVideo import com.futo.platformplayer.api.media.models.video.IPlatformVideoDetails import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo -import com.futo.platformplayer.casting.StateCasting import com.futo.platformplayer.downloads.VideoLocal import com.futo.platformplayer.helpers.VideoHelper import com.futo.platformplayer.logging.Logger @@ -40,12 +31,10 @@ import com.futo.platformplayer.views.pills.RoundButton import com.futo.platformplayer.views.pills.RoundButtonGroup import com.futo.platformplayer.views.overlays.slideup.* import com.futo.platformplayer.views.video.FutoVideoPlayerBase -import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import okhttp3.internal.notifyAll import java.lang.IllegalStateException class UISlideOverlays { diff --git a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt index 84dbb104..9f031ed5 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/MainActivity.kt @@ -515,6 +515,9 @@ class MainActivity : AppCompatActivity, IWithResultLauncher { val url = intent.getStringExtra("VIDEO"); navigate(_fragVideoDetail, url); } + "IMPORT_OPTIONS" -> { + UIDialogs.showImportOptionsDialog(this); + } "TAB" -> { when(intent.getStringExtra("TAB")){ "Sources" -> { @@ -730,18 +733,7 @@ class MainActivity : AppCompatActivity, IWithResultLauncher { if (!newPipeSubsParsed.has("subscriptions") || !newPipeSubsParsed["subscriptions"].isJsonArray) return false;//throw IllegalArgumentException("Invalid NewPipe json structure found"); - val jsonSubs = newPipeSubsParsed["subscriptions"] - val jsonSubsArray = jsonSubs.asJsonArray; - val jsonSubsArrayItt = jsonSubsArray.iterator(); - val subs = mutableListOf() - while(jsonSubsArrayItt.hasNext()) { - val jsonSubObj = jsonSubsArrayItt.next().asJsonObject; - - if(jsonSubObj.has("url")) - subs.add(jsonSubObj["url"].asString); - } - - navigate(_fragImportSubscriptions, subs); + StateBackup.importNewPipeSubs(this, newPipeSubsParsed); } catch(ex: Exception) { Logger.e(TAG, ex.message, ex); @@ -1054,5 +1046,12 @@ class MainActivity : AppCompatActivity, IWithResultLauncher { sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); return sourcesIntent; } + + fun getImportOptionsIntent(context: Context): Intent { + val sourcesIntent = Intent(context, MainActivity::class.java); + sourcesIntent.action = "IMPORT_OPTIONS"; + sourcesIntent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); + return sourcesIntent; + } } } \ No newline at end of file diff --git a/app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt index 8527e2d6..e10d855a 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/SettingsActivity.kt @@ -5,6 +5,7 @@ import android.content.Context import android.content.Intent import android.os.Bundle import android.view.View +import android.widget.FrameLayout import android.widget.ImageButton import android.widget.LinearLayout import androidx.activity.result.ActivityResult @@ -30,6 +31,8 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher { private var _isFinished = false; + lateinit var overlay: FrameLayout; + override fun attachBaseContext(newBase: Context?) { Logger.i("SettingsActivity", "SettingsActivity.attachBaseContext") super.attachBaseContext(StateApp.instance.getLocaleContext(newBase)) @@ -44,6 +47,7 @@ class SettingsActivity : AppCompatActivity(), IWithResultLauncher { _buttonDev = findViewById(R.id.button_dev); _devSets = findViewById(R.id.dev_settings); _loaderView = findViewById(R.id.loader); + overlay = findViewById(R.id.overlay_container); _form.onChanged.subscribe { field, value -> Logger.i("SettingsActivity", "Setting [${field.field?.name}] changed, saving"); diff --git a/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt b/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt new file mode 100644 index 00000000..4abdb16c --- /dev/null +++ b/app/src/main/java/com/futo/platformplayer/dialogs/ImportOptionsDialog.kt @@ -0,0 +1,73 @@ +package com.futo.platformplayer.dialogs + +import android.app.AlertDialog +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import android.widget.Button +import com.futo.platformplayer.R +import com.futo.platformplayer.activities.MainActivity +import com.futo.platformplayer.readBytes +import com.futo.platformplayer.states.StateApp +import com.futo.platformplayer.states.StateBackup +import com.futo.platformplayer.views.buttons.BigButton + +class ImportOptionsDialog: AlertDialog { + private val _context: MainActivity; + + private lateinit var _button_import_zip: BigButton; + private lateinit var _button_import_ezip: BigButton; + private lateinit var _button_import_txt: BigButton; + private lateinit var _button_import_newpipe_subs: BigButton; + private lateinit var _button_close: Button; + + + constructor(context: MainActivity): super(context) { + _context = context; + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState); + setContentView(LayoutInflater.from(context).inflate(R.layout.dialog_import_options, null)); + _button_import_zip = findViewById(R.id.button_import_zip); + _button_import_ezip = findViewById(R.id.button_import_ezip); + _button_import_txt = findViewById(R.id.button_import_txt); + _button_import_newpipe_subs = findViewById(R.id.button_import_newpipe_subs); + _button_close = findViewById(R.id.button_cancel); + + _button_import_zip.onClick.subscribe { + dismiss(); + StateApp.instance.requestFileReadAccess(_context, null, "application/zip") { + val zipBytes = it?.readBytes(context) ?: return@requestFileReadAccess; + StateBackup.importZipBytes(_context, StateApp.instance.scope, zipBytes); + }; + } + _button_import_ezip.setOnClickListener { + + } + _button_import_txt.onClick.subscribe { + dismiss(); + StateApp.instance.requestFileReadAccess(_context, null, "text/plain") { + val txtBytes = it?.readBytes(context) ?: return@requestFileReadAccess; + val txt = String(txtBytes); + StateBackup.importTxt(_context, txt); + }; + } + _button_import_newpipe_subs.onClick.subscribe { + dismiss(); + StateApp.instance.requestFileReadAccess(_context, null, "application/json") { + val jsonBytes = it?.readBytes(context) ?: return@requestFileReadAccess; + val json = String(jsonBytes); + StateBackup.importNewPipeSubs(_context, json); + }; + }; + _button_close.setOnClickListener { + dismiss(); + } + } + + override fun dismiss() { + super.dismiss(); + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt index bfdc4836..69b9f2aa 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateApp.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateApp.kt @@ -235,14 +235,33 @@ class StateApp { return state; } - fun requestFileReadAccess(activity: IWithResultLauncher, path: Uri?, handle: (DocumentFile?)->Unit) { + fun requestFileReadAccess(activity: IWithResultLauncher, path: Uri?, contentType: String, handle: (DocumentFile?)->Unit) { if(activity is Context) { val intent = Intent(Intent.ACTION_OPEN_DOCUMENT); if(path != null) intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, path); intent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION .or(Intent.FLAG_GRANT_READ_URI_PERMISSION); - + intent.setType(contentType); + activity.launchForResult(intent, 98) { + if(it.resultCode == Activity.RESULT_OK) { + val uri = it.data?.data; + if(uri != null) + handle(DocumentFile.fromSingleUri(activity, uri)); + } + else + UIDialogs.showDialogOk(context, R.drawable.ic_security_pred, "No access granted"); + }; + } + } + fun requestFileCreateAccess(activity: IWithResultLauncher, path: Uri?, contentType: String, handle: (DocumentFile?)->Unit) { + if(activity is Context) { + val intent = Intent(Intent.ACTION_CREATE_DOCUMENT); + if(path != null) + intent.putExtra(DocumentsContract.EXTRA_INITIAL_URI, path); + intent.flags = Intent.FLAG_GRANT_WRITE_URI_PERMISSION + .or(Intent.FLAG_GRANT_READ_URI_PERMISSION); + intent.setType(contentType); activity.launchForResult(intent, 98) { if(it.resultCode == Activity.RESULT_OK) { val uri = it.data?.data; diff --git a/app/src/main/java/com/futo/platformplayer/states/StateBackup.kt b/app/src/main/java/com/futo/platformplayer/states/StateBackup.kt index 69fbb5fe..b3a7ea3e 100644 --- a/app/src/main/java/com/futo/platformplayer/states/StateBackup.kt +++ b/app/src/main/java/com/futo/platformplayer/states/StateBackup.kt @@ -8,17 +8,21 @@ import com.futo.platformplayer.R import com.futo.platformplayer.Settings import com.futo.platformplayer.UIDialogs import com.futo.platformplayer.activities.IWithResultLauncher +import com.futo.platformplayer.activities.MainActivity import com.futo.platformplayer.activities.SettingsActivity import com.futo.platformplayer.api.media.models.video.SerializedPlatformVideo import com.futo.platformplayer.copyTo import com.futo.platformplayer.encryption.GPasswordEncryptionProvider import com.futo.platformplayer.encryption.GPasswordEncryptionProviderV0 +import com.futo.platformplayer.fragment.mainactivity.main.ImportSubscriptionsFragment import com.futo.platformplayer.getNowDiffHours import com.futo.platformplayer.logging.Logger import com.futo.platformplayer.readBytes import com.futo.platformplayer.stores.FragmentedStorage import com.futo.platformplayer.stores.v2.ManagedStore import com.futo.platformplayer.writeBytes +import com.google.gson.JsonObject +import com.google.gson.JsonParser import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -52,15 +56,6 @@ class StateBackup { val secondaryBackupFile = dir.findFile("GrayjayBackup.ezip.old") ?: if(create) dir.createFile("grayjay/ezip", "GrayjayBackup.ezip.old") else null; return Pair(mainBackupFile, secondaryBackupFile); } - /* - private fun getAutomaticBackupFiles(): Pair { - val dir = StateApp.instance.getExternalRootDirectory(); - if(dir == null) - throw IllegalStateException("Can't access external files"); - return Pair(File(dir, "GrayjayBackup.ezip"), File(dir, "GrayjayBackup.ezip.old")) - }*/ - - fun getAllMigrationStores(): List> = listOf( StateSubscriptions.instance.toMigrateCheck(), StatePlaylists.instance.toMigrateCheck() @@ -192,7 +187,19 @@ class StateBackup { importZipBytes(context, scope, backupBytes); } - fun startExternalBackup() { + fun saveExternalBackup(activity: IWithResultLauncher) { + val data = export(); + if(activity is Context) + StateApp.instance.requestFileCreateAccess(activity, null, "application/zip") { + if(it == null) { + UIDialogs.toast("Cancelled"); + return@requestFileCreateAccess; + } + it.writeBytes(activity, data.asZip()); + UIDialogs.toast("Export saved"); + }; + } + fun shareExternalBackup() { val data = export(); val now = OffsetDateTime.now(); val exportFile = File( @@ -401,6 +408,46 @@ class StateBackup { ).withCondition { doImport } else null ); } + + fun importTxt(context: MainActivity, text: String, allowFailure: Boolean = false): Boolean { + if(text.startsWith("@/Subscription") || text.startsWith("Subscriptions")) { + val lines = text.split("\n").map { it.trim() }.drop(1).filter { it.isNotEmpty() }; + context.navigate(context.getFragment(), lines); + return true; + } + else if(allowFailure) { + UIDialogs.showGeneralErrorDialog(context, "Unknown text header [${text}]"); + } + return false; + } + fun importNewPipeSubs(context: MainActivity, json: String) { + val newPipeSubsParsed = JsonParser.parseString(json).asJsonObject; + if (!newPipeSubsParsed.has("subscriptions") || !newPipeSubsParsed["subscriptions"].isJsonArray) + UIDialogs.showGeneralErrorDialog(context, "Invalid json"); + else { + importNewPipeSubs(context, newPipeSubsParsed); + } + } + fun importNewPipeSubs(context: MainActivity, obj: JsonObject) { + try { + val jsonSubs = obj["subscriptions"] + val jsonSubsArray = jsonSubs.asJsonArray; + val jsonSubsArrayItt = jsonSubsArray.iterator(); + val subs = mutableListOf() + while(jsonSubsArrayItt.hasNext()) { + val jsonSubObj = jsonSubsArrayItt.next().asJsonObject; + + if(jsonSubObj.has("url")) + subs.add(jsonSubObj["url"].asString); + } + + context.navigate(context.getFragment(), subs); + } + catch(ex: Exception) { + Logger.e("StateBackup", ex.message, ex); + UIDialogs.showGeneralErrorDialog(context, context.getString(R.string.failed_to_parse_newpipe_subscriptions), ex); + } + } } class ExportStructure( diff --git a/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt b/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt index 0cb71490..373132c4 100644 --- a/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt +++ b/app/src/main/java/com/futo/platformplayer/views/overlays/slideup/SlideUpMenuItem.kt @@ -25,7 +25,7 @@ class SlideUpMenuItem : RelativeLayout { init(); } - constructor(context: Context, imageRes: Int = 0, mainText: String, subText: String = "", tag: Any, call: (()->Unit)? = null, invokeParent: Boolean = true): super(context){ + constructor(context: Context, imageRes: Int = 0, mainText: String, subText: String = "", tag: Any?, call: (()->Unit)? = null, invokeParent: Boolean = true): super(context){ init(); _image.setImageResource(imageRes); _text.text = mainText; diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index ac34014a..b0bf134b 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -1,89 +1,105 @@ - - + android:layout_height="match_parent"> - - - - - - - - - - - - - + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingStart="20dp" + android:paddingEnd="20dp" + android:background="@color/black"> - + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical" + android:paddingTop="20dp" + android:paddingBottom="15dp"> - + + + + + + + + + + + - - - - + android:layout_height="60dp" /> - - \ No newline at end of file + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_import_options.xml b/app/src/main/res/layout/dialog_import_options.xml index e4b1df2b..ad50a314 100644 --- a/app/src/main/res/layout/dialog_import_options.xml +++ b/app/src/main/res/layout/dialog_import_options.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:gravity="center" android:background="@color/gray_1d"> @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center" - android:paddingTop="40dp"> + android:paddingTop="20dp"> + + @@ -55,39 +67,47 @@ android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center" - android:padding="10dp" - android:layout_marginTop="28dp" - android:layout_marginBottom="28dp"> + android:paddingBottom="10dp" + android:paddingTop="10dp" + android:layout_marginTop="5dp" + android:layout_marginBottom="10dp"> Date: Tue, 5 Dec 2023 14:15:39 +0100 Subject: [PATCH 4/4] Creator search, toggle to disable bad rep comments fading --- .../java/com/futo/platformplayer/Settings.kt | 3 + .../java/com/futo/platformplayer/UIDialogs.kt | 4 +- .../mainactivity/main/CreatorsFragment.kt | 12 ++++ .../views/adapters/CommentViewHolder.kt | 3 +- .../CommentWithReferenceViewHolder.kt | 4 +- .../views/adapters/SubscriptionAdapter.kt | 12 +++- .../main/res/layout/dialog_multi_button.xml | 3 +- app/src/main/res/layout/fragment_creators.xml | 66 ++++++++++++++----- app/src/main/res/values/strings.xml | 2 + 9 files changed, 86 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/com/futo/platformplayer/Settings.kt b/app/src/main/java/com/futo/platformplayer/Settings.kt index 2870f4d7..aeee8376 100644 --- a/app/src/main/java/com/futo/platformplayer/Settings.kt +++ b/app/src/main/java/com/futo/platformplayer/Settings.kt @@ -413,6 +413,9 @@ class Settings : FragmentedStorageFileJson() { @FormField(R.string.default_comment_section, FieldForm.DROPDOWN, -1, 0) @DropdownFieldOptionsId(R.array.comment_sections) var defaultCommentSection: Int = 0; + + @FormField(R.string.bad_reputation_comments_fading, FieldForm.TOGGLE, R.string.bad_reputation_comments_fading_description, 0) + var badReputationCommentsFading: Boolean = true; } @FormField(R.string.downloads, "group", R.string.configure_downloading_of_videos, 7) diff --git a/app/src/main/java/com/futo/platformplayer/UIDialogs.kt b/app/src/main/java/com/futo/platformplayer/UIDialogs.kt index 920150c1..a32c1b80 100644 --- a/app/src/main/java/com/futo/platformplayer/UIDialogs.kt +++ b/app/src/main/java/com/futo/platformplayer/UIDialogs.kt @@ -190,8 +190,10 @@ class UIDialogs { view.findViewById(R.id.dialog_text_code).apply { if(code == null) this.visibility = View.GONE; - else + else { this.text = code; + this.visibility = View.VISIBLE; + } }; view.findViewById(R.id.dialog_buttons).apply { val buttons = actions.map { act -> diff --git a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorsFragment.kt b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorsFragment.kt index 88844108..b62098a7 100644 --- a/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorsFragment.kt +++ b/app/src/main/java/com/futo/platformplayer/fragment/mainactivity/main/CreatorsFragment.kt @@ -6,8 +6,10 @@ import android.view.View import android.view.ViewGroup import android.widget.AdapterView import android.widget.ArrayAdapter +import android.widget.EditText import android.widget.FrameLayout import android.widget.Spinner +import androidx.core.widget.addTextChangedListener import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.futo.platformplayer.R @@ -21,9 +23,13 @@ class CreatorsFragment : MainFragment() { private var _spinnerSortBy: Spinner? = null; private var _overlayContainer: FrameLayout? = null; + private var _containerSearch: FrameLayout? = null; + private var _editSearch: EditText? = null; override fun onCreateMainView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { val view = inflater.inflate(R.layout.fragment_creators, container, false); + _containerSearch = view.findViewById(R.id.container_search); + _editSearch = view.findViewById(R.id.edit_search); val adapter = SubscriptionAdapter(inflater, getString(R.string.confirm_delete_subscription)); adapter.onClick.subscribe { platformUser -> navigate(platformUser) }; @@ -44,6 +50,10 @@ class CreatorsFragment : MainFragment() { _spinnerSortBy = spinnerSortBy; + _editSearch?.addTextChangedListener { + adapter.query = it.toString(); + } + val recyclerView = view.findViewById(R.id.recycler_subscriptions); recyclerView.adapter = adapter; recyclerView.layoutManager = LinearLayoutManager(view.context); @@ -54,6 +64,8 @@ class CreatorsFragment : MainFragment() { super.onDestroyMainView(); _spinnerSortBy = null; _overlayContainer = null; + _editSearch = null; + _containerSearch = null; } companion object { diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt index 89c3c1bb..68103c99 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/CommentViewHolder.kt @@ -117,7 +117,8 @@ class CommentViewHolder : ViewHolder { val rating = comment.rating; if (rating is RatingLikeDislikes) { - _layoutComment.alpha = if (rating.dislikes > 2 && rating.dislikes.toFloat() / (rating.likes + rating.dislikes).toFloat() >= 0.7f) 0.5f else 1.0f; + _layoutComment.alpha = if (Settings.instance.comments.badReputationCommentsFading && + rating.dislikes > 2 && rating.dislikes.toFloat() / (rating.likes + rating.dislikes).toFloat() >= 0.7f) 0.5f else 1.0f; } else { _layoutComment.alpha = 1.0f; } diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt index f0581abd..c47db9f6 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/CommentWithReferenceViewHolder.kt @@ -23,7 +23,6 @@ import com.futo.platformplayer.views.pills.PillRatingLikesDislikes import com.futo.polycentric.core.Opinion import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch -import userpackage.Protocol import java.util.IdentityHashMap class CommentWithReferenceViewHolder : ViewHolder { @@ -135,7 +134,8 @@ class CommentWithReferenceViewHolder : ViewHolder { val rating = comment.rating; if (rating is RatingLikeDislikes) { - _layoutComment.alpha = if (rating.dislikes > 2 && rating.dislikes.toFloat() / (rating.likes + rating.dislikes).toFloat() >= 0.7f) 0.5f else 1.0f; + _layoutComment.alpha = if (Settings.instance.comments.badReputationCommentsFading && + rating.dislikes > 2 && rating.dislikes.toFloat() / (rating.likes + rating.dislikes).toFloat() >= 0.7f) 0.5f else 1.0f; } else { _layoutComment.alpha = 1.0f; } diff --git a/app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionAdapter.kt b/app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionAdapter.kt index f7a63d53..fe33c0da 100644 --- a/app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionAdapter.kt +++ b/app/src/main/java/com/futo/platformplayer/views/adapters/SubscriptionAdapter.kt @@ -15,11 +15,16 @@ class SubscriptionAdapter : RecyclerView.Adapter { var onClick = Event1(); var onSettings = Event1(); - var sortBy: Int = 3 + var sortBy: Int = 5 set(value) { field = value updateDataset() } + var query: String? = null + set(value) { + field = value; + updateDataset(); + } constructor(inflater: LayoutInflater, confirmationMessage: String) : super() { _inflater = inflater; @@ -53,6 +58,7 @@ class SubscriptionAdapter : RecyclerView.Adapter { } private fun updateDataset() { + val queryLower = query?.lowercase() ?: ""; _sortedDataset = when (sortBy) { 0 -> StateSubscriptions.instance.getSubscriptions().sortedBy({ u -> u.channel.name.lowercase() }) 1 -> StateSubscriptions.instance.getSubscriptions().sortedByDescending({ u -> u.channel.name.lowercase() }) @@ -61,7 +67,9 @@ class SubscriptionAdapter : RecyclerView.Adapter { 4 -> StateSubscriptions.instance.getSubscriptions().sortedBy { it.playbackSeconds } 5 -> StateSubscriptions.instance.getSubscriptions().sortedByDescending { it.playbackSeconds } else -> throw IllegalStateException("Invalid sorting algorithm selected."); - }.toList(); + } + .filter { (queryLower.isNullOrBlank() || it.channel.name.lowercase().contains(queryLower)) } + .toList(); notifyDataSetChanged(); } diff --git a/app/src/main/res/layout/dialog_multi_button.xml b/app/src/main/res/layout/dialog_multi_button.xml index 70c9e86e..87365f8c 100644 --- a/app/src/main/res/layout/dialog_multi_button.xml +++ b/app/src/main/res/layout/dialog_multi_button.xml @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:textColor="#AAAAAA" android:fontFamily="monospace" - android:text="source.getVideoDetails(...)" + android:text="" android:textAlignment="center" android:layout_marginStart="30dp" android:layout_marginEnd="30dp" @@ -58,6 +58,7 @@ android:padding="5dp" android:background="#111111" android:textSize="8dp" + android:visibility="gone" android:layout_height="wrap_content" tools:ignore="HardcodedText" /> diff --git a/app/src/main/res/layout/fragment_creators.xml b/app/src/main/res/layout/fragment_creators.xml index f8bc6aa0..b39ad6f4 100644 --- a/app/src/main/res/layout/fragment_creators.xml +++ b/app/src/main/res/layout/fragment_creators.xml @@ -16,33 +16,67 @@ - + android:orientation="vertical"> - + + android:visibility="visible" + android:layout_margin="10dp"> - + + + + + + android:gravity="center_vertical"> + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 72462219..d04340d8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -368,6 +368,8 @@ Default quality while previewing a video in a feed Primary Language Default Comment Section + Bad Reputation Comment Fading + If comments with a very bad reputation should be faded. Disabling may worsen experience. Reinstall Embedded Plugins Remove Cached Version Remove the last downloaded version