From adf1a80ae8d516e305fd12bf635662d6028d61b4 Mon Sep 17 00:00:00 2001
From: sathwikcs <85106054+sathwikcs@users.noreply.github.com>
Date: Mon, 7 Oct 2024 18:07:41 +0530
Subject: [PATCH] NavigationDrawer rearrange

---
 .../attendanceapp/MainActivity.kt             |  7 +---
 .../ui/components/BottomComponents.kt         |  8 -----
 .../viewModel/navigationViewModel.kt          |  4 ---
 .../attendanceapp/screens/home/ui/home.kt     |  7 ++++
 .../ui/components/BottomComponents.kt         | 36 +++++++++++++++++++
 .../ui/components/TopComponents.kt            |  4 +--
 .../navigationDrawer}/ui/navigation.kt        | 17 ++++++---
 .../viewModel/navigationViewModel.kt          |  4 +++
 8 files changed, 62 insertions(+), 25 deletions(-)
 delete mode 100644 app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/BottomComponents.kt
 delete mode 100644 app/src/main/java/in/sminnovations/attendanceapp/navigation/viewModel/navigationViewModel.kt
 create mode 100644 app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/BottomComponents.kt
 rename app/src/main/java/in/sminnovations/attendanceapp/{navigation => screens/navigationDrawer}/ui/components/TopComponents.kt (94%)
 rename app/src/main/java/in/sminnovations/attendanceapp/{navigation => screens/navigationDrawer}/ui/navigation.kt (72%)
 create mode 100644 app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/viewModel/navigationViewModel.kt

diff --git a/app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt b/app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt
index 66738e4..184a991 100644
--- a/app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt
+++ b/app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt
@@ -1,15 +1,10 @@
 package `in`.sminnovations.attendanceapp
 
 import android.os.Bundle
-import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Button
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.dp
-import `in`.sminnovations.attendanceapp.navigation.ui.NavigationDrawer
+import `in`.sminnovations.attendanceapp.screens.navigationDrawer.ui.NavigationDrawer
 import `in`.sminnovations.attendanceapp.ui.theme.SMIAttendanceTheme
 
 class MainActivity : ComponentActivity() {
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/BottomComponents.kt b/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/BottomComponents.kt
deleted file mode 100644
index c6b37a7..0000000
--- a/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/BottomComponents.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package `in`.sminnovations.attendanceapp.navigation.ui.components
-
-import androidx.compose.runtime.Composable
-
-@Composable
-fun BottomComponents(){
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/navigation/viewModel/navigationViewModel.kt b/app/src/main/java/in/sminnovations/attendanceapp/navigation/viewModel/navigationViewModel.kt
deleted file mode 100644
index df3b161..0000000
--- a/app/src/main/java/in/sminnovations/attendanceapp/navigation/viewModel/navigationViewModel.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package `in`.sminnovations.attendanceapp.navigation.viewModel
-
-class navigationViewModel {
-}
\ No newline at end of file
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/screens/home/ui/home.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/home/ui/home.kt
index e258262..075c547 100644
--- a/app/src/main/java/in/sminnovations/attendanceapp/screens/home/ui/home.kt
+++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/home/ui/home.kt
@@ -1,2 +1,9 @@
 package `in`.sminnovations.attendanceapp.screens.home.ui
 
+import androidx.compose.material3.Button
+import androidx.compose.runtime.Composable
+
+@Composable
+fun Home(){
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/BottomComponents.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/BottomComponents.kt
new file mode 100644
index 0000000..4fb3bb0
--- /dev/null
+++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/BottomComponents.kt
@@ -0,0 +1,36 @@
+package `in`.sminnovations.attendanceapp.screens.navigationDrawer.ui.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun BottomComponents(appVersion : String){
+    Column(
+        modifier = Modifier.fillMaxWidth().padding(8.dp),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+        Text(
+            text = "App Version",
+            style = MaterialTheme.typography.titleMedium,
+            fontWeight = FontWeight.Bold,
+            fontSize = 20.sp,
+            color = MaterialTheme.colorScheme.onSurface
+        )
+        Text(
+            text = appVersion,
+            style = MaterialTheme.typography.titleMedium,
+            fontWeight = FontWeight.Bold,
+            fontSize = 20.sp,
+            color = MaterialTheme.colorScheme.onSurface
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/TopComponents.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/TopComponents.kt
similarity index 94%
rename from app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/TopComponents.kt
rename to app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/TopComponents.kt
index 5ba8f79..edccda3 100644
--- a/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/components/TopComponents.kt
+++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/components/TopComponents.kt
@@ -1,4 +1,4 @@
-package `in`.sminnovations.attendanceapp.navigation.ui.components
+package `in`.sminnovations.attendanceapp.screens.navigationDrawer.ui.components
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
@@ -25,7 +25,7 @@ import `in`.sminnovations.attendanceapp.R
 @Composable
 fun TopComponents() {
     Column(
-        modifier = Modifier.fillMaxWidth().padding(16.dp),
+        modifier = Modifier.fillMaxWidth().padding(8.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
         // Image with rounded corners
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/navigation.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/navigation.kt
similarity index 72%
rename from app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/navigation.kt
rename to app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/navigation.kt
index f5aee2b..3a09844 100644
--- a/app/src/main/java/in/sminnovations/attendanceapp/navigation/ui/navigation.kt
+++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/ui/navigation.kt
@@ -1,6 +1,7 @@
-package `in`.sminnovations.attendanceapp.navigation.ui
+package `in`.sminnovations.attendanceapp.screens.navigationDrawer.ui
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
@@ -15,8 +16,9 @@ import androidx.compose.material3.rememberDrawerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import `in`.sminnovations.attendanceapp.screens.navigationDrawer.ui.components.BottomComponents
 import kotlinx.coroutines.launch
-import `in`.sminnovations.attendanceapp.navigation.ui.components.TopComponents
+import `in`.sminnovations.attendanceapp.screens.navigationDrawer.ui.components.TopComponents
 
 @Composable
 fun NavigationDrawer(){
@@ -25,9 +27,14 @@ fun NavigationDrawer(){
     ModalNavigationDrawer(
         drawerState = drawerState,
         drawerContent = {
-            ModalDrawerSheet { /* Drawer content */
-             TopComponents()
+            ModalDrawerSheet {
+                   Column (
+                       Modifier.fillMaxHeight(),
 
+                   ){
+                       TopComponents()
+                       BottomComponents(appVersion = "")
+                   }
             }
         },
     ) {
@@ -47,7 +54,7 @@ fun NavigationDrawer(){
             }
         ) { contentPadding ->
             Column (modifier = Modifier.padding(contentPadding)){
-
+            `in`.sminnovations.attendanceapp.screens.home.ui.Home()
             }
         }
     }
diff --git a/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/viewModel/navigationViewModel.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/viewModel/navigationViewModel.kt
new file mode 100644
index 0000000..2961c42
--- /dev/null
+++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/navigationDrawer/viewModel/navigationViewModel.kt
@@ -0,0 +1,4 @@
+package `in`.sminnovations.attendanceapp.screens.navigationDrawer.viewModel
+
+class navigationViewModel {
+}
\ No newline at end of file