Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-20 19:18:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify redundant split-pane window size class checks.

Browse Source
This commit is contained in:
jeffrey-signal
2025-11-20 14:48:04 -05:00
parent 1b77a523e4
commit 4219e2d16f
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
View File

@@ -72,7 +72,6 @@ import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.repeatOnLifecycle
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import androidx.window.core.layout.WindowSizeClass import androidx.window.core.layout.WindowSizeClass
import androidx.window.core.layout.WindowWidthSizeClass
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import io.reactivex.rxjava3.subjects.PublishSubject import io.reactivex.rxjava3.subjects.PublishSubject
import io.reactivex.rxjava3.subjects.Subject import io.reactivex.rxjava3.subjects.Subject
@@ -555,7 +554,7 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
} }
}, },
secondaryContent = { secondaryContent = {
val listContainerColor = if (windowSizeClass.isSplitPane() && windowSizeClass.windowWidthSizeClass == WindowWidthSizeClass.MEDIUM) { val listContainerColor = if (windowSizeClass.isSplitPane()) {
SignalTheme.colors.colorSurface1 SignalTheme.colors.colorSurface1
} else { } else {
MaterialTheme.colorScheme.surface MaterialTheme.colorScheme.surface

3
app/src/main/java/org/thoughtcrime/securesms/window/AppScaffold.kt
View File

@@ -42,7 +42,6 @@ import androidx.compose.ui.platform.LocalInspectionMode
import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex import androidx.compose.ui.zIndex
import androidx.window.core.layout.WindowHeightSizeClass
import org.signal.core.ui.compose.AllDevicePreviews import org.signal.core.ui.compose.AllDevicePreviews
import org.signal.core.ui.compose.Previews import org.signal.core.ui.compose.Previews
import org.thoughtcrime.securesms.main.MainFloatingActionButtonsCallback import org.thoughtcrime.securesms.main.MainFloatingActionButtonsCallback
@@ -61,7 +60,7 @@ enum class NavigationType {
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
return remember(windowSizeClass) { return remember(windowSizeClass) {
if (windowSizeClass.isSplitPane() && windowSizeClass.windowHeightSizeClass.isAtLeast(WindowHeightSizeClass.MEDIUM)) { if (windowSizeClass.isSplitPane()) {
RAIL RAIL
} else { } else {
BAR BAR

2
app/src/main/java/org/thoughtcrime/securesms/window/WindowSizeClassExtensions.kt
View File

@@ -40,7 +40,7 @@ fun Resources.getWindowSizeClass(): WindowSizeClass {
} }
/** /**
* Split Pane is enabled as long as the width size class is MEDIUM or greater * Determines whether the UI should display in split-pane mode based on available screen space.
*/ */
@JvmOverloads @JvmOverloads
fun WindowSizeClass.isSplitPane( fun WindowSizeClass.isSplitPane(