refactor

Author: f-arslan

.gitignore

@@ -4,6 +4,7 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
+keystore.properties
 
 # Log/OS Files
 *.log

core/common/src/main/kotlin/com/espressodev/gptmap/core/common/util/keyboardAsState.kt

@@ -1,7 +1,6 @@
 package com.espressodev.gptmap.core.common.util
 
 import android.graphics.Rect
-import android.util.Log
 import android.view.ViewTreeObserver
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -14,7 +13,6 @@ import androidx.compose.ui.platform.LocalView
 fun keyboardAsState(): State<Boolean> {
     val keyboardState = remember { mutableStateOf(false) }
     val view = LocalView.current
-    Log.d("keyboardAsState", "view: ${view.hashCode()}")
     DisposableEffect(view) {
         val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
             val rect = Rect()

core/designsystem/src/main/kotlin/com/espressodev/gptmap/core/designsystem/theme/Theme.kt

@@ -1,16 +1,11 @@
 package com.espressodev.gptmap.core.designsystem.theme
 
-import android.app.Activity
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
-import androidx.compose.runtime.SideEffect
-import androidx.compose.ui.graphics.toArgb
-import androidx.compose.ui.platform.LocalView
-import androidx.core.view.WindowCompat
 
 private val LightColors = lightColorScheme(
     primary = md_theme_light_primary,
@@ -87,15 +82,6 @@ fun GptmapTheme(
     }
 
     val gmColorPalette = if (!darkTheme) LightGmColorsPalette else DarkGmColorsPalette
-
-    val view = LocalView.current
-    if (!view.isInEditMode) {
-        SideEffect {
-            val window = (view.context as Activity).window
-            window.statusBarColor = colorScheme.primary.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
-        }
-    }
     CompositionLocalProvider(LocalGmColorsPalette provides gmColorPalette) {
         MaterialTheme(
             colorScheme = colorScheme,

core/designsystem/src/main/res/values/strings.xml

@@ -42,6 +42,8 @@
     <string name="send">Send</string>
     <string name="message">Message</string>
     <string name="screenshot_gallery">Screenshot Gallery</string>
+    <string name="screenshots">Screenshots</string>
+    <string name="favourites">Favourites</string>
     <string name="edit">Edit</string>
     <string name="logout">Logout</string>
 

core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/composable/SaveScreenshot.kt

@@ -22,13 +22,12 @@ import com.espressodev.gptmap.core.save_screenshot.SaveScreenshotService
 
 @Composable
 fun SaveScreenshot(
-    onConfirm: () -> Unit,
     onSuccess: () -> Unit,
     modifier: Modifier = Modifier,
+    onConfirm: () -> Unit = {},
     viewModel: ScreenshotViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    Log.d("SaveScreenshot", "uiState: $uiState")
     LaunchedEffect(key1 = uiState.screenState) {
         when (uiState.screenState) {
             ScreenState.Finished -> {

feature/profile/src/main/kotlin/com/espressodev/gptmap/feature/profile/ProfileViewModel.kt

@@ -2,7 +2,6 @@ package com.espressodev.gptmap.feature.profile
 
 import androidx.lifecycle.viewModelScope
 import com.espressodev.gptmap.core.common.GmViewModel
-import com.espressodev.gptmap.core.common.splash_navigation.SplashNavigationManager
 import com.espressodev.gptmap.core.data.AccountService
 import com.espressodev.gptmap.core.data.FirestoreService
 import com.espressodev.gptmap.core.data.LogService
@@ -27,7 +26,7 @@ import javax.inject.Inject
 class ProfileViewModel @Inject constructor(
     private val accountService: AccountService,
     private val realmAccountService: RealmAccountService,
-    private val firestoreService: FirestoreService,
+    firestoreService: FirestoreService,
     ioDispatcher: CoroutineDispatcher,
     logService: LogService
 ) : GmViewModel(logService) {
@@ -58,7 +57,6 @@ class ProfileViewModel @Inject constructor(
     fun onLogoutClick(navigate: () -> Unit) = launchCatching {
         accountService.signOut()
         realmAccountService.logOut()
-        SplashNavigationManager.onLogout()
         navigate()
     }
 

feature/screenshot-gallery/src/main/kotlin/com/espressodev/gptmap/feature/screenshot_gallery/ScreenshotGalleryScreen.kt

@@ -101,7 +101,6 @@ fun ScreenshotGalleryRoute(
             }
         }
     }
-
 }
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -245,7 +244,7 @@ fun DotsIndicator(
     totalDots: Int,
     selectedIndex: Int,
     modifier: Modifier = Modifier,
-    activeDotColor: Color = Color.Black,
+    activeDotColor: Color = Color.White,
     inactiveDotColor: Color = Color.LightGray,
     spacing: Dp = 8.dp,
     selectedDotSize: Dp = 16.dp,

feature/screenshot/src/main/kotlin/com/espressodev/gptmap/feature/screenshot/ScreenshotNavigation.kt

@@ -5,14 +5,14 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
 import androidx.navigation.compose.composable
 
-const val SCREENSHOT_ROUTE = "screenshot_route"
+const val ScreenshotRoute = "screenshot_route"
 
 fun NavController.navigateToScreenshot(navOptions: NavOptions? = null) {
-    navigate(SCREENSHOT_ROUTE)
+    navigate(ScreenshotRoute, navOptions)
 }
 
 fun NavGraphBuilder.screenshotScreen(popUp: () -> Unit, navigateToMap: () -> Unit) {
-    composable(SCREENSHOT_ROUTE) {
+    composable(ScreenshotRoute) {
         ScreenshotRoute(popUp = popUp, navigateToMap)
     }
-}
+}