Merge pull request #209 from rosuH/dev

Support tile mode && UI improvements

Author: rosuH

.github/workflows/pr_pre_check.yml

@@ -2,7 +2,7 @@ name: PR Basic Check
 
 on:
   pull_request:
-    types: [opened, reopened]
+    types: [opened,reopened,synchronize]
     branches:
       - master
 jobs:
@@ -27,4 +27,4 @@ jobs:
             gradle-
 
       - name: Build apk with Gradle
-        run: bash ./gradlew assembleRelease
+        run: bash ./gradlew assembleRelease --scan --debug

PrivacyPolicy.md

@@ -10,7 +10,7 @@ an integral part of the Privacy Policy Network Service Use Agreement. You do not
 with the personal information we request, but in many cases, if you choose not to do so, we will not
 be able to provide you with our products or services or respond to any questions you may have. If
 you have any questions about the data processing practices described in this Privacy Policy, please
-contact us at [rosuh＠qq.com](mailto:hi@rosuh.me) so that we can address your specific needs. We are
+contact us at [hi@rosuh.me](mailto:hi@rosuh.me) so that we can address your specific needs. We are
 happy to receive your feedback.
 
 <h3> I. How we collect information</h3>
@@ -38,7 +38,7 @@ Any changes, by your consent, you agree to be bound by this policy as amended
 The constraints.
 <h3>Vii. How to contact us</h3>
 If you have any questions, comments or suggestions regarding this Privacy Policy, you may
-Contact us by email: rosuh＠qq.com If you are not satisfied with our response, especially with our personal information
+Contact us by email: hi@rosuh.me If you are not satisfied with our response, especially with our personal information
 You may also be able to address your legal rights by filing a complaint with us.
 Seeking resolution by filing a lawsuit in the people's court of competent jurisdiction
 Program.

PrivacyPolicy_zh-CN.md

@@ -3,7 +3,7 @@
 隐私政策尊重并保护所有使用隐私政策网络服务用户的个人隐私权。 为了给您提供更准确、更有个性化的服务，我们的隐私政策涵盖我们收集，使用，披露，传输和存储您的信息的方式。
 但隐私政策将以高度的勤勉、审慎义务对待这些信息。隐私政策会不时更新本隐私权政策。 您在同意隐私政策络服务使用协议之时，即视为您已经同意本隐私权政策全部内容。
 本隐私权政策属于隐私政策络服务使用协议不可分割的一部分。 你不是一定要提供我们要求的个人信息，但在许多情况下，如果你选择不提供，我们将无法为你提供我们的产品或服务，也无法回应你遇到的任何问题。
-如果您对本隐私政策中描述的数据处理实践有任何疑问，请通过[rosuh＠qq.com](mailto:hi@rosuh.me)联系我们，以便我们处理您的特殊需求。我们很高兴收到您的反馈。
+如果您对本隐私政策中描述的数据处理实践有任何疑问，请通过[hi@rosuh.me](mailto:hi@rosuh.me)联系我们，以便我们处理您的特殊需求。我们很高兴收到您的反馈。
 
 <h3> 一、我们如何收集信息</h3>
 我们压根就不主动收集信息。即便没有你的信息，我们照样运行得很好。当然，如果崩溃了，你可以选择高抬贵手发送带有设备型号和系统版本信息的邮件给我们，方便我们定位问题。
@@ -30,7 +30,7 @@
 的约束。
 <h3>七、如何联系我们</h3>
 如果你对本隐私政策有任何疑问、意见或建议，可以
-通过邮件联系我们: rosuh＠qq.com 如果你对我们的回复不满意，特别是我们的个人信息
+通过邮件联系我们: hi@rosuh.me 如果你对我们的回复不满意，特别是我们的个人信息
 处理行为损害了你的合法权益，你还可以通过向我们
 所在地有管辖权的人民法院提起诉讼的方式寻求解决
 方案。

app/build.gradle.kts

@@ -15,8 +15,8 @@ android {
         applicationId = "me.rosuh.easywatermark"
         minSdk = (Apps.minSdk)
         targetSdk = (Apps.targetSdk)
-        versionCode = 20802
-        versionName = "2.8.2"
+        versionCode = 20803
+        versionName = "2.8.3"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         setProperty("archivesBaseName", "$applicationId-v$versionName($versionCode)")
     }
@@ -76,34 +76,34 @@ dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
     implementation(project(mapOf("path" to ":cmonet")))
 
-    val roomVersion = "2.4.2"
+    val roomVersion = "2.4.3"
 
     implementation("androidx.room:room-runtime:$roomVersion")
     implementation("androidx.room:room-ktx:$roomVersion")
     kapt("androidx.room:room-compiler:$roomVersion")
 
     implementation("androidx.datastore:datastore-preferences:1.0.0")
 
-    implementation("com.google.dagger:hilt-android:2.42")
-    kapt("com.google.dagger:hilt-compiler:2.42")
+    implementation("com.google.dagger:hilt-android:2.43.2")
+    kapt("com.google.dagger:hilt-compiler:2.43.2")
 
     implementation("androidx.asynclayoutinflater:asynclayoutinflater:1.0.0")
 
