refactor & new feat

f-arslan · f-arslan · commit 12bd16b9db7a · 2024-01-20T23:52:10.000+03:00
diff --git a/core/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
diff --git a/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/network_monitor/ConnectivityManagerNetworkMonitor.kt b/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/network_monitor/ConnectivityManagerNetworkMonitor.kt
@@ -0,0 +1,60 @@
+package com.espressodev.gptmap.core.common.network_monitor
+
+import android.content.Context
+import android.net.ConnectivityManager
+import android.net.Network
+import android.net.NetworkCapabilities
+import android.net.NetworkRequest
+import androidx.core.content.getSystemService
+import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.channels.awaitClose
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
+import kotlinx.coroutines.flow.conflate
+import javax.inject.Inject
+
+class ConnectivityManagerNetworkMonitor @Inject constructor(
+    @ApplicationContext private val context: Context,
+): NetworkMonitor {
+    override val isOnline: Flow<Boolean> = callbackFlow {
+        val connectivityManager = context.getSystemService<ConnectivityManager>()
+        if (connectivityManager == null) {
+            channel.trySend(false)
+            channel.close()
+            return@callbackFlow
+        }
+
+        val callback = object : ConnectivityManager.NetworkCallback() {
+            private val networks = mutableSetOf<Network>()
+
+            override fun onAvailable(network: Network) {
+                networks += network
+                channel.trySend(true)
+            }
+
+            override fun onLost(network: Network) {
+                networks -= network
+                channel.trySend(networks.isNotEmpty())
+            }
+        }
+
+        val request = NetworkRequest.Builder()
+            .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+            .build()
+        connectivityManager.registerNetworkCallback(request, callback)
+
+        /**
+         * Sends the latest connectivity status to the underlying channel.
+         */
+        channel.trySend(connectivityManager.isCurrentlyConnected())
+
+        awaitClose {
+            connectivityManager.unregisterNetworkCallback(callback)
+        }
+    }
+        .conflate()
+
+    private fun ConnectivityManager.isCurrentlyConnected() = activeNetwork
+        ?.let(::getNetworkCapabilities)
+        ?.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) ?: false
+}
diff --git a/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/network_monitor/NetworkMonitor.kt b/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/network_monitor/NetworkMonitor.kt
@@ -0,0 +1,19 @@
+package com.espressodev.gptmap.core.common.network_monitor
+
+import dagger.Binds
+import dagger.Module
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import kotlinx.coroutines.flow.Flow
+
+interface NetworkMonitor {
+    val isOnline: Flow<Boolean>
+}
+
+@Module
+@InstallIn(ActivityComponent::class)
+abstract class NetworkModule {
+
+    @Binds
+    abstract fun bindsNetworkMonitor(networkMonitor: ConnectivityManagerNetworkMonitor): NetworkMonitor
+}
diff --git a/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/snackbar/SnackbarManager.kt b/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/snackbar/SnackbarManager.kt
@@ -4,25 +4,25 @@ import androidx.annotation.StringRes
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
 
 object SnackbarManager {
-    private val messages: MutableStateFlow<SnackbarMessage?> = MutableStateFlow(null)
-    val snackbarMessages: StateFlow<SnackbarMessage?>
-        get() = messages.asStateFlow()
+    private val messages = MutableStateFlow<SnackbarMessage?>(null)
+    val snackbarMessages get() = messages.asStateFlow()
 
     fun showMessage(@StringRes message: Int) {
-        messages.value = SnackbarMessage.ResourceSnackbar(message)
+        messages.update { SnackbarMessage.ResourceSnackbar(message) }
     }
 
     fun showMessage(message: String) {
-        messages.value = SnackbarMessage.StringSnackbar(message)
+        messages.update { SnackbarMessage.StringSnackbar(message) }
     }
 
     fun showMessage(message: SnackbarMessage) {
-        messages.value = message
+        messages.update { message }
     }
 
     fun clean() {
-        messages.value = null
+        messages.update { null }
     }
 }
