Merge pull request #77 from rosuH/dev

Bump version to 2.2.0

Author: rosuH

.idea/codeStyles/codeStyleConfig.xml

@@ -39,27 +39,32 @@ Securely, easily add a watermark to your sensitive photos.</br>To prevent them f
 > Seriously (pushes up glasses)
 
 - **Security**.
-  - The code is completely open source and uses a loose MIT protocol, you are free to Fork yourself to modify and remove code you think is problematic ;)
-  - No network requests, no network request permissions, no fear of your photos being compromised. users with API >= 29 don't even need to request any permissions. (28 and below users need to apply for storage permissions to access and store photos)
-  - And of course there are no stats, buried points or Device IDs, or even crash reporting (so if you get a crash, please share the crash info with us >_<).
-  - We're forgoing the convenient third-party collection SDK and various stats just so you can use it with confidence. 
-  **What's yours is yours**. 
-- **Layout**: support for horizontal and vertical intervals between the watermark, automatically repeat the full picture.
-- **Style**: font color, transparency, size and rotation angle can be adjusted.
-- **Content**: Support text watermark and image watermark.
+  - The code is completely open source and feel free to FORK your won, ;)
+  - Pure offline, no need to worry about your photos being leaked. Users with API >= 29 don't even
+    need to request any permissions. (28 and below users need to approve for storage permissions to
+    access and store photos)
+  - There are no stats, tracking, Device IDs, or even crash reporting (so if you got a crash, please
+    share the crash info with us >_<).
+  - We've given up all third-party tracking SDK and various stats just so you can use it with
+    confidence.
+    **What's yours is yours**.
+- **Layout**: support for horizontal and vertical intervals between the watermark, automatically
+  repeat the full picture.
+- **Style**: font color, font style, transparency, font size, and rotation angle are included.
+- **Content**: Support text watermark and image watermark (or says stickers).
 
 ## Download
 
 Developer-led download channels:
 - [Github Release](https://github.com/rosuH/EasyWatermark/releases): Always stay up to date!
 - [Google Play](https://play.google.com/store/apps/details?id=me.rosuh.easywatermark)
-  - ⚠️Note: this version charges but the code is identical, so if you'd like to buy the author a cup of tea🍵 then go here and download it, otherwise please choose another source :)
+  - 🍺 Noted: the paid version, the same code. Try it if you want to buy me a cup of tea 🍵.
 - [F-Droid](https://f-droid.org/packages/me.rosuh.easywatermark/)
 - [Coolapk](https://www.coolapk.com/apk/272743)
 
 All other channels are not developer-driven, so please screen them carefully before downloading and using them.
 
-## Use
+## How to ?
 You can use it however you want. It is more suitable for situations where you need to submit a photo ID, a hand-held photo ID or a sensitive photo. Example.
 - Various real names in the country, uploading front and back photos of ID cards at every turn, even handheld ID photos.
 - Pre-project previews, samples, copyrighted or simply spoofed images
@@ -74,21 +79,28 @@ You can turn down the transparency, just don't block the key information.
 > Even if it's (probably) useless in the end, at least you can disgust the leaker a bit.
 
 ## UI
-- Designed by renowned UI guru [@tovi](https://www.figma.com/@tovi) (👏🤪)
-  - Anything you think doesn't work well is my UI restore that doesn't work, and has nothing to do with the UI draft. xD
+
+- Designed by [@tovi](https://www.figma.com/@tovi) with ❤️.
+  - Any UI or UX you think doesn't great well is my coding issue, and has nothing to do with the UI
+    draft. xD
 
 > This app was designed by [@tovi](https://www.figma.com/@tovi), so all rights to the UI and related design resources belong to him and may not be used without permission from any person or organization.
 
 ## Credit
+
 - [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/)
-- Sample Photo by Deepak Nautiyal on [Unsplash](https://unsplash.com/s/photos/animals?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText)
+- Sample Photo by Deepak Nautiyal
+  on [Unsplash](https://unsplash.com/s/photos/animals?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText)
 
 ## 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.
-Of course, you can also contact the developer directly via telegram or email and we'll get back to you shortly.
 
-## Privacy policy
-[Privacy policy](https://github.com/rosuH/EasyWatermark/blob/master/PrivacyPolicy.md)
+We welcome your comments and suggestions in the issues section, or you can contribute your code by
+submitting a PR directly to us. Of course, you can also contact the developer directly via telegram
+or email and we'll get back to you shortly.
+
+## [Privacy policy](https://github.com/rosuH/EasyWatermark/blob/master/PrivacyPolicy.md)
+
+If you really need it.

README.md

@@ -42,21 +42,21 @@
   - 当然也没有统计、埋点和 Device ID，甚至没有崩溃上报（所以如果遇到崩溃，麻烦和我们分享一下崩溃信息吧 >_<）。
   - 我们放弃方便的第三方采集 SDK 以及各种统计信息，就是为了让你能放心地使用。**你的就是你的。**
 - **布局**：支持水印间的横竖间隔，自动重复铺满整张图片。
-- **样式**：字体颜色、透明度、大小和旋转角度都可以调节。
+- **样式**：字体颜色、文本样式、透明度、大小和旋转角度都可以调节。
 - **内容**：支持文字水印和图片水印。
 
 ## 下载
 
 开发者所主导的下载渠道：
 - [Github Release](https://github.com/rosuH/EasyWatermark/releases)：永远保持最新
 - [Google Play](https://play.google.com/store/apps/details?id=me.rosuh.easywatermark)
-  - ⚠️注意：此版本收费，但是代码完全一致，所以如果您愿意请作者喝一杯茶（或者您比较任性），那么请去此下载，否则请选择其他渠道:)
+    - 🍺 注意：收费版，但代码一致，如果您愿意请作者喝一杯茶（或者您比较任性），那么请去此下载，否则请选择其他渠道:)
 - [F-Droid](https://f-droid.org/packages/me.rosuh.easywatermark/)
 - [酷安](https://www.coolapk.com/apk/272743)
 
 其他渠道均非开发者所主导，请仔细甄别后下载使用。
 
-## 使用
+## 如何使用？
 你想怎么用就怎么用。比较适合于需要提交证件照、手持证件照或敏感照片等情况。例如：
 - 国内各种实名制，动不动就上传身份证正反照片，甚至是手持证件照。
 - 项目前期预览图、小样、版权或单纯的恶搞图片
@@ -78,15 +78,18 @@
 
 ## 开源许可
 使用到的第三方库：
+
 - [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/)
-- 示例图片来自 Jeremy Bishop on [Unsplash](https://unsplash.com/s/photos/animals?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText)
+- 示例图片来自 Jeremy Bishop
+  on [Unsplash](https://unsplash.com/s/photos/animals?utm_source=unsplash&utm_medium=referral&utm_content=creditCopyText)
 
 ## 反馈与贡献
-我们非常欢迎您在 issues 区发表您任何意见与建议，或者直接提交 PR 以贡献您的代码。
-当然您也可以直接联系开发者的 Telegram 或邮件，我们将择期回复。
 
-## 隐私政策
-[隐私政策](https://github.com/rosuH/EasyWatermark/blob/master/PrivacyPolicy_zh-CN.md)
+我们非常欢迎您在 issues 区发表您任何意见与建议，或者直接提交 PR 以贡献您的代码。 当然您也可以直接联系开发者的 Telegram 或邮件，我们将择期回复。
+
+## [隐私政策](https://github.com/rosuH/EasyWatermark/blob/master/PrivacyPolicy_zh-CN.md)
+
+如果你需要的话。

README_zh-CN.md

@@ -2,30 +2,26 @@ import ProductFlavors.coolApk
 import ProductFlavors.github
 import ProductFlavors.googlePlay
 import ProductFlavors.others
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.application")
     id("kotlin-android")
     id("kotlin-parcelize")
-    id("com.github.ben-manes.versions")
 }
 
 android {
-    compileSdkVersion(Apps.compileSdk)
-    buildToolsVersion(Apps.buildTools)
-    ndkVersion = "21.3.6528147"
+    compileSdk = (Apps.compileSdk)
+    buildToolsVersion = (Apps.buildTools)
     defaultConfig {
         applicationId = "me.rosuh.easywatermark"
-        minSdkVersion(Apps.minSdk)
-        targetSdkVersion(Apps.targetSdk)
-        versionCode = 20100
-        versionName = "2.1.0"
+        minSdk = (Apps.minSdk)
+        targetSdk = (Apps.targetSdk)
+        versionCode = 20200
+        versionName = "2.2.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
-
         getByName(BuildTypes.Debug) {
             isMinifyEnabled = false
             applicationIdSuffix = ".${BuildTypes.Debug}"
@@ -41,22 +37,20 @@ android {
                 "coroutines.pro", "proguard-rules.pro"
             )
         }
-    }
-
-    flavorDimensions("version")
 
-    productFlavors {
-        create(googlePlay)
-        create(github)
-        create(coolApk)
-        create(others) {
-            isDefault = true
+        productFlavors {
+            flavorDimensions.add("version")
+            create(googlePlay)
+            create(github)
+            create(coolApk)
+            create(others)
         }
     }
 
+
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility(JavaVersion.VERSION_11)
+        targetCompatibility(JavaVersion.VERSION_11)
     }
 
     applicationVariants.all {
@@ -69,16 +63,13 @@ android {
     }
 
     packagingOptions {
-        exclude("DebugProbesKt.bin")
+        resources.excludes.add("DebugProbesKt.bin")
     }
 
     android.buildFeatures.viewBinding = true
 
-}
-
-tasks.withType<KotlinCompile> {
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "11"
     }
 }
 
@@ -88,19 +79,19 @@ dependencies {
     implementation("androidx.appcompat:appcompat:1.4.0-alpha02")
     implementation("id.zelory:compressor:3.0.1")
     implementation("com.github.daniel-stoneuk:material-about-library:3.1.2")
-    implementation("com.google.android.material:material:1.3.0")
+    implementation("com.google.android.material:material:1.4.0")
     implementation("androidx.fragment:fragment-ktx:1.4.0-alpha02")
-    implementation("androidx.activity:activity-ktx:1.3.0-beta01")
+    implementation("androidx.activity:activity-ktx:1.3.1")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.3.1")
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.1")
     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.0-beta02")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.20")
-    implementation("androidx.exifinterface:exifinterface:1.3.2")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.5.21")
+    implementation("androidx.exifinterface:exifinterface:1.3.3")
     implementation("androidx.palette:palette-ktx:1.0.0")
 
     testImplementation("junit:junit:4.12")

app/build.gradle.kts

@@ -23,6 +23,7 @@
             android:configChanges="orientation|keyboardHidden"
             android:screenOrientation="portrait"
             android:launchMode="singleTask"
+            android:exported="true"
             android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/AndroidManifest.xml

@@ -7,6 +7,7 @@ import android.content.Intent
 import android.content.SharedPreferences
 import android.util.Log
 import androidx.core.content.edit
+import kotlinx.coroutines.*
 import me.rosuh.easywatermark.model.UserConfig
 import me.rosuh.easywatermark.model.WaterMarkConfig
 import kotlin.system.exitProcess

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

@@ -6,7 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import me.rosuh.easywatermark.R
-import me.rosuh.easywatermark.base.BaseVideHolder
+import me.rosuh.easywatermark.base.BaseViewHolder
 import me.rosuh.easywatermark.widget.SelectableImageView
 
 class ColorPreviewAdapter(
@@ -57,7 +57,7 @@ class ColorPreviewAdapter(
         notifyDataSetChanged()
     }
 
-    internal class PreviewHolder(root: View) : BaseVideHolder(root) {
+    internal class PreviewHolder(root: View) : BaseViewHolder(root) {
         val siv: SelectableImageView = root.findViewById(R.id.siv_color)
     }
 

app/src/main/java/me/rosuh/easywatermark/adapter/ColorPreviewAdapter.kt

@@ -5,7 +5,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import me.rosuh.easywatermark.R
-import me.rosuh.easywatermark.base.BaseVideHolder
+import me.rosuh.easywatermark.base.BaseViewHolder
 
 class DividerAdapter(
     private val dividerSize: Int = 1
@@ -26,5 +26,5 @@ class DividerAdapter(
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {}
 
-    internal class DividerHolder(val root: View) : BaseVideHolder(root)
+    internal class DividerHolder(val root: View) : BaseViewHolder(root)
 }

app/src/main/java/me/rosuh/easywatermark/adapter/DividerAdapter.kt

@@ -8,6 +8,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import me.rosuh.easywatermark.R
+import me.rosuh.easywatermark.base.BaseViewHolder
 import me.rosuh.easywatermark.model.FuncTitleModel
 
 class FuncPanelAdapter(
@@ -89,7 +90,7 @@ class FuncPanelAdapter(
         notifyDataSetChanged()
     }
 
-    class FuncTitleHolder(view: View) : RecyclerView.ViewHolder(view) {
+    class FuncTitleHolder(view: View) : BaseViewHolder(view) {
         val tvTitle: TextView = view.findViewById(R.id.tv_title)
         val ivIcon: ImageView = view.findViewById(R.id.iv_icon)
     }

app/src/main/java/me/rosuh/easywatermark/adapter/FuncPanelAdapter.kt

@@ -8,7 +8,7 @@ import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import me.rosuh.easywatermark.R
-import me.rosuh.easywatermark.base.BaseVideHolder
+import me.rosuh.easywatermark.base.BaseViewHolder
 import me.rosuh.easywatermark.model.TextPaintStyle
 
 class TextPaintStyleAdapter(
@@ -83,7 +83,7 @@ class TextPaintStyleAdapter(
         notifyItemChanged(selectedPos, "Selected")
     }
 
-    internal class TypefaceHolder(val root: View) : BaseVideHolder(root) {
+    internal class TypefaceHolder(val root: View) : BaseViewHolder(root) {
         val tvPreview: TextView by lazy { root.findViewById(R.id.tv_preview) }
         val tvTitle: TextView? by lazy { root.findViewById(R.id.tv_title) }
     }