Merge pull request #24 from rosuH/dev

v1.1.2

Author: rosuH

app/build.gradle.kts

@@ -46,25 +46,27 @@ android {
     flavorDimensions("version")
 
     productFlavors {
-        create(googlePlay) {
-            versionNameSuffix = "-${googlePlay}"
-        }
-        create(github) {
-            versionNameSuffix = "-${github}"
-        }
-        create(coolApk) {
-            versionNameSuffix = "-${coolApk}"
-        }
+        create(googlePlay)
+        create(github)
+        create(coolApk)
         create(others) {
             isDefault = true
-            versionNameSuffix = "-${others}"
         }
     }
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+
+    applicationVariants.all {
+        val variant = this
+        variant.outputs
+            .map { it as com.android.build.gradle.internal.api.BaseVariantOutputImpl }
+            .forEach { output ->
+                output.outputFileName = "ewm-v${variant.versionName}.apk"
+            }
+    }
 }
 
 tasks.withType<KotlinCompile> {

app/src/main/java/me/rosuh/easywatermark/widget/ColoredImageVIew.kt

@@ -7,7 +7,6 @@ import android.graphics.*
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.graphics.drawable.toBitmap
-import androidx.interpolator.view.animation.FastOutLinearInInterpolator
 
 
 class ColoredImageVIew : AppCompatImageView {
@@ -19,6 +18,7 @@ class ColoredImageVIew : AppCompatImageView {
         defStyleAttr
     )
 
+    private var sizeHasChanged: Boolean = true
     private val paint by lazy { Paint() }
 
     private val colorList = arrayOf(
@@ -30,6 +30,8 @@ class ColoredImageVIew : AppCompatImageView {
 
     private val posList = arrayOf(0f, 0.5178f, 0.7654f, 1f).toFloatArray()
 
+    private val xfermode by lazy { PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP) }
+
     private val colorAnimator by lazy {
         ObjectAnimator.ofFloat(1f, 0f)
             .apply {
@@ -48,7 +50,6 @@ class ColoredImageVIew : AppCompatImageView {
                     postInvalidateOnAnimation()
                 }
                 duration = 1200
-                interpolator = FastOutLinearInInterpolator()
                 repeatCount = ObjectAnimator.INFINITE
                 repeatMode = ObjectAnimator.REVERSE
             }
@@ -57,16 +58,21 @@ class ColoredImageVIew : AppCompatImageView {
 
     private var innerBitmap: Bitmap? = null
 
+    override fun onSizeChanged(w: Int, h: Int, oldw: Int, oldh: Int) {
+        super.onSizeChanged(w, h, oldw, oldh)
+        sizeHasChanged = w != oldh || h != oldh
+    }
+
     @SuppressLint("DrawAllocation")
     override fun onDraw(canvas: Canvas?) {
-        if (innerBitmap == null) {
+        if (innerBitmap == null || (sizeHasChanged && width > 0 && height > 0)) {
             super.onDraw(canvas)
             innerBitmap = drawable.toBitmap(width, height)
         }
         innerBitmap?.let {
             val sc = canvas?.saveLayer(0f, 0f, width.toFloat(), height.toFloat(), null) ?: return
             canvas.drawBitmap(it, 0f, 0f, paint)
-            paint.xfermode = PorterDuffXfermode(PorterDuff.Mode.SRC_ATOP)
+            paint.xfermode = xfermode
             canvas.drawRect(0f, 0f, width.toFloat(), height.toFloat(), paint)
             paint.xfermode = null
             canvas.restoreToCount(sc)

app/src/main/res/values-en/strings.xml

@@ -66,9 +66,11 @@
     <string name="dialog_change_log_title">Change log</string>
     <string name="dialog_change_log_content">
         Thank you for your feedback, the main update of this version is:\n\n
+         <u><big>New</big></u> \n\n
+         · Spanish \n\n
+         Thank sguinetti \n\n
          <u><big>Repair</big></u> \n\n
-         · Android Q and lower systems: failed to preview pictures\n\n · Android Q and lower systems: After the pictures are output, the media scan failed to be notified\n\n
-         Thanks to reverieo_o, wong077 \n\n
+         · Part of the ROM crashed due to animation
     </string>
     <string name="tips_not_app_can_open_imaegs">It looks like you have no file manager installed</string>
     <string name="tips_choose_other_file_type">Looks like you chose not a picture</string>

app/src/main/res/values-es/strings.xml

@@ -65,17 +65,15 @@
     <string name="dialog_change_log_title">Registro de cambios</string>
     <string name="dialog_change_log_content">
         Thank you for your feedback. The main update of this version is:\n\n
-        <u><big>New</big></u> \n\n
-        Options for adjusting transparency. Although on the left side of the preview area, sliding up and down can also be adjusted, but you don’t seem to like this method very much. 😄\n\n
-        (Thanks: e**oc, la**r)\n\n
-        <u><big>Adjustment</big></u> \n\n
-        · The control panel is forbidden to slide to reduce the false touch of the adjustment parameters. \n
-        · Used a brand new Icon, thanks to our designers! @Twowei \n\n
-        <u><big>Fix</big></u> \n\n
-        Fix the crash of some lower version phones when saving pictures problem. (Thanks: 2**9@qq.com, a**liang)\n
+        <u><big>Nuevo</big> </u> \n\n
+         · Español \n\n
+         Gracias, sguinetti \n\n
+        <u><big>Reparación</big> </u> \n\n
+         · Parte de la ROM se bloqueó debido a la animación
     </string>
     <string name="tips_not_app_can_open_imaegs">Parece que no tienes un gestor de archivos instalado</string>
     <string name="tips_choose_other_file_type">Parece que no escogió una imagen</string>
     <string name="error_save_oom">Memoria insuficiente, limpie la caché y vuelva a intentarlo</string>
     <string name="error_share_uri_is_null">El Uri de salida está vacío, contacta con el desarrollador para enviar comentarios, gracias</string>
+    <string name="tips_content_mode_button">Haga clic para editar texto o imagen</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -76,10 +76,11 @@
     <string name="contributor_info">当反馈的问题有效，并被修复或加入新版本时，您的名字或邮件出现在更新日志弹窗中。我们会对您的信息作遮挡处理，不会出现全称。\n 如果您不愿意出现，请标注：我不愿意。即可</string>
     <string name="dialog_change_log_content">
         感谢大家的反馈，此版本主要更新为：\n\n
+        <u><big>新增</big></u> \n\n
+        · 西班牙语 \n\n
+        感谢 sguinetti \n\n
         <u><big>修复</big></u> \n\n
-        · Android Q 以下的系统：预览图片失败的问题\n\n
-        · Android Q 以下的系统：图片输出后，通知媒体扫描失败的问题 \n\n
-        感谢 reverieo_o, wong077 \n\n
+        · 部分 ROM 因为动画导致的崩溃
     </string>
     <string name="open_source_desc_compressor" translatable="false">"Compressor is a lightweight and powerful android image compression library. Compressor will allow you to compress large photos into smaller sized photos with very less or negligible loss in quality of the image. "</string>
     <string name="open_source_desc_gif" translatable="false">Bundled GIFLib via JNI is used to render frames. This way should be more efficient than WebView or Movie classes.</string>

buildSrc/src/main/java/Dependencies.kt

@@ -3,8 +3,8 @@ object Apps {
     const val buildTools = "29.0.3"
     const val minSdk = 22
     const val targetSdk = 29
-    const val versionCode = 10101
-    const val versionName = "1.1.1"
+    const val versionCode = 10102
+    const val versionName = "1.1.2"
 }
 
 object BuildTypes {
@@ -25,7 +25,7 @@ object Versions {
 
     const val gap = "4.0.1"
 
-    const val kotlin = "1.4.0"
+    const val kotlin = "1.4.10"
 
     const val appcompat = "1.2.0"