Skip to content

Commit cc346ae

Browse files
committed
Update project
1 parent 9b21bd1 commit cc346ae

File tree

5 files changed

+81
-69
lines changed

5 files changed

+81
-69
lines changed

auto/src/main/kotlin/org/michaelbel/template/ui/MainActivityContent.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ import androidx.compose.runtime.Composable
2525
import androidx.compose.runtime.getValue
2626
import androidx.compose.runtime.mutableStateOf
2727
import androidx.compose.runtime.remember
28+
import androidx.compose.runtime.rememberCoroutineScope
2829
import androidx.compose.runtime.setValue
2930
import androidx.compose.ui.Alignment
3031
import androidx.compose.ui.Modifier
3132
import androidx.navigation.compose.NavHost
3233
import androidx.navigation.compose.composable
3334
import androidx.navigation.compose.rememberNavController
35+
import kotlinx.coroutines.launch
3436
import org.koin.androidx.compose.koinViewModel
3537
import org.michaelbel.template.MainViewModel
3638
import org.michaelbel.template.ui.details2.DetailsScreen2
@@ -42,6 +44,7 @@ fun MainActivityContent(
4244
modifier: Modifier = Modifier,
4345
viewModel: MainViewModel = koinViewModel()
4446
) {
47+
val scope = rememberCoroutineScope()
4548
val navHostController = rememberNavController()
4649
var selectedRoute by remember { mutableStateOf<TabNavigation>(TabNavigation.Home) }
4750
val listDetailPaneScaffoldNavigator = rememberListDetailPaneScaffoldNavigator<AppNavigation.Details>()
@@ -92,21 +95,25 @@ fun MainActivityContent(
9295
AnimatedPane(
9396
modifier = Modifier
9497
.navigationBarsPadding()
95-
.fillMaxWidth(0.5F)
98+
.fillMaxWidth(.5F)
9699
) {
97100
ListScreen(
98-
onClick = { listDetailPaneScaffoldNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail, AppNavigation.Details(it)) }
101+
onClick = {
102+
scope.launch {
103+
listDetailPaneScaffoldNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail, AppNavigation.Details(it))
104+
}
105+
}
99106
)
100107
}
101108
},
102109
detailPane = {
103110
AnimatedPane(
104-
modifier = Modifier.fillMaxWidth(0.5F)
111+
modifier = Modifier.fillMaxWidth(.5F)
105112
) {
106113
when {
107-
listDetailPaneScaffoldNavigator.currentDestination?.content != null -> {
114+
listDetailPaneScaffoldNavigator.currentDestination?.contentKey != null -> {
108115
DetailsScreen2(
109-
id = listDetailPaneScaffoldNavigator.currentDestination?.content?.id!!
116+
id = listDetailPaneScaffoldNavigator.currentDestination?.contentKey?.id!!
110117
)
111118
}
112119
else -> {

config/debug-key.jks

2.65 KB
Binary file not shown.

gradle/libs.versions.toml

Lines changed: 59 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ min-sdk = "32"
33
compile-sdk = "36"
44
target-sdk = "36"
55
jdk = "21"
6-
agp = "8.12.0"
6+
agp = "8.12.1"
77

8-
kotlin = "2.2.0"
8+
kotlin = "2.2.10"
99
kotlinx-coroutines = "1.10.2"
1010
kotlinx-datetime = "0.7.1"
1111
kotlinx-serialization = "1.9.0"
@@ -14,15 +14,15 @@ kotlinx-collections = "0.4.0"
1414
kotlinx-atomicfu = "0.29.0"
1515
kotlinx-binary-compatibility = "0.18.1"
1616

17-
google-ksp = "2.2.0-2.0.2"
17+
google-ksp = "2.2.10-2.0.2"
1818
google-hilt = "2.57"
1919
google-services = "4.4.3"
2020
google-gson = "2.13.1"
2121
google-horologist = "0.7.15"
2222
google-zxing = "3.5.3"
2323
google-ai-generativeai = "0.9.0"
2424
google-ai-edge = "0.0.1-exp02"
25-
google-protobuf = "4.31.1"
25+
google-protobuf = "4.32.0"
2626

2727
google-ar-core = "1.50.0"
2828
google-ar-impress = "0.0.5"
@@ -96,7 +96,6 @@ google-gms-play-services-home = "16.0.0"
9696
google-gms-play-services-identity = "18.1.0"
9797
google-gms-play-services-identity-credentials = "1.0.0"
9898
google-gms-play-services-iid = "17.0.0"
99-
google-gms-play-services-instantapps = "18.2.0"
10099
google-gms-play-services-location = "21.3.0"
101100
google-gms-play-services-maps = "19.2.0"
102101
google-gms-play-services-measurement = "23.0.0"
@@ -186,7 +185,7 @@ google-firebase-database = "21.0.0"
186185
google-firebase-database-collection = "18.0.1"
187186
google-firebase-database-connection = "16.0.2"
188187
google-firebase-dataconnect = "17.0.0"
189-
google-firebase-datatransport = "19.0.0"
188+
google-firebase-datatransport = "20.0.0"
190189
google-firebase-dynamic-links = "22.1.0"
191190
google-firebase-dynamic-module-support = "1.0.0"
192191
google-firebase-encoders = "17.0.0"
@@ -203,7 +202,7 @@ google-firebase-invites = "17.0.0"
203202
google-firebase-measurement-connector = "20.0.1"
204203
google-firebase-measurement-connector-impl = "17.0.5"
205204
google-firebase-messaging = "24.1.2"
206-
google-firebase-messaging-directboot = "24.1.2"
205+
google-firebase-messaging-directboot = "25.0.0"
207206
google-firebase-messaging-ktx = "1.0.0"
208207
google-firebase-ml-common = "22.1.2"
209208
google-firebase-ml-model-interpreter = "22.0.4"
@@ -223,7 +222,7 @@ google-firebase-ml-vision-internal-vkp = "17.0.2"
223222
google-firebase-ml-vision-object-detection-model = "19.0.6"
224223
google-firebase-perf = "21.0.5"
225224
google-firebase-plugins = "2.0.0"
226-
google-firebase-sessions = "2.1.2"
225+
google-firebase-sessions = "3.0.0"
227226
google-firebase-storage = "21.0.2"
228227
google-firebase-storage-common = "17.0.0"
229228
google-firebase-vertexai = "16.5.0"
@@ -232,38 +231,38 @@ google-firebase-license = "12.0.1"
232231
androidx-activity = "1.10.1"
233232
androidx-ads = "1.0.0-alpha05"
234233
androidx-annotation = "1.9.1"
235-
androidx-annotation-experimental = "1.5.0"
234+
androidx-annotation-experimental = "1.5.1"
236235
androidx-appcompat = "1.7.1"
237236
androidx-appsearch = "1.1.0"
238237
androidx-arch-core = "2.2.0"
239238
androidx-asynclayoutinflater = "1.1.0"
240239
androidx-autofill = "1.3.0"
241-
androidx-baselineprofile = "1.3.4"
242-
androidx-benchmark = "1.3.4"
240+
androidx-baselineprofile = "1.4.0"
241+
androidx-benchmark = "1.4.0"
243242
androidx-biometric = "1.2.0-alpha05"
244243
androidx-bluetooth = "1.0.0-alpha02"
245-
androidx-browser = "1.8.0"
246-
androidx-car-app = "1.4.0"
244+
androidx-browser = "1.9.0"
245+
androidx-car-app = "1.7.0"
247246
androidx-camera = "1.4.2"
248-
androidx-camera-compose = "1.5.0-beta01"
247+
androidx-camera-compose = "1.5.0-rc01"
249248
androidx-camera-viewfinder = "1.4.0-alpha07"
250249
androidx-camera-viewfinder-compose = "1.0.0-alpha02"
251250
androidx-cardview = "1.0.0"
252251
androidx-collection = "1.5.0"
253-
androidx-compose-animation = "1.8.3"
254-
androidx-compose-foundation = "1.8.3"
255-
androidx-compose-runtime = "1.8.3"
256-
androidx-compose-ui = "1.8.3"
257-
androidx-compose-material = "1.8.3"
252+
androidx-compose-animation = "1.9.0"
253+
androidx-compose-foundation = "1.9.0"
254+
androidx-compose-runtime = "1.9.0"
255+
androidx-compose-ui = "1.9.0"
256+
androidx-compose-material = "1.9.0"
258257
androidx-compose-material3 = "1.3.2"
259258
androidx-compose-material3-adaptive = "1.1.0"
260259
androidx-compose-material3-window-size = "1.3.2"
261-
androidx-concurrent = "1.2.0"
260+
androidx-concurrent = "1.3.0"
262261
androidx-constraintlayout = "2.2.1"
263262
androidx-constraintlayout-compose = "1.1.1"
264263
androidx-contentpager = "1.0.0"
265264
androidx-coordinatorlayout = "1.3.0"
266-
androidx-core = "1.16.0"
265+
androidx-core = "1.17.0"
267266
androidx-core-animation = "1.0.0"
268267
androidx-core-google-shortcuts = "1.1.0"
269268
androidx-core-performance = "1.0.0"
@@ -289,10 +288,10 @@ androidx-emoji = "1.1.0"
289288
androidx-emoji2 = "1.5.0"
290289
androidx-enterprise = "1.1.0"
291290
androidx-exifinterface = "1.4.1"
292-
androidx-fragment = "1.8.8"
291+
androidx-fragment = "1.8.9"
293292
androidx-games-activity = "4.0.0"
294293
androidx-games-controller = "2.0.2"
295-
androidx-games-frame-pacing = "2.1.2"
294+
androidx-games-frame-pacing = "2.1.3"
296295
androidx-games-memory-advice = "2.0.1"
297296
androidx-games-text-input = "4.0.0"
298297
androidx-games-performance-tuner = "2.0.0"
@@ -303,31 +302,31 @@ androidx-graphics-path = "1.0.1"
303302
androidx-graphics-shapes = "1.0.1"
304303
androidx-gridlayout = "1.1.0"
305304
androidx-health = "1.0.0"
306-
androidx-health-connect = "1.1.0-rc02"
305+
androidx-health-connect = "1.1.0-rc03"
307306
androidx-heifwriter = "1.1.0-beta01"
308307
androidx-hilt = "1.2.0"
309308
androidx-hilt-lifecycle = "1.0.0-alpha03"
310-
androidx-ink = "1.0.0-alpha05"
311-
androidx-input = "1.0.0-beta05"
309+
androidx-ink = "1.0.0-alpha06"
310+
androidx-input = "1.0.0-beta06"
312311
androidx-interpolator = "1.0.0"
313312
androidx-javascriptengine = "1.0.0"
314313
androidx-leanback = "1.2.0"
315314
androidx-leanback-paging = "1.1.0"
316315
androidx-leanback-grid = "1.0.0"
317316
androidx-leanback-tab = "1.1.0"
318-
androidx-lifecycle = "2.9.1"
317+
androidx-lifecycle = "2.9.2"
319318
androidx-lint = "30.0.1"
320319
androidx-lint-gradle = "1.0.0-alpha05"
321320
androidx-loader = "1.1.0"
322321
androidx-localbroadcastmanager = "1.1.0"
323322
androidx-media3 = "1.8.0"
324323
androidx-mediarouter = "1.8.1"
325324
androidx-metrics = "1.0.0-beta02"
326-
androidx-navigation = "2.9.1"
327-
androidx-navigation3 = "1.0.0-alpha05"
325+
androidx-navigation = "2.9.3"
326+
androidx-navigation3 = "1.0.0-alpha07"
328327
androidx-paging = "3.3.6"
329328
androidx-palette = "1.0.0"
330-
androidx-pdf = "1.0.0-alpha09"
329+
androidx-pdf = "1.0.0-alpha10"
331330
androidx-percentlayout = "1.0.0"
332331
androidx-preference = "1.2.1"
333332
androidx-photopicker = "1.0.0-alpha01"
@@ -339,9 +338,9 @@ androidx-recyclerview-selection = "1.2.0"
339338
androidx-remotecallback = "1.0.0-alpha02"
340339
androidx-resourceinspection = "1.0.1"
341340
androidx-room = "2.7.2"
342-
androidx-savedstate = "1.3.0"
343-
androidx-security-crypto = "1.1.0-beta01"
344-
androidx-security-app-authenticator = "1.0.0-rc01"
341+
androidx-savedstate = "1.3.1"
342+
androidx-security-crypto = "1.1.0"
343+
androidx-security-app-authenticator = "1.0.0"
345344
androidx-security-state = "1.0.0-beta01"
346345
androidx-security-identity-credential = "1.0.0-alpha03"
347346
androidx-sharetarget = "1.2.0"
@@ -352,23 +351,23 @@ androidx-sqlite = "2.5.2"
352351
androidx-startup = "1.2.0"
353352
androidx-swiperefreshlayout = "1.1.0"
354353
androidx-test-annotation = "1.0.1"
355-
androidx-test-core = "1.6.1"
356-
androidx-test-espresso = "3.6.1"
357-
androidx-test-espresso-device = "1.0.1"
358-
androidx-test-ext-junit = "1.2.1"
354+
androidx-test-core = "1.7.0"
355+
androidx-test-espresso = "3.7.0"
356+
androidx-test-espresso-device = "1.1.0"
357+
androidx-test-ext-junit = "1.3.0"
359358
androidx-test-ext-junit-gtest = "1.0.0-alpha02"
360-
androidx-test-ext-truth = "1.6.0"
361-
androidx-test-monitor = "1.7.2"
362-
androidx-test-orchestrator = "1.5.1"
363-
androidx-test-runner = "1.6.2"
364-
androidx-test-rules = "1.6.1"
365-
androidx-test-services = "1.5.0"
359+
androidx-test-ext-truth = "1.7.0"
360+
androidx-test-monitor = "1.8.0"
361+
androidx-test-orchestrator = "1.6.1"
362+
androidx-test-runner = "1.7.0"
363+
androidx-test-rules = "1.7.0"
364+
androidx-test-services = "1.6.0"
366365
androidx-test-uiautomator = "2.3.0"
367-
androidx-test-uiautomator-shell = "1.0.0-alpha01"
366+
androidx-test-uiautomator-shell = "1.0.0-alpha02"
368367
androidx-textclassifier = "1.0.0-alpha04"
369368
androidx-tracing = "1.3.0"
370369
androidx-transition = "1.6.0"
371-
androidx-tv = "1.0.0"
370+
androidx-tv = "1.0.1"
372371
androidx-tv-foundation = "1.0.0-alpha12"
373372
androidx-tvprovider = "1.1.0"
374373
androidx-vectordrawable = "1.2.0"
@@ -391,18 +390,18 @@ androidx-webkit = "1.14.0"
391390
androidx-window = "1.4.0"
392391
androidx-window-extensions-core = "1.0.0"
393392
androidx-work = "2.10.3"
394-
androidx-xr = "1.0.0-alpha08"
393+
androidx-xr = "1.0.0-alpha10"
395394

396395
detekt = "1.23.8"
397396
kode-detekt-rules-compose = "1.4.0"
398397
twitter-compose-rules-detekt = "0.0.26"
399398
nlopez-compose-rules-detekt = "0.4.22"
400399
vk-vkompose-detekt = "0.6"
401-
ktor = "3.2.1"
402-
okio = "3.15.0"
403-
okhttp = "5.0.0"
400+
ktor = "3.2.3"
401+
okio = "3.16.0"
402+
okhttp = "5.1.0"
404403
retrofit = "3.0.0"
405-
chucker = "4.1.0"
404+
chucker = "4.2.0"
406405
moshi = "1.15.2"
407406
rxjava3 = "3.1.10"
408407
rxjava3-rxkotlin = "3.0.1"
@@ -421,25 +420,25 @@ junit = "4.13.2"
421420
robolectric = "4.15.1"
422421
mockito = "5.18.0"
423422
kaspresso = "1.6.0"
424-
mockk = "1.14.4"
423+
mockk = "1.14.5"
425424
turbine = "1.2.1"
426425
barista = "4.3.0"
427426
kotest = "5.9.1"
428427
tensorflow-lite = "2.17.0"
429428
jetbrains-dokka = "2.0.0"
430-
android-compose-screenshot = "0.0.1-alpha10"
429+
android-compose-screenshot = "0.0.1-alpha11"
431430

432-
androidx-compose-bom = "2025.06.01"
433-
androidx-compose-bom-beta = "2025.06.02"
434-
androidx-compose-bom-alpha = "2025.06.02"
435-
google-firebase-bom = "33.16.0"
436-
kotlin-bom = "2.1.10"
431+
androidx-compose-bom = "2025.08.00"
432+
androidx-compose-bom-beta = "2025.08.00"
433+
androidx-compose-bom-alpha = "2025.08.00"
434+
google-firebase-bom = "34.1.0"
435+
kotlin-bom = "2.2.0"
437436
kotlinx-coroutines-bom = "1.10.2"
438-
okhttp-bom = "5.0.0"
437+
okhttp-bom = "5.1.0"
439438
koin-bom = "4.1.0"
440439
koin-annotations-bom = "2.1.0"
441-
junit-bom = "5.13.3"
442-
mockito-bom = "5.18.0"
440+
junit-bom = "5.13.4"
441+
mockito-bom = "5.19.0"
443442

444443
[libraries]
445444
#region bom
@@ -541,7 +540,6 @@ google-gms-play-services-identity-credentials = { module = "com.google.android.g
541540
google-gms-play-services-identity-license = { module = "com.google.android.gms:play-services-identity-license", version.ref = "google-gms-play-services-license" }
542541
google-gms-play-services-iid = { module = "com.google.android.gms:play-services-iid", version.ref = "google-gms-play-services-iid" }
543542
google-gms-play-services-iid-license = { module = "com.google.android.gms:play-services-iid-license", version.ref = "google-gms-play-services-license" }
544-
google-gms-play-services-instantapps = { module = "com.google.android.gms:play-services-instantapps", version.ref = "google-gms-play-services-instantapps" }
545543
google-gms-play-services-instantapps-license = { module = "com.google.android.gms:play-services-instantapps-license", version.ref = "google-gms-play-services-license" }
546544
google-gms-play-services-location = { module = "com.google.android.gms:play-services-location", version.ref = "google-gms-play-services-location" }
547545
google-gms-play-services-location-license = { module = "com.google.android.gms:play-services-location-license", version.ref = "google-gms-play-services-license" }
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#Sun Apr 04 22:00:34 MSK 2021
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
6-
zipStoreBase=GRADLE_USER_HOME
7-
networkTimeout=30000
6+
zipStoreBase=GRADLE_USER_HOME

mobile/build.gradle.kts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ android {
4343
}
4444

4545
signingConfigs {
46+
getByName("debug") {
47+
keyAlias = "template"
48+
keyPassword = "password"
49+
storeFile = rootProject.file("config/debug-key.jks")
50+
storePassword = "password"
51+
}
52+
4653
val keystoreProperties = Properties()
4754
val keystorePropertiesFile: File = rootProject.file("config/keystore.properties")
4855
if (keystorePropertiesFile.exists()) {
@@ -87,6 +94,7 @@ android {
8794
isDebuggable = true
8895
isMinifyEnabled = false
8996
isShrinkResources = false
97+
signingConfig = signingConfigs.getByName("debug")
9098
applicationIdSuffix = ".debug"
9199
}
92100
}

0 commit comments

Comments
 (0)