From 77a01804aa3c879d620c2ac7c79c696e469c7f96 Mon Sep 17 00:00:00 2001
From: aritra <aritrarick2002@gmail.com>
Date: Tue, 27 Feb 2024 13:29:48 +0530
Subject: [PATCH 1/5] Fixed the recompositions

---
 .idea/deploymentTargetDropDown.xml            |  15 +--
 .idea/gradle.xml                              |   3 +-
 .../com/aritra/notify/navigation/NotifyApp.kt |  32 ++---
 .../ui/screens/notes/homeScreen/NoteScreen.kt | 121 +++++-------------
 4 files changed, 42 insertions(+), 129 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 73b6ec28..0c0c3383 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,20 +3,7 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State>
-          <runningDeviceTargetSelectedWithDropDown>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="4d467f4a" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2023-10-30T10:39:32.351103600Z" />
-        </State>
+        <State />
       </entry>
     </value>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 9f47dfb4..0897082f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,9 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="jbr-17" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
index 4dcbb25b..b75ef47e 100644
--- a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
+++ b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
@@ -1,8 +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
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
@@ -20,9 +18,6 @@ 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
@@ -53,11 +48,8 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
         "${NotifyScreens.AddEditNotes.name}/{noteId}",
         NotifyScreens.TrashNoteScreen.name
     )
-    val backStackEntry = navController.currentBackStackEntryAsState()
 
-    var shouldHideBottomBar: Boolean by remember {
-        mutableStateOf(true)
-    }
+    val backStackEntry = navController.currentBackStackEntryAsState()
     val trashViewModel = hiltViewModel<TrashNoteViewModel>()
     val state by trashViewModel.state.collectAsState()
     val effect by trashViewModel.effect.collectAsState()
