10 Commits

Author SHA1 Message Date
Renovate Bot
b5274d2113 Lock file maintenance 2025-09-28 02:00:47 +00:00
Renovate Bot
d7ad8ebd74 Lock file maintenance 2025-09-27 02:01:04 +00:00
Renovate Bot
43a521de16 Update dependency androidx.compose.material3:material3 to v1.4.0 2025-09-27 02:00:37 +00:00
Renovate Bot
4cf8c497a8 Update dependency androidx.navigation:navigation-compose to v2.9.5 2025-09-26 04:00:37 +02:00
Renovate Bot
fd57b5dee4 Update dependency androidx.compose.ui:ui-tooling to v1.9.2 2025-09-26 02:00:30 +00:00
Renovate Bot
49b80dc3b9 Update dependency androidx.compose.material:material to v1.9.2 2025-09-25 04:00:37 +02:00
Renovate Bot
c0e3943700 Update dependency androidx.compose:compose-bom to v2025.09.01 2025-09-25 02:00:27 +00:00
f1608179f8 Update app/build.gradle 2025-09-21 13:22:34 +02:00
soraefir
86aa888be6 Fix build 2025-09-21 13:09:36 +02:00
soraefir
9c1374c99f Update and cleanup 2025-09-21 12:58:00 +02:00
3 changed files with 57 additions and 52 deletions

View File