diff --git a/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/splash_navigation/SplashNavigationManager.kt b/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/splash_navigation/SplashNavigationManager.kt
@@ -0,0 +1,22 @@
+package com.espressodev.gptmap.core.common.splash_navigation
+
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.update
+
+enum class AfterSplashState {
+    Idle, Map
+}
+
+object SplashNavigationManager {
+    private val _splashNavigationState = MutableStateFlow(AfterSplashState.Idle)
+    val splashNavigationState get() = _splashNavigationState.asStateFlow()
+
+    fun onUserAlreadySignIn() {
+        _splashNavigationState.update { AfterSplashState.Map }
+    }
+
+    fun onLogout() {
+        _splashNavigationState.update { AfterSplashState.Idle }
+    }
+}
diff --git a/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/util/LifecycleObserver.kt b/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/util/LifecycleObserver.kt
@@ -0,0 +1,45 @@
+package com.espressodev.gptmap.core.common.util
+
+import android.util.Log
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.platform.LocalLifecycleOwner
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
+
+@Composable
+fun LifecycleObserver(tag: String) {
+    val lifecycleOwner = LocalLifecycleOwner.current
+    val lifecycle = lifecycleOwner.lifecycle
+
+    val currentLifecycle = rememberUpdatedState(newValue = lifecycle.currentState)
+
+    DisposableEffect(currentLifecycle) {
+        val observer = LifecycleEventObserver { _, event ->
+            when (event) {
+                Lifecycle.Event.ON_CREATE -> {
+                    Log.d(tag, "ON_CREATE")
+                }
+
+                Lifecycle.Event.ON_START -> {
+                    Log.d(tag, "ON_START")
+                }
+
+                Lifecycle.Event.ON_RESUME -> {
+                    Log.d(tag, "ON_RESUME")
+                }
+
+                Lifecycle.Event.ON_PAUSE -> Log.d(tag, "ON_PAUSE")
+                Lifecycle.Event.ON_STOP -> Log.d(tag, "ON_STOP")
+                Lifecycle.Event.ON_DESTROY -> Log.d(tag, "ON_DESTROY")
+                Lifecycle.Event.ON_ANY -> Log.d(tag, "ON_ANY")
+            }
+        }
+
+        lifecycle.addObserver(observer)
+        onDispose {
+            lifecycle.removeObserver(observer)
+        }
+    }
+}
diff --git a/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/util/keyboardAsState.kt b/core/common/src/main/kotlin/com/espressodev/gptmap/core/common/util/keyboardAsState.kt
@@ -1,4 +1,4 @@
-package com.espressodev.gptmap.core.common.state
+package com.espressodev.gptmap.core.common.util
 
 import android.graphics.Rect
 import android.util.Log
