Skip to content

Commit f031038

Browse files
authored
refactor: update to Nav 3 (#600)
POS-27
1 parent c4d67c9 commit f031038

File tree

35 files changed

+520
-578
lines changed

35 files changed

+520
-578
lines changed

.claude/rules/gradle/gradle.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
paths:
3-
- "**.gradle.kts"
4-
- "**/buildSrc/**/*.kt"
5-
- "**/build-logic/**/*.kt"
3+
- "**.gradle.kts"
4+
- "**/buildSrc/**/*.kt"
5+
- "**/build-logic/**/*.kt"
6+
- "gradle/libs.versions.toml"
67
---
7-
88
# Gradle Rules
99

1010
- **Convention Plugins**: Define these in `build-logic` to avoid repeated build logic.
@@ -14,3 +14,5 @@ paths:
1414
ensuring logic is compatible with the caches.
1515
- **Multi-Platform Build Logic**: Ensure Gradle build logic (in build-logic or otherwise) works when
1616
executed on Windows, macOS, Linux, and any other Unix-like systems.
17+
- **Dependency Versions**: When adding a dependency on a new library or plugin, use the latest
18+
stable version.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 36 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ plugins {
66
alias(libs.plugins.android.application)
77
alias(libs.plugins.kotlin.android)
88
alias(libs.plugins.kotlin.compose)
9+
alias(libs.plugins.kotlin.serialization)
910
alias(libs.plugins.google.ksp)
1011
alias(libs.plugins.google.services)
1112
alias(libs.plugins.google.firebase.crashlytics)
@@ -105,7 +106,10 @@ dependencies {
105106
implementation(libs.androidx.hilt.navigation.compose)
106107
implementation(libs.androidx.lifecycle.runtime.compose)
107108
implementation(libs.androidx.lifecycle.viewModel.compose)
108-
implementation(libs.androidx.navigation.compose)
109+
implementation(libs.androidx.lifecycle.viewmodel.navigation3)
110+
implementation(libs.androidx.navigation3.runtime)
111+
implementation(libs.androidx.navigation3.ui)
112+
implementation(libs.kotlinx.serialization.core)
109113
implementation(libs.google.hilt.android)
110114
implementation(libs.google.materialComponents)
111115
implementation(platform(libs.google.firebase.bom))
@@ -126,7 +130,6 @@ kotlin {
126130
compilerOptions {
127131
freeCompilerArgs.addAll(
128132
"-Xjvm-default=all",
129-
"-Xcontext-parameters",
130133
"-Xinline-classes",
131134
)
132135
jvmTarget = JvmTarget.JVM_17

app/src/main/java/io/trewartha/positional/MainActivity.kt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import androidx.activity.compose.setContent
55
import androidx.appcompat.app.AppCompatActivity
66
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
77
import androidx.compose.runtime.CompositionLocalProvider
8-
import androidx.navigation.compose.rememberNavController
98
import dagger.hilt.android.AndroidEntryPoint
109
import io.trewartha.positional.core.ui.format.DateTimeFormatter
1110
import io.trewartha.positional.core.ui.locals.LocalDateTimeFormatter
@@ -22,10 +21,7 @@ public class MainActivity : AppCompatActivity() {
2221
setContent {
2322
CompositionLocalProvider(LocalDateTimeFormatter provides dateTimeFormatter) {
2423
val widthSizeClass = calculateWindowSizeClass(activity = this).widthSizeClass
25-
MainView(
26-
navHostController = rememberNavController(),
27-
windowWidthSizeClass = widthSizeClass
28-
)
24+
MainView(windowWidthSizeClass = widthSizeClass)
2925
}
3026
}
3127
}

0 commit comments

Comments
 (0)