@@ -17,8 +17,8 @@ android {
applicationId 'net.helcel.beans'
minSdk 28
targetSdk 36
versionCode 3
versionName "1.0c"
versionCode 4
versionName "1.1a"
}
signingConfigs {
create("release") {
@@ -78,6 +78,10 @@ android {
kotlinCompilerExtensionVersion = "2.2.20"
}
kotlin {
jvmToolchain(21)
}
lint {
disable 'UsingMaterialAndMaterial3Libraries'
}
@@ -91,12 +95,12 @@ aboutLibraries {
}
dependencies {
implementation 'androidx.compose.material3:material3:1.3.2'
implementation 'androidx.navigation:navigation-compose:2.9.4'
implementation 'androidx.compose.material3:material3:1.4.0'
implementation 'androidx.navigation:navigation-compose:2.9.5'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5'
implementation 'androidx.preference:preference-ktx:1.2.1'
implementation 'androidx.compose.ui:ui'
implementation "androidx.compose.material:material:1.9.1"
implementation "androidx.compose.material:material:1.9.2"
implementation "androidx.activity:activity-ktx:1.11.0"
implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -111,6 +115,6 @@ dependencies {
implementation 'com.mikepenz:aboutlibraries-core:12.2.4'
implementation platform('androidx.compose:compose-bom:2025.09.00')
debugImplementation 'androidx.compose.ui:ui-tooling:1.9.1'
implementation platform('androidx.compose:compose-bom:2025.09.01')
debugImplementation 'androidx.compose.ui:ui-tooling:1.9.2'
}

View File

@@ -16,8 +16,8 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.CheckboxDefaults
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ScrollableTabRow
import androidx.compose.material.Tab
import androidx.compose.material.TabRow
import androidx.compose.material.Text
import androidx.compose.material.TriStateCheckbox
import androidx.compose.runtime.Composable
@@ -111,9 +111,8 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
Column {
val currentTab = tabs.getOrNull(selectedTab) ?: return@Column
ScrollableTabRow(
selectedTabIndex = min(tabs.lastIndex,selectedTab)
TabRow(
selectedTabIndex = min(tabs.lastIndex, selectedTab),
) {
tabs.forEachIndexed { index, tab ->
Tab(
@@ -127,6 +126,7 @@ fun EditPlaceScreen(loc: GeoLoc, onExit:()->Unit={}) {
}
}
LazyColumn(
modifier = Modifier.fillMaxSize()
) {

View File

@@ -3,25 +3,26 @@
"@asamuzakjp/css-color@^4.0.3":
version "4.0.4"
resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-4.0.4.tgz#3c0a94e98593829d60f68916116814e8fbbdba6d"
integrity sha512-cKjSKvWGmAziQWbCouOsFwb14mp1betm8Y7Fn+yglDMUUu3r9DCbJ9iJbeFDenLMqFbIMC0pQP8K+B8LAxX3OQ==
version "4.0.5"
resolved "https://registry.yarnpkg.com/@asamuzakjp/css-color/-/css-color-4.0.5.tgz#cc533095241d8a56c49614591955280ab8c4bb02"
integrity sha512-lMrXidNhPGsDjytDy11Vwlb6OIGrT3CmLg3VWNFyWkLWtijKl7xjvForlh8vuj0SHGjgl4qZEQzUmYTeQA2JFQ==
dependencies:
"@csstools/css-calc" "^2.1.4"
"@csstools/css-color-parser" "^3.0.10"
"@csstools/css-color-parser" "^3.1.0"
"@csstools/css-parser-algorithms" "^3.0.5"
"@csstools/css-tokenizer" "^3.0.4"
lru-cache "^11.1.0"
lru-cache "^11.2.1"
"@asamuzakjp/dom-selector@^6.5.4":
version "6.5.5"
resolved "https://registry.yarnpkg.com/@asamuzakjp/dom-selector/-/dom-selector-6.5.5.tgz#72bbf54a07bbae7dd5a1732318d3fe6a6717625c"
integrity sha512-kI2MX9pmImjxWT8nxDZY+MuN6r1jJGe7WxizEbsAEPB/zxfW5wYLIiPG1v3UKgEOOP8EsDkp0ZL99oRFAdPM8g==
version "6.5.6"
resolved "https://registry.yarnpkg.com/@asamuzakjp/dom-selector/-/dom-selector-6.5.6.tgz#8662334b001f0cf145da97f4e7d3f16f58dbd2f7"
integrity sha512-Mj3Hu9ymlsERd7WOsUKNUZnJYL4IZ/I9wVVYgtvOsWYiEFbkQ4G7VRIh2USxTVW4BBDIsLG+gBUgqOqf2Kvqow==
dependencies:
"@asamuzakjp/nwsapi" "^2.3.9"
bidi-js "^1.0.3"
css-tree "^3.1.0"
is-potential-custom-element-name "^1.0.1"
lru-cache "^11.2.1"
"@asamuzakjp/nwsapi@^2.3.9":
version "2.3.9"
@@ -38,7 +39,7 @@
resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-2.1.4.tgz#8473f63e2fcd6e459838dd412401d5948f224c65"
integrity sha512-3N8oaj+0juUw/1H3YwmDDJXCgTB1gKU6Hc/bB502u9zR0q2vd786XJH9QfrKIEgFlZmhZiq6epXl4rHqhzsIgQ==
"@csstools/css-color-parser@^3.0.10":
"@csstools/css-color-parser@^3.1.0":
version "3.1.0"
resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-3.1.0.tgz#4e386af3a99dd36c46fef013cfe4c1c341eed6f0"
integrity sha512-nbtKwh3a6xNVIp/VRuXV64yTKnb1IjTAEEh3irzS+HkKjAOYLTGNb9pmVNntZ8iVBHcWDA2Dof0QtPgFI1BaTA==
@@ -97,9 +98,9 @@
integrity sha512-pQaoQTBvDf7p7d/3ZHDaxWaU62guSYB9KQ6vvecshELunzpdN5tbgw0d+SVO1eYaTlrxX3Nvi7F9DI8FcoJePg==
"@rollup/rollup-linux-x64-gnu@^4.44.1":
version "4.52.0"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.0.tgz#214b534701614c7502603e2a083bb9f072ae8500"
integrity sha512-nmSVN+F2i1yKZ7rJNKO3G7ZzmxJgoQBQZ/6c4MuS553Grmr7WqR7LLDcYG53Z2m9409z3JLt4sCOhLdbKQ3HmA==
version "4.52.3"
resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.3.tgz#ed63dec576799fa5571eee5b2040f65faa82b49b"
integrity sha512-tPgGd6bY2M2LJTA1uGq8fkSPK8ZLYjDjY+ZLK9WHncCnfIz29LIXIqUgzCR0hIefzy6Hpbe8Th5WOSwTM8E7LA==
"@tmcw/togeojson@^5.6.0":
version "5.8.1"
@@ -1739,9 +1740,9 @@ css-tree@^3.1.0:
source-map-js "^1.0.1"
cssstyle@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-5.3.0.tgz#9d0750a5bda34351464850e5524c414435b8d72c"
integrity sha512-RveJPnk3m7aarYQ2bJ6iw+Urh55S6FzUiqtBq+TihnTDP4cI8y/TYDqGOyqgnG1J1a6BxJXZsV9JFSTulm9Z7g==
version "5.3.1"
resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-5.3.1.tgz#f55a9cc73d12705da8a341261d5e85003fe3a441"
integrity sha512-g5PC9Aiph9eiczFpcgUhd9S4UUO3F+LHGRIi5NUMZ+4xtoIYbHNZwZnWA2JsFGe8OU8nl4WyaEFiZuGuxlutJQ==
dependencies:
"@asamuzakjp/css-color" "^4.0.3"
"@csstools/css-syntax-patches-for-csstree" "^1.0.14"
@@ -1822,9 +1823,9 @@ depd@~2.0.0:
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
detect-libc@^2.0.1:
version "2.1.0"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.0.tgz#3ca811f60a7b504b0480e5008adacc660b0b8c4f"
integrity sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==
version "2.1.1"
resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.1.tgz#9f1e511ace6bb525efea4651345beac424dac7b9"
integrity sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==
dunder-proto@^1.0.1:
version "1.0.1"
@@ -2107,10 +2108,10 @@ keygrip@~1.1.0:
dependencies:
tsscmp "1.0.6"
lru-cache@^11.1.0:
version "11.2.1"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.1.tgz#d426ac471521729c6c1acda5f7a633eadaa28db2"
integrity sha512-r8LA6i4LP4EeWOhqBaZZjDWwehd1xUJPCJd9Sv300H0ZmcUER4+JPh7bqqZeqs1o5pgtgvXm+d9UGrB5zZGDiQ==
lru-cache@^11.2.1:
version "11.2.2"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-11.2.2.tgz#40fd37edffcfae4b2940379c0722dc6eeaa75f24"
integrity sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==
mapshaper@^0.6.79:
version "0.6.112"
@@ -2480,17 +2481,17 @@ tinyqueue@^2.0.0, tinyqueue@^2.0.3:
resolved "https://registry.yarnpkg.com/tinyqueue/-/tinyqueue-2.0.3.tgz#64d8492ebf39e7801d7bd34062e29b45b2035f08"
integrity sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==
tldts-core@^7.0.15:
version "7.0.15"
resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-7.0.15.tgz#68b12802db18f65279f647687608bf7fa582fb5b"
integrity sha512-YBkp2VfS9VTRMPNL2PA6PMESmxV1JEVoAr5iBlZnB5JG3KUrWzNCB3yNNkRa2FZkqClaBgfNYCp8PgpYmpjkZw==
tldts-core@^7.0.16:
version "7.0.16"
resolved "https://registry.yarnpkg.com/tldts-core/-/tldts-core-7.0.16.tgz#f94a42b1f571ee7e4d5c58a4a3486d557b093c14"
integrity sha512-XHhPmHxphLi+LGbH0G/O7dmUH9V65OY20R7vH8gETHsp5AZCjBk9l8sqmRKLaGOxnETU7XNSDUPtewAy/K6jbA==
tldts@^7.0.5:
version "7.0.15"
resolved "https://registry.yarnpkg.com/tldts/-/tldts-7.0.15.tgz#0d08f6145856b016790fe4be27079d53f1c3a5a3"
integrity sha512-heYRCiGLhtI+U/D0V8YM3QRwPfsLJiP+HX+YwiHZTnWzjIKC+ZCxQRYlzvOoTEc6KIP62B1VeAN63diGCng2hg==
version "7.0.16"
resolved "https://registry.yarnpkg.com/tldts/-/tldts-7.0.16.tgz#8eecb4c15608a23e5b360d64d74f937fb9dbe6aa"
integrity sha512-5bdPHSwbKTeHmXrgecID4Ljff8rQjv7g8zKQPkCozRo2HWWni+p310FSn5ImI+9kWw9kK4lzOB5q/a6iv0IJsw==
dependencies:
tldts-core "^7.0.15"
tldts-core "^7.0.16"
topojson-client@3.x:
version "3.1.0"