Fixing release build (#51)

* update package for module persistence
* fix package name in manifest
* set min sdk to 21 version
* turn off proguard for release builds

app/build.gradle

@@ -43,6 +43,7 @@ android {
     buildTypes {
         release {
             minifyEnabled false
+            useProguard false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
 

app/src/main/java/com/agileburo/anytype/di/main/DataModule.kt

@@ -7,7 +7,7 @@ import com.agileburo.anytype.data.auth.repo.block.BlockDataRepository
 import com.agileburo.anytype.data.auth.repo.block.BlockDataStoreFactory
 import com.agileburo.anytype.data.auth.repo.block.BlockRemote
 import com.agileburo.anytype.data.auth.repo.block.BlockRemoteDataStore
-import com.agileburo.anytype.db.AnytypeDatabase
+import com.agileburo.anytype.persistence.db.AnytypeDatabase
 import com.agileburo.anytype.device.DefaultPathProvider
 import com.agileburo.anytype.domain.auth.repo.AuthRepository
 import com.agileburo.anytype.domain.block.repo.BlockRepository
@@ -17,7 +17,7 @@ import com.agileburo.anytype.middleware.auth.AuthMiddleware
 import com.agileburo.anytype.middleware.block.BlockMiddleware
 import com.agileburo.anytype.middleware.interactor.EventHandler
 import com.agileburo.anytype.middleware.interactor.Middleware
-import com.agileburo.anytype.repo.DefaultAuthCache
+import com.agileburo.anytype.persistence.repo.DefaultAuthCache
 import dagger.Module
 import dagger.Provides
 import javax.inject.Singleton

app/src/main/java/com/agileburo/anytype/ui/contacts/ContactsFragment.kt

@@ -45,6 +45,7 @@ class ContactsFragment :
                     layoutManager = LinearLayoutManager(requireContext())
                     addItemDecoration(ListDividerItemDecoration(requireContext()))
                     contactsAdapter = ContactsAdapter(vm::onContactClick)
+                    adapter = contactsAdapter
                 }
 
                 with(recyclerFilters) {
@@ -57,6 +58,7 @@ class ContactsFragment :
                         )
                     )
                     filtersAdapter = FiltersAdapter(vm::onFilterClick)
+                    adapter = filtersAdapter
                 }
                 vm.getFilters()
             }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     ext.compile_sdk = 29
     ext.target_sdk = 29
-    ext.min_sdk = 26
+    ext.min_sdk = 21
 
     ext.application_id = 'com.agileburo.anytype'
     ext.version_name = '1.0'

middleware/src/main/AndroidManifest.xml

@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.agileburo.anytype" />
+    package="com.agileburo.anytype.middleware" />

persistence/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.agileburo.anytype" />
+<manifest package="com.agileburo.anytype.persistence" />

persistence/src/main/java/com/agileburo/anytype/persistence/common/Config.kt

@@ -1,4 +1,4 @@
-package com.agileburo.anytype.common
+package com.agileburo.anytype.persistence.common
 
 object Config {
 

persistence/src/main/java/com/agileburo/anytype/persistence/common/Provider.kt

@@ -1,4 +1,4 @@
-package com.agileburo.anytype.common
+package com.agileburo.anytype.persistence.common
 
 abstract class Provider<in P, out T> {
     private var original: T? = null

persistence/src/main/java/com/agileburo/anytype/persistence/dao/AccountDao.kt

@@ -1,9 +1,9 @@
-package com.agileburo.anytype.dao
+package com.agileburo.anytype.persistence.dao
 
 import androidx.room.Dao
 import androidx.room.Query
-import com.agileburo.anytype.common.Config
-import com.agileburo.anytype.model.AccountTable
+import com.agileburo.anytype.persistence.common.Config
+import com.agileburo.anytype.persistence.model.AccountTable
 
 @Dao
 abstract class AccountDao : BaseDao<AccountTable> {

persistence/src/main/java/com/agileburo/anytype/persistence/dao/BaseDao.kt

@@ -1,4 +1,4 @@
-package com.agileburo.anytype.dao
+package com.agileburo.anytype.persistence.dao
 
 import androidx.room.Delete
 import androidx.room.Insert

persistence/src/main/java/com/agileburo/anytype/persistence/db/AnytypeDatabase.kt

@@ -1,15 +1,15 @@
-package com.agileburo.anytype.db
+package com.agileburo.anytype.persistence.db
 
 import android.content.Context
 import androidx.room.Database
 import androidx.room.Room.databaseBuilder
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.agileburo.anytype.common.Config
-import com.agileburo.anytype.common.Provider
-import com.agileburo.anytype.dao.AccountDao
-import com.agileburo.anytype.model.AccountTable
-import com.agileburo.anytype.util.Converters
+import com.agileburo.anytype.persistence.common.Config
+import com.agileburo.anytype.persistence.common.Provider
+import com.agileburo.anytype.persistence.dao.AccountDao
+import com.agileburo.anytype.persistence.model.AccountTable
+import com.agileburo.anytype.persistence.util.Converters
 
 @Database(
     entities = [AccountTable::class],

persistence/src/main/java/com/agileburo/anytype/persistence/mapper/MapperExtension.kt

@@ -1,8 +1,8 @@
-package com.agileburo.anytype.mapper
+package com.agileburo.anytype.persistence.mapper
 
 import com.agileburo.anytype.data.auth.model.AccountEntity
 import com.agileburo.anytype.data.auth.model.ImageEntity
-import com.agileburo.anytype.model.AccountTable
+import com.agileburo.anytype.persistence.model.AccountTable
 
 fun AccountTable.toEntity(): AccountEntity {
     return AccountEntity(

persistence/src/main/java/com/agileburo/anytype/persistence/model/AccountTable.kt

@@ -1,11 +1,11 @@
-package com.agileburo.anytype.model
+package com.agileburo.anytype.persistence.model
 
 import androidx.room.Embedded
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverters
-import com.agileburo.anytype.common.Config
-import com.agileburo.anytype.util.Converters
+import com.agileburo.anytype.persistence.common.Config
+import com.agileburo.anytype.persistence.util.Converters
 
 @Entity(tableName = Config.ACCOUNT_TABLE_NAME)
 data class AccountTable(

persistence/src/main/java/com/agileburo/anytype/persistence/repo/DefaultAuthCache.kt

@@ -1,11 +1,11 @@
-package com.agileburo.anytype.repo
+package com.agileburo.anytype.persistence.repo
 
 import android.content.SharedPreferences
 import com.agileburo.anytype.data.auth.model.AccountEntity
 import com.agileburo.anytype.data.auth.repo.AuthCache
-import com.agileburo.anytype.db.AnytypeDatabase
-import com.agileburo.anytype.mapper.toEntity
-import com.agileburo.anytype.mapper.toTable
+import com.agileburo.anytype.persistence.db.AnytypeDatabase
+import com.agileburo.anytype.persistence.mapper.toEntity
+import com.agileburo.anytype.persistence.mapper.toTable
 import timber.log.Timber
 
 class DefaultAuthCache(

persistence/src/main/java/com/agileburo/anytype/persistence/util/Converters.kt

@@ -1,7 +1,7 @@
-package com.agileburo.anytype.util
+package com.agileburo.anytype.persistence.util
 
 import androidx.room.TypeConverter
-import com.agileburo.anytype.model.AccountTable
+import com.agileburo.anytype.persistence.model.AccountTable
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 

persistence/src/test/java/com/agileburo/anytype/AccountDaoTest.kt

@@ -3,8 +3,8 @@ package com.agileburo.anytype
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.room.Room
 import androidx.test.platform.app.InstrumentationRegistry
-import com.agileburo.anytype.db.AnytypeDatabase
-import com.agileburo.anytype.model.AccountTable
+import com.agileburo.anytype.persistence.db.AnytypeDatabase
+import com.agileburo.anytype.persistence.model.AccountTable
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.After