-    implementation("com.github.bumptech.glide:glide:4.13.1")
-    kapt("com.github.bumptech.glide:compiler:4.13.1")
+    implementation("com.github.bumptech.glide:glide:4.13.2")
+    kapt("com.github.bumptech.glide:compiler:4.13.2")
 
     implementation("id.zelory:compressor:3.0.1")
 
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.0")
-    implementation("androidx.appcompat:appcompat:1.4.2")
-    implementation("com.google.android.material:material:1.7.0-alpha02")
-    implementation("androidx.fragment:fragment-ktx:1.5.0")
-    implementation("androidx.activity:activity-ktx:1.5.0")
-    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.0")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.1")
-    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.1")
-    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.0")
-    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.0")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
+    implementation("androidx.appcompat:appcompat:1.5.0")
+    implementation("com.google.android.material:material:1.8.0-alpha01")
+    implementation("androidx.fragment:fragment-ktx:1.5.2")
+    implementation("androidx.activity:activity-ktx:1.5.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.5.1")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.5.1")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
     implementation("com.github.skydoves:colorpickerview:2.2.3")
     implementation("androidx.viewpager2:viewpager2:1.0.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")

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

@@ -23,5 +23,9 @@ data class FuncTitleModel(
         object TextSize : FuncType() {
             val tag = "TextSize"
         }
+
+        object TileMode : FuncType() {
+            val tag = "TileMode"
+        }
     }
 }

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

@@ -1,6 +1,8 @@
 package me.rosuh.easywatermark.data.model
 
+import android.graphics.Shader
 import android.net.Uri
+import androidx.annotation.FloatRange
 
 data class ImageInfo(
     val uri: Uri,
@@ -12,7 +14,45 @@ data class ImageInfo(
     var result: Result<*>? = null,
     var jobState: JobState = JobState.Ready,
     var isInDelModel: Boolean = false,
+    val tileMode: Int = Shader.TileMode.REPEAT.ordinal,
+    @FloatRange(from = 0.0, to = 1.0) val offsetX: Float = 0.5f,
+    @FloatRange(from = 0.0, to = 1.0) val offsetY: Float = 0.5f,
 ) {
     val shareUri: Uri?
         get() = result?.data as? Uri?
+
+    fun obtainTileMode(): Shader.TileMode {
+        return when (tileMode) {
+            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
+        }
+    }
+
+    fun isSameItem(other: ImageInfo): Boolean {
+        return uri == other.uri
+                && result == other.result
+                && jobState == other.jobState
+                && isInDelModel == other.isInDelModel
+    }
+
+    companion object {
+        fun empty(): ImageInfo {
+            return ImageInfo(
+                Uri.EMPTY,
+                1,
+                1,
+                1,
+                1f,
+                1f,
+                null,
+                JobState.Ready,
+                false,
+                Shader.TileMode.REPEAT.ordinal,
+                0.5f,
+                0.5f
+            )
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package me.rosuh.easywatermark.data.model
 
+import android.graphics.Shader
 import android.net.Uri
 import androidx.annotation.Keep
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository

app/src/main/java/me/rosuh/easywatermark/data/repo/WaterMarkRepository.kt

@@ -1,14 +1,15 @@
 package me.rosuh.easywatermark.data.repo
 
 import android.graphics.Color
+import android.graphics.Shader
 import android.net.Uri
+import android.util.Log
+import androidx.collection.ArrayMap
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.*
-import androidx.lifecycle.asLiveData
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.withContext
 import me.rosuh.easywatermark.MyApp
 import me.rosuh.easywatermark.R
 import me.rosuh.easywatermark.data.model.ImageInfo
@@ -21,6 +22,8 @@ import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_E
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_HORIZON_GAP
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_ICON_URI
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_MODE
+import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_OFFSET_X
+import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_OFFSET_Y
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_TEXT
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_TEXT_COLOR
 import me.rosuh.easywatermark.data.repo.WaterMarkRepository.PreferenceKeys.KEY_TEXT_SIZE
@@ -31,6 +34,7 @@ import java.io.IOException
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
+import kotlin.collections.ArrayList
 
 @Singleton
 class WaterMarkRepository @Inject constructor(
@@ -48,10 +52,18 @@ class WaterMarkRepository @Inject constructor(
         val KEY_VERTICAL_GAP = intPreferencesKey(SP_KEY_VERTICAL_GAP)
         val KEY_DEGREE = floatPreferencesKey(SP_KEY_DEGREE)
         val KEY_ICON_URI = stringPreferencesKey(SP_KEY_ICON_URI)
+        val KEY_URI = stringPreferencesKey(SP_KEY_URI)
         val KEY_MODE = intPreferencesKey(SP_KEY_WATERMARK_MODE)
         val KEY_ENABLE_BOUNDS = booleanPreferencesKey(SP_KEY_ENABLE_BOUNDS)
+        val KEY_TILE_MODE = intPreferencesKey(SP_KEY_TILE_MODEL)
+        val KEY_OFFSET_X = floatPreferencesKey(SP_KEY_OFFSET_X)
+        val KEY_OFFSET_Y = floatPreferencesKey(SP_KEY_OFFSET_Y)
     }
 
+    private val _selectedImage = MutableStateFlow(ImageInfo.empty())
+
+    val selectedImage: StateFlow<ImageInfo> = _selectedImage
+
     val waterMark: Flow<WaterMark> = dataStore.data
         .catch { exception ->
             if (exception is IOException) {
@@ -78,16 +90,19 @@ class WaterMarkRepository @Inject constructor(
             )
         }
 
-    private val imageListFlow: MutableStateFlow<List<ImageInfo>> =
-        MutableStateFlow(emptyList())
+    private val _imageMapFlow: MutableStateFlow<List<ImageInfo>> = MutableStateFlow(emptyList())
+    private val imageInfoMap: MutableMap<Uri, Int> = ArrayMap(_imageMapFlow.value.size)
 
-    val uriLivedData = imageListFlow.asLiveData()
+    val imageInfoMapFlow = _imageMapFlow
 
     val imageInfoList: List<ImageInfo>
-        get() = uriLivedData.value ?: emptyList()
+        get() = imageInfoMapFlow.value
 
     suspend fun updateImageList(imageList: List<ImageInfo>) {
-        imageListFlow.emit(imageList)
+        val map = imageList.mapIndexed { index, imageInfo -> imageInfo.uri to index }.toMap()
+        imageInfoMap.clear()
+        imageInfoMap.putAll(map)
+        _imageMapFlow.emit(imageList)
     }
 
     suspend fun updateText(text: String) {
@@ -138,6 +153,40 @@ class WaterMarkRepository @Inject constructor(
         }
     }
 
+    suspend fun updateTileMode(imageInfo: ImageInfo, mode: Shader.TileMode): ImageInfo {
+        if (imageInfo.tileMode == mode.ordinal) {
+            Log.i("WaterMarkRepository", "updateTileMode: same mode")
+            return imageInfo
+        }
+        val index = imageInfoMap[imageInfo.uri] ?: kotlin.run {
+            Log.e("WaterMarkRepository", "updateTileMode: imageInfo not found, uri = ${imageInfo.uri}")
+            return imageInfo
+        }
+
+        val info = imageInfo.copy(tileMode = mode.ordinal)
+        val list = ArrayList(imageInfoList)
+        list[index] = info
+        imageInfoMap[info.uri] = index
+        _imageMapFlow.emit(list)
+        _selectedImage.emit(info)
+        return info
+    }
+
+    suspend fun updateOffset(imageInfo: ImageInfo) {
+        if (imageInfo == selectedImage.value) {
+            return
+        }
+        val index = imageInfoMap[selectedImage.value.uri] ?: kotlin.run {
+            Log.e("WaterMarkRepository", "updateOffset: imageInfo not found, uri = ${selectedImage.value.uri}")
+            return
+        }
+        val list = ArrayList(imageInfoList)
+        list[index] = imageInfo
+        imageInfoMap[imageInfo.uri] = index
+        _imageMapFlow.emit(list)
+        _selectedImage.emit(imageInfo)
+    }
+
     suspend fun resetModeToText() {
         dataStore.edit { it[KEY_MODE] = MarkMode.Text.value }
     }
@@ -150,6 +199,11 @@ class WaterMarkRepository @Inject constructor(
         updateImageList(emptyList())
     }
 
+    suspend fun select(uri: Uri) = withContext(Dispatchers.Default) {
+        val info = imageInfoList.find { it.uri == uri } ?: ImageInfo(uri)
+        _selectedImage.emit(info)
+    }
+
     sealed class MarkMode(val value: Int) {
         object Text : MarkMode(0)
 
@@ -171,9 +225,15 @@ class WaterMarkRepository @Inject constructor(
         const val SP_KEY_CHANGE_LOG = "${SP_NAME}_key_change_log"
         const val SP_KEY_ENABLE_BOUNDS = "${SP_NAME}_key_enable_bounds"
         const val SP_KEY_ICON_URI = "${SP_NAME}_key_icon_uri"
+        const val SP_KEY_URI = "${SP_NAME}_key_uri"
         const val SP_KEY_WATERMARK_MODE = "${SP_NAME}_key_watermark_mode"
         const val SP_KEY_IMAGE_ROTATION = "${SP_NAME}_key_watermark_mode"
+        const val SP_KEY_TILE_MODEL = "${SP_NAME}_key_tile_model"
+        const val SP_KEY_OFFSET_X = "${SP_NAME}_key_offset_x"
+        const val SP_KEY_OFFSET_Y = "${SP_NAME}_key_offset_y"
         const val MAX_TEXT_SIZE = 100f
+        const val MIN_TEXT_SIZE = 1f
+        const val DEFAULT_TEXT_SIZE = 14f
         const val MAX_DEGREE = 360f
         const val MAX_HORIZON_GAP = 500
         const val MAX_VERTICAL_GAP = 500