@@ -81,18 +73,12 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
 
     Scaffold(
         bottomBar = {
-            AnimatedVisibility(
-                visible = shouldHideBottomBar,
-                enter = fadeIn(animationSpec = tween(delayMillis = 500, easing = LinearOutSlowInEasing)),
-                exit = fadeOut(animationSpec = tween(delayMillis = 500, easing = LinearOutSlowInEasing))
-            ) {
-                BottomNavigationBar(
-                    backStackEntry,
-                    bottomNavItem,
-                    screensWithHiddenNavBar,
-                    navController
-                )
-            }
+            BottomNavigationBar(
+                backStackEntry,
+                bottomNavItem,
+                screensWithHiddenNavBar,
+                navController
+            )
         }
     ) { scaffoldPadding ->
         NavHost(
@@ -130,9 +116,7 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
                     navigateToUpdateNoteScreen = { noteId ->
                         navController.navigate("${NotifyScreens.AddEditNotes.name}/$noteId")
                     }
-                ) { shouldHide ->
-                    shouldHideBottomBar = shouldHide
-                }
+                )
             }
 
             composable(
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt
index 19293d4e..34460bcb 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt
@@ -2,11 +2,6 @@
 
 package com.aritra.notify.ui.screens.notes.homeScreen
 
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.LinearOutSlowInEasing
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -44,7 +39,6 @@ import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateListOf
@@ -53,7 +47,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
@@ -78,8 +71,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun NoteScreen(
     onFabClicked: () -> Unit,
-    navigateToUpdateNoteScreen: (noteId: Int) -> Unit,
-    shouldHideBottomBar: (Boolean) -> Unit,
+    navigateToUpdateNoteScreen: (noteId: Int) -> Unit
 ) {
     val viewModel = hiltViewModel<NoteScreenViewModel>()
 
@@ -87,43 +79,19 @@ fun NoteScreen(
     val listOfAllNotes by viewModel.listOfNotes.observeAsState(emptyList())
     var searchQuery by rememberSaveable { mutableStateOf("") }
     var isGridView by rememberSaveable { mutableStateOf(false) }
-
-    var isInSelectionMode by remember {
-        mutableStateOf(false)
-    }
-    val selectedNoteIds = remember {
-        mutableStateListOf<Int>()
-    }
-
-    val deletedNotes = remember {
-        mutableStateListOf<Note>()
-    }
-
+    var isInSelectionMode by remember { mutableStateOf(false) }
+    val selectedNoteIds = remember { mutableStateListOf<Int>() }
+    val deletedNotes = remember { mutableStateListOf<Note>() }
     val scope = rememberCoroutineScope()
     val snackBarHostState = remember { SnackbarHostState() }
-
     val resetSelectionMode = {
         isInSelectionMode = false
         selectedNoteIds.clear()
     }
 
     val listState: LazyListState = rememberLazyListState()
-    val shouldHideSearchBarForList by remember(listState) {
-        derivedStateOf {
-            listState.firstVisibleItemIndex == 0
-        }
-    }
 
     val staggeredGState: LazyStaggeredGridState = rememberLazyStaggeredGridState()
-    val shouldHideSearchBarForGrid by remember(staggeredGState) {
-        derivedStateOf {
-            staggeredGState.firstVisibleItemIndex == 0
-        }
-    }
-
-    var shouldHideSearchBar by remember {
-        mutableStateOf(true)
-    }
 
     BackPressHandler(isInSelectionMode, resetSelectionMode)
 
@@ -136,25 +104,6 @@ fun NoteScreen(
         }
     }
 
-    LaunchedEffect(listState) {
-        snapshotFlow { listState.layoutInfo }
-            .collect {
-                if (it.visibleItemsInfo.isNotEmpty()) {
-                    shouldHideBottomBar.invoke(shouldHideSearchBarForList)
-                    shouldHideSearchBar = shouldHideSearchBarForList
-                }
-            }
-    }
-    LaunchedEffect(staggeredGState) {
-        snapshotFlow { staggeredGState.layoutInfo }
-            .collect {
-                if (it.visibleItemsInfo.isNotEmpty()) {
-                    shouldHideBottomBar.invoke(shouldHideSearchBarForGrid)
-                    shouldHideSearchBar = shouldHideSearchBarForGrid
-                }
-            }
-    }
-
     Scaffold(
         snackbarHost = {
             SnackbarHost(hostState = snackBarHostState)
@@ -205,43 +154,37 @@ fun NoteScreen(
                     resetSelectionMode = resetSelectionMode
                 )
             } else {
-                AnimatedVisibility(
-                    visible = shouldHideSearchBar,
-                    enter = fadeIn(animationSpec = tween(delayMillis = 500, easing = LinearOutSlowInEasing)),
-                    exit = fadeOut(animationSpec = tween(delayMillis = 500, easing = LinearOutSlowInEasing))
-                ) {
-                    SearchBar(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(10.dp),
-                        query = searchQuery,
-                        onQueryChange = { search ->
-                            searchQuery = search
-                        },
-                        onSearch = {},
-                        active = false,
-                        onActiveChange = {},
-                        placeholder = { Text(stringResource(R.string.search_your_notes)) },
-                        leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
-                        trailingIcon = {
-                            if (searchQuery.isNotEmpty()) {
-                                Icon(
-                                    modifier = Modifier.clickable { searchQuery = "" },
-                                    imageVector = Icons.Default.Close,
-                                    contentDescription = "Close"
-                                )
-                            } else {
-                                LayoutToggleButton(
-                                    isGridView = isGridView,
-                                    onToggleClick = { isGridView = !isGridView }
-                                )
-                            }
+                SearchBar(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(10.dp),
+                    query = searchQuery,
+                    onQueryChange = { search ->
+                        searchQuery = search
+                    },
+                    onSearch = {},
+                    active = false,
+                    onActiveChange = {},
+                    placeholder = { Text(stringResource(R.string.search_your_notes)) },
+                    leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) },
+                    trailingIcon = {
+                        if (searchQuery.isNotEmpty()) {
+                            Icon(
+                                modifier = Modifier.clickable { searchQuery = "" },
+                                imageVector = Icons.Default.Close,
+                                contentDescription = "Close"
+                            )
+                        } else {
+                            LayoutToggleButton(
+                                isGridView = isGridView,
+                                onToggleClick = { isGridView = !isGridView }
+                            )
                         }
-                    ) {}
-                }
+                    }
+                ) {}
             }
         },
-        content = {
+        content = { it ->
             Surface(
                 modifier = Modifier.padding(it)
             ) {

From c398e7dc126889e7259dd18a64d41b6d0c4d4f82 Mon Sep 17 00:00:00 2001
From: aritra <aritrarick2002@gmail.com>
Date: Tue, 27 Feb 2024 19:06:44 +0530
Subject: [PATCH 2/5] Bumped dependencies version

---
 .idea/deploymentTargetDropDown.xml | 15 ++++++++++++++-
 gradle/libs.versions.toml          | 14 +++++++-------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 0c0c3383..46583fc7 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <targetSelectedWithDropDown>
+            <Target>
+              <type value="QUICK_BOOT_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="VIRTUAL_DEVICE_PATH" />
+                  <value value="$USER_HOME$/.android/avd/Pixel_7_Pro_API_30_2.avd" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-02-27T07:37:24.292442Z" />
+        </State>
       </entry>
     </value>
   </component>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ff7e0f21..e7d115a3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 accompanistPermissions = "0.32.0"
 accompanistSystemuicontroller = "0.32.0"
-activity-compose = "1.8.0"
+activity-compose = "1.8.2"
 androidx-junit = "1.1.5"
 appUpdate = "2.1.0"
 biometric = "1.2.0-alpha05"
@@ -20,18 +20,18 @@ leakcanaryAndroid = "2.12"
 lifecycle-runtime-ktx = "2.6.2"
 lifecycleExtensions = "2.2.0"
 lifecycleVersion = "2.6.2"
-material3 = "1.2.0-beta01"
-materialIconsExtended = "1.5.4"
-navVersion = "2.7.4"
-roomVersion = "2.5.2"
+material3 = "1.2.0"
+materialIconsExtended = "1.6.2"
+navVersion = "2.7.7"
+roomVersion = "2.6.1"
 runtimeLivedata = "1.5.3"
-bom = "2023.10.00"
+bom = "2024.02.01"
 kotlinBom = "1.9.20"
 material3windowsize = "1.1.2"
 android-application = "8.1.2"
 kotlin-android = "1.9.20"
 dagger-hilt-android = "2.48.1"
-devtools-ksp = "1.9.20-1.0.14"
+devtools-ksp = "1.9.22-1.0.16"
 zoomable = "0.6.2"
 zoomableImageCoil = "0.6.2"
 ktlint = "11.6.1"

From 6100661b0d557743ed4fb41aff26bbb1258e58d9 Mon Sep 17 00:00:00 2001
From: aritra <aritrarick2002@gmail.com>
Date: Tue, 27 Feb 2024 19:21:14 +0530
Subject: [PATCH 3/5] Fixed the `lint` check

---
 .../com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt
index 34460bcb..088c22dc 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/homeScreen/NoteScreen.kt
@@ -71,7 +71,7 @@ import kotlinx.coroutines.launch
 @Composable
 fun NoteScreen(
     onFabClicked: () -> Unit,
-    navigateToUpdateNoteScreen: (noteId: Int) -> Unit
+    navigateToUpdateNoteScreen: (noteId: Int) -> Unit,
 ) {
     val viewModel = hiltViewModel<NoteScreenViewModel>()
 

From 62ce51092fbc82f39c5d11da470c8d7d86beee41 Mon Sep 17 00:00:00 2001
From: aritra <aritrarick2002@gmail.com>
Date: Tue, 27 Feb 2024 20:42:26 +0530
Subject: [PATCH 4/5] Optimized the `Navigation` and made some file changes

---
 .../notify/components/dialog/TextDialog.kt    |  4 +-
 .../aritra/notify/data/dao/TrashNoteDao.kt    |  2 +-
 .../com/aritra/notify/domain/models/Note.kt   |  5 --
 .../models}/TrashNoteWithNotes.kt             |  4 +-
 .../domain/repository/trash/TrashNoteRepo.kt  |  2 +-
 .../repository/trash/TrashNoteRepoImpl.kt     |  2 +-
 .../aritra/notify/navigation/BottomNavItem.kt |  4 +-
 .../com/aritra/notify/navigation/NotifyApp.kt | 85 ++++++++-----------
 .../com/aritra/notify/ui/theme/Animation.kt   | 15 ++++
 .../models => utils}/ReminderDateTimeModel.kt |  4 +-
 10 files changed, 60 insertions(+), 67 deletions(-)
 rename app/src/main/java/com/aritra/notify/{data/relations => domain/models}/TrashNoteWithNotes.kt (63%)
 create mode 100644 app/src/main/java/com/aritra/notify/ui/theme/Animation.kt
 rename app/src/main/java/com/aritra/notify/{domain/models => utils}/ReminderDateTimeModel.kt (87%)

diff --git a/app/src/main/java/com/aritra/notify/components/dialog/TextDialog.kt b/app/src/main/java/com/aritra/notify/components/dialog/TextDialog.kt
index 33998859..43be45a1 100644
--- a/app/src/main/java/com/aritra/notify/components/dialog/TextDialog.kt
+++ b/app/src/main/java/com/aritra/notify/components/dialog/TextDialog.kt
@@ -38,8 +38,8 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.aritra.notify.R
-import com.aritra.notify.domain.models.ReminderDateTimeModel
-import com.aritra.notify.domain.models.formatToLocalDateTime
+import com.aritra.notify.utils.ReminderDateTimeModel
+import com.aritra.notify.utils.formatToLocalDateTime
 import com.aritra.notify.utils.Const
 import com.aritra.notify.utils.checkDateIsNotOld
 import com.aritra.notify.utils.checkTimeIsNotOld
diff --git a/app/src/main/java/com/aritra/notify/data/dao/TrashNoteDao.kt b/app/src/main/java/com/aritra/notify/data/dao/TrashNoteDao.kt
index 641a8b31..6aea90cb 100644
--- a/app/src/main/java/com/aritra/notify/data/dao/TrashNoteDao.kt
+++ b/app/src/main/java/com/aritra/notify/data/dao/TrashNoteDao.kt
@@ -4,7 +4,7 @@ import androidx.room.Dao
 import androidx.room.Query
 import androidx.room.Transaction
 import androidx.room.Upsert
-import com.aritra.notify.data.relations.TrashNoteWithNotes
+import com.aritra.notify.domain.models.TrashNoteWithNotes
 import com.aritra.notify.domain.models.TrashNote
 
 @Dao
diff --git a/app/src/main/java/com/aritra/notify/domain/models/Note.kt b/app/src/main/java/com/aritra/notify/domain/models/Note.kt
index e8012826..b221ad3d 100644
--- a/app/src/main/java/com/aritra/notify/domain/models/Note.kt
+++ b/app/src/main/java/com/aritra/notify/domain/models/Note.kt
@@ -24,8 +24,3 @@ data class Note(
     var reminderDateTime: LocalDateTime? = null,
     var isReminded: Boolean = false,
 ) : Parcelable
-
-data class ReminderDateTimeInfo(
-    val dateTime: LocalDateTime,
-    val isReminded: Boolean,
-)
diff --git a/app/src/main/java/com/aritra/notify/data/relations/TrashNoteWithNotes.kt b/app/src/main/java/com/aritra/notify/domain/models/TrashNoteWithNotes.kt
similarity index 63%
rename from app/src/main/java/com/aritra/notify/data/relations/TrashNoteWithNotes.kt
rename to app/src/main/java/com/aritra/notify/domain/models/TrashNoteWithNotes.kt
index bb2eb2aa..330d96d9 100644
--- a/app/src/main/java/com/aritra/notify/data/relations/TrashNoteWithNotes.kt
+++ b/app/src/main/java/com/aritra/notify/domain/models/TrashNoteWithNotes.kt
@@ -1,9 +1,7 @@
-package com.aritra.notify.data.relations
+package com.aritra.notify.domain.models
 
 import androidx.room.Embedded
 import androidx.room.Relation
-import com.aritra.notify.domain.models.Note
-import com.aritra.notify.domain.models.TrashNote
 
 data class TrashNoteWithNotes(
     @Embedded val trashNote: TrashNote,
diff --git a/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepo.kt b/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepo.kt
index df5da8f8..f0b9292e 100644
--- a/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepo.kt
+++ b/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepo.kt
@@ -1,6 +1,6 @@
 package com.aritra.notify.domain.repository.trash
 
-import com.aritra.notify.data.relations.TrashNoteWithNotes
+import com.aritra.notify.domain.models.TrashNoteWithNotes
 import com.aritra.notify.domain.models.TrashNote
 import java.time.LocalDateTime
 
diff --git a/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepoImpl.kt b/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepoImpl.kt
index 3d49e7d0..db374dc7 100644
--- a/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepoImpl.kt
+++ b/app/src/main/java/com/aritra/notify/domain/repository/trash/TrashNoteRepoImpl.kt
@@ -1,7 +1,7 @@
 package com.aritra.notify.domain.repository.trash
 
 import com.aritra.notify.data.dao.TrashNoteDao
-import com.aritra.notify.data.relations.TrashNoteWithNotes
+import com.aritra.notify.domain.models.TrashNoteWithNotes
 import com.aritra.notify.domain.models.TrashNote
 import java.time.LocalDateTime
 import java.time.temporal.ChronoUnit
diff --git a/app/src/main/java/com/aritra/notify/navigation/BottomNavItem.kt b/app/src/main/java/com/aritra/notify/navigation/BottomNavItem.kt
index 4a234888..98f4d91c 100644
--- a/app/src/main/java/com/aritra/notify/navigation/BottomNavItem.kt
+++ b/app/src/main/java/com/aritra/notify/navigation/BottomNavItem.kt
@@ -1,9 +1,9 @@
 package com.aritra.notify.navigation
 
-import androidx.annotation.DrawableRes
+import androidx.compose.ui.graphics.vector.ImageVector
 
 data class BottomNavItem(
     val name: String,
     val route: String,
-    @DrawableRes val icon: Int,
+    val icon: ImageVector,
 )
diff --git a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
index b75ef47e..81361314 100644
--- a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
+++ b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
@@ -1,10 +1,6 @@
 package com.aritra.notify.navigation
 
 import android.widget.Toast
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.scaleIn
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
@@ -20,12 +16,14 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.vectorResource
 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.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType.Companion.IntType
 import androidx.navigation.compose.NavHost
@@ -40,10 +38,11 @@ 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
+import com.aritra.notify.ui.theme.FadeIn
+import com.aritra.notify.ui.theme.FadeOut
 
 @Composable
 fun NotifyApp(navController: NavHostController = rememberNavController()) {
-    val bottomNavItem = getBottomNavItems()
     val screensWithHiddenNavBar = listOf(
         "${NotifyScreens.AddEditNotes.name}/{noteId}",
         NotifyScreens.TrashNoteScreen.name
@@ -55,7 +54,7 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
     val effect by trashViewModel.effect.collectAsState()
     val context = LocalContext.current
 
-    LaunchedEffect(key1 = effect) {
+    LaunchedEffect(effect) {
         effect?.let {
             when (it) {
                 TrashNoteEffect.Close -> {
@@ -75,7 +74,6 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
         bottomBar = {
             BottomNavigationBar(
                 backStackEntry,
-                bottomNavItem,
                 screensWithHiddenNavBar,
                 navController
             )
@@ -85,28 +83,10 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
             navController = navController,
             startDestination = NotifyScreens.Notes.name,
             modifier = Modifier.padding(scaffoldPadding),
-            enterTransition = {
-                fadeIn(
-                    animationSpec = tween(220, delayMillis = 90)
-                ) + scaleIn(
-                    initialScale = 0.92f,
-                    animationSpec = tween(220, delayMillis = 90)
-                )
-            },
-            exitTransition = {
-                fadeOut(animationSpec = tween(90))
-            },
-            popEnterTransition = {
-                fadeIn(
-                    animationSpec = tween(220, delayMillis = 90)
-                ) + scaleIn(
-                    initialScale = 0.92f,
-                    animationSpec = tween(220, delayMillis = 90)
-                )
-            },
-            popExitTransition = {
-                fadeOut(animationSpec = tween(90))
-            }
+            enterTransition = { FadeIn },
+            exitTransition = { FadeOut },
+            popEnterTransition = { FadeIn },
+            popExitTransition = { FadeOut }
         ) {
             composable(
                 route = NotifyScreens.Notes.name
@@ -147,18 +127,33 @@ fun NotifyApp(navController: NavHostController = rememberNavController()) {
 @Composable
 fun BottomNavigationBar(
     backStackEntry: State<NavBackStackEntry?>,
-    bottomNavItem: List<BottomNavItem>,
     screensWithHiddenNavBar: List<String>,
     navController: NavHostController,
 ) {
     if (backStackEntry.value?.destination?.route !in screensWithHiddenNavBar) {
-        NavigationBar(containerColor = Color.Transparent, modifier = Modifier.height(75.dp)) {
+        NavigationBar(
+            containerColor = Color.Transparent,
+            modifier = Modifier.height(75.dp)
+        ) {
+            val bottomNavItem = listOf(
+                BottomNavItem(
+                    name = "Notes",
+                    route = NotifyScreens.Notes.name,
+                    icon = ImageVector.vectorResource(R.drawable.note_outline)
+                ),
+                BottomNavItem(
+                    name = "Settings",
+                    route = NotifyScreens.Settings.name,
+                    icon = ImageVector.vectorResource(R.drawable.settings_outline)
+                )
+            )
+
             bottomNavItem.forEach { item ->
                 NavigationBarItem(
                     alwaysShowLabel = true,
                     icon = {
                         Icon(
-                            painter = painterResource(id = item.icon),
+                            imageVector = item.icon,
                             contentDescription = item.name,
                             tint = if (backStackEntry.value?.destination?.route == item.route) {
                                 MaterialTheme.colorScheme.onSurface
@@ -176,7 +171,7 @@ fun BottomNavigationBar(
                                 MaterialTheme.colorScheme.secondary
                             },
                             fontWeight = if (backStackEntry.value?.destination?.route == item.route) {
-                                FontWeight.Bold
+                                FontWeight.SemiBold
                             } else {
                                 FontWeight.Normal
                             }
@@ -187,8 +182,13 @@ fun BottomNavigationBar(
                         val currentDestination = navController.currentBackStackEntry?.destination?.route
                         if (item.route != currentDestination) {
                             navController.navigate(item.route) {
-                                popUpTo(navController.graph.startDestinationId)
+                                navController.graph.findStartDestination().let { route ->
+                                    popUpTo(route.id) {
+                                        saveState = true
+                                    }
+                                }
                                 launchSingleTop = true
+                                restoreState = true
                             }
                         }
                     }
@@ -197,18 +197,3 @@ fun BottomNavigationBar(
         }
     }
 }
-
-fun getBottomNavItems(): List<BottomNavItem> {
-    return listOf(
-        BottomNavItem(
-            name = "Notes",
-            route = NotifyScreens.Notes.name,
-            icon = R.drawable.note_outline
-        ),
-        BottomNavItem(
-            name = "Settings",
-            route = NotifyScreens.Settings.name,
-            icon = R.drawable.settings_outline
-        )
-    )
-}
diff --git a/app/src/main/java/com/aritra/notify/ui/theme/Animation.kt b/app/src/main/java/com/aritra/notify/ui/theme/Animation.kt
new file mode 100644
index 00000000..4f518942
--- /dev/null
+++ b/app/src/main/java/com/aritra/notify/ui/theme/Animation.kt
@@ -0,0 +1,15 @@
+package com.aritra.notify.ui.theme
+
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.scaleIn
+
+val FadeIn = fadeIn(animationSpec = tween(220, delayMillis = 90)) + scaleIn(
+    initialScale = 0.92f,
+    animationSpec = tween(
+        220, delayMillis = 90
+    )
+)
+
+val FadeOut = fadeOut(animationSpec = tween(90))
diff --git a/app/src/main/java/com/aritra/notify/domain/models/ReminderDateTimeModel.kt b/app/src/main/java/com/aritra/notify/utils/ReminderDateTimeModel.kt
similarity index 87%
rename from app/src/main/java/com/aritra/notify/domain/models/ReminderDateTimeModel.kt
rename to app/src/main/java/com/aritra/notify/utils/ReminderDateTimeModel.kt
index b0c91a96..df39335b 100644
--- a/app/src/main/java/com/aritra/notify/domain/models/ReminderDateTimeModel.kt
+++ b/app/src/main/java/com/aritra/notify/utils/ReminderDateTimeModel.kt
@@ -1,8 +1,8 @@
-package com.aritra.notify.domain.models
+package com.aritra.notify.utils
 
 import java.time.LocalDateTime
 
-enum class ReminderDateTimeModel() {
+enum class ReminderDateTimeModel {
     AFTER_30_MINUTES,
     AFTER_1_HOUR,
     TOMORROW_MORNING_7,

From a808b743fcde89aafbf584d487cf1962534bb69c Mon Sep 17 00:00:00 2001
From: aritra <aritrarick2002@gmail.com>
Date: Wed, 28 Feb 2024 20:10:28 +0530
Subject: [PATCH 5/5] Modified the file structure

---
 app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt | 2 +-
 .../notify/ui/screens/notes/addEditScreen/AddEditScreen.kt  | 4 ++++
 .../addEditScreen/{ => components}/DescriptionTextField.kt  | 2 +-
 .../notes/addEditScreen/{ => components}/NoteChecklist.kt   | 2 +-
 .../notes/addEditScreen/{ => components}/NoteImages.kt      | 2 +-
 .../notes/addEditScreen/{ => components}/NoteStats.kt       | 2 +-
 .../screens/notes/addEditScreen/{ => route}/AddEditRoute.kt | 6 ++++--
 7 files changed, 13 insertions(+), 7 deletions(-)
 rename app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/{ => components}/DescriptionTextField.kt (98%)
 rename app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/{ => components}/NoteChecklist.kt (98%)
 rename app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/{ => components}/NoteImages.kt (98%)
 rename app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/{ => components}/NoteStats.kt (98%)
 rename app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/{ => route}/AddEditRoute.kt (92%)

diff --git a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
index 81361314..97024a83 100644
--- a/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
+++ b/app/src/main/java/com/aritra/notify/navigation/NotifyApp.kt
@@ -32,7 +32,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 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.addEditScreen.route.AddEditRoute
 import com.aritra.notify.ui.screens.notes.homeScreen.NoteScreen
 import com.aritra.notify.ui.screens.notes.trash.TrashNoteEffect
 import com.aritra.notify.ui.screens.notes.trash.TrashNoteScreen
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditScreen.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditScreen.kt
index b236868c..98722328 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditScreen.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditScreen.kt
@@ -53,6 +53,10 @@ import com.aritra.notify.components.dialog.TextDialog
 import com.aritra.notify.components.drawing.DrawingScreen
 import com.aritra.notify.domain.models.Note
 import com.aritra.notify.domain.models.Todo
+import com.aritra.notify.ui.screens.notes.addEditScreen.components.DescriptionTextField
+import com.aritra.notify.ui.screens.notes.addEditScreen.components.NoteChecklist
+import com.aritra.notify.ui.screens.notes.addEditScreen.components.NoteImages
+import com.aritra.notify.ui.screens.notes.addEditScreen.components.NoteStats
 import com.aritra.notify.ui.theme.NotifyTheme
 import com.aritra.notify.utils.formatReminderDateTime
 import java.time.LocalDateTime
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/DescriptionTextField.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/DescriptionTextField.kt
similarity index 98%
rename from app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/DescriptionTextField.kt
rename to app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/DescriptionTextField.kt
index b4a05600..f8808af4 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/DescriptionTextField.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/DescriptionTextField.kt
@@ -1,4 +1,4 @@
-package com.aritra.notify.ui.screens.notes.addEditScreen
+package com.aritra.notify.ui.screens.notes.addEditScreen.components
 
 import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteChecklist.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteChecklist.kt
similarity index 98%
rename from app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteChecklist.kt
rename to app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteChecklist.kt
index e656f554..a628cb90 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteChecklist.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteChecklist.kt
@@ -1,4 +1,4 @@
-package com.aritra.notify.ui.screens.notes.addEditScreen
+package com.aritra.notify.ui.screens.notes.addEditScreen.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteImages.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteImages.kt
similarity index 98%
rename from app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteImages.kt
rename to app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteImages.kt
index c3de68d9..f513c4c9 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteImages.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteImages.kt
@@ -1,4 +1,4 @@
-package com.aritra.notify.ui.screens.notes.addEditScreen
+package com.aritra.notify.ui.screens.notes.addEditScreen.components
 
 import android.net.Uri
 import androidx.compose.foundation.horizontalScroll
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteStats.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteStats.kt
similarity index 98%
rename from app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteStats.kt
rename to app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteStats.kt
index 5c8cf1d3..90de3c8b 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/NoteStats.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/components/NoteStats.kt
@@ -1,4 +1,4 @@
-package com.aritra.notify.ui.screens.notes.addEditScreen
+package com.aritra.notify.ui.screens.notes.addEditScreen.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
diff --git a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditRoute.kt b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/route/AddEditRoute.kt
similarity index 92%
rename from app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditRoute.kt
rename to app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/route/AddEditRoute.kt
index b86570ae..b2800135 100644
--- a/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/AddEditRoute.kt
+++ b/app/src/main/java/com/aritra/notify/ui/screens/notes/addEditScreen/route/AddEditRoute.kt
@@ -1,4 +1,4 @@
-package com.aritra.notify.ui.screens.notes.addEditScreen
+package com.aritra.notify.ui.screens.notes.addEditScreen.route
 
 import android.net.Uri
 import android.widget.Toast
@@ -13,6 +13,8 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.NavBackStackEntry
 import androidx.navigation.NavController
 import com.aritra.notify.domain.models.Todo
+import com.aritra.notify.ui.screens.notes.addEditScreen.AddEditScreen
+import com.aritra.notify.ui.screens.notes.addEditScreen.AddEditViewModel
 import com.aritra.notify.ui.screens.notes.homeScreen.NoteScreenViewModel
 import java.time.LocalDateTime
 
@@ -79,7 +81,7 @@ fun AddEditRoute(
         }
     }
 
-    var rememberUpdateDateTime = remember {
+    val rememberUpdateDateTime = remember {
         { localDateTime: LocalDateTime? ->
             viewModel.updateReminderDateTime(localDateTime)
         }