Compare commits
205 Commits
1.1a
..
7e3173f4cc
| Author | SHA1 | Date | |
|---|---|---|---|
| 7e3173f4cc | |||
| 57007049b4 | |||
| e52e8cba27 | |||
| 3a675af015 | |||
| 07c2926d47 | |||
| bc29c93e72 | |||
| a8b0c99b1c | |||
| 027af22a55 | |||
| c5ea332f6e | |||
| c80dcfc721 | |||
| 9c415da2cf | |||
| 52a4bc1c21 | |||
| 45128b0c41 | |||
| 97649f9f43 | |||
| 3de4677121 | |||
| 03f9777c9a | |||
| 1124d239d9 | |||
| 4efc445ac5 | |||
| 960a167b44 | |||
| d4eeadc4f5 | |||
| 3936601599 | |||
| 453ba4c867 | |||
| 55d25db229 | |||
| 528789cbfe | |||
| 867584dbb0 | |||
| e19c8eba7f | |||
| 867ec40141 | |||
| dd0fd4041c | |||
| b772d8769c | |||
| 92b6e98060 | |||
| 0919c237c8 | |||
| afd79eb2c7 | |||
| d953984df1 | |||
| f606a5c57c | |||
| 3e1bfe44df | |||
| 63a552934c | |||
| 74faab692d | |||
| 23c866c743 | |||
| 8836c41622 | |||
| f1249506a6 | |||
| 9b62593811 | |||
| b201c770e8 | |||
| 94e64bcf0d | |||
| 12f7913e77 | |||
| 5866bf837c | |||
| 9c11c96c00 | |||
| 6a13d7a779 | |||
| c71129d6a3 | |||
| a588c8509d | |||
| b93082dab1 | |||
| 495312e7cd | |||
| 01d7903fa6 | |||
| cf30d5f265 | |||
| 6294502850 | |||
| 1b692865dc | |||
| e20eee2f84 | |||
| 8d61249b6a | |||
| 2265e4f4cc | |||
| e6b290d991 | |||
| b4da9656d6 | |||
| 34079e700d | |||
| 910d1de178 | |||
| e2296859c5 | |||
| 267126e664 | |||
| fe0ee5c463 | |||
| 064be48564 | |||
| b8a1a0e0bc | |||
| fb30049f04 | |||
| 4c6a556cc8 | |||
| 2c45e4dfe4 | |||
| c2eec3965f | |||
| dad18f6c0c | |||
| 3bf8705179 | |||
| c1df3f6a92 | |||
| cfc5ba086a | |||
| 1431d384db | |||
| 9fad8233b2 | |||
| b985b9dee0 | |||
| 22ced4b782 | |||
| 64090e0eb1 | |||
| 11cf1787b2 | |||
| 2ca47892c1 | |||
| ec71180c95 | |||
| db10def0fb | |||
| 38b0995523 | |||
| a1384e7594 | |||
| fac01dc0ca | |||
| 063649a5df | |||
| bb6baa3fe8 | |||
| 6e0b2632ff | |||
| 33cd4c17da | |||
| 62eb91bdf3 | |||
| 6a717ca652 | |||
| 0eb8337089 | |||
| a68eceab6d | |||
| 78fefa9bd2 | |||
| dcf8f05657 | |||
| 0a327cbea1 | |||
| 240669f9f2 | |||
| b1c1fe78f3 | |||
| afab88a939 | |||
| 0b5669cb52 | |||
| e7af455803 | |||
| ca8231d988 | |||
| 1cf43f41d3 | |||
| 52d2aa37fa | |||
| b1a96d1003 | |||
| d858795a54 | |||
| dbec6ade39 | |||
| 937cd31bac | |||
| ad03d60934 | |||
| 55f9e52c19 | |||
| af7ebfc6fb | |||
| 2b3c4cea80 | |||
| 16bfc6cbba | |||
| aa0dfa23fa | |||
| 4c245337bd | |||
| 00adc184d7 | |||
| 32210875c4 | |||
| 63a10cbd12 | |||
| 43cca9e874 | |||
| d97c63f75f | |||
| 50e5e74f59 | |||
| 94561e2f96 | |||
| 23513fc8fb | |||
| bea9bb0b96 | |||
| 0da8f01a92 | |||
| ede977452d | |||
| e12494e5ed | |||
| 1c7c66ee50 | |||
| 88f86c75c8 | |||
| 036db580f5 | |||
| 6dcd4a9e25 | |||
| da276fb8f8 | |||
| 05301b7bd5 | |||
| 78c35c28b3 | |||
| 863ede58b4 | |||
| 7d6692b17a | |||
| 4f31eadbd4 | |||
| 56d2d2684d | |||
| 0668c65bfe | |||
| abe3d5e958 | |||
| 7379e27f90 | |||
| be8b297235 | |||
| 64ad296815 | |||
| 17266f3c0b | |||
| 0d9cae6550 | |||
| 41c1eb1257 | |||
| 4a6164ac84 | |||
| aec008e7be | |||
| 0d76b994a2 | |||
| 14bfaabb11 | |||
| d77c5ec391 | |||
| b793ac7a6e | |||
| d04e78694c | |||
| d6dd4e6b96 | |||
| 44e5c54c77 | |||
| bdb49cd085 | |||
| e76aca71eb | |||
| 98321b4c3b | |||
| b082fc44dc | |||
| 0776814283 | |||
| 3a9718d1a7 | |||
| d9ef921a43 | |||
| c415e8a829 | |||
| daa291d5de | |||
| d2987ebe1e | |||
| ed32fd1183 | |||
| 83b1ec9c92 | |||
| 5e982e93ee | |||
| 846081536d | |||
| 9f2f7844f9 | |||
| 9966bba33c | |||
| ae59b054c9 | |||
| 8bed6b040b | |||
| d1933ec661 | |||
| b40932624a | |||
| 6c5e727c67 | |||
| 6420ae2f13 | |||
| 91b234777d | |||
| b1a646f1f2 | |||
| 89134681f3 | |||
| 3b670b8ce2 | |||
| b0ba07a7fb | |||
| 07adda1d74 | |||
| 6a86d05bad | |||
| dc94c465d6 | |||
| 950bfbb42e | |||
| 927ac05f03 | |||
| d6d84c6892 | |||
| a34c1dbb11 | |||
| 6df13a044b | |||
| 68fb0023da | |||
| 686982c096 | |||
| 84898895df | |||
|
472237ba8f
|
|||
| 2ae7e1fb8c | |||
| ed4d751dce | |||
| b5274d2113 | |||
| d7ad8ebd74 | |||
| 43a521de16 | |||
| 4cf8c497a8 | |||
| fd57b5dee4 | |||
| 49b80dc3b9 | |||
| c0e3943700 |
@@ -23,7 +23,7 @@ jobs:
|
|||||||
contents: write
|
contents: write
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v5
|
- uses: actions/checkout@v6
|
||||||
|
|
||||||
- name: set up secrets
|
- name: set up secrets
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
+17
-13
@@ -1,9 +1,9 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application'
|
id 'com.android.application'
|
||||||
id 'org.jetbrains.kotlin.android'
|
id 'org.jetbrains.kotlin.android'
|
||||||
id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.20'
|
id 'org.jetbrains.kotlin.plugin.serialization' version '2.3.10'
|
||||||
id 'org.jetbrains.kotlin.plugin.compose' version '2.2.20'
|
id 'org.jetbrains.kotlin.plugin.compose' version '2.3.10'
|
||||||
id 'com.mikepenz.aboutlibraries.plugin' version '12.2.4'
|
id 'com.mikepenz.aboutlibraries.plugin' version '13.2.1'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -95,26 +95,30 @@ aboutLibraries {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'androidx.compose.material3:material3:1.3.2'
|
implementation 'androidx.compose.material3:material3:1.4.0'
|
||||||
implementation 'androidx.navigation:navigation-compose:2.9.4'
|
implementation "androidx.compose.material:material:1.10.3"
|
||||||
|
implementation 'androidx.compose.material:material-icons-extended:1.7.8'
|
||||||
|
implementation 'androidx.navigation:navigation-compose:2.9.7'
|
||||||
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
|
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
|
||||||
|
|
||||||
|
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0'
|
||||||
|
|
||||||
implementation 'androidx.preference:preference-ktx:1.2.1'
|
implementation 'androidx.preference:preference-ktx:1.2.1'
|
||||||
implementation 'androidx.compose.ui:ui'
|
implementation 'androidx.compose.ui:ui'
|
||||||
implementation "androidx.compose.material:material:1.9.1"
|
implementation "androidx.activity:activity-ktx:1.12.4"
|
||||||
implementation "androidx.activity:activity-ktx:1.11.0"
|
|
||||||
|
|
||||||
implementation 'androidx.compose.ui:ui-tooling-preview'
|
implementation 'androidx.compose.ui:ui-tooling-preview'
|
||||||
implementation 'com.google.android.material:material:1.13.0'
|
implementation 'com.google.android.material:material:1.13.0'
|
||||||
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0'
|
implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0'
|
||||||
|
|
||||||
implementation 'com.caverock:androidsvg-aar:1.4'
|
implementation 'com.caverock:androidsvg-aar:1.4'
|
||||||
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
|
implementation 'com.github.chrisbanes:PhotoView:2.3.0'
|
||||||
|
|
||||||
implementation 'com.mikepenz:aboutlibraries:12.2.4'
|
implementation 'com.mikepenz:aboutlibraries:13.2.1'
|
||||||
implementation 'com.mikepenz:aboutlibraries-compose-m3:12.2.4'
|
implementation 'com.mikepenz:aboutlibraries-compose-m3:13.2.1'
|
||||||
implementation 'com.mikepenz:aboutlibraries-core:12.2.4'
|
implementation 'com.mikepenz:aboutlibraries-core:13.2.1'
|
||||||
|
|
||||||
|
|
||||||
implementation platform('androidx.compose:compose-bom:2025.09.00')
|
implementation platform('androidx.compose:compose-bom:2026.01.01')
|
||||||
debugImplementation 'androidx.compose.ui:ui-tooling:1.9.1'
|
debugImplementation 'androidx.compose.ui:ui-tooling:1.10.2'
|
||||||
}
|
}
|
||||||
@@ -19,13 +19,15 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
|||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.res.stringResource
|
import androidx.compose.ui.res.stringResource
|
||||||
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.unit.dp
|
import androidx.compose.ui.unit.dp
|
||||||
import net.helcel.beans.R
|
import net.helcel.beans.R
|
||||||
import net.helcel.beans.activity.sub.EditPlaceScreen
|
import net.helcel.beans.activity.sub.EditPlaceScreen
|
||||||
import net.helcel.beans.countries.World
|
import net.helcel.beans.countries.World
|
||||||
|
|
||||||
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun EditScreen(onExit:()->Unit) {
|
fun EditScreen(onExit:()->Unit = {}) {
|
||||||
SysTheme {
|
SysTheme {
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ import androidx.compose.material.TopAppBar
|
|||||||
import androidx.compose.material.icons.Icons
|
import androidx.compose.material.icons.Icons
|
||||||
import androidx.compose.material.icons.filled.DateRange
|
import androidx.compose.material.icons.filled.DateRange
|
||||||
import androidx.compose.material.icons.filled.Edit
|
import androidx.compose.material.icons.filled.Edit
|
||||||
|
import androidx.compose.material.icons.filled.Percent
|
||||||
import androidx.compose.material.icons.filled.Settings
|
import androidx.compose.material.icons.filled.Settings
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.runtime.remember
|
import androidx.compose.runtime.remember
|
||||||
@@ -82,7 +83,7 @@ class MainScreen : ComponentActivity() {
|
|||||||
Icon(Icons.Default.Edit, contentDescription = "Edit")
|
Icon(Icons.Default.Edit, contentDescription = "Edit")
|
||||||
}
|
}
|
||||||
IconButton(onClick = { nav.navigate("stats") }){
|
IconButton(onClick = { nav.navigate("stats") }){
|
||||||
Icon(Icons.Default.DateRange, contentDescription = "Stats")
|
Icon(Icons.Default.Percent, contentDescription = "Stats")
|
||||||
}
|
}
|
||||||
IconButton(onClick = { nav.navigate("settings") }) {
|
IconButton(onClick = { nav.navigate("settings") }) {
|
||||||
Icon(Icons.Default.Settings, contentDescription = "Settings")
|
Icon(Icons.Default.Settings, contentDescription = "Settings")
|
||||||
|
|||||||
@@ -118,9 +118,10 @@ fun settingsNav(): NavHostController {
|
|||||||
return navController
|
return navController
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Preview
|
||||||
@Composable
|
@Composable
|
||||||
fun SettingsMainScreen(onExit: ()->Unit = {}) {
|
fun SettingsMainScreen(onExit: ()->Unit = {}) {
|
||||||
var nav: NavHostController? = null
|
val nav: NavHostController = settingsNav()
|
||||||
SysTheme {
|
SysTheme {
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
@@ -128,7 +129,7 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
|
|||||||
title = { Text(stringResource(R.string.action_settings)) },
|
title = { Text(stringResource(R.string.action_settings)) },
|
||||||
navigationIcon = {
|
navigationIcon = {
|
||||||
IconButton(onClick = {
|
IconButton(onClick = {
|
||||||
if(nav!=null && !nav!!.popBackStack())
|
if(!nav.popBackStack())
|
||||||
onExit()
|
onExit()
|
||||||
}) {
|
}) {
|
||||||
Icon(
|
Icon(
|
||||||
@@ -141,13 +142,12 @@ fun SettingsMainScreen(onExit: ()->Unit = {}) {
|
|||||||
}
|
}
|
||||||
) { innerPadding ->
|
) { innerPadding ->
|
||||||
Box(modifier = Modifier.padding(innerPadding)) {
|
Box(modifier = Modifier.padding(innerPadding)) {
|
||||||
nav = settingsNav()
|
SettingsScreen()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Preview
|
|
||||||
@Composable
|
@Composable
|
||||||
fun SettingsScreen(navController: NavHostController = settingsNav()) {
|
fun SettingsScreen(navController: NavHostController = settingsNav()) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|||||||
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||||
plugins {
|
plugins {
|
||||||
id 'com.android.application' version '8.13.0' apply false
|
id 'com.android.application' version '9.0.0' apply false
|
||||||
id 'com.android.library' version '8.13.0' apply false
|
id 'com.android.library' version '9.0.0' apply false
|
||||||
id 'org.jetbrains.kotlin.android' version '2.2.20' apply false
|
id 'org.jetbrains.kotlin.android' version '2.3.10' apply false
|
||||||
}
|
}
|
||||||
Vendored
BIN
Binary file not shown.
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
|
distributionSha256Sum=b266d5ff6b90eada6dc3b20cb090e3731302e553a27c5d3e4df1f0d76beaff06
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
+1
-1
@@ -2,7 +2,7 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@turf/area": "^7.0.0",
|
"@turf/area": "^7.0.0",
|
||||||
"@turf/turf": "^7.0.0",
|
"@turf/turf": "^7.0.0",
|
||||||
"jsdom": "^27.0.0",
|
"jsdom": "^28.0.0",
|
||||||
"mapshaper": "^0.6.79"
|
"mapshaper": "^0.6.79"
|
||||||
},
|
},
|
||||||
"type": "module"
|
"type": "module"
|
||||||
|
|||||||
Reference in New Issue
Block a user