fix: issue179 & issue173 - Fix r8 config and search validation (#180)

isuPatches · Dec 28, 2022 · 2f1b6d0 · 2f1b6d0
1 parent c895237
commit 2f1b6d0
Show file tree

Hide file tree

Showing 34 changed files with 276 additions and 107 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -60,8 +60,8 @@ android {
             applicationIdSuffix = ".debug"
             enableUnitTestCoverage = true
             enableAndroidTestCoverage = true
-            isMinifyEnabled = false
-            isShrinkResources = false
+            isMinifyEnabled = System.getenv("MINIFY_DEBUG_BUILDS").toBoolean()
+            isShrinkResources = System.getenv("MINIFY_DEBUG_BUILDS").toBoolean()
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "$rootDir/proguard/r8-app-debug.pro"
@@ -72,8 +72,8 @@ android {
         release {
             enableUnitTestCoverage = false
             enableAndroidTestCoverage = false
-            isMinifyEnabled = false
-            isShrinkResources = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "$rootDir/proguard/r8-app-release.pro"
@@ -123,7 +123,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Versions.ANDROIDX_COMPOSE
+        kotlinCompilerExtensionVersion = Versions.ANDROIDX_COMPOSE_COMPILER
     }
 }
 

diff --git a/app/gradle.lockfile b/app/gradle.lockfile
@@ -14,25 +14,25 @@ androidx.autofill:autofill:1.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.cardview:cardview:1.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.collection:collection-ktx:1.1.0=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.collection:collection:1.1.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.animation:animation-core:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.animation:animation:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.animation:animation-core:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.animation:animation:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.compose.foundation:foundation-layout:1.2.0=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.compose.foundation:foundation:1.2.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.material:material-icons-core:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.material:material-icons-extended:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.material:material-ripple:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.material:material:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.runtime:runtime-saveable:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.runtime:runtime:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui-geometry:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui-graphics:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui-text:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui-tooling-data:1.3.0=debugRuntimeClasspath
-androidx.compose.ui:ui-tooling-preview:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui-tooling:1.3.0=debugRuntimeClasspath
-androidx.compose.ui:ui-unit:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui-util:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
-androidx.compose.ui:ui:1.3.0=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.material:material-icons-core:1.3.1=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.material:material-icons-extended:1.3.1=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.material:material-ripple:1.3.1=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.material:material:1.3.1=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.runtime:runtime-saveable:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.runtime:runtime:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui-geometry:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui-graphics:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui-text:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui-tooling-data:1.3.2=debugRuntimeClasspath
+androidx.compose.ui:ui-tooling-preview:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui-tooling:1.3.2=debugRuntimeClasspath
+androidx.compose.ui:ui-unit:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui-util:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
+androidx.compose.ui:ui:1.3.2=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.concurrent:concurrent-futures:1.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.constraintlayout:constraintlayout-solver:2.0.1=debugRuntimeClasspath,releaseRuntimeClasspath
 androidx.constraintlayout:constraintlayout:2.0.1=debugRuntimeClasspath,releaseRuntimeClasspath
@@ -112,10 +112,10 @@ com.isupatches.android.wisefy:wifi:5.0.0=debugRuntimeClasspath,releaseRuntimeCla
 com.isupatches.android.wisefy:wisefy:5.0.0=debugRuntimeClasspath,releaseRuntimeClasspath
 javax.inject:javax.inject:1=debugRuntimeClasspath,releaseRuntimeClasspath
 org.jacoco:org.jacoco.agent:0.8.8=debugRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=debugRuntimeClasspath,releaseRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib-common:1.7.20=debugRuntimeClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21=debugRuntimeClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21=debugRuntimeClasspath,releaseRuntimeClasspath
-org.jetbrains.kotlin:kotlin-stdlib:1.7.10=debugRuntimeClasspath,releaseRuntimeClasspath
+org.jetbrains.kotlin:kotlin-stdlib:1.7.20=debugRuntimeClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4=debugRuntimeClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=debugRuntimeClasspath,releaseRuntimeClasspath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=debugRuntimeClasspath,releaseRuntimeClasspath

diff --git a/app/src/main/java/com/isupatches/android/wisefy/sample/features/misc/MiscScreenContent.kt b/app/src/main/java/com/isupatches/android/wisefy/sample/features/misc/MiscScreenContent.kt
@@ -120,6 +120,7 @@ internal fun MiscScreenContent(
             rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
                 if (result.all { it.value }) {
                     scope.launch {
+                        @Suppress("MissingPermission")
                         viewModel.getSavedNetworks()
                     }
                 } else {

diff --git a/...android/wisefy/sample/features/misc/nearbyaccesspoints/NearbyAccessPointsScreenContent.kt b/...android/wisefy/sample/features/misc/nearbyaccesspoints/NearbyAccessPointsScreenContent.kt
@@ -29,6 +29,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.isupatches.android.wisefy.accesspoints.entities.AccessPointData
@@ -44,21 +45,37 @@ internal fun NearbyAccessPointsScreenContent(
     accessPoints: () -> List<AccessPointUIData>
 ) {
     WisefySampleTheme {
-        val listState = rememberLazyListState()
-        LazyColumn(
-            state = listState,
-            verticalArrangement = Arrangement.spacedBy(WisefySampleSizes.Large),
-            contentPadding = PaddingValues(
-                top = WisefySampleSizes.WisefySampleTopMargin,
-                bottom = WisefySampleSizes.WisefySampleBottomMargin,
-                start = WisefySampleSizes.WisefySampleHorizontalMargins,
-                end = WisefySampleSizes.WisefySampleHorizontalMargins
-            )
-        ) {
-            items(accessPoints()) { accessPoint ->
-                @OptIn(ExperimentalFoundationApi::class)
-                Row(modifier = Modifier.animateItemPlacement()) {
-                    AccessPointRow(accessPoint = accessPoint)
+        val accessPointsValue = accessPoints()
+        if (accessPointsValue.isNotEmpty()) {
+            val listState = rememberLazyListState()
+            LazyColumn(
+                state = listState,
+                verticalArrangement = Arrangement.spacedBy(WisefySampleSizes.Large),
+                contentPadding = PaddingValues(
+                    top = WisefySampleSizes.WisefySampleTopMargin,
+                    bottom = WisefySampleSizes.WisefySampleBottomMargin,
+                    start = WisefySampleSizes.WisefySampleHorizontalMargins,
+                    end = WisefySampleSizes.WisefySampleHorizontalMargins
+                )
+            ) {
+                items(accessPointsValue) { accessPoint ->
+                    @OptIn(ExperimentalFoundationApi::class)
+                    Row(modifier = Modifier.animateItemPlacement()) {
+                        AccessPointRow(accessPoint = accessPoint)
+                    }
+                }
+            }
+        } else {
+            Column(horizontalAlignment = Alignment.CenterHorizontally) {
+                Row(
+                    modifier = Modifier.padding(
+                        top = WisefySampleSizes.WisefySampleTopMargin,
+                        bottom = WisefySampleSizes.WisefySampleBottomMargin,
+                        start = WisefySampleSizes.WisefySampleHorizontalMargins,
+                        end = WisefySampleSizes.WisefySampleHorizontalMargins
+                    )
+                ) {
+                    WisefySampleBodyLabel(stringResId = R.string.no_access_points_found)
                 }
             }
         }

diff --git a/...n/java/com/isupatches/android/wisefy/sample/features/remove/RemoveNetworkScreenContent.kt b/...n/java/com/isupatches/android/wisefy/sample/features/remove/RemoveNetworkScreenContent.kt
@@ -51,6 +51,7 @@ internal fun RemoveNetworkScreenContent(viewModel: RemoveNetworkViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
             if (result.all { it.value }) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.removeNetwork()
                 }
             } else {
@@ -101,7 +102,7 @@ private fun RemoveNetworkInputRows(
             onTextChange = { newText ->
                 viewModel.onInputChanged(newText)
             },
-            labelResId = R.string.regex_for_network,
+            labelResId = R.string.ssid_or_bssid_of_network,
             error = when (currentInputState.networkInputValidityState) {
                 is RemoveNetworkInputValidityState.SSID.Invalid.Empty -> {
                     WisefySampleEditTextError(R.string.ssid_input_empty)

diff --git a/...src/main/java/com/isupatches/android/wisefy/sample/features/search/SearchScreenContent.kt b/...src/main/java/com/isupatches/android/wisefy/sample/features/search/SearchScreenContent.kt
@@ -69,6 +69,7 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
             if (isGranted) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.searchForAccessPoint()
                 }
             } else {
@@ -81,6 +82,7 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
             if (isGranted) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.searchForAccessPoints()
                 }
             } else {
@@ -93,6 +95,7 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
             if (result.all { it.value }) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.searchForSavedNetwork()
                 }
             } else {
@@ -105,6 +108,7 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { result ->
             if (result.all { it.value }) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.searchForSavedNetworks()
                 }
             } else {
@@ -117,6 +121,7 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
             if (isGranted) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.searchForSSID()
                 }
             } else {
@@ -129,6 +134,7 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
         rememberLauncherForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted ->
             if (isGranted) {
                 scope.launch {
+                    @Suppress("MissingPermission")
                     viewModel.searchForSSIDs()
                 }
             } else {
@@ -194,6 +200,12 @@ internal fun SearchScreenContent(viewModel: SearchViewModel) {
                 ssidType = { viewModel.uiState.value.ssidType },
                 onSSIDTypeChanged = { ssidType -> viewModel.onSSIDTypeChanged(ssidType) }
             )
+            SearchScreenUseRegexForSearchInputRows(
+                useRegexForSearch = { viewModel.uiState.value.useRegexForSearch },
+                onUseRegexForSearchChanged = { useRegexForSearch ->
+                    viewModel.onUseRegexForSearchChanged(useRegexForSearch)
+                }
+            )
             SearchScreenReturnFullListInputRows(
                 returnFullList = { viewModel.uiState.value.returnFullList },
                 viewModel = viewModel
@@ -298,6 +310,43 @@ private fun SearchScreenSearchTypeInputRows(
     }
 }
 
+@Composable
+internal fun SearchScreenUseRegexForSearchInputRows(
+    useRegexForSearch: () -> Boolean,
+    onUseRegexForSearchChanged: (Boolean) -> Unit
+) {
+    WisefySampleTheme {
+        Column {
+            val currentValue = useRegexForSearch()
+            Row {
+                WisefySampleSubHeaderLabel(
+                    modifier = Modifier.padding(top = WisefySampleSizes.Large),
+                    stringResId = R.string.use_regex_for_search
+                )
+            }
+            Row(
+                modifier = Modifier.padding(top = WisefySampleSizes.Medium),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                WisefySampleRadioButton(
+                    isSelected = currentValue,
+                    onClick = {
+                        onUseRegexForSearchChanged(true)
+                    }
+                )
+                WisefySampleBodyLabel(stringResId = R.string.yes)
+                WisefySampleRadioButton(
+                    isSelected = !currentValue,
+                    onClick = {
+                        onUseRegexForSearchChanged(false)
+                    }
+                )
+                WisefySampleBodyLabel(stringResId = R.string.no)
+            }
+        }
+    }
+}
+
 @Composable
 private fun SearchScreenReturnFullListInputRows(
     returnFullList: () -> Boolean,

diff --git a/...src/main/java/com/isupatches/android/wisefy/sample/features/search/SearchScreenUIState.kt b/...src/main/java/com/isupatches/android/wisefy/sample/features/search/SearchScreenUIState.kt
@@ -26,6 +26,7 @@ internal data class SearchUIState(
     val inputState: SearchInputState,
     val searchType: SearchType,
     val ssidType: SSIDType,
+    val useRegexForSearch: Boolean,
     val returnFullList: Boolean,
     val filterDuplicates: Boolean,
     val timeoutInSeconds: Int?

diff --git a/app/src/main/java/com/isupatches/android/wisefy/sample/features/search/SearchStore.kt b/app/src/main/java/com/isupatches/android/wisefy/sample/features/search/SearchStore.kt
@@ -31,6 +31,7 @@ import kotlinx.coroutines.flow.map
 private const val PREF_LAST_USED_NETWORK_INPUT = "last_used_network_input"
 private const val PREF_SEARCH_TYPE = "search_type"
 private const val PREF_SSID_TYPE = "ssid_type"
+private const val PREF_USE_REGEX_FOR_SEARCH = "use_regex_for_search"
 private const val PREF_RETURN_FULL_LIST = "return_full_list"
 private const val PREF_FILTER_DUPLICATES = "filter_duplicates"
 private const val PREF_TIMEOUT = "timeout"
@@ -41,13 +42,15 @@ internal interface SearchStore {
     fun getLastUsedNetworkInput(): Flow<String>
     fun getSearchType(): Flow<SearchType>
     fun getSSIDType(): Flow<SSIDType>
+    fun shouldUseRegexForSearch(): Flow<Boolean>
     fun shouldReturnFullList(): Flow<Boolean>
     fun shouldFilterDuplicates(): Flow<Boolean>
     fun getTimeout(): Flow<Int>
 
     suspend fun setLastUsedNetworkInput(lastUsedNetworkInput: String)
     suspend fun setSearchType(searchType: SearchType)
     suspend fun setSSIDType(ssidType: SSIDType)
+    suspend fun setUseRegexForSearch(useRegexForSearch: Boolean)
     suspend fun setReturnFullList(returnFullList: Boolean)
     suspend fun setFilterDuplicates(filterDuplicates: Boolean)
     suspend fun setTimeout(timeout: Int)
@@ -62,6 +65,7 @@ internal class DefaultSearchStore(
     private val lastUsedNetworkInputKey = stringPreferencesKey(PREF_LAST_USED_NETWORK_INPUT)
     private val searchTypeKey = intPreferencesKey(PREF_SEARCH_TYPE)
     private val ssidTypeKey = intPreferencesKey(PREF_SSID_TYPE)
+    private val useRegexForSearchKey = booleanPreferencesKey(PREF_USE_REGEX_FOR_SEARCH)
     private val returnFullListKey = booleanPreferencesKey(PREF_RETURN_FULL_LIST)
     private val filterDuplicatesKey = booleanPreferencesKey(PREF_FILTER_DUPLICATES)
     private val timeoutKey = intPreferencesKey(PREF_TIMEOUT)
@@ -119,6 +123,22 @@ internal class DefaultSearchStore(
         }
     }
 
+    /*
+     * Use regex for search
+     */
+
+    override fun shouldUseRegexForSearch(): Flow<Boolean> {
+        return context.searchDataStore.data.map { preferences ->
+            preferences[useRegexForSearchKey] ?: false
+        }
+    }
+
+    override suspend fun setUseRegexForSearch(useRegexForSearch: Boolean) {
+        context.searchDataStore.edit { preferences ->
+            preferences[useRegexForSearchKey] = useRegexForSearch
+        }
+    }
+
     /*
      * Return full list
      */