Skip to content

Commit 018e247

Browse files
authored
Merge pull request #61 from aashishksahu/54-prompt-to-rename-on-overwrite
54 prompt to rename on overwrite
2 parents 1a2d5a7 + 232e03c commit 018e247

91 files changed

Lines changed: 5568 additions & 1983 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.idea/.gitignore

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/deploymentTargetDropDown.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

.idea/deploymentTargetSelector.xml

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 45 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,13 @@ android {
1616

1717
minSdk 29
1818
targetSdk 34
19-
versionCode 22
20-
versionName "1.4.8"
19+
versionCode 31
20+
versionName "2.0.0"
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
23+
vectorDrawables {
24+
useSupportLibrary true
25+
}
2326
}
2427

2528
buildTypes {
@@ -36,6 +39,17 @@ android {
3639
kotlinOptions {
3740
jvmTarget = '1.8'
3841
}
42+
buildFeatures {
43+
compose true
44+
}
45+
composeOptions {
46+
kotlinCompilerExtensionVersion '1.5.1'
47+
}
48+
packaging {
49+
resources {
50+
excludes += '/META-INF/{AL2.0,LGPL2.1}'
51+
}
52+
}
3953
}
4054

4155
dependencies {
@@ -50,12 +64,32 @@ dependencies {
5064
implementation 'androidx.media3:media3-common:1.3.1'
5165

5266
// For Pictures
53-
implementation 'com.github.bumptech.glide:glide:4.15.1'
54-
annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
67+
implementation 'com.github.bumptech.glide:glide:4.16.0'
68+
implementation "com.github.bumptech.glide:compose:1.0.0-beta01"
69+
implementation 'androidx.preference:preference-ktx:1.2.1'
70+
implementation 'androidx.activity:activity-ktx:1.9.0'
71+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
72+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1'
73+
implementation 'androidx.lifecycle:lifecycle-runtime-compose-android:2.8.1'
74+
annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0'
5575
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
5676

77+
// Compose
78+
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.8.1'
79+
implementation 'androidx.activity:activity-compose:1.9.0'
80+
implementation platform('androidx.compose:compose-bom:2024.05.00')
81+
implementation 'androidx.compose.ui:ui'
82+
implementation 'androidx.compose.ui:ui-graphics'
83+
implementation 'androidx.compose.ui:ui-tooling-preview'
84+
implementation 'androidx.compose.material3:material3'
85+
debugImplementation 'androidx.compose.ui:ui-tooling'
86+
implementation "androidx.compose.runtime:runtime-livedata:1.6.7"
87+
debugImplementation 'androidx.compose.ui:ui-test-manifest'
88+
androidTestImplementation platform('androidx.compose:compose-bom:2024.05.00')
89+
androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
90+
5791
// For Camera
58-
def camerax_version = "1.3.2"
92+
def camerax_version = "1.3.3"
5993
implementation "androidx.camera:camera-core:${camerax_version}"
6094
implementation "androidx.camera:camera-camera2:${camerax_version}"
6195
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
@@ -65,15 +99,15 @@ dependencies {
6599
implementation "androidx.camera:camera-extensions:${camerax_version}"
66100

67101
// For App functionality
68-
implementation 'androidx.core:core-ktx:1.12.0'
102+
implementation 'androidx.core:core-ktx:1.13.1'
69103
implementation "androidx.recyclerview:recyclerview:1.3.2"
70-
implementation 'androidx.appcompat:appcompat:1.6.1'
71-
implementation 'com.google.android.material:material:1.11.0'
104+
implementation 'androidx.appcompat:appcompat:1.7.0'
105+
implementation 'com.google.android.material:material:1.12.0'
72106
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
73-
implementation "androidx.fragment:fragment-ktx:1.6.2"
74-
107+
implementation "androidx.fragment:fragment-ktx:1.7.1"
108+
implementation "androidx.preference:preference-ktx:1.2.1"
75109

76-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
110+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
77111
}
78112

79113
// https://f-droid.org/docs/Reproducible_Builds/#bug-baselineprofm-not-deterministic

app/release/app-release.apk

12.3 MB
Binary file not shown.

0 commit comments

Comments
 (0)