Merge remote-tracking branch 'upstream/master'

Author: sguinetti

README.md

@@ -83,6 +83,7 @@ Third party libraries used.
 - [daniel-stonuk/material-about-library](https://github.com/daniel-stoneuk/material-about-library)
 - [skydoves/ColorPickerView](https://github.com/skydoves/ColorPickerView)
 - [material-components/material-components-android](https://github.com/material-components/material-components-android)
+- [Compressor](https://github.com/zetbaitsu/Compressor/)
 
 ## Feedback and contribution
 We welcome your comments and suggestions in the issues section, or you can contribute your code by submitting a PR directly to us.

README_zh-CN.md

@@ -81,6 +81,7 @@
 - [daniel-stoneuk/material-about-library](https://github.com/daniel-stoneuk/material-about-library)
 - [skydoves/ColorPickerView](https://github.com/skydoves/ColorPickerView)
 - [material-components/material-components-android](https://github.com/material-components/material-components-android)
+- [Compressor](https://github.com/zetbaitsu/Compressor/)
 
 ## 反馈与贡献
 我们非常欢迎您在 issues 区发表您任何意见与建议，或者直接提交 PR 以贡献您的代码。

app/build.gradle.kts

@@ -13,7 +13,7 @@ plugins {
 android {
     compileSdkVersion(Apps.compileSdk)
     buildToolsVersion(Apps.buildTools)
-
+    ndkVersion = "21.3.6528147"
     defaultConfig {
         applicationId = "me.rosuh.easywatermark"
         minSdkVersion(Apps.minSdk)
@@ -88,6 +88,6 @@ dependencies {
     implementation(Libs.recycleView)
     implementation(Libs.constraintLayout)
     implementation(Libs.coreKtx)
-    implementation(Libs.gifDrawable)
+    implementation(Libs.exif)
     testImplementation(TestLibs.junit)
 }

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Easy WaterMark·Debug</string>
+</resources>

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

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">简单水印·测试</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -20,6 +20,8 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".ui.MainActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -29,6 +31,8 @@
         </activity>
         <activity
             android:name=".ui.about.AboutActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
             android:parentActivityName=".ui.MainActivity"
             android:theme="@style/AppTheme.MaterialAboutActivity">
             <meta-data
@@ -37,6 +41,8 @@
         </activity>
         <activity
             android:name=".ui.about.OpenSourceActivity"
+            android:configChanges="orientation|keyboardHidden"
+            android:screenOrientation="portrait"
             android:parentActivityName=".ui.about.AboutActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"

app/src/main/java/me/rosuh/easywatermark/MyApp.kt

@@ -17,12 +17,18 @@ class MyApp : Application() {
 
     private fun catchException() {
         Thread.setDefaultUncaughtExceptionHandler { t, e ->
+            // Because intent limit data to 1mb, so that we should limit the stack track by magic number below
+            val maxStringLength = 1024 * 1024 / 2 / 10 // the 10 is a magic number ;)
+            var fullStackTrace = Log.getStackTraceString(e)
+            if (fullStackTrace.length > maxStringLength) {
+                fullStackTrace = fullStackTrace.substring(IntRange(0, maxStringLength))
+            }
             getSharedPreferences(SP_NAME, MODE_PRIVATE).edit(true) {
                 putBoolean(KEY_IS_CRASH, true)
                 putString(
                     KEY_STACK_TRACE, """
                     Crash in ${t.name}:
-                    ${Log.getStackTraceString(e)}
+                    $fullStackTrace
                 """.trimIndent()
                 )
             }

app/src/main/java/me/rosuh/easywatermark/ktx/PainKtx.kt

@@ -4,8 +4,22 @@ import android.graphics.Color
 import android.graphics.Paint
 import me.rosuh.easywatermark.model.WaterMarkConfig
 
-fun Paint.applyConfig(config: WaterMarkConfig?): Paint {
-    textSize = config?.textSize ?: 14f
+/**
+ * @author rosuh@qq.com
+ * @date 2020/9/8
+ * 因为预览和实际图像之间存在缩放，所以在预览时要除去缩放比。而在保存时，就不需要了
+ * Because there is a zoom between the preview and the actual image, the zoom ratio should be removed when previewing
+ * When saving, it’s not needed
+ */
+fun Paint.applyConfig(
+    config: WaterMarkConfig?,
+    scale: Boolean = true
+): Paint {
+    textSize = (config?.textSize ?: 14f) / if (scale) {
+        (config?.imageScale ?: 1f)
+    } else {
+        1f
+    }
     color = config?.textColor ?: Color.RED
     alpha = config?.alpha ?: 128
     style = config?.textStyle ?: Paint.Style.FILL

app/src/main/java/me/rosuh/easywatermark/model/WaterMarkConfig.kt

@@ -32,6 +32,8 @@ class WaterMarkConfig {
 
     var markMode: MarkMode
 
+    var imageScale: Float
+
     init {
         with(
             MyApp.instance.getSharedPreferences(SP_NAME, MODE_PRIVATE)
@@ -68,6 +70,7 @@ class WaterMarkConfig {
             } else {
                 Uri.parse("")
             }
+            imageScale = getFloat(SP_KEY_TEXT_SIZE, 1f)
         }
     }
 
@@ -99,6 +102,7 @@ class WaterMarkConfig {
                     MarkMode.Image -> 1
                 }
             )
+            putFloat(SP_KEY_IMAGE_SCALE, imageScale)
         }
     }
 
@@ -131,6 +135,7 @@ class WaterMarkConfig {
         const val SP_KEY_ICON_URI = SP_NAME + "_key_icon_uri"
         const val SP_KEY_MODE = SP_NAME + "_key_type"
         const val SP_KEY_CHANGE_LOG = SP_NAME + "_key_change_log"
+        const val SP_KEY_IMAGE_SCALE = SP_NAME + "_key_image_scale"
 
     }
 }

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

@@ -36,8 +36,7 @@ import me.rosuh.easywatermark.ui.dialog.SaveImageBSDialogFragment
 import me.rosuh.easywatermark.ui.panel.ContentFragment
 import me.rosuh.easywatermark.ui.panel.LayoutFragment
 import me.rosuh.easywatermark.ui.panel.StyleFragment
-import pl.droidsonroids.gif.GifDrawable
-import pl.droidsonroids.gif.GifImageView
+import me.rosuh.easywatermark.utils.FileUtils
 import kotlin.math.abs
 
 
@@ -55,7 +54,6 @@ class MainActivity : AppCompatActivity() {
         scope.launch {
             initView()
             initObserver()
-            (iv_logo.drawable as? GifDrawable)?.start()
             cl_root.setTransition(R.id.transition_launch)
             cl_root.transitionToEnd()
             checkHadCrash()
@@ -65,6 +63,16 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onStart() {
+        super.onStart()
+        iv_logo.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        iv_logo.stop()
+    }
+
     private fun checkHadCrash() {
         with(getSharedPreferences(MyApp.SP_NAME, MODE_PRIVATE)) {
             val isCrash = getBoolean(MyApp.KEY_IS_CRASH, false)
@@ -106,16 +114,16 @@ class MainActivity : AppCompatActivity() {
             try {
                 cl_root.setTransition(R.id.transition_open_image)
                 cl_root.transitionToEnd()
-                (iv_logo.drawable as? GifDrawable)?.stop()
                 iv_photo?.config = it
+                iv_logo.stop()
             } catch (se: SecurityException) {
                 se.printStackTrace()
                 // reset the uri because we don't have permission -_-
                 viewModel.updateUri(Uri.parse(""))
             }
         })
 
-        viewModel.tipsStatus.observe(this, Observer { tips ->
+        viewModel.tipsStatus.observe(this, { tips ->
             when (tips) {
                 is MainViewModel.TipsStatus.None -> {
                     tv_data_tips.apply {
@@ -137,7 +145,7 @@ class MainActivity : AppCompatActivity() {
             }
         })
 
-        viewModel.saveState.observe(this, Observer { state ->
+        viewModel.saveState.observe(this, { state ->
             when (state) {
                 MainViewModel.State.SaveOk -> {
                     Toast.makeText(this, getString(R.string.tips_save_ok), Toast.LENGTH_SHORT)
@@ -215,7 +223,9 @@ class MainActivity : AppCompatActivity() {
                             performClick()
                             scope.launch {
                                 delay(300)
-                                viewModel.updateTips(MainViewModel.TipsStatus.None)
+                                val isAlphaZero = (config?.alpha ?: 0) == 0
+                                val isTextSize = (config?.textSize ?: 0) == 0
+                                viewModel.updateTips(MainViewModel.TipsStatus.None(isAlphaZero || isTextSize))
                             }
                         }
                     }
@@ -271,11 +281,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         R.id.action_pick -> {
-            if (viewModel.isPermissionGrated(this)) {
-                performFileSearch(READ_REQUEST_CODE)
-            } else {
-                viewModel.requestPermission(this)
-            }
+            performFileSearch(READ_REQUEST_CODE)
             true
         }
 
@@ -292,17 +298,30 @@ class MainActivity : AppCompatActivity() {
      * Fires an intent to spin up the "file chooser" UI and select an image.
      */
     fun performFileSearch(requestCode: Int) {
+        if (!viewModel.isPermissionGrated(this)) {
+            viewModel.requestPermission(this)
+            return
+        }
         val intent = Intent(Intent.ACTION_OPEN_DOCUMENT).apply {
             flags = (Intent.FLAG_GRANT_READ_URI_PERMISSION
                     or Intent.FLAG_GRANT_WRITE_URI_PERMISSION
                     or Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION)
             addCategory(Intent.CATEGORY_OPENABLE)
-            type = "image/*"
+            type = "*/*"
+        }
+        val result = kotlin.runCatching {
+            startActivityForResult(
+                intent,
+                requestCode
+            )
+        }
+        if (result.isFailure) {
+            Toast.makeText(
+                this,
+                getString(R.string.tips_not_app_can_open_imaegs),
+                Toast.LENGTH_LONG
+            ).show()
         }
-        startActivityForResult(
-            intent,
-            requestCode
-        )
     }
 
     override fun onRequestPermissionsResult(
@@ -325,35 +344,39 @@ class MainActivity : AppCompatActivity() {
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode != Activity.RESULT_OK) {
+            Toast.makeText(
+                this,
+                getString(R.string.tips_do_not_choose_image),
+                Toast.LENGTH_SHORT
+            ).show()
+            return
+        }
         when (requestCode) {
             READ_REQUEST_CODE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    data?.data?.also { uri ->
-                        viewModel.updateUri(uri)
-                        takePersistableUriPermission(uri)
-                    }
+                val uri = data?.data
+                if (FileUtils.isImage(this.contentResolver, uri)) {
+                    viewModel.updateUri(uri!!)
+                    takePersistableUriPermission(uri)
                 } else {
                     Toast.makeText(
                         this,
-                        getString(R.string.tips_do_not_choose_image),
+                        getString(R.string.tips_choose_other_file_type),
                         Toast.LENGTH_SHORT
-                    )
-                        .show()
+                    ).show()
                 }
             }
             ICON_REQUEST_CODE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    data?.data?.also { uri ->
-                        viewModel.updateIcon(uri)
-                        takePersistableUriPermission(uri)
-                    }
+                val uri = data?.data
+                if (FileUtils.isImage(this.contentResolver, uri)) {
+                    viewModel.updateIcon(uri!!)
+                    takePersistableUriPermission(uri)
                 } else {
                     Toast.makeText(
                         this,
-                        getString(R.string.tips_do_not_choose_image),
+                        getString(R.string.tips_choose_other_file_type),
                         Toast.LENGTH_SHORT
-                    )
-                        .show()
+                    ).show()
                 }
             }
         }