Cleaning up old window size code. (#182)

AdamMc331 · Mar 9, 2023 · 1f770bd · 1f770bd
1 parent 6fd6376
commit 1f770bd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 82 deletions.
diff --git a/StreamHistory.md b/StreamHistory.md
@@ -594,7 +594,8 @@ In this stream, we implemented the material 3 window size class dependency & cha
 type based on screen width. 
 
 PRs:
-* https://github.com/AdamMc331/TOA/pull/181
+* Adaptive navigation types: https://github.com/AdamMc331/TOA/pull/181
+* Old windowsize code cleanup: https://github.com/AdamMc331/TOA/pull/182
 
 YouTube:
 * Coming Soon
diff --git a/app/src/androidTest/java/com/adammcneilly/toa/tasklist/ui/TaskListScreenTest.kt b/app/src/androidTest/java/com/adammcneilly/toa/tasklist/ui/TaskListScreenTest.kt
@@ -1,9 +1,9 @@
 package com.adammcneilly.toa.tasklist.ui
 
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.ui.test.junit4.createComposeRule
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.performClick
-import com.adammcneilly.toa.core.ui.WindowSize
 import com.adammcneilly.toa.destinations.AddTaskDialogDestination
 import com.adammcneilly.toa.destinations.AddTaskScreenDestination
 import com.adammcneilly.toa.fakes.FakeDestinationsNavigator
@@ -47,7 +47,7 @@ class TaskListScreenTest {
             TaskListScreen(
                 navigator = destinationsNavigator,
                 viewModel = viewModel,
-                windowSize = WindowSize.Compact,
+                windowWidthSizeClass = WindowWidthSizeClass.Compact,
             )
         }
         composeTestRule
@@ -84,7 +84,7 @@ class TaskListScreenTest {
             TaskListScreen(
                 navigator = destinationsNavigator,
                 viewModel = viewModel,
-                windowSize = WindowSize.Expanded,
+                windowWidthSizeClass = WindowWidthSizeClass.Expanded,
             )
         }
 

diff --git a/app/src/main/java/com/adammcneilly/toa/MainActivity.kt b/app/src/main/java/com/adammcneilly/toa/MainActivity.kt
@@ -23,11 +23,9 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.graphics.Color
 import androidx.core.view.WindowCompat
 import androidx.fragment.app.FragmentActivity
-import com.adammcneilly.toa.core.ui.WindowSize
 import com.adammcneilly.toa.core.ui.components.navigation.NavigationTab
 import com.adammcneilly.toa.core.ui.components.navigation.NavigationType
 import com.adammcneilly.toa.core.ui.components.navigation.TOANavigationContainer
-import com.adammcneilly.toa.core.ui.rememberWindowSizeClass
 import com.adammcneilly.toa.core.ui.theme.TOATheme
 import com.adammcneilly.toa.destinations.LoginScreenDestination
 import com.adammcneilly.toa.destinations.TaskListScreenDestination
@@ -50,6 +48,7 @@ class MainActivity : FragmentActivity() {
 
     private val sessionViewModel: SessionViewModel by viewModels()
 
+    @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -58,7 +57,7 @@ class MainActivity : FragmentActivity() {
         WindowCompat.setDecorFitsSystemWindows(window, false)
 
         setContent {
-            val windowSize = rememberWindowSizeClass()
+            val windowWidthSizeClass = calculateWindowSizeClass(activity = this).widthSizeClass
 
             TOATheme {
                 ConfigureSystemBars()
@@ -76,7 +75,7 @@ class MainActivity : FragmentActivity() {
                         }
 
                         if (startRoute != null) {
-                            TOANavHost(startRoute, windowSize)
+                            TOANavHost(startRoute, windowWidthSizeClass)
                         }
                     }
                 }
@@ -88,7 +87,7 @@ class MainActivity : FragmentActivity() {
     @Composable
     private fun TOANavHost(
         startRoute: Route,
-        windowSize: WindowSize,
+        windowWidthSizeClass: WindowWidthSizeClass,
     ) {
         val navigationEngine = rememberAnimatedNavHostEngine(
             rootDefaultAnimations = RootNavGraphDefaultAnimations(
@@ -131,7 +130,7 @@ class MainActivity : FragmentActivity() {
                         composable(TaskListScreenDestination) {
                             TaskListScreen(
                                 navigator = destinationsNavigator,
-                                windowSize = windowSize,
+                                windowWidthSizeClass = windowWidthSizeClass,
                             )
                         }
                     },

diff --git a/app/src/main/java/com/adammcneilly/toa/core/ui/WindowSize.kt b/app/src/main/java/com/adammcneilly/toa/core/ui/WindowSize.kt
diff --git a/app/src/main/java/com/adammcneilly/toa/tasklist/ui/TaskListScreen.kt b/app/src/main/java/com/adammcneilly/toa/tasklist/ui/TaskListScreen.kt
@@ -1,12 +1,12 @@
 package com.adammcneilly.toa.tasklist.ui
 
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.adammcneilly.toa.addtask.ui.AddTaskNavArguments
-import com.adammcneilly.toa.core.ui.WindowSize
 import com.adammcneilly.toa.destinations.AddTaskDialogDestination
 import com.adammcneilly.toa.destinations.AddTaskScreenDestination
 import com.ramcosta.composedestinations.annotation.Destination
@@ -16,7 +16,7 @@ import com.ramcosta.composedestinations.navigation.DestinationsNavigator
 @Composable
 fun TaskListScreen(
     navigator: DestinationsNavigator,
-    windowSize: WindowSize = WindowSize.Compact,
+    windowWidthSizeClass: WindowWidthSizeClass = WindowWidthSizeClass.Compact,
     viewModel: TaskListViewModel = hiltViewModel(),
 ) {
     val viewState = viewModel.viewState.collectAsState()
@@ -30,7 +30,7 @@ fun TaskListScreen(
                 initialDate = viewState.value.selectedDate,
             )
 
-            val destination = if (windowSize != WindowSize.Compact) {
+            val destination = if (windowWidthSizeClass != WindowWidthSizeClass.Compact) {
                 AddTaskDialogDestination(
                     initialDate = navArgs.initialDate
                 )