mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-02-22 18:55:12 +00:00
Inline large-screen internal setting and remove it.
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -31,6 +31,5 @@ data class InternalSettingsState(
|
||||
val hasPendingOneTimeDonation: Boolean,
|
||||
val hevcEncoding: Boolean,
|
||||
val newCallingUi: Boolean,
|
||||
val largeScreenUi: Boolean,
|
||||
val forceSplitPane: Boolean
|
||||
)
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -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<String> = emptyList()
|
||||
|
||||
/**
|
||||
* Enable or disable the large screen UI.
|
||||
*/
|
||||
var largeScreenUi by booleanValue(LARGE_SCREEN_UI, true).defaultForExternalUsers()
|
||||
|
||||
/**
|
||||
* Force split-pane mode on compact landscape
|
||||
*/
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user