Semper-Viventem · Semper-Viventem · Feb 27, 2023 · Feb 27, 2023 · Feb 27, 2023 · Feb 27, 2023
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+app/release/app-release.aab
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
         applicationId = "f.cking.software"
         minSdk = 29
         targetSdk = 33
-        versionCode = 1
-        versionName = "0.1-alpha"
+        versionCode = (System.currentTimeMillis() / 1000).toInt()
+        versionName = "0.2-alpha"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,41 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+
+# Keep `Companion` object fields of serializable classes.
+# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
+-if @kotlinx.serialization.Serializable class **
+-keepclassmembers class <1> {
+    static <1>$Companion Companion;
+}
+
+# Keep `serializer()` on companion objects (both default and named) of serializable classes.
+-if @kotlinx.serialization.Serializable class ** {
+    static **$* *;
+}
+-keepclassmembers class <2>$<3> {
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# Keep `INSTANCE.serializer()` of serializable objects.
+-if @kotlinx.serialization.Serializable class ** {
+    public static ** INSTANCE;
+}
+-keepclassmembers class <1> {
+    public static <1> INSTANCE;
+    kotlinx.serialization.KSerializer serializer(...);
+}
+
+# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
+-keepattributes RuntimeVisibleAnnotations,AnnotationDefault
+
+# Don't print notes about potential mistakes or omissions in the configuration for kotlinx-serialization classes
+# See also https://github.com/Kotlin/kotlinx.serialization/issues/1900
+-dontnote kotlinx.serialization.**
+
+# Serialization core uses `java.lang.ClassValue` for caching inside these specified classes.
+# If there is no `java.lang.ClassValue` (for example, in Android), then R8/ProGuard will print a warning.
+# However, since in this case they will not be used, we can disable these warnings
+-dontwarn kotlinx.serialization.internal.ClassValueReferences
diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_launcher_background_original"/>
+    <item android:drawable="@drawable/ic_launcher_background_grid"/>
+</layer-list>
diff --git a/...n/res/drawable/ic_launcher_background.xml → .../drawable/ic_launcher_background_grid.xml b/...n/res/drawable/ic_launcher_background.xml → .../drawable/ic_launcher_background_grid.xml
@@ -2,10 +2,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
+    android:alpha="0.5"
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#3DDC84"
+        android:fillColor="#48673AB7"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"

diff --git a/app/src/debug/res/drawable/ic_launcher_background_original.jpg b/app/src/debug/res/drawable/ic_launcher_background_original.jpg
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -23,8 +23,6 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-
     <uses-feature android:name="android.hardware.location.gps" />
     <uses-feature android:name="android.hardware.location.network" />
 

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/java/f/cking/software/data/repo/SettingsRepository.kt b/app/src/main/java/f/cking/software/data/repo/SettingsRepository.kt
@@ -47,11 +47,20 @@ class SettingsRepository(
         return sharedPreferences.getBoolean(KEY_USE_GPS_ONLY, TheAppConfig.USE_GPS_LOCATION_ONLY)
     }
 
+    fun getPermissionsIntroWasShown(): Boolean {
+        return sharedPreferences.getBoolean(KEY_PERMISSIONS_INTRO_WAS_SHOWN, false)
+    }
+
+    fun setPermissionsIntroWasShown(value: Boolean) {
+        sharedPreferences.edit().putBoolean(KEY_PERMISSIONS_INTRO_WAS_SHOWN, value).apply()
+    }
+
     companion object {
         private const val KEY_SCAN_INTERVAL = "key_scan_interval"
         private const val KEY_SCAN_RESTRICTED_INTERVAL = "key_scan_restricted_interval"
         private const val KEY_SCAN_DURATION = "key_scan_duration"
         private const val KEY_GARBAGING_TIME = "key_garbaging_time"
         private const val KEY_USE_GPS_ONLY = "key_use_gps_location_only"
+        private const val KEY_PERMISSIONS_INTRO_WAS_SHOWN = "key_permissions_intro_was_shown"
     }
 }
