Merge pull request #236 from aritra-tech/optimize_trash_note_screen

Optimized the `Trash Note` Screen
aritra-tech · Nov 10, 2023 · 8054f4d · 8054f4d
2 parents fa77924 + 35f5fba
commit 8054f4d
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 43 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -48,7 +48,7 @@ android {
         compose = true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.2"
+        kotlinCompilerExtensionVersion = "1.5.4"
     }
     packaging {
         resources {

diff --git a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
@@ -1,5 +1,6 @@
 package com.aritra.notify.navigation
 
+import android.widget.Toast
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.animation.core.tween
@@ -15,16 +16,20 @@ import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType.Companion.IntType
@@ -36,7 +41,9 @@ import androidx.navigation.navArgument
 import com.aritra.notify.R
 import com.aritra.notify.ui.screens.notes.addEditScreen.AddEditRoute
 import com.aritra.notify.ui.screens.notes.homeScreen.NoteScreen
-import com.aritra.notify.ui.screens.notes.trash.trashNoteDest
+import com.aritra.notify.ui.screens.notes.trash.TrashNoteEffect
+import com.aritra.notify.ui.screens.notes.trash.TrashNoteScreen
+import com.aritra.notify.ui.screens.notes.trash.TrashNoteViewModel
 import com.aritra.notify.ui.screens.settingsScreen.SettingsScreen
 
 @Composable
@@ -51,6 +58,26 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
     var shouldHideBottomBar: Boolean by remember {
         mutableStateOf(true)
     }
+    val trashViewModel = hiltViewModel<TrashNoteViewModel>()
+    val state by trashViewModel.state.collectAsState()
+    val effect by trashViewModel.effect.collectAsState()
+    val context = LocalContext.current
+
+    LaunchedEffect(key1 = effect) {
+        effect?.let {
+            when (it) {
+                TrashNoteEffect.Close -> {
+                    navController.popBackStack()
+                    trashViewModel.resetEffect()
+                }
+
+                is TrashNoteEffect.Message -> {
+                    Toast.makeText(context, it.message, Toast.LENGTH_SHORT).show()
+                    trashViewModel.closePage()
+                }
+            }
+        }
+    }
 
     Scaffold(
         bottomBar = {
@@ -123,7 +150,12 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
             ) {
                 SettingsScreen(controller = navController)
             }
-            trashNoteDest(navController)
+
+            composable(
+                route = NotifyScreens.TrashNoteScreen.name
+            ) {
+                TrashNoteScreen(trashNoteState = state, onEvent = trashViewModel::onEvent)
+            }
         }
     }
 }

diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/trash/TrashNoteScreen.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/trash/TrashNoteScreen.kt
@@ -1,7 +1,6 @@
 package com.aritra.notify.ui.screens.notes.trash
 
 import TrashNoteState
-import android.widget.Toast
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -20,47 +19,11 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
-import androidx.navigation.NavController
-import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import com.aritra.notify.components.note.NotesCard
-import com.aritra.notify.navigation.NotifyScreens
-
-fun NavGraphBuilder.trashNoteDest(controller: NavController) {
-    composable(NotifyScreens.TrashNoteScreen.name) {
-        val trashViewModel = hiltViewModel<TrashNoteViewModel>()
-        val state by trashViewModel.state.collectAsState()
-        val effect by trashViewModel.effect.collectAsState()
-        val context = LocalContext.current
-        LaunchedEffect(key1 = effect) {
-            effect?.let {
-                when (it) {
-                    TrashNoteEffect.Close -> {
-                        controller.popBackStack()
-                        trashViewModel.resetEffect()
-                    }
-
-                    is TrashNoteEffect.Message -> {
-                        Toast.makeText(context, it.message, Toast.LENGTH_SHORT).show()
-                        trashViewModel.closePage()
-                    }
-
-                    else -> {}
-                }
-            }
-        }
-        TrashNoteScreen(trashNoteState = state, trashViewModel::onEvent)
-    }
-}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,12 +26,12 @@ navVersion = "2.7.4"
 roomVersion = "2.5.2"
 runtimeLivedata = "1.5.3"
 bom = "2023.10.00"
-kotlinBom = "1.9.0"
+kotlinBom = "1.9.20"
 material3windowsize = "1.1.2"
 android-application = "8.1.2"
-kotlin-android = "1.9.0"
+kotlin-android = "1.9.20"
 dagger-hilt-android = "2.48.1"
-devtools-ksp = "1.9.0-1.0.12"
+devtools-ksp = "1.9.20-1.0.14"
 zoomable = "0.6.2"
 zoomableImageCoil = "0.6.2"
 ktlint = "11.6.1"