Merge pull request #94 from Spikeysanju/Update-Release-Build

Fix proguard-rules.pro #93
Spikeysanju · Nov 12, 2021 · a981727 · a981727
2 parents 76956fc + 4b7eaeb
commit a981727
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -22,7 +22,7 @@ plugins {
     id("kotlin-android")
     id("kotlin-kapt")
     id("dagger.hilt.android.plugin")
-    kotlin("plugin.serialization") version "1.4.0"
+    kotlin("plugin.serialization") version "1.5.31"
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
 }
@@ -35,8 +35,8 @@ android {
         applicationId = "dev.spikeysanju.einsen"
         minSdk = 21
         targetSdk = 30
-        versionCode = 2
-        versionName = "v1.0.0-alpha02"
+        versionCode = 3
+        versionName = "v1.0.0-alpha03"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -18,4 +18,14 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+-renamesourcefileattribute SourceFile
+
+-keepattributes *Annotation*, InnerClasses
+-dontnote kotlinx.serialization.SerializationKt
+-keep,includedescriptorclasses class dev.spikeysanju.einsen.**$$serializer { *; }
+-keepclassmembers class dev.spikeysanju.einsen.** {
+    *** Companion;
+}
+-keepclasseswithmembers class dev.spikeysanju.einsen.** {
+    kotlinx.serialization.KSerializer serializer(...);
+}
diff --git a/app/src/main/java/dev/spikeysanju/einsen/model/emoji/Emoji.kt b/app/src/main/java/dev/spikeysanju/einsen/model/emoji/Emoji.kt
@@ -19,7 +19,9 @@
 
 package dev.spikeysanju.einsen.model.emoji
 
+import androidx.annotation.Keep
 import kotlinx.serialization.Serializable
 
+@Keep
 @Serializable
 class Emoji : ArrayList<EmojiItem>()
diff --git a/app/src/main/java/dev/spikeysanju/einsen/model/emoji/EmojiItem.kt b/app/src/main/java/dev/spikeysanju/einsen/model/emoji/EmojiItem.kt
@@ -19,23 +19,19 @@
 
 package dev.spikeysanju.einsen.model.emoji
 
-import androidx.annotation.NonNull
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
+import androidx.annotation.Keep
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-@Entity(tableName = "emojis")
+@Keep
 @Serializable
 data class EmojiItem(
-    @NonNull
-    @PrimaryKey(autoGenerate = false)
-    @ColumnInfo(name = "emoji")
+    @SerialName("emoji")
     val emoji: String,
-    @ColumnInfo(name = "description")
+    @SerialName("description")
     val description: String,
-    @ColumnInfo(name = "category")
+    @SerialName("category")
     val category: String,
-    @ColumnInfo(name = "aliases")
+    @SerialName("aliases")
     val aliases: List<String>
 )
diff --git a/app/src/main/java/dev/spikeysanju/einsen/view/allemoji/AllEmojiScreen.kt b/app/src/main/java/dev/spikeysanju/einsen/view/allemoji/AllEmojiScreen.kt
@@ -122,7 +122,7 @@ fun AllEmojiScreen(
                         AnimationViewState(
                             title = stringResource(R.string.text_no_emoji_description),
                             description = "Please try searching with another term.\n  Ex -> star_struck",
-                            callToAction = "Retry Search",
+                            callToAction = stringResource(R.string.text_retry),
                             screenState = ScreenState.ERROR,
                             actions = {
                                 scope.launch {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -80,5 +80,6 @@
     <string name="text_four">4</string>
     <string name="text_search_emoji">Search Emoji...</string>
     <string name="text_go_back">Go Back!</string>
+    <string name="text_retry">Retry Search</string>
 
 </resources>