Merge pull request #83 from infinum/develop

Develop

Author: bojankoma

CHANGELOG.md

@@ -1,6 +1,15 @@
 Changelog
 =========
 
+## Version 5.2.8
+
+_2021-03-11_
+
+* Add tablet support on databases list.
+* Update dependencies to more stable releases.
+* Fix Lint issues.
+* Enable Proguard for release builds.
+
 ## Version 5.2.7
 
 _2021-02-24_

README.md

@@ -43,13 +43,13 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle.
 
 **Groovy**
 ```groovy
-debugImplementation "com.infinum.dbinspector:dbinspector:5.2.7"
-releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.2.7"
+debugImplementation "com.infinum.dbinspector:dbinspector:5.2.8"
+releaseImplementation "com.infinum.dbinspector:dbinspector-no-op:5.2.8"
 ```
 **KotlinDSL**
 ```kotlin
-debugImplementation("com.infinum.dbinspector:dbinspector:5.2.7")
-releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.2.7")
+debugImplementation("com.infinum.dbinspector:dbinspector:5.2.8")
+releaseImplementation("com.infinum.dbinspector:dbinspector-no-op:5.2.8")
 ```
 
 ### Usage

config.gradle

@@ -7,7 +7,7 @@ ext {
     ]
     releaseConfig = [
             "group"      : "com.infinum.dbinspector",
-            "version"    : "5.2.7",
-            "versionCode": 5 * 100 * 100 + 2 * 100 + 7
+            "version"    : "5.2.8",
+            "versionCode": 5 * 100 * 100 + 2 * 100 + 8
     ]
 }

dbinspector-no-op/build.gradle

@@ -39,6 +39,7 @@ android {
         freeCompilerArgs += [
                 '-Xexplicit-api=strict'
         ]
+        useIR = true
     }
 
     sourceSets.each {

dbinspector/build.gradle

@@ -24,13 +24,17 @@ android {
         }
         release {
             debuggable false
-            minifyEnabled false // TODO: Enable once R8/D8 works with Protobuf
+            minifyEnabled true
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
         }
     }
 
     resourcePrefix "dbinspector_"
 
+    lintOptions {
+        disable 'InvalidFragmentVersionForActivityResult', 'VectorPath', 'IconLocation'
+    }
+
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -42,6 +46,7 @@ android {
                 '-Xopt-in=org.koin.core.component.KoinApiExtension',
                 '-Xexplicit-api=strict'
         ]
