mirror of
https://github.com/atsunatsu/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
Updated gradle plugin, removed BuildConfig usages
This commit is contained in:
1 parent
b1aa623b29
commit
e100484810
10 files changed
+31
-44
No files matched your search
@@ -21,7 +21,6 @@ android {
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
buildFeatures {
|
||||
buildConfig = true
|
||||
compose = true
|
||||
}
|
||||
buildTypes {
|
||||
@@ -31,7 +30,7 @@ android {
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
composeOptions { kotlinCompilerExtensionVersion = "1.5.1" }
|
||||
composeOptions { kotlinCompilerExtensionVersion = "1.5.2" }
|
||||
}
|
||||
|
||||
dependencies {
|
||||
@@ -45,12 +44,12 @@ dependencies {
|
||||
|
||||
implementation("androidx.activity:activity-compose:1.7.2")
|
||||
implementation("androidx.compose.animation:animation:1.5.0")
|
||||
implementation("androidx.compose.compiler:compiler:1.5.1")
|
||||
implementation("androidx.compose.compiler:compiler:1.5.2")
|
||||
implementation("androidx.compose.material3:material3:1.1.1")
|
||||
implementation("androidx.compose.runtime:runtime:1.5.0")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview:1.5.0")
|
||||
implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1")
|
||||
implementation("androidx.navigation:navigation-compose:2.7.0")
|
||||
implementation("androidx.navigation:navigation-compose:2.7.1")
|
||||
|
||||
implementation("com.squareup.okhttp3:okhttp:4.10.0")
|
||||
implementation("org.osmdroid:osmdroid-android:6.1.16")
|
||||
@@ -59,7 +58,7 @@ dependencies {
|
||||
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")
|
||||
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
testImplementation("io.mockk:mockk:1.13.5")
|
||||
testImplementation("io.mockk:mockk:1.13.7")
|
||||
testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3")
|
||||
androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.5.0")
|
||||
}
|
||||
@@ -18,6 +18,7 @@
|
||||
package com.rtbishop.look4sat
|
||||
|
||||
import android.app.Application
|
||||
import android.content.pm.ApplicationInfo
|
||||
import android.os.StrictMode
|
||||
import android.os.StrictMode.ThreadPolicy
|
||||
import android.os.StrictMode.VmPolicy
|
||||
@@ -31,7 +32,7 @@ class MainApplication : Application() {
|
||||
lateinit var container: MainContainer
|
||||
|
||||
override fun onCreate() {
|
||||
if (BuildConfig.DEBUG) enableStrictMode()
|
||||
enableStrictMode()
|
||||
super.onCreate()
|
||||
container = MainContainer(this)
|
||||
container.mainScope.launch { checkAutoUpdate() }
|
||||
@@ -50,8 +51,11 @@ class MainApplication : Application() {
|
||||
}
|
||||
|
||||
private fun enableStrictMode() {
|
||||
StrictMode.setThreadPolicy(ThreadPolicy.Builder().detectAll().penaltyLog().build())
|
||||
StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build())
|
||||
val isDebuggable = 0 != applicationInfo.flags and ApplicationInfo.FLAG_DEBUGGABLE
|
||||
if (isDebuggable) {
|
||||
StrictMode.setThreadPolicy(ThreadPolicy.Builder().detectAll().penaltyLog().build())
|
||||
StrictMode.setVmPolicy(VmPolicy.Builder().detectAll().penaltyLog().build())
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
|
||||
@@ -33,7 +33,6 @@ import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import com.rtbishop.look4sat.BuildConfig
|
||||
import com.rtbishop.look4sat.R
|
||||
import com.rtbishop.look4sat.domain.model.OtherSettings
|
||||
import com.rtbishop.look4sat.domain.predict.GeoPos
|
||||
@@ -113,8 +112,9 @@ fun SettingsScreen() {
|
||||
val toggleSensor = { value: Boolean -> viewModel.toggleSensor(value) }
|
||||
|
||||
// Screen setup
|
||||
val versionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName ?: "4.0.0"
|
||||
LazyColumn(modifier = Modifier.padding(6.dp), verticalArrangement = Arrangement.spacedBy(6.dp)) {
|
||||
item { CardAbout(BuildConfig.VERSION_NAME) }
|
||||
item { CardAbout(versionName) }
|
||||
item { LocationCard(positionSettings, setGpsPos, showPosDialog, showLocDialog, dismissPos) }
|
||||
item { DataCard(dataSettings, updateFromWeb, updateFromFile, clearAllData) }
|
||||
item { OtherCard(otherSettings, toggleUtc, toggleUpdate, toggleSweep, toggleSensor) }
|
||||
|
||||
Reference in new issue
Block a user