diff --git a/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/AccountService.kt b/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/AccountService.kt
@@ -11,8 +11,9 @@ typealias RevokeAccessResponse = Response<Boolean>
 typealias UpdatePasswordResponse = Response<Boolean>
 
 interface AccountService {
-    val currentUser: FirebaseUser
-    val userId: String
+    val userId: String?
+    val isEmailVerified: Boolean
+    val firebaseUser: FirebaseUser?
     suspend fun firebaseSignUpWithEmailAndPassword(
         email: String,
         password: String,
diff --git a/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/FirestoreService.kt b/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/FirestoreService.kt
@@ -7,5 +7,5 @@ interface FirestoreService {
     fun saveUser(user: User)
     suspend fun isUserInDatabase(email: String): Result<Boolean>
     suspend fun getUser(userId: String): User
-    fun getUserFlow(userId: String): Flow<User?>
+    fun getUserFlow(): Flow<User?>
 }
diff --git a/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/impl/AccountServiceImpl.kt b/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/impl/AccountServiceImpl.kt
@@ -17,11 +17,14 @@ import javax.inject.Inject
 class AccountServiceImpl @Inject constructor(
     private val auth: FirebaseAuth,
 ) : AccountService {
-    override val currentUser: FirebaseUser
-        get() = auth.currentUser ?: throw FirebaseUserIsNullException()
+    override val userId: String?
+        get() = auth.currentUser?.uid
 
-    override val userId: String
-        get() = currentUser.uid
+    override val isEmailVerified: Boolean
+        get() = auth.currentUser?.isEmailVerified ?: false
+
+    override val firebaseUser: FirebaseUser?
+        get() = auth.currentUser
 
     override suspend fun firebaseSignUpWithEmailAndPassword(
         email: String,
diff --git a/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/impl/FirestoreServiceImpl.kt b/core/data/src/main/kotlin/com/espressodev/gptmap/core/data/impl/FirestoreServiceImpl.kt
@@ -37,8 +37,10 @@ class FirestoreServiceImpl @Inject constructor(
         getUserDocRef(userId).get().await().toObject(User::class.java)
             ?: throw FirebaseUserIsNullException()
 
-    override fun getUserFlow(userId: String): Flow<User?> =
-        getUserDocRef(userId).dataObjects<User>()
+    override fun getUserFlow(): Flow<User?> =
+        auth.currentUser?.uid?.let { userId ->
+            getUserDocRef(userId).dataObjects<User>()
+        } ?: throw FirebaseUserIsNullException()
 
     private val userColRef by lazy { firestore.collection(USERS) }
     private fun getUserDocRef(id: String) = userColRef.document(id)
diff --git a/core/designsystem/src/main/kotlin/com/espressodev/gptmap/core/designsystem/component/Brush.kt b/core/designsystem/src/main/kotlin/com/espressodev/gptmap/core/designsystem/component/Brush.kt
@@ -43,7 +43,7 @@ fun shimmerBrush(showShimmer: Boolean = true, targetValue: Float = 1000f): Brush
 
 val darkBottomOverlayBrush: Brush = Brush.verticalGradient(
     colors = listOf(
-        Color.Black.copy(alpha = 0.8f),
+        Color.Black.copy(alpha = 0.7f),
         Color.Transparent,
         Color.Transparent,
         Color.Transparent
diff --git a/core/designsystem/src/main/res/drawable/app_icon.xml b/core/designsystem/src/main/res/drawable/app_icon.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="200dp" android:viewportHeight="500" android:viewportWidth="500" android:width="200dp">
+      
+    <path android:fillColor="#00000000" android:pathData="M250,250m-240,0a240,240 0,1 1,480 0a240,240 0,1 1,-480 0" android:strokeColor="#000000" android:strokeWidth="20"/>
+      
+    <path android:fillColor="#000000" android:fillType="evenOdd" android:pathData="M250,99C319.04,99 375,154.96 375,224C375,275.15 320.64,331.13 271.55,381.7C265.93,387.48 260.39,393.19 255,398.82C253,401.73 247,401.73 245,398.82C237.08,390.59 229.18,382.57 221.42,374.7C170.93,323.46 126.73,278.61 125,224C125,154.96 180.96,99 250,99ZM187,224H312C311.73,189.71 283.85,162 249.5,162C215.15,162 187.27,189.71 187,224ZM249.5,286C283.85,286 311.73,258.29 312,224H187C187.27,258.29 215.15,286 249.5,286Z"/>
+    
+</vector>
diff --git a/core/designsystem/src/main/res/raw/app_icon_anim.json b/core/designsystem/src/main/res/raw/app_icon_anim.json
@@ -0,0 +1 @@
+{"nm":"newScene","ddd":0,"h":581,"w":550,"meta":{"g":"LottieFiles Figma v49"},"layers":[{"ty":4,"nm":"","sr":1,"st":0,"op":85,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"ef":[],"shapes":[],"ind":1},{"ty":4,"nm":"","sr":1,"st":0,"op":85,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"ef":[],"shapes":[{"ty":"gr","bm":0,"hd":false,"nm":"","it":[{"ty":"sh","bm":0,"hd":false,"nm":"","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[0,-69.036],[49.09499999999997,-50.56299999999999],[5.3870000000000005,-5.625],[2,2.913000000000011],[7.753999999999991,7.867999999999995],[1.7340000000000089,54.613999999999976],[-69.036,0]],"o":[[69.036,0],[0,51.15100000000001],[-5.614000000000033,5.781999999999982],[-2,2.913000000000011],[-7.920000000000016,-8.228999999999985],[-50.49600000000001,-51.240999999999985],[0,-69.036],[0,0]],"v":[[275,140],[400,265],[296.547,422.697],[280,439.815],[270,439.815],[246.423,415.699],[150,265],[275,140]]}}},{"ty":"sh","bm":0,"hd":false,"nm":"","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[0,0],[34.351,0],[0.26899999999997704,-34.28800000000001]],"o":[[0,0],[-0.26900000000000546,-34.28800000000001],[-34.351,0],[0,0]],"v":[[212.002,265],[336.998,265],[274.5,203],[212.002,265]]}}},{"ty":"sh","bm":0,"hd":false,"nm":"","d":1,"ks":{"a":0,"k":{"c":true,"i":[[0,0],[-0.26900000000000546,34.28800000000001],[0,0],[-34.351,0]],"o":[[34.351,0],[0,0],[0.26900000000000546,34.28800000000001],[0,0]],"v":[[274.498,327],[336.996,265],[212,265],[274.498,327]]}}},{"ty":"gf","bm":0,"hd":false,"nm":"","e":{"a":0,"k":[275,442]},"g":{"p":2,"k":{"a":0,"k":[0,1,1,1,1,0.8196078431372549,0.8941176470588236,0.9490196078431372]}},"t":1,"a":{"a":0,"k":0},"h":{"a":0,"k":0},"s":{"a":0,"k":[275,140]},"r":2,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":1,"k":[{"o":{"x":0.34,"y":1.56},"i":{"x":0.64,"y":1},"s":[0,-681],"t":30},{"s":[0,0],"t":60}]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":30},{"s":[100],"t":60}]}}]}],"ind":2,"parent":1},{"ty":4,"nm":"","sr":1,"st":0,"op":85,"ip":0,"hd":false,"ddd":0,"bm":0,"hasMask":false,"ao":0,"ks":{"a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":0,"k":[0,0]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":0,"k":100}},"ef":[],"shapes":[{"ty":"gr","bm":0,"hd":false,"nm":"","it":[{"ty":"el","bm":0,"hd":false,"nm":"","d":1,"p":{"a":0,"k":[275,291]},"s":{"a":0,"k":[480,480]}},{"ty":"gs","bm":0,"hd":false,"nm":"","e":{"a":0,"k":[275,541]},"g":{"p":3,"k":{"a":0,"k":[0,0.47058823529411764,0.7725490196078432,0.8352941176470589,0.445,0.1568627450980392,0.32941176470588235,0.5215686274509804,0.82,0.15294117647058825,0.3254901960784314,0.5176470588235295]}},"t":1,"a":{"a":0,"k":0},"h":{"a":0,"k":0},"s":{"a":0,"k":[275,41]},"lc":1,"lj":1,"ml":4,"o":{"a":0,"k":100},"w":{"a":0,"k":20}},{"ty":"gf","bm":0,"hd":false,"nm":"","e":{"a":0,"k":[525,291]},"g":{"p":3,"k":{"a":0,"k":[0,0.7725490196078432,0.9803921568627451,0.996078431372549,0.49622,0,0.7254901960784313,0.6313725490196078,1,0.19607843137254902,0.7607843137254902,0.9686274509803922]}},"t":1,"a":{"a":0,"k":0},"h":{"a":0,"k":0},"s":{"a":0,"k":[25,291]},"r":1,"o":{"a":0,"k":100}},{"ty":"tr","a":{"a":0,"k":[0,0]},"s":{"a":0,"k":[100,100]},"sk":{"a":0,"k":0},"p":{"a":1,"k":[{"o":{"x":0.34,"y":1.56},"i":{"x":0.64,"y":1},"s":[0,-681],"t":0},{"s":[0,0],"t":60}]},"r":{"a":0,"k":0},"sa":{"a":0,"k":0},"o":{"a":1,"k":[{"o":{"x":0.167,"y":0.167},"i":{"x":0.833,"y":0.833},"s":[0],"t":0},{"s":[100],"t":60}]}}]}],"ind":3,"parent":1}],"v":"5.7.0","fr":60,"op":85,"ip":0,"assets":[]}
diff --git a/core/domain/src/main/kotlin/com/espressodev/gptmap/core/domain/AddDatabaseIfUserIsNewUseCase.kt b/core/domain/src/main/kotlin/com/espressodev/gptmap/core/domain/AddDatabaseIfUserIsNewUseCase.kt
@@ -2,6 +2,7 @@ package com.espressodev.gptmap.core.domain
 
 import com.espressodev.gptmap.core.data.AccountService
 import com.espressodev.gptmap.core.data.FirestoreService
+import com.espressodev.gptmap.core.model.Exceptions
 import com.espressodev.gptmap.core.mongodb.RealmSyncService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
@@ -18,7 +19,9 @@ class AddDatabaseIfUserIsNewUseCase @Inject constructor(
         if (isUserInRealmDb) {
             return@withContext Result.success(value = true)
         }
-        val realmUser = firestoreService.getUser(accountService.currentUser.uid).toRealmUser()
+        val realmUser =
+            accountService.userId?.let { userId -> firestoreService.getUser(userId).toRealmUser() }
+                ?: throw Exceptions.FirebaseUserIsNullException()
         realmSyncService.saveUser(realmUser).getOrThrow()
         Result.success(value = true)
     }
diff --git a/core/domain/src/main/kotlin/com/espressodev/gptmap/core/domain/SignInWithEmailAndPasswordUseCase.kt b/core/domain/src/main/kotlin/com/espressodev/gptmap/core/domain/SignInWithEmailAndPasswordUseCase.kt
@@ -5,9 +5,6 @@ import com.espressodev.gptmap.core.model.Exceptions.FirebaseEmailVerificationIsF
 import com.espressodev.gptmap.core.model.Exceptions.FirebaseUserIdIsNullException
 import com.espressodev.gptmap.core.mongodb.RealmAccountService
 import com.google.firebase.auth.AuthResult
-import com.google.firebase.auth.FirebaseAuthInvalidCredentialsException
-import com.google.firebase.auth.FirebaseAuthInvalidUserException
-import io.realm.kotlin.exceptions.RealmException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.tasks.await
 import kotlinx.coroutines.withContext
@@ -18,7 +15,7 @@ class SignInWithEmailAndPasswordUseCase @Inject constructor(
     private val realmAccountService: RealmAccountService,
 ) {
     suspend operator fun invoke(email: String, password: String) = withContext(Dispatchers.IO) {
-        try {
+        runCatching {
             val authResult = accountService.firebaseSignInWithEmailAndPassword(email, password)
             accountService.reloadFirebaseUser()
 
@@ -27,15 +24,7 @@ class SignInWithEmailAndPasswordUseCase @Inject constructor(
 
             loginToRealm(authResult)
 
-            Result.success(value = true)
-        } catch (e: FirebaseAuthInvalidUserException) {
-            Result.failure(e)
-        } catch (e: FirebaseAuthInvalidCredentialsException) {
-            Result.failure(e)
-        } catch (e: FirebaseEmailVerificationIsFalseException) {
-            Result.failure(e)
-        } catch (e: RealmException) {
-            Result.failure(e)
+            true
         }
     }
 
diff --git a/core/model/src/main/kotlin/com/espressodev/gptmap/core/model/PromptUtil.kt b/core/model/src/main/kotlin/com/espressodev/gptmap/core/model/PromptUtil.kt
@@ -1,4 +1,4 @@
-package com.espressodev.gptmap.core.model.utils
+package com.espressodev.gptmap.core.model
 
 object PromptUtil {
     val locationPreText = """
diff --git a/core/mongodb/src/main/kotlin/com/espressodev/gptmap/core/mongodb/impl/RealmAccountServiceImpl.kt b/core/mongodb/src/main/kotlin/com/espressodev/gptmap/core/mongodb/impl/RealmAccountServiceImpl.kt
@@ -1,5 +1,6 @@
 package com.espressodev.gptmap.core.mongodb.impl
 
+import android.util.Log
 import com.espressodev.gptmap.core.mongodb.RealmAccountService
 import com.espressodev.gptmap.core.mongodb.module.RealmModule
 import com.espressodev.gptmap.core.mongodb.module.RealmModule.app
diff --git a/core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/SaveScreenshotService.kt b/core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/SaveScreenshotService.kt
@@ -70,7 +70,11 @@ class SaveScreenshotService : Service() {
                             bitmap?.compress(Bitmap.CompressFormat.JPEG, 80, fos!!)
                         }
                         Log.e(TAG, "Screenshot captured")
-                        sendBroadcast(Intent(ACTION_SERVICE_STOPPED))
+                        sendBroadcast(
+                            Intent(ACTION_SERVICE_STOPPED).apply {
+                                setPackage(applicationContext.packageName)
+                            }
+                        )
                     }
                 } catch (e: Exception) {
                     Log.e(TAG, "Failed to capture screenshot because: ${e.message}")
@@ -96,7 +100,6 @@ class SaveScreenshotService : Service() {
 
     @Suppress("DEPRECATION")
     override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        // Start the service in the foreground with a notification
         startForegroundWithNotification()
 
         // Extract the result code and data from the intent to start the media projection
@@ -107,7 +110,10 @@ class SaveScreenshotService : Service() {
             intent.getParcelableExtra(DATA)
         }
         startProjection(resultCode, data)
-        sendBroadcast(Intent(ACTION_SERVICE_STARTED))
+        sendBroadcast(Intent(ACTION_SERVICE_STARTED).apply {
+            setPackage(applicationContext.packageName)
+        }
+        )
         return START_NOT_STICKY
     }
 
diff --git a/core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/composable/SaveScreenshot.kt b/core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/composable/SaveScreenshot.kt
@@ -3,6 +3,7 @@ package com.espressodev.gptmap.core.save_screenshot.composable
 import android.app.Activity
 import android.content.Context
 import android.media.projection.MediaProjectionManager
+import android.util.Log
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.layout.Box
@@ -27,6 +28,7 @@ fun SaveScreenshot(
     viewModel: ScreenshotViewModel = hiltViewModel(),
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    Log.d("SaveScreenshot", "uiState: $uiState")
     LaunchedEffect(key1 = uiState.screenState) {
         when (uiState.screenState) {
             ScreenState.Finished -> {
@@ -36,7 +38,7 @@ fun SaveScreenshot(
             ScreenState.Started -> {
                 onConfirm()
             }
-            else -> {}
+            ScreenState.Idle -> {}
         }
     }
 
diff --git a/core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/composable/SaveScreenshotViewModel.kt b/core/save-screenshot/src/main/kotlin/com/espressodev/gptmap/core/save_screenshot/composable/SaveScreenshotViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -4,25 +4,25 @@ import androidx.annotation.StringRes`
`4`	`4`	`import kotlinx.coroutines.flow.MutableStateFlow`
`5`	`5`	`import kotlinx.coroutines.flow.StateFlow`
`6`	`6`	`import kotlinx.coroutines.flow.asStateFlow`
	`7`	`+import kotlinx.coroutines.flow.update`
`7`	`8`
`8`	`9`	`object SnackbarManager {`
`9`		`- private val messages: MutableStateFlow<SnackbarMessage?> = MutableStateFlow(null)`
`10`		`- val snackbarMessages: StateFlow<SnackbarMessage?>`
`11`		`- get() = messages.asStateFlow()`
	`10`	`+ private val messages = MutableStateFlow<SnackbarMessage?>(null)`
	`11`	`+ val snackbarMessages get() = messages.asStateFlow()`
`12`	`12`
`13`	`13`	`fun showMessage(@StringRes message: Int) {`
`14`		`- messages.value = SnackbarMessage.ResourceSnackbar(message)`
	`14`	`+ messages.update { SnackbarMessage.ResourceSnackbar(message) }`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`fun showMessage(message: String) {`
`18`		`- messages.value = SnackbarMessage.StringSnackbar(message)`
	`18`	`+ messages.update { SnackbarMessage.StringSnackbar(message) }`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`fun showMessage(message: SnackbarMessage) {`
`22`		`- messages.value = message`
	`22`	`+ messages.update { message }`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`fun clean() {`
`26`		`- messages.value = null`
	`26`	`+ messages.update { null }`
`27`	`27`	`}`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.espressodev.gptmap.core.common.state`
	`1`	`+package com.espressodev.gptmap.core.common.util`
`2`	`2`
`3`	`3`	`import android.graphics.Rect`
`4`	`4`	`import android.util.Log`
Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ interface FirestoreService {`
`7`	`7`	`fun saveUser(user: User)`
`8`	`8`	`suspend fun isUserInDatabase(email: String): Result<Boolean>`
`9`	`9`	`suspend fun getUser(userId: String): User`
`10`		`- fun getUserFlow(userId: String): Flow<User?>`
	`10`	`+ fun getUserFlow(): Flow<User?>`
`11`	`11`	`}`