Merge branch 'release/1.2.1' into main

G00fY2 · Jul 1, 2021 · 21a6ac0 · 21a6ac0
2 parents 56f02e1 + 3296683
commit 21a6ac0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -18,10 +18,10 @@ There are two different flavors available on `mavenCentral()`:
 | V2 model is used (possibly faster, more accurate) | currently V1 model will be downloaded
 ```kotlin
 // bundled:  
-implementation("io.github.g00fy2.quickie:quickie-bundled:1.2.0")
+implementation("io.github.g00fy2.quickie:quickie-bundled:1.2.1")
 
 // unbundled:
-implementation("io.github.g00fy2.quickie:quickie-unbundled:1.2.0")
+implementation("io.github.g00fy2.quickie:quickie-unbundled:1.2.1")
 ```
 
 ## Quick Start

diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -5,13 +5,13 @@ object Versions {
   const val androidTargetSdk = 30
   const val androidBuildTools = "30.0.3"
 
-  const val androidGradle = "4.2.1"
+  const val androidGradle = "4.2.2"
   const val kotlin = "1.5.20"
 
   const val appcompat = "1.3.0"
 
   const val cameraX = "1.0.0"
-  const val cameraView = "1.0.0-alpha25"
+  const val cameraView = "1.0.0-alpha26"
 
   const val barcodeScanning = "16.2.0"
   const val barcodeScanningGms = "16.2.0"

diff --git a/quickie/build.gradle.kts b/quickie/build.gradle.kts
@@ -43,7 +43,7 @@ dependencies {
 }
 
 group = "io.github.g00fy2.quickie"
-version = "1.2.0"
+version = "1.2.1"
 
 tasks.register<Jar>("androidJavadocJar") {
   archiveClassifier.set("javadoc")

diff --git a/quickie/src/main/kotlin/io/github/g00fy2/quickie/QROverlayView.kt b/quickie/src/main/kotlin/io/github/g00fy2/quickie/QROverlayView.kt
@@ -103,7 +103,7 @@ internal class QROverlayView @JvmOverloads constructor(
   }
 
   fun setTorchVisibilityAndOnClick(visible: Boolean, action: (Boolean) -> Unit = {}) {
-    binding.torchImageView.visibility = if (visible) View.VISIBLE else View.INVISIBLE
+    binding.torchImageView.visibility = if (visible) View.VISIBLE else View.GONE
     binding.torchImageView.setOnClickListener { action(!it.isSelected) }
   }
 

diff --git a/quickie/src/main/res/layout/quickie_overlay_view.xml b/quickie/src/main/res/layout/quickie_overlay_view.xml
@@ -34,7 +34,7 @@
       android:layout_margin="12dp"
       android:background="@drawable/quickie_bg_torch"
       android:padding="12dp"
-      android:visibility="invisible"
+      android:visibility="gone"
       app:srcCompat="@drawable/quickie_ic_torch"
       tools:visibility="visible"
       />
@@ -56,6 +56,7 @@
         android:indeterminate="true"
         android:indeterminateTint="@color/quickie_stroke"
         />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"