Merge pull request #210 from rosuH/dev

🚑

Author: rosuH

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "me.rosuh.easywatermark"
         minSdk = (Apps.minSdk)
         targetSdk = (Apps.targetSdk)
-        versionCode = 20803
-        versionName = "2.8.3"
+        versionCode = 20804
+        versionName = "2.8.4"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
     }

app/src/main/java/me/rosuh/easywatermark/data/model/ImageInfo.kt

@@ -2,6 +2,7 @@ package me.rosuh.easywatermark.data.model
 
 import android.graphics.Shader
 import android.net.Uri
+import android.os.Build
 import androidx.annotation.FloatRange
 
 data class ImageInfo(
@@ -26,7 +27,11 @@ data class ImageInfo(
             Shader.TileMode.CLAMP.ordinal -> Shader.TileMode.CLAMP
             Shader.TileMode.MIRROR.ordinal -> Shader.TileMode.MIRROR
             Shader.TileMode.REPEAT.ordinal -> Shader.TileMode.REPEAT
-            else -> Shader.TileMode.DECAL
+            else -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                Shader.TileMode.DECAL
+            } else {
+                Shader.TileMode.CLAMP
+            }
         }
     }
 

app/src/main/java/me/rosuh/easywatermark/ui/MainViewModel.kt

@@ -297,7 +297,7 @@ class MainViewModel @Inject constructor(
                 )
             }
 
-            if (imageInfo.obtainTileMode() == Shader.TileMode.DECAL) {
+            if (imageInfo.obtainTileMode() == Shader.TileMode.CLAMP) {
                 canvas.translate(
                     0 + imageInfo.offsetX * mutableBitmap.width,
                     0 + imageInfo.offsetY * mutableBitmap.height

app/src/main/java/me/rosuh/easywatermark/ui/panel/TileModeFragment.kt

@@ -28,21 +28,21 @@ class TileModeFragment : BaseBindFragment<FragmentTileModeBinding>() {
                 return@observe
             }
             val checkedId = when (it.tileMode) {
-                Shader.TileMode.DECAL.ordinal -> R.id.rb_tile_mode_decal
+                Shader.TileMode.CLAMP.ordinal -> R.id.rb_tile_mode_decal
                 else -> R.id.rb_tile_mode_repeat
             }
             binding?.rgTileMode?.setOnCheckedChangeListener(null)
             binding?.rgTileMode?.check(checkedId)
             binding?.rgTileMode?.setOnCheckedChangeListener { _, id ->
                 val imageInfo = it
-                if (id == R.id.rb_tile_mode_decal && imageInfo.tileMode == Shader.TileMode.DECAL.ordinal) {
+                if (id == R.id.rb_tile_mode_decal && imageInfo.tileMode == Shader.TileMode.CLAMP.ordinal) {
                     return@setOnCheckedChangeListener
                 }
                 if (id == R.id.rb_tile_mode_repeat && imageInfo.tileMode == Shader.TileMode.REPEAT.ordinal) {
                     return@setOnCheckedChangeListener
                 }
                 when(id) {
-                    R.id.rb_tile_mode_decal -> shareViewModel.updateTileMode(imageInfo, Shader.TileMode.DECAL)
+                    R.id.rb_tile_mode_decal -> shareViewModel.updateTileMode(imageInfo, Shader.TileMode.CLAMP)
                     else -> shareViewModel.updateTileMode(imageInfo, Shader.TileMode.REPEAT)
                 }
             }

app/src/main/java/me/rosuh/easywatermark/ui/widget/WaterMarkImageView.kt

@@ -271,7 +271,7 @@ class WaterMarkImageView : androidx.appcompat.widget.AppCompatImageView, Corouti
         }
         layoutPaint.shader = layoutShader?.bitmapShader
         canvas?.withSave {
-            if (curImageInfo.obtainTileMode() == Shader.TileMode.DECAL) {
+            if (curImageInfo.obtainTileMode() == Shader.TileMode.CLAMP) {
                 translate(
                     drawableBounds.left + curImageInfo.offsetX * drawableBounds.width(),
                     drawableBounds.top + curImageInfo.offsetY * drawableBounds.height()
@@ -321,7 +321,7 @@ class WaterMarkImageView : androidx.appcompat.widget.AppCompatImageView, Corouti
     }
 
     private fun updateWaterMarkOffset(deltaX: Float, deltaY: Float): ImageInfo {
-        if (curImageInfo.obtainTileMode() != Shader.TileMode.DECAL) {
+        if (curImageInfo.obtainTileMode() != Shader.TileMode.CLAMP) {
             return curImageInfo
         }
         val newOffsetX = (curImageInfo.offsetX + deltaX / drawableBounds.width())
@@ -337,7 +337,7 @@ class WaterMarkImageView : androidx.appcompat.widget.AppCompatImageView, Corouti
     private var touchRect = RectF()
 
     fun isOutOfDrawable(deltaX: Float, deltaY: Float): Boolean {
-        if (curImageInfo.obtainTileMode() != Shader.TileMode.DECAL) {
+        if (curImageInfo.obtainTileMode() != Shader.TileMode.CLAMP) {
             return false
         }
         val newOffsetX = (curImageInfo.offsetX + deltaX / drawableBounds.width())
@@ -360,7 +360,7 @@ class WaterMarkImageView : androidx.appcompat.widget.AppCompatImageView, Corouti
     }
 
     fun isTouchWaterMark(event: MotionEvent): Boolean {
-        if (curImageInfo.obtainTileMode() != Shader.TileMode.DECAL) {
+        if (curImageInfo.obtainTileMode() != Shader.TileMode.CLAMP) {
             return false
         }
         val shader = layoutShader ?: return false