compress apk with r8 and more

dhino12 · Feb 9, 2023 · 6fdd5e4 · 6fdd5e4
1 parent 671d529
commit 6fdd5e4
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 251 deletions.
diff --git a/Food Application.zip b/Food Application.zip
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id 'androidx.navigation.safeargs.kotlin'
 }
 
 apply from: '../shared_dependencies.gradle'
@@ -24,7 +23,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
@@ -50,7 +49,7 @@ android {
 dependencies {
     implementation project(":core")
 
-    implementation "com.google.accompanist:accompanist-systemuicontroller:0.27.0"
+    implementation "com.google.accompanist:accompanist-systemuicontroller:0.28.0"
     implementation "com.airbnb.android:lottie:$lottie_version"
 
 }
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.example.foodapplication",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/main/java/com/example/foodapplication/ui/RecipeApp.kt b/app/src/main/java/com/example/foodapplication/ui/RecipeApp.kt
@@ -182,8 +182,8 @@ fun RecipeApp (
                     navArgument("title") { type = NavType.StringType }
                 ),
             ) {
-                val idCooking = it.arguments?.getString("foodId") ?: null
-                val titleCooking = it.arguments?.getString("title") ?: null
+                val idCooking = it.arguments?.getString("foodId")
+                val titleCooking = it.arguments?.getString("title")
 
                 LaunchedEffect(key1 = true ) {
                     val intent = Intent(context, DetailFoodActivity::class.java)
@@ -201,17 +201,17 @@ fun RecipeApp (
                     navArgument("title") { type = NavType.StringType },
                 )
             ) {
-                val idArticle = it.arguments?.getString("articleId") ?: null
-                val tagArticle = it.arguments?.getString("tag") ?: null
-                val titleArticle = it.arguments?.getString("title") ?: null
-                val context = LocalContext.current as Activity
+                val idArticle = it.arguments?.getString("articleId")
+                val tagArticle = it.arguments?.getString("tag")
+                val titleArticle = it.arguments?.getString("title")
+                val ctx = LocalContext.current as Activity
                 if (idArticle != null) {
                     LaunchedEffect(key1 = true) {
-                        val intent = Intent(context, DetailFoodActivity::class.java)
+                        val intent = Intent(ctx, DetailFoodActivity::class.java)
                         intent.putExtra(DetailFoodActivity.EXTRA_ARTICLE_ID, idArticle)
                         intent.putExtra(DetailFoodActivity.EXTRA_ARTICLE_TAG, tagArticle)
                         intent.putExtra(DetailFoodActivity.EXTRA_ARTICLE_TITLE, titleArticle)
-                        context.startActivity(intent)
+                        ctx.startActivity(intent)
                     }
                 }
             }

diff --git a/app/src/main/java/com/example/foodapplication/ui/components/ItemFoodVertical.kt b/app/src/main/java/com/example/foodapplication/ui/components/ItemFoodVertical.kt
@@ -10,7 +10,6 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
@@ -33,7 +32,6 @@ fun ItemFoodsVertical(
     time: String? = null,
     difficulty: String? = null,
     tags: String? = null,
-    brush: Brush? = null,
     OnItemClick: () -> Unit,
 ) {
     Card(

diff --git a/app/src/main/java/com/example/foodapplication/ui/detail/food/DetailViewModel.kt b/app/src/main/java/com/example/foodapplication/ui/detail/food/DetailViewModel.kt
@@ -23,7 +23,7 @@ class DetailViewModel(private val foodUseCase: FoodUseCase) : ViewModel() {
         foodUseCase.getDetailCooking(title).asLiveData()
     }
 
-    var articleDetail: LiveData<Resource<Article>> = Transformations.switchMap(titleArticle) { title ->
+    var articleDetail: LiveData<Resource<Article>> = Transformations.switchMap(titleArticle) {
         foodUseCase.getArticleDetail(titleArticle.value!!).asLiveData()
     }
 

diff --git a/app/src/main/java/com/example/foodapplication/ui/screen/detail/DetailScreen.kt b/app/src/main/java/com/example/foodapplication/ui/screen/detail/DetailScreen.kt
diff --git a/app/src/main/java/com/example/foodapplication/ui/screen/detail/DetailViewModel.kt b/app/src/main/java/com/example/foodapplication/ui/screen/detail/DetailViewModel.kt
diff --git a/app/src/main/java/com/example/foodapplication/util/DataToView.kt b/app/src/main/java/com/example/foodapplication/util/DataToView.kt
@@ -146,7 +146,7 @@ class DataToView(
 
     private fun getActionBarSize(): Int {
         val typedValue = TypedValue()
-        val textSizeAttr = intArrayOf(com.google.android.material.R.attr.actionBarSize)
+        val textSizeAttr = intArrayOf(androidx.constraintlayout.widget.R.attr.actionBarSize)
         val indexOfAttrTextSize = 0
         val a = context.obtainStyledAttributes(typedValue.data, textSizeAttr)
         val actionBarSize = a.getDimensionPixelSize(indexOfAttrTextSize, -1)

diff --git a/app/src/main/res/drawable/foodrecipies.png b/app/src/main/res/drawable/foodrecipies.png
diff --git a/app/src/main/res/drawable/ic_baseline_search_24.xml b/app/src/main/res/drawable/ic_baseline_search_24.xml
diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
diff --git a/app/src/main/res/drawable/nothing_page.png b/app/src/main/res/drawable/nothing_page.png
diff --git a/app/src/main/res/drawable/random.png b/app/src/main/res/drawable/random.png
diff --git a/app/src/main/res/drawable/search_not_founds.png b/app/src/main/res/drawable/search_not_founds.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -5,16 +5,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="0dp"
-        android:layout_marginEnd="0dp"
-        android:background="?android:attr/windowBackground"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:menu="@menu/bottom_nav_menu" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
@@ -1,3 +1,3 @@
 <resources>
-    <dimen name="fab_margin">48dp</dimen>
+<!--    <dimen name="fab_margin">48dp</dimen>-->
 </resources>
diff --git a/app/src/main/res/values-w1240dp/dimens.xml b/app/src/main/res/values-w1240dp/dimens.xml
@@ -1,3 +1,3 @@
 <resources>
-    <dimen name="fab_margin">200dp</dimen>
+<!--    <dimen name="fab_margin">200dp</dimen>-->
 </resources>
diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml
@@ -1,3 +1,3 @@
 <resources>
-    <dimen name="fab_margin">48dp</dimen>
+<!--    <dimen name="fab_margin">48dp</dimen>-->
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -35,18 +35,10 @@ buildscript {
         sql_lite_chiper_version = '2.3.0'
         sql_chiper_version = '4.5.3'
     }
-
-    dependencies {
-        def nav_version = "2.4.2"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
-    }
 }
 
 plugins {
     id 'com.android.application' version '7.4.0' apply false
     id 'com.android.library' version '7.4.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
-
-    id 'androidx.navigation.safeargs.kotlin' version '2.4.1' apply false
-    id 'com.android.dynamic-feature' version '7.4.0' apply false
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -3,7 +3,6 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-parcelize'
     id 'kotlin-kapt'
-    id 'androidx.navigation.safeargs.kotlin'
 }
 
 apply from: '../shared_dependencies.gradle'
@@ -22,7 +21,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }