...
Some checks failed
Deploy static content to Pages / deploy (push) Has been cancelled

This commit is contained in:
lunaticbum 2025-07-15 16:09:50 +09:00
parent 109f91059f
commit 0f77c9cf10
58 changed files with 625 additions and 294 deletions

View File

@ -47,17 +47,17 @@ android {
buildTypes { buildTypes {
release { release {
applicationIdSuffix = ".release" isMinifyEnabled = false
isShrinkResources = false
postprocessing { // proguardFiles(
isRemoveUnusedCode = true // getDefaultProguardFile("proguard-android-optimize.txt"),
isObfuscate = false // "proguard-rules.pro"
isOptimizeCode = true // )
}
} }
debug { debug {
applicationIdSuffix = ".debug"
isDebuggable = true isDebuggable = true
isMinifyEnabled = false
isShrinkResources = false
} }
create("nightly") { create("nightly") {
initWith(getByName("release")) initWith(getByName("release"))

View File

@ -16,18 +16,26 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") // //consumerProguardFiles("consumer-rules.pro")
signingConfig = signingConfigs.getByName("debug") signingConfig = signingConfigs.getByName("debug")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
create("nightly") { create("nightly") {
isMinifyEnabled = false
isShrinkResources = false
initWith(getByName("release")) initWith(getByName("release"))
matchingFallbacks += "release" matchingFallbacks += "release"
} }

View File

@ -293,7 +293,6 @@ fun ColumnScope.ConfigureAppWidget(
val widgetInfo = remember(widget.config.widgetId) { val widgetInfo = remember(widget.config.widgetId) {
AppWidgetManager.getInstance(context).getAppWidgetInfo(widget.config.widgetId) AppWidgetManager.getInstance(context).getAppWidgetInfo(widget.config.widgetId)
} }
if (widgetInfo == null) { if (widgetInfo == null) {
var replaceWidget by rememberSaveable { var replaceWidget by rememberSaveable {
mutableStateOf(false) mutableStateOf(false)
@ -365,6 +364,7 @@ fun ColumnScope.ConfigureAppWidget(
} }
AppWidgetHost( AppWidgetHost(
widgetInfo = widgetInfo, widgetInfo = widgetInfo,
widgetId = widget.config.widgetId, widgetId = widget.config.widgetId,
modifier = Modifier modifier = Modifier

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") // //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
create("nightly") { create("nightly") {
initWith(getByName("release")) initWith(getByName("release"))

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") // //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") // //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,16 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
isMinifyEnabled = false isMinifyEnabled = false
proguardFiles( isShrinkResources = false
getDefaultProguardFile("proguard-android-optimize.txt"), // proguardFiles(
"proguard-rules.pro" // getDefaultProguardFile("proguard-android-optimize.txt"),
) // "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }
compileOptions { compileOptions {

View File

@ -20,7 +20,9 @@ import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.channelFlow import kotlinx.coroutines.flow.channelFlow
import de.mm20.launcher2.ktx.foldOrNull import de.mm20.launcher2.ktx.foldOrNull
import de.mm20.launcher2.ktx.isBetterThan import de.mm20.launcher2.ktx.isBetterThan
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.withContext
import java.util.concurrent.locks.ReentrantReadWriteLock import java.util.concurrent.locks.ReentrantReadWriteLock
import kotlin.concurrent.read import kotlin.concurrent.read
import kotlin.concurrent.write import kotlin.concurrent.write
@ -78,20 +80,24 @@ class DevicePoseProvider internal constructor(
} }
if (hasFineAccess) { if (hasFineAccess) {
requestLocationUpdates( withContext(Dispatchers.Main) {
LocationManager.GPS_PROVIDER, requestLocationUpdates(
minTimeMs, LocationManager.GPS_PROVIDER,
minDistanceM, minTimeMs,
locationCallback minDistanceM,
) locationCallback
)
}
} }
if (hasCoarseAccess) { if (hasCoarseAccess) {
requestLocationUpdates( withContext(Dispatchers.Main) {
LocationManager.NETWORK_PROVIDER, requestLocationUpdates(
minTimeMs, LocationManager.NETWORK_PROVIDER,
minDistanceM, minTimeMs,
locationCallback minDistanceM,
) locationCallback
)
}
} }
}?.onFailure { }?.onFailure {
Log.e("DevicePoseProvider", "Failed to register location listener", it) Log.e("DevicePoseProvider", "Failed to register location listener", it)

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
create("nightly") { create("nightly") {
initWith(getByName("release")) initWith(getByName("release"))

View File

@ -14,15 +14,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") // //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
create("nightly") { create("nightly") {
initWith(getByName("release")) initWith(getByName("release"))

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -12,7 +12,7 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
javaCompileOptions { javaCompileOptions {
annotationProcessorOptions { annotationProcessorOptions {
@ -23,10 +23,16 @@ android {
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -13,16 +13,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
isMinifyEnabled = false isMinifyEnabled = false
proguardFiles( isShrinkResources = false
getDefaultProguardFile("proguard-android-optimize.txt"), // proguardFiles(
"proguard-rules.pro" // getDefaultProguardFile("proguard-android-optimize.txt"),
) // "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }
compileOptions { compileOptions {

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,19 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), // proguardFiles(
"proguard-rules.pro" // getDefaultProguardFile("proguard-android-optimize.txt"),
) //// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
} }
} }
@ -43,6 +47,7 @@ dependencies {
implementation(libs.bundles.retrofit) implementation(libs.bundles.retrofit)
implementation(libs.suncalc) implementation(libs.suncalc)
implementation(libs.koin.android) implementation(libs.koin.android)
implementation("com.squareup.okhttp3:logging-interceptor:4.5.0")
implementation(project(":data:database")) implementation(project(":data:database"))
implementation(project(":core:base")) implementation(project(":core:base"))

View File

@ -1,3 +1,11 @@
-keep class de.mm20.launcher2.weather.** { *; } #-keep class de.mm20.launcher2.weather.** { *; }
-keep class kotlin.coroutines.Continuation #-keep class kotlin.coroutines.Continuation
-dontwarn edu.umd.cs.findbugs.annotations.Nullable #-dontwarn edu.umd.cs.findbugs.annotations.Nullable
#
#-assumenosideeffects class android.util.Log {
## public static *** d(...);
# public static *** v(...);
# public static *** i(...);
# public static *** w(...);
## public static *** e(...);
#}

View File

@ -1,21 +1,28 @@
# Add project specific ProGuard rules here. ## Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the ## You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.kts.kts.kts.kts.kts. ## proguardFiles setting in build.gradle.kts.kts.kts.kts.kts.
##
## For more details, see
## http://developer.android.com/guide/developing/tools/proguard.html
# #
# For more details, see ## If your project uses WebView with JS, uncomment the following
# http://developer.android.com/guide/developing/tools/proguard.html ## and specify the fully qualified class name to the JavaScript interface
## class:
# If your project uses WebView with JS, uncomment the following ##-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# and specify the fully qualified class name to the JavaScript interface ## public *;
# class: ##}
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { #
# public *; ## Uncomment this to preserve the line number information for
#} ## debugging stack traces.
##-keepattributes SourceFile,LineNumberTable
# Uncomment this to preserve the line number information for #
# debugging stack traces. ## If you keep the line number information, uncomment this to
#-keepattributes SourceFile,LineNumberTable ## hide the original source file name.
##-renamesourcefileattribute SourceFile
# If you keep the line number information, uncomment this to #-assumenosideeffects class android.util.Log {
# hide the original source file name. ## public static *** d(...);
#-renamesourcefileattribute SourceFile # public static *** v(...);
# public static *** i(...);
# public static *** w(...);
## public static *** e(...);
#}

View File

@ -7,9 +7,13 @@ import de.mm20.launcher2.preferences.weather.WeatherLocation
import de.mm20.launcher2.weather.Forecast import de.mm20.launcher2.weather.Forecast
import de.mm20.launcher2.weather.R import de.mm20.launcher2.weather.R
import de.mm20.launcher2.weather.WeatherProvider import de.mm20.launcher2.weather.WeatherProvider
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory import retrofit2.converter.gson.GsonConverterFactory
import java.util.Locale import java.util.Locale
import java.util.concurrent.TimeUnit
import kotlin.getValue
internal class OpenWeatherMapProvider( internal class OpenWeatherMapProvider(
private val context: Context, private val context: Context,
@ -17,11 +21,24 @@ internal class OpenWeatherMapProvider(
private val retrofit by lazy { private val retrofit by lazy {
Retrofit.Builder() Retrofit.Builder()
.client(client)
.baseUrl("https://api.openweathermap.org/") .baseUrl("https://api.openweathermap.org/")
.addConverterFactory(GsonConverterFactory.create()) .addConverterFactory(GsonConverterFactory.create())
.build() .build()
} }
private val client by lazy {
val timeOutMillSeconds = 1500L
OkHttpClient.Builder()
.addInterceptor(HttpLoggingInterceptor().apply {
level = HttpLoggingInterceptor.Level.BODY
})
.callTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS)
.connectTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS)
.readTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS)
.writeTimeout(timeOutMillSeconds,TimeUnit.MILLISECONDS)
.build()
}
private val openWeatherMapService by lazy { private val openWeatherMapService by lazy {
retrofit.create(OpenWeatherMapApi::class.java) retrofit.create(OpenWeatherMapApi::class.java)
} }

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!--<string name="openweathermap_key" translatable="false">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</string>--> <string name="openweathermap_key" translatable="false">87cd0810b7e4b4debd31a6ef98b98154"</string>
<!--<string name="here_key" translatable="false">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</string>--> <!--<string name="here_key" translatable="false">xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx</string>-->
<!--<string name="metno_contact" translatable="false"></string>--> <!--<string name="metno_contact" translatable="false"></string>-->
</resources> </resources>

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -8,7 +8,7 @@ targetSdk = "36"
pluginSdk = "2.2.0" pluginSdk = "2.2.0"
gradle = "8.1.2" gradle = "8.12"
android-gradle-plugin = "8.10.1" android-gradle-plugin = "8.10.1"
ksp-gradle-plugin = "2.1.21-2.0.1" ksp-gradle-plugin = "2.1.21-2.0.1"
@ -139,6 +139,7 @@ osmopeninghours = { group = "de.westnordost", name = "osm-opening-hours", versio
kotlin = ["kotlin-stdlib", "kotlinx-coroutines-core", "kotlinx-coroutines-android", "kotlinx-collections-immutable", "kotlinx-serialization-json"] kotlin = ["kotlin-stdlib", "kotlinx-coroutines-core", "kotlinx-coroutines-android", "kotlinx-collections-immutable", "kotlinx-serialization-json"]
androidx-lifecycle = ["androidx-lifecycle-viewmodel", "androidx-lifecycle-common", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodelcompose", "androidx-lifecycle-runtimecompose"] androidx-lifecycle = ["androidx-lifecycle-viewmodel", "androidx-lifecycle-common", "androidx-lifecycle-runtime", "androidx-lifecycle-viewmodelcompose", "androidx-lifecycle-runtimecompose"]
retrofit = ["retrofit-core", "retrofit-gson"] retrofit = ["retrofit-core", "retrofit-gson"]
tests = ["junit"] tests = ["junit"]
[plugins] [plugins]

View File

@ -1,6 +1,6 @@
#Sun Feb 09 12:41:42 CET 2025 #Tue Jul 15 14:35:45 KST 2025
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

View File

@ -10,16 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
consumerProguardFiles("proguard-rules.pro") // "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -12,15 +12,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -12,15 +12,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -14,7 +14,7 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildFeatures { buildFeatures {
@ -23,10 +23,16 @@ android {
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
create("nightly") { create("nightly") {
initWith(getByName("release")) initWith(getByName("release"))

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -11,15 +11,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }

View File

@ -10,15 +10,21 @@ android {
minSdk = libs.versions.minSdk.get().toInt() minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro") //consumerProguardFiles("consumer-rules.pro")
} }
buildTypes { buildTypes {
release { release {
proguardFiles( isMinifyEnabled = false
getDefaultProguardFile("proguard-android-optimize.txt"), isShrinkResources = false
"proguard-rules.pro" // proguardFiles(
) // getDefaultProguardFile("proguard-android-optimize.txt"),
// "proguard-rules.pro"
// )
}
debug {
isMinifyEnabled = false
isShrinkResources = false
} }
} }