diff --git a/app/src/main/java/f/cking/software/ui/UiModule.kt b/app/src/main/java/f/cking/software/ui/UiModule.kt
@@ -16,7 +16,7 @@ import org.koin.dsl.module
 object UiModule {
     val module = module {
         single { NavRouter() }
-        viewModel { MainViewModel(get(), get(), get()) }
+        viewModel { MainViewModel(get(), get(), get(), get()) }
         viewModel { DeviceListViewModel(get(), get(), get(), get()) }
         viewModel { SettingsViewModel(get(), get(), get(), get(), get(), get(), get(), get(), get(), get()) }
         viewModel { ProfilesListViewModel(get(), get()) }

diff --git a/app/src/main/java/f/cking/software/ui/devicelist/DeviceListScreen.kt b/app/src/main/java/f/cking/software/ui/devicelist/DeviceListScreen.kt
@@ -13,6 +13,7 @@ import androidx.compose.material.icons.filled.Search
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
@@ -23,6 +24,7 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.NestedScrollSource
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalFocusManager
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
@@ -51,23 +53,50 @@ object DeviceListScreen {
             }
         }
 
-        LazyColumn(
+        val list = viewModel.devicesViewState
+
+        if (list.isEmpty()) {
+            ContentPlaceholder()
+        } else {
+            LazyColumn(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .fillMaxHeight()
+                    .nestedScroll(nestedScroll),
+            ) {
+                stickyHeader {
+                    Filters(viewModel)
+                }
+
+                list.mapIndexed { index, deviceData ->
+                    item { DeviceListItem(device = deviceData) { viewModel.onDeviceClick(deviceData) } }
+                    val showDivider = list.getOrNull(index + 1)?.lastDetectTimeMs != deviceData.lastDetectTimeMs
+                    if (showDivider) {
+                        item { Divider() }
+                    }
+                }
+            }
+        }
+    }
+
+    @Composable
+    fun ContentPlaceholder() {
+        Box(
             modifier = Modifier
                 .fillMaxWidth()
-                .fillMaxHeight()
-                .nestedScroll(nestedScroll),
+                .fillMaxHeight(),
+            contentAlignment = Alignment.Center
         ) {
-            stickyHeader {
-                Filters(viewModel)
-            }
-
-            val list = viewModel.devicesViewState
-            list.mapIndexed { index, deviceData ->
-                item { DeviceListItem(device = deviceData) { viewModel.onDeviceClick(deviceData) } }
-                val showDivider = list.getOrNull(index + 1)?.lastDetectTimeMs != deviceData.lastDetectTimeMs
-                if (showDivider) {
-                    item { Divider() }
-                }
+            Column(Modifier.padding(16.dp), horizontalAlignment = Alignment.CenterHorizontally) {
+                val text = stringResource(R.string.device_list_placeholder)
+                Icon(
+                    modifier = Modifier.size(100.dp),
+                    painter = painterResource(id = R.drawable.ic_ghost),
+                    contentDescription = text,
+                    tint = Color.Gray
+                )
+                Spacer(modifier = Modifier.height(8.dp))
+                Text(text = text, color = Color.Gray)
             }
         }
     }

diff --git a/app/src/main/java/f/cking/software/ui/main/MainScreen.kt b/app/src/main/java/f/cking/software/ui/main/MainScreen.kt
@@ -1,21 +1,28 @@
 package f.cking.software.ui.main
 
+import android.widget.Toast
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.Refresh
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.vanpra.composematerialdialogs.MaterialDialog
+import com.vanpra.composematerialdialogs.MaterialDialogState
+import com.vanpra.composematerialdialogs.rememberMaterialDialogState
 import f.cking.software.R
 import org.koin.androidx.compose.koinViewModel
 
@@ -95,9 +102,26 @@ object MainScreen {
             icon = R.drawable.ic_ble
         }
 
+        val context = LocalContext.current
+        val permissionsIntro = permissionsIntroDialog(
+            onPassed = {
+                viewModel.userHasPassedPermissionsIntro()
+                viewModel.runBackgroundScanning()
+            },
+            onDeclined = {
+                Toast.makeText(context, "The scanner cannot work without these permissions", Toast.LENGTH_SHORT).show()
+            }
+        )
+
         ExtendedFloatingActionButton(
             text = { Text(text = text, fontWeight = FontWeight.Bold) },
-            onClick = { viewModel.runBackgroundScanning() },
+            onClick = {
+                if (viewModel.needToShowPermissionsIntro()) {
+                    permissionsIntro.show()
+                } else {
+                    viewModel.runBackgroundScanning()
+                }
+            },
             icon = {
                 Image(
                     painter = painterResource(id = icon),
@@ -108,6 +132,81 @@ object MainScreen {
         )
     }
 
+    @Composable
+    private fun permissionsIntroDialog(
+        onPassed: () -> Unit,
+        onDeclined: () -> Unit,
+    ): MaterialDialogState {
+        val state = rememberMaterialDialogState()
+        MaterialDialog(
+            dialogState = state,
+            buttons = {
+                positiveButton(stringResource(id = R.string.confirm)) {
+                    state.hide()
+                    onPassed.invoke()
+                }
+                negativeButton(stringResource(id = R.string.decline)) {
+                    state.hide()
+                    onDeclined.invoke()
+                }
+            }
+        ) {
+            LazyColumn(Modifier.padding(horizontal = 8.dp)) {
+                item {
+                    Text(text = "Permissions required", fontSize = 18.sp, fontWeight = FontWeight.Bold)
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+                item {
+                    Text(text = stringResource(R.string.permissions_intro_nearby_title), fontWeight = FontWeight.Bold)
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Row {
+                        Icon(
+                            painter = painterResource(R.drawable.ic_ble),
+                            contentDescription = stringResource(R.string.permissions_intro_nearby_title),
+                            tint = Color.Gray
+                        )
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(text = stringResource(R.string.permissions_intro_nearby_description))
+                    }
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+                item {
+                    Text(text = stringResource(R.string.permissions_intro_bg_location_title), fontWeight = FontWeight.Bold)
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Row {
+                        Icon(
+                            imageVector = Icons.Default.LocationOn,
+                            contentDescription = stringResource(R.string.permissions_intro_bg_location_title),
+                            tint = Color.Gray
+                        )
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(text = stringResource(R.string.permission_intro_bg_location_text))
+                    }
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+                item {
+                    Text(text = stringResource(R.string.permissions_intro_doze_mode_title), fontWeight = FontWeight.Bold)
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Row {
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_charge),
+                            contentDescription = stringResource(R.string.permissions_intro_doze_mode_title),
+                            tint = Color.Gray
+                        )
+                        Spacer(modifier = Modifier.width(8.dp))
+                        Text(text = stringResource(R.string.permissions_intro_doze_mode_text))
+                    }
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+                item { 
+                    Text(text = stringResource(R.string.permission_data_coolect_info))
+                    Spacer(modifier = Modifier.height(8.dp))
+                }
+            }
+        }
+        return state
+    }
+
     @Composable
     private fun TopBar(viewModel: MainViewModel) {
         TopAppBar(

diff --git a/app/src/main/java/f/cking/software/ui/main/MainViewModel.kt b/app/src/main/java/f/cking/software/ui/main/MainViewModel.kt
@@ -11,6 +11,7 @@ import androidx.lifecycle.viewModelScope
 import f.cking.software.R
 import f.cking.software.data.helpers.BleScannerHelper
 import f.cking.software.data.helpers.PermissionHelper
+import f.cking.software.data.repo.SettingsRepository
 import f.cking.software.service.BgScanService
 import f.cking.software.ui.devicelist.DeviceListScreen
 import f.cking.software.ui.journal.JournalScreen
@@ -22,6 +23,7 @@ class MainViewModel(
     private val permissionHelper: PermissionHelper,
     private val context: Application,
     private val bleScanner: BleScannerHelper,
+    private val settingsRepository: SettingsRepository,
 ) : ViewModel() {
 
     var scanStarted: Boolean by mutableStateOf(bleScanner.inProgress.value)
@@ -82,6 +84,14 @@ class MainViewModel(
         }
     }
 
+    fun needToShowPermissionsIntro(): Boolean {
+        return !settingsRepository.getPermissionsIntroWasShown()
+    }
+
+    fun userHasPassedPermissionsIntro() {
+        settingsRepository.setPermissionsIntroWasShown(true)
+    }
+
     private fun observeScanInProgress() {
         viewModelScope.launch {
             bleScanner.inProgress