From ba378d28f45ffc9b8025b1b1c304a7acd23175ea Mon Sep 17 00:00:00 2001 From: Alex Hart Date: Fri, 7 Nov 2025 10:13:39 -0400 Subject: [PATCH] Inline large-screen internal setting and remove it. --- .../app/internal/InternalSettingsFragment.kt | 12 ------------ .../settings/app/internal/InternalSettingsState.kt | 1 - .../app/internal/InternalSettingsViewModel.kt | 6 ------ .../securesms/keyvalue/InternalValues.kt | 6 ------ .../securesms/window/WindowSizeClassExtensions.kt | 2 +- 5 files changed, 1 insertion(+), 26 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt index 2a02503bc6..9735f7b046 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt @@ -174,19 +174,7 @@ class InternalSettingsFragment : DSLSettingsFragment(R.string.preferences__inter sectionHeaderPref(DSLSettingsText.from("App UI")) switchPref( - title = DSLSettingsText.from("Enable new split pane UI."), - summary = DSLSettingsText.from("Warning: Some bugs and non functional buttons are expected. App will restart."), - isChecked = state.largeScreenUi, - onClick = { - viewModel.setUseLargeScreenUi(!state.largeScreenUi) - AppUtil.restart(requireContext()) - } - ) - - switchPref( - isEnabled = state.largeScreenUi, title = DSLSettingsText.from("Force split pane UI on phones."), - summary = DSLSettingsText.from("This setting requires split pane UI to be enabled."), isChecked = state.forceSplitPane, onClick = { viewModel.setForceSplitPane(!state.forceSplitPane) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt index 15e0611251..138bcfc987 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsState.kt @@ -31,6 +31,5 @@ data class InternalSettingsState( val hasPendingOneTimeDonation: Boolean, val hevcEncoding: Boolean, val newCallingUi: Boolean, - val largeScreenUi: Boolean, val forceSplitPane: Boolean ) diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt index eb86cfc5cf..c8d6fbf639 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsViewModel.kt @@ -197,7 +197,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito hasPendingOneTimeDonation = SignalStore.inAppPayments.getPendingOneTimeDonation() != null, hevcEncoding = SignalStore.internal.hevcEncoding, newCallingUi = SignalStore.internal.newCallingUi, - largeScreenUi = SignalStore.internal.largeScreenUi, forceSplitPane = SignalStore.internal.forceSplitPane ) @@ -214,11 +213,6 @@ class InternalSettingsViewModel(private val repository: InternalSettingsReposito refresh() } - fun setUseLargeScreenUi(largeScreenUi: Boolean) { - SignalStore.internal.largeScreenUi = largeScreenUi - refresh() - } - fun setForceSplitPane(forceSplitPane: Boolean) { SignalStore.internal.forceSplitPane = forceSplitPane refresh() diff --git a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt index f20e74c8eb..060994193f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/InternalValues.kt @@ -32,7 +32,6 @@ class InternalValues internal constructor(store: KeyValueStore) : SignalStoreVal const val WEB_SOCKET_SHADOWING_STATS: String = "internal.web_socket_shadowing_stats" const val ENCODE_HEVC: String = "internal.hevc_encoding" const val NEW_CALL_UI: String = "internal.new.call.ui" - const val LARGE_SCREEN_UI: String = "internal.large.screen.ui" const val FORCE_SPLIT_PANE_ON_COMPACT_LANDSCAPE: String = "internal.force.split.pane.on.compact.landscape.ui" const val SHOW_ARCHIVE_STATE_HINT: String = "internal.show_archive_state_hint" const val INCLUDE_DEBUGLOG_IN_BACKUP: String = "internal.include_debuglog_in_backup" @@ -43,11 +42,6 @@ class InternalValues internal constructor(store: KeyValueStore) : SignalStoreVal public override fun getKeysToIncludeInBackup(): List = emptyList() - /** - * Enable or disable the large screen UI. - */ - var largeScreenUi by booleanValue(LARGE_SCREEN_UI, true).defaultForExternalUsers() - /** * Force split-pane mode on compact landscape */ diff --git a/app/src/main/java/org/thoughtcrime/securesms/window/WindowSizeClassExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/window/WindowSizeClassExtensions.kt index 62273e868d..811122b0f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/window/WindowSizeClassExtensions.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/window/WindowSizeClassExtensions.kt @@ -31,7 +31,7 @@ fun WindowWidthSizeClass.isAtLeast(other: WindowWidthSizeClass): Boolean { * Global check for large screen support, can be inlined after production release. */ fun isLargeScreenSupportEnabled(): Boolean { - return RemoteConfig.largeScreenUi && SignalStore.internal.largeScreenUi + return RemoteConfig.largeScreenUi } @OptIn(ExperimentalWindowCoreApi::class)