Merge pull request #90 from infinum/develop

Courtesy PR

Author: bojankoma

CHANGELOG.md

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+## Version 5.3.3
+
+_2021-04-30_
+
+* Fix refreshing schema or content when editor has affected rows.
+
 ## Version 5.3.2
 
 _2021-04-26_

README.md

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

build.properties

@@ -1 +1 @@
-build.debug=true
+build.debug=false

config.gradle

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

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/content/shared/ContentActivity.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.DialogInterface
 import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.ActivityResultLauncher
 import androidx.annotation.MenuRes
 import androidx.annotation.StringRes
 import androidx.paging.LoadState
@@ -22,6 +23,7 @@ import com.infinum.dbinspector.ui.content.view.ViewViewModel
 import com.infinum.dbinspector.ui.pragma.PragmaActivity
 import com.infinum.dbinspector.ui.shared.base.BaseActivity
 import com.infinum.dbinspector.ui.shared.base.lifecycle.LifecycleConnection
+import com.infinum.dbinspector.ui.shared.contracts.EditContract
 import com.infinum.dbinspector.ui.shared.delegates.lifecycleConnection
 import com.infinum.dbinspector.ui.shared.delegates.viewBinding
 import com.infinum.dbinspector.ui.shared.edgefactories.bounce.BounceEdgeEffectFactory
@@ -50,13 +52,21 @@ internal abstract class ContentActivity : BaseActivity() {
 
     private lateinit var contentAdapter: ContentAdapter
 
+    private lateinit var contract: ActivityResultLauncher<EditContract.Input>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding.toolbar.setNavigationOnClickListener { finish() }
 
         contentPreviewFactory = ContentPreviewFactory(this)
 
+        contract = registerForActivityResult(EditContract()) { shouldRefresh ->
+            if (shouldRefresh) {
+                contentAdapter.refresh()
+            }
+        }
+
         if (connection.hasSchemaData) {
             viewModel.databasePath = connection.databasePath!!
             viewModel.open()
@@ -105,6 +115,11 @@ internal abstract class ContentActivity : BaseActivity() {
         }
     }
 
+    override fun onDestroy() {
+        contract.unregister()
+        super.onDestroy()
+    }
+
     private fun setupUi(databasePath: String, databaseName: String, schemaName: String) {
         with(binding.toolbar) {
             title = getString(this@ContentActivity.title)
@@ -125,7 +140,7 @@ internal abstract class ContentActivity : BaseActivity() {
                         true
                     }
                     R.id.edit -> {
-                        contentPreviewFactory.showEdit(databasePath, databaseName)
+                        showEdit(databasePath, databaseName)
                         true
                     }
                     else -> false
@@ -198,4 +213,12 @@ internal abstract class ContentActivity : BaseActivity() {
         )
         finish()
     }
+
+    private fun showEdit(databasePath: String, databaseName: String) =
+        contract.launch(
+            EditContract.Input(
+                databasePath = databasePath,
+                databaseName = databaseName
+            )
+        )
 }

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/content/shared/ContentPreviewFactory.kt

@@ -6,7 +6,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.DialogInterface
-import android.content.Intent
 import android.graphics.BitmapFactory
 import android.text.format.Formatter
 import android.view.LayoutInflater
@@ -21,8 +20,6 @@ import com.infinum.dbinspector.domain.schema.shared.models.ImageType
 import com.infinum.dbinspector.domain.shared.models.Cell
 import com.infinum.dbinspector.extensions.toChecksum
 import com.infinum.dbinspector.extensions.toUtf8String
-import com.infinum.dbinspector.ui.Presentation
-import com.infinum.dbinspector.ui.edit.EditActivity
 import java.io.File
 import java.io.FileOutputStream
 
@@ -32,15 +29,6 @@ internal class ContentPreviewFactory(
 
     private val clipboardManager = activity.getSystemService(Context.CLIPBOARD_SERVICE) as? ClipboardManager
 
-    fun showEdit(databasePath: String, databaseName: String) =
-        activity.startActivity(
-            Intent(activity, EditActivity::class.java)
-                .apply {
-                    putExtra(Presentation.Constants.Keys.DATABASE_PATH, databasePath)
-                    putExtra(Presentation.Constants.Keys.DATABASE_NAME, databaseName)
-                }
-        )
-
     fun showCell(cell: Cell) {
         cell.data?.let { bytes ->
             when (cell.imageType) {

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/edit/EditActivity.kt

@@ -1,5 +1,7 @@
 package com.infinum.dbinspector.ui.edit
 
+import android.app.Activity
+import android.content.Intent
 import android.os.Bundle
 import androidx.core.view.isVisible
 import androidx.core.widget.doOnTextChanged
@@ -12,6 +14,7 @@ import com.infinum.dbinspector.R
 import com.infinum.dbinspector.databinding.DbinspectorActivityEditBinding
 import com.infinum.dbinspector.domain.shared.models.Cell
 import com.infinum.dbinspector.extensions.setupAsTable
+import com.infinum.dbinspector.ui.Presentation
 import com.infinum.dbinspector.ui.content.shared.ContentAdapter
 import com.infinum.dbinspector.ui.content.shared.ContentPreviewFactory
 import com.infinum.dbinspector.ui.edit.history.HistoryDialog
@@ -189,6 +192,12 @@ internal class EditActivity : BaseActivity(), HistoryDialog.Listener {
                     rowCount
                 )
         }
+        setResult(
+            Activity.RESULT_OK,
+            Intent().apply {
+                putExtra(Presentation.Constants.Keys.SHOULD_REFRESH, true)
+            }
+        )
     }
 
     private fun showError(message: String?) {

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/schema/SchemaActivity.kt

@@ -1,19 +1,19 @@
 package com.infinum.dbinspector.ui.schema
 
-import android.content.Intent
 import android.os.Bundle
+import androidx.activity.result.ActivityResultLauncher
 import com.google.android.material.tabs.TabLayoutMediator
 import com.infinum.dbinspector.R
 import com.infinum.dbinspector.databinding.DbinspectorActivitySchemaBinding
 import com.infinum.dbinspector.domain.schema.shared.models.SchemaType
 import com.infinum.dbinspector.extensions.searchView
 import com.infinum.dbinspector.extensions.setup
 import com.infinum.dbinspector.extensions.uppercase
-import com.infinum.dbinspector.ui.Presentation
-import com.infinum.dbinspector.ui.edit.EditActivity
+import com.infinum.dbinspector.ui.schema.shared.SchemaFragment
 import com.infinum.dbinspector.ui.schema.shared.SchemaTypeAdapter
 import com.infinum.dbinspector.ui.shared.base.BaseActivity
 import com.infinum.dbinspector.ui.shared.base.lifecycle.LifecycleConnection
+import com.infinum.dbinspector.ui.shared.contracts.EditContract
 import com.infinum.dbinspector.ui.shared.delegates.lifecycleConnection
 import com.infinum.dbinspector.ui.shared.delegates.viewBinding
 import com.infinum.dbinspector.ui.shared.searchable.Searchable
@@ -27,6 +27,8 @@ internal class SchemaActivity : BaseActivity(), Searchable {
 
     private val connection: LifecycleConnection by lifecycleConnection()
 
+    private lateinit var contract: ActivityResultLauncher<EditContract.Input>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -39,9 +41,18 @@ internal class SchemaActivity : BaseActivity(), Searchable {
         } else {
             showDatabaseParametersError()
         }
+
+        contract = registerForActivityResult(EditContract()) { shouldRefresh ->
+            if (shouldRefresh) {
+                supportFragmentManager.fragments
+                    .filterIsInstance<SchemaFragment>()
+                    .forEach { it.refresh() }
+            }
+        }
     }
 
     override fun onDestroy() {
+        contract.unregister()
         viewModel.close()
         super.onDestroy()
     }
@@ -93,11 +104,10 @@ internal class SchemaActivity : BaseActivity(), Searchable {
     }
 
     private fun showEdit(databasePath: String, databaseName: String) =
-        startActivity(
-            Intent(this, EditActivity::class.java)
-                .apply {
-                    putExtra(Presentation.Constants.Keys.DATABASE_PATH, databasePath)
-                    putExtra(Presentation.Constants.Keys.DATABASE_NAME, databaseName)
-                }
+        contract.launch(
+            EditContract.Input(
+                databasePath = databasePath,
+                databaseName = databaseName
+            )
         )
 }

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/schema/shared/SchemaFragment.kt

@@ -107,6 +107,8 @@ internal abstract class SchemaFragment :
         query(query)
     }
 
+    fun refresh() = schemaAdapter.refresh()
+
     private fun query(query: String?) {
         viewModel.query(databasePath, query) {
             schemaAdapter.submitData(it)

dbinspector/src/main/kotlin/com/infinum/dbinspector/ui/shared/contracts/EditContract.kt

@@ -0,0 +1,22 @@
+package com.infinum.dbinspector.ui.shared.contracts
+
+import android.content.Context
+import android.content.Intent
+import com.infinum.dbinspector.ui.Presentation
+import com.infinum.dbinspector.ui.edit.EditActivity
+import com.infinum.dbinspector.ui.shared.base.BaseContract
+
+internal class EditContract : BaseContract<EditContract.Input>() {
+
+    override fun createIntent(context: Context, input: Input): Intent =
+        Intent(context, EditActivity::class.java)
+            .apply {
+                putExtra(Presentation.Constants.Keys.DATABASE_PATH, input.databasePath)
+                putExtra(Presentation.Constants.Keys.DATABASE_NAME, input.databaseName)
+            }
+
+    data class Input(
+        val databaseName: String,
+        val databasePath: String
+    ) : BaseContract.Input
+}