Merge pull request #162 from rosuH/dev

UI improvement.
rosuH · May 4, 2022 · 85e5773 · 85e5773
2 parents 0490a47 + 6dee130
commit 85e5773
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 28 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -15,8 +15,8 @@ android {
         applicationId = "me.rosuh.easywatermark"
         minSdk = (Apps.minSdk)
         targetSdk = (Apps.targetSdk)
-        versionCode = 20705
-        versionName = "2.7.5"
+        versionCode = 20706
+        versionName = "2.7.6"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
     }
@@ -81,21 +81,21 @@ dependencies {
     kapt("com.google.dagger:hilt-compiler:2.40.4")
     implementation("com.github.bumptech.glide:glide:4.13.1")
     kapt("com.github.bumptech.glide:compiler:4.13.1")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
     implementation("androidx.appcompat:appcompat:1.4.1")
     implementation("id.zelory:compressor:3.0.1")
-    implementation("com.google.android.material:material:1.6.0-alpha03")
-    implementation("androidx.fragment:fragment-ktx:1.4.0")
+    implementation("com.google.android.material:material:1.6.0-beta01")
+    implementation("androidx.fragment:fragment-ktx:1.4.1")
     implementation("androidx.activity:activity-ktx:1.4.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.4.0")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0")
     implementation("com.github.skydoves:colorpickerview:2.2.3")
     implementation("androidx.viewpager2:viewpager2:1.0.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.3")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.20")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
     implementation("androidx.exifinterface:exifinterface:1.3.3")
     implementation("androidx.palette:palette-ktx:1.0.0")
 

diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/MainActivity.kt b/app/src/main/java/me/rosuh/easywatermark/ui/MainActivity.kt
@@ -63,6 +63,9 @@ class MainActivity : AppCompatActivity() {
     private lateinit var pickIconLauncher: ActivityResultLauncher<String>
     private val viewModel: MainViewModel by viewModels()
 
+    private val currentBgColor:Int
+        get() = ((launchView.parent as? View?)?.background as? ColorDrawable)?.color ?: colorSurface
+
     private val contentFunList: List<FuncTitleModel> by lazy {
         listOf(
             FuncTitleModel(
@@ -353,10 +356,7 @@ class MainActivity : AppCompatActivity() {
             val bgColor = palette.bgColor(this)
             val titleTextColor = palette.titleTextColor(this)
 
-            bgTransformAnimator =
-                ((launchView.ivPhoto.background as? ColorDrawable)?.color ?: Color.BLACK).toColor(
-                    bgColor
-                ) {
+            bgTransformAnimator = currentBgColor.toColor(bgColor) {
                     val c = it.animatedValue as Int
                     if (launchView.isEdit()) {
                         doApplyBgChanged(c)

diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/widget/LaunchView.kt b/app/src/main/java/me/rosuh/easywatermark/ui/widget/LaunchView.kt
@@ -109,11 +109,6 @@ class LaunchView : CustomViewGroup {
                 )
             setPadding(12.dp)
             scaleType = ImageView.ScaleType.MATRIX
-            setOnTouchListener { _, event ->
-                return@setOnTouchListener rvPhotoList.onTouchEvent(
-                    event
-                )
-            }
         }
     }
 

diff --git a/app/src/main/java/me/rosuh/easywatermark/ui/widget/WaterMarkImageView.kt b/app/src/main/java/me/rosuh/easywatermark/ui/widget/WaterMarkImageView.kt
@@ -222,20 +222,10 @@ class WaterMarkImageView : androidx.appcompat.widget.AppCompatImageView, Corouti
         }
     }
 
-    private fun getAvailableCanvasWidth() = measuredWidth - paddingLeft - paddingRight
-    private fun getAvailableCanvasHeight() = measuredHeight - paddingTop - paddingBottom
-
-    private var bgTransformAnimator: ObjectAnimator? = null
-
     private fun applyBg(imageBitmap: Bitmap?) {
         launch {
             generatePalette(imageBitmap)?.let { palette ->
-                bgTransformAnimator?.cancel()
-                val color = palette.bgColor(context)
-                bgTransformAnimator =
-                    ((background as? ColorDrawable)?.color ?: Color.BLACK).toColor(color) {
-                        setBackgroundColor(it.animatedValue as Int)
-                    }
+                setBackgroundColor(Color.TRANSPARENT)
                 this@WaterMarkImageView.onBgReady.invoke(palette)
             }
         }