+        useIR = true
     }
 
     sourceSets.each {
@@ -57,13 +62,15 @@ dependencies {
     implementation packages.kotlin.core
     implementation packages.androidx.core
     implementation packages.androidx.appcompat
+    implementation packages.androidx.activity
     implementation packages.androidx.fragment
     implementation packages.androidx.recyclerview
     implementation packages.androidx.viewpager
     implementation packages.androidx.paging
     implementation packages.androidx.startup
     implementation packages.androidx.swiperefreshlayout
     implementation packages.androidx.datastore
+    implementation packages.androidx.dynamicanimation
     implementation packages.google.protobuf.javalite
     implementation packages.google.design
     implementation packages.kotlinx.coroutines

dbinspector/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.infinum.dbinspector">
 
-    <application>
+    <application android:supportsRtl="false">
 
         <activity-alias
             android:name="com.infinum.dbinspector.DbInspectorActivity"

dbinspector/src/main/kotlin/com/infinum/dbinspector/data/Data.kt

@@ -1,8 +1,8 @@
 package com.infinum.dbinspector.data
 
 import android.content.Context
+import androidx.datastore.core.DataStoreFactory
 import androidx.datastore.core.Serializer
-import androidx.datastore.createDataStore
 import com.infinum.dbinspector.data.Data.Constants.Name.PROTO_FILENAME_HISTORY
 import com.infinum.dbinspector.data.Data.Constants.Name.PROTO_FILENAME_SETTINGS
 import com.infinum.dbinspector.data.models.local.proto.output.HistoryEntity
@@ -18,6 +18,7 @@ import com.infinum.dbinspector.data.source.memory.connection.AndroidConnectionSo
 import com.infinum.dbinspector.data.source.memory.pagination.CursorPaginator
 import com.infinum.dbinspector.data.source.memory.pagination.Paginator
 import com.infinum.dbinspector.data.source.raw.AndroidDatabasesSource
+import com.infinum.dbinspector.extensions.dataStoreFile
 import org.koin.core.module.Module
 import org.koin.core.qualifier.StringQualifier
 import org.koin.dsl.module
@@ -114,19 +115,22 @@ internal object Data {
         single<Sources.Local.Settings> {
             val context: Context = get()
             SettingsDataStore(
-                context.createDataStore(
-                    fileName = get(qualifier = Qualifiers.Name.DATASTORE_SETTINGS),
-                    serializer = get(qualifier = Qualifiers.Name.DATASTORE_SETTINGS)
-                )
+                DataStoreFactory.create(
+                    get(qualifier = Qualifiers.Name.DATASTORE_SETTINGS)
+                ) {
+                    context.dataStoreFile(get(qualifier = Qualifiers.Name.DATASTORE_SETTINGS))
+                }
             )
         }
         single<Sources.Local.History> {
             val context: Context = get()
+
             HistoryDataStore(
-                context.createDataStore(
-                    fileName = get(qualifier = Qualifiers.Name.DATASTORE_HISTORY),
-                    serializer = get(qualifier = Qualifiers.Name.DATASTORE_HISTORY)
-                )
+                DataStoreFactory.create(
+                    get(qualifier = Qualifiers.Name.DATASTORE_HISTORY)
+                ) {
+                    context.dataStoreFile(get(qualifier = Qualifiers.Name.DATASTORE_HISTORY))
+                }
             )
         }
 

dbinspector/src/main/kotlin/com/infinum/dbinspector/data/source/local/proto/history/HistorySerializer.kt

@@ -6,20 +6,27 @@ import com.google.protobuf.InvalidProtocolBufferException
 import com.infinum.dbinspector.data.models.local.proto.output.HistoryEntity
 import java.io.InputStream
 import java.io.OutputStream
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlinx.coroutines.suspendCancellableCoroutine
 
 internal class HistorySerializer : Serializer<HistoryEntity> {
 
     override val defaultValue: HistoryEntity =
         HistoryEntity.getDefaultInstance()
 
-    override fun readFrom(input: InputStream): HistoryEntity {
-        try {
-            return HistoryEntity.parseFrom(input)
-        } catch (exception: InvalidProtocolBufferException) {
-            throw CorruptionException("Cannot read proto.", exception)
+    override suspend fun readFrom(input: InputStream): HistoryEntity =
+        suspendCancellableCoroutine { continuation ->
+            try {
+                continuation.resume(HistoryEntity.parseFrom(input))
+            } catch (exception: InvalidProtocolBufferException) {
+                continuation.resumeWithException(CorruptionException("Cannot read proto.", exception))
+            }
         }
-    }
 
-    override fun writeTo(t: HistoryEntity, output: OutputStream) =
-        t.writeTo(output)
+    override suspend fun writeTo(t: HistoryEntity, output: OutputStream): Unit =
+        suspendCancellableCoroutine { continuation ->
+            t.writeTo(output)
+            continuation.resume(Unit)
+        }
 }

dbinspector/src/main/kotlin/com/infinum/dbinspector/data/source/local/proto/settings/SettingsSerializer.kt

@@ -6,20 +6,27 @@ import com.google.protobuf.InvalidProtocolBufferException
 import com.infinum.dbinspector.data.models.local.proto.output.SettingsEntity
 import java.io.InputStream
 import java.io.OutputStream
+import kotlin.coroutines.resume
+import kotlin.coroutines.resumeWithException
+import kotlinx.coroutines.suspendCancellableCoroutine
 
 internal class SettingsSerializer : Serializer<SettingsEntity> {
 
     override val defaultValue: SettingsEntity =
         SettingsEntity.getDefaultInstance()
 
-    override fun readFrom(input: InputStream): SettingsEntity {
-        try {
-            return SettingsEntity.parseFrom(input)
-        } catch (exception: InvalidProtocolBufferException) {
-            throw CorruptionException("Cannot read proto.", exception)
+    override suspend fun readFrom(input: InputStream): SettingsEntity =
+        suspendCancellableCoroutine { continuation ->
+            try {
+                continuation.resume(SettingsEntity.parseFrom(input))
+            } catch (exception: InvalidProtocolBufferException) {
+                continuation.resumeWithException(CorruptionException("Cannot read proto.", exception))
+            }
         }
-    }
 
-    override fun writeTo(t: SettingsEntity, output: OutputStream) =
-        t.writeTo(output)
+    override suspend fun writeTo(t: SettingsEntity, output: OutputStream): Unit =
+        suspendCancellableCoroutine { continuation ->
+            t.writeTo(output)
+            continuation.resume(Unit)
+        }
 }

dbinspector/src/main/kotlin/com/infinum/dbinspector/extensions/Context.kt

@@ -7,6 +7,10 @@ import android.util.TypedValue
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.core.content.ContextCompat
+import java.io.File
+
+internal fun Context.dataStoreFile(fileName: String): File =
+    File(filesDir, "datastore/$fileName")
 
 internal val Context.databaseDir: String
     get() = "${filesDir.path.substring(0, filesDir.path.lastIndexOf("/"))}/databases"