Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ android {
}

compileSdk {
version = release(36)
version = release(37)
}

defaultConfig {
applicationId = "de.stephanlindauer.criticalmaps"
minSdk = 26
targetSdk = 36
targetSdk = 37
versionCode = 103
versionName = "3.1.1"
vectorDrawables.useSupportLibrary = true
Expand Down
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
android:dataExtractionRules="@xml/data_extraction_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
tools:targetApi="s">

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public void execute() {
outputFile);

Intent cameraIntent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
cameraIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);

cameraIntent.putExtra(MediaStore.EXTRA_OUTPUT, imageCaptureUri);

Expand Down
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-hdpi/ic_stat_logo.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-mdpi/ic_stat_logo.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-xhdpi/ic_stat_logo.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/drawable-xxhdpi/ic_stat_logo.png
Binary file not shown.
6 changes: 0 additions & 6 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

This file was deleted.

Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.png
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Binary file not shown.
Binary file not shown.
6 changes: 6 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@ android.useAndroidX=true
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true

android.defaults.buildfeatures.resvalues=true
android.r8.strictFullModeForKeepRules=false
android.r8.optimizedResourceShrinking=false
android.builtInKotlin=false
android.newDsl=false
14 changes: 7 additions & 7 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
[versions]
otto = "1.3.8"
mapLibre = "12.3.1"
mapLibre = "13.2.0"
#noinspection NewerVersionAvailable
picasso = "2.8"
timber = "5.0.1"
okhttp = "5.3.2"
typedPreferences = "2.1.0"
material = "1.13.0"
core = "1.18.0"
material = "1.14.0"
core = "1.19.0"
appcompat = "1.7.1"
annotation = "1.9.1"
annotation = "1.10.0"
exifinterface = "1.4.2"
constraintLayout = "2.2.1"
dagger = "2.57.2"
leakcanary = "2.14"
junit = "4.13.2"
truth = "1.4.5"
mockito = "5.21.0"
mockito = "5.22.0"
junitVersion = "1.3.0"
androidTest = "1.7.0"
espressoCore = "3.7.0"
agp = "8.13.2"
agp = "9.1.1"
unmock = "0.9.0"

[libraries]
otto = { group = "com.squareup", name = "otto", version.ref = "otto" }
maplibre = { group = "org.maplibre.gl", name = "android-sdk", version.ref = "mapLibre" }
maplibre = { group = "org.maplibre.gl", name = "android-sdk-opengl", version.ref = "mapLibre" }
picasso = { group = "com.squareup.picasso", name = "picasso", version.ref = "picasso" }
timber = { group = "com.jakewharton.timber", name = "timber", version.ref = "timber" }
okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#Sun Nov 08 23:45:32 CET 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading