From 737de0785c8fcdfba324971753d29911ffa22acd Mon Sep 17 00:00:00 2001 From: sathwikcs <85106054+sathwikcs@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:17:28 +0530 Subject: [PATCH] Settings --- .../screens/settings/{ => ui}/Settings.kt | 15 +++++++++------ .../settingsComponents/RadioDialogue.kt | 2 +- .../components/settingsComponents/RadioRow.kt | 6 +++--- 3 files changed, 13 insertions(+), 10 deletions(-) rename app/src/main/java/in/sminnovations/attendanceapp/screens/settings/{ => ui}/Settings.kt (74%) rename app/src/main/java/in/sminnovations/attendanceapp/screens/settings/{ => ui}/components/settingsComponents/RadioDialogue.kt (98%) rename app/src/main/java/in/sminnovations/attendanceapp/screens/settings/{ => ui}/components/settingsComponents/RadioRow.kt (75%) diff --git a/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/Settings.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/Settings.kt similarity index 74% rename from app/src/main/java/in/sminnovations/attendanceapp/screens/settings/Settings.kt rename to app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/Settings.kt index a94fc7d..bb92ec3 100644 --- a/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/Settings.kt +++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/Settings.kt @@ -1,4 +1,4 @@ -package `in`.sminnovations.attendanceapp.screens.settings +package `in`.sminnovations.attendanceapp.screens.settings.ui import androidx.compose.foundation.layout.Column @@ -15,13 +15,16 @@ import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp +import androidx.navigation.NavController import `in`.sminnovations.attendanceapp.screens.settings.data.SettingsData -import `in`.sminnovations.attendanceapp.screens.settings.components.TopComponents -import `in`.sminnovations.attendanceapp.screens.settings.components.subSetting.AboutSettings -import `in`.sminnovations.attendanceapp.screens.settings.components.subSetting.Appearance +import `in`.sminnovations.attendanceapp.screens.settings.ui.components.TopComponents +import `in`.sminnovations.attendanceapp.screens.settings.ui.components.subSetting.AboutSettings +import `in`.sminnovations.attendanceapp.screens.settings.ui.components.subSetting.Appearance @Composable -fun SettingsScreen() { +fun SettingsScreen( + navController: NavController +) { val context = LocalContext.current val dataStore = SettingsData(context) val scrollState = rememberScrollState() @@ -32,7 +35,7 @@ fun SettingsScreen() { .fillMaxSize(), ) { Spacer(modifier = Modifier.height(20.dp)) - TopComponents() + TopComponents(navController = navController) Spacer(modifier = Modifier.height(20.dp)) OutlinedCard( modifier = Modifier diff --git a/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/components/settingsComponents/RadioDialogue.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/components/settingsComponents/RadioDialogue.kt similarity index 98% rename from app/src/main/java/in/sminnovations/attendanceapp/screens/settings/components/settingsComponents/RadioDialogue.kt rename to app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/components/settingsComponents/RadioDialogue.kt index 4601af0..f8bd2e4 100644 --- a/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/components/settingsComponents/RadioDialogue.kt +++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/components/settingsComponents/RadioDialogue.kt @@ -1,4 +1,4 @@ -package `in`.sminnovations.attendanceapp.screens.settings.components.settingsComponents +package `in`.sminnovations.attendanceapp.screens.settings.ui.components.settingsComponents import androidx.activity.compose.BackHandler import androidx.compose.foundation.background diff --git a/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/components/settingsComponents/RadioRow.kt b/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/components/settingsComponents/RadioRow.kt similarity index 75% rename from app/src/main/java/in/sminnovations/attendanceapp/screens/settings/components/settingsComponents/RadioRow.kt rename to app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/components/settingsComponents/RadioRow.kt index 7923a23..1e786c2 100644 --- a/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/components/settingsComponents/RadioRow.kt +++ b/app/src/main/java/in/sminnovations/attendanceapp/screens/settings/ui/components/settingsComponents/RadioRow.kt @@ -1,4 +1,4 @@ -package `in`.sminnovations.attendanceapp.screens.settings.components.settingsComponents +package `in`.sminnovations.attendanceapp.screens.settings.ui.components.settingsComponents import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -6,8 +6,8 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import androidx.compose.ui.graphics.vector.ImageVector -import `in`.sminnovations.attendanceapp.screens.settings.components.settingsComponents.ClickableCard -import `in`.sminnovations.attendanceapp.screens.settings.components.settingsComponents.RadioDialogue +import `in`.sminnovations.attendanceapp.screens.settings.ui.components.settingsComponents.ClickableCard +import `in`.sminnovations.attendanceapp.screens.settings.ui.components.settingsComponents.RadioDialogue @Composable