Merge pull request #119 from mshdabiola/bugfix/reorder_modules

bugfix/reorder_modules

Author: mshdabiola

.github/workflows/Build.yaml

@@ -32,9 +32,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
 
       - name: Validate Gradle Wrapper
         uses: gradle/wrapper-validation-action@v3
@@ -81,7 +78,7 @@ jobs:
           ./gradlew dependencyGuardBaseline
 
       - name: Push new Dependency Guard baselines if available
-        uses: stefanzweifel/git-auto-commit-action@v6.0.1
+        uses: stefanzweifel/git-auto-commit-action@v5
         if: steps.dependencyguard_baseline.outcome == 'success'
         with:
           file_pattern: '**/dependencies/*.txt'
@@ -108,7 +105,7 @@ jobs:
           ./gradlew updateFossReliantDebugScreenshotTest
 
       - name: Push new screenshots if available
-        uses: stefanzweifel/git-auto-commit-action@v6.0.1
+        uses: stefanzweifel/git-auto-commit-action@v5
         if: steps.screenshotsrecord.outcome == 'success'
         with:
           file_pattern: '*/*.png'

app/build.gradle.kts

@@ -80,34 +80,37 @@ dependencies {
     implementation(projects.modules.designsystem)
     implementation(projects.modules.data)
     implementation(projects.modules.ui)
+    implementation(projects.modules.domain)
 
 
     implementation(projects.feature.main)
     implementation(projects.feature.detail)
     implementation(projects.feature.gallery)
     implementation(projects.feature.drawing)
     implementation(projects.feature.about)
-    implementation(projects.feature.labelscreen)
-    implementation(projects.feature.selectlabelscreen)
+    implementation(projects.feature.label)
+    implementation(projects.feature.selectlabel)
     implementation(projects.feature.setting)
+    implementation(projects.feature.search)
+
 
 
 
 
     implementation(libs.kotlinx.serialization.json)
 
 
+    implementation(libs.androidx.navigation3.runtime)
+    implementation(libs.androidx.navigation3.ui)
+    implementation(libs.androidx.lifecycle.viewmodel.navigation3)
+//    implementation(libs.androidx.material3.adaptive.navigation3)
+
     implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.compose.material3.adaptive)
-    implementation(libs.androidx.compose.material3.adaptive.layout)
-    implementation(libs.androidx.compose.material3.adaptive.navigation)
     implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.compose.runtime.tracing)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.hilt.navigation.compose)
     implementation(libs.androidx.lifecycle.runtimeCompose)
-    implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.profileinstaller)
     implementation(libs.androidx.tracing.ktx)
     implementation(libs.androidx.window.core)
@@ -131,7 +134,6 @@ dependencies {
 
     androidTestImplementation(projects.modules.testing)
     androidTestImplementation(libs.androidx.test.espresso.core)
-    androidTestImplementation(libs.androidx.navigation.testing)
     androidTestImplementation(libs.androidx.compose.ui.test)
     androidTestImplementation(libs.hilt.android.testing)
     debugImplementation (libs.androidx.monitor)

app/dependencies/fossReliantReleaseRuntimeClasspath.txt

@@ -1,6 +1,6 @@
-androidx.activity:activity-compose:1.10.1
-androidx.activity:activity-ktx:1.10.1
-androidx.activity:activity:1.10.1
+androidx.activity:activity-compose:1.12.0-alpha03
+androidx.activity:activity-ktx:1.12.0-alpha03
+androidx.activity:activity:1.12.0-alpha03
 androidx.annotation:annotation-experimental:1.4.1
 androidx.annotation:annotation-jvm:1.9.1
 androidx.annotation:annotation:1.9.1
@@ -13,53 +13,47 @@ androidx.browser:browser:1.8.0
 androidx.collection:collection-jvm:1.5.0
 androidx.collection:collection-ktx:1.5.0
 androidx.collection:collection:1.5.0
-androidx.compose.animation:animation-android:1.9.0-alpha04
-androidx.compose.animation:animation-core-android:1.9.0-alpha04
-androidx.compose.animation:animation-core:1.9.0-alpha04
-androidx.compose.animation:animation:1.9.0-alpha04
-androidx.compose.foundation:foundation-android:1.9.0-alpha04
-androidx.compose.foundation:foundation-layout-android:1.9.0-alpha04
-androidx.compose.foundation:foundation-layout:1.9.0-alpha04
-androidx.compose.foundation:foundation:1.9.0-alpha04
-androidx.compose.material3.adaptive:adaptive-android:1.2.0-alpha06
-androidx.compose.material3.adaptive:adaptive-layout-android:1.2.0-alpha06
-androidx.compose.material3.adaptive:adaptive-layout:1.2.0-alpha06
-androidx.compose.material3.adaptive:adaptive-navigation-android:1.2.0-alpha06
-androidx.compose.material3.adaptive:adaptive-navigation:1.2.0-alpha06
-androidx.compose.material3.adaptive:adaptive:1.2.0-alpha06
-androidx.compose.material3:material3-android:1.4.0-alpha15
-androidx.compose.material3:material3-window-size-class-android:1.4.0-alpha15
-androidx.compose.material3:material3-window-size-class:1.4.0-alpha15
-androidx.compose.material3:material3:1.4.0-alpha15
+androidx.compose.animation:animation-android:1.9.0-beta01
+androidx.compose.animation:animation-core-android:1.9.0-beta01
+androidx.compose.animation:animation-core:1.9.0-beta01
+androidx.compose.animation:animation:1.9.0-beta01
+androidx.compose.foundation:foundation-android:1.9.0-beta01
+androidx.compose.foundation:foundation-layout-android:1.9.0-beta01
+androidx.compose.foundation:foundation-layout:1.9.0-beta01
+androidx.compose.foundation:foundation:1.9.0-beta01
+androidx.compose.material3:material3-android:1.4.0-alpha16
+androidx.compose.material3:material3-window-size-class-android:1.4.0-alpha16
+androidx.compose.material3:material3-window-size-class:1.4.0-alpha16
+androidx.compose.material3:material3:1.4.0-alpha16
 androidx.compose.material:material-icons-core-android:1.7.8
 androidx.compose.material:material-icons-core:1.7.8
 androidx.compose.material:material-icons-extended-android:1.7.8
 androidx.compose.material:material-icons-extended:1.7.8
-androidx.compose.material:material-ripple-android:1.9.0-alpha04
-androidx.compose.material:material-ripple:1.9.0-alpha04
-androidx.compose.runtime:runtime-android:1.9.0-alpha04
-androidx.compose.runtime:runtime-annotation-android:1.9.0-alpha04
-androidx.compose.runtime:runtime-annotation:1.9.0-alpha04
-androidx.compose.runtime:runtime-saveable-android:1.9.0-alpha04
-androidx.compose.runtime:runtime-saveable:1.9.0-alpha04
-androidx.compose.runtime:runtime-tracing:1.9.0-alpha04
-androidx.compose.runtime:runtime:1.9.0-alpha04
-androidx.compose.ui:ui-android:1.9.0-alpha04
-androidx.compose.ui:ui-geometry-android:1.9.0-alpha04
-androidx.compose.ui:ui-geometry:1.9.0-alpha04
-androidx.compose.ui:ui-graphics-android:1.9.0-alpha04
-androidx.compose.ui:ui-graphics:1.9.0-alpha04
-androidx.compose.ui:ui-text-android:1.9.0-alpha04
-androidx.compose.ui:ui-text-google-fonts:1.9.0-alpha04
-androidx.compose.ui:ui-text:1.9.0-alpha04
-androidx.compose.ui:ui-tooling-preview-android:1.9.0-alpha04
-androidx.compose.ui:ui-tooling-preview:1.9.0-alpha04
-androidx.compose.ui:ui-unit-android:1.9.0-alpha04
-androidx.compose.ui:ui-unit:1.9.0-alpha04
-androidx.compose.ui:ui-util-android:1.9.0-alpha04
-androidx.compose.ui:ui-util:1.9.0-alpha04
-androidx.compose.ui:ui:1.9.0-alpha04
-androidx.compose:compose-bom-alpha:2025.06.00
+androidx.compose.material:material-ripple-android:1.9.0-beta01
+androidx.compose.material:material-ripple:1.9.0-beta01
+androidx.compose.runtime:runtime-android:1.9.0-beta01
+androidx.compose.runtime:runtime-annotation-android:1.9.0-beta01
+androidx.compose.runtime:runtime-annotation:1.9.0-beta01
+androidx.compose.runtime:runtime-saveable-android:1.9.0-beta01
+androidx.compose.runtime:runtime-saveable:1.9.0-beta01
+androidx.compose.runtime:runtime-tracing:1.9.0-beta01
+androidx.compose.runtime:runtime:1.9.0-beta01
+androidx.compose.ui:ui-android:1.9.0-beta01
+androidx.compose.ui:ui-geometry-android:1.9.0-beta01
+androidx.compose.ui:ui-geometry:1.9.0-beta01
+androidx.compose.ui:ui-graphics-android:1.9.0-beta01
+androidx.compose.ui:ui-graphics:1.9.0-beta01
+androidx.compose.ui:ui-text-android:1.9.0-beta01
+androidx.compose.ui:ui-text-google-fonts:1.9.0-beta01
+androidx.compose.ui:ui-text:1.9.0-beta01
+androidx.compose.ui:ui-tooling-preview-android:1.9.0-beta01
+androidx.compose.ui:ui-tooling-preview:1.9.0-beta01
+androidx.compose.ui:ui-unit-android:1.9.0-beta01
+androidx.compose.ui:ui-unit:1.9.0-beta01
+androidx.compose.ui:ui-util-android:1.9.0-beta01
+androidx.compose.ui:ui-util:1.9.0-beta01
+androidx.compose.ui:ui:1.9.0-beta01
+androidx.compose:compose-bom-alpha:2025.06.01
 androidx.compose:compose-bom:2024.02.01
 androidx.concurrent:concurrent-futures:1.1.0
 androidx.core:core-ktx:1.16.0
@@ -69,12 +63,14 @@ androidx.core:core:1.16.0
 androidx.cursoradapter:cursoradapter:1.0.0
 androidx.customview:customview-poolingcontainer:1.0.0
 androidx.customview:customview:1.0.0
-androidx.datastore:datastore-android:1.1.7
 androidx.datastore:datastore-core-android:1.1.7
 androidx.datastore:datastore-core-okio-jvm:1.1.7
 androidx.datastore:datastore-core-okio:1.1.7
 androidx.datastore:datastore-core:1.1.7
-androidx.datastore:datastore:1.1.7
+androidx.datastore:datastore-preferences-core-android:1.1.7
+androidx.datastore:datastore-preferences-core:1.1.7
+androidx.datastore:datastore-preferences-external-protobuf:1.1.7
+androidx.datastore:datastore-preferences-proto:1.1.7
 androidx.drawerlayout:drawerlayout:1.0.0
 androidx.emoji2:emoji2-views-helper:1.4.0
 androidx.emoji2:emoji2:1.4.0
@@ -103,34 +99,43 @@ androidx.lifecycle:lifecycle-viewmodel-android:2.9.1
 androidx.lifecycle:lifecycle-viewmodel-compose-android:2.9.1
 androidx.lifecycle:lifecycle-viewmodel-compose:2.9.1
 androidx.lifecycle:lifecycle-viewmodel-ktx:2.9.1
+androidx.lifecycle:lifecycle-viewmodel-navigation3-android:1.0.0-alpha02
+androidx.lifecycle:lifecycle-viewmodel-navigation3:1.0.0-alpha02
 androidx.lifecycle:lifecycle-viewmodel-savedstate-android:2.9.1
 androidx.lifecycle:lifecycle-viewmodel-savedstate:2.9.1
 androidx.lifecycle:lifecycle-viewmodel:2.9.1
 androidx.loader:loader:1.0.0
 androidx.metrics:metrics-performance:1.0.0-beta02
 androidx.multidex:multidex:2.0.1
-androidx.navigation:navigation-common-android:2.9.0
-androidx.navigation:navigation-common:2.9.0
-androidx.navigation:navigation-compose-android:2.9.0
-androidx.navigation:navigation-compose:2.9.0
-androidx.navigation:navigation-runtime-android:2.9.0
-androidx.navigation:navigation-runtime:2.9.0
+androidx.navigation3:navigation3-runtime-android:1.0.0-alpha04
+androidx.navigation3:navigation3-runtime:1.0.0-alpha04
+androidx.navigation3:navigation3-ui-android:1.0.0-alpha04
+androidx.navigation3:navigation3-ui:1.0.0-alpha04
+androidx.navigation:navigation-common-ktx:2.5.1
+androidx.navigation:navigation-common:2.5.1
+androidx.navigation:navigation-compose:2.5.1
+androidx.navigation:navigation-runtime-ktx:2.5.1
+androidx.navigation:navigation-runtime:2.5.1
+androidx.navigationevent:navigationevent-android:1.0.0-alpha03
+androidx.navigationevent:navigationevent-compose-android:1.0.0-alpha03
+androidx.navigationevent:navigationevent-compose:1.0.0-alpha03
+androidx.navigationevent:navigationevent:1.0.0-alpha03
 androidx.profileinstaller:profileinstaller:1.4.1
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
-androidx.room:room-common-jvm:2.7.1
-androidx.room:room-common:2.7.1
-androidx.room:room-ktx:2.7.1
-androidx.room:room-runtime-android:2.7.1
-androidx.room:room-runtime:2.7.1
+androidx.room:room-common-jvm:2.7.2
+androidx.room:room-common:2.7.2
+androidx.room:room-ktx:2.7.2
+androidx.room:room-runtime-android:2.7.2
+androidx.room:room-runtime:2.7.2
 androidx.savedstate:savedstate-android:1.3.0
 androidx.savedstate:savedstate-compose-android:1.3.0
 androidx.savedstate:savedstate-compose:1.3.0
 androidx.savedstate:savedstate-ktx:1.3.0
 androidx.savedstate:savedstate:1.3.0
-androidx.sqlite:sqlite-android:2.5.0
-androidx.sqlite:sqlite-framework-android:2.5.0
-androidx.sqlite:sqlite-framework:2.5.0
-androidx.sqlite:sqlite:2.5.0
+androidx.sqlite:sqlite-android:2.5.1
+androidx.sqlite:sqlite-framework-android:2.5.1
+androidx.sqlite:sqlite-framework:2.5.1
+androidx.sqlite:sqlite:2.5.1
 androidx.startup:startup-runtime:1.1.1
 androidx.test:core:1.4.0
 androidx.test:monitor:1.4.0
@@ -145,8 +150,8 @@ androidx.viewpager:viewpager:1.0.0
 androidx.window:window-core-android:1.4.0
 androidx.window:window-core:1.4.0
 androidx.window:window:1.4.0
-com.airbnb.android:lottie-compose:6.6.6
-com.airbnb.android:lottie:6.6.6
+com.airbnb.android:lottie-compose:6.6.7
+com.airbnb.android:lottie:6.6.7
 com.google.accompanist:accompanist-drawablepainter:0.37.3
 com.google.code.findbugs:jsr305:3.0.2
 com.google.dagger:dagger-lint-aar:2.56.2
@@ -159,8 +164,6 @@ com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:31.0.1-jre
 com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava
 com.google.j2objc:j2objc-annotations:1.3
-com.google.protobuf:protobuf-javalite:4.31.1
-com.google.protobuf:protobuf-kotlin-lite:4.31.1
 com.jakewharton.timber:timber:5.0.1
 com.squareup.okhttp3:okhttp:4.12.0
 com.squareup.okio:okio-jvm:3.11.0
@@ -212,23 +215,23 @@ org.jetbrains.compose.ui:ui-util:1.8.0
 org.jetbrains.compose.ui:ui:1.8.0
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.21
-org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21
-org.jetbrains.kotlin:kotlin-stdlib:2.1.21
+org.jetbrains.kotlin:kotlin-stdlib:2.2.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.4.0
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2
 org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.10.2
-org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.6.2
-org.jetbrains.kotlinx:kotlinx-datetime:0.6.2
-org.jetbrains.kotlinx:kotlinx-serialization-bom:1.8.1
-org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.1
-org.jetbrains.kotlinx:kotlinx-serialization-core:1.8.1
-org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.1
-org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.1
+org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.7.0
+org.jetbrains.kotlinx:kotlinx-datetime:0.7.0
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.9.0
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.9.0
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.9.0
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.9.0
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0
 org.jetbrains:annotations:23.0.0
 org.jspecify:jspecify:1.0.0