Merge pull request #11 from DanielRendox/develop

Merge develop into production

Author: DanielRendox

.idea/deploymentTargetDropDown.xml

@@ -6,7 +6,7 @@
 
 <br />
 
-Grocery Genius is a reliable Android app for your grocery needs, where you can add, edit, and delete items with the finesse of a ninja. And we’re gearing up to introduce real-time sharing! Soon, you’ll be able to sync your shopping lists with friends and family as you go. Apart from that, Grocery Genius offers a visually appealing interface featuring grocery images, autocomplete suggestions, and an intuitive user experience.
+Grocery Genius is a reliable shopping list Android app for your grocery needs. It offers a visually appealing interface featuring grocery images, autocomplete suggestions, and an intuitive user experience.
 
 ## Motivation
 
@@ -20,11 +20,13 @@ My motivation for this project is to learn how to talk to the server effectively
 
 ## Tech stack
 
-- Jetpack Compose for the user interface, with a single Activity and no Fragments.
+- Jetpack Compose for the user interface, with a single Activity and no Fragments
 - View model for business logic separation
+- RecyclerView for lists with drag-and-drop functionality
 - Room database for local data storage
 - Kotlin coroutines and flow for asynchronous requests
 - Hilt for dependency injection
-- MVVM pattern but with intents from MVI
-- CLEAN architecture with both repository and use cases
-- SOLID principles
+- MVI pattern
+- CLEAN architecture data and presentation layer
+- Retrofit for working with REST API
+- Work Manager for synching data in the background

.idea/vcs.xml

@@ -16,7 +16,7 @@ android {
         minSdk = 21
         targetSdk = 34
         versionCode = 1
-        versionName = "1.0"
+        versionName = "0.1.1"
 
         testInstrumentationRunner = "com.rendox.grocerygenius.testing.GroceryGeniusTestRunner"
         vectorDrawables {

README.md

@@ -22,4 +22,16 @@
 
 -keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
     <fields>;
-}
+}
+
+ # With R8 full mode generic signatures are stripped for classes that are not
+ # kept. Suspend functions are wrapped in continuations where the type argument
+ # is used.
+ -keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+
+ # R8 full mode strips generic signatures from return types if not kept.
+ -if interface * { @retrofit2.http.* public *** *(...); }
+ -keep,allowoptimization,allowshrinking,allowobfuscation class <3>
+
+ # With R8 full mode generic signatures are stripped for classes that are not kept.
+ -keep,allowobfuscation,allowshrinking class retrofit2.Response

app/build.gradle.kts

@@ -0,0 +1,37 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.rendox.grocerygenius",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "0.1.1",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File",
+  "baselineProfiles": [
+    {
+      "minApi": 28,
+      "maxApi": 30,
+      "baselineProfiles": [
+        "baselineProfiles/1/app-release.dm"
+      ]
+    },
+    {
+      "minApi": 31,
+      "maxApi": 2147483647,
+      "baselineProfiles": [
+        "baselineProfiles/0/app-release.dm"
+      ]
+    }
+  ],
+  "minSdkVersionForDexing": 21
+}

app/proguard-rules.pro

@@ -24,7 +24,9 @@ import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.core.view.WindowCompat
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -59,37 +61,53 @@ class MainActivity : ComponentActivity() {
             uiState == null
         }
 
-        enableEdgeToEdge()
+        val statusBarLightScrim = ContextCompat.getColor(this, R.color.status_bar_light_scrim)
+
+        if (Build.VERSION.SDK_INT < 23) {
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            window.statusBarColor = statusBarLightScrim
+            window.navigationBarColor = navBarDarkScrim
+        } else {
+            enableEdgeToEdge()
+        }
 
         // app's UI has bottom sheets that don't look good in landscape mode on small screen sizes
         if (resources.configuration.smallestScreenWidthDp < 600) {
             requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
         }
 
         setContent {
-            val darkTheme = shouldUseDarkTheme(uiState)
-            DisposableEffect(darkTheme) {
-                enableEdgeToEdge(
-                    statusBarStyle = SystemBarStyle.auto(
-                        Color.TRANSPARENT,
-                        Color.TRANSPARENT,
-                    ) { darkTheme },
-                    navigationBarStyle = SystemBarStyle.auto(
-                        lightScrim,
-                        darkScrim,
-                    ) { darkTheme },
-                )
+            val useDarkTheme = shouldUseDarkTheme(uiState)
+            DisposableEffect(useDarkTheme) {
+                if (Build.VERSION.SDK_INT >= 23) {
+                    enableEdgeToEdge(
+                        statusBarStyle = SystemBarStyle.auto(
+                            Color.TRANSPARENT,
+                            Color.TRANSPARENT,
+                        ) { useDarkTheme },
+                        navigationBarStyle = SystemBarStyle.auto(
+                            navBarLightScrim,
+                            navBarDarkScrim,
+                        ) { useDarkTheme },
+                    )
+                }
                 onDispose {}
             }
-            LaunchedEffect(Unit) {
+            LaunchedEffect(useDarkTheme) {
                 if (Build.VERSION.SDK_INT >= 29) {
                     window.isNavigationBarContrastEnforced = false
                 }
             }
+            LaunchedEffect(useDarkTheme) {
+                if (Build.VERSION.SDK_INT < 23) {
+                    window.statusBarColor =
+                        if (useDarkTheme) Color.TRANSPARENT else statusBarLightScrim
+                }
+            }
 
             uiState?.let { uiState ->
                 GroceryGeniusTheme(
-                    useDarkTheme = darkTheme,
+                    useDarkTheme = useDarkTheme,
                     disableDynamicColor = !uiState.useSystemAccentColor,
                     requestedColorScheme = uiState.selectedTheme,
                 ) {
@@ -125,10 +143,10 @@ private fun shouldUseDarkTheme(
  * The default light scrim, as defined by androidx and the platform:
  * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=35-38;drc=27e7d52e8604a080133e8b842db10c89b4482598
  */
-private val lightScrim = Color.argb(0xe6, 0xFF, 0xFF, 0xFF)
+private val navBarLightScrim = Color.argb(0xe6, 0xFF, 0xFF, 0xFF)
 
 /**
  * The default dark scrim, as defined by androidx and the platform:
  * https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt;l=40-44;drc=27e7d52e8604a080133e8b842db10c89b4482598
  */
-private val darkScrim = Color.argb(0x80, 0x1b, 0x1b, 0x1b)
+private val navBarDarkScrim = Color.argb(0x80, 0x1b, 0x1b, 0x1b)