From d1782b7edc2fb56e6bb80e9dd095f3883dd4a3e7 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Wed, 23 Apr 2025 11:52:24 +0200 Subject: [PATCH] refactor: enable full local mode by default --- .../github/libretube/helpers/PlayerHelper.kt | 2 +- .../libretube/ui/models/WelcomeViewModel.kt | 6 ++- app/src/main/res/layout/activity_welcome.xml | 46 +++++++++---------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt index 4f8387549..e2d95c3d2 100644 --- a/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt +++ b/app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt @@ -348,7 +348,7 @@ object PlayerHelper { val fullLocalMode: Boolean get() = PreferenceHelper.getBoolean( PreferenceKeys.FULL_LOCAL_MODE, - false + true ) val localStreamExtraction: Boolean diff --git a/app/src/main/java/com/github/libretube/ui/models/WelcomeViewModel.kt b/app/src/main/java/com/github/libretube/ui/models/WelcomeViewModel.kt index 1da24cb74..466f5fa87 100644 --- a/app/src/main/java/com/github/libretube/ui/models/WelcomeViewModel.kt +++ b/app/src/main/java/com/github/libretube/ui/models/WelcomeViewModel.kt @@ -19,6 +19,7 @@ import com.github.libretube.api.RetrofitInstance import com.github.libretube.api.obj.PipedInstance import com.github.libretube.constants.PreferenceKeys import com.github.libretube.helpers.BackupHelper +import com.github.libretube.helpers.PlayerHelper import com.github.libretube.helpers.PreferenceHelper import kotlinx.coroutines.launch import kotlinx.parcelize.Parcelize @@ -69,6 +70,7 @@ class WelcomeViewModel( PreferenceKeys.FETCH_INSTANCE, _uiState.value.instances[selectedInstanceIndex].apiUrl ) + PreferenceHelper.putBoolean(PreferenceKeys.FULL_LOCAL_MODE, false) refreshAndNavigate() } } @@ -79,7 +81,7 @@ class WelcomeViewModel( // only skip the welcome activity if the restored backup contains an instance val instancePref = PreferenceHelper.getString(PreferenceKeys.FETCH_INSTANCE, "") - if (instancePref.isNotEmpty()) { + if (instancePref.isNotEmpty() || PlayerHelper.fullLocalMode) { refreshAndNavigate() } } @@ -101,7 +103,7 @@ class WelcomeViewModel( @Parcelize data class UiState( - val fullLocalMode: Boolean = false, + val fullLocalMode: Boolean = true, val selectedInstanceIndex: Int? = null, val instances: List = emptyList(), @StringRes val error: Int? = null, diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml index 2d9db6770..958906430 100644 --- a/app/src/main/res/layout/activity_welcome.xml +++ b/app/src/main/res/layout/activity_welcome.xml @@ -45,19 +45,12 @@ android:id="@+id/operation_mode_group" app:selectionRequired="true" app:singleSelection="true" - app:checkedButton="@+id/piped_toggle_group_button" + app:checkedButton="@+id/full_local_mode_toggle_group_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" android:layout_marginBottom="10dp"> - - + + + + + + + + - - - - - -