Merge pull request #33 from rosuH/feat_UI_Experimental

v2.0.0

Author: rosuH

.idea/codeStyles/Project.xml

@@ -24,6 +24,7 @@ Securely, easily add a watermark to your sensitive photos.</br>To prevent them f
 <p align="left">
 <a href="https://play.google.com/store/apps/details?id=me.rosuh.easywatermark"><img src="/static/google-play-badge.png" width="auto" height="64px"/></a>
   <a href="https://www.coolapk.com/apk/272743"><img src="/static/logo_coolapk.png" width="auto" height="64px"/></a>
+  <a href="https://f-droid.org/packages/me.rosuh.easywatermark/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="auto" height="64px"/></a>
 </p>
 
 ## Characteristics
@@ -78,12 +79,12 @@ You can turn down the transparency, just don't block the key information.
 
 > 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.
 
-## Open Source License.
-Third party libraries used.
+## 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)
 
 ## 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.

.idea/codeStyles/codeStyleConfig.xml

@@ -21,8 +21,10 @@
 <p align="left">
 <a href="https://play.google.com/store/apps/details?id=me.rosuh.easywatermark"><img src="/static/google-play-badge_cn.png" width="auto" height="64px"/></a>
   <a href="https://www.coolapk.com/apk/272743"><img src="/static/logo_coolapk.png" width="auto" height="64px"/></a>
+    <a href="https://f-droid.org/packages/me.rosuh.easywatermark/"><img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" width="auto" height="64px"/></a>
 </p>
 
+
 ## 特性
 
 > 当时我就念了一首诗 👓
@@ -47,11 +49,9 @@
 
 开发者所主导的下载渠道：
 - [Github Release](https://github.com/rosuH/EasyWatermark/releases)：永远保持最新
-- [奶牛快传](https://ewm.rosuh.me): ⚡不限速下载，永远保持最新
-  - 如果你有意尝试奶牛快传，可以使用我的[邀请链接](https://cowtransfer.com/?lx_guid=d14511ff-0fb9-4add-9cf1-e22b63415f33) ;)
 - [Google Play](https://play.google.com/store/apps/details?id=me.rosuh.easywatermark)
   - ⚠️注意：此版本收费，但是代码完全一致，所以如果您愿意请作者喝一杯茶（或者您比较任性），那么请去此下载，否则请选择其他渠道:)
-- F-Droid（构建中）
+- [F-Droid](https://f-droid.org/packages/me.rosuh.easywatermark/)
 - [酷安](https://www.coolapk.com/apk/272743)
 
 其他渠道均非开发者所主导，请仔细甄别后下载使用。
@@ -82,6 +82,7 @@
 - [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)
 
 ## 反馈与贡献
 我们非常欢迎您在 issues 区发表您任何意见与建议，或者直接提交 PR 以贡献您的代码。

.idea/jarRepositories.xml

@@ -7,7 +7,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("kotlin-android-extensions")
+    id("kotlin-parcelize")
+    id("name.remal.check-dependency-updates") version "1.2.2"
 }
 
 android {
@@ -18,9 +19,8 @@ android {
         applicationId = "me.rosuh.easywatermark"
         minSdkVersion(Apps.minSdk)
         targetSdkVersion(Apps.targetSdk)
-        versionCode = 10102
-        versionName = "1.1.2"
-
+        versionCode = 20000
+        versionName = "2.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -38,7 +38,7 @@ android {
             isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "coroutines.pro","proguard-rules.pro"
             )
         }
     }
@@ -67,11 +67,19 @@ android {
                 output.outputFileName = "ewm-v${variant.versionName}.apk"
             }
     }
+
+    packagingOptions {
+        exclude("DebugProbesKt.bin")
+    }
+
+    android.buildFeatures.viewBinding = true
+
 }
 
 tasks.withType<KotlinCompile> {
     kotlinOptions {
         jvmTarget = "1.8"
+        useIR = true
     }
 }
 
@@ -83,6 +91,10 @@ dependencies {
     implementation(Libs.materialAboutLibrary)
     implementation(Libs.material)
     implementation(Libs.fragmentKtx)
+    implementation(Libs.fragment)
+    implementation(Libs.activityKtx)
+    implementation(Libs.coroutineAndroid)
+    implementation(Libs.coroutineCore)
     implementation(Libs.lifecycleLiveData)
     implementation(Libs.lifecycleViewModel)
     implementation(Libs.colorPickerView)
@@ -91,5 +103,16 @@ dependencies {
     implementation(Libs.constraintLayout)
     implementation(Libs.coreKtx)
     implementation(Libs.exif)
+    implementation(Libs.palette)
     testImplementation(TestLibs.junit)
-}
+    testImplementation(TestLibs.androidXTest)
+    testImplementation(TestLibs.mock)
+    androidTestImplementation(TestLibs.mockAndroid)
+    androidTestImplementation(TestLibs.robolectric)
+    androidTestImplementation(TestLibs.testRules)
+    androidTestImplementation(TestLibs.testRunner)
+    androidTestImplementation(TestLibs.hamcrest)
+    androidTestImplementation(TestLibs.espresso)
+    androidTestImplementation(TestLibs.uiautomator)
+    androidTestImplementation(TestLibs.junitExt)
+}

.idea/runConfigurations.xml

@@ -0,0 +1,24 @@
+# Allow R8 to optimize away the FastServiceLoader.
+# Together with ServiceLoader optimization in R8
+# this results in direct instantiation when loading Dispatchers.Main
+-assumenosideeffects class kotlinx.coroutines.internal.MainDispatcherLoader {
+    boolean FAST_SERVICE_LOADER_ENABLED return false;
+}
+
+-assumenosideeffects class kotlinx.coroutines.internal.FastServiceLoaderKt {
+    boolean ANDROID_DETECTED return true;
+}
+
+-keep class kotlinx.coroutines.android.AndroidDispatcherFactory {*;}
+
+# Disable support for "Missing Main Dispatcher", since we always have Android main dispatcher
+-assumenosideeffects class kotlinx.coroutines.internal.MainDispatchersKt {
+    boolean SUPPORT_MISSING return false;
+}
+
+# Statically turn off all debugging facilities and assertions
+-assumenosideeffects class kotlinx.coroutines.DebugKt {
+    boolean getASSERTIONS_ENABLED() return false;
+    boolean getDEBUG() return false;
+    boolean getRECOVER_STACK_TRACES() return false;
+}

README.md

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