mirror of
https://github.com/rt-bishop/Look4Sat.git
synced 2026-10-02 03:15:37 +00:00
Updated dependencies and gradle plugin, minor fixes
This commit is contained in:
1 parent
a6cbd89ff1
commit
9ea4da9d21
6 files changed
+17
-25
No files matched your search
@@ -1,7 +1,5 @@
|
|||||||
package com.rtbishop.look4sat.presentation.components
|
package com.rtbishop.look4sat.presentation.components
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
|
||||||
import androidx.compose.foundation.background
|
import androidx.compose.foundation.background
|
||||||
import androidx.compose.foundation.clickable
|
import androidx.compose.foundation.clickable
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
import androidx.compose.foundation.layout.Arrangement
|
||||||
@@ -45,7 +43,6 @@ import com.rtbishop.look4sat.presentation.MainTheme
|
|||||||
import java.text.SimpleDateFormat
|
import java.text.SimpleDateFormat
|
||||||
import java.util.Date
|
import java.util.Date
|
||||||
import java.util.Locale
|
import java.util.Locale
|
||||||
import androidx.core.net.toUri
|
|
||||||
|
|
||||||
private val sdfTime = SimpleDateFormat("HH:mm:ss", Locale.ENGLISH)
|
private val sdfTime = SimpleDateFormat("HH:mm:ss", Locale.ENGLISH)
|
||||||
|
|
||||||
@@ -224,10 +221,6 @@ fun CardLoadingIndicator() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun gotoUrl(context: Context, url: String) {
|
|
||||||
context.startActivity(Intent(Intent.ACTION_VIEW, url.toUri()))
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getDefaultPass(): OrbitalPass {
|
fun getDefaultPass(): OrbitalPass {
|
||||||
val orbitalData = OrbitalData("No Future Passes", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0, 0.0)
|
val orbitalData = OrbitalData("No Future Passes", 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0, 0.0)
|
||||||
val satellite = NearEarthObject(orbitalData)
|
val satellite = NearEarthObject(orbitalData)
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import androidx.compose.runtime.Composable
|
|||||||
import androidx.compose.runtime.CompositionLocalProvider
|
import androidx.compose.runtime.CompositionLocalProvider
|
||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.platform.LocalUriHandler
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
import androidx.compose.ui.text.font.FontWeight
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
import androidx.compose.ui.text.style.TextAlign
|
||||||
@@ -33,7 +33,6 @@ import com.rtbishop.look4sat.presentation.MainNavBar
|
|||||||
import com.rtbishop.look4sat.presentation.MainTheme
|
import com.rtbishop.look4sat.presentation.MainTheme
|
||||||
import com.rtbishop.look4sat.presentation.Screen
|
import com.rtbishop.look4sat.presentation.Screen
|
||||||
import com.rtbishop.look4sat.presentation.components.CardButton
|
import com.rtbishop.look4sat.presentation.components.CardButton
|
||||||
import com.rtbishop.look4sat.presentation.components.gotoUrl
|
|
||||||
|
|
||||||
private const val POLICY_URL = "https://sites.google.com/view/look4sat-privacy-policy/home"
|
private const val POLICY_URL = "https://sites.google.com/view/look4sat-privacy-policy/home"
|
||||||
private const val LICENSE_URL = "https://www.gnu.org/licenses/gpl-3.0.html"
|
private const val LICENSE_URL = "https://www.gnu.org/licenses/gpl-3.0.html"
|
||||||
@@ -63,7 +62,7 @@ private fun CardCreditsPreview() = MainTheme { CardCredits() }
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
private fun CardCredits(modifier: Modifier = Modifier) {
|
private fun CardCredits(modifier: Modifier = Modifier) {
|
||||||
val context = LocalContext.current
|
val uriHandler = LocalUriHandler.current
|
||||||
ElevatedCard(modifier = modifier.fillMaxWidth()) {
|
ElevatedCard(modifier = modifier.fillMaxWidth()) {
|
||||||
Column(
|
Column(
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
horizontalAlignment = Alignment.CenterHorizontally,
|
||||||
@@ -90,13 +89,13 @@ private fun CardCredits(modifier: Modifier = Modifier) {
|
|||||||
)
|
)
|
||||||
Row(horizontalArrangement = Arrangement.SpaceEvenly) {
|
Row(horizontalArrangement = Arrangement.SpaceEvenly) {
|
||||||
CardButton(
|
CardButton(
|
||||||
onClick = { gotoUrl(context, LICENSE_URL) },
|
onClick = { uriHandler.openUri(LICENSE_URL) },
|
||||||
text = stringResource(id = R.string.btn_license),
|
text = stringResource(id = R.string.btn_license),
|
||||||
modifier = Modifier.weight(1f)
|
modifier = Modifier.weight(1f)
|
||||||
)
|
)
|
||||||
Spacer(modifier = Modifier.width(6.dp))
|
Spacer(modifier = Modifier.width(6.dp))
|
||||||
CardButton(
|
CardButton(
|
||||||
onClick = { gotoUrl(context, POLICY_URL) },
|
onClick = { uriHandler.openUri(POLICY_URL) },
|
||||||
text = stringResource(id = R.string.btn_privacy),
|
text = stringResource(id = R.string.btn_privacy),
|
||||||
modifier = Modifier.weight(1f)
|
modifier = Modifier.weight(1f)
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -5,12 +5,12 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvmToolchain(17)
|
jvmToolchain(21)
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "com.rtbishop.look4sat.data"
|
namespace = "com.rtbishop.look4sat.data"
|
||||||
compileSdk = 35
|
compileSdk = 36
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ plugins {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvmToolchain(17)
|
jvmToolchain(21)
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|||||||
@@ -1,24 +1,24 @@
|
|||||||
[versions]
|
[versions]
|
||||||
android-gradle-plugin = "8.10.1"
|
android-gradle-plugin = "8.11.1"
|
||||||
google-ksp = "2.1.21-2.0.2"
|
google-ksp = "2.2.0-2.0.2"
|
||||||
kotlin = "2.1.21"
|
kotlin = "2.2.0"
|
||||||
|
|
||||||
androidx-core-ktx = "1.16.0"
|
androidx-core-ktx = "1.16.0"
|
||||||
androidx-core-splashscreen = "1.0.1"
|
androidx-core-splashscreen = "1.0.1"
|
||||||
androidx-room = "2.7.1"
|
androidx-room = "2.7.2"
|
||||||
|
|
||||||
compose-bom = "2025.06.00"
|
compose-bom = "2025.06.01"
|
||||||
compose-activity = "1.10.1"
|
compose-activity = "1.10.1"
|
||||||
compose-lifecycle = "2.9.1"
|
compose-lifecycle = "2.9.1"
|
||||||
compose-navigation = "2.9.0"
|
compose-navigation = "2.9.1"
|
||||||
|
|
||||||
other-coroutines = "1.10.2"
|
other-coroutines = "1.10.2"
|
||||||
other-json = "20250517"
|
other-json = "20250517"
|
||||||
other-okhttp = "4.12.0"
|
other-okhttp = "5.1.0"
|
||||||
other-osmdroid = "6.1.20"
|
other-osmdroid = "6.1.20"
|
||||||
|
|
||||||
test-junit4 = "4.13.2"
|
test-junit4 = "4.13.2"
|
||||||
test-mockk = "1.14.2"
|
test-mockk = "1.14.4"
|
||||||
|
|
||||||
androidTest-junit = "1.2.1"
|
androidTest-junit = "1.2.1"
|
||||||
androidTest-espresso = "3.6.1"
|
androidTest-espresso = "3.6.1"
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
#Sat Jan 04 21:11:19 GMT 2025
|
#Sun Jul 13 12:20:27 BST 2025
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
Reference in new issue
Block a user