Merge branch 'main' into rpf-update-firebase-ktx

.editorconfig

@@ -4,3 +4,4 @@
 [*.{kt,kts}]
 ij_kotlin_allow_trailing_comma=true
 ij_kotlin_allow_trailing_comma_on_call_site=true
+ktlint_function_naming_ignore_when_annotated_with=Composable, Test

.github/ci-gradle.properties

@@ -19,7 +19,6 @@ org.gradle.parallel=true
 org.gradle.workers.max=2
 
 kotlin.incremental=false
-kotlin.compiler.execution.strategy=in-process
 
 # Controls KotlinOptions.allWarningsAsErrors.
 # This value used in CI and is currently set to false.

.github/dependabot.yml

@@ -0,0 +1,25 @@
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "gradle"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    registries: "*"
+    labels: [ "version update" ]
+    groups:
+      kotlin-ksp:
+        patterns:
+          - "org.jetbrains.kotlin:*"
+          - "org.jetbrains.kotlin.jvm"
+          - "com.google.devtools.ksp"
+    open-pull-requests-limit: 10
+registries:
+  maven-google:
+    type: "maven-repository"
+    url: "https://maven.google.com"
+    replaces-base: true

.github/pull_request_template.md

@@ -1,17 +1,25 @@
-Thanks for submitting a pull request. Please include the following information.
+**DO NOT CREATE A PULL REQUEST WITHOUT READING THESE INSTRUCTIONS**
 
-**What I have done and why**
+## Instructions
-Include a summary of what your pull request contains, and why you have made these changes.
+Thanks for submitting a pull request. To accept your pull request we need you do a few things: 
+
+**If this is your first pull request**
+
+- [Sign the contributors license agreement](https://cla.developers.google.com/)
+
+**Ensure tests pass and code is formatted correctly**
 
-Fixes #<issue_number_goes_here>
+- Run local tests on the `DemoDebug` variant by running `./gradlew testDemoDebug`
+- Fix code formatting: `./gradlew --init-script gradle/init.gradle.kts spotlessApply`
 
-**Do tests pass?**
+**Add a description**
-- [ ] Run local tests on `DemoDebug` variant: `./gradlew testDemoDebug`
-- [ ] Check formatting: `./gradlew --init-script gradle/init.gradle.kts spotlessApply`
 
-**Is this your first pull request?**
+We need to know what you've done and why you've done it. Include a summary of what your pull request contains, and why you have made these changes. Include links to any relevant issues which it fixes.
-- [ ] [Sign the CLA](https://cla.developers.google.com/)
-- [ ] Run `./tools/setup.sh`
-- [ ] Import the code formatting style as explained in [the setup script](/tools/setup.sh#L40).
 
+[Here's an example](https://github.com/android/nowinandroid/pull/1257).
+
+**NOW DELETE THIS LINE AND EVERYTHING ABOVE IT**
+
+**What I have done and why**
 
+\<add your PR description here\> 

.github/renovate.json

@@ -1,16 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base", "group:all", ":dependencyDashboard", "schedule:daily"
-  ],
-  "packageRules": [
-    {
-      "matchPackageNames": ["org.objenesis:objenesis"],
-      "allowedVersions": "<=2.6"
-    },
-    {
-      "matchPackageNames": ["com.google.protobuf"],
-      "allowedVersions": "<=0.8.19"
-    }
-  ]
-}

.github/workflows/Build.yaml

@@ -11,70 +11,67 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build:
+  test_and_apk:
+    name: "Local tests and APKs"
     runs-on: ubuntu-latest
-    timeout-minutes: 90
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    timeout-minutes: 60
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v1
-
       - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
-
-      - name: Check spotless
-        run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
-
-      - name: Build all build type and flavor permutations
-        run: ./gradlew assemble
-
-      - name: Upload build outputs (APKs)
-        uses: actions/upload-artifact@v3
         with:
-          name: APKs
+          validate-wrappers: true
-          path: '**/build/outputs/apk/**/*.apk'
+          gradle-home-cache-cleanup: true
-
-      - name: Run local tests
-        run: ./gradlew testDemoDebug testProdDebug :lint:test
-
-  test:
-    runs-on: ubuntu-latest
 
-    permissions:
+      - name: Check build-logic
-      contents: write
+        run: ./gradlew check -p build-logic
 
-    timeout-minutes: 60
+      - name: Check spotless
+        run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
 
-    steps:
+      - name: Check Dependency Guard
-      - name: Checkout
+        id: dependencyguard_verify
-        uses: actions/checkout@v4
+        continue-on-error: true
+        run: ./gradlew dependencyGuard
 
-      - name: Validate Gradle Wrapper
+      - name: Prevent updating Dependency Guard baselines if this is a fork
-        uses: gradle/wrapper-validation-action@v1
+        id: checkfork_dependencyguard
+        continue-on-error: false
+        if: steps.dependencyguard_verify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
+        run: |
+          echo "::error::Dependency Guard failed, please update baselines with: ./gradlew dependencyGuardBaseline" && exit 1
 
-      - name: Copy CI gradle.properties
+        # Runs if previous job failed
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+      - name: Generate new Dependency Guard baselines if verification failed and it's a PR
+        id: dependencyguard_baseline
+        if: steps.dependencyguard_verify.outcome == 'failure' && github.event_name == 'pull_request'
+        run: |
+          ./gradlew dependencyGuardBaseline
 
-      - name: Set up JDK 17
+      - name: Push new Dependency Guard baselines if available
-        uses: actions/setup-java@v3
+        uses: stefanzweifel/git-auto-commit-action@v5
+        if: steps.dependencyguard_baseline.outcome == 'success'
         with:
-          distribution: 'zulu'
+          file_pattern: '**/dependencies/*.txt'
-          java-version: 17
+          disable_globbing: true
-
+          commit_message: "🤖 Updates baselines for Dependency Guard"
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
 
       - name: Run all local screenshot tests (Roborazzi)
         id: screenshotsverify
@@ -82,7 +79,7 @@ jobs:
         run: ./gradlew verifyRoborazziDemoDebug
 
       - name: Prevent pushing new screenshots if this is a fork
-        id: checkfork
+        id: checkfork_screenshots
         continue-on-error: false
         if: steps.screenshotsverify.outcome == 'failure' && github.event.pull_request.head.repo.full_name != github.repository
         run: |
@@ -104,23 +101,46 @@ jobs:
           commit_message: "🤖 Updates screenshots"
 
       # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.
-      - name: Run local tests
+      - name: Run local tests and create report
         if: always()
-        run: ./gradlew testDemoDebug testProdDebug
+        run: ./gradlew testDemoDebug :lint:test
+      # Replace task exclusions with `-Pandroidx.baselineprofile.skipgeneration` when
+      # https://android-review.googlesource.com/c/platform/frameworks/support/+/2602790 landed in a
+      # release build
+
+      - name: Build all build type and flavor permutations
+        run: ./gradlew :app:assemble :benchmarks:assemble
+          -x pixel6Api33ProdNonMinifiedReleaseAndroidTest
+          -x pixel6Api33DemoNonMinifiedReleaseAndroidTest
+          -x collectDemoNonMinifiedReleaseBaselineProfile
+          -x collectProdNonMinifiedReleaseBaselineProfile
+
+      - name: Upload build outputs (APKs)
+        uses: actions/upload-artifact@v4
+        with:
+          name: APKs
+          path: '**/build/outputs/apk/**/*.apk'
 
-      - name: Upload test results (XML)
+      - name: Upload JVM local results (XML)
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: test-results
+          name: local-test-results
           path: '**/build/test-results/test*UnitTest/**.xml'
 
+      - name: Upload screenshot results (PNG)
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: screenshot-test-results
+          path: '**/build/outputs/roborazzi/*_compare.png'
+
       - name: Check lint
         run: ./gradlew :app:lintProdRelease :app-nia-catalog:lintRelease :lint:lint
 
       - name: Upload lint reports (HTML)
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: lint-reports
           path: '**/build/reports/lint-results-*.html'
@@ -129,14 +149,31 @@ jobs:
         run: ./gradlew :app:checkProdReleaseBadging
 
   androidTest:
-    needs: build
+    runs-on: ubuntu-latest
-    runs-on: macOS-latest # enables hardware acceleration in the virtual machine
     timeout-minutes: 55
     strategy:
       matrix:
         api-level: [26, 30]
 
     steps:
+      - name: Delete unnecessary tools 🔧
+        uses: jlumbroso/free-disk-space@v1.3.1
+        with:
+          android: false # Don't remove Android tools
+          tool-cache: true # Remove image tool cache - rm -rf "$AGENT_TOOLSDIRECTORY"
+          dotnet: true # rm -rf /usr/share/dotnet
+          haskell: true # rm -rf /opt/ghc...
+          swap-storage: true # rm -f /mnt/swapfile (4GiB)
+          docker-images: false # Takes 16s, enable if needed in the future
+          large-packages: false # includes google-cloud-sdk and it's slow
+
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -144,18 +181,18 @@ jobs:
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
-
+        with:
-      - name: Build AndroidTest apps
+          validate-wrappers: true
-        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest --daemon
+          gradle-home-cache-cleanup: true
 
-      - name: Run instrumentation tests
+      - name: Build projects and run instrumentation tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
           api-level: ${{ matrix.api-level }}
@@ -165,9 +202,41 @@ jobs:
           heap-size: 600M
           script: ./gradlew connectedDemoDebugAndroidTest --daemon
 
+      - name: Run local tests (including Roborazzi) for the combined coverage report (only API 30)
+        if: matrix.api-level == 30
+        # There is no need to verify Roborazzi tests to generate coverage.
+        run: ./gradlew testDemoDebugUnitTest -Proborazzi.test.verify=false # Add Prod if we ever add JVM tests for prod
+
+      # Add `createProdDebugUnitTestCoverageReport` if we ever add JVM tests for prod
+      - name: Generate coverage reports for Debug variants (only API 30)
+        if: matrix.api-level == 30
+        run: ./gradlew createDemoDebugCombinedCoverageReport
+        
       - name: Upload test reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ matrix.api-level }}
           path: '**/build/reports/androidTests'
+
+      - name: Display local test coverage (only API 30)
+        if: matrix.api-level == 30
+        id: jacoco
+        uses: madrapps/jacoco-report@v1.6.1
+        with:
+          title: Combined test coverage report
+          min-coverage-overall: 40
+          min-coverage-changed-files: 60
+          paths: |
+            ${{ github.workspace }}/**/build/reports/jacoco/**/*Report.xml
+          token: ${{ secrets.GITHUB_TOKEN }}
+        
+      - name: Upload local coverage reports (XML + HTML) (only API 30)
+        if: matrix.api-level == 30
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-reports
+          if-no-files-found: error
+          compression-level: 1
+          overwrite: false
+          path: '**/build/reports/jacoco/'

.github/workflows/Release.yml

@@ -8,27 +8,48 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    timeout-minutes: 45
+    timeout-minutes: 120
 
     steps:
+      - name: Enable KVM group perms
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+          ls /dev/kvm
+
       - name: Checkout
-        uses: actions/checkout@v4   
 
-      - name: Validate Gradle Wrapper
+        uses: actions/checkout@v4
-        uses: gradle/wrapper-validation-action@v1
 
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
           java-version: 17
 
-      - name: Build app
+      - name: Setup Gradle
-        run: ./gradlew :app:assembleDemoRelease
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          validate-wrappers: true
+          gradle-home-cache-cleanup: true
 
+      - name: Install GMD image for baseline profile generation
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager "system-images;android-33;aosp_atd;x86_64"
+
+      - name: Accept Android licenses
+        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
+
+      - name: Build release variant including baseline profile generation
+        run: ./gradlew :app:assembleDemoRelease
+             -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
+             -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+             -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+             -Pandroid.experimental.androidTest.numManagedDeviceShards=1
+             -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1

.gitignore

@@ -43,3 +43,6 @@ _sandbox
 
 # Android Studio captures folder
 captures/
+
+# Kotlin
+.kotlin

README.md

@@ -22,7 +22,7 @@ The app is currently in development. The `prodRelease` variant is [available on
 **Now in Android** displays content from the
 [Now in Android](https://developer.android.com/series/now-in-android) series. Users can browse for
 links to recent videos, articles and other content. Users can also follow topics they are interested
-in.
+in, and be notified when new content is published which matches interests they are following.
 
 ## Screenshots
 
@@ -109,12 +109,42 @@ Examples:
   manipulate the state of the `Test` repository and verify the resulting behavior, instead of
   checking that specific repository methods were called.
 
-## Screenshot tests
+To run the tests execute the following gradle tasks: 
+
+- `testDemoDebug` run all local tests against the `demoDebug` variant.
+- `connectedDemoDebugAndroidTest` run all instrumented tests against the `demoDebug` variant. 
 
-**Now In Android** uses [Roborazzi](https://github.com/takahirom/roborazzi) to do screenshot tests
+**Note:** You should not run `./gradlew test` or `./gradlew connectedAndroidTest` as this will execute 
-of certain screens and components. To run these tests, run the `verifyRoborazziDemoDebug` or
+tests against _all_ build variants which is both unecessary and will result in failures as only the
-`recordRoborazziDemoDebug` tasks. Note that screenshots are recorded on CI, using Linux, and other
+`demoDebug` variant is supported. No other variants have any tests (although this might change in future). 
-platforms might generate slightly different images, making the tests fail.
+
+## Screenshot tests
+A screenshot test takes a screenshot of a screen or a UI component within the app, and compares it 
+with a previously recorded screenshot which is known to be rendered correctly. 
+
+For example, Now in Android has [screenshot tests](https://github.com/android/nowinandroid/blob/main/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt)
+to verify that the navigation is displayed correctly on different screen sizes 
+([known correct screenshots](https://github.com/android/nowinandroid/tree/main/app/src/testDemo/screenshots)). 
+
+Now In Android uses [Roborazzi](https://github.com/takahirom/roborazzi) to run screenshot tests
+of certain screens and UI components. When working with screenshot tests the following gradle tasks are useful:
+
+- `verifyRoborazziDemoDebug` run all screenshot tests, verifying the screenshots against the known
+correct screenshots.
+- `recordRoborazziDemoDebug` record new "known correct" screenshots. Use this command when you have
+made changes to the UI and manually verified that they are rendered correctly. Screenshots will be
+stored in `modulename/src/test/screenshots`.
+- `compareRoborazziDemoDebug` create comparison images between failed tests and the known correct
+images. These can also be found in `modulename/src/test/screenshots`. 
+
+**Note:** The known correct screenshots stored in this repository are recorded on CI using Linux. Other
+platforms may (and probably will) generate slightly different images, making the screenshot tests fail. 
+When working on a non-Linux platform, a workaround to this is to run `recordRoborazziDemoDebug` on the
+`main` branch before starting work. After making changes, `verifyRoborazziDemoDebug` will identify only
+legitimate changes. 
+
+For more information about screenshot testing 
+[check out this talk](https://www.droidcon.com/2023/11/15/easy-screenshot-testing-with-compose/).
 
 # UI
 The app was designed using [Material 3 guidelines](https://m3.material.io/). Learn more about the design process and 

app-nia-catalog/README.md

@@ -1,3 +1,3 @@
 # :app-nia-catalog module
-
+## Dependency graph
-![Dependency graph](../docs/images/graphs/dep_graph_app_nia_catalog.png)
+![Dependency graph](../docs/images/graphs/dep_graph_app_nia_catalog.svg)

app-nia-catalog/build.gradle.kts

@@ -59,13 +59,18 @@ android {
             // To publish on the Play store a private signing key is required, but to allow anyone
             // who clones the code to sign and run the release variant, use the debug signing key.
             // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.named("debug").get()
         }
     }
 }
 
 dependencies {
+    implementation(libs.androidx.activity.compose)
+
     implementation(projects.core.designsystem)
     implementation(projects.core.ui)
-    implementation(libs.androidx.activity.compose)
+}
+
+dependencyGuard {
+    configuration("releaseRuntimeClasspath")
 }

app-nia-catalog/dependencies/releaseRuntimeClasspath.txt

@@ -0,0 +1,122 @@
+androidx.activity:activity-compose:1.8.2
+androidx.activity:activity-ktx:1.8.2
+androidx.activity:activity:1.8.2
+androidx.annotation:annotation-experimental:1.4.0
+androidx.annotation:annotation-jvm:1.8.0
+androidx.annotation:annotation:1.8.0
+androidx.appcompat:appcompat-resources:1.6.1
+androidx.arch.core:core-common:2.2.0
+androidx.arch.core:core-runtime:2.2.0
+androidx.autofill:autofill:1.0.0
+androidx.browser:browser:1.8.0
+androidx.collection:collection-jvm:1.4.0
+androidx.collection:collection-ktx:1.4.0
+androidx.collection:collection:1.4.0
+androidx.compose.animation:animation-android:1.7.0-beta01
+androidx.compose.animation:animation-core-android:1.7.0-beta01
+androidx.compose.animation:animation-core:1.7.0-beta01
+androidx.compose.animation:animation:1.7.0-beta01
+androidx.compose.foundation:foundation-android:1.7.0-beta01
+androidx.compose.foundation:foundation-layout-android:1.7.0-beta01
+androidx.compose.foundation:foundation-layout:1.7.0-beta01
+androidx.compose.foundation:foundation:1.7.0-beta01
+androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive:1.0.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01
+androidx.compose.material3:material3-android:1.3.0-beta01
+androidx.compose.material3:material3:1.3.0-beta01
+androidx.compose.material:material-icons-core-android:1.6.3
+androidx.compose.material:material-icons-core:1.6.3
+androidx.compose.material:material-icons-extended-android:1.6.3
+androidx.compose.material:material-icons-extended:1.6.3
+androidx.compose.material:material-ripple-android:1.7.0-beta01
+androidx.compose.material:material-ripple:1.7.0-beta01
+androidx.compose.runtime:runtime-android:1.7.0-beta01
+androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01
+androidx.compose.runtime:runtime-saveable:1.7.0-beta01
+androidx.compose.runtime:runtime:1.7.0-beta01
+androidx.compose.ui:ui-android:1.7.0-beta01
+androidx.compose.ui:ui-geometry-android:1.7.0-beta01
+androidx.compose.ui:ui-geometry:1.7.0-beta01
+androidx.compose.ui:ui-graphics-android:1.7.0-beta01
+androidx.compose.ui:ui-graphics:1.7.0-beta01
+androidx.compose.ui:ui-text-android:1.7.0-beta01
+androidx.compose.ui:ui-text:1.7.0-beta01
+androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01
+androidx.compose.ui:ui-tooling-preview:1.7.0-beta01
+androidx.compose.ui:ui-unit-android:1.7.0-beta01
+androidx.compose.ui:ui-unit:1.7.0-beta01
+androidx.compose.ui:ui-util-android:1.7.0-beta01
+androidx.compose.ui:ui-util:1.7.0-beta01
+androidx.compose.ui:ui:1.7.0-beta01
+androidx.compose:compose-bom:2024.02.02
+androidx.concurrent:concurrent-futures:1.1.0
+androidx.core:core-ktx:1.13.1
+androidx.core:core:1.13.1
+androidx.customview:customview-poolingcontainer:1.0.0
+androidx.customview:customview:1.0.0
+androidx.emoji2:emoji2:1.3.0
+androidx.exifinterface:exifinterface:1.3.7
+androidx.fragment:fragment:1.5.1
+androidx.graphics:graphics-path:1.0.1
+androidx.interpolator:interpolator:1.0.0
+androidx.lifecycle:lifecycle-common-java8:2.8.0
+androidx.lifecycle:lifecycle-common-jvm:2.8.0
+androidx.lifecycle:lifecycle-common:2.8.0
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.0
+androidx.lifecycle:lifecycle-livedata-core:2.8.0
+androidx.lifecycle:lifecycle-livedata:2.8.0
+androidx.lifecycle:lifecycle-process:2.8.0
+androidx.lifecycle:lifecycle-runtime-android:2.8.0
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.0
+androidx.lifecycle:lifecycle-runtime-compose:2.8.0
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.0
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.0
+androidx.lifecycle:lifecycle-runtime:2.8.0
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.0
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.0
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.0
+androidx.lifecycle:lifecycle-viewmodel:2.8.0
+androidx.loader:loader:1.0.0
+androidx.metrics:metrics-performance:1.0.0-alpha04
+androidx.profileinstaller:profileinstaller:1.3.1
+androidx.savedstate:savedstate-ktx:1.2.1
+androidx.savedstate:savedstate:1.2.1
+androidx.startup:startup-runtime:1.1.1
+androidx.tracing:tracing-ktx:1.3.0-alpha02
+androidx.tracing:tracing:1.3.0-alpha02
+androidx.vectordrawable:vectordrawable-animated:1.1.0
+androidx.vectordrawable:vectordrawable:1.1.0
+androidx.versionedparcelable:versionedparcelable:1.1.1
+androidx.viewpager:viewpager:1.0.0
+androidx.window.extensions.core:core:1.0.0
+androidx.window:window-core-android:1.3.0-beta02
+androidx.window:window-core:1.3.0-beta02
+androidx.window:window:1.3.0-beta02
+com.google.accompanist:accompanist-drawablepainter:0.32.0
+com.google.code.findbugs:jsr305:3.0.2
+com.google.dagger:dagger-lint-aar:2.51.1
+com.google.dagger:dagger:2.51.1
+com.google.dagger:hilt-android:2.51.1
+com.google.dagger:hilt-core:2.51.1
+com.google.guava:listenablefuture:1.0
+com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okio:okio-jvm:3.8.0
+com.squareup.okio:okio:3.8.0
+io.coil-kt:coil-base:2.6.0
+io.coil-kt:coil-compose-base:2.6.0
+io.coil-kt:coil-compose:2.6.0
+io.coil-kt:coil:2.6.0
+javax.inject:javax.inject:1
+org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib:2.0.0
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
+org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
+org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
+org.jetbrains:annotations:23.0.0

app/README.md

@@ -1,3 +1,3 @@
 # :app module
-
+## Dependency graph
-![Dependency graph](../docs/images/graphs/dep_graph_app.png)
+![Dependency graph](../docs/images/graphs/dep_graph_app.svg)

app/build.gradle.kts

@@ -21,9 +21,10 @@ plugins {
     alias(libs.plugins.nowinandroid.android.application.flavors)
     alias(libs.plugins.nowinandroid.android.application.jacoco)
     alias(libs.plugins.nowinandroid.android.hilt)
-    id("jacoco")
     alias(libs.plugins.nowinandroid.android.application.firebase)
     id("com.google.android.gms.oss-licenses-plugin")
+    alias(libs.plugins.baselineprofile)
+    alias(libs.plugins.roborazzi)
 }
 
 android {
@@ -43,7 +44,7 @@ android {
         debug {
             applicationIdSuffix = NiaBuildType.DEBUG.applicationIdSuffix
         }
-        val release by getting {
+        release {
             isMinifyEnabled = true
             applicationIdSuffix = NiaBuildType.RELEASE.applicationIdSuffix
             proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
@@ -51,18 +52,9 @@ android {
             // To publish on the Play store a private signing key is required, but to allow anyone
             // who clones the code to sign and run the release variant, use the debug signing key.
             // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
-            signingConfig = signingConfigs.getByName("debug")
+            signingConfig = signingConfigs.named("debug").get()
-        }
+            // Ensure Baseline Profile is fresh for release builds.
-        create("benchmark") {
+            baselineProfile.automaticGenerationDuringBuild = true
-            // Enable all the optimizations from release build through initWith(release).
-            initWith(release)
-            matchingFallbacks.add("release")
-            // Debug key signing is available to everyone.
-            signingConfig = signingConfigs.getByName("debug")
-            // Only use benchmark proguard rules
-            proguardFiles("benchmark-rules.pro")
-            isMinifyEnabled = true
-            applicationIdSuffix = NiaBuildType.BENCHMARK.applicationIdSuffix
         }
     }
 
@@ -93,43 +85,58 @@ dependencies {
     implementation(projects.core.data)
     implementation(projects.core.model)
     implementation(projects.core.analytics)
-
     implementation(projects.sync.work)
 
-    androidTestImplementation(projects.core.testing)
-    androidTestImplementation(projects.core.datastoreTest)
-    androidTestImplementation(projects.core.dataTest)
-    androidTestImplementation(projects.core.network)
-    androidTestImplementation(libs.androidx.navigation.testing)
-    androidTestImplementation(libs.accompanist.testharness)
-    androidTestImplementation(kotlin("test"))
-    debugImplementation(libs.androidx.compose.ui.testManifest)
-    debugImplementation(projects.uiTestHiltManifest)
-
     implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.appcompat)
+    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.compose.runtime)
-    implementation(libs.androidx.lifecycle.runtimeCompose)
-    implementation(libs.androidx.compose.runtime.tracing)
-    implementation(libs.androidx.compose.material3.windowSizeClass)
     implementation(libs.androidx.hilt.navigation.compose)
+    implementation(libs.androidx.lifecycle.runtimeCompose)
     implementation(libs.androidx.navigation.compose)
-    implementation(libs.androidx.window.manager)
     implementation(libs.androidx.profileinstaller)
+    implementation(libs.androidx.tracing.ktx)
+    implementation(libs.androidx.window.core)
     implementation(libs.kotlinx.coroutines.guava)
     implementation(libs.coil.kt)
 
-    // Core functions
+    ksp(libs.hilt.compiler)
-    testImplementation(projects.core.testing)
+
-    testImplementation(projects.core.datastoreTest)
+    debugImplementation(libs.androidx.compose.ui.testManifest)
+    debugImplementation(projects.uiTestHiltManifest)
+
+    kspTest(libs.hilt.compiler)
+
     testImplementation(projects.core.dataTest)
-    testImplementation(projects.core.network)
+    testImplementation(libs.hilt.android.testing)
-    testImplementation(libs.androidx.navigation.testing)
+    testImplementation(projects.sync.syncTest)
-    testImplementation(libs.accompanist.testharness)
+
-    testImplementation(libs.work.testing)
+    testDemoImplementation(libs.robolectric)
-    testImplementation(kotlin("test"))
+    testDemoImplementation(libs.roborazzi)
-    kaptTest(libs.hilt.compiler)
+    testDemoImplementation(projects.core.screenshotTesting)
+
+    androidTestImplementation(kotlin("test"))
+    androidTestImplementation(projects.core.testing)
+    androidTestImplementation(projects.core.dataTest)
+    androidTestImplementation(projects.core.datastoreTest)
+    androidTestImplementation(libs.androidx.test.espresso.core)
+    androidTestImplementation(libs.androidx.navigation.testing)
+    androidTestImplementation(libs.androidx.compose.ui.test)
+    androidTestImplementation(libs.hilt.android.testing)
+
+    baselineProfile(projects.benchmarks)
+}
+
+baselineProfile {
+    // Don't build on every iteration of a full assemble.
+    // Instead enable generation directly for the release build variant.
+    automaticGenerationDuringBuild = false
+}
 
+dependencyGuard {
+    configuration("prodReleaseRuntimeClasspath")
 }

app/dependencies/prodReleaseRuntimeClasspath.txt

@@ -0,0 +1,226 @@
+androidx.activity:activity-compose:1.8.2
+androidx.activity:activity-ktx:1.8.2
+androidx.activity:activity:1.8.2
+androidx.annotation:annotation-experimental:1.4.0
+androidx.annotation:annotation-jvm:1.8.0
+androidx.annotation:annotation:1.8.0
+androidx.appcompat:appcompat-resources:1.7.0
+androidx.appcompat:appcompat:1.7.0
+androidx.arch.core:core-common:2.2.0
+androidx.arch.core:core-runtime:2.2.0
+androidx.autofill:autofill:1.0.0
+androidx.browser:browser:1.8.0
+androidx.collection:collection-jvm:1.4.0
+androidx.collection:collection-ktx:1.4.0
+androidx.collection:collection:1.4.0
+androidx.compose.animation:animation-android:1.7.0-beta01
+androidx.compose.animation:animation-core-android:1.7.0-beta01
+androidx.compose.animation:animation-core:1.7.0-beta01
+androidx.compose.animation:animation:1.7.0-beta01
+androidx.compose.foundation:foundation-android:1.7.0-beta01
+androidx.compose.foundation:foundation-layout-android:1.7.0-beta01
+androidx.compose.foundation:foundation-layout:1.7.0-beta01
+androidx.compose.foundation:foundation:1.7.0-beta01
+androidx.compose.material3.adaptive:adaptive-android:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive-layout-android:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive-layout:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive-navigation-android:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive-navigation:1.0.0-beta01
+androidx.compose.material3.adaptive:adaptive:1.0.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite-android:1.3.0-beta01
+androidx.compose.material3:material3-adaptive-navigation-suite:1.3.0-beta01
+androidx.compose.material3:material3-android:1.3.0-beta01
+androidx.compose.material3:material3-window-size-class-android:1.3.0-beta01
+androidx.compose.material3:material3-window-size-class:1.3.0-beta01
+androidx.compose.material3:material3:1.3.0-beta01
+androidx.compose.material:material-icons-core-android:1.6.3
+androidx.compose.material:material-icons-core:1.6.3
+androidx.compose.material:material-icons-extended-android:1.6.3
+androidx.compose.material:material-icons-extended:1.6.3
+androidx.compose.material:material-ripple-android:1.7.0-beta01
+androidx.compose.material:material-ripple:1.7.0-beta01
+androidx.compose.runtime:runtime-android:1.7.0-beta01
+androidx.compose.runtime:runtime-saveable-android:1.7.0-beta01
+androidx.compose.runtime:runtime-saveable:1.7.0-beta01
+androidx.compose.runtime:runtime-tracing:1.0.0-beta01
+androidx.compose.runtime:runtime:1.7.0-beta01
+androidx.compose.ui:ui-android:1.7.0-beta01
+androidx.compose.ui:ui-geometry-android:1.7.0-beta01
+androidx.compose.ui:ui-geometry:1.7.0-beta01
+androidx.compose.ui:ui-graphics-android:1.7.0-beta01
+androidx.compose.ui:ui-graphics:1.7.0-beta01
+androidx.compose.ui:ui-text-android:1.7.0-beta01
+androidx.compose.ui:ui-text:1.7.0-beta01
+androidx.compose.ui:ui-tooling-preview-android:1.7.0-beta01
+androidx.compose.ui:ui-tooling-preview:1.7.0-beta01
+androidx.compose.ui:ui-unit-android:1.7.0-beta01
+androidx.compose.ui:ui-unit:1.7.0-beta01
+androidx.compose.ui:ui-util-android:1.7.0-beta01
+androidx.compose.ui:ui-util:1.7.0-beta01
+androidx.compose.ui:ui:1.7.0-beta01
+androidx.compose:compose-bom:2024.02.02
+androidx.concurrent:concurrent-futures:1.1.0
+androidx.core:core-ktx:1.13.1
+androidx.core:core-splashscreen:1.0.1
+androidx.core:core:1.13.1
+androidx.cursoradapter:cursoradapter:1.0.0
+androidx.customview:customview-poolingcontainer:1.0.0
+androidx.customview:customview:1.0.0
+androidx.datastore:datastore-core:1.0.0
+androidx.datastore:datastore-preferences-core:1.0.0
+androidx.datastore:datastore-preferences:1.0.0
+androidx.datastore:datastore:1.0.0
+androidx.documentfile:documentfile:1.0.0
+androidx.drawerlayout:drawerlayout:1.0.0
+androidx.emoji2:emoji2-views-helper:1.3.0
+androidx.emoji2:emoji2:1.3.0
+androidx.exifinterface:exifinterface:1.3.7
+androidx.fragment:fragment:1.5.4
+androidx.graphics:graphics-path:1.0.1
+androidx.hilt:hilt-common:1.1.0
+androidx.hilt:hilt-navigation-compose:1.2.0
+androidx.hilt:hilt-navigation:1.2.0
+androidx.hilt:hilt-work:1.1.0
+androidx.interpolator:interpolator:1.0.0
+androidx.legacy:legacy-support-core-utils:1.0.0
+androidx.lifecycle:lifecycle-common-java8:2.8.1
+androidx.lifecycle:lifecycle-common-jvm:2.8.1
+androidx.lifecycle:lifecycle-common:2.8.1
+androidx.lifecycle:lifecycle-livedata-core-ktx:2.8.1
+androidx.lifecycle:lifecycle-livedata-core:2.8.1
+androidx.lifecycle:lifecycle-livedata:2.8.1
+androidx.lifecycle:lifecycle-process:2.8.1
+androidx.lifecycle:lifecycle-runtime-android:2.8.1
+androidx.lifecycle:lifecycle-runtime-compose-android:2.8.1
+androidx.lifecycle:lifecycle-runtime-compose:2.8.1
+androidx.lifecycle:lifecycle-runtime-ktx-android:2.8.1
+androidx.lifecycle:lifecycle-runtime-ktx:2.8.1
+androidx.lifecycle:lifecycle-runtime:2.8.1
+androidx.lifecycle:lifecycle-service:2.8.1
+androidx.lifecycle:lifecycle-viewmodel-android:2.8.1
+androidx.lifecycle:lifecycle-viewmodel-compose-android:2.8.1
+androidx.lifecycle:lifecycle-viewmodel-compose:2.8.1
+androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.1
+androidx.lifecycle:lifecycle-viewmodel-savedstate:2.8.1
+androidx.lifecycle:lifecycle-viewmodel:2.8.1
+androidx.loader:loader:1.0.0
+androidx.localbroadcastmanager:localbroadcastmanager:1.0.0
+androidx.metrics:metrics-performance:1.0.0-alpha04
+androidx.navigation:navigation-common-ktx:2.8.0-alpha06
+androidx.navigation:navigation-common:2.8.0-alpha06
+androidx.navigation:navigation-compose:2.8.0-alpha06
+androidx.navigation:navigation-runtime-ktx:2.8.0-alpha06
+androidx.navigation:navigation-runtime:2.8.0-alpha06
+androidx.print:print:1.0.0
+androidx.privacysandbox.ads:ads-adservices-java:1.0.0-beta05
+androidx.privacysandbox.ads:ads-adservices:1.0.0-beta05
+androidx.profileinstaller:profileinstaller:1.3.1
+androidx.resourceinspection:resourceinspection-annotation:1.0.1
+androidx.room:room-common:2.6.1
+androidx.room:room-ktx:2.6.1
+androidx.room:room-runtime:2.6.1
+androidx.savedstate:savedstate-ktx:1.2.1
+androidx.savedstate:savedstate:1.2.1
+androidx.sqlite:sqlite-framework:2.4.0
+androidx.sqlite:sqlite:2.4.0
+androidx.startup:startup-runtime:1.1.1
+androidx.tracing:tracing-ktx:1.3.0-alpha02
+androidx.tracing:tracing-perfetto:1.0.0
+androidx.tracing:tracing:1.3.0-alpha02
+androidx.vectordrawable:vectordrawable-animated:1.1.0
+androidx.vectordrawable:vectordrawable:1.1.0
+androidx.versionedparcelable:versionedparcelable:1.1.1
+androidx.viewpager:viewpager:1.0.0
+androidx.window.extensions.core:core:1.0.0
+androidx.window:window-core-android:1.3.0-beta02
+androidx.window:window-core:1.3.0-beta02
+androidx.window:window:1.3.0-beta02
+androidx.work:work-runtime-ktx:2.9.0
+androidx.work:work-runtime:2.9.0
+com.caverock:androidsvg-aar:1.4
+com.google.accompanist:accompanist-drawablepainter:0.32.0
+com.google.accompanist:accompanist-permissions:0.34.0
+com.google.android.datatransport:transport-api:3.0.0
+com.google.android.datatransport:transport-backend-cct:3.1.9
+com.google.android.datatransport:transport-runtime:3.1.9
+com.google.android.gms:play-services-ads-identifier:18.0.0
+com.google.android.gms:play-services-base:18.0.1
+com.google.android.gms:play-services-basement:18.1.0
+com.google.android.gms:play-services-cloud-messaging:17.0.1
+com.google.android.gms:play-services-measurement-api:21.4.0
+com.google.android.gms:play-services-measurement-base:21.4.0
+com.google.android.gms:play-services-measurement-impl:21.4.0
+com.google.android.gms:play-services-measurement-sdk-api:21.4.0
+com.google.android.gms:play-services-measurement-sdk:21.4.0
+com.google.android.gms:play-services-measurement:21.4.0
+com.google.android.gms:play-services-oss-licenses:17.0.1
+com.google.android.gms:play-services-stats:17.0.2
+com.google.android.gms:play-services-tasks:18.0.2
+com.google.code.findbugs:jsr305:3.0.2
+com.google.dagger:dagger-lint-aar:2.51.1
+com.google.dagger:dagger:2.51.1
+com.google.dagger:hilt-android:2.51.1
+com.google.dagger:hilt-core:2.51.1
+com.google.errorprone:error_prone_annotations:2.11.0
+com.google.firebase:firebase-abt:21.1.1
+com.google.firebase:firebase-analytics-ktx:21.4.0
+com.google.firebase:firebase-analytics:21.4.0
+com.google.firebase:firebase-annotations:16.2.0
+com.google.firebase:firebase-bom:32.4.0
+com.google.firebase:firebase-common-ktx:20.4.2
+com.google.firebase:firebase-common:20.4.2
+com.google.firebase:firebase-components:17.1.5
+com.google.firebase:firebase-config:21.5.0
+com.google.firebase:firebase-crashlytics-ktx:18.5.0
+com.google.firebase:firebase-crashlytics:18.5.0
+com.google.firebase:firebase-datatransport:18.1.8
+com.google.firebase:firebase-encoders-json:18.0.1
+com.google.firebase:firebase-encoders-proto:16.0.0
+com.google.firebase:firebase-encoders:17.0.0
+com.google.firebase:firebase-iid-interop:17.1.0
+com.google.firebase:firebase-installations-interop:17.1.1
+com.google.firebase:firebase-installations:17.2.0
+com.google.firebase:firebase-measurement-connector:19.0.0
+com.google.firebase:firebase-messaging-ktx:23.3.0
+com.google.firebase:firebase-messaging:23.3.0
+com.google.firebase:firebase-perf-ktx:20.5.0
+com.google.firebase:firebase-perf:20.5.0
+com.google.firebase:firebase-sessions:1.1.0
+com.google.firebase:protolite-well-known-types:18.0.0
+com.google.guava:failureaccess:1.0.1
+com.google.guava:guava:31.1-android
+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.26.1
+com.google.protobuf:protobuf-kotlin-lite:4.26.1
+com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0
+com.squareup.okhttp3:logging-interceptor:4.12.0
+com.squareup.okhttp3:okhttp:4.12.0
+com.squareup.okio:okio-jvm:3.8.0
+com.squareup.okio:okio:3.8.0
+com.squareup.retrofit2:retrofit:2.9.0
+io.coil-kt:coil-base:2.6.0
+io.coil-kt:coil-compose-base:2.6.0
+io.coil-kt:coil-compose:2.6.0
+io.coil-kt:coil-svg:2.6.0
+io.coil-kt:coil:2.6.0
+javax.inject:javax.inject:1
+org.checkerframework:checker-qual:3.12.0
+org.jetbrains.kotlin:kotlin-stdlib-common:2.0.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.0
+org.jetbrains.kotlin:kotlin-stdlib:2.0.0
+org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-guava:1.8.0
+org.jetbrains.kotlinx:kotlinx-coroutines-play-services:1.8.0
+org.jetbrains.kotlinx:kotlinx-datetime-jvm:0.5.0
+org.jetbrains.kotlinx:kotlinx-datetime:0.5.0
+org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3
+org.jetbrains:annotations:23.0.0

app/prodRelease-badging.txt

@@ -6,9 +6,9 @@ uses-permission: name='android.permission.ACCESS_NETWORK_STATE'
 uses-permission: name='android.permission.POST_NOTIFICATIONS'
 uses-permission: name='android.permission.WAKE_LOCK'
 uses-permission: name='com.google.android.c2dm.permission.RECEIVE'
-uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE'
 uses-permission: name='android.permission.RECEIVE_BOOT_COMPLETED'
 uses-permission: name='android.permission.FOREGROUND_SERVICE'
+uses-permission: name='com.google.android.finsky.permission.BIND_GET_INSTALL_REFERRER_SERVICE'
 uses-permission: name='com.google.samples.apps.nowinandroid.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION'
 application-label:'Now in Android'
 application-label-af:'Now in Android'
@@ -120,3 +120,4 @@ supports-screens: 'small' 'normal' 'large' 'xlarge'
 supports-any-density: 'true'
 locales: '--_--' 'af' 'am' 'ar' 'as' 'az' 'be' 'bg' 'bn' 'bs' 'ca' 'cs' 'da' 'de' 'el' 'en-AU' 'en-CA' 'en-GB' 'en-IN' 'en-XC' 'es' 'es-US' 'et' 'eu' 'fa' 'fi' 'fr' 'fr-CA' 'gl' 'gu' 'hi' 'hr' 'hu' 'hy' 'in' 'is' 'it' 'iw' 'ja' 'ka' 'kk' 'km' 'kn' 'ko' 'ky' 'lo' 'lt' 'lv' 'mk' 'ml' 'mn' 'mr' 'ms' 'my' 'nb' 'ne' 'nl' 'or' 'pa' 'pl' 'pt' 'pt-BR' 'pt-PT' 'ro' 'ru' 'si' 'sk' 'sl' 'sq' 'sr' 'sr-Latn' 'sv' 'sw' 'ta' 'te' 'th' 'tl' 'tr' 'uk' 'ur' 'uz' 'vi' 'zh-CN' 'zh-HK' 'zh-TW' 'zu'
 densities: '120' '160' '240' '320' '480' '640' '65534'
+native-code: 'arm64-v8a' 'armeabi-v7a' 'x86' 'x86_64'

app/proguard-rules.pro

@@ -1,13 +1,3 @@
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
-
 # Fix for Retrofit issue https://github.com/square/retrofit/issues/3751
 # Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
 -keep,allowobfuscation,allowshrinking interface retrofit2.Call
@@ -16,4 +6,4 @@
 # With R8 full mode generic signatures are stripped for classes that are not
 # kept. Suspend functions are wrapped in continuations where the type argument
 # is used.
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt

@@ -20,7 +20,6 @@ import androidx.annotation.StringRes
 import androidx.compose.ui.test.assertCountEquals
 import androidx.compose.ui.test.assertIsOn
 import androidx.compose.ui.test.assertIsSelected
-import androidx.compose.ui.test.hasAnyAncestor
 import androidx.compose.ui.test.hasTestTag
 import androidx.compose.ui.test.hasText
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
@@ -42,7 +41,7 @@ import dagger.hilt.android.testing.BindValue
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.test.runTest
+import kotlinx.coroutines.runBlocking
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -51,7 +50,7 @@ import javax.inject.Inject
 import kotlin.properties.ReadOnlyProperty
 import com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR
-import com.google.samples.apps.nowinandroid.feature.interests.R as FeatureInterestsR
+import com.google.samples.apps.nowinandroid.feature.search.R as FeatureSearchR
 import com.google.samples.apps.nowinandroid.feature.settings.R as SettingsR
 
 /**
@@ -90,18 +89,18 @@ class NavigationTest {
     lateinit var topicsRepository: TopicsRepository
 
     private fun AndroidComposeTestRule<*, *>.stringResource(@StringRes resId: Int) =
-        ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }
+        ReadOnlyProperty<Any, String> { _, _ -> activity.getString(resId) }
 
     // The strings used for matching in these tests
-    private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.navigate_up)
+    private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_navigate_up)
-    private val forYou by composeTestRule.stringResource(FeatureForyouR.string.for_you)
+    private val forYou by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_title)
-    private val interests by composeTestRule.stringResource(FeatureInterestsR.string.interests)
+    private val interests by composeTestRule.stringResource(FeatureSearchR.string.feature_search_interests)
     private val sampleTopic = "Headlines"
     private val appName by composeTestRule.stringResource(R.string.app_name)
-    private val saved by composeTestRule.stringResource(BookmarksR.string.saved)
+    private val saved by composeTestRule.stringResource(BookmarksR.string.feature_bookmarks_title)
-    private val settings by composeTestRule.stringResource(SettingsR.string.top_app_bar_action_icon_description)
+    private val settings by composeTestRule.stringResource(SettingsR.string.feature_settings_top_app_bar_action_icon_description)
-    private val brand by composeTestRule.stringResource(SettingsR.string.brand_android)
+    private val brand by composeTestRule.stringResource(SettingsR.string.feature_settings_brand_android)
-    private val ok by composeTestRule.stringResource(SettingsR.string.dismiss_dialog_button_text)
+    private val ok by composeTestRule.stringResource(SettingsR.string.feature_settings_dismiss_dialog_button_text)
 
     @Before
     fun setup() = hiltRule.inject()
@@ -166,7 +165,10 @@ class NavigationTest {
         composeTestRule.apply {
             // GIVEN the user is on any of the top level destinations, THEN the Up arrow is not shown.
             onNodeWithContentDescription(navigateUp).assertDoesNotExist()
-            // TODO: Add top level destinations here, see b/226357686.
+
+            onNodeWithText(saved).performClick()
+            onNodeWithContentDescription(navigateUp).assertDoesNotExist()
+
             onNodeWithText(interests).performClick()
             onNodeWithContentDescription(navigateUp).assertDoesNotExist()
         }
@@ -222,12 +224,7 @@ class NavigationTest {
             onNodeWithText(ok).performClick()
 
             // Check that the saved screen is still visible and selected.
-            onNode(
+            onNode(hasText(saved) and hasTestTag("NiaNavItem")).assertIsSelected()
-                hasText(saved) and
-                    hasAnyAncestor(
-                        hasTestTag("NiaBottomBar") or hasTestTag("NiaNavRail"),
-                    ),
-            ).assertIsSelected()
         }
     }
 
@@ -265,14 +262,16 @@ class NavigationTest {
     }
 
     @Test
-    fun navigationBar_multipleBackStackInterests() = runTest {
+    fun navigationBar_multipleBackStackInterests() {
         composeTestRule.apply {
             onNodeWithText(interests).performClick()
 
             // Select the last topic
-            val topic = topicsRepository.getTopics().first().sortedBy(Topic::name).last().name
+            val topic = runBlocking {
-            onNodeWithTag("interests:topics").performScrollToNode(hasText(topic))
+                topicsRepository.getTopics().first().sortedBy(Topic::name).last()
-            onNodeWithText(topic).performClick()
+            }
+            onNodeWithTag("interests:topics").performScrollToNode(hasText(topic.name))
+            onNodeWithText(topic.name).performClick()
 
             // Switch tab
             onNodeWithText(forYou).performClick()
@@ -280,8 +279,8 @@ class NavigationTest {
             // Come back to Interests
             onNodeWithText(interests).performClick()
 
-            // Verify we're not in the list of interests
+            // Verify the topic is still shown
-            onNodeWithTag("interests:topics").assertDoesNotExist()
+            onNodeWithTag("topic:${topic.id}").assertExists()
         }
     }
 }

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationUiTest.kt

@@ -1,268 +0,0 @@
-/*
- * Copyright 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.samples.apps.nowinandroid.ui
-
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowSizeClass
-import androidx.compose.ui.test.assertIsDisplayed
-import androidx.compose.ui.test.junit4.createAndroidComposeRule
-import androidx.compose.ui.test.onNodeWithTag
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.dp
-import com.google.accompanist.testharness.TestHarness
-import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepository
-import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
-import com.google.samples.apps.nowinandroid.core.rules.GrantPostNotificationsPermissionRule
-import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
-import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
-import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
-import dagger.hilt.android.testing.BindValue
-import dagger.hilt.android.testing.HiltAndroidRule
-import dagger.hilt.android.testing.HiltAndroidTest
-import org.junit.Before
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-import javax.inject.Inject
-
-/**
- * Tests that the navigation UI is rendered correctly on different screen sizes.
- */
-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
-@HiltAndroidTest
-class NavigationUiTest {
-
-    /**
-     * Manages the components' state and is used to perform injection on your test
-     */
-    @get:Rule(order = 0)
-    val hiltRule = HiltAndroidRule(this)
-
-    /**
-     * Create a temporary folder used to create a Data Store file. This guarantees that
-     * the file is removed in between each test, preventing a crash.
-     */
-    @BindValue
-    @get:Rule(order = 1)
-    val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()
-
-    /**
-     * Grant [android.Manifest.permission.POST_NOTIFICATIONS] permission.
-     */
-    @get:Rule(order = 2)
-    val postNotificationsPermission = GrantPostNotificationsPermissionRule()
-
-    /**
-     * Use a test activity to set the content on.
-     */
-    @get:Rule(order = 3)
-    val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()
-
-    val userNewsResourceRepository = CompositeUserNewsResourceRepository(
-        newsRepository = TestNewsRepository(),
-        userDataRepository = TestUserDataRepository(),
-    )
-
-    @Inject
-    lateinit var networkMonitor: NetworkMonitor
-
-    @Before
-    fun setup() {
-        hiltRule.inject()
-    }
-
-    @Test
-    fun compactWidth_compactHeight_showsNavigationBar() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(400.dp, 400.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()
-    }
-
-    @Test
-    fun mediumWidth_compactHeight_showsNavigationRail() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(610.dp, 400.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
-    }
-
-    @Test
-    fun expandedWidth_compactHeight_showsNavigationRail() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(900.dp, 400.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
-    }
-
-    @Test
-    fun compactWidth_mediumHeight_showsNavigationBar() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(400.dp, 500.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()
-    }
-
-    @Test
-    fun mediumWidth_mediumHeight_showsNavigationRail() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(610.dp, 500.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
-    }
-
-    @Test
-    fun expandedWidth_mediumHeight_showsNavigationRail() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(900.dp, 500.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
-    }
-
-    @Test
-    fun compactWidth_expandedHeight_showsNavigationBar() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(400.dp, 1000.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaNavRail").assertDoesNotExist()
-    }
-
-    @Test
-    fun mediumWidth_expandedHeight_showsNavigationRail() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(610.dp, 1000.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
-    }
-
-    @Test
-    fun expandedWidth_expandedHeight_showsNavigationRail() {
-        composeTestRule.setContent {
-            TestHarness(size = DpSize(900.dp, 1000.dp)) {
-                BoxWithConstraints {
-                    NiaApp(
-                        windowSizeClass = WindowSizeClass.calculateFromSize(
-                            DpSize(maxWidth, maxHeight),
-                        ),
-                        networkMonitor = networkMonitor,
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
-                }
-            }
-        }
-
-        composeTestRule.onNodeWithTag("NiaNavRail").assertIsDisplayed()
-        composeTestRule.onNodeWithTag("NiaBottomBar").assertDoesNotExist()
-    }
-}

app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppStateTest.kt

@@ -16,15 +16,11 @@
 
 package com.google.samples.apps.nowinandroid.ui
 
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.test.junit4.createComposeRule
-import androidx.compose.ui.unit.DpSize
-import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.ComposeNavigator
 import androidx.navigation.compose.composable
@@ -34,14 +30,15 @@ import com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNe
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestNewsRepository
 import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepository
 import com.google.samples.apps.nowinandroid.core.testing.util.TestNetworkMonitor
+import com.google.samples.apps.nowinandroid.core.testing.util.TestTimeZoneMonitor
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.test.UnconfinedTestDispatcher
 import kotlinx.coroutines.test.runTest
+import kotlinx.datetime.TimeZone
 import org.junit.Rule
 import org.junit.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
 /**
@@ -50,7 +47,6 @@ import kotlin.test.assertTrue
  * Note: This could become an unit test if Robolectric is added to the project and the Context
  * is faked.
  */
-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 class NiaAppStateTest {
 
     @get:Rule
@@ -59,6 +55,8 @@ class NiaAppStateTest {
     // Create the test dependencies.
     private val networkMonitor = TestNetworkMonitor()
 
+    private val timeZoneMonitor = TestTimeZoneMonitor()
+
     private val userNewsResourceRepository =
         CompositeUserNewsResourceRepository(TestNewsRepository(), TestUserDataRepository())
 
@@ -75,9 +73,9 @@ class NiaAppStateTest {
                 NiaAppState(
                     navController = navController,
                     coroutineScope = backgroundScope,
-                    windowSizeClass = getCompactWindowClass(),
                     networkMonitor = networkMonitor,
                     userNewsResourceRepository = userNewsResourceRepository,
+                    timeZoneMonitor = timeZoneMonitor,
                 )
             }
 
@@ -97,9 +95,9 @@ class NiaAppStateTest {
     fun niaAppState_destinations() = runTest {
         composeTestRule.setContent {
             state = rememberNiaAppState(
-                windowSizeClass = getCompactWindowClass(),
                 networkMonitor = networkMonitor,
                 userNewsResourceRepository = userNewsResourceRepository,
+                timeZoneMonitor = timeZoneMonitor,
             )
         }
 
@@ -110,80 +108,50 @@ class NiaAppStateTest {
     }
 
     @Test
-    fun niaAppState_showBottomBar_compact() = runTest {
+    fun niaAppState_whenNetworkMonitorIsOffline_StateIsOffline() = runTest(UnconfinedTestDispatcher()) {
         composeTestRule.setContent {
             state = NiaAppState(
                 navController = NavHostController(LocalContext.current),
                 coroutineScope = backgroundScope,
-                windowSizeClass = getCompactWindowClass(),
                 networkMonitor = networkMonitor,
                 userNewsResourceRepository = userNewsResourceRepository,
+                timeZoneMonitor = timeZoneMonitor,
             )
         }
 
-        assertTrue(state.shouldShowBottomBar)
+        backgroundScope.launch { state.isOffline.collect() }
-        assertFalse(state.shouldShowNavRail)
+        networkMonitor.setConnected(false)
-    }
+        assertEquals(
-
+            true,
-    @Test
+            state.isOffline.value,
-    fun niaAppState_showNavRail_medium() = runTest {
+        )
-        composeTestRule.setContent {
-            state = NiaAppState(
-                navController = NavHostController(LocalContext.current),
-                coroutineScope = backgroundScope,
-                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(800.dp, 800.dp)),
-                networkMonitor = networkMonitor,
-                userNewsResourceRepository = userNewsResourceRepository,
-            )
-        }
-
-        assertTrue(state.shouldShowNavRail)
-        assertFalse(state.shouldShowBottomBar)
-    }
-
-    @Test
-    fun niaAppState_showNavRail_large() = runTest {
-        composeTestRule.setContent {
-            state = NiaAppState(
-                navController = NavHostController(LocalContext.current),
-                coroutineScope = backgroundScope,
-                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
-                networkMonitor = networkMonitor,
-                userNewsResourceRepository = userNewsResourceRepository,
-            )
-        }
-
-        assertTrue(state.shouldShowNavRail)
-        assertFalse(state.shouldShowBottomBar)
     }
 
     @Test
-    fun stateIsOfflineWhenNetworkMonitorIsOffline() = runTest(UnconfinedTestDispatcher()) {
+    fun niaAppState_differentTZ_withTimeZoneMonitorChange() = runTest(UnconfinedTestDispatcher()) {
         composeTestRule.setContent {
             state = NiaAppState(
                 navController = NavHostController(LocalContext.current),
                 coroutineScope = backgroundScope,
-                windowSizeClass = WindowSizeClass.calculateFromSize(DpSize(900.dp, 1200.dp)),
                 networkMonitor = networkMonitor,
                 userNewsResourceRepository = userNewsResourceRepository,
+                timeZoneMonitor = timeZoneMonitor,
             )
         }
-
+        val changedTz = TimeZone.of("Europe/Prague")
-        backgroundScope.launch { state.isOffline.collect() }
+        backgroundScope.launch { state.currentTimeZone.collect() }
-        networkMonitor.setConnected(false)
+        timeZoneMonitor.setTimeZone(changedTz)
         assertEquals(
-            true,
+            changedTz,
-            state.isOffline.value,
+            state.currentTimeZone.value,
         )
     }
-
-    private fun getCompactWindowClass() = WindowSizeClass.calculateFromSize(DpSize(500.dp, 300.dp))
 }
 
 @Composable
 private fun rememberTestNavController(): TestNavHostController {
     val context = LocalContext.current
-    return remember<TestNavHostController> {
+    return remember {
         TestNavHostController(context).apply {
             navigatorProvider.addNavigator(ComposeNavigator())
             graph = createGraph(startDestination = "a") {

app/src/benchmark/res/values-night/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+        for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>

app/src/benchmark/res/values/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+        for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FF006780</color>
 </resources>

app/src/debug/res/values-night/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+    for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#FFFFFF</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>

app/src/debug/res/values/colors.xml

@@ -15,6 +15,8 @@
      limitations under the License.
 -->
 <resources>
+    <!-- Allow users to distinguish between build variants by having a different background color
+    for the launcher icon. See https://github.com/android/nowinandroid/pull/989. -->
     <color name="ic_launcher_background_tint">#000000</color>
     <color name="ic_launcher_foreground_tint">#FFA23F16</color>
 </resources>

app/src/main/kotlin/com/google/samples/apps/nowinandroid/MainActivity.kt

@@ -17,15 +17,13 @@
 package com.google.samples.apps.nowinandroid
 
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.SystemBarStyle
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.viewModels
 import androidx.compose.foundation.isSystemInDarkTheme
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
@@ -34,32 +32,31 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
 import androidx.metrics.performance.JankStats
-import androidx.profileinstaller.ProfileVerifier
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Loading
 import com.google.samples.apps.nowinandroid.MainActivityUiState.Success
 import com.google.samples.apps.nowinandroid.core.analytics.AnalyticsHelper
 import com.google.samples.apps.nowinandroid.core.analytics.LocalAnalyticsHelper
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 import com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig
 import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand
+import com.google.samples.apps.nowinandroid.core.ui.LocalTimeZone
 import com.google.samples.apps.nowinandroid.ui.NiaApp
+import com.google.samples.apps.nowinandroid.ui.rememberNiaAppState
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
-import kotlinx.coroutines.guava.await
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
 private const val TAG = "MainActivity"
 
-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
@@ -72,6 +69,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var networkMonitor: NetworkMonitor
 
+    @Inject
+    lateinit var timeZoneMonitor: TimeZoneMonitor
+
     @Inject
     lateinit var analyticsHelper: AnalyticsHelper
 
@@ -90,9 +90,7 @@ class MainActivity : ComponentActivity() {
         lifecycleScope.launch {
             lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 viewModel.uiState
-                    .onEach {
+                    .onEach { uiState = it }
-                        uiState = it
-                    }
                     .collect()
             }
         }
@@ -133,17 +131,25 @@ class MainActivity : ComponentActivity() {
                 onDispose {}
             }
 
-            CompositionLocalProvider(LocalAnalyticsHelper provides analyticsHelper) {
+            val appState = rememberNiaAppState(
+                networkMonitor = networkMonitor,
+                userNewsResourceRepository = userNewsResourceRepository,
+                timeZoneMonitor = timeZoneMonitor,
+            )
+
+            val currentTimeZone by appState.currentTimeZone.collectAsStateWithLifecycle()
+
+            CompositionLocalProvider(
+                LocalAnalyticsHelper provides analyticsHelper,
+                LocalTimeZone provides currentTimeZone,
+            ) {
                 NiaTheme(
                     darkTheme = darkTheme,
                     androidTheme = shouldUseAndroidTheme(uiState),
                     disableDynamicTheming = shouldDisableDynamicTheming(uiState),
                 ) {
-                    NiaApp(
+                    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
-                        networkMonitor = networkMonitor,
+                    NiaApp(appState)
-                        windowSizeClass = calculateWindowSizeClass(this),
-                        userNewsResourceRepository = userNewsResourceRepository,
-                    )
                 }
             }
         }
@@ -152,48 +158,12 @@ class MainActivity : ComponentActivity() {
     override fun onResume() {
         super.onResume()
         lazyStats.get().isTrackingEnabled = true
-        lifecycleScope.launch {
-            logCompilationStatus()
-        }
     }
 
     override fun onPause() {
         super.onPause()
         lazyStats.get().isTrackingEnabled = false
     }
-
-    /**
-     * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier].
-     */
-    private suspend fun logCompilationStatus() {
-        /*
-        When delivering through Google Play, the baseline profile is compiled during installation.
-        In this case you will see the correct state logged without any further action necessary.
-        To verify baseline profile installation locally, you need to manually trigger baseline
-        profile installation.
-        For immediate compilation, call:
-         `adb shell cmd package compile -f -m speed-profile com.example.macrobenchmark.target`
-        You can also trigger background optimizations:
-         `adb shell pm bg-dexopt-job`
-        Both jobs run asynchronously and might take some time complete.
-        To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`.
-        If you don't do either of these steps, you might only see the profile status reported as
-        "enqueued for compilation" when running the sample locally.
-        */
-        withContext(Dispatchers.IO) {
-            val status = ProfileVerifier.getCompilationStatusAsync().await()
-            Log.d(TAG, "ProfileInstaller status code: ${status.profileInstallResultCode}")
-            Log.d(
-                TAG,
-                when {
-                    status.isCompiledWithProfile -> "ProfileInstaller: is compiled with profile"
-                    status.hasProfileEnqueuedForCompilation() ->
-                        "ProfileInstaller: Enqueued for compilation"
-                    else -> "Profile not compiled or enqueued"
-                },
-            )
-        }
-    }
 }
 
 /**

app/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaApplication.kt

@@ -20,9 +20,9 @@ import android.app.Application
 import coil.ImageLoader
 import coil.ImageLoaderFactory
 import com.google.samples.apps.nowinandroid.sync.initializers.Sync
+import com.google.samples.apps.nowinandroid.util.ProfileVerifierLogger
 import dagger.hilt.android.HiltAndroidApp
 import javax.inject.Inject
-import javax.inject.Provider
 
 /**
  * [Application] class for NiA
@@ -30,12 +30,16 @@ import javax.inject.Provider
 @HiltAndroidApp
 class NiaApplication : Application(), ImageLoaderFactory {
     @Inject
-    lateinit var imageLoader: Provider<ImageLoader>
+    lateinit var imageLoader: dagger.Lazy<ImageLoader>
+
+    @Inject
+    lateinit var profileVerifierLogger: ProfileVerifierLogger
 
     override fun onCreate() {
         super.onCreate()
         // Initialize Sync; the system responsible for keeping data in the app up to date.
         Sync.initialize(context = this)
+        profileVerifierLogger()
     }
 
     override fun newImageLoader(): ImageLoader = imageLoader.get()

app/src/main/kotlin/com/google/samples/apps/nowinandroid/di/JankStatsModule.kt

@@ -20,6 +20,7 @@ import android.app.Activity
 import android.util.Log
 import android.view.Window
 import androidx.metrics.performance.JankStats
+import androidx.metrics.performance.JankStats.OnFrameListener
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -29,26 +30,20 @@ import dagger.hilt.android.components.ActivityComponent
 @InstallIn(ActivityComponent::class)
 object JankStatsModule {
     @Provides
-    fun providesOnFrameListener(): JankStats.OnFrameListener {
+    fun providesOnFrameListener(): OnFrameListener = OnFrameListener { frameData ->
-        return JankStats.OnFrameListener { frameData ->
+        // Make sure to only log janky frames.
-            // Make sure to only log janky frames.
+        if (frameData.isJank) {
-            if (frameData.isJank) {
+            // We're currently logging this but would better report it to a backend.
-                // We're currently logging this but would better report it to a backend.
+            Log.v("NiA Jank", frameData.toString())
-                Log.v("NiA Jank", frameData.toString())
-            }
         }
     }
 
     @Provides
-    fun providesWindow(activity: Activity): Window {
+    fun providesWindow(activity: Activity): Window = activity.window
-        return activity.window
-    }
 
     @Provides
     fun providesJankStats(
         window: Window,
-        frameListener: JankStats.OnFrameListener,
+        frameListener: OnFrameListener,
-    ): JankStats {
+    ): JankStats = JankStats.createAndTrack(window, frameListener)
-        return JankStats.createAndTrack(window, frameListener)
-    }
 }

app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt

@@ -20,14 +20,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.navigation.compose.NavHost
 import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouNavigationRoute
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouScreen
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsGraph
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
 import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
-import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTS
 import com.google.samples.apps.nowinandroid.ui.NiaAppState
+import com.google.samples.apps.nowinandroid.ui.interests2pane.interestsListDetailScreen
 
 /**
  * Top-level navigation graph. Navigation is organized as explained at
@@ -41,7 +40,7 @@ fun NiaNavHost(
     appState: NiaAppState,
     onShowSnackbar: suspend (String, String?) -> Boolean,
     modifier: Modifier = Modifier,
-    startDestination: String = forYouNavigationRoute,
+    startDestination: String = FOR_YOU_ROUTE,
 ) {
     val navController = appState.navController
     NavHost(
@@ -49,24 +48,16 @@ fun NiaNavHost(
         startDestination = startDestination,
         modifier = modifier,
     ) {
-        forYouScreen(onTopicClick = navController::navigateToTopic)
+        forYouScreen(onTopicClick = navController::navigateToInterests)
         bookmarksScreen(
-            onTopicClick = navController::navigateToTopic,
+            onTopicClick = navController::navigateToInterests,
             onShowSnackbar = onShowSnackbar,
         )
         searchScreen(
             onBackClick = navController::popBackStack,
             onInterestsClick = { appState.navigateToTopLevelDestination(INTERESTS) },
-            onTopicClick = navController::navigateToTopic,
+            onTopicClick = navController::navigateToInterests,
-        )
-        interestsGraph(
-            onTopicClick = navController::navigateToTopic,
-            nestedGraphs = {
-                topicScreen(
-                    onBackClick = navController::popBackStack,
-                    onTopicClick = navController::navigateToTopic,
-                )
-            },
         )
+        interestsListDetailScreen()
     }
 }

app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt

@@ -21,7 +21,7 @@ import com.google.samples.apps.nowinandroid.R
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
 import com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksR
 import com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR
-import com.google.samples.apps.nowinandroid.feature.interests.R as interestsR
+import com.google.samples.apps.nowinandroid.feature.search.R as searchR
 
 /**
  * Type for the top level destinations in the application. Each of these destinations
@@ -37,19 +37,19 @@ enum class TopLevelDestination(
     FOR_YOU(
         selectedIcon = NiaIcons.Upcoming,
         unselectedIcon = NiaIcons.UpcomingBorder,
-        iconTextId = forYouR.string.for_you,
+        iconTextId = forYouR.string.feature_foryou_title,
         titleTextId = R.string.app_name,
     ),
     BOOKMARKS(
         selectedIcon = NiaIcons.Bookmarks,
         unselectedIcon = NiaIcons.BookmarksBorder,
-        iconTextId = bookmarksR.string.saved,
+        iconTextId = bookmarksR.string.feature_bookmarks_title,
-        titleTextId = bookmarksR.string.saved,
+        titleTextId = bookmarksR.string.feature_bookmarks_title,
     ),
     INTERESTS(
         selectedIcon = NiaIcons.Grid3x3,
         unselectedIcon = NiaIcons.Grid3x3,
-        iconTextId = interestsR.string.interests,
+        iconTextId = searchR.string.feature_search_interests,
-        titleTextId = interestsR.string.interests,
+        titleTextId = searchR.string.feature_search_interests,
     ),
 }

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt

@@ -16,9 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.ui
 
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.consumeWindowInsets
@@ -26,7 +25,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawing
-import androidx.compose.foundation.layout.safeDrawingPadding
 import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@@ -39,7 +37,9 @@ import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.SnackbarResult.ActionPerformed
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.WindowAdaptiveInfo
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -62,14 +62,9 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavDestination
 import androidx.navigation.NavDestination.Companion.hierarchy
 import com.google.samples.apps.nowinandroid.R
-import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
-import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaBackground
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaGradientBackground
-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBar
+import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationSuiteScaffold
-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationBarItem
-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRail
-import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaNavigationRailItem
 import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopAppBar
 import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
 import com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColors
@@ -79,29 +74,18 @@ import com.google.samples.apps.nowinandroid.navigation.NiaNavHost
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
 import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR
 
-@OptIn(
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
-    ExperimentalMaterial3Api::class,
-    ExperimentalLayoutApi::class,
-    ExperimentalComposeUiApi::class,
-)
 @Composable
 fun NiaApp(
-    windowSizeClass: WindowSizeClass,
+    appState: NiaAppState,
-    networkMonitor: NetworkMonitor,
+    modifier: Modifier = Modifier,
-    userNewsResourceRepository: UserNewsResourceRepository,
+    windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),
-    appState: NiaAppState = rememberNiaAppState(
-        networkMonitor = networkMonitor,
-        windowSizeClass = windowSizeClass,
-        userNewsResourceRepository = userNewsResourceRepository,
-    ),
 ) {
     val shouldShowGradientBackground =
         appState.currentTopLevelDestination == TopLevelDestination.FOR_YOU
-    var showSettingsDialog by rememberSaveable {
+    var showSettingsDialog by rememberSaveable { mutableStateOf(false) }
-        mutableStateOf(false)
-    }
 
-    NiaBackground {
+    NiaBackground(modifier = modifier) {
         NiaGradientBackground(
             gradientColors = if (shouldShowGradientBackground) {
                 LocalGradientColors.current
@@ -124,162 +108,141 @@ fun NiaApp(
                 }
             }
 
-            if (showSettingsDialog) {
+            NiaApp(
-                SettingsDialog(
+                appState = appState,
-                    onDismiss = { showSettingsDialog = false },
+                snackbarHostState = snackbarHostState,
-                )
+                showSettingsDialog = showSettingsDialog,
-            }
+                onSettingsDismissed = { showSettingsDialog = false },
+                onTopAppBarActionClick = { showSettingsDialog = true },
+                windowAdaptiveInfo = windowAdaptiveInfo,
+            )
+        }
+    }
+}
+
+@Composable
+@OptIn(
+    ExperimentalMaterial3Api::class,
+    ExperimentalComposeUiApi::class,
+    ExperimentalMaterial3AdaptiveApi::class,
+)
+internal fun NiaApp(
+    appState: NiaAppState,
+    snackbarHostState: SnackbarHostState,
+    showSettingsDialog: Boolean,
+    onSettingsDismissed: () -> Unit,
+    onTopAppBarActionClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo(),
+) {
+    val unreadDestinations by appState.topLevelDestinationsWithUnreadResources
+        .collectAsStateWithLifecycle()
+    val currentDestination = appState.currentDestination
 
-            val unreadDestinations by appState.topLevelDestinationsWithUnreadResources.collectAsStateWithLifecycle()
+    if (showSettingsDialog) {
+        SettingsDialog(
+            onDismiss = { onSettingsDismissed() },
+        )
+    }
 
-            Scaffold(
+    NiaNavigationSuiteScaffold(
-                modifier = Modifier.semantics {
+        navigationSuiteItems = {
-                    testTagsAsResourceId = true
+            appState.topLevelDestinations.forEach { destination ->
-                },
+                val hasUnread = unreadDestinations.contains(destination)
-                containerColor = Color.Transparent,
+                val selected = currentDestination
-                contentColor = MaterialTheme.colorScheme.onBackground,
+                    .isTopLevelDestinationInHierarchy(destination)
-                contentWindowInsets = WindowInsets(0, 0, 0, 0),
+                item(
-                snackbarHost = { SnackbarHost(snackbarHostState) },
+                    selected = selected,
-                bottomBar = {
+                    onClick = { appState.navigateToTopLevelDestination(destination) },
-                    if (appState.shouldShowBottomBar) {
+                    icon = {
-                        NiaBottomBar(
+                        Icon(
-                            destinations = appState.topLevelDestinations,
+                            imageVector = destination.unselectedIcon,
-                            destinationsWithUnreadResources = unreadDestinations,
+                            contentDescription = null,
-                            onNavigateToDestination = appState::navigateToTopLevelDestination,
-                            currentDestination = appState.currentDestination,
-                            modifier = Modifier.testTag("NiaBottomBar"),
                         )
-                    }
+                    },
-                },
+                    selectedIcon = {
-            ) { padding ->
+                        Icon(
-                Row(
+                            imageVector = destination.selectedIcon,
+                            contentDescription = null,
+                        )
+                    },
+                    label = { Text(stringResource(destination.iconTextId)) },
+                    modifier =
                     Modifier
-                        .fillMaxSize()
+                        .testTag("NiaNavItem")
-                        .padding(padding)
+                        .then(if (hasUnread) Modifier.notificationDot() else Modifier),
-                        .consumeWindowInsets(padding)
+                )
-                        .windowInsetsPadding(
+            }
-                            WindowInsets.safeDrawing.only(
+        },
-                                WindowInsetsSides.Horizontal,
+        windowAdaptiveInfo = windowAdaptiveInfo,
-                            ),
+    ) {
+        Scaffold(
+            modifier = modifier.semantics {
+                testTagsAsResourceId = true
+            },
+            containerColor = Color.Transparent,
+            contentColor = MaterialTheme.colorScheme.onBackground,
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
+            snackbarHost = { SnackbarHost(snackbarHostState) },
+        ) { padding ->
+            Column(
+                Modifier
+                    .fillMaxSize()
+                    .padding(padding)
+                    .consumeWindowInsets(padding)
+                    .windowInsetsPadding(
+                        WindowInsets.safeDrawing.only(
+                            WindowInsetsSides.Horizontal,
                         ),
-                ) {
+                    ),
-                    if (appState.shouldShowNavRail) {
+            ) {
-                        NiaNavRail(
+                // Show the top app bar on top level destinations.
-                            destinations = appState.topLevelDestinations,
+                val destination = appState.currentTopLevelDestination
-                            destinationsWithUnreadResources = unreadDestinations,
+                val shouldShowTopAppBar = destination != null
-                            onNavigateToDestination = appState::navigateToTopLevelDestination,
+                if (destination != null) {
-                            currentDestination = appState.currentDestination,
+                    NiaTopAppBar(
-                            modifier = Modifier
+                        titleRes = destination.titleTextId,
-                                .testTag("NiaNavRail")
+                        navigationIcon = NiaIcons.Search,
-                                .safeDrawingPadding(),
+                        navigationIconContentDescription = stringResource(
-                        )
+                            id = settingsR.string.feature_settings_top_app_bar_navigation_icon_description,
-                    }
+                        ),
-
+                        actionIcon = NiaIcons.Settings,
-                    Column(Modifier.fillMaxSize()) {
+                        actionIconContentDescription = stringResource(
-                        // Show the top app bar on top level destinations.
+                            id = settingsR.string.feature_settings_top_app_bar_action_icon_description,
-                        val destination = appState.currentTopLevelDestination
+                        ),
-                        if (destination != null) {
+                        colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
-                            NiaTopAppBar(
+                            containerColor = Color.Transparent,
-                                titleRes = destination.titleTextId,
+                        ),
-                                navigationIcon = NiaIcons.Search,
+                        onActionClick = { onTopAppBarActionClick() },
-                                navigationIconContentDescription = stringResource(
+                        onNavigationClick = { appState.navigateToSearch() },
-                                    id = settingsR.string.top_app_bar_navigation_icon_description,
+                    )
-                                ),
+                }
-                                actionIcon = NiaIcons.Settings,
-                                actionIconContentDescription = stringResource(
-                                    id = settingsR.string.top_app_bar_action_icon_description,
-                                ),
-                                colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
-                                    containerColor = Color.Transparent,
-                                ),
-                                onActionClick = { showSettingsDialog = true },
-                                onNavigationClick = { appState.navigateToSearch() },
-                            )
-                        }
 
-                        NiaNavHost(appState = appState, onShowSnackbar = { message, action ->
+                Box(
+                    // Workaround for https://issuetracker.google.com/338478720
+                    modifier = Modifier.consumeWindowInsets(
+                        if (shouldShowTopAppBar) {
+                            WindowInsets.safeDrawing.only(WindowInsetsSides.Top)
+                        } else {
+                            WindowInsets(0, 0, 0, 0)
+                        },
+                    ),
+                ) {
+                    NiaNavHost(
+                        appState = appState,
+                        onShowSnackbar = { message, action ->
                             snackbarHostState.showSnackbar(
                                 message = message,
                                 actionLabel = action,
                                 duration = Short,
                             ) == ActionPerformed
-                        })
+                        },
-                    }
-
-                    // TODO: We may want to add padding or spacer when the snackbar is shown so that
-                    //  content doesn't display behind it.
-                }
-            }
-        }
-    }
-}
-
-@Composable
-private fun NiaNavRail(
-    destinations: List<TopLevelDestination>,
-    destinationsWithUnreadResources: Set<TopLevelDestination>,
-    onNavigateToDestination: (TopLevelDestination) -> Unit,
-    currentDestination: NavDestination?,
-    modifier: Modifier = Modifier,
-) {
-    NiaNavigationRail(modifier = modifier) {
-        destinations.forEach { destination ->
-            val selected = currentDestination.isTopLevelDestinationInHierarchy(destination)
-            val hasUnread = destinationsWithUnreadResources.contains(destination)
-            NiaNavigationRailItem(
-                selected = selected,
-                onClick = { onNavigateToDestination(destination) },
-                icon = {
-                    Icon(
-                        imageVector = destination.unselectedIcon,
-                        contentDescription = null,
                     )
-                },
+                }
-                selectedIcon = {
-                    Icon(
-                        imageVector = destination.selectedIcon,
-                        contentDescription = null,
-                    )
-                },
-                label = { Text(stringResource(destination.iconTextId)) },
-                modifier = if (hasUnread) Modifier.notificationDot() else Modifier,
-            )
-        }
-    }
-}
 
-@Composable
+                // TODO: We may want to add padding or spacer when the snackbar is shown so that
-private fun NiaBottomBar(
+                //  content doesn't display behind it.
-    destinations: List<TopLevelDestination>,
+            }
-    destinationsWithUnreadResources: Set<TopLevelDestination>,
-    onNavigateToDestination: (TopLevelDestination) -> Unit,
-    currentDestination: NavDestination?,
-    modifier: Modifier = Modifier,
-) {
-    NiaNavigationBar(
-        modifier = modifier,
-    ) {
-        destinations.forEach { destination ->
-            val hasUnread = destinationsWithUnreadResources.contains(destination)
-            val selected = currentDestination.isTopLevelDestinationInHierarchy(destination)
-            NiaNavigationBarItem(
-                selected = selected,
-                onClick = { onNavigateToDestination(destination) },
-                icon = {
-                    Icon(
-                        imageVector = destination.unselectedIcon,
-                        contentDescription = null,
-                    )
-                },
-                selectedIcon = {
-                    Icon(
-                        imageVector = destination.selectedIcon,
-                        contentDescription = null,
-                    )
-                },
-                label = { Text(stringResource(destination.iconTextId)) },
-                modifier = if (hasUnread) Modifier.notificationDot() else Modifier,
-            )
         }
     }
 }

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt

@@ -16,8 +16,6 @@
 
 package com.google.samples.apps.nowinandroid.ui
 
-import androidx.compose.material3.windowsizeclass.WindowSizeClass
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.remember
@@ -32,13 +30,14 @@ import androidx.navigation.navOptions
 import androidx.tracing.trace
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
 import com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank
-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksRoute
+import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BOOKMARKS_ROUTE
 import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks
-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouNavigationRoute
+import com.google.samples.apps.nowinandroid.feature.foryou.navigation.FOR_YOU_ROUTE
 import com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.interestsRoute
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTE
-import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterestsGraph
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests
 import com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearch
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination
 import com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.BOOKMARKS
@@ -50,12 +49,13 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.datetime.TimeZone
 
 @Composable
 fun rememberNiaAppState(
-    windowSizeClass: WindowSizeClass,
     networkMonitor: NetworkMonitor,
     userNewsResourceRepository: UserNewsResourceRepository,
+    timeZoneMonitor: TimeZoneMonitor,
     coroutineScope: CoroutineScope = rememberCoroutineScope(),
     navController: NavHostController = rememberNavController(),
 ): NiaAppState {
@@ -63,16 +63,16 @@ fun rememberNiaAppState(
     return remember(
         navController,
         coroutineScope,
-        windowSizeClass,
         networkMonitor,
         userNewsResourceRepository,
+        timeZoneMonitor,
     ) {
         NiaAppState(
-            navController,
+            navController = navController,
-            coroutineScope,
+            coroutineScope = coroutineScope,
-            windowSizeClass,
+            networkMonitor = networkMonitor,
-            networkMonitor,
+            userNewsResourceRepository = userNewsResourceRepository,
-            userNewsResourceRepository,
+            timeZoneMonitor = timeZoneMonitor,
         )
     }
 }
@@ -80,10 +80,10 @@ fun rememberNiaAppState(
 @Stable
 class NiaAppState(
     val navController: NavHostController,
-    val coroutineScope: CoroutineScope,
+    coroutineScope: CoroutineScope,
-    val windowSizeClass: WindowSizeClass,
     networkMonitor: NetworkMonitor,
     userNewsResourceRepository: UserNewsResourceRepository,
+    timeZoneMonitor: TimeZoneMonitor,
 ) {
     val currentDestination: NavDestination?
         @Composable get() = navController
@@ -91,18 +91,12 @@ class NiaAppState(
 
     val currentTopLevelDestination: TopLevelDestination?
         @Composable get() = when (currentDestination?.route) {
-            forYouNavigationRoute -> FOR_YOU
+            FOR_YOU_ROUTE -> FOR_YOU
-            bookmarksRoute -> BOOKMARKS
+            BOOKMARKS_ROUTE -> BOOKMARKS
-            interestsRoute -> INTERESTS
+            INTERESTS_ROUTE -> INTERESTS
             else -> null
         }
 
-    val shouldShowBottomBar: Boolean
-        get() = windowSizeClass.widthSizeClass == WindowWidthSizeClass.Compact
-
-    val shouldShowNavRail: Boolean
-        get() = !shouldShowBottomBar
-
     val isOffline = networkMonitor.isOnline
         .map(Boolean::not)
         .stateIn(
@@ -115,7 +109,7 @@ class NiaAppState(
      * Map of top level destinations to be used in the TopBar, BottomBar and NavRail. The key is the
      * route.
      */
-    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.values().asList()
+    val topLevelDestinations: List<TopLevelDestination> = TopLevelDestination.entries
 
     /**
      * The top level destinations that have unread news resources.
@@ -127,12 +121,20 @@ class NiaAppState(
                     FOR_YOU.takeIf { forYouNewsResources.any { !it.hasBeenViewed } },
                     BOOKMARKS.takeIf { bookmarkedNewsResources.any { !it.hasBeenViewed } },
                 )
-            }.stateIn(
+            }
+            .stateIn(
                 coroutineScope,
                 SharingStarted.WhileSubscribed(5_000),
                 initialValue = emptySet(),
             )
 
+    val currentTimeZone = timeZoneMonitor.currentTimeZone
+        .stateIn(
+            coroutineScope,
+            SharingStarted.WhileSubscribed(5_000),
+            TimeZone.currentSystemDefault(),
+        )
+
     /**
      * UI logic for navigating to a top level destination in the app. Top level destinations have
      * only one copy of the destination of the back stack, and save and restore state whenever you
@@ -159,14 +161,12 @@ class NiaAppState(
             when (topLevelDestination) {
                 FOR_YOU -> navController.navigateToForYou(topLevelNavOptions)
                 BOOKMARKS -> navController.navigateToBookmarks(topLevelNavOptions)
-                INTERESTS -> navController.navigateToInterestsGraph(topLevelNavOptions)
+                INTERESTS -> navController.navigateToInterests(null, topLevelNavOptions)
             }
         }
     }
 
-    fun navigateToSearch() {
+    fun navigateToSearch() = navController.navigateToSearch()
-        navController.navigateToSearch()
-    }
 }
 
 /**

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.ui.interests2pane
+
+import androidx.lifecycle.SavedStateHandle
+import androidx.lifecycle.ViewModel
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARG
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.StateFlow
+import javax.inject.Inject
+
+@HiltViewModel
+class Interests2PaneViewModel @Inject constructor(
+    private val savedStateHandle: SavedStateHandle,
+) : ViewModel() {
+    val selectedTopicId: StateFlow<String?> =
+        savedStateHandle.getStateFlow(TOPIC_ID_ARG, savedStateHandle[TOPIC_ID_ARG])
+
+    fun onTopicClick(topicId: String?) {
+        savedStateHandle[TOPIC_ID_ARG] = topicId
+    }
+}

app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt

@@ -0,0 +1,168 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.ui.interests2pane
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.layout.AnimatedPane
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
+import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
+import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
+import androidx.compose.material3.adaptive.layout.ThreePaneScaffoldDestinationItem
+import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
+import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.key
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.saveable.Saver
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.INTERESTS_ROUTE
+import com.google.samples.apps.nowinandroid.feature.interests.navigation.TOPIC_ID_ARG
+import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholder
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.TOPIC_ROUTE
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.createTopicRoute
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic
+import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen
+import java.util.UUID
+
+private const val DETAIL_PANE_NAVHOST_ROUTE = "detail_pane_route"
+
+fun NavGraphBuilder.interestsListDetailScreen() {
+    composable(
+        route = INTERESTS_ROUTE,
+        arguments = listOf(
+            navArgument(TOPIC_ID_ARG) {
+                type = NavType.StringType
+                defaultValue = null
+                nullable = true
+            },
+        ),
+    ) {
+        InterestsListDetailScreen()
+    }
+}
+
+@Composable
+internal fun InterestsListDetailScreen(
+    viewModel: Interests2PaneViewModel = hiltViewModel(),
+) {
+    val selectedTopicId by viewModel.selectedTopicId.collectAsStateWithLifecycle()
+    InterestsListDetailScreen(
+        selectedTopicId = selectedTopicId,
+        onTopicClick = viewModel::onTopicClick,
+    )
+}
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+@Composable
+internal fun InterestsListDetailScreen(
+    selectedTopicId: String?,
+    onTopicClick: (String) -> Unit,
+) {
+    val listDetailNavigator = rememberListDetailPaneScaffoldNavigator(
+        initialDestinationHistory = listOfNotNull(
+            ThreePaneScaffoldDestinationItem(ListDetailPaneScaffoldRole.List),
+            ThreePaneScaffoldDestinationItem<Nothing>(ListDetailPaneScaffoldRole.Detail).takeIf {
+                selectedTopicId != null
+            },
+        ),
+    )
+    BackHandler(listDetailNavigator.canNavigateBack()) {
+        listDetailNavigator.navigateBack()
+    }
+
+    var nestedNavHostStartDestination by remember {
+        mutableStateOf(selectedTopicId?.let(::createTopicRoute) ?: TOPIC_ROUTE)
+    }
+    var nestedNavKey by rememberSaveable(
+        stateSaver = Saver({ it.toString() }, UUID::fromString),
+    ) {
+        mutableStateOf(UUID.randomUUID())
+    }
+    val nestedNavController = key(nestedNavKey) {
+        rememberNavController()
+    }
+
+    fun onTopicClickShowDetailPane(topicId: String) {
+        onTopicClick(topicId)
+        if (listDetailNavigator.isDetailPaneVisible()) {
+            // If the detail pane was visible, then use the nestedNavController navigate call
+            // directly
+            nestedNavController.navigateToTopic(topicId) {
+                popUpTo(DETAIL_PANE_NAVHOST_ROUTE)
+            }
+        } else {
+            // Otherwise, recreate the NavHost entirely, and start at the new destination
+            nestedNavHostStartDestination = createTopicRoute(topicId)
+            nestedNavKey = UUID.randomUUID()
+        }
+        listDetailNavigator.navigateTo(ListDetailPaneScaffoldRole.Detail)
+    }
+
+    ListDetailPaneScaffold(
+        value = listDetailNavigator.scaffoldValue,
+        directive = listDetailNavigator.scaffoldDirective,
+        listPane = {
+            AnimatedPane {
+                InterestsRoute(
+                    onTopicClick = ::onTopicClickShowDetailPane,
+                    highlightSelectedTopic = listDetailNavigator.isDetailPaneVisible(),
+                )
+            }
+        },
+        detailPane = {
+            AnimatedPane {
+                key(nestedNavKey) {
+                    NavHost(
+                        navController = nestedNavController,
+                        startDestination = nestedNavHostStartDestination,
+                        route = DETAIL_PANE_NAVHOST_ROUTE,
+                    ) {
+                        topicScreen(
+                            showBackButton = !listDetailNavigator.isListPaneVisible(),
+                            onBackClick = listDetailNavigator::navigateBack,
+                            onTopicClick = ::onTopicClickShowDetailPane,
+                        )
+                        composable(route = TOPIC_ROUTE) {
+                            TopicDetailPlaceholder()
+                        }
+                    }
+                }
+            }
+        },
+    )
+}
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+private fun <T> ThreePaneScaffoldNavigator<T>.isListPaneVisible(): Boolean =
+    scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
+
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+private fun <T> ThreePaneScaffoldNavigator<T>.isDetailPaneVisible(): Boolean =
+    scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded

app/src/main/kotlin/com/google/samples/apps/nowinandroid/util/ProfileVerifierLogger.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.util
+
+import android.util.Log
+import androidx.profileinstaller.ProfileVerifier
+import com.google.samples.apps.nowinandroid.core.network.di.ApplicationScope
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.guava.await
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+/**
+ * Logs the app's Baseline Profile Compilation Status using [ProfileVerifier].
+ *
+ * When delivering through Google Play, the baseline profile is compiled during installation.
+ * In this case you will see the correct state logged without any further action necessary.
+ * To verify baseline profile installation locally, you need to manually trigger baseline
+ * profile installation.
+ *
+ * For immediate compilation, call:
+ * ```bash
+ * adb shell cmd package compile -f -m speed-profile com.example.macrobenchmark.target
+ * ```
+ * You can also trigger background optimizations:
+ * ```bash
+ * adb shell pm bg-dexopt-job
+ * ```
+ * Both jobs run asynchronously and might take some time complete.
+ *
+ * To see quick turnaround of the ProfileVerifier, we recommend using `speed-profile`.
+ * If you don't do either of these steps, you might only see the profile status reported as
+ * "enqueued for compilation" when running the sample locally.
+ *
+ * @see androidx.profileinstaller.ProfileVerifier.CompilationStatus.ResultCode
+ */
+class ProfileVerifierLogger @Inject constructor(
+    @ApplicationScope private val scope: CoroutineScope,
+) {
+    companion object {
+        private const val TAG = "ProfileInstaller"
+    }
+
+    operator fun invoke() = scope.launch {
+        val status = ProfileVerifier.getCompilationStatusAsync().await()
+        Log.d(TAG, "Status code: ${status.profileInstallResultCode}")
+        Log.d(
+            TAG,
+            when {
+                status.isCompiledWithProfile -> "App compiled with profile"
+                status.hasProfileEnqueuedForCompilation() -> "Profile enqueued for compilation"
+                else -> "Profile not compiled nor enqueued"
+            },
+        )
+    }
+}

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -20,10 +20,10 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:pathData="M65.08,84.13C64.01,84.13 63.13,83.26 63.13,82.18C63.13,81.11 64,80.24 65.08,80.24C66.15,80.24 67.02,81.11 67.02,82.18C67.02,83.26 66.15,84.13 65.08,84.13ZM43.6,84.13C42.53,84.13 41.65,83.26 41.65,82.18C41.65,81.11 42.52,80.24 43.6,80.24C44.66,80.24 45.54,81.11 45.54,82.18C45.54,83.26 44.67,84.13 43.6,84.13ZM65.77,72.44L69.66,65.73C69.88,65.35 69.74,64.85 69.36,64.63C68.97,64.41 68.48,64.54 68.25,64.93L64.32,71.73C61.31,70.36 57.94,69.59 54.33,69.59C50.73,69.59 47.35,70.36 44.34,71.73L40.41,64.93C40.19,64.54 39.69,64.41 39.31,64.63C38.92,64.85 38.79,65.35 39.01,65.73L42.89,72.44C36.22,76.07 31.67,82.81 31,90.77H77.67C77,82.8 72.44,76.06 65.77,72.44Z"
+      android:pathData="M65.08,84.13a1.94,1.94 0,1 1,-0.01 -3.9,1.94 1.94,0 0,1 0.01,3.9ZM43.6,84.13a1.94,1.94 0,1 1,-0.01 -3.9,1.94 1.94,0 0,1 0.01,3.9ZM65.77,72.44 L69.66,65.73a0.81,0.81 0,0 0,-0.3 -1.1,0.82 0.82,0 0,0 -1.11,0.3l-3.93,6.8a24,24 0,0 0,-9.99 -2.14c-3.6,0 -6.98,0.77 -9.99,2.14l-3.93,-6.8a0.8,0.8 0,1 0,-1.4 0.8l3.88,6.71A22.91,22.91 0,0 0,31 90.77h46.67a22.9,22.9 0,0 0,-11.9 -18.33Z"
       android:fillColor="@color/ic_launcher_foreground_tint"/>
   <path
-      android:pathData="M46.57,35H46.57C46.1,35 45.72,35.38 45.72,35.85L45.72,43.15H44.19C43.35,43.15 42.67,43.83 42.67,44.68C42.67,45.52 43.35,46.2 44.19,46.2H45.72V43.15H47.42C48.17,43.15 48.78,42.54 48.78,41.79L48.78,37.72H49.97C50.43,37.72 50.81,37.34 50.81,36.87V35.85C50.81,35.38 50.43,35 49.97,35H47.42H46.57ZM46.57,54.35H46.57H47.42H49.97C50.43,54.35 50.81,53.97 50.81,53.5V52.48C50.81,52.02 50.43,51.64 49.97,51.64H48.78L48.78,47.56C48.78,46.81 48.17,46.2 47.42,46.2H45.72L45.72,53.5C45.72,53.97 46.1,54.35 46.57,54.35ZM61.54,35H61.54C62.01,35 62.39,35.38 62.39,35.85V43.15H63.92C64.76,43.15 65.44,43.83 65.44,44.68C65.44,45.52 64.76,46.2 63.92,46.2H62.39V43.15H60.69C59.94,43.15 59.33,42.54 59.33,41.79V37.72H58.15C57.68,37.72 57.3,37.34 57.3,36.87V35.85C57.3,35.38 57.68,35 58.15,35H60.69H61.54ZM61.54,54.35H61.54H60.69H58.15C57.68,54.35 57.3,53.97 57.3,53.5V52.48C57.3,52.02 57.68,51.64 58.15,51.64H59.33V47.56C59.33,46.81 59.94,46.2 60.69,46.2H62.39V53.5C62.39,53.97 62.01,54.35 61.54,54.35Z"
+      android:pathData="M46.57,35a0.85,0.85 0,0 0,-0.85 0.85v7.3h-1.53a1.52,1.52 0,0 0,0 3.05h1.53v-3.05h1.7c0.75,0 1.36,-0.61 1.36,-1.36v-4.07h1.19c0.46,0 0.84,-0.38 0.84,-0.85v-1.02a0.85,0.85 0,0 0,-0.84 -0.85h-3.4ZM46.57,54.35h3.4c0.46,0 0.84,-0.38 0.84,-0.85v-1.02a0.85,0.85 0,0 0,-0.84 -0.84h-1.19v-4.08c0,-0.75 -0.61,-1.36 -1.36,-1.36h-1.7v7.3c0,0.47 0.38,0.85 0.85,0.85ZM61.54,35c0.47,0 0.85,0.38 0.85,0.85v7.3h1.53a1.52,1.52 0,0 1,0 3.05h-1.53v-3.05h-1.7c-0.75,0 -1.36,-0.61 -1.36,-1.36v-4.07h-1.18a0.85,0.85 0,0 1,-0.85 -0.85v-1.02c0,-0.47 0.38,-0.85 0.85,-0.85h3.39ZM61.54,54.35h-3.39a0.85,0.85 0,0 1,-0.85 -0.85v-1.02c0,-0.46 0.38,-0.84 0.85,-0.84h1.18v-4.08c0,-0.75 0.61,-1.36 1.36,-1.36h1.7v7.3c0,0.47 -0.38,0.85 -0.85,0.85Z"
       android:fillColor="@color/ic_launcher_foreground_tint"
       android:fillType="evenOdd"/>
 </vector>

app/src/main/res/drawable/ic_splash.xml

@@ -24,11 +24,11 @@
         android:pathData="M0,0h108v108h-108z"
         android:fillColor="@color/ic_launcher_background_tint"/>
     <path
-        android:pathData="M65.08,84.13C64.01,84.13 63.13,83.26 63.13,82.18C63.13,81.11 64,80.24 65.08,80.24C66.15,80.24 67.02,81.11 67.02,82.18C67.02,83.26 66.15,84.13 65.08,84.13ZM43.6,84.13C42.53,84.13 41.65,83.26 41.65,82.18C41.65,81.11 42.52,80.24 43.6,80.24C44.66,80.24 45.54,81.11 45.54,82.18C45.54,83.26 44.67,84.13 43.6,84.13ZM65.77,72.44L69.66,65.73C69.88,65.35 69.74,64.85 69.36,64.63C68.97,64.41 68.48,64.54 68.25,64.93L64.32,71.73C61.31,70.36 57.94,69.59 54.33,69.59C50.73,69.59 47.35,70.36 44.34,71.73L40.41,64.93C40.19,64.54 39.69,64.41 39.31,64.63C38.92,64.85 38.79,65.35 39.01,65.73L42.89,72.44C36.22,76.07 31.67,82.81 31,90.77H77.67C77,82.8 72.44,76.06 65.77,72.44Z"
+        android:pathData="M65.08,84.13a1.94,1.94 0,1 1,-0.01 -3.9,1.94 1.94,0 0,1 0.01,3.9ZM43.6,84.13a1.94,1.94 0,1 1,-0.01 -3.9,1.94 1.94,0 0,1 0.01,3.9ZM65.77,72.44 L69.66,65.73a0.81,0.81 0,0 0,-0.3 -1.1,0.82 0.82,0 0,0 -1.11,0.3l-3.93,6.8a24,24 0,0 0,-9.99 -2.14c-3.6,0 -6.98,0.77 -9.99,2.14l-3.93,-6.8a0.8,0.8 0,1 0,-1.4 0.8l3.88,6.71A22.91,22.91 0,0 0,31 90.77h46.67a22.9,22.9 0,0 0,-11.9 -18.33Z"
         android:fillColor="@color/ic_launcher_foreground_tint"/>
     <path
-        android:pathData="M46.57,35H46.57C46.1,35 45.72,35.38 45.72,35.85L45.72,43.15H44.19C43.35,43.15 42.67,43.83 42.67,44.68C42.67,45.52 43.35,46.2 44.19,46.2H45.72V43.15H47.42C48.17,43.15 48.78,42.54 48.78,41.79L48.78,37.72H49.97C50.43,37.72 50.81,37.34 50.81,36.87V35.85C50.81,35.38 50.43,35 49.97,35H47.42H46.57ZM46.57,54.35H46.57H47.42H49.97C50.43,54.35 50.81,53.97 50.81,53.5V52.48C50.81,52.02 50.43,51.64 49.97,51.64H48.78L48.78,47.56C48.78,46.81 48.17,46.2 47.42,46.2H45.72L45.72,53.5C45.72,53.97 46.1,54.35 46.57,54.35ZM61.54,35H61.54C62.01,35 62.39,35.38 62.39,35.85V43.15H63.92C64.76,43.15 65.44,43.83 65.44,44.68C65.44,45.52 64.76,46.2 63.92,46.2H62.39V43.15H60.69C59.94,43.15 59.33,42.54 59.33,41.79V37.72H58.15C57.68,37.72 57.3,37.34 57.3,36.87V35.85C57.3,35.38 57.68,35 58.15,35H60.69H61.54ZM61.54,54.35H61.54H60.69H58.15C57.68,54.35 57.3,53.97 57.3,53.5V52.48C57.3,52.02 57.68,51.64 58.15,51.64H59.33V47.56C59.33,46.81 59.94,46.2 60.69,46.2H62.39V53.5C62.39,53.97 62.01,54.35 61.54,54.35Z"
+        android:pathData="M46.57,35a0.85,0.85 0,0 0,-0.85 0.85v7.3h-1.53a1.52,1.52 0,0 0,0 3.05h1.53v-3.05h1.7c0.75,0 1.36,-0.61 1.36,-1.36v-4.07h1.19c0.46,0 0.84,-0.38 0.84,-0.85v-1.02a0.85,0.85 0,0 0,-0.84 -0.85h-3.4ZM46.57,54.35h3.4c0.46,0 0.84,-0.38 0.84,-0.85v-1.02a0.85,0.85 0,0 0,-0.84 -0.84h-1.19v-4.08c0,-0.75 -0.61,-1.36 -1.36,-1.36h-1.7v7.3c0,0.47 0.38,0.85 0.85,0.85ZM61.54,35c0.47,0 0.85,0.38 0.85,0.85v7.3h1.53a1.52,1.52 0,0 1,0 3.05h-1.53v-3.05h-1.7c-0.75,0 -1.36,-0.61 -1.36,-1.36v-4.07h-1.18a0.85,0.85 0,0 1,-0.85 -0.85v-1.02c0,-0.47 0.38,-0.85 0.85,-0.85h3.39ZM61.54,54.35h-3.39a0.85,0.85 0,0 1,-0.85 -0.85v-1.02c0,-0.46 0.38,-0.84 0.85,-0.84h1.18v-4.08c0,-0.75 0.61,-1.36 1.36,-1.36h1.7v7.3c0,0.47 -0.38,0.85 -0.85,0.85Z"
         android:fillColor="@color/ic_launcher_foreground_tint"
         android:fillType="evenOdd"/>
 
-</vector>
+</vector>

app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/DeviceConfigurationOverrideWindowInsets.kt

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2024 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.ui
+
+import android.view.WindowInsets
+import android.widget.FrameLayout
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.test.DeviceConfigurationOverride
+import androidx.compose.ui.viewinterop.AndroidView
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.children
+
+/**
+ * A [DeviceConfigurationOverride] that allows overriding the [windowInsets] available
+ * to the content under test.
+ */
+@Suppress("ktlint:standard:function-naming")
+fun DeviceConfigurationOverride.Companion.WindowInsets(
+    windowInsets: WindowInsetsCompat,
+): DeviceConfigurationOverride = DeviceConfigurationOverride { contentUnderTest ->
+    val currentContentUnderTest by rememberUpdatedState(contentUnderTest)
+    val currentWindowInsets by rememberUpdatedState(windowInsets)
+    AndroidView(
+        factory = { context ->
+            object : FrameLayout(context) {
+                override fun dispatchApplyWindowInsets(insets: WindowInsets): WindowInsets {
+                    children.forEach {
+                        it.dispatchApplyWindowInsets(currentWindowInsets.toWindowInsets())
+                    }
+                    return WindowInsetsCompat.CONSUMED.toWindowInsets()!!
+                }
+
+                /**
+                 * Deprecated, but intercept the `requestApplyInsets` call via the deprecated
+                 * method.
+                 */
+                @Deprecated("Deprecated in Java")
+                override fun requestFitSystemWindows() {
+                    dispatchApplyWindowInsets(currentWindowInsets.toWindowInsets()!!)
+                }
+            }.apply {
+                addView(
+                    ComposeView(context).apply {
+                        setContent {
+                            currentContentUnderTest()
+                        }
+                    },
+                )
+            }
+        },
+    )
+}

app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppScreenSizesScreenshotTests.kt

@@ -16,27 +16,26 @@
 
 package com.google.samples.apps.nowinandroid.ui
 
-import android.util.Log
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.material3.adaptive.Posture
-import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.adaptive.WindowAdaptiveInfo
-import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.test.DeviceConfigurationOverride
+import androidx.compose.ui.test.ForcedSize
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onRoot
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import androidx.test.platform.app.InstrumentationRegistry
+import androidx.window.core.layout.WindowSizeClass
-import androidx.work.Configuration
-import androidx.work.testing.SynchronousExecutor
-import androidx.work.testing.WorkManagerTestInitHelper
 import com.github.takahirom.roborazzi.captureRoboImage
-import com.google.accompanist.testharness.TestHarness
 import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepository
 import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
 import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
 import com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptions
 import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
 import dagger.hilt.android.testing.BindValue
@@ -60,12 +59,11 @@ import javax.inject.Inject
 /**
  * Tests that the navigation UI is rendered correctly on different screen sizes.
  */
-@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
 @RunWith(RobolectricTestRunner::class)
 @GraphicsMode(GraphicsMode.Mode.NATIVE)
 // Configure Robolectric to use a very large screen size that can fit all of the test sizes.
 // This allows enough room to render the content under test without clipping or scaling.
-@Config(application = HiltTestApplication::class, qualifiers = "w1000dp-h1000dp-480dpi", sdk = [33])
+@Config(application = HiltTestApplication::class, qualifiers = "w1000dp-h1000dp-480dpi")
 @LooperMode(LooperMode.Mode.PAUSED)
 @HiltAndroidTest
 class NiaAppScreenSizesScreenshotTests {
@@ -93,6 +91,9 @@ class NiaAppScreenSizesScreenshotTests {
     @Inject
     lateinit var networkMonitor: NetworkMonitor
 
+    @Inject
+    lateinit var timeZoneMonitor: TimeZoneMonitor
+
     @Inject
     lateinit var userDataRepository: UserDataRepository
 
@@ -104,17 +105,6 @@ class NiaAppScreenSizesScreenshotTests {
 
     @Before
     fun setup() {
-        val config = Configuration.Builder()
-            .setMinimumLoggingLevel(Log.DEBUG)
-            .setExecutor(SynchronousExecutor())
-            .build()
-
-        // Initialize WorkManager for instrumentation tests.
-        WorkManagerTestInitHelper.initializeTestWorkManager(
-            InstrumentationRegistry.getInstrumentation().context,
-            config,
-        )
-
         hiltRule.inject()
 
         // Configure user data
@@ -133,19 +123,30 @@ class NiaAppScreenSizesScreenshotTests {
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
     }
 
+    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
     private fun testNiaAppScreenshotWithSize(width: Dp, height: Dp, screenshotName: String) {
         composeTestRule.setContent {
             CompositionLocalProvider(
                 LocalInspectionMode provides true,
             ) {
-                TestHarness(size = DpSize(width, height)) {
+                DeviceConfigurationOverride(
-                    BoxWithConstraints {
+                    override = DeviceConfigurationOverride.ForcedSize(DpSize(width, height)),
-                        NiaApp(
+                ) {
-                            windowSizeClass = WindowSizeClass.calculateFromSize(
+                    NiaTheme {
-                                DpSize(maxWidth, maxHeight),
+                        val fakeAppState = rememberNiaAppState(
-                            ),
                             networkMonitor = networkMonitor,
                             userNewsResourceRepository = userNewsResourceRepository,
+                            timeZoneMonitor = timeZoneMonitor,
+                        )
+                        NiaApp(
+                            fakeAppState,
+                            windowAdaptiveInfo = WindowAdaptiveInfo(
+                                windowSizeClass = WindowSizeClass.compute(
+                                    width.value,
+                                    height.value,
+                                ),
+                                windowPosture = Posture(),
+                            ),
                         )
                     }
                 }
@@ -169,20 +170,20 @@ class NiaAppScreenSizesScreenshotTests {
     }
 
     @Test
-    fun mediumWidth_compactHeight_showsNavigationRail() {
+    fun mediumWidth_compactHeight_showsNavigationBar() {
         testNiaAppScreenshotWithSize(
             610.dp,
             400.dp,
-            "mediumWidth_compactHeight_showsNavigationRail",
+            "mediumWidth_compactHeight_showsNavigationBar",
         )
     }
 
     @Test
-    fun expandedWidth_compactHeight_showsNavigationRail() {
+    fun expandedWidth_compactHeight_showsNavigationBar() {
         testNiaAppScreenshotWithSize(
             900.dp,
             400.dp,
-            "expandedWidth_compactHeight_showsNavigationRail",
+            "expandedWidth_compactHeight_showsNavigationBar",
         )
     }
 

app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarInsetsScreenshotTests.kt

@@ -0,0 +1,349 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.ui
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
+import androidx.compose.foundation.layout.safeDrawing
+import androidx.compose.foundation.layout.windowInsetsBottomHeight
+import androidx.compose.foundation.layout.windowInsetsEndWidth
+import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.layout.windowInsetsStartWidth
+import androidx.compose.foundation.layout.windowInsetsTopHeight
+import androidx.compose.material3.SnackbarDuration.Indefinite
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.Posture
+import androidx.compose.material3.adaptive.WindowAdaptiveInfo
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.toAndroidRect
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.test.DeviceConfigurationOverride
+import androidx.compose.ui.test.ForcedSize
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onNodeWithTag
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpRect
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.roundToIntRect
+import androidx.core.graphics.Insets
+import androidx.core.view.WindowInsetsCompat
+import androidx.window.core.layout.WindowSizeClass
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
+import com.google.samples.apps.nowinandroid.core.data.test.repository.FakeUserDataRepository
+import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
+import com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptions
+import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
+import dagger.hilt.android.testing.BindValue
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.HiltTestApplication
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import org.robolectric.annotation.LooperMode
+import java.util.TimeZone
+import javax.inject.Inject
+
+/**
+ * Tests that the Snackbar is correctly displayed on different screen sizes.
+ */
+@RunWith(RobolectricTestRunner::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+// Configure Robolectric to use a very large screen size that can fit all of the test sizes.
+// This allows enough room to render the content under test without clipping or scaling.
+@Config(application = HiltTestApplication::class, qualifiers = "w1000dp-h1000dp-480dpi")
+@LooperMode(LooperMode.Mode.PAUSED)
+@HiltAndroidTest
+class SnackbarInsetsScreenshotTests {
+
+    /**
+     * Manages the components' state and is used to perform injection on your test
+     */
+    @get:Rule(order = 0)
+    val hiltRule = HiltAndroidRule(this)
+
+    /**
+     * Create a temporary folder used to create a Data Store file. This guarantees that
+     * the file is removed in between each test, preventing a crash.
+     */
+    @BindValue
+    @get:Rule(order = 1)
+    val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()
+
+    /**
+     * Use a test activity to set the content on.
+     */
+    @get:Rule(order = 2)
+    val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()
+
+    @Inject
+    lateinit var networkMonitor: NetworkMonitor
+
+    @Inject
+    lateinit var timeZoneMonitor: TimeZoneMonitor
+
+    @Inject
+    lateinit var userDataRepository: FakeUserDataRepository
+
+    @Inject
+    lateinit var topicsRepository: TopicsRepository
+
+    @Inject
+    lateinit var userNewsResourceRepository: UserNewsResourceRepository
+
+    @Before
+    fun setup() {
+        hiltRule.inject()
+
+        // Configure user data
+        runBlocking {
+            userDataRepository.setShouldHideOnboarding(true)
+
+            userDataRepository.setFollowedTopicIds(
+                setOf(topicsRepository.getTopics().first().first().id),
+            )
+        }
+    }
+
+    @Before
+    fun setTimeZone() {
+        // Make time zone deterministic in tests
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
+    }
+
+    @Test
+    fun phone_noSnackbar() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            400.dp,
+            500.dp,
+            "insets_snackbar_compact_medium_noSnackbar",
+            action = { },
+        )
+    }
+
+    @Test
+    fun snackbarShown_phone() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            400.dp,
+            500.dp,
+            "insets_snackbar_compact_medium",
+        ) {
+            snackbarHostState.showSnackbar(
+                "This is a test snackbar message",
+                actionLabel = "Action Label",
+                duration = Indefinite,
+            )
+        }
+    }
+
+    @Test
+    fun snackbarShown_foldable() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            600.dp,
+            600.dp,
+            "insets_snackbar_medium_medium",
+        ) {
+            snackbarHostState.showSnackbar(
+                "This is a test snackbar message",
+                actionLabel = "Action Label",
+                duration = Indefinite,
+            )
+        }
+    }
+
+    @Test
+    fun snackbarShown_tablet() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            900.dp,
+            900.dp,
+            "insets_snackbar_expanded_expanded",
+        ) {
+            snackbarHostState.showSnackbar(
+                "This is a test snackbar message",
+                actionLabel = "Action Label",
+                duration = Indefinite,
+            )
+        }
+    }
+
+    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
+    private fun testSnackbarScreenshotWithSize(
+        snackbarHostState: SnackbarHostState,
+        width: Dp,
+        height: Dp,
+        screenshotName: String,
+        action: suspend () -> Unit,
+    ) {
+        lateinit var scope: CoroutineScope
+        composeTestRule.setContent {
+            CompositionLocalProvider(
+                // Replaces images with placeholders
+                LocalInspectionMode provides true,
+            ) {
+                scope = rememberCoroutineScope()
+
+                DeviceConfigurationOverride(
+                    DeviceConfigurationOverride.ForcedSize(DpSize(width, height)),
+                ) {
+                    DeviceConfigurationOverride(
+                        DeviceConfigurationOverride.WindowInsets(
+                            WindowInsetsCompat.Builder()
+                                .setInsets(
+                                    WindowInsetsCompat.Type.statusBars(),
+                                    DpRect(
+                                        left = 0.dp,
+                                        top = 64.dp,
+                                        right = 0.dp,
+                                        bottom = 0.dp,
+                                    ).toInsets(),
+                                )
+                                .setInsets(
+                                    WindowInsetsCompat.Type.navigationBars(),
+                                    DpRect(
+                                        left = 64.dp,
+                                        top = 0.dp,
+                                        right = 64.dp,
+                                        bottom = 64.dp,
+                                    ).toInsets(),
+                                )
+                                .build(),
+                        ),
+                    ) {
+                        BoxWithConstraints(Modifier.testTag("root")) {
+                            NiaTheme {
+                                val appState = rememberNiaAppState(
+                                    networkMonitor = networkMonitor,
+                                    userNewsResourceRepository = userNewsResourceRepository,
+                                    timeZoneMonitor = timeZoneMonitor,
+                                )
+                                NiaApp(
+                                    appState = appState,
+                                    snackbarHostState = snackbarHostState,
+                                    showSettingsDialog = false,
+                                    onSettingsDismissed = {},
+                                    onTopAppBarActionClick = {},
+                                    windowAdaptiveInfo = WindowAdaptiveInfo(
+                                        windowSizeClass = WindowSizeClass.compute(
+                                            maxWidth.value,
+                                            maxHeight.value,
+                                        ),
+                                        windowPosture = Posture(),
+                                    ),
+                                )
+                                DebugVisibleWindowInsets()
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        scope.launch {
+            action()
+        }
+
+        composeTestRule.onNodeWithTag("root")
+            .captureRoboImage(
+                "src/testDemo/screenshots/$screenshotName.png",
+                roborazziOptions = DefaultRoborazziOptions,
+            )
+    }
+}
+
+@Composable
+fun DebugVisibleWindowInsets(
+    modifier: Modifier = Modifier,
+    debugColor: Color = Color.Magenta.copy(alpha = 0.5f),
+) {
+    Box(modifier = modifier.fillMaxSize()) {
+        Spacer(
+            modifier = Modifier
+                .align(Alignment.CenterStart)
+                .fillMaxHeight()
+                .windowInsetsStartWidth(WindowInsets.safeDrawing)
+                .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Vertical))
+                .background(debugColor),
+        )
+        Spacer(
+            modifier = Modifier
+                .align(Alignment.CenterEnd)
+                .fillMaxHeight()
+                .windowInsetsEndWidth(WindowInsets.safeDrawing)
+                .windowInsetsPadding(WindowInsets.safeDrawing.only(WindowInsetsSides.Vertical))
+                .background(debugColor),
+        )
+        Spacer(
+            modifier = Modifier
+                .align(Alignment.TopCenter)
+                .fillMaxWidth()
+                .windowInsetsTopHeight(WindowInsets.safeDrawing)
+                .background(debugColor),
+        )
+        Spacer(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .fillMaxWidth()
+                .windowInsetsBottomHeight(WindowInsets.safeDrawing)
+                .background(debugColor),
+        )
+    }
+}
+
+@Composable
+private fun DpRect.toInsets() = toInsets(LocalDensity.current)
+
+private fun DpRect.toInsets(density: Density) =
+    Insets.of(with(density) { toRect() }.roundToIntRect().toAndroidRect())

app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/SnackbarScreenshotTests.kt

@@ -0,0 +1,251 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.ui
+
+import androidx.compose.foundation.layout.BoxWithConstraints
+import androidx.compose.material3.SnackbarDuration.Indefinite
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.Posture
+import androidx.compose.material3.adaptive.WindowAdaptiveInfo
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.platform.LocalInspectionMode
+import androidx.compose.ui.test.DeviceConfigurationOverride
+import androidx.compose.ui.test.ForcedSize
+import androidx.compose.ui.test.junit4.createAndroidComposeRule
+import androidx.compose.ui.test.onRoot
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpSize
+import androidx.compose.ui.unit.dp
+import androidx.window.core.layout.WindowSizeClass
+import com.github.takahirom.roborazzi.captureRoboImage
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourceRepository
+import com.google.samples.apps.nowinandroid.core.data.test.repository.FakeUserDataRepository
+import com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitor
+import com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitor
+import com.google.samples.apps.nowinandroid.core.designsystem.theme.NiaTheme
+import com.google.samples.apps.nowinandroid.core.testing.util.DefaultRoborazziOptions
+import com.google.samples.apps.nowinandroid.uitesthiltmanifest.HiltComponentActivity
+import dagger.hilt.android.testing.BindValue
+import dagger.hilt.android.testing.HiltAndroidRule
+import dagger.hilt.android.testing.HiltAndroidTest
+import dagger.hilt.android.testing.HiltTestApplication
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.runBlocking
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.TemporaryFolder
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+import org.robolectric.annotation.GraphicsMode
+import org.robolectric.annotation.LooperMode
+import java.util.TimeZone
+import javax.inject.Inject
+
+/**
+ * Tests that the Snackbar is correctly displayed on different screen sizes.
+ */
+@RunWith(RobolectricTestRunner::class)
+@GraphicsMode(GraphicsMode.Mode.NATIVE)
+// Configure Robolectric to use a very large screen size that can fit all of the test sizes.
+// This allows enough room to render the content under test without clipping or scaling.
+@Config(application = HiltTestApplication::class, qualifiers = "w1000dp-h1000dp-480dpi")
+@LooperMode(LooperMode.Mode.PAUSED)
+@HiltAndroidTest
+class SnackbarScreenshotTests {
+
+    /**
+     * Manages the components' state and is used to perform injection on your test
+     */
+    @get:Rule(order = 0)
+    val hiltRule = HiltAndroidRule(this)
+
+    /**
+     * Create a temporary folder used to create a Data Store file. This guarantees that
+     * the file is removed in between each test, preventing a crash.
+     */
+    @BindValue
+    @get:Rule(order = 1)
+    val tmpFolder: TemporaryFolder = TemporaryFolder.builder().assureDeletion().build()
+
+    /**
+     * Use a test activity to set the content on.
+     */
+    @get:Rule(order = 2)
+    val composeTestRule = createAndroidComposeRule<HiltComponentActivity>()
+
+    @Inject
+    lateinit var networkMonitor: NetworkMonitor
+
+    @Inject
+    lateinit var timeZoneMonitor: TimeZoneMonitor
+
+    @Inject
+    lateinit var userDataRepository: FakeUserDataRepository
+
+    @Inject
+    lateinit var topicsRepository: TopicsRepository
+
+    @Inject
+    lateinit var userNewsResourceRepository: UserNewsResourceRepository
+
+    @Before
+    fun setup() {
+        hiltRule.inject()
+
+        // Configure user data
+        runBlocking {
+            userDataRepository.setShouldHideOnboarding(true)
+
+            userDataRepository.setFollowedTopicIds(
+                setOf(topicsRepository.getTopics().first().first().id),
+            )
+        }
+    }
+
+    @Before
+    fun setTimeZone() {
+        // Make time zone deterministic in tests
+        TimeZone.setDefault(TimeZone.getTimeZone("UTC"))
+    }
+
+    @Test
+    fun phone_noSnackbar() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            400.dp,
+            500.dp,
+            "snackbar_compact_medium_noSnackbar",
+            action = { },
+        )
+    }
+
+    @Test
+    fun snackbarShown_phone() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            400.dp,
+            500.dp,
+            "snackbar_compact_medium",
+        ) {
+            snackbarHostState.showSnackbar(
+                "This is a test snackbar message",
+                actionLabel = "Action Label",
+                duration = Indefinite,
+            )
+        }
+    }
+
+    @Test
+    fun snackbarShown_foldable() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            600.dp,
+            600.dp,
+            "snackbar_medium_medium",
+        ) {
+            snackbarHostState.showSnackbar(
+                "This is a test snackbar message",
+                actionLabel = "Action Label",
+                duration = Indefinite,
+            )
+        }
+    }
+
+    @Test
+    fun snackbarShown_tablet() {
+        val snackbarHostState = SnackbarHostState()
+        testSnackbarScreenshotWithSize(
+            snackbarHostState,
+            900.dp,
+            900.dp,
+            "snackbar_expanded_expanded",
+        ) {
+            snackbarHostState.showSnackbar(
+                "This is a test snackbar message",
+                actionLabel = "Action Label",
+                duration = Indefinite,
+            )
+        }
+    }
+
+    @OptIn(ExperimentalMaterial3AdaptiveApi::class)
+    private fun testSnackbarScreenshotWithSize(
+        snackbarHostState: SnackbarHostState,
+        width: Dp,
+        height: Dp,
+        screenshotName: String,
+        action: suspend () -> Unit,
+    ) {
+        lateinit var scope: CoroutineScope
+        composeTestRule.setContent {
+            CompositionLocalProvider(
+                // Replaces images with placeholders
+                LocalInspectionMode provides true,
+            ) {
+                scope = rememberCoroutineScope()
+
+                DeviceConfigurationOverride(
+                    DeviceConfigurationOverride.ForcedSize(DpSize(width, height)),
+                ) {
+                    BoxWithConstraints {
+                        NiaTheme {
+                            val appState = rememberNiaAppState(
+                                networkMonitor = networkMonitor,
+                                userNewsResourceRepository = userNewsResourceRepository,
+                                timeZoneMonitor = timeZoneMonitor,
+                            )
+                            NiaApp(
+                                appState = appState,
+                                snackbarHostState = snackbarHostState,
+                                showSettingsDialog = false,
+                                onSettingsDismissed = {},
+                                onTopAppBarActionClick = {},
+                                windowAdaptiveInfo = WindowAdaptiveInfo(
+                                    windowSizeClass = WindowSizeClass.compute(
+                                        maxWidth.value,
+                                        maxHeight.value,
+                                    ),
+                                    windowPosture = Posture(),
+                                ),
+                            )
+                        }
+                    }
+                }
+            }
+        }
+
+        scope.launch {
+            action()
+        }
+
+        composeTestRule.onRoot()
+            .captureRoboImage(
+                "src/testDemo/screenshots/$screenshotName.png",
+                roborazziOptions = DefaultRoborazziOptions,
+            )
+    }
+}

benchmarks/build.gradle.kts

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import com.google.samples.apps.nowinandroid.NiaBuildType
 import com.google.samples.apps.nowinandroid.configureFlavors
 
 plugins {
+    alias(libs.plugins.baselineprofile)
     alias(libs.plugins.nowinandroid.android.test)
 }
 
@@ -34,23 +34,6 @@ android {
         buildConfig = true
     }
 
-    buildTypes {
-        // This benchmark buildType is used for benchmarking, and should function like your
-        // release build (for example, with minification on). It's signed with a debug key
-        // for easy local/CI testing.
-        create("benchmark") {
-            // Keep the build type debuggable so we can attach a debugger if needed.
-            isDebuggable = true
-            signingConfig = signingConfigs.getByName("debug")
-            matchingFallbacks.add("release")
-            buildConfigField(
-                "String",
-                "APP_BUILD_TYPE_SUFFIX",
-                "\"${NiaBuildType.BENCHMARK.applicationIdSuffix ?: ""}\""
-            )
-        }
-    }
-
     // Use the same flavor dimensions as the application to allow generating Baseline Profiles on prod,
     // which is more close to what will be shipped to users (no fake data), but has ability to run the
     // benchmarks on demo, so we benchmark on stable data. 
@@ -62,10 +45,27 @@ android {
         )
     }
 
+    testOptions.managedDevices.devices {
+        create<com.android.build.api.dsl.ManagedVirtualDevice>("pixel6Api33") {
+            device = "Pixel 6"
+            apiLevel = 33
+            systemImageSource = "aosp"
+        }
+    }
+
     targetProjectPath = ":app"
     experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
+baselineProfile {
+    // This specifies the managed devices to use that you run the tests on.
+    managedDevices += "pixel6Api33"
+
+    // Don't use a connected device but rely on a GMD for consistency between local and CI builds.
+    useConnectedDevices = false
+
+}
+
 dependencies {
     implementation(libs.androidx.benchmark.macro)
     implementation(libs.androidx.test.core)
@@ -75,9 +75,3 @@ dependencies {
     implementation(libs.androidx.test.runner)
     implementation(libs.androidx.test.uiautomator)
 }
-
-androidComponents {
-    beforeVariants {
-        it.enable = it.buildType == "benchmark"
-    }
-}

benchmarks/src/main/kotlin/androidx/test/uiautomator/UiAutomatorHelpers.kt

@@ -29,15 +29,11 @@ import androidx.test.uiautomator.HasChildrenOp.EXACTLY
 fun untilHasChildren(
     childCount: Int = 1,
     op: HasChildrenOp = AT_LEAST,
-): UiObject2Condition<Boolean> {
+): UiObject2Condition<Boolean> = object : UiObject2Condition<Boolean>() {
-    return object : UiObject2Condition<Boolean>() {
+    override fun apply(element: UiObject2): Boolean = when (op) {
-        override fun apply(element: UiObject2): Boolean {
+        AT_LEAST -> element.childCount >= childCount
-            return when (op) {
+        EXACTLY -> element.childCount == childCount
-                AT_LEAST -> element.childCount >= childCount
+        AT_MOST -> element.childCount <= childCount
-                EXACTLY -> element.childCount == childCount
-                AT_MOST -> element.childCount <= childCount
-            }
-        }
     }
 }
 

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/GeneralActions.kt

@@ -20,6 +20,10 @@ import android.Manifest.permission
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.TIRAMISU
 import androidx.benchmark.macro.MacrobenchmarkScope
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.BySelector
+import androidx.test.uiautomator.UiObject2
+import androidx.test.uiautomator.Until
 
 /**
  * Because the app under test is different from the one running the instrumentation test,
@@ -42,3 +46,27 @@ fun MacrobenchmarkScope.allowNotifications() {
         device.executeShellCommand(command)
     }
 }
+
+/**
+ * Wraps starting the default activity, waiting for it to start and then allowing notifications in
+ * one convenient call.
+ */
+fun MacrobenchmarkScope.startActivityAndAllowNotifications() {
+    startActivityAndWait()
+    allowNotifications()
+}
+
+/**
+ * Waits for and returns the `niaTopAppBar`
+ */
+fun MacrobenchmarkScope.getTopAppBar(): UiObject2 {
+    device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000)
+    return device.findObject(By.res("niaTopAppBar"))
+}
+
+/**
+ * Waits for an object on the top app bar, passed in as [selector].
+ */
+fun MacrobenchmarkScope.waitForObjectOnTopAppBar(selector: BySelector, timeout: Long = 2_000) {
+    getTopAppBar().wait(Until.hasObject(selector), timeout)
+}

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/Utils.kt

@@ -30,7 +30,6 @@ import java.io.ByteArrayOutputStream
 val PACKAGE_NAME = buildString {
     append("com.google.samples.apps.nowinandroid")
     append(BuildConfig.APP_FLAVOR_SUFFIX)
-    append(BuildConfig.APP_BUILD_TYPE_SUFFIX)
 }
 
 fun UiDevice.flingElementDownUp(element: UiObject2) {

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/baselineprofile/BookmarksBaselineProfile.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.baselineprofile
+
+import androidx.benchmark.macro.junit4.BaselineProfileRule
+import com.google.samples.apps.nowinandroid.PACKAGE_NAME
+import com.google.samples.apps.nowinandroid.bookmarks.goToBookmarksScreen
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * Baseline Profile of the "Bookmarks" screen
+ */
+class BookmarksBaselineProfile {
+    @get:Rule val baselineProfileRule = BaselineProfileRule()
+
+    @Test
+    fun generate() =
+        baselineProfileRule.collect(PACKAGE_NAME) {
+            startActivityAndAllowNotifications()
+
+            // Navigate to saved screen
+            goToBookmarksScreen()
+        }
+}

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/baselineprofile/ForYouBaselineProfile.kt

@@ -18,43 +18,27 @@ package com.google.samples.apps.nowinandroid.baselineprofile
 
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
-import com.google.samples.apps.nowinandroid.allowNotifications
-import com.google.samples.apps.nowinandroid.bookmarks.goToBookmarksScreen
 import com.google.samples.apps.nowinandroid.foryou.forYouScrollFeedDownUp
 import com.google.samples.apps.nowinandroid.foryou.forYouSelectTopics
 import com.google.samples.apps.nowinandroid.foryou.forYouWaitForContent
-import com.google.samples.apps.nowinandroid.interests.goToInterestsScreen
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
-import com.google.samples.apps.nowinandroid.interests.interestsScrollTopicsDownUp
 import org.junit.Rule
 import org.junit.Test
 
 /**
- * Generates a baseline profile which can be copied to `app/src/main/baseline-prof.txt`.
+ * Baseline Profile of the "For You" screen
  */
-class BaselineProfileGenerator {
+class ForYouBaselineProfile {
     @get:Rule val baselineProfileRule = BaselineProfileRule()
 
     @Test
     fun generate() =
         baselineProfileRule.collect(PACKAGE_NAME) {
-            // This block defines the app's critical user journey. Here we are interested in
+            startActivityAndAllowNotifications()
-            // optimizing for app startup. But you can also navigate and scroll
-            // through your most important UI.
-            allowNotifications()
-            pressHome()
-            startActivityAndWait()
-            allowNotifications()
 
             // Scroll the feed critical user journey
             forYouWaitForContent()
             forYouSelectTopics(true)
             forYouScrollFeedDownUp()
-
-            // Navigate to saved screen
-            goToBookmarksScreen()
-
-            // Navigate to interests screen
-            goToInterestsScreen()
-            interestsScrollTopicsDownUp()
         }
 }

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/baselineprofile/InterestsBaselineProfile.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.baselineprofile
+
+import androidx.benchmark.macro.junit4.BaselineProfileRule
+import com.google.samples.apps.nowinandroid.PACKAGE_NAME
+import com.google.samples.apps.nowinandroid.interests.goToInterestsScreen
+import com.google.samples.apps.nowinandroid.interests.interestsScrollTopicsDownUp
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * Baseline Profile of the "Interests" screen
+ */
+class InterestsBaselineProfile {
+    @get:Rule val baselineProfileRule = BaselineProfileRule()
+
+    @Test
+    fun generate() =
+        baselineProfileRule.collect(PACKAGE_NAME) {
+            startActivityAndAllowNotifications()
+
+            // Navigate to interests screen
+            goToInterestsScreen()
+            interestsScrollTopicsDownUp()
+        }
+}

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/baselineprofile/StartupBaselineProfile.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.nowinandroid.baselineprofile
+
+import androidx.benchmark.macro.MacrobenchmarkScope
+import androidx.benchmark.macro.junit4.BaselineProfileRule
+import com.google.samples.apps.nowinandroid.PACKAGE_NAME
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
+import org.junit.Rule
+import org.junit.Test
+
+/**
+ * Baseline Profile for app startup. This profile also enables using [Dex Layout Optimizations](https://developer.android.com/topic/performance/baselineprofiles/dex-layout-optimizations)
+ * via the `includeInStartupProfile` parameter.
+ */
+class StartupBaselineProfile {
+    @get:Rule val baselineProfileRule = BaselineProfileRule()
+
+    @Test
+    fun generate() = baselineProfileRule.collect(
+        PACKAGE_NAME,
+        includeInStartupProfile = true,
+        profileBlock = MacrobenchmarkScope::startActivityAndAllowNotifications,
+    )
+}

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/bookmarks/BookmarksActions.kt

@@ -18,13 +18,13 @@ package com.google.samples.apps.nowinandroid.bookmarks
 
 import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.By
-import androidx.test.uiautomator.Until
+import com.google.samples.apps.nowinandroid.waitForObjectOnTopAppBar
 
 fun MacrobenchmarkScope.goToBookmarksScreen() {
-    device.findObject(By.text("Saved")).click()
+    val savedSelector = By.text("Saved")
+    val savedButton = device.findObject(savedSelector)
+    savedButton.click()
     device.waitForIdle()
     // Wait until saved title are shown on screen
-    device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000)
+    waitForObjectOnTopAppBar(savedSelector)
-    val topAppBar = device.findObject(By.res("niaTopAppBar"))
-    topAppBar.wait(Until.hasObject(By.text("Saved")), 2_000)
 }

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ForYouActions.kt

@@ -22,6 +22,8 @@ import androidx.test.uiautomator.Until
 import androidx.test.uiautomator.untilHasChildren
 import com.google.samples.apps.nowinandroid.flingElementDownUp
 import com.google.samples.apps.nowinandroid.waitAndFindObject
+import com.google.samples.apps.nowinandroid.waitForObjectOnTopAppBar
+import org.junit.Assert.fail
 
 fun MacrobenchmarkScope.forYouWaitForContent() {
     // Wait until content is loaded by checking if topics are loaded
@@ -49,6 +51,9 @@ fun MacrobenchmarkScope.forYouSelectTopics(recheckTopicsIfChecked: Boolean = fal
     var visited = 0
 
     while (visited < 3) {
+        if (topics.childCount == 0) {
+            fail("No topics found, can't generate profile for ForYou page.")
+        }
         // Selecting some topics, which will populate items in the feed.
         val topic = topics.children[index % topics.childCount]
         // Find the checkable element to figure out whether it's checked or not
@@ -99,7 +104,5 @@ fun MacrobenchmarkScope.setAppTheme(isDark: Boolean) {
     device.findObject(By.text("OK")).click()
 
     // Wait until the top app bar is visible on screen
-    device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000)
+    waitForObjectOnTopAppBar(By.text("Now in Android"))
-    val topAppBar = device.findObject(By.res("niaTopAppBar"))
-    topAppBar.wait(Until.hasObject(By.text("Now in Android")), 2_000)
 }

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/foryou/ScrollForYouFeedBenchmark.kt

@@ -22,7 +22,7 @@ import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
-import com.google.samples.apps.nowinandroid.allowNotifications
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -38,6 +38,9 @@ class ScrollForYouFeedBenchmark {
     @Test
     fun scrollFeedCompilationBaselineProfile() = scrollFeed(CompilationMode.Partial())
 
+    @Test
+    fun scrollFeedCompilationFull() = scrollFeed(CompilationMode.Full())
+
     private fun scrollFeed(compilationMode: CompilationMode) = benchmarkRule.measureRepeated(
         packageName = PACKAGE_NAME,
         metrics = listOf(FrameTimingMetric()),
@@ -47,8 +50,7 @@ class ScrollForYouFeedBenchmark {
         setupBlock = {
             // Start the app
             pressHome()
-            startActivityAndWait()
+            startActivityAndAllowNotifications()
-            allowNotifications()
         },
     ) {
         forYouWaitForContent()

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsActions.kt

@@ -20,22 +20,21 @@ import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.Until
 import com.google.samples.apps.nowinandroid.flingElementDownUp
-import com.google.samples.apps.nowinandroid.waitAndFindObject
+import com.google.samples.apps.nowinandroid.waitForObjectOnTopAppBar
 
 fun MacrobenchmarkScope.goToInterestsScreen() {
     device.findObject(By.text("Interests")).click()
     device.waitForIdle()
     // Wait until interests are shown on screen
-    device.wait(Until.hasObject(By.res("niaTopAppBar")), 2_000)
+    waitForObjectOnTopAppBar(By.text("Interests"))
-    val topAppBar = device.findObject(By.res("niaTopAppBar"))
-    topAppBar.wait(Until.hasObject(By.text("Interests")), 2_000)
 
     // Wait until content is loaded by checking if interests are loaded
     device.wait(Until.gone(By.res("loadingWheel")), 5_000)
 }
 
 fun MacrobenchmarkScope.interestsScrollTopicsDownUp() {
-    val topicsList = device.waitAndFindObject(By.res("interests:topics"), 2_000)
+    device.wait(Until.hasObject(By.res("interests:topics")), 5_000)
+    val topicsList = device.findObject(By.res("interests:topics"))
     device.flingElementDownUp(topicsList)
 }
 

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/ScrollTopicListBenchmark.kt

@@ -23,7 +23,7 @@ import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.uiautomator.By
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
-import com.google.samples.apps.nowinandroid.allowNotifications
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,8 +47,7 @@ class ScrollTopicListBenchmark {
             setupBlock = {
                 // Start the app
                 pressHome()
-                startActivityAndWait()
+                startActivityAndAllowNotifications()
-                allowNotifications()
                 // Navigate to interests screen
                 device.findObject(By.text("Interests")).click()
                 device.waitForIdle()

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/ScrollTopicListPowerMetricsBenchmark.kt

@@ -45,7 +45,7 @@ class ScrollTopicListPowerMetricsBenchmark {
     @get:Rule
     val benchmarkRule = MacrobenchmarkRule()
 
-    private val categories = PowerCategory.values()
+    private val categories = PowerCategory.entries
         .associateWith { PowerCategoryDisplayLevel.TOTAL }
 
     @Test

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/interests/TopicsScreenRecompositionBenchmark.kt

@@ -23,7 +23,7 @@ import androidx.benchmark.macro.junit4.MacrobenchmarkRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.uiautomator.By
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
-import com.google.samples.apps.nowinandroid.allowNotifications
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,8 +47,7 @@ class TopicsScreenRecompositionBenchmark {
             setupBlock = {
                 // Start the app
                 pressHome()
-                startActivityAndWait()
+                startActivityAndAllowNotifications()
-                allowNotifications()
                 // Navigate to interests screen
                 device.findObject(By.text("Interests")).click()
                 device.waitForIdle()

benchmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/startup/StartupBenchmark.kt

@@ -26,6 +26,7 @@ import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.google.samples.apps.nowinandroid.PACKAGE_NAME
 import com.google.samples.apps.nowinandroid.allowNotifications
 import com.google.samples.apps.nowinandroid.foryou.forYouWaitForContent
+import com.google.samples.apps.nowinandroid.startActivityAndAllowNotifications
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -41,32 +42,33 @@ class StartupBenchmark {
     val benchmarkRule = MacrobenchmarkRule()
 
     @Test
-    fun startupNoCompilation() = startup(CompilationMode.None())
+    fun startupWithoutPreCompilation() = startup(CompilationMode.None())
 
     @Test
-    fun startupBaselineProfileDisabled() = startup(
+    fun startupWithPartialCompilationAndDisabledBaselineProfile() = startup(
         CompilationMode.Partial(baselineProfileMode = Disable, warmupIterations = 1),
     )
 
     @Test
-    fun startupBaselineProfile() = startup(CompilationMode.Partial(baselineProfileMode = Require))
+    fun startupPrecompiledWithBaselineProfile() =
+        startup(CompilationMode.Partial(baselineProfileMode = Require))
 
     @Test
-    fun startupFullCompilation() = startup(CompilationMode.Full())
+    fun startupFullyPrecompiled() = startup(CompilationMode.Full())
 
     private fun startup(compilationMode: CompilationMode) = benchmarkRule.measureRepeated(
         packageName = PACKAGE_NAME,
         metrics = listOf(StartupTimingMetric()),
         compilationMode = compilationMode,
-        iterations = 10,
+        // More iterations result in higher statistical significance.
+        iterations = 20,
         startupMode = COLD,
         setupBlock = {
             pressHome()
             allowNotifications()
         },
     ) {
-        startActivityAndWait()
+        startActivityAndAllowNotifications()
-        allowNotifications()
         // Waits until the content is ready to capture Time To Full Display
         forYouWaitForContent()
     }

build-logic/convention/build.gradle.kts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
@@ -28,18 +29,30 @@ java {
     sourceCompatibility = JavaVersion.VERSION_17
     targetCompatibility = JavaVersion.VERSION_17
 }
-tasks.withType<KotlinCompile>().configureEach {
+
-    kotlinOptions {
+kotlin {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    compilerOptions {
+        jvmTarget = JvmTarget.JVM_17
     }
 }
 
 dependencies {
     compileOnly(libs.android.gradlePlugin)
+    compileOnly(libs.android.tools.common)
+    compileOnly(libs.compose.gradlePlugin)
     compileOnly(libs.firebase.crashlytics.gradlePlugin)
     compileOnly(libs.firebase.performance.gradlePlugin)
     compileOnly(libs.kotlin.gradlePlugin)
     compileOnly(libs.ksp.gradlePlugin)
+    compileOnly(libs.room.gradlePlugin)
+    implementation(libs.truth)
+}
+
+tasks {
+    validatePlugins {
+        enableStricterValidation = true
+        failOnWarning = true
+    }
 }
 
 gradlePlugin {

build-logic/convention/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt

@@ -18,14 +18,14 @@ import com.android.build.api.dsl.ApplicationExtension
 import com.google.samples.apps.nowinandroid.configureAndroidCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
 
 class AndroidApplicationComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            pluginManager.apply("com.android.application")
+            apply(plugin = "com.android.application")
-            // Screenshot Tests
+            apply(plugin = "org.jetbrains.kotlin.plugin.compose")
-            pluginManager.apply("io.github.takahirom.roborazzi")
 
             val extension = extensions.getByType<ApplicationExtension>()
             configureAndroidCompose(extension)

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -15,10 +15,10 @@
  */
 
 import com.android.build.api.dsl.ApplicationExtension
-import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import com.google.samples.apps.nowinandroid.configureBadgingTasks
+import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import org.gradle.api.Plugin
@@ -33,11 +33,14 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
                 apply("com.android.application")
                 apply("org.jetbrains.kotlin.android")
                 apply("nowinandroid.android.lint")
+                apply("com.dropbox.dependency-guard")
             }
 
             extensions.configure<ApplicationExtension> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 34
+                @Suppress("UnstableApiUsage")
+                testOptions.animationsDisabled = true
                 configureGradleManagedDevices(this)
             }
             extensions.configure<ApplicationAndroidComponentsExtension> {
@@ -47,4 +50,4 @@ class AndroidApplicationConventionPlugin : Plugin<Project> {
         }
     }
 
-}
+}

build-logic/convention/src/main/kotlin/AndroidApplicationJacocoConventionPlugin.kt

@@ -15,6 +15,7 @@
  */
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import com.google.samples.apps.nowinandroid.configureJacoco
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -23,13 +24,15 @@ import org.gradle.kotlin.dsl.getByType
 class AndroidApplicationJacocoConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            with(pluginManager) {
+            pluginManager.apply("jacoco")
-                apply("org.gradle.jacoco")
+            val androidExtension = extensions.getByType<BaseAppModuleExtension>()
-                apply("com.android.application")
+
+            androidExtension.buildTypes.configureEach {
+                enableAndroidTestCoverage = true
+                enableUnitTestCoverage = true
             }
-            val extension = extensions.getByType<ApplicationAndroidComponentsExtension>()
+
-            configureJacoco(extension)
+            configureJacoco(extensions.getByType<ApplicationAndroidComponentsExtension>())
         }
     }
-
+}
-}

build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt

@@ -21,7 +21,6 @@ import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.kotlin
 
 class AndroidFeatureConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
@@ -31,35 +30,20 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {
                 apply("nowinandroid.android.hilt")
             }
             extensions.configure<LibraryExtension> {
-                defaultConfig {
+                testOptions.animationsDisabled = true
-                    testInstrumentationRunner =
-                        "com.google.samples.apps.nowinandroid.core.testing.NiaTestRunner"
-                }
                 configureGradleManagedDevices(this)
             }
 
             dependencies {
-                add("implementation", project(":core:model"))
                 add("implementation", project(":core:ui"))
                 add("implementation", project(":core:designsystem"))
-                add("implementation", project(":core:data"))
-                add("implementation", project(":core:common"))
-                add("implementation", project(":core:domain"))
-                add("implementation", project(":core:analytics"))
-
-                add("testImplementation", kotlin("test"))
-                add("testImplementation", project(":core:testing"))
-                add("androidTestImplementation", kotlin("test"))
-                add("androidTestImplementation", project(":core:testing"))
-
-                add("implementation", libs.findLibrary("coil.kt").get())
-                add("implementation", libs.findLibrary("coil.kt.compose").get())
 
                 add("implementation", libs.findLibrary("androidx.hilt.navigation.compose").get())
                 add("implementation", libs.findLibrary("androidx.lifecycle.runtimeCompose").get())
                 add("implementation", libs.findLibrary("androidx.lifecycle.viewModelCompose").get())
+                add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
 
-                add("implementation", libs.findLibrary("kotlinx.coroutines.android").get())
+                add("androidTestImplementation", libs.findLibrary("androidx.lifecycle.runtimeTesting").get())
             }
         }
     }

build-logic/convention/src/main/kotlin/AndroidHiltConventionPlugin.kt

@@ -23,17 +23,13 @@ class AndroidHiltConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
             with(pluginManager) {
+                apply("com.google.devtools.ksp")
                 apply("dagger.hilt.android.plugin")
-                // KAPT must go last to avoid build warnings.
-                // See: https://stackoverflow.com/questions/70550883/warning-the-following-options-were-not-recognized-by-any-processor-dagger-f
-                apply("org.jetbrains.kotlin.kapt")
             }
 
             dependencies {
                 "implementation"(libs.findLibrary("hilt.android").get())
-                "kapt"(libs.findLibrary("hilt.compiler").get())
+                "ksp"(libs.findLibrary("hilt.compiler").get())
-                "kaptAndroidTest"(libs.findLibrary("hilt.compiler").get())
-                "kaptTest"(libs.findLibrary("hilt.compiler").get())
             }
 
         }

build-logic/convention/src/main/kotlin/AndroidLibraryComposeConventionPlugin.kt

@@ -18,16 +18,14 @@ import com.android.build.gradle.LibraryExtension
 import com.google.samples.apps.nowinandroid.configureAndroidCompose
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.getByType
-import org.gradle.kotlin.dsl.kotlin
 
 class AndroidLibraryComposeConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            pluginManager.apply("com.android.library")
+            apply(plugin = "com.android.library")
-            // Screenshot Tests
+            apply(plugin = "org.jetbrains.kotlin.plugin.compose")
-            pluginManager.apply("io.github.takahirom.roborazzi")
 
             val extension = extensions.getByType<LibraryExtension>()
             configureAndroidCompose(extension)

build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt

@@ -21,6 +21,7 @@ import com.google.samples.apps.nowinandroid.configureGradleManagedDevices
 import com.google.samples.apps.nowinandroid.configureKotlinAndroid
 import com.google.samples.apps.nowinandroid.configurePrintApksTask
 import com.google.samples.apps.nowinandroid.disableUnnecessaryAndroidTests
+import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.configure
@@ -39,18 +40,23 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
             extensions.configure<LibraryExtension> {
                 configureKotlinAndroid(this)
                 defaultConfig.targetSdk = 34
+                defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+                testOptions.animationsDisabled = true
                 configureFlavors(this)
                 configureGradleManagedDevices(this)
+                // The resource prefix is derived from the module name,
+                // so resources inside ":core:module1" must be prefixed with "core_module1_"
+                resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_"
             }
             extensions.configure<LibraryAndroidComponentsExtension> {
                 configurePrintApksTask(this)
                 disableUnnecessaryAndroidTests(target)
             }
             dependencies {
-                add("testImplementation", kotlin("test"))
-                add("testImplementation", project(":core:testing"))
                 add("androidTestImplementation", kotlin("test"))
-                add("androidTestImplementation", project(":core:testing"))
+                add("testImplementation", kotlin("test"))
+
+                add("implementation", libs.findLibrary("androidx.tracing.ktx").get())
             }
         }
     }

build-logic/convention/src/main/kotlin/AndroidLibraryJacocoConventionPlugin.kt

@@ -14,6 +14,8 @@
  *   limitations under the License.
  */
 
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.google.samples.apps.nowinandroid.configureJacoco
 import org.gradle.api.Plugin
@@ -23,13 +25,15 @@ import org.gradle.kotlin.dsl.getByType
 class AndroidLibraryJacocoConventionPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         with(target) {
-            with(pluginManager) {
+            pluginManager.apply("jacoco")
-                apply("org.gradle.jacoco")
+            val androidExtension = extensions.getByType<LibraryExtension>()
-                apply("com.android.library")
+
+            androidExtension.buildTypes.configureEach {
+                enableAndroidTestCoverage = true
+                enableUnitTestCoverage = true
             }
-            val extension = extensions.getByType<LibraryAndroidComponentsExtension>()
+
-            configureJacoco(extension)
+            configureJacoco(extensions.getByType<LibraryAndroidComponentsExtension>())
         }
     }
-
+}
-}

build-logic/convention/src/main/kotlin/AndroidRoomConventionPlugin.kt

@@ -14,29 +14,30 @@
  *   limitations under the License.
  */
 
+import androidx.room.gradle.RoomExtension
 import com.google.devtools.ksp.gradle.KspExtension
 import com.google.samples.apps.nowinandroid.libs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.tasks.InputDirectory
-import org.gradle.api.tasks.PathSensitive
-import org.gradle.api.tasks.PathSensitivity
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.process.CommandLineArgumentProvider
-import java.io.File
 
 class AndroidRoomConventionPlugin : Plugin<Project> {
 
     override fun apply(target: Project) {
         with(target) {
+            pluginManager.apply("androidx.room")
             pluginManager.apply("com.google.devtools.ksp")
 
             extensions.configure<KspExtension> {
+                arg("room.generateKotlin", "true")
+            }
+
+            extensions.configure<RoomExtension> {
                 // The schemas directory contains a schema file for each version of the Room database.
                 // This is required to enable Room auto migrations.
                 // See https://developer.android.com/reference/kotlin/androidx/room/AutoMigration.
-                arg(RoomSchemaArgProvider(File(projectDir, "schemas")))
+                schemaDirectory("$projectDir/schemas")
             }
 
             dependencies {
@@ -46,16 +47,4 @@ class AndroidRoomConventionPlugin : Plugin<Project> {
             }
         }
     }
-
-    /**
-     * https://issuetracker.google.com/issues/132245929
-     * [Export schemas](https://developer.android.com/training/data-storage/room/migrating-db-versions#export-schemas)
-     */
-    class RoomSchemaArgProvider(
-        @get:InputDirectory
-        @get:PathSensitive(PathSensitivity.RELATIVE)
-        val schemaDir: File,
-    ) : CommandLineArgumentProvider {
-        override fun asArguments() = listOf("room.schemaLocation=${schemaDir.path}")
-    }
 }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/AndroidCompose.kt

@@ -18,34 +18,29 @@ package com.google.samples.apps.nowinandroid
 
 import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.Project
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.assign
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 /**
  * Configure Compose-specific options
  */
 internal fun Project.configureAndroidCompose(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         buildFeatures {
             compose = true
         }
 
-        composeOptions {
-            kotlinCompilerExtensionVersion = libs.findVersion("androidxComposeCompiler").get().toString()
-        }
-
         dependencies {
             val bom = libs.findLibrary("androidx-compose-bom").get()
             add("implementation", platform(bom))
             add("androidTestImplementation", platform(bom))
-            // Add ComponentActivity to debug manifest
+            add("implementation", libs.findLibrary("androidx-compose-ui-tooling-preview").get())
-            add("debugImplementation", libs.findLibrary("androidx.compose.ui.testManifest").get())
+            add("debugImplementation", libs.findLibrary("androidx-compose-ui-tooling").get())
-            // Screenshot Tests on JVM
-            add("testImplementation", libs.findLibrary("robolectric").get())
-            add("testImplementation", libs.findLibrary("roborazzi").get())
         }
 
         testOptions {
@@ -56,35 +51,22 @@ internal fun Project.configureAndroidCompose(
         }
     }
 
-    tasks.withType<KotlinCompile>().configureEach {
+    extensions.configure<ComposeCompilerGradlePluginExtension> {
-        kotlinOptions {
+        fun Provider<String>.onlyIfTrue() = flatMap { provider { it.takeIf(String::toBoolean) } }
-            freeCompilerArgs = freeCompilerArgs + buildComposeMetricsParameters()
+        fun Provider<*>.relativeToRootProject(dir: String) = flatMap {
-        }
+            rootProject.layout.buildDirectory.dir(projectDir.toRelativeString(rootDir))
-    }
+        }.map { it.dir(dir) }
-}
 
-private fun Project.buildComposeMetricsParameters(): List<String> {
+        project.providers.gradleProperty("enableComposeCompilerMetrics").onlyIfTrue()
-    val metricParameters = mutableListOf<String>()
+            .relativeToRootProject("compose-metrics")
-    val enableMetricsProvider = project.providers.gradleProperty("enableComposeCompilerMetrics")
+            .let(metricsDestination::set)
-    val relativePath = projectDir.relativeTo(rootDir)
+
-    val buildDir = layout.buildDirectory.get().asFile
+        project.providers.gradleProperty("enableComposeCompilerReports").onlyIfTrue()
-    val enableMetrics = (enableMetricsProvider.orNull == "true")
+            .relativeToRootProject("compose-reports")
-    if (enableMetrics) {
+            .let(reportsDestination::set)
-        val metricsFolder = buildDir.resolve("compose-metrics").resolve(relativePath)
-        metricParameters.add("-P")
-        metricParameters.add(
-            "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" + metricsFolder.absolutePath
-        )
-    }
 
-    val enableReportsProvider = project.providers.gradleProperty("enableComposeCompilerReports")
+        stabilityConfigurationFile = rootProject.layout.projectDirectory.file("compose_compiler_config.conf")
-    val enableReports = (enableReportsProvider.orNull == "true")
+        
-    if (enableReports) {
+        enableStrongSkippingMode = true
-        val reportsFolder = buildDir.resolve("compose-reports").resolve(relativePath)
-        metricParameters.add("-P")
-        metricParameters.add(
-            "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" + reportsFolder.absolutePath
-        )
     }
-    return metricParameters.toList()
 }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Badging.kt

@@ -16,35 +16,44 @@
 
 package com.google.samples.apps.nowinandroid
 
+import com.android.SdkConstants
 import com.android.build.api.artifact.SingleArtifact
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
+import com.google.common.truth.Truth.assertWithMessage
 import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
 import org.gradle.api.Project
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.file.RegularFileProperty
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.CacheableTask
 import org.gradle.api.tasks.Copy
+import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputFile
 import org.gradle.api.tasks.OutputDirectory
 import org.gradle.api.tasks.OutputFile
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
 import org.gradle.configurationcache.extensions.capitalized
+import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.register
 import org.gradle.language.base.plugins.LifecycleBasePlugin
 import org.gradle.process.ExecOperations
 import java.io.File
-import java.nio.file.Files
 import javax.inject.Inject
 
+@CacheableTask
 abstract class GenerateBadgingTask : DefaultTask() {
 
     @get:OutputFile
     abstract val badging: RegularFileProperty
 
+    @get:PathSensitive(PathSensitivity.NONE)
     @get:InputFile
     abstract val apk: RegularFileProperty
 
+    @get:PathSensitive(PathSensitivity.NONE)
     @get:InputFile
     abstract val aapt2Executable: RegularFileProperty
 
@@ -65,6 +74,7 @@ abstract class GenerateBadgingTask : DefaultTask() {
     }
 }
 
+@CacheableTask
 abstract class CheckBadgingTask : DefaultTask() {
 
     // In order for the task to be up-to-date when the inputs have not changed,
@@ -73,27 +83,27 @@ abstract class CheckBadgingTask : DefaultTask() {
     @get:OutputDirectory
     abstract val output: DirectoryProperty
 
+    @get:PathSensitive(PathSensitivity.NONE)
     @get:InputFile
     abstract val goldenBadging: RegularFileProperty
 
+    @get:PathSensitive(PathSensitivity.NONE)
     @get:InputFile
     abstract val generatedBadging: RegularFileProperty
 
+    @get:Input
+    abstract val updateBadgingTaskName: Property<String>
+
     override fun getGroup(): String = LifecycleBasePlugin.VERIFICATION_GROUP
 
     @TaskAction
     fun taskAction() {
-        if (
+        assertWithMessage(
-            Files.mismatch(
+            "Generated badging is different from golden badging! " +
-                goldenBadging.get().asFile.toPath(),
+                "If this change is intended, run ./gradlew ${updateBadgingTaskName.get()}",
-                generatedBadging.get().asFile.toPath(),
+        )
-            ) != -1L
+            .that(generatedBadging.get().asFile.readText())
-        ) {
+            .isEqualTo(goldenBadging.get().asFile.readText())
-            throw GradleException(
-                "Generated badging is different from golden badging! " +
-                    "If this change is intended, run ./gradlew updateBadging",
-            )
-        }
     }
 }
 
@@ -105,42 +115,41 @@ fun Project.configureBadgingTasks(
     componentsExtension.onVariants { variant ->
         // Registers a new task to verify the app bundle.
         val capitalizedVariantName = variant.name.capitalized()
+        val generateBadgingTaskName = "generate${capitalizedVariantName}Badging"
         val generateBadging =
-            tasks.register<GenerateBadgingTask>("generate${capitalizedVariantName}Badging") {
+            tasks.register<GenerateBadgingTask>(generateBadgingTaskName) {
-                apk.set(
+                apk = variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE)
-                    variant.artifacts.get(SingleArtifact.APK_FROM_BUNDLE),
+
-                )
+                aapt2Executable = File(
-                aapt2Executable.set(
+                    baseExtension.sdkDirectory,
-                    File(
+                    "${SdkConstants.FD_BUILD_TOOLS}/" +
-                        baseExtension.sdkDirectory,
+                        "${baseExtension.buildToolsVersion}/" +
-                        "build-tools/${baseExtension.buildToolsVersion}/aapt2",
+                        SdkConstants.FN_AAPT2,
-                    ),
                 )
 
-                badging.set(
+
-                    project.layout.buildDirectory.file(
+                badging = project.layout.buildDirectory.file(
-                        "outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",
+                    "outputs/apk_from_bundle/${variant.name}/${variant.name}-badging.txt",
-                    ),
                 )
+
             }
 
-        tasks.register<Copy>("update${capitalizedVariantName}Badging") {
+        val updateBadgingTaskName = "update${capitalizedVariantName}Badging"
+        tasks.register<Copy>(updateBadgingTaskName) {
             from(generateBadging.get().badging)
             into(project.layout.projectDirectory)
         }
 
         val checkBadgingTaskName = "check${capitalizedVariantName}Badging"
         tasks.register<CheckBadgingTask>(checkBadgingTaskName) {
-            goldenBadging.set(
+            goldenBadging = project.layout.projectDirectory.file("${variant.name}-badging.txt")
-                project.layout.projectDirectory.file("${variant.name}-badging.txt"),
+
-            )
+            generatedBadging = generateBadging.get().badging
-            generatedBadging.set(
+
-                generateBadging.get().badging,
+            this.updateBadgingTaskName = updateBadgingTaskName
-            )
+
+            output = project.layout.buildDirectory.dir("intermediates/$checkBadgingTaskName")
 
-            output.set(
-                project.layout.buildDirectory.dir("intermediates/$checkBadgingTaskName"),
-            )
         }
     }
 }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/GradleManagedDevices.kt

@@ -25,7 +25,7 @@ import org.gradle.kotlin.dsl.invoke
  * Configure project for Gradle managed devices
  */
 internal fun configureGradleManagedDevices(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     val pixel4 = DeviceConfig("Pixel 4", 30, "aosp-atd")
     val pixel6 = DeviceConfig("Pixel 6", 31, "aosp")

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/Jacoco.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2024 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,15 @@
 
 package com.google.samples.apps.nowinandroid
 
+import com.android.build.api.artifact.ScopedArtifact
 import com.android.build.api.variant.AndroidComponentsExtension
+import com.android.build.api.variant.ScopedArtifacts
 import org.gradle.api.Project
+import org.gradle.api.file.Directory
+import org.gradle.api.file.RegularFile
+import org.gradle.api.provider.ListProperty
 import org.gradle.api.tasks.testing.Test
+import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
@@ -32,13 +38,24 @@ private val coverageExclusions = listOf(
     "**/R.class",
     "**/R\$*.class",
     "**/BuildConfig.*",
-    "**/Manifest*.*"
+    "**/Manifest*.*",
+    "**/*_Hilt*.class",
+    "**/Hilt_*.class",
 )
 
 private fun String.capitalize() = replaceFirstChar {
     if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString()
 }
 
+/**
+ * Creates a new task that generates a combined coverage report with data from local and
+ * instrumented tests.
+ *
+ * `create{variant}CombinedCoverageReport`
+ *
+ * Note that coverage data must exist before running the task. This allows us to run device
+ * tests on CI using a different Github Action or an external device farm.
+ */
 internal fun Project.configureJacoco(
     androidComponentsExtension: AndroidComponentsExtension<*, *, *>,
 ) {
@@ -46,37 +63,62 @@ internal fun Project.configureJacoco(
         toolVersion = libs.findVersion("jacoco").get().toString()
     }
 
-    val jacocoTestReport = tasks.create("jacocoTestReport")
-
     androidComponentsExtension.onVariants { variant ->
-        val testTaskName = "test${variant.name.capitalize()}UnitTest"
+        val myObjFactory = project.objects
         val buildDir = layout.buildDirectory.get().asFile
-        val reportTask = tasks.register("jacoco${testTaskName.capitalize()}Report", JacocoReport::class) {
+        val allJars: ListProperty<RegularFile> = myObjFactory.listProperty(RegularFile::class.java)
-            dependsOn(testTaskName)
+        val allDirectories: ListProperty<Directory> =
+            myObjFactory.listProperty(Directory::class.java)
+        val reportTask =
+            tasks.register(
+                "create${variant.name.capitalize()}CombinedCoverageReport",
+                JacocoReport::class,
+            ) {
 
-            reports {
+                classDirectories.setFrom(
-                xml.required.set(true)
+                    allJars,
-                html.required.set(true)
+                    allDirectories.map { dirs ->
-            }
+                        dirs.map { dir ->
-
+                            myObjFactory.fileTree().setDir(dir).exclude(coverageExclusions)
-            classDirectories.setFrom(
+                        }
-                fileTree("$buildDir/tmp/kotlin-classes/${variant.name}") {
+                    },
-                    exclude(coverageExclusions)
+                )
+                reports {
+                    xml.required = true
+                    html.required = true
                 }
-            )
 
-            sourceDirectories.setFrom(files("$projectDir/src/main/java", "$projectDir/src/main/kotlin"))
+                // TODO: This is missing files in src/debug/, src/prod, src/demo, src/demoDebug...
-            executionData.setFrom(file("$buildDir/jacoco/$testTaskName.exec"))
+                sourceDirectories.setFrom(
-        }
+                    files(
+                        "$projectDir/src/main/java",
+                        "$projectDir/src/main/kotlin",
+                    ),
+                )
+
+                executionData.setFrom(
+                    project.fileTree("$buildDir/outputs/unit_test_code_coverage/${variant.name}UnitTest")
+                        .matching { include("**/*.exec") },
+
+                    project.fileTree("$buildDir/outputs/code_coverage/${variant.name}AndroidTest")
+                        .matching { include("**/*.ec") },
+                )
+            }
+
 
-        jacocoTestReport.dependsOn(reportTask)
+        variant.artifacts.forScope(ScopedArtifacts.Scope.PROJECT)
+            .use(reportTask)
+            .toGet(
+                ScopedArtifact.CLASSES,
+                { _ -> allJars },
+                { _ -> allDirectories },
+            )
     }
 
     tasks.withType<Test>().configureEach {
         configure<JacocoTaskExtension> {
             // Required for JaCoCo + Robolectric
             // https://github.com/robolectric/robolectric/issues/2230
-            // TODO: Consider removing if not we don't add Robolectric
             isIncludeNoLocationClasses = true
 
             // Required for JDK 11 with the above

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/KotlinAndroid.kt

@@ -20,17 +20,20 @@ import com.android.build.api.dsl.CommonExtension
 import org.gradle.api.JavaVersion
 import org.gradle.api.Project
 import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.kotlin.dsl.assign
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.provideDelegate
-import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
+import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension
 
 /**
  * Configure base Kotlin with Android options
  */
 internal fun Project.configureKotlinAndroid(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
     commonExtension.apply {
         compileSdk = 34
@@ -48,7 +51,7 @@ internal fun Project.configureKotlinAndroid(
         }
     }
 
-    configureKotlin()
+    configureKotlin<KotlinAndroidProjectExtension>()
 
     dependencies {
         add("coreLibraryDesugaring", libs.findLibrary("android.desugarJdkLibs").get())
@@ -66,28 +69,26 @@ internal fun Project.configureKotlinJvm() {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    configureKotlin()
+    configureKotlin<KotlinJvmProjectExtension>()
 }
 
 /**
  * Configure base Kotlin options
  */
-private fun Project.configureKotlin() {
+private inline fun <reified T : KotlinTopLevelExtension> Project.configureKotlin() = configure<T> {
-    // Use withType to workaround https://youtrack.jetbrains.com/issue/KT-55947
+    // Treat all Kotlin warnings as errors (disabled by default)
-    tasks.withType<KotlinCompile>().configureEach {
+    // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
-        kotlinOptions {
+    val warningsAsErrors: String? by project
-            // Set JVM target to 11
+    when (this) {
-            jvmTarget = JavaVersion.VERSION_11.toString()
+        is KotlinAndroidProjectExtension -> compilerOptions
-            // Treat all Kotlin warnings as errors (disabled by default)
+        is KotlinJvmProjectExtension -> compilerOptions
-            // Override by setting warningsAsErrors=true in your ~/.gradle/gradle.properties
+        else -> TODO("Unsupported project extension $this ${T::class}")
-            val warningsAsErrors: String? by project
+    }.apply {
-            allWarningsAsErrors = warningsAsErrors.toBoolean()
+        jvmTarget = JvmTarget.JVM_11
-            freeCompilerArgs = freeCompilerArgs + listOf(
+        allWarningsAsErrors = warningsAsErrors.toBoolean()
-                "-opt-in=kotlin.RequiresOptIn",
+        freeCompilerArgs.add(
-                // Enable experimental coroutines APIs, including Flow
+            // Enable experimental coroutines APIs, including Flow
-                "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
+            "-opt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-opt-in=kotlinx.coroutines.FlowPreview",
+        )
-            )
-        }
     }
 }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaBuildType.kt

@@ -22,5 +22,4 @@ package com.google.samples.apps.nowinandroid
 enum class NiaBuildType(val applicationIdSuffix: String? = null) {
     DEBUG(".debug"),
     RELEASE,
-    BENCHMARK(".benchmark")
 }

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/NiaFlavor.kt

@@ -20,7 +20,7 @@ enum class NiaFlavor(val dimension: FlavorDimension, val applicationIdSuffix: St
 }
 
 fun configureFlavors(
-    commonExtension: CommonExtension<*, *, *, *, *>,
+    commonExtension: CommonExtension<*, *, *, *, *, *>,
     flavorConfigurationBlock: ProductFlavor.(flavor: NiaFlavor) -> Unit = {}
 ) {
     commonExtension.apply {

build-logic/convention/src/main/kotlin/com/google/samples/apps/nowinandroid/PrintTestApks.kt

@@ -30,7 +30,11 @@ import org.gradle.api.tasks.Input
 import org.gradle.api.tasks.InputDirectory
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Internal
+import org.gradle.api.tasks.PathSensitive
+import org.gradle.api.tasks.PathSensitivity
 import org.gradle.api.tasks.TaskAction
+import org.gradle.kotlin.dsl.assign
+import org.gradle.work.DisableCachingByDefault
 import java.io.File
 
 internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtension<*, *, *>) {
@@ -50,22 +54,26 @@ internal fun Project.configurePrintApksTask(extension: AndroidComponentsExtensio
             if (artifact != null && testSources != null) {
                 tasks.register(
                     "${variant.name}PrintTestApk",
-                    PrintApkLocationTask::class.java
+                    PrintApkLocationTask::class.java,
                 ) {
-                    apkFolder.set(artifact)
+                    apkFolder = artifact
-                    builtArtifactsLoader.set(loader)
+                    builtArtifactsLoader = loader
-                    variantName.set(variant.name)
+                    variantName = variant.name
-                    sources.set(testSources)
+                    sources = testSources
                 }
             }
         }
     }
 }
 
+@DisableCachingByDefault(because = "Prints output")
 internal abstract class PrintApkLocationTask : DefaultTask() {
+
+    @get:PathSensitive(PathSensitivity.RELATIVE)
     @get:InputDirectory
     abstract val apkFolder: DirectoryProperty
 
+    @get:PathSensitive(PathSensitivity.RELATIVE)
     @get:InputFiles
     abstract val sources: ListProperty<Directory>
 
@@ -79,14 +87,12 @@ internal abstract class PrintApkLocationTask : DefaultTask() {
     fun taskAction() {
         val hasFiles = sources.orNull?.any { directory ->
             directory.asFileTree.files.any {
-                it.isFile && it.parentFile.path.contains("build${File.separator}generated").not()
+                it.isFile && "build${File.separator}generated" !in it.parentFile.path
             }
         } ?: throw RuntimeException("Cannot check androidTest sources")
 
         // Don't print APK location if there are no androidTest source files
-        if (!hasFiles) {
+        if (!hasFiles) return
-            return
-        }
 
         val builtArtifacts = builtArtifactsLoader.get().load(apkFolder.get())
             ?: throw RuntimeException("Cannot load APKs")
@@ -95,4 +101,4 @@ internal abstract class PrintApkLocationTask : DefaultTask() {
         val apk = File(builtArtifacts.elements.single().outputFile).toPath()
         println(apk)
     }
-}
+}

build.gradle.kts

@@ -27,13 +27,19 @@ buildscript {
             exclude(group = "com.google.protobuf")
         }
     }
+
 }
 
-// Lists all plugins used throughout the project without applying them.
+// Lists all plugins used throughout the project
 plugins {
     alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.android.library) apply false
+    alias(libs.plugins.android.test) apply false
+    alias(libs.plugins.baselineprofile) apply false
+    alias(libs.plugins.compose) apply false
     alias(libs.plugins.kotlin.jvm) apply false
     alias(libs.plugins.kotlin.serialization) apply false
+    alias(libs.plugins.dependencyGuard) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
     alias(libs.plugins.firebase.perf) apply false
     alias(libs.plugins.gms) apply false
@@ -41,4 +47,6 @@ plugins {
     alias(libs.plugins.ksp) apply false
     alias(libs.plugins.roborazzi) apply false
     alias(libs.plugins.secrets) apply false
+    alias(libs.plugins.room) apply false
+    alias(libs.plugins.module.graph) apply true // Plugin applied to allow module graph generation
 }

compose_compiler_config.conf

@@ -0,0 +1,11 @@
+// This file contains classes (with possible wildcards) that the Compose Compiler will treat as stable.
+// It allows us to define classes that our not part of our codebase without wrapping them in a stable class.
+// For more information, check https://developer.android.com/jetpack/compose/performance/stability/fix#configuration-file
+
+// We always use immutable classes for our data model, to avoid running the Compose compiler
+// in the module we declare it to be stable here.
+com.google.samples.apps.nowinandroid.core.model.data.*
+
+// Java standard library classes
+java.time.ZoneId
+java.time.ZoneOffset

core/analytics/README.md

@@ -0,0 +1,3 @@
+# :core:analytics module
+## Dependency graph
+![Dependency graph](../../docs/images/graphs/dep_graph_core_analytics.svg)

core/analytics/build.gradle.kts

@@ -24,9 +24,8 @@ android {
 }
 
 dependencies {
-    implementation(platform(libs.firebase.bom))
     implementation(libs.androidx.compose.runtime)
-    implementation(libs.androidx.core.ktx)
+
-    implementation(libs.firebase.analytics)
+    prodImplementation(platform(libs.firebase.bom))
-    implementation(libs.kotlinx.coroutines.android)
+    prodImplementation(libs.firebase.analytics)
 }

core/analytics/src/demo/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt

@@ -23,7 +23,7 @@ import dagger.hilt.components.SingletonComponent
 
 @Module
 @InstallIn(SingletonComponent::class)
-abstract class AnalyticsModule {
+internal abstract class AnalyticsModule {
     @Binds
     abstract fun bindsAnalyticsHelper(analyticsHelperImpl: StubAnalyticsHelper): AnalyticsHelper
 }

core/analytics/src/main/kotlin/com/google/samples/apps/nowinandroid/core/analytics/StubAnalyticsHelper.kt

@@ -27,7 +27,7 @@ private const val TAG = "StubAnalyticsHelper"
  * analytics events should be sent to a backend.
  */
 @Singleton
-class StubAnalyticsHelper @Inject constructor() : AnalyticsHelper {
+internal class StubAnalyticsHelper @Inject constructor() : AnalyticsHelper {
     override fun logEvent(event: AnalyticsEvent) {
         Log.d(TAG, "Received analytics event: $event")
     }

core/analytics/src/prod/kotlin/com/google/samples/apps/nowinandroid/core/analytics/AnalyticsModule.kt

@@ -28,13 +28,15 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-abstract class AnalyticsModule {
+internal abstract class AnalyticsModule {
     @Binds
     abstract fun bindsAnalyticsHelper(analyticsHelperImpl: FirebaseAnalyticsHelper): AnalyticsHelper
 
     companion object {
         @Provides
         @Singleton
-        fun provideFirebaseAnalytics(): FirebaseAnalytics { return Firebase.analytics }
+        fun provideFirebaseAnalytics(): FirebaseAnalytics {
+            return Firebase.analytics
+        }
     }
 }