Skip to content

Commit ddc7566

Browse files
authored
Merge pull request #42 from Abizer-R/release/5-rc2
Release/5 rc2
2 parents 9a1f6a6 + 62d1525 commit ddc7566

24 files changed

Lines changed: 480 additions & 263 deletions

File tree

app/build.gradle.kts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
plugins {
22
alias(libs.plugins.android.application)
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.kotlin.compose)
45
alias(libs.plugins.kotlin.kapt)
56
alias(libs.plugins.dagger.hilt)
67
}
78

89
android {
910
namespace = "com.abizer_r.quickedit"
10-
compileSdk = 34
11+
compileSdk = 35
1112

1213
defaultConfig {
1314
applicationId = "com.abizer_r.quickedit"
1415
minSdk = 24
15-
targetSdk = 34
16-
versionCode = 4
17-
versionName = "1.1.0"
16+
targetSdk = 35
17+
versionCode = 5
18+
versionName = "1.1.1"
1819

1920
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2021
vectorDrawables {
@@ -42,9 +43,9 @@ android {
4243
buildFeatures {
4344
compose = true
4445
}
45-
composeOptions {
46-
kotlinCompilerExtensionVersion = "1.4.3"
47-
}
46+
47+
// remove composeOptions.kotlinCompilerExtensionVersion when on Kotlin 2.x
48+
// composeOptions { kotlinCompilerExtensionVersion = "1.5.10" }
4849
packaging {
4950
resources {
5051
excludes += "/META-INF/{AL2.0,LGPL2.1}"

app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,15 @@
2020
android:windowSoftInputMode="adjustResize">
2121
<intent-filter>
2222
<action android:name="android.intent.action.MAIN" />
23-
2423
<category android:name="android.intent.category.LAUNCHER" />
2524
</intent-filter>
25+
26+
<intent-filter>
27+
<action android:name="android.intent.action.SEND" />
28+
<category android:name="android.intent.category.DEFAULT" />
29+
<data android:mimeType="image/*" />
30+
</intent-filter>
31+
2632
</activity>
2733
</application>
2834

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,37 @@
11
package com.abizer_r.quickedit.ui.main
22

3+
import android.content.Intent
4+
import android.net.Uri
35
import android.os.Bundle
46
import androidx.activity.ComponentActivity
7+
import androidx.activity.SystemBarStyle
58
import androidx.activity.compose.setContent
9+
import androidx.activity.enableEdgeToEdge
10+
import androidx.core.view.WindowCompat
611
import com.abizer_r.quickedit.ui.navigation.QuickEditApp
712
import dagger.hilt.android.AndroidEntryPoint
813

914
@AndroidEntryPoint
1015
class MainActivity : ComponentActivity() {
1116
override fun onCreate(savedInstanceState: Bundle?) {
1217
super.onCreate(savedInstanceState)
18+
19+
WindowCompat.setDecorFitsSystemWindows(window, false)
20+
21+
val imageUri: Uri? = extractImageUriFromIntent(intent)
22+
1323
setContent {
14-
QuickEditApp()
24+
QuickEditApp(initialImageUri = imageUri)
25+
}
26+
}
27+
28+
private fun extractImageUriFromIntent(intent: Intent?): Uri? {
29+
if (intent == null) return null
30+
31+
return if (intent.action == Intent.ACTION_SEND) {
32+
intent.getParcelableExtra(Intent.EXTRA_STREAM)
33+
} else {
34+
null
1535
}
1636
}
1737
}

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
alias(libs.plugins.android.application) apply false
44
alias(libs.plugins.android.library) apply false
55
alias(libs.plugins.kotlin.android) apply false
6+
alias(libs.plugins.kotlin.compose) apply false
67
alias(libs.plugins.kotlin.kapt) apply false
78
alias(libs.plugins.dagger.hilt) apply false
89
// id("org.jetbrains.kotlin.plugin.serialization") version "2.0.0-RC3" apply false

gradle/libs.versions.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
22
activityCompose = "1.9.0"
3-
agp = "8.1.4"
3+
agp = "8.6.1"
44
androidImageCropper = "4.5.0"
55
appcompat = "1.7.0"
6-
cloudy = "0.1.2"
6+
cloudy = "0.2.7"
77
colorpicker = "1.0.0"
8-
composeBom = "2024.06.00"
8+
composeBom = "2025.05.00"
99
composeScreenshot = "1.0.3"
1010
constraintlayoutCompose = "1.0.1"
1111
coreKtx = "1.13.1"
1212
espressoCore = "3.6.0"
1313
gpuimage = "2.1.0"
14-
hiltAndroid = "2.49"
14+
hiltAndroid = "2.57.1"
1515
hiltNavigationCompose = "1.2.0"
1616
junit = "4.13.2"
1717
junitVersion = "1.2.0"
18-
kotlinxSerializationJson = "1.7.0-RC"
19-
kotlin = "1.8.10"
18+
kotlinxSerializationJson = "1.6.3"
19+
kotlin = "2.1.10"
2020
lifecycleRuntimeKtx = "2.8.2"
2121
material = "1.12.0"
2222
navigationCompose = "2.7.7"
@@ -59,5 +59,6 @@ material = { module = "com.google.android.material:material", version.ref = "mat
5959
android-application = { id = "com.android.application", version.ref = "agp"}
6060
android-library = { id = "com.android.library", version.ref = "agp"}
6161
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin"}
62+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin"}
6263
kotlin-kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin"}
6364
dagger-hilt = { id = "com.google.dagger.hilt.android", version.ref = "hiltAndroid"}

gradle/wrapper/gradle-wrapper.jar

-15.3 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Sat Mar 09 22:53:01 IST 2024
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)