Fix proguard issues (#118)

Author: edgar-zigis

core/src/main/java/com/zigis/paleontologas/core/architecture/BaseRepository.kt

@@ -1,25 +1,25 @@
 package com.zigis.paleontologas.core.architecture
 
 import androidx.sqlite.db.SimpleSQLiteQuery
-import java.lang.reflect.ParameterizedType
 
 abstract class BaseRepository<T>(
-    private val dao: BaseDao<T>
+    private val dao: BaseDao<T>,
+    private val tableName: String
 ) {
     abstract suspend fun initialize()
 
     suspend fun findOne(id: Int): T {
         return dao.findOne(
             SimpleSQLiteQuery(
-                "SELECT * FROM ${databaseName()}  WHERE id=$id"
+                "SELECT * FROM $tableName  WHERE id=$id"
             )
         )
     }
 
     suspend fun findAll(): List<T> {
         return dao.findAll(
             SimpleSQLiteQuery(
-                "SELECT * FROM ${databaseName()}"
+                "SELECT * FROM $tableName"
             )
         )
     }
@@ -31,15 +31,8 @@ abstract class BaseRepository<T>(
     protected suspend fun deleteAll(): Int {
         return dao.deleteAll(
             SimpleSQLiteQuery(
-                "DELETE FROM ${databaseName()}"
+                "DELETE FROM $tableName"
             )
         )
     }
-
-    @Suppress("UNCHECKED_CAST")
-    private fun databaseName(): String {
-        val parameterizedType = javaClass.genericSuperclass as ParameterizedType
-        val classType = parameterizedType.actualTypeArguments[0] as Class<T>
-        return classType.simpleName.lowercase()
-    }
 }

features/library/src/main/java/com/zigis/paleontologas/features/library/data/LifeForm.kt

@@ -3,7 +3,7 @@ package com.zigis.paleontologas.features.library.data
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 
-@Entity
+@Entity(tableName = "life_forms")
 data class LifeForm(
     @PrimaryKey(autoGenerate = true) val id: Int,
     val periodId: Int,

features/library/src/main/java/com/zigis/paleontologas/features/library/data/LifeFormDatabase.kt

@@ -29,7 +29,7 @@ abstract class LifeFormDatabase : RoomDatabase() {
             return Room.databaseBuilder(
                 context.applicationContext,
                 LifeFormDatabase::class.java,
-                "lifeform"
+                "life_forms"
             ).fallbackToDestructiveMigration().build()
         }
     }

features/library/src/main/java/com/zigis/paleontologas/features/library/data/Period.kt

@@ -4,7 +4,7 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
 
-@Entity
+@Entity(tableName = "periods")
 data class Period(
     @PrimaryKey(autoGenerate = true) val id: Int,
     val title: String,

features/library/src/main/java/com/zigis/paleontologas/features/library/data/PeriodDatabase.kt

@@ -29,7 +29,7 @@ abstract class PeriodDatabase : RoomDatabase() {
             return Room.databaseBuilder(
                 context.applicationContext,
                 PeriodDatabase::class.java,
-                "period"
+                "periods"
             ).fallbackToDestructiveMigration().build()
         }
     }

features/library/src/main/java/com/zigis/paleontologas/features/library/repositories/LifeFormRepository.kt

@@ -11,7 +11,7 @@ import com.zigis.paleontologas.features.library.data.LifeForm
 class LifeFormRepository(
     private val context: Context,
     private val lifeFormDao: LifeFormDao
-) : BaseRepository<LifeForm>(lifeFormDao) {
+) : BaseRepository<LifeForm>(lifeFormDao, tableName = "life_forms") {
 
     @WorkerThread
     override suspend fun initialize() {
@@ -408,7 +408,7 @@ class LifeFormRepository(
     }
 
     suspend fun findAll(periodId: Int): List<LifeForm> {
-        val query = SimpleSQLiteQuery("SELECT * FROM lifeform WHERE periodId=${periodId}")
+        val query = SimpleSQLiteQuery("SELECT * FROM life_forms WHERE periodId=${periodId}")
         return findAll(query)
     }
 }

features/library/src/main/java/com/zigis/paleontologas/features/library/repositories/PeriodRepository.kt

@@ -10,7 +10,7 @@ import com.zigis.paleontologas.features.library.data.Period
 class PeriodRepository(
     private val context: Context,
     private val periodDao: PeriodDao
-) : BaseRepository<Period>(periodDao) {
+) : BaseRepository<Period>(periodDao, tableName = "periods") {
 
     @WorkerThread
     override suspend fun initialize() {

features/quiz/src/main/java/com/zigis/paleontologas/features/quiz/data/Question.kt

@@ -4,7 +4,7 @@ import androidx.room.Entity
 import androidx.room.Ignore
 import androidx.room.PrimaryKey
 
-@Entity
+@Entity(tableName = "quiz_questions")
 data class Question(
     @PrimaryKey(autoGenerate = true) val id: Int,
     val periodId: Int,

features/quiz/src/main/java/com/zigis/paleontologas/features/quiz/data/QuestionDatabase.kt

@@ -29,7 +29,7 @@ abstract class QuestionDatabase : RoomDatabase() {
             return Room.databaseBuilder(
                 context.applicationContext,
                 QuestionDatabase::class.java,
-                "question"
+                "quiz_questions"
             ).fallbackToDestructiveMigration().build()
         }
     }

features/quiz/src/main/java/com/zigis/paleontologas/features/quiz/repositories/QuestionRepository.kt

@@ -11,7 +11,7 @@ import com.zigis.paleontologas.features.quiz.data.QuestionDao
 class QuestionRepository(
     private val context: Context,
     private val questionDao: QuestionDao
-) : BaseRepository<Question>(questionDao) {
+) : BaseRepository<Question>(questionDao, "quiz_questions") {
 
     @WorkerThread
     override suspend fun initialize() {
@@ -40,7 +40,7 @@ class QuestionRepository(
     }
 
     suspend fun findAll(periodId: Int): List<Question> {
-        val query = SimpleSQLiteQuery("SELECT * FROM question WHERE periodId=${periodId}")
+        val query = SimpleSQLiteQuery("SELECT * FROM quiz_questions WHERE periodId=${periodId}")
         return findAll(query)
     }
 

shared.build.gradle

@@ -30,9 +30,9 @@ android {
     buildTypes {
         release {
             if (this.name == 'app') {
-                shrinkResources true
+                shrinkResources false
+                minifyEnabled true
             }
-            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }