Merge pull request #185 from rosuH/dev

Dependencies upgraded and bug fixed.

Author: rosuH

app/build.gradle.kts

@@ -83,14 +83,19 @@ dependencies {
     kapt("androidx.room:room-compiler:$roomVersion")
 
     implementation("androidx.datastore:datastore-preferences:1.0.0")
-    implementation("com.google.dagger:hilt-android:2.40.4")
+
+    implementation("com.google.dagger:hilt-android:2.42")
+    kapt("com.google.dagger:hilt-compiler:2.42")
+
     implementation("androidx.asynclayoutinflater:asynclayoutinflater:1.0.0")
-    kapt("com.google.dagger:hilt-compiler:2.40.4")
+
     implementation("com.github.bumptech.glide:glide:4.13.1")
     kapt("com.github.bumptech.glide:compiler:4.13.1")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
-    implementation("androidx.appcompat:appcompat:1.4.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.4.1")
     implementation("androidx.activity:activity-ktx:1.4.0")
@@ -103,7 +108,6 @@ dependencies {
     implementation("androidx.viewpager2:viewpager2:1.0.0")
     implementation("androidx.recyclerview:recyclerview:1.2.1")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
     implementation("androidx.exifinterface:exifinterface:1.3.3")
     implementation("androidx.palette:palette-ktx:1.0.0")
 

app/src/main/java/me/rosuh/easywatermark/ui/dialog/TextWatermarkBSDFragment.kt

@@ -63,6 +63,7 @@ class TextWatermarkBSDFragment : BaseBindBSDFragment<DialogEditTextContainerBind
                         UiState.GoTemplate -> {
                             expandToTemplateList()
                         }
+                        else -> {}
                     }
                 }
         }

app/src/main/java/me/rosuh/easywatermark/ui/panel/DegreePbFragment.kt

@@ -14,7 +14,7 @@ class DegreePbFragment : BasePBFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding?.slideContentSize?.valueFrom = 0f
-        binding?.slideContentSize?.valueTo = 360f
+        binding?.slideContentSize?.valueTo = WaterMarkRepository.MAX_DEGREE
     }
 
     override fun doOnChange(slider: Slider, value: Float, fromUser: Boolean) {

app/src/main/java/me/rosuh/easywatermark/ui/panel/HorizonPbFragment.kt

@@ -14,7 +14,7 @@ class HorizonPbFragment : BasePBFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding?.slideContentSize?.valueFrom = 0f
-        binding?.slideContentSize?.valueTo = 500f
+        binding?.slideContentSize?.valueTo = WaterMarkRepository.MAX_HORIZON_GAP.toFloat()
     }
 
     override fun doOnChange(slider: Slider, value: Float, fromUser: Boolean) {

app/src/main/java/me/rosuh/easywatermark/ui/panel/TextSizePbFragment.kt

@@ -22,11 +22,12 @@ class TextSizePbFragment : BasePBFragment() {
     }
 
     override fun formatValue(config: WaterMark?): Float {
-        return config?.textSize?.toInt()?.toFloat() ?: 1f
+        return (config?.textSize?.toInt()?.toFloat() ?: 1f).coerceAtLeast(1f).coerceAtMost(WaterMarkRepository.MAX_TEXT_SIZE)
     }
 
     override fun formatValueTips(config: WaterMark?): String {
-        return "${config?.textSize?.toInt()?.toFloat() ?: 1f}"
+        val size = (config?.textSize?.toInt()?.toFloat() ?: 1f).coerceAtLeast(1f).coerceAtMost(WaterMarkRepository.MAX_TEXT_SIZE)
+        return "$size"
     }
 
     companion object {

app/src/main/java/me/rosuh/easywatermark/ui/panel/VerticalPbFragment.kt

@@ -14,7 +14,7 @@ class VerticalPbFragment : BasePBFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         binding?.slideContentSize?.valueFrom = 0f
-        binding?.slideContentSize?.valueTo = 500f
+        binding?.slideContentSize?.valueTo = WaterMarkRepository.MAX_VERTICAL_GAP.toFloat()
     }
 
     override fun doOnChange(slider: Slider, value: Float, fromUser: Boolean) {

build.gradle.kts

@@ -7,10 +7,10 @@ buildscript {
         maven("https://plugins.gradle.org/m2/")
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.0")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
+        classpath("com.android.tools.build:gradle:7.2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0")
         classpath("org.jlleitschuh.gradle:ktlint-gradle:10.1.0")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:2.40.1")
+        classpath("com.google.dagger:hilt-android-gradle-plugin:2.42")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }