Merge pull request #40 from Abizer-R/bump_api_target_to_35

Abizer-R · web-flow · commit 080ce7d6247e · 2025-08-28T17:12:45.000+05:30
Bump api target to 35
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,18 +1,19 @@
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.dagger.hilt)
 }
 
 android {
     namespace = "com.abizer_r.quickedit"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.abizer_r.quickedit"
         minSdk = 24
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 5
         versionName = "1.1.1"
 
@@ -42,9 +43,9 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
-    }
+
+    // remove composeOptions.kotlinCompilerExtensionVersion when on Kotlin 2.x
+//    composeOptions { kotlinCompilerExtensionVersion = "1.5.10" }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
diff --git a/app/src/main/java/com/abizer_r/quickedit/ui/main/MainActivity.kt b/app/src/main/java/com/abizer_r/quickedit/ui/main/MainActivity.kt
@@ -4,7 +4,10 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.core.view.WindowCompat
 import com.abizer_r.quickedit.ui.navigation.QuickEditApp
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -13,6 +16,8 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        WindowCompat.setDecorFitsSystemWindows(window, false)
+
         val imageUri: Uri? = extractImageUriFromIntent(intent)
 
         setContent {
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.kotlin.android) apply false
+    alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.kotlin.kapt) apply false
     alias(libs.plugins.dagger.hilt) apply false
 //    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0-RC3" apply false
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,22 +1,22 @@
 [versions]
 activityCompose = "1.9.0"
-agp = "8.3.0"
+agp = "8.6.1"
 androidImageCropper = "4.5.0"
 appcompat = "1.7.0"
-cloudy = "0.1.2"
+cloudy = "0.2.7"
 colorpicker = "1.0.0"
-composeBom = "2024.06.00"
+composeBom = "2025.05.00"
 composeScreenshot = "1.0.3"
 constraintlayoutCompose = "1.0.1"
 coreKtx = "1.13.1"
 espressoCore = "3.6.0"
 gpuimage = "2.1.0"
-hiltAndroid = "2.49"
+hiltAndroid = "2.57.1"
 hiltNavigationCompose = "1.2.0"
 junit = "4.13.2"
 junitVersion = "1.2.0"
 kotlinxSerializationJson = "1.6.3"
-kotlin = "1.9.22"
+kotlin = "2.1.10"
 lifecycleRuntimeKtx = "2.8.2"
 material = "1.12.0"
 navigationCompose = "2.7.7"
@@ -59,5 +59,6 @@ material = { module = "com.google.android.material:material", version.ref = "mat
 android-application = { id = "com.android.application", version.ref = "agp"}
 android-library = { id = "com.android.library", version.ref = "agp"}
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"}
+kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin"}
 kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin"}
 dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid"}
diff --git a/quickedit/build.gradle.kts b/quickedit/build.gradle.kts
@@ -1,13 +1,14 @@
 plugins {
     alias(libs.plugins.android.library)
     alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.kotlin.compose)
     alias(libs.plugins.kotlin.kapt)
     alias(libs.plugins.dagger.hilt)
 }
 
 android {
     namespace = "com.abizer_r.quickedit"
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         minSdk = 24
@@ -35,9 +36,9 @@ android {
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = "1.5.10"
-    }
+
+    // remove composeOptions.kotlinCompilerExtensionVersion when on Kotlin 2.x
+//    composeOptions { kotlinCompilerExtensionVersion = "1.5.10" }
 }
 
 dependencies {
diff --git a/quickedit/proguard-rules.pro b/quickedit/proguard-rules.pro
@@ -18,4 +18,15 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+
+# Hilt / Dagger
+-keep class dagger.hilt.** { *; }
+-keep class * extends dagger.hilt.internal.GeneratedComponent { *; }
+-keep class * extends androidx.lifecycle.ViewModel { *; }  # keep ViewModel names if used in DI
+
+# Okio/OkHttp/Moshi (if you add later)
+-dontwarn javax.annotation.**
+
+# GPUImage (avoid stripping)
+-keep class jp.co.cyberagent.android.gpuimage.** { *; }
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/theme/Theme.kt b/quickedit/src/main/java/com/abizer_r/quickedit/theme/Theme.kt
@@ -55,9 +55,14 @@ fun QuickEditTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
-            window.statusBarColor = Color.Black.toArgb()
-            window.navigationBarColor = Color.Black.toArgb()
-            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+            window.statusBarColor = Color.Transparent.toArgb()
+            window.navigationBarColor = Color.Transparent.toArgb()
+
+            val controller = WindowCompat.getInsetsController(window, view)
+            controller.isAppearanceLightStatusBars = !darkTheme
+            controller.isAppearanceLightNavigationBars = !darkTheme
+
+            if (Build.VERSION.SDK_INT >= 29) window.isNavigationBarContrastEnforced = false
         }
     }
 
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/ui/cropMode/cropperOptions/CropperOptionsFullWidth.kt b/quickedit/src/main/java/com/abizer_r/quickedit/ui/cropMode/cropperOptions/CropperOptionsFullWidth.kt
@@ -61,7 +61,7 @@ fun CropperOptionsFullWidth(
             val cropperOption = cropperOptionList[index]
             CropperOptionView(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = 4.dp),
                 cropperOption = cropperOption,
                 isSelected = index == selectedIndex,
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/ui/effectsMode/EffectsModeScreen.kt b/quickedit/src/main/java/com/abizer_r/quickedit/ui/effectsMode/EffectsModeScreen.kt
@@ -48,8 +48,7 @@ import com.abizer_r.quickedit.ui.editorScreen.bottomToolbar.TOOLBAR_HEIGHT_SMALL
 import com.abizer_r.quickedit.ui.editorScreen.topToolbar.TextModeTopToolbar
 import com.abizer_r.quickedit.ui.effectsMode.effectsPreview.EffectItem
 import com.abizer_r.quickedit.ui.effectsMode.effectsPreview.EffectsPreviewListFullWidth
-import com.abizer_r.quickedit.utils.SharedTransitionPreviewExtension
-import com.abizer_r.quickedit.utils.editorScreen.EffectsModeUtils
+import com.abizer_r.quickedit.utils.effectsMode.EffectsModeUtils
 import com.abizer_r.quickedit.utils.other.anim.AnimUtils
 import com.abizer_r.quickedit.utils.other.bitmap.ImmutableBitmap
 import com.smarttoolfactory.screenshot.ImageResult
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/ui/effectsMode/effectsPreview/EffectsPreviewListFullWidth.kt b/quickedit/src/main/java/com/abizer_r/quickedit/ui/effectsMode/effectsPreview/EffectsPreviewListFullWidth.kt
@@ -67,7 +67,7 @@ fun EffectsPreviewListFullWidth(
             val effectItem = effectsList[index]
             EffectPreview(
                 modifier = Modifier
-                    .animateItemPlacement()
+                    .animateItem()
                     .padding(horizontal = 4.dp),
                 effectItem = effectItem,
                 isSelected = index == selectedIndex,
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/ui/mainScreen/MainScreenViewModel.kt b/quickedit/src/main/java/com/abizer_r/quickedit/ui/mainScreen/MainScreenViewModel.kt
@@ -16,7 +16,7 @@ class MainScreenViewModel @Inject constructor(
     val visiblePermissionDialogQueue = mutableStateListOf<String>()
 
     fun dismissDialog() {
-        visiblePermissionDialogQueue.removeLast()
+        visiblePermissionDialogQueue.removeAt(visiblePermissionDialogQueue.size - 1)
     }
 
     fun onPermissionResult(
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/ui/navigation/QuickEditApp.kt b/quickedit/src/main/java/com/abizer_r/quickedit/ui/navigation/QuickEditApp.kt
@@ -3,7 +3,12 @@ package com.abizer_r.quickedit.ui.navigation
 import android.net.Uri
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import com.abizer_r.quickedit.theme.QuickEditTheme
@@ -13,11 +18,18 @@ fun QuickEditApp(
     initialImageUri: Uri? = null
 ) {
     QuickEditTheme {
-        Box(
-            modifier = Modifier
-                .background(MaterialTheme.colorScheme.background)
-        ) {
-            QuickEditNavigation(initialImageUri)
+        Scaffold(
+            // Ensure content avoids system bars & cutouts
+            contentWindowInsets = WindowInsets.safeDrawing,
+        ) { innerPadding ->
+            Box(
+                modifier = Modifier
+                    .fillMaxSize()
+                    .padding(innerPadding)
+                    .background(MaterialTheme.colorScheme.background)
+            ) {
+                QuickEditNavigation(initialImageUri)
+            }
         }
     }
 }
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/AcvToneCurveParser.kt b/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/AcvToneCurveParser.kt
@@ -0,0 +1,58 @@
+package com.abizer_r.quickedit.utils.effectsMode
+
+import java.io.InputStream
+import kotlin.math.roundToInt
+
+object AcvToneCurveParser {
+    data class Curve(val r: List<Pair<Float, Float>>, val g: List<Pair<Float, Float>>, val b: List<Pair<Float, Float>>)
+
+    fun parse(input: InputStream): Curve {
+        val data = input.readBytes()
+        var offset = 0
+
+        fun readShort(): Int {
+            val result = ((data[offset].toInt() and 0xFF) shl 8) or (data[offset + 1].toInt() and 0xFF)
+            offset += 2
+            return result
+        }
+
+        readShort() // version
+        val totalCurves = readShort()
+
+        val curves = mutableListOf<List<Pair<Float, Float>>>()
+        repeat(totalCurves) {
+            val pointCount = readShort()
+            val points = List(pointCount) {
+                val y = readShort().toFloat()
+                val x = readShort().toFloat()
+                Pair(x / 255f, y / 255f)
+            }.sortedBy { it.first }
+            curves.add(points)
+        }
+
+        return Curve(
+            r = curves.getOrNull(1) ?: curves[0],
+            g = curves.getOrNull(2) ?: curves[0],
+            b = curves.getOrNull(3) ?: curves[0]
+        )
+    }
+
+    fun interpolate(points: List<Pair<Float, Float>>): IntArray {
+        val lut = IntArray(256)
+        for (i in 0..255) {
+            val x = i / 255f
+            val p = points.zipWithNext().firstOrNull { x >= it.first.first && x <= it.second.first }
+            val value = when {
+                p != null -> {
+                    val (x1, y1) = p.first
+                    val (x2, y2) = p.second
+                    y1 + (x - x1) * (y2 - y1) / (x2 - x1)
+                }
+                x <= points.first().first -> points.first().second
+                else -> points.last().second
+            }
+            lut[i] = (value.coerceIn(0f, 1f) * 255).roundToInt()
+        }
+        return lut
+    }
+}
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/BitmapGrayscaleFilter.kt b/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/BitmapGrayscaleFilter.kt
@@ -0,0 +1,18 @@
+package com.abizer_r.quickedit.utils.effectsMode
+
+import android.graphics.Bitmap
+import android.graphics.Canvas
+import android.graphics.ColorMatrix
+import android.graphics.ColorMatrixColorFilter
+import android.graphics.Paint
+
+object BitmapGrayscaleFilter {
+    fun apply(original: Bitmap): Bitmap {
+        val result = Bitmap.createBitmap(original.width, original.height, Bitmap.Config.ARGB_8888)
+        val canvas = Canvas(result)
+        val matrix = ColorMatrix().apply { setSaturation(0f) }
+        val paint = Paint().apply { colorFilter = ColorMatrixColorFilter(matrix) }
+        canvas.drawBitmap(original, 0f, 0f, paint)
+        return result
+    }
+}
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/BitmapToneCurveFilter.kt b/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/BitmapToneCurveFilter.kt
@@ -0,0 +1,30 @@
+package com.abizer_r.quickedit.utils.effectsMode
+
+import android.graphics.Bitmap
+
+object BitmapToneCurveFilter {
+    fun apply(original: Bitmap, curve: AcvToneCurveParser.Curve): Bitmap {
+        val rLut = AcvToneCurveParser.interpolate(curve.r)
+        val gLut = AcvToneCurveParser.interpolate(curve.g)
+        val bLut = AcvToneCurveParser.interpolate(curve.b)
+
+        val w = original.width
+        val h = original.height
+        val result = Bitmap.createBitmap(w, h, Bitmap.Config.ARGB_8888)
+
+        val pixels = IntArray(w * h)
+        original.getPixels(pixels, 0, w, 0, 0, w, h)
+
+        for (i in pixels.indices) {
+            val c = pixels[i]
+            val a = c ushr 24
+            val r = rLut[(c shr 16) and 0xFF]
+            val g = gLut[(c shr 8) and 0xFF]
+            val b = bLut[c and 0xFF]
+            pixels[i] = (a shl 24) or (r shl 16) or (g shl 8) or b
+        }
+
+        result.setPixels(pixels, 0, w, 0, 0, w, h)
+        return result
+    }
+}
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/EffectsModeUtils.kt b/quickedit/src/main/java/com/abizer_r/quickedit/utils/effectsMode/EffectsModeUtils.kt
diff --git a/quickedit/src/main/java/com/abizer_r/quickedit/utils/textMode/blurBackground/BlurBitmapBackground.kt b/quickedit/src/main/java/com/abizer_r/quickedit/utils/textMode/blurBackground/BlurBitmapBackground.kt
