Migrate progress bar from databinding module to viewBinding (#123)

Grigoriy Bykov · web-flow · commit 5dba0e39d6fb · 2023-05-19T01:18:08.000+03:00
- Add AndroidUtilTargetTemplate validation to viewBinding module
- Update coroutines library version to 1.6.1 that was previously resolved automatically through transitive dependency of io.coil library
diff --git a/application/binary/build.gradle.kts b/application/binary/build.gradle.kts
@@ -18,7 +18,6 @@ androidBinary(
         target(":feature:characters:favorite:impl"),
 
         target(":common:extensions:android-util"),
-        target(":common:progressbar:databinding"),
 //        target(":common:util-native"),
         target(":core:mvvm:library"),
         target(":core:di:library")
diff --git a/application/common/progressbar/databinding/src/main/res/layout/view_progress_dialog.xml b/application/common/progressbar/databinding/src/main/res/layout/view_progress_dialog.xml
diff --git a/application/common/progressbar/viewbinding/.gitignore b/application/common/progressbar/viewbinding/.gitignore
diff --git a/application/common/progressbar/viewbinding/build.gradle.kts b/application/common/progressbar/viewbinding/build.gradle.kts
@@ -1,12 +1,11 @@
-dataBinding(
-    packageName = "com.stepango.blockme.common.progressbar.databinding",
+viewBinding(
+    packageName = "com.stepango.blockme.common.progressbar.viewbinding",
 
     dependencies = deps(
         androidx.appcompat,
         androidx.constraintlayout
     ) + deps(
         target(":common:extensions:android-util"),
-        target(":common:extensions:databinding-adapter"),
         target(":common:progressbar:res")
     )
 )
diff --git a/application/common/progressbar/viewbinding/consumer-rules.pro b/application/common/progressbar/viewbinding/consumer-rules.pro
diff --git a/application/common/progressbar/viewbinding/proguard-rules.pro b/application/common/progressbar/viewbinding/proguard-rules.pro
diff --git a/application/common/progressbar/viewbinding/src/main/java/com/stepango/blockme/common/progressbar/viewbinding/ProgressBarDialog.kt b/application/common/progressbar/viewbinding/src/main/java/com/stepango/blockme/common/progressbar/viewbinding/ProgressBarDialog.kt
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
-package com.stepango.blockme.common.progressbar.databinding
+package com.stepango.blockme.common.progressbar.viewbinding
 
 import android.content.Context
 import android.view.LayoutInflater
+import android.view.View
 import androidx.annotation.StringRes
 import androidx.appcompat.app.AlertDialog
 import com.stepango.blockme.common.extensions.android.util.getString
-import com.stepango.blockme.common.progressbar.databinding.databinding.ViewProgressDialogBinding
+import com.stepango.blockme.common.progressbar.viewbinding.databinding.ViewProgressDialogBinding
 
 /**
  * Custom progress dialog to display as alert during on long process user waiting.
@@ -58,8 +59,10 @@ class ProgressBarDialog(
         setCanceledOnTouchOutside(false)
         setCancelable(false)
 
-        viewBinding.isLoading = true
-        viewBinding.message = context.getString(messageRes)
+        viewBinding.progressBarLoading.visibility = View.VISIBLE
+        val message = context.getString(messageRes)
+        viewBinding.progressBarMessage.text = message
+        viewBinding.progressBarMessage.visibility = if (message.isEmpty()) View.GONE else View.VISIBLE
     }
 
     /**
@@ -73,7 +76,9 @@ class ProgressBarDialog(
         setCanceledOnTouchOutside(true)
         setCancelable(true)
 
-        viewBinding.isLoading = false
-        viewBinding.message = context.getString(messageRes)
+        viewBinding.progressBarLoading.visibility = View.GONE
+        val message = context.getString(messageRes)
+        viewBinding.progressBarMessage.text = message
+        viewBinding.progressBarMessage.visibility = if (message.isEmpty()) View.GONE else View.VISIBLE
     }
 }
diff --git a/application/common/progressbar/viewbinding/src/main/res/layout/view_progress_dialog.xml b/application/common/progressbar/viewbinding/src/main/res/layout/view_progress_dialog.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_progress_dialog"
+    android:padding="@dimen/progress_bar_container_padding">
+
+    <ProgressBar
+        android:id="@+id/progress_bar_loading"
+        android:layout_width="@dimen/progress_bar_loading_size"
+        android:layout_height="@dimen/progress_bar_loading_size"
+        app:layout_constraintBottom_toTopOf="@+id/progress_bar_message"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/progress_bar_message"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progress_bar_loading"
+        tools:text="Loading" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/application/feature/characters/core/impl/build.gradle.kts b/application/feature/characters/core/impl/build.gradle.kts
@@ -14,7 +14,6 @@ impl(
 
         target(":common:extensions:util"),
         target(":common:extensions:android-util"),
-        target(":common:extensions:databinding-adapter"),
         target(":common:util")
 
     ),
diff --git a/application/feature/characters/detail/impl/build.gradle.kts b/application/feature/characters/detail/impl/build.gradle.kts
@@ -29,6 +29,6 @@ impl(
 
         target(":common:util"),
         target(":common:extensions:android-util"),
-        target(":common:progressbar:databinding")
+        target(":common:progressbar:viewbinding")
     )
 )
diff --git a/application/feature/characters/detail/impl/src/main/java/com/stepango/blockme/feature/characters/detail/impl/ui/CharacterDetailFragment.kt b/application/feature/characters/detail/impl/src/main/java/com/stepango/blockme/feature/characters/detail/impl/ui/CharacterDetailFragment.kt
@@ -25,7 +25,7 @@ import by.kirich1409.viewbindingdelegate.viewBinding
 import com.google.android.material.snackbar.Snackbar
 import com.stepango.blockme.common.extensions.android.util.loadImage
 import com.stepango.blockme.common.extensions.android.util.observe
-import com.stepango.blockme.common.progressbar.databinding.ProgressBarDialog
+import com.stepango.blockme.common.progressbar.viewbinding.ProgressBarDialog
 import com.stepango.blockme.core.mvvm.library.ui.BaseViewBindingFragment
 import com.stepango.blockme.core.mvvm.library.viewModels
 import com.stepango.blockme.feature.characters.core.api.di.CharactersCoreFeatureProvider
diff --git a/build-dependencies/dependencies/src/main/kotlin/Versions.kt b/build-dependencies/dependencies/src/main/kotlin/Versions.kt
@@ -2,7 +2,7 @@ object versions {
     const val coil = "2.1.0"
 
     object jetbrains {
-        const val coroutines = "1.3.7"
+        const val coroutines = "1.6.1"
     }
 
     object androidx {
diff --git a/plugins/android/src/main/java/viewBinding.kt b/plugins/android/src/main/java/viewBinding.kt
@@ -5,6 +5,7 @@ import tools.forma.android.feature.applyFeatures
 import tools.forma.android.feature.kotlinAndroidFeatureDefinition
 import tools.forma.owner.NoOwner
 import tools.forma.owner.Owner
+import tools.forma.android.target.AndroidUtilTargetTemplate
 import tools.forma.android.target.ApiTargetTemplate
 import tools.forma.android.target.LibraryTargetTemplate
 import tools.forma.android.target.ResourcesTargetTemplate
@@ -53,7 +54,8 @@ fun Project.viewBinding(
             ApiTargetTemplate,
             WidgetTargetTemplate,
             ResourcesTargetTemplate,
-            LibraryTargetTemplate
+            LibraryTargetTemplate,
+            AndroidUtilTargetTemplate,
         ),
         dependencies = dependencies,
         repositoriesConfiguration = Forma.configuration.repositories

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-dataBinding(`
`2`		`- packageName = "com.stepango.blockme.common.progressbar.databinding",`
	`1`	`+viewBinding(`
	`2`	`+ packageName = "com.stepango.blockme.common.progressbar.viewbinding",`
`3`	`3`
`4`	`4`	`dependencies = deps(`
`5`	`5`	`androidx.appcompat,`
`6`	`6`	`androidx.constraintlayout`
`7`	`7`	`) + deps(`
`8`	`8`	`target(":common:extensions:android-util"),`
`9`		`- target(":common:extensions:databinding-adapter"),`
`10`	`9`	`target(":common:progressbar:res")`
`11`	`10`	`)`
`12`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@ impl(`
`29`	`29`
`30`	`30`	`target(":common:util"),`
`31`	`31`	`target(":common:extensions:android-util"),`
`32`		`- target(":common:progressbar:databinding")`
	`32`	`+ target(":common:progressbar:viewbinding")`
`33`	`33`	`)`
`34`	`34`	`)`