Enable R8 for release build

JackEblan · Feb 8, 2024 · 184c5fc · 184c5fc
1 parent 0b70cc7
commit 184c5fc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 21 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -20,8 +20,8 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
-            isShrinkResources = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
             )

diff --git a/feature/applist/src/main/kotlin/com/feature/applist/AppListScreen.kt b/feature/applist/src/main/kotlin/com/feature/applist/AppListScreen.kt
@@ -2,7 +2,6 @@ package com.feature.applist
 
 import androidx.annotation.VisibleForTesting
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
@@ -47,15 +46,15 @@ internal fun AppListRoute(
 }
 
 @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 internal fun AppListScreen(
     modifier: Modifier = Modifier,
     appListUiState: AppListUiState,
     onItemClick: (String, String) -> Unit,
     onSecureSettingsClick: () -> Unit
 ) {
-    Scaffold(modifier = modifier.fillMaxSize(), topBar = {
+    Scaffold(topBar = {
         TopAppBar(title = {
             Text(text = "Geto")
         }, actions = {
@@ -67,13 +66,13 @@ internal fun AppListScreen(
         })
     }) { innerPadding ->
         Box(
-            modifier = Modifier
+            modifier = modifier
                 .fillMaxSize()
                 .consumeWindowInsets(innerPadding)
         ) {
             when (appListUiState) {
                 AppListUiState.Loading -> LoadingPlaceHolderScreen(
-                    modifier = Modifier
+                    modifier = modifier
                         .fillMaxSize()
                         .testTag("applist:loadingPlaceHolderScreen")
                 )

diff --git a/feature/appsettings/src/main/kotlin/com/feature/appsettings/AppSettingsScreen.kt b/feature/appsettings/src/main/kotlin/com/feature/appsettings/AppSettingsScreen.kt
@@ -122,7 +122,7 @@ internal fun AppSettingsScreen(
     onAddAppSettingsClick: () -> Unit,
     onLaunchApp: () -> Unit
 ) {
-    Scaffold(modifier = modifier.fillMaxSize(), topBar = {
+    Scaffold(topBar = {
         TopAppBar(title = {
             Text(text = appName, maxLines = 1)
         }, navigationIcon = {
@@ -162,9 +162,10 @@ internal fun AppSettingsScreen(
         )
     }) { innerPadding ->
         Box(
-            modifier = modifier.fillMaxSize()
+            modifier = modifier
+                .fillMaxSize()
+                .consumeWindowInsets(innerPadding)
         ) {
-
             when (appSettingsUiState) {
                 AppSettingsUiState.Empty -> {
                     EmptyListPlaceHolderScreen(
@@ -185,12 +186,8 @@ internal fun AppSettingsScreen(
                 }
 
                 is AppSettingsUiState.Success -> {
-
                     LazyColumn(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .consumeWindowInsets(innerPadding),
-                        contentPadding = innerPadding
+                        modifier = Modifier.fillMaxSize(), contentPadding = innerPadding
                     ) {
                         appSettings(
                             appSettingsList = appSettingsUiState.appSettingsList,

diff --git a/...resettingslist/src/main/kotlin/com/feature/securesettingslist/SecureSettingsListScreen.kt b/...resettingslist/src/main/kotlin/com/feature/securesettingslist/SecureSettingsListScreen.kt
@@ -118,7 +118,7 @@ internal fun SecureSettingsListScreen(
     onGlobalDropdownMenuItemClick: () -> Unit,
     secureSettingsListUiState: SecureSettingsListUiState
 ) {
-    Scaffold(modifier = modifier.fillMaxSize(), topBar = {
+    Scaffold(topBar = {
         TopAppBar(title = {
             Text(text = "Settings Database")
         }, navigationIcon = {
@@ -151,7 +151,9 @@ internal fun SecureSettingsListScreen(
         )
     }) { innerPadding ->
         Box(
-            modifier = Modifier.fillMaxSize()
+            modifier = modifier
+                .fillMaxSize()
+                .consumeWindowInsets(innerPadding)
         ) {
             when (secureSettingsListUiState) {
                 SecureSettingsListUiState.Loading -> LoadingPlaceHolderScreen(
@@ -162,10 +164,7 @@ internal fun SecureSettingsListScreen(
 
                 is SecureSettingsListUiState.Success -> {
                     LazyColumn(
-                        modifier = Modifier
-                            .fillMaxSize()
-                            .consumeWindowInsets(innerPadding),
-                        contentPadding = innerPadding
+                        modifier = Modifier.fillMaxSize(), contentPadding = innerPadding
                     ) {
                         secureSettingItems(
                             secureSettingsList = secureSettingsListUiState.secureSettingsList,