Skip to content

Lower min SDK to API 23 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ethanc8 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Lower min SDK to API 23 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {

defaultConfig {
applicationId = "com.catenarymaps.catenary"
minSdk = 27
minSdk = 23
targetSdk = 36
versionCode = 190
versionName = "2.0.88"
Expand All @@ -47,11 +47,13 @@ android {
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
// Enable Java 8 desugaring
isCoreLibraryDesugaringEnabled = true
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
jvmTarget = "11"
jvmTarget = "1.8"
}
buildFeatures {
compose = true
Expand Down Expand Up @@ -109,6 +111,9 @@ dependencies {
implementation(libs.androidx.core.splashscreen)
implementation(libs.coil.compose)
implementation(libs.coil.svg)

// Enable Java 8 desugaring
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.3")
}

datadog {
Expand Down
5 changes: 4 additions & 1 deletion app/src/main/java/com/catenarymaps/catenary/AlertsBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ import java.util.TimeZone

import androidx.compose.foundation.layout.heightIn
import androidx.compose.ui.platform.LocalConfiguration
import androidx.core.os.ConfigurationCompat

@Serializable
data class AlertTranslation(
val text: String,
Expand Down Expand Up @@ -96,7 +98,8 @@ fun AlertsBox(

val alertColor = Color(0xFFF99C24)

val locale = LocalConfiguration.current.locales[0]
val locale = ConfigurationCompat.getLocales(LocalConfiguration.current)
.get(0) ?: Locale.getDefault()
val localeCode = remember(locale) {
if (locale.language.startsWith("en")) "en-CA" else locale.toLanguageTag()
}
Expand Down
6 changes: 5 additions & 1 deletion app/src/main/java/com/catenarymaps/catenary/StopScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package com.catenarymaps.catenary

import android.os.Build
import androidx.annotation.RequiresApi
import androidx.core.os.ConfigurationCompat
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -714,7 +717,8 @@ fun StopScreen(
ZoneId.systemDefault()
}
}
val locale = LocalConfiguration.current.locales[0] ?: Locale.getDefault()
val locale = ConfigurationCompat.getLocales(LocalConfiguration.current)
.get(0) ?: Locale.getDefault()
val dateHeaderFormatter = remember(locale) {
DateTimeFormatter.ofLocalizedDate(FormatStyle.FULL).withLocale(locale).withZone(zoneId)
}
Expand Down