From 7af5be51d3e7307f1a6628a330b87168e0cb7173 Mon Sep 17 00:00:00 2001 From: f1rq Date: Tue, 29 Apr 2025 17:18:28 +0200 Subject: [PATCH] Updates --- .idea/misc.xml | 3 +- .kotlin/errors/errors-1745936908387.log | 47 +++++ .../java/com/f1rq/lifemap/MainActivity.kt | 87 +------- .../com/f1rq/lifemap/components/NavBar.kt | 191 +++++++----------- .../lifemap/screens/NotificationsScreen.kt | 30 +-- .../f1rq/lifemap/screens/SettingsScreen.kt | 124 ++---------- .../SettingsNotificationsScreen.kt | 22 -- 7 files changed, 155 insertions(+), 349 deletions(-) create mode 100644 .kotlin/errors/errors-1745936908387.log diff --git a/.idea/misc.xml b/.idea/misc.xml index b2c751a..a4f09e2 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,7 @@ + - + diff --git a/.kotlin/errors/errors-1745936908387.log b/.kotlin/errors/errors-1745936908387.log new file mode 100644 index 0000000..21b8052 --- /dev/null +++ b/.kotlin/errors/errors-1745936908387.log @@ -0,0 +1,47 @@ +kotlin version: 2.0.21 +error message: Incremental compilation failed: Expected absolute path but found relative path: E:\f1rq\Programowanie\LifeMap\app\src\main\java\com\f1rq\lifemap\components\NavBar.kt +java.lang.IllegalStateException: Expected absolute path but found relative path: E:\f1rq\Programowanie\LifeMap\app\src\main\java\com\f1rq\lifemap\components\NavBar.kt + at org.jetbrains.kotlin.incremental.storage.RelocatableFileToPathConverter.toPath(RelocatableFileToPathConverter.kt:20) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:50) + at org.jetbrains.kotlin.incremental.storage.FileDescriptor.getHashCode(FileToPathConverter.kt:30) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.hashKey(LinkedCustomHashMap.java:109) + at org.jetbrains.kotlin.com.intellij.util.containers.LinkedCustomHashMap.remove(LinkedCustomHashMap.java:153) + at org.jetbrains.kotlin.com.intellij.util.containers.SLRUMap.remove(SLRUMap.java:89) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.flushAppendCache(PersistentMapImpl.java:999) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.doGet(PersistentMapImpl.java:640) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentMapImpl.get(PersistentMapImpl.java:613) + at org.jetbrains.kotlin.com.intellij.util.io.PersistentHashMap.get(PersistentHashMap.java:196) + at org.jetbrains.kotlin.incremental.storage.LazyStorage.get(LazyStorage.kt:76) + at org.jetbrains.kotlin.incremental.storage.InMemoryStorage.get(InMemoryStorage.kt:68) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.get(InMemoryStorage.kt:155) + at org.jetbrains.kotlin.incremental.storage.AppendableInMemoryStorage.get(InMemoryStorage.kt:147) + at org.jetbrains.kotlin.incremental.storage.AppendableSetBasicMap.get(BasicMap.kt:137) + at org.jetbrains.kotlin.incremental.storage.AbstractSourceToOutputMap.getFqNames(SourceToOutputMaps.kt:50) + at org.jetbrains.kotlin.incremental.AbstractIncrementalCache.classesFqNamesBySources(AbstractIncrementalCache.kt:95) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.getRemovedClassesChanges(IncrementalCompilerRunner.kt:622) + at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.calculateSourcesToCompileImpl(IncrementalJvmCompilerRunner.kt:274) + at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.calculateSourcesToCompile(IncrementalJvmCompilerRunner.kt:143) + at org.jetbrains.kotlin.incremental.IncrementalJvmCompilerRunner.calculateSourcesToCompile(IncrementalJvmCompilerRunner.kt:73) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.tryCompileIncrementally$lambda$9$compile(IncrementalCompilerRunner.kt:225) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.tryCompileIncrementally(IncrementalCompilerRunner.kt:267) + at org.jetbrains.kotlin.incremental.IncrementalCompilerRunner.compile(IncrementalCompilerRunner.kt:120) + at org.jetbrains.kotlin.daemon.CompileServiceImplBase.execIncrementalCompiler(CompileServiceImpl.kt:675) + at org.jetbrains.kotlin.daemon.CompileServiceImplBase.access$execIncrementalCompiler(CompileServiceImpl.kt:92) + at org.jetbrains.kotlin.daemon.CompileServiceImpl.compile(CompileServiceImpl.kt:1660) + at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(Unknown Source) + at java.base/java.lang.reflect.Method.invoke(Unknown Source) + at java.rmi/sun.rmi.server.UnicastServerRef.dispatch(Unknown Source) + at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source) + at java.rmi/sun.rmi.transport.Transport$1.run(Unknown Source) + at java.base/java.security.AccessController.doPrivileged(Unknown Source) + at java.rmi/sun.rmi.transport.Transport.serviceCall(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport.handleMessages(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run0(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.lambda$run$0(Unknown Source) + at java.base/java.security.AccessController.doPrivileged(Unknown Source) + at java.rmi/sun.rmi.transport.tcp.TCPTransport$ConnectionHandler.run(Unknown Source) + at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source) + at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source) + at java.base/java.lang.Thread.run(Unknown Source) + + diff --git a/app/src/main/java/com/f1rq/lifemap/MainActivity.kt b/app/src/main/java/com/f1rq/lifemap/MainActivity.kt index be43a16..177b578 100644 --- a/app/src/main/java/com/f1rq/lifemap/MainActivity.kt +++ b/app/src/main/java/com/f1rq/lifemap/MainActivity.kt @@ -1,87 +1,3 @@ -<<<<<<< HEAD -package com.f1rq.lifemap - -import android.os.Bundle -import androidx.activity.ComponentActivity -import androidx.activity.compose.setContent -import androidx.activity.enableEdgeToEdge -import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Scaffold -import androidx.compose.ui.Modifier -import androidx.core.view.WindowCompat -import androidx.navigation.compose.NavHost -import androidx.navigation.compose.composable -import androidx.navigation.compose.currentBackStackEntryAsState -import androidx.navigation.compose.rememberNavController -import androidx.compose.runtime.SideEffect -import androidx.compose.ui.platform.LocalView -import com.f1rq.lifemap.screens.ListView -import com.f1rq.lifemap.screens.MapView -import com.f1rq.lifemap.screens.SettingsScreen -import com.f1rq.lifemap.screens.NotificationsScreen -import com.f1rq.lifemap.ui.theme.LifeMapTheme -import com.f1rq.lifemap.ui.theme.ActiveNavColor -import com.f1rq.lifemap.ui.theme.InactiveNavColor -import com.f1rq.lifemap.components.TopBar -import com.f1rq.lifemap.components.NavBar -import com.f1rq.lifemap.screens.settingsScreens.SettingsNotificationsScreen - -class MainActivity : ComponentActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - enableEdgeToEdge() - WindowCompat.setDecorFitsSystemWindows(window, false) - - setContent { - LifeMapTheme { - val navController = rememberNavController() - - val view = LocalView.current - val darkTheme = !isSystemInDarkTheme() - SideEffect { - WindowCompat.setDecorFitsSystemWindows(window, false) - val insetsController = WindowCompat.getInsetsController(window, view) - insetsController.isAppearanceLightStatusBars = true - insetsController.isAppearanceLightNavigationBars = true - } - - Scaffold( - topBar = { - TopBar( - onSettingsButtonClick = { navController.navigate("settings")}, - onNotificationsButtonClick = { navController.navigate("notifications")} - ) - }, - bottomBar = { - val navBackStackEntry = navController.currentBackStackEntryAsState() - val currentRoute = navBackStackEntry.value?.destination?.route - - NavBar( - onMapViewClicked = { navController.navigate("mapview") }, - onListViewClicked = { navController.navigate("listview") }, - mapViewBackgroundColor = if (currentRoute == "mapview") ActiveNavColor else InactiveNavColor, - listViewBackgroundColor = if (currentRoute == "listview") ActiveNavColor else InactiveNavColor - ) - } - ) { innerPadding -> - NavHost( - navController = navController, - startDestination = "mapview", - modifier = Modifier.padding(innerPadding) - ) { - composable("mapview") { MapView(Modifier) } - composable("listview") { ListView(Modifier) } - composable("settings") { SettingsScreen(navController = navController, Modifier)} - composable("notifications") { NotificationsScreen(Modifier)} - composable("settings_notifications") { SettingsNotificationsScreen(Modifier) } - } - } - } - } - } -} -======= package com.f1rq.lifemap import android.os.Bundle @@ -156,7 +72,7 @@ class MainActivity : ComponentActivity() { composable("mapview") { MapView(Modifier) } composable("listview") { ListView(Modifier) } composable("settings") { SettingsScreen(navController = navController, Modifier)} - composable("notifications") { NotificationsScreen(Modifier)} + composable("notifications") { NotificationsScreen(navController = navController, Modifier)} composable("settings_notifications") { SettingsNotificationsScreen(navController = navController, Modifier) } } } @@ -164,4 +80,3 @@ class MainActivity : ComponentActivity() { } } } ->>>>>>> 774f07c0804f103a0523e1f7da3f969046a53aec diff --git a/app/src/main/java/com/f1rq/lifemap/components/NavBar.kt b/app/src/main/java/com/f1rq/lifemap/components/NavBar.kt index bc0196c..270f7eb 100644 --- a/app/src/main/java/com/f1rq/lifemap/components/NavBar.kt +++ b/app/src/main/java/com/f1rq/lifemap/components/NavBar.kt @@ -1,4 +1,3 @@ -<<<<<<< HEAD package com.f1rq.lifemap.components import androidx.compose.foundation.layout.* @@ -28,7 +27,6 @@ import com.f1rq.lifemap.ui.theme.ActiveNavColor import com.f1rq.lifemap.ui.theme.PrimaryColor import com.f1rq.lifemap.R.drawable.navbar_listview_button import com.f1rq.lifemap.R.drawable.navbar_mapview_button -import com.google.relay.compose.BoxScopeInstanceImpl.align @Composable fun NavBar( @@ -107,116 +105,79 @@ fun NavBar( } -@Preview -@Composable -fun NavBarPreview() { - NavBar() -======= -package com.f1rq.lifemap.components - -import androidx.compose.foundation.layout.* -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.unit.dp -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview -import com.f1rq.lifemap.ui.theme.MainBG -import com.f1rq.lifemap.ui.theme.InactiveNavColor -import com.f1rq.lifemap.ui.theme.ActiveNavColor -import com.f1rq.lifemap.ui.theme.PrimaryColor -import com.f1rq.lifemap.R.drawable.navbar_listview_button -import com.f1rq.lifemap.R.drawable.navbar_mapview_button - -@Composable -fun NavBar( - modifier: Modifier = Modifier, - onMapViewClicked: () -> Unit = {}, - onListViewClicked: () -> Unit = {}, - mapViewBackgroundColor: Color = ActiveNavColor, - listViewBackgroundColor: Color = InactiveNavColor, -) { - Box( - modifier = modifier - .fillMaxWidth() - ) { - - Card( - modifier = Modifier.fillMaxWidth(), - colors = CardDefaults.cardColors(containerColor = MainBG), - elevation = CardDefaults.cardElevation(defaultElevation = 6.dp), - ) { - Row( - modifier = Modifier - .padding( - top = 12.dp, - bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + 6.dp, - ), - verticalAlignment = Alignment.CenterVertically - ) { - Box( - modifier = Modifier - .weight(1f), - contentAlignment = Alignment.Center - ) { - IconButton( - onClick = onMapViewClicked, - modifier = Modifier - .size(48.dp) - .background( - color = mapViewBackgroundColor, - shape = RoundedCornerShape(16.dp) - ) - ) { - Icon( - painter = painterResource(id = navbar_mapview_button), - contentDescription = "Map View", - modifier = Modifier.requiredSize(24.dp), - tint = PrimaryColor - ) - } - } - - Box( - modifier = Modifier - .weight(1f), - contentAlignment = Alignment.Center - ) { - IconButton( - onClick = onListViewClicked, - modifier = Modifier - .size(48.dp) - .background( - color = listViewBackgroundColor, - shape = RoundedCornerShape(16.dp) - ) - ) { - Icon( - painter = painterResource(id = navbar_listview_button), - contentDescription = "List View", - modifier = Modifier.requiredSize(24.dp), - tint = PrimaryColor - ) - } - } - } - } - } -} - - -@Preview -@Composable -fun NavBarPreview() { - NavBar() ->>>>>>> 774f07c0804f103a0523e1f7da3f969046a53aec -} \ No newline at end of file +//@Composable +//fun NavBar( +// modifier: Modifier = Modifier, +// onMapViewClicked: () -> Unit = {}, +// onListViewClicked: () -> Unit = {}, +// mapViewBackgroundColor: Color = ActiveNavColor, +// listViewBackgroundColor: Color = InactiveNavColor, +//) { +// Box( +// modifier = modifier +// .fillMaxWidth() +// ) { +// +// Card( +// modifier = Modifier.fillMaxWidth(), +// colors = CardDefaults.cardColors(containerColor = MainBG), +// elevation = CardDefaults.cardElevation(defaultElevation = 6.dp), +// ) { +// Row( +// modifier = Modifier +// .padding( +// top = 12.dp, +// bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding() + 6.dp, +// ), +// verticalAlignment = Alignment.CenterVertically +// ) { +// Box( +// modifier = Modifier +// .weight(1f), +// contentAlignment = Alignment.Center +// ) { +// IconButton( +// onClick = onMapViewClicked, +// modifier = Modifier +// .size(48.dp) +// .background( +// color = mapViewBackgroundColor, +// shape = RoundedCornerShape(16.dp) +// ) +// ) { +// Icon( +// painter = painterResource(id = navbar_mapview_button), +// contentDescription = "Map View", +// modifier = Modifier.requiredSize(24.dp), +// tint = PrimaryColor +// ) +// } +// } +// +// Box( +// modifier = Modifier +// .weight(1f), +// contentAlignment = Alignment.Center +// ) { +// IconButton( +// onClick = onListViewClicked, +// modifier = Modifier +// .size(48.dp) +// .background( +// color = listViewBackgroundColor, +// shape = RoundedCornerShape(16.dp) +// ) +// ) { +// Icon( +// painter = painterResource(id = navbar_listview_button), +// contentDescription = "List View", +// modifier = Modifier.requiredSize(24.dp), +// tint = PrimaryColor +// ) +// } +// } +// } +// } +// } +//} +// \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/screens/NotificationsScreen.kt b/app/src/main/java/com/f1rq/lifemap/screens/NotificationsScreen.kt index 0160df9..43215cf 100644 --- a/app/src/main/java/com/f1rq/lifemap/screens/NotificationsScreen.kt +++ b/app/src/main/java/com/f1rq/lifemap/screens/NotificationsScreen.kt @@ -1,39 +1,23 @@ package com.f1rq.lifemap.screens import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize 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.unit.dp -import com.f1rq.lifemap.ui.theme.MainTextColor +import androidx.navigation.NavController +import com.f1rq.lifemap.components.ScreenTitle @Composable -fun NotificationsScreen(modifier: Modifier = Modifier) { - Box( +fun NotificationsScreen(navController: NavController, modifier: Modifier = Modifier) { + Column( modifier = Modifier .fillMaxSize() + .padding(horizontal = 16.dp, vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { - Column( - verticalArrangement = Arrangement.spacedBy(4.dp), - ) { - Text( - text = "Settings", - style = MaterialTheme.typography.titleMedium, - fontSize = MaterialTheme.typography.titleLarge.fontSize, - fontFamily = MaterialTheme.typography.titleLarge.fontFamily, - color = MainTextColor, - modifier = Modifier - .padding( - top = 24.dp, - start = 24.dp - ), - ) - } + ScreenTitle("Notifications") } } \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/screens/SettingsScreen.kt b/app/src/main/java/com/f1rq/lifemap/screens/SettingsScreen.kt index 5226a2a..ccbe2d8 100644 --- a/app/src/main/java/com/f1rq/lifemap/screens/SettingsScreen.kt +++ b/app/src/main/java/com/f1rq/lifemap/screens/SettingsScreen.kt @@ -1,126 +1,46 @@ -<<<<<<< HEAD package com.f1rq.lifemap.screens import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.automirrored.outlined.List -import androidx.compose.material.icons.filled.MailOutline -import androidx.compose.material.icons.filled.Notifications import androidx.compose.material.icons.outlined.Email import androidx.compose.material.icons.outlined.Notifications -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.navigation.NavController import com.f1rq.lifemap.components.SettingsLabel -import com.f1rq.lifemap.ui.theme.MainTextColor -import com.f1rq.lifemap.R.drawable.contact_icon -import com.f1rq.lifemap.R.drawable.feedback_icon +import com.f1rq.lifemap.components.ScreenTitle @Composable fun SettingsScreen(navController: NavController, modifier: Modifier = Modifier) { - Box( + Column( modifier = Modifier .fillMaxSize() + .padding(horizontal = 16.dp, vertical = 16.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), ) { - Column ( - verticalArrangement = Arrangement.spacedBy(4.dp), - ) { - Text( - text = "Settings", - style = MaterialTheme.typography.titleMedium, - fontSize = MaterialTheme.typography.titleLarge.fontSize, - fontFamily = MaterialTheme.typography.titleLarge.fontFamily, - color = MainTextColor, - modifier = Modifier - .padding( - top = 24.dp, - start = 24.dp - ), - ) - SettingsLabel( - text = "Notifications", - iconResource = Icons.Outlined.Notifications, - desc = "Notifications", - modifier = Modifier - .padding( - horizontal = 16.dp - ), - onClick = { navController.navigate("settings_notifications") } - ) + ScreenTitle("Settings") - SettingsLabel( - text = "Contact", - iconResource = Icons.Outlined.Email, - desc = "Contact us", - modifier = Modifier - .padding( - horizontal = 16.dp - ) - ) + SettingsLabel( + text = "Notifications", + iconResource = Icons.Outlined.Notifications, + desc = "Notifications", + onClick = { navController.navigate("settings_notifications") } + ) - SettingsLabel( - text = "Report a bug", - iconResource = Icons.Outlined.Email, - desc = "Report a bug", - modifier = Modifier - .padding( - horizontal = 16.dp - ) - ) - } + SettingsLabel( + text = "Contact", + iconResource = Icons.Outlined.Email, + desc = "Contact us" + ) + + SettingsLabel( + text = "Report a bug", + iconResource = Icons.Outlined.Email, + desc = "Report a bug" + ) } -======= -package com.f1rq.lifemap.screens - -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.padding -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.outlined.Email -import androidx.compose.material.icons.outlined.Notifications -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.unit.dp -import androidx.navigation.NavController -import com.f1rq.lifemap.components.SettingsLabel -import com.f1rq.lifemap.components.ScreenTitle - -@Composable -fun SettingsScreen(navController: NavController, modifier: Modifier = Modifier) { - Column( - modifier = Modifier - .fillMaxSize() - .padding(horizontal = 16.dp, vertical = 16.dp), - verticalArrangement = Arrangement.spacedBy(16.dp), - ) { - ScreenTitle("Settings") - - SettingsLabel( - text = "Notifications", - iconResource = Icons.Outlined.Notifications, - desc = "Notifications", - onClick = { navController.navigate("settings_notifications") } - ) - - SettingsLabel( - text = "Contact", - iconResource = Icons.Outlined.Email, - desc = "Contact us" - ) - - SettingsLabel( - text = "Report a bug", - iconResource = Icons.Outlined.Email, - desc = "Report a bug" - ) - } ->>>>>>> 774f07c0804f103a0523e1f7da3f969046a53aec } \ No newline at end of file diff --git a/app/src/main/java/com/f1rq/lifemap/screens/settingsScreens/SettingsNotificationsScreen.kt b/app/src/main/java/com/f1rq/lifemap/screens/settingsScreens/SettingsNotificationsScreen.kt index 23a658d..7719360 100644 --- a/app/src/main/java/com/f1rq/lifemap/screens/settingsScreens/SettingsNotificationsScreen.kt +++ b/app/src/main/java/com/f1rq/lifemap/screens/settingsScreens/SettingsNotificationsScreen.kt @@ -1,24 +1,3 @@ -<<<<<<< HEAD -package com.f1rq.lifemap.screens.settingsScreens - -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier - -@Composable -fun SettingsNotificationsScreen(modifier: Modifier = Modifier) { - Box( - modifier = Modifier - .fillMaxSize(), - contentAlignment = Alignment.Center - ) { - Text("Notifications settings") - } -} -======= package com.f1rq.lifemap.screens.settingsScreens import androidx.compose.foundation.layout.Arrangement @@ -69,4 +48,3 @@ fun SettingsNotificationsScreen(navController: NavController, modifier: Modifier } } } ->>>>>>> 774f07c0804f103a0523e1f7da3f969046a53aec