feat(release): bump version

Fixes: ca6b941cbb ("fix(release): update secrets handling scripts")

.gitattributes

@@ -2,3 +2,4 @@
 **/dependencies/** linguist-generated
 **/clawicons/** linguist-generated
 android/src/main/baseline-prof.txt linguist-generated -diff
+android/src/main/generated/** linguist-generated -diff

.github/renovate.json5

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",
     ":dependencyDashboard",
@@ -15,27 +16,37 @@
         "https://maven.google.com/",
         "https://repo1.maven.org/maven2",
         "https://plugins.gradle.org/m2/",
+        "https://jitpack.io",
       ],
     },
+    {
+      "matchPackageNames": [
+        "androidx.compose.compiler:compiler",
+        "dev.drewhamilton.poko",
+        "org.jetbrains.kotlin:kotlin-gradle-plugin",
+        "org.jetbrains.kotlin.plugin.serialization",
+      ],
+      "groupName": "Kotlin and Compose",
+    },
     {
       "matchPackagePatterns": [
-        "^kotlin",
-        "^org.jetbrains.kotlin",
-        "^androidx.compose.compiler"
+        "^androidx.*",
       ],
-      "groupName": "kotlin"
+      "groupName": "androidx"
     },
     {
-      "managers": [
-        "gradle"
+      "matchPackagePatterns": [
+        "^io.sentry",
+        "^sentry",
       ],
-      "packagePatterns": [
-        // We want to stay in sync with Retrofit
-        "^com.squareup.okhttp3",
-        // Renovate refuses to stop resolving this from the snapshots repo
-        "^app.cash.sqldelight",
+      "groupName": "sentry"
+    },
+    {
+      "matchPackageNames": [
+        "com.android.tools:r8",
+        "com.squareup.anvil",
       ],
-      "enabled": false
+      "enabled": false,
     },
   ],
   "regexManagers": [
@@ -50,17 +61,6 @@
       "depNameTemplate": "com.facebook:ktfmt",
       "registryUrlTemplate": "https://repo1.maven.org/maven2/",
     },
-    {
-      "fileMatch": [
-        "Detekt\.kt$"
-      ],
-      "matchStrings": [
-        "COMPOSE_RULES_VERSION = \"(?<currentValue>.*)\""
-      ],
-      "datasourceTemplate": "maven",
-      "depNameTemplate": "io.nlopez.compose.rules:detekt",
-      "registryUrlTemplate": "https://repo1.maven.org/maven2/",
-    },
     {
       "fileMatch": [
         "gradle/libs.versions.toml"
@@ -72,15 +72,5 @@
       "depNameTemplate": "androidx.compose.compiler:compiler",
       "registryUrlTemplate": "https://maven.google.com",
     },
-    {
-      "fileMatch": [
-        "qodana.yaml"
-      ],
-      "matchStrings": [
-        "jetbrains/qodana-jvm-android:(?<currentValue>.*)"
-      ],
-      "datasourceTemplate": "docker",
-      "depNameTemplate": "jetbrains/qodana-jvm-android",
-    }
-  ]
+  ],
 }

.github/workflows/baseline-profile.yml

@@ -6,9 +6,8 @@ on:
     - cron: '43 0 * * *'
   workflow_dispatch:
 
-env:
-  AVD_API_LEVEL: 31
-  AVD_ARCH: x86_64
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   baseline-profile:
@@ -19,13 +18,13 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
-
+ 
     - name: Set up JDK
-      uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: temurin
         java-version: 18
@@ -37,19 +36,10 @@ jobs:
         git config user.email noreply@github.com
 
     - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@6095a76664413da4c8c134ee32e8a8ae900f0f1f # v2.4.0
+      uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # v2.7.0
       with:
         gradle-home-cache-cleanup: true
-
-    # Restore AVD from cache
-    - name: Cache AVD
-      uses: actions/cache@69d9d449aced6a2ede0bc19182fadc3a0a42d2b0 # v3.2.6
-      id: avd-cache
-      with:
-        path: |
-          ~/.android/avd/*
-          ~/.android/adb*
-        key: ${{ runner.os }}-avd-${{ env.AVD_API_LEVEL }}-${{ env.AVD_ARCH }}
+        cache-read-only: true
 
     - name: Decrypt secrets
       run: |
@@ -61,64 +51,27 @@ jobs:
     # This allows us to build most of what we need without the emulator running
     # and using resources
     - name: Build app and benchmark
-      run: ./gradlew :benchmark:assembleBenchmark :android:assembleBenchmark
+      run: ./gradlew :benchmark:assembleNonMinifiedBenchmark :android:assembleNonMinifiedRelease
 
-    # Now use reactivecircus/android-emulator-runner to spin up an emulator. We're gonna use it again
-    # to actually run the test once the emulator has booted.
-    - name: Create AVD snapshot for caching
-      if: steps.avd-cache.outputs.cache-hit != 'true'
-      uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # v2
-      with:
-        api-level: ${{ env.AVD_API_LEVEL }}
-        arch: ${{ env.AVD_ARCH }}
-        channel: canary
-        target: aosp_atd
-        force-avd-creation: false
-        emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-        disable-animations: false
-        disk-size: 8G
-        script: echo "Generated AVD snapshot for caching."
+    - name: Setup emulator for benchmark
+      run: ./gradlew :benchmark:api31Setup
 
-    # Run our baseline profile generator. We need to manually pull the baseline profiles off the
-    # emulator when using the GA runner
-    - name: Run benchmark
-      uses: reactivecircus/android-emulator-runner@50986b1464923454c95e261820bc626f38490ec0 # v2
-      with:
-        api-level: ${{ env.AVD_API_LEVEL }}
-        arch: ${{ env.AVD_ARCH }}
-        channel: canary
-        target: aosp_atd
-        disable-animations: true
-        disable-spellchecker: true
-        disk-size: 8G
-        script: |
-          # Run our benchmark, enabling only tests using BaselineProfile
-          ./gradlew connectedBenchmarkAndroidTest -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile --stacktrace
-          # Need to manually pull the generated profiles from the emulator
-          adb pull /sdcard/Android/media/dev.msfjarvis.claw.benchmark benchmark/build/outputs/baseline-prof/
+    - name: Run benchmark on Gradle Managed Device
+      run: |
+        ./gradlew cleanManagedDevices
+        ./gradlew generateBaselineProfile \
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
 
-    # If we're on main branch, copy over the baseline profile and
-    # commit it to the repository (if changed)
+    # If we're on main branch, commit the baseline profile to the repository (if changed)
     - name: Commit baseline profile into main
       if: github.ref == 'refs/heads/main'
       run: |
-        # Pull down any changes which may have been committed while this workflow has been running
-        git pull
-        # Sort the baseline profile, saving it to app/
-        sort -o android/src/main/baseline-prof.txt benchmark/build/outputs/baseline-prof/BaselineProfileGenerator_startup-baseline-prof.txt
         # If the baseline profile has changed, commit it
-        if [[ $(git diff --stat android/src/main/baseline-prof.txt) != '' ]]; then
-          git add android/src/main/baseline-prof.txt
+        if [[ $(git diff --stat android/src/main/generated/baselineProfiles/baseline-prof.txt) != '' ]]; then
+          git add android/src/main/generated/baselineProfiles/baseline-prof.txt
           git commit -m "chore(android): refresh baseline profile" && git push
         fi
 
-    # Upload the entire generated folder and attach it to the CI run
-    - name: Attach baseline profile
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-      with:
-        name: Baseline profile output
-        path: benchmark/build/outputs/baseline-prof
-
     - name: Clean secrets
       if: always()
       run: scripts/signing-cleanup.sh

.github/workflows/ci.yml

@@ -18,27 +18,23 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      with:
+        fetch-depth: 0
 
     - name: Set up JDK
-      uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: temurin
         java-version: 18
 
     - name: Run unit tests
-      uses: gradle/gradle-build-action@6095a76664413da4c8c134ee32e8a8ae900f0f1f # v2.4.0
+      uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # v2.7.0
       with:
-        arguments: --no-configuration-cache --stacktrace check
-        gradle-home-cache-cleanup: true
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-    - name: Run Detekt
-      uses: gradle/gradle-build-action@6095a76664413da4c8c134ee32e8a8ae900f0f1f # v2.4.0
-      with:
-        arguments: --no-configuration-cache --stacktrace detektMain
+        arguments: --no-configuration-cache --stacktrace check -PslimTests
         gradle-home-cache-cleanup: true
         cache-read-only: ${{ github.ref != 'refs/heads/main' }}
+        dependency-graph: generate-and-submit
 
     - name: (Fail-only) Upload test report
       if: failure()
@@ -53,23 +49,31 @@ jobs:
     needs: [ "check" ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
 
     - name: Set up JDK
-      uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: temurin
         java-version: 18
 
+    - name: Set up Git author
+      shell: bash
+      run: |
+        git config user.name "GitHub Actions"
+        git config user.email noreply@github.com
+
     - name: Decrypt secrets
       run: |
         ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
+        ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
       env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+        AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
 
     - name: Build release app
-      uses: gradle/gradle-build-action@6095a76664413da4c8c134ee32e8a8ae900f0f1f # v2.4.0
+      uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # v2.7.0
+      env:
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       with:
         arguments: --no-configuration-cache --stacktrace collectReleaseApks
         gradle-home-cache-cleanup: true
@@ -79,6 +83,6 @@ jobs:
       run: scripts/signing-cleanup.sh
 
     - name: Deploy snapshot
-      run: scripts/deploy-snapshot.sh
+      run: scripts/deploy-snapshot.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/codeql_analysis.yml

@@ -1,7 +1,12 @@
-name: "CodeQL"
+name: CodeQL
 
 on:
   workflow_dispatch:
+  schedule:
+    - cron: '31 7 * * 3'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   analyze:
@@ -13,14 +18,33 @@ jobs:
       security-events: write
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+
+    - name: Set up JDK
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      with:
+        distribution: temurin
+        java-version: 18
+
+    - name: Setup Gradle caching
+      uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # v2.7.0
+      with:
+        gradle-home-cache-cleanup: true
+        cache-read-only: true
+
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
+      uses: github/codeql-action/init@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2
       with:
         languages: java
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
+        tools: latest
+        queries: +security-extended
+
+    - name: Build project
+      shell: bash
+      run: |
+        ./gradlew assemble -PslimTests
+
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@32dc499307d133bb5085bae78498c0ac2cf762d5 # v2
+      uses: github/codeql-action/analyze@0ba4244466797eb048eb91a6cd43d5c03ca8bd05 # v2.21.2
       with:
         category: "/language:java"

.github/workflows/qodana_scan.yml

@@ -1,16 +0,0 @@
-name: Qodana
-
-on:
-  workflow_dispatch:
-
-jobs:
-  qodana:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
-        with:
-          fetch-depth: 0
-      - name: 'Qodana Scan'
-        uses: JetBrains/qodana-action@7afb26c0c2f325c0d5c21ea1f617c79c7f899337 # v2022.3.4
-        env:
-          QODANA_TOKEN: ${{ secrets.QODANA_TOKEN }}

.github/workflows/release.yml

@@ -2,18 +2,21 @@ name: Release to Google Play
 on:
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
   publish-google-play-release:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
 
     - name: Set up JDK
-      uses: actions/setup-java@3f07048e3d294f56e9b90ac5ea2c6f74e9ad0f98 # v3.10.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         distribution: temurin
         java-version: 18
@@ -25,7 +28,7 @@ jobs:
         git config user.email noreply@github.com
 
     - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@6095a76664413da4c8c134ee32e8a8ae900f0f1f # v2.4.0
+      uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c # v2.7.0
       with:
         gradle-home-cache-cleanup: true
         cache-read-only: true
@@ -33,9 +36,9 @@ jobs:
     - name: Decrypt secrets
       run: |
         ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
+        ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
       env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+        AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
 
     - name: Get current version
       shell: bash
@@ -45,7 +48,7 @@ jobs:
         echo VERSION="${VERSION}" >> $GITHUB_ENV
 
     - name: Update changelog
-      uses: msfjarvis/keep-a-changelog-new-release@ce8769801992253adb0209055c236a0cd192500b # 2.0.0
+      uses: msfjarvis/keep-a-changelog-new-release@bf43ae42f4e42f137572950af426efcf6e777207 # 2.1.0
       with:
         tag: v${{ env.VERSION }}
         version: ${{ env.VERSION }}
@@ -57,8 +60,11 @@ jobs:
 
     - name: Build release assets
       shell: bash
+      env:
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       run: |
-        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle
+        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle -PsentryUploadMappings
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh

.gitignore

@@ -245,3 +245,5 @@ hs_err_pid*
 
 keystore.properties
 distribution/
+screenshots/
+claw-export.json

.rgignore

@@ -1,2 +1,3 @@
 *.json
 baseline-prof.txt
+**/test/resources/**

CHANGELOG.md

@@ -7,6 +7,106 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.33.0] - 2023-07-31
+
+### Changed
+
+*   Yet another attempt at fixing native library crashes
+*   Rework how baseline profiles are generated
+
+## [1.32.0] - 2023-07-27
+
+### Changed
+
+*   Upgrade to AndroidX July 26 release
+*   Revert selectable text feature due to sporadic crashes
+
+## [1.31.0] - 2023-07-25
+
+### Added
+
+*   Added the ability to search for posts
+*   Text in the comments page is now selectable
+
+### Changed
+
+*   Upgrade to Compose July release
+*   Upgrade to Kotlin 1.9.0
+
+## [1.30.0] - 2023-07-02
+
+### Changed
+
+*   Added another workaround for native library loading crash
+
+## [1.29.0] - 2023-06-08
+
+### Added
+
+*   Backup and restore options for saved posts
+
+### Fixed
+
+*   Spamming the comments button no longer causes it to be opened multiple times
+*   Saved posts screen now has a visual indication when you have nothing saved
+*   Iconography has been updated across the board to be more consistent
+
+## [1.28.0] - 2023-06-03
+
+### Changed
+
+*   Navigation transitions have been slightly sped up
+
+### Fixed
+
+*   Add workaround for a native library loading crash observed on some devices
+
+## [1.27.0] - 2023-05-31
+
+### Changed
+
+*   Small accessibility improvements
+*   Slightly tweak the layout for story items to take less vertical space
+*   Upgrade to Compose `1.5.0-beta01` release
+*   Set accessibility web URI for profile screen
+*   Directly use Material Icons from upstream artifacts
+*   Upgrade dependencies
+*   Add adaptive navigation support (thanks @Yash-Garg)
+*   Use latest SQLite for backing databases
+
+## [1.26.0] - 2023-05-03
+
+### Changed
+
+*   Upgrade to Compose May release
+*   Disable Sentry performance reporting
+*   Migrate to Compose Foundation `FlowRow` in `LobstersCard`
+
+## [1.25.0] - 2023-04-18
+
+### Changed
+
+*   Make the app draw edge to edge
+*   Simplify Top App Bar color scheme
+*   Rework how baseline profiles are generated
+*   Upgrade to Compose April release
+
+## [1.24.0] - 2023-03-24
+
+### Changed
+
+*   Rebuild app icon assets to align better with Material guidelines
+*   Adopt Slack's Compose lints and address issues found by it
+*   Upgrade to OkHttp 4.x
+*   Upgrade to Compose March release
+*   Start work on support for logging in with lobste.rs
+
+## [1.23.0] - 2023-03-02
+
+### Added
+
+*   Introduce [Sentry](https://sentry.io) for error reporting and performance monitoring
+
 ## [1.22.0] - 2023-03-02
 
 ### Changed
@@ -176,7 +276,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *   Initial Play Store release
 
-[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.22.0...HEAD
+[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.33.0...HEAD
+
+[1.33.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.32.0...v1.33.0
+
+[1.32.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.31.0...v1.32.0
+
+[1.31.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.30.0...v1.31.0
+
+[1.30.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.29.0...v1.30.0
+
+[1.29.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.28.0...v1.29.0
+
+[1.28.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.27.0...v1.28.0
+
+[1.27.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.26.0...v1.27.0
+
+[1.26.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.25.0...v1.26.0
+
+[1.25.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.24.0...v1.25.0
+
+[1.24.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.23.0...v1.24.0
+
+[1.23.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.22.0...v1.23.0
 
 [1.22.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.21.0...v1.22.0
 

README.md

@@ -8,12 +8,35 @@ Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), b
        height="80" />
 </a>
 
+> Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/nightly).
+
 <img src="https://github.com/msfjarvis/compose-lobsters/blob/main/.github/readme_feature.webp"
-     alt="Side by side screenshots of the app's main page in dark and light UI modes"
-     height="550" />
+     alt="A grid of screenshots from the app, in clockwise order: the main screen, the comments page, the search page and the saved posts page"
+     width="550" />
 
-Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/nightly).
+## Dependency Diagram
 
+```mermaid
+%%{
+  init: {
+    'theme': 'neutral'
+  }
+}%%
+
+graph LR
+
+  benchmark --> android
+  android --> api
+  android --> common
+  android --> core
+  android --> database
+  android --> model
+  api --> model
+  common --> core
+  common --> database
+  common --> model
+
+```
 ## License
 
 See [LICENSE](LICENSE)

android/benchmark-rules.pro

@@ -1 +0,0 @@
--dontobfuscate

android/build.gradle.kts

@@ -4,23 +4,21 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+@file:Suppress("UnstableApiUsage")
+
+import dev.msfjarvis.claw.gradle.addTestDependencies
 
 plugins {
   id("dev.msfjarvis.claw.android-application")
   id("dev.msfjarvis.claw.rename-artifacts")
   id("dev.msfjarvis.claw.kotlin-android")
   id("dev.msfjarvis.claw.kotlin-kapt")
+  id("dev.msfjarvis.claw.sentry")
   id("dev.msfjarvis.claw.versioning-plugin")
   alias(libs.plugins.anvil)
+  alias(libs.plugins.modulegraphassert)
   alias(libs.plugins.whetstone)
-}
-
-whetstone {
-  addOns {
-    compose.set(true)
-    workManager.set(true)
-  }
+  alias(libs.plugins.baselineprofile)
 }
 
 android {
@@ -31,39 +29,64 @@ android {
     useLiveLiterals = false
     kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
-  buildTypes {
-    create("benchmark") {
-      signingConfig = signingConfigs["debug"]
-      matchingFallbacks += "release"
-      isDebuggable = false
-      proguardFile("benchmark-rules.pro")
-    }
+  packaging { jniLibs { useLegacyPackaging = true } }
+}
+
+baselineProfile {
+  dexLayoutOptimization = true
+  mergeIntoMain = true
+  saveInSrc = true
+  from(projects.benchmark.dependencyProject)
+}
+
+moduleGraphAssert {
+  assertOnAnyBuild = true
+  maxHeight = 4
+  restricted = arrayOf(":core -X> :.*")
+}
+
+whetstone {
+  addOns {
+    compose.set(true)
+    workManager.set(true)
   }
 }
 
 dependencies {
-  kapt(libs.dagger.compiler)
   implementation(platform(libs.androidx.compose.bom))
-  implementation(libs.dagger)
-  implementation(projects.api)
-  implementation(projects.common)
-  implementation(projects.core)
-  implementation(projects.coroutineUtils)
-  implementation(projects.database)
-  implementation(projects.metadataExtractor)
-  implementation(projects.model)
+  implementation(platform(libs.okhttp.bom))
   implementation(libs.accompanist.sysuicontroller)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.material)
+  implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.compose.material3)
+  implementation(libs.androidx.compose.material3.window.size)
   implementation(libs.androidx.core.splashscreen)
+  implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
   implementation(libs.androidx.profileinstaller)
-  implementation(libs.androidx.work.runtime.ktx)
+  implementation(libs.androidx.work.runtime)
   implementation(libs.coil)
   implementation(libs.copydown)
+  implementation(libs.dagger)
+  implementation(libs.jsoup)
+  implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.napier)
+  implementation(libs.soloader)
   implementation(libs.sqldelight.extensions.coroutines)
+  implementation(libs.unfurl)
+  implementation(projects.api)
+  implementation(projects.common)
+  implementation(projects.core)
+  implementation(projects.database)
+  implementation(projects.model)
+
+  kapt(libs.dagger.compiler)
+
+  testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.okhttp.mockwebserver)
+  addTestDependencies(project)
 }

android/lint-baseline.xml

@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.0-alpha09" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.0-alpha09)" variant="all" version="7.4.0-alpha09">
+<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="gradle" dependencies="true" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
+
+    <issue
+        id="NewerVersionAvailable"
+        message="A newer version of com.squareup.anvil than 2.4.7 is available: 2.4.7-1-8"
+        errorLine1="anvil = &quot;com.squareup.anvil:2.4.7&quot;"
+        errorLine2="        ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/libs.versions.toml"
+            line="100"
+            column="9"/>
+    </issue>
+
+    <issue
+        id="UsingMaterialAndMaterial3Libraries"
+        message="Using a material import while also using the material3 library"
+        errorLine1="import androidx.compose.material.ExperimentalMaterialApi"
+        errorLine2="       ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt"
+            line="17"
+            column="8"/>
+    </issue>
 
 </issues>

android/proguard-android-optimize.pro

@@ -1,22 +1,19 @@
 -allowaccessmodification
--dontpreverify
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
 -verbose
 
 -keepattributes *Annotation*
 
 -keepclasseswithmembernames class * {
-    native <methods>;
+  native <methods>;
 }
 
 -keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
+  public static **[] values();
+  public static ** valueOf(java.lang.String);
 }
 
 -keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
+  public static final ** CREATOR;
 }
 
 -keep class androidx.annotation.Keep
@@ -24,13 +21,13 @@
 -keep @androidx.annotation.Keep class * {*;}
 
 -keepclasseswithmembers class * {
-    @androidx.annotation.Keep <methods>;
+  @androidx.annotation.Keep <methods>;
 }
 
 -keepclasseswithmembers class * {
-    @androidx.annotation.Keep <fields>;
+  @androidx.annotation.Keep <fields>;
 }
 
 -keepclasseswithmembers class * {
-    @androidx.annotation.Keep <init>(...);
+  @androidx.annotation.Keep <init>(...);
 }

android/proguard-rules.pro

@@ -1,2 +1,22 @@
 -dontobfuscate
 -keepattributes SourceFile, LineNumberTable
+
+# From https://github.com/square/retrofit/blob/master/retrofit/src/main/resources/META-INF/proguard/retrofit2.pro
+
+# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
+# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+# Keep inherited services.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface * extends <1>
+
+# 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
+
+# R8 full mode strips generic signatures from return types if not kept.
+-if interface * { @retrofit2.http.* public *** *(...); }
+-keep,allowoptimization,allowshrinking,allowobfuscation class <3>

android/src/debug/res/values/strings.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <resources>
   <string name="app_name">Claw β</string>
 </resources>

android/src/main/AndroidManifest.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools">
 
@@ -6,13 +11,13 @@
   <application
     android:name=".ClawApplication"
     android:dataExtractionRules="@xml/data_extraction_rules"
+    android:enableOnBackInvokedCallback="true"
     android:fullBackupContent="@xml/full_backup_content"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
     android:roundIcon="@mipmap/ic_launcher"
     android:supportsRtl="true"
     android:theme="@style/Theme.Claw.SplashScreen"
-    android:enableOnBackInvokedCallback="true"
     tools:targetApi="tiramisu">
     <profileable
       android:shell="true"
@@ -25,19 +30,6 @@
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:scheme="https" />
-        <data android:ssp="//lobste.rs" />
-
-        <data android:host="lobste.rs" />
-        <data android:path="/" />
-        <data android:scheme="https" />
-      </intent-filter>
 
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -163,5 +155,14 @@
         <action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
       </intent-filter>
     </receiver>
+    <!-- Required: set your sentry.io project identifier (DSN) -->
+    <meta-data android:name="io.sentry.dsn" android:value="${sentryDsn}" />
+    <!-- enable automatic breadcrumbs for user interactions (clicks, swipes, scrolls) -->
+    <meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="${enableSentry}" />
+    <meta-data android:name="io.sentry.breadcrumbs.user-interaction" android:value="${enableSentry}" />
+    <!-- enable screenshot for crashes -->
+    <meta-data android:name="io.sentry.attach-screenshot" android:value="${enableSentry}" />
+    <!-- enable view hierarchy for crashes -->
+    <meta-data android:name="io.sentry.attach-view-hierarchy" android:value="${enableSentry}" />
   </application>
 </manifest>

android/src/main/kotlin/dev/msfjarvis/claw/android/ClawApplication.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -15,6 +15,7 @@ import androidx.work.WorkManager
 import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.app.ApplicationComponentOwner
 import com.deliveryhero.whetstone.app.ContributesAppInjector
+import com.facebook.soloader.SoLoader
 import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
 import dev.msfjarvis.claw.core.injection.AppPlugin
 import java.util.concurrent.TimeUnit
@@ -31,6 +32,8 @@ class ClawApplication : Application(), ApplicationComponentOwner {
   override fun onCreate() {
     Whetstone.inject(this)
     super.onCreate()
+    SoLoader.init(this, false)
+    SoLoader.loadLibrary("sqlite3x")
     plugins.forEach { plugin -> plugin.apply(this) }
     val postUpdateWorkRequest =
       PeriodicWorkRequestBuilder<SavedPostUpdaterWorker>(POST_REFRESH_PERIOD, TimeUnit.HOURS)

android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -11,7 +11,10 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.core.view.WindowCompat
 import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.activity.ContributesActivityInjector
 import dev.msfjarvis.claw.android.ui.LobstersApp
@@ -26,14 +29,19 @@ class MainActivity : ComponentActivity() {
   @Inject lateinit var htmlConverter: HTMLConverter
   private var webUri: String? = null
 
+  @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     installSplashScreen()
     Whetstone.inject(this)
+    WindowCompat.setDecorFitsSystemWindows(window, false)
     setContent {
+      val windowSizeClass = calculateWindowSizeClass(this)
+
       LobstersApp(
         urlLauncher = urlLauncher,
         htmlConverter = htmlConverter,
+        windowSizeClass = windowSizeClass,
         setWebUri = { url -> webUri = url },
       )
     }

android/src/main/kotlin/dev/msfjarvis/claw/android/injection/DataStoreModule.kt

@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.injection
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.PreferenceDataStoreFactory
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.preferencesDataStoreFile
+import com.deliveryhero.whetstone.ForScope
+import com.deliveryhero.whetstone.app.ApplicationScope
+import com.squareup.anvil.annotations.ContributesTo
+import dagger.Module
+import dagger.Provides
+import dev.msfjarvis.claw.core.coroutines.DispatcherProvider
+import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+
+@Module
+@ContributesTo(ApplicationScope::class)
+class DataStoreModule {
+
+  @Singleton
+  @Provides
+  fun provideLoginDatastore(
+    @ForScope(ApplicationScope::class) context: Context,
+    dispatcherProvider: DispatcherProvider,
+  ): DataStore<Preferences> {
+    return PreferenceDataStoreFactory.create(
+      corruptionHandler = null,
+      migrations = emptyList(),
+      scope = CoroutineScope(dispatcherProvider.io() + SupervisorJob()),
+    ) {
+      context.preferencesDataStoreFile("login")
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/injection/HTMLConverterModule.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.

android/src/main/kotlin/dev/msfjarvis/claw/android/injection/MetadataExtractorModule.kt

@@ -1,25 +1,44 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.android.injection
 
-import com.chimbori.crux.Crux
 import com.deliveryhero.whetstone.app.ApplicationScope
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
+import io.github.aakira.napier.Napier
+import me.saket.unfurl.UnfurlLogger
+import me.saket.unfurl.Unfurler
 import okhttp3.OkHttpClient
 
 @Module
 @ContributesTo(ApplicationScope::class)
 object MetadataExtractorModule {
   @Provides
-  fun provideCrux(
+  fun provideUnfurlLogger(): UnfurlLogger {
+    return object : UnfurlLogger {
+      override fun log(message: String) {
+        Napier.d { message }
+      }
+
+      override fun log(e: Throwable, message: String) {
+        Napier.e(e) { message }
+      }
+    }
+  }
+
+  @Provides
+  fun provideUnfurler(
     okHttpClient: OkHttpClient,
-  ): Crux {
-    return Crux(okHttpClient = okHttpClient)
+    logger: UnfurlLogger,
+  ): Unfurler {
+    return Unfurler(
+      httpClient = okHttpClient,
+      logger = logger,
+    )
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/injection/annotations.kt

@@ -1,15 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.injection
-
-import javax.inject.Qualifier
-
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class DatabaseDispatcher
-
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class MainDispatcher
-
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class IODispatcher

android/src/main/kotlin/dev/msfjarvis/claw/android/paging/LobstersPagingSource.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -13,7 +13,7 @@ import com.slack.eithernet.ApiResult.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import dev.msfjarvis.claw.android.injection.IODispatcher
+import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.model.LobstersPost
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher

android/src/main/kotlin/dev/msfjarvis/claw/android/paging/SearchPagingSource.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright © 2021-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.slack.eithernet.ApiResult
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
+import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.model.LobstersPost
+import java.io.IOException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+/**
+ * Duplicate of [LobstersPagingSource] with an additional optimization to not continue loading
+ * further pages if nothing is found in the current one. This is required to prevent the app from
+ * hammering the search endpoint with up to 70 consecutive requests for the search results of a
+ * blank query.
+ */
+class SearchPagingSource
+@AssistedInject
+constructor(
+  @Assisted private val remoteFetcher: RemoteFetcher<LobstersPost>,
+  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
+) : PagingSource<Int, LobstersPost>() {
+  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int? {
+    return state.anchorPosition?.let { anchorPosition ->
+      (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
+    }
+  }
+
+  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
+    val page = params.key ?: STARTING_PAGE_INDEX
+    return when (val result = withContext(ioDispatcher) { remoteFetcher.getItemsAtPage(page) }) {
+      is ApiResult.Success -> {
+        // Optimization: prevent fetching more pages if we found no items, this means
+        // there is no active search query.
+        val nextKey = if (result.value.isEmpty()) null else page + 1
+        LoadResult.Page(
+          itemsBefore = (page - 1) * PAGE_SIZE,
+          data = result.value,
+          prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
+          nextKey = nextKey,
+        )
+      }
+      is ApiResult.Failure.NetworkFailure -> LoadResult.Error(result.error)
+      is ApiResult.Failure.UnknownFailure -> LoadResult.Error(result.error)
+      is ApiResult.Failure.HttpFailure,
+      is ApiResult.Failure.ApiFailure ->
+        LoadResult.Error(IOException("API returned an invalid response"))
+    }
+  }
+
+  @AssistedFactory
+  interface Factory {
+    fun create(remoteFetcher: RemoteFetcher<LobstersPost>): SearchPagingSource
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/settings/LoginSettings.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.settings
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.stringPreferencesKey
+import javax.inject.Inject
+
+class LoginSettings
+@Inject
+constructor(
+  val dataStore: DataStore<Preferences>,
+) {
+  companion object {
+    val CSRF_TOKEN = stringPreferencesKey("csrf_token")
+    val LOGIN_COOKIE = stringPreferencesKey("login_cookie")
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt

@@ -6,23 +6,38 @@
  */
 package dev.msfjarvis.claw.android.ui
 
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.ImportExport
+import androidx.compose.material.icons.filled.NewReleases
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Whatshot
+import androidx.compose.material.icons.outlined.FavoriteBorder
+import androidx.compose.material.icons.outlined.NewReleases
+import androidx.compose.material.icons.outlined.Search
+import androidx.compose.material.icons.outlined.Whatshot
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
@@ -38,43 +53,46 @@ import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.deliveryhero.whetstone.compose.injectedViewModel
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.android.ui.datatransfer.DataTransferScreen
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
+import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
 import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
+import dev.msfjarvis.claw.android.ui.decorations.TransparentSystemBars
 import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
 import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
+import dev.msfjarvis.claw.android.ui.lists.SearchList
+import dev.msfjarvis.claw.android.ui.navigation.ClawNavigationType
 import dev.msfjarvis.claw.android.ui.navigation.Destinations
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.common.comments.CommentsPage
 import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.res.ClawIcons
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.decorations.ClawAppBar
-import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.launch
 
-@OptIn(
-  ExperimentalComposeUiApi::class,
-  ExperimentalMaterial3Api::class,
-)
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun LobstersApp(
   urlLauncher: UrlLauncher,
   htmlConverter: HTMLConverter,
+  windowSizeClass: WindowSizeClass,
   setWebUri: (String?) -> Unit,
   modifier: Modifier = Modifier,
   viewModel: ClawViewModel = injectedViewModel(),
 ) {
-  val systemUiController = rememberSystemUiController()
   val hottestListState = rememberLazyListState()
   val newestListState = rememberLazyListState()
   val savedListState = rememberLazyListState()
+  val searchListState = rememberLazyListState()
   val navController = rememberNavController()
   val coroutineScope = rememberCoroutineScope()
+  val snackbarHostState = remember { SnackbarHostState() }
   val postActions = rememberPostActions(urlLauncher, navController, viewModel)
   val backStackEntry by navController.currentBackStackEntryAsState()
   val currentDestination = backStackEntry?.destination?.route
@@ -82,156 +100,195 @@ fun LobstersApp(
 
   val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
   val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
-  val savedPosts by viewModel.savedPosts.collectAsState(emptyMap())
+  val savedPosts by viewModel.savedPosts.collectAsState(persistentMapOf())
+
+  val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
 
   LobstersTheme(
     dynamicColor = true,
     providedValues = arrayOf(LocalUriHandler provides urlLauncher),
   ) {
-    val currentUiMode = LocalConfiguration.current.uiMode
-    val systemBarsColor = MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation()
-    val backgroundColor = MaterialTheme.colorScheme.background
     val navItems =
-      listOf(
+      persistentListOf(
         NavigationItem(
           label = "Hottest",
           route = Destinations.Hottest.route,
-          icon = ClawIcons.Flame,
-          selectedIcon = ClawIcons.FlameFilled,
+          icon = Icons.Outlined.Whatshot,
+          selectedIcon = Icons.Filled.Whatshot,
         ) {
           coroutineScope.launch { hottestListState.animateScrollToItem(index = 0) }
         },
         NavigationItem(
           label = "Newest",
           route = Destinations.Newest.route,
-          icon = ClawIcons.New,
-          selectedIcon = ClawIcons.NewFilled,
+          icon = Icons.Outlined.NewReleases,
+          selectedIcon = Icons.Filled.NewReleases,
         ) {
           coroutineScope.launch { newestListState.animateScrollToItem(index = 0) }
         },
         NavigationItem(
           label = "Saved",
           route = Destinations.Saved.route,
-          icon = ClawIcons.HeartBorder,
-          selectedIcon = ClawIcons.Heart,
+          icon = Icons.Outlined.FavoriteBorder,
+          selectedIcon = Icons.Filled.Favorite,
         ) {
           coroutineScope.launch { savedListState.animateScrollToItem(index = 0) }
         },
+        NavigationItem(
+          label = "Search",
+          route = Destinations.Search.route,
+          icon = Icons.Outlined.Search,
+          selectedIcon = Icons.Filled.Search,
+        ) {
+          coroutineScope.launch { searchListState.animateScrollToItem(index = 0) }
+        },
       )
 
-    SideEffect { systemUiController.setStatusBarColor(color = systemBarsColor) }
-
-    // Track UI mode as a key to force a navbar color update when dark theme is toggled
-    LaunchedEffect(currentDestination, currentUiMode) {
-      val color =
-        if (navItems.none { item -> item.route == currentDestination }) {
-          backgroundColor
-        } else {
-          systemBarsColor
-        }
-      systemUiController.setNavigationBarColor(color = color)
-    }
+    TransparentSystemBars()
 
     Scaffold(
       topBar = {
-        ClawAppBar(
-          backgroundColor = systemBarsColor,
-          navigationIcon = {
-            if (navItems.none { it.route == currentDestination }) {
-              IconButton(
-                onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
+        if (currentDestination != Destinations.Search.route) {
+          ClawAppBar(
+            navigationIcon = {
+              if (
+                navController.previousBackStackEntry != null &&
+                  navItems.none { it.route == currentDestination }
               ) {
-                Icon(
-                  painter = ClawIcons.ArrowBack,
-                  contentDescription = "Go back to previous screen",
-                )
+                IconButton(
+                  onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() },
+                ) {
+                  Icon(
+                    imageVector = Icons.Filled.ArrowBack,
+                    contentDescription = "Go back to previous screen",
+                  )
+                }
               }
-            }
-          },
-          title = {
-            if (navItems.any { it.route == currentDestination }) {
-              Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
-            }
-          },
-        )
+            },
+            title = {
+              if (navItems.any { it.route == currentDestination }) {
+                Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
+              }
+            },
+            actions = {
+              if (navItems.any { it.route == currentDestination }) {
+                IconButton(onClick = { navController.navigate(Destinations.DataTransfer.route) }) {
+                  Icon(
+                    imageVector = Icons.Filled.ImportExport,
+                    contentDescription = "Data transfer options",
+                  )
+                }
+              }
+            },
+          )
+        }
       },
       bottomBar = {
-        ClawNavigationBar(
-          navController = navController,
-          items = navItems,
-          isVisible = navItems.any { it.route == currentDestination },
-        )
+        AnimatedVisibility(visible = navigationType == ClawNavigationType.BOTTOM_NAVIGATION) {
+          ClawNavigationBar(
+            navController = navController,
+            items = navItems,
+            isVisible = navItems.any { it.route == currentDestination },
+          )
+        }
       },
+      snackbarHost = { SnackbarHost(snackbarHostState) },
       modifier = modifier.semantics { testTagsAsResourceId = true },
     ) { paddingValues ->
-      NavHost(
-        navController = navController,
-        startDestination = Destinations.startDestination.route,
-        modifier = Modifier.padding(paddingValues),
-      ) {
-        val uri = LobstersApi.BASE_URL
-        composable(
-          route = Destinations.Hottest.route,
-          deepLinks =
-            listOf(navDeepLink { uriPattern = uri }, navDeepLink { uriPattern = "$uri/" }),
+      Row(modifier = Modifier.padding(paddingValues)) {
+        AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
+          ClawNavigationRail(
+            navController = navController,
+            items = navItems,
+            isVisible = navItems.any { it.route == currentDestination },
+          )
+        }
+
+        NavHost(
+          navController = navController,
+          startDestination = Destinations.startDestination.route,
+          // Make animations 2x faster than default specs
+          enterTransition = { fadeIn(animationSpec = tween(350)) },
+          exitTransition = { fadeOut(animationSpec = tween(350)) },
         ) {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            lazyPagingItems = hottestPosts,
-            listState = hottestListState,
-            isPostSaved = viewModel::isPostSaved,
-            postActions = postActions,
-          )
-        }
-        composable(
-          route = Destinations.Newest.route,
-        ) {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            lazyPagingItems = newestPosts,
-            listState = newestListState,
-            isPostSaved = viewModel::isPostSaved,
-            postActions = postActions,
-          )
-        }
-        composable(Destinations.Saved.route) {
-          setWebUri(null)
-          DatabasePosts(
-            items = savedPosts,
-            listState = savedListState,
-            postActions = postActions,
-          )
-        }
-        composable(
-          route = Destinations.Comments.route,
-          arguments = listOf(navArgument("postId") { type = NavType.StringType }),
-          deepLinks =
-            listOf(
-              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}/.*" },
-              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}" },
-            ),
-        ) { backStackEntry ->
-          val postId = requireNotNull(backStackEntry.arguments?.getString("postId"))
-          setWebUri("https://lobste.rs/s/$postId")
-          CommentsPage(
-            postId = postId,
-            postActions = postActions,
-            htmlConverter = htmlConverter,
-            getSeenComments = viewModel::getSeenComments,
-            markSeenComments = viewModel::markSeenComments,
-          )
-        }
-        composable(
-          route = Destinations.User.route,
-          arguments = listOf(navArgument("username") { type = NavType.StringType }),
-          deepLinks =
-            listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }),
-        ) { backStackEntry ->
-          val username = requireNotNull(backStackEntry.arguments?.getString("username"))
-          UserProfile(
-            username = username,
-            getProfile = viewModel::getUserProfile,
-          )
+          val uri = LobstersApi.BASE_URL
+          composable(route = Destinations.Hottest.route) {
+            setWebUri("https://lobste.rs/")
+            NetworkPosts(
+              lazyPagingItems = hottestPosts,
+              listState = hottestListState,
+              isPostSaved = viewModel::isPostSaved,
+              postActions = postActions,
+            )
+          }
+          composable(route = Destinations.Newest.route) {
+            setWebUri("https://lobste.rs/")
+            NetworkPosts(
+              lazyPagingItems = newestPosts,
+              listState = newestListState,
+              isPostSaved = viewModel::isPostSaved,
+              postActions = postActions,
+            )
+          }
+          composable(route = Destinations.Saved.route) {
+            setWebUri(null)
+            DatabasePosts(
+              items = savedPosts,
+              listState = savedListState,
+              postActions = postActions,
+            )
+          }
+          composable(Destinations.Search.route) {
+            setWebUri("https://lobste.rs/search")
+            SearchList(
+              items = viewModel.searchResults,
+              listState = searchListState,
+              isPostSaved = viewModel::isPostSaved,
+              postActions = postActions,
+              searchQuery = viewModel.searchQuery,
+              setSearchQuery = { query -> viewModel.searchQuery = query },
+            )
+          }
+          composable(
+            route = Destinations.Comments.route,
+            arguments = listOf(navArgument("postId") { type = NavType.StringType }),
+            deepLinks =
+              listOf(
+                navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}/.*" },
+                navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}" },
+              ),
+          ) { backStackEntry ->
+            val postId = requireNotNull(backStackEntry.arguments?.getString("postId"))
+            setWebUri("https://lobste.rs/s/$postId")
+            CommentsPage(
+              postId = postId,
+              postActions = postActions,
+              htmlConverter = htmlConverter,
+              getSeenComments = viewModel::getSeenComments,
+              markSeenComments = viewModel::markSeenComments,
+            )
+          }
+          composable(
+            route = Destinations.User.route,
+            arguments = listOf(navArgument("username") { type = NavType.StringType }),
+            deepLinks =
+              listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }),
+          ) { backStackEntry ->
+            val username = requireNotNull(backStackEntry.arguments?.getString("username"))
+            setWebUri("https://lobste.rs/u/$username")
+            UserProfile(
+              username = username,
+              getProfile = viewModel::getUserProfile,
+            )
+          }
+          composable(route = Destinations.DataTransfer.route) {
+            DataTransferScreen(
+              context = context,
+              importPosts = viewModel::importPosts,
+              exportPosts = viewModel::exportPosts,
+              snackbarHostState = snackbarHostState,
+            )
+          }
         }
       }
     }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/datatransfer/DataTransferScreen.kt

@@ -0,0 +1,138 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.ui.datatransfer
+
+import android.content.Context
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts.CreateDocument
+import androidx.activity.result.contract.ActivityResultContracts.GetContent
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.height
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.Upload
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.unit.dp
+import java.io.InputStream
+import java.io.OutputStream
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+private const val MIME_TYPE = "application/json"
+
+@Composable
+fun DataTransferScreen(
+  context: Context,
+  importPosts: suspend (InputStream) -> Unit,
+  exportPosts: suspend (OutputStream) -> Unit,
+  snackbarHostState: SnackbarHostState,
+  modifier: Modifier = Modifier,
+) {
+  val coroutineScope = rememberCoroutineScope()
+  Column(modifier = modifier) {
+    ImportOption(context, coroutineScope, importPosts, snackbarHostState)
+    ExportOption(context, coroutineScope, exportPosts, snackbarHostState)
+  }
+}
+
+@Composable
+private fun ImportOption(
+  context: Context,
+  coroutineScope: CoroutineScope,
+  importPosts: suspend (InputStream) -> Unit,
+  snackbarHostState: SnackbarHostState,
+) {
+  val importAction =
+    rememberLauncherForActivityResult(GetContent()) { uri ->
+      if (uri == null) {
+        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
+        return@rememberLauncherForActivityResult
+      }
+      coroutineScope.launch {
+        context.contentResolver.openInputStream(uri)?.use { stream ->
+          importPosts(stream)
+          snackbarHostState.showSnackbarDismissing("Successfully imported posts")
+        }
+      }
+    }
+  SettingsActionItem(
+    title = "Import saved posts",
+    description = "Import saved posts from a previously generated export",
+    icon = Icons.Filled.Download,
+  ) {
+    importAction.launch(MIME_TYPE)
+  }
+}
+
+@Composable
+private fun ExportOption(
+  context: Context,
+  coroutineScope: CoroutineScope,
+  exportPosts: suspend (OutputStream) -> Unit,
+  snackbarHostState: SnackbarHostState,
+) {
+  val exportAction =
+    rememberLauncherForActivityResult(CreateDocument(MIME_TYPE)) { uri ->
+      if (uri == null) {
+        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
+        return@rememberLauncherForActivityResult
+      }
+      coroutineScope.launch {
+        context.contentResolver.openOutputStream(uri)?.use { stream ->
+          exportPosts(stream)
+          snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+        }
+      }
+    }
+  SettingsActionItem(
+    title = "Export posts to file",
+    description = "Write all saved posts into a JSON file that can be imported at a later date",
+    icon = Icons.Filled.Upload,
+  ) {
+    exportAction.launch("claw-export.json")
+  }
+}
+
+@Composable
+private fun SettingsActionItem(
+  title: String,
+  modifier: Modifier = Modifier,
+  description: String? = null,
+  icon: ImageVector? = null,
+  onClick: (() -> Unit)? = null,
+) {
+  ListItem(
+    headlineContent = { Text(title) },
+    supportingContent = { description?.let { Text(it) } },
+    leadingContent = {
+      icon?.let {
+        Icon(
+          imageVector = icon,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      }
+    },
+    modifier = modifier.clickable { onClick?.invoke() },
+  )
+}
+
+/** Shows a Snackbar but dismisses any existing ones first. */
+private suspend fun SnackbarHostState.showSnackbarDismissing(
+  text: String,
+) {
+  currentSnackbarData?.dismiss()
+  showSnackbar(text)
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -19,17 +19,18 @@ import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import androidx.navigation.NavController
 import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import kotlinx.collections.immutable.ImmutableList
 
-private const val AnimationDuration = 100
+const val AnimationDuration = 100
 
 @Composable
 fun ClawNavigationBar(
   navController: NavController,
-  items: List<NavigationItem>,
+  items: ImmutableList<NavigationItem>,
   isVisible: Boolean,
   modifier: Modifier = Modifier,
 ) {
@@ -54,10 +55,10 @@ fun ClawNavigationBar(
         val isCurrentDestination = navController.currentDestination?.route == navItem.route
         NavigationBarItem(
           icon = {
-            Crossfade(isCurrentDestination) {
+            Crossfade(isCurrentDestination, label = "nav-label") {
               Icon(
-                painter = if (it) navItem.selectedIcon else navItem.icon,
-                contentDescription = navItem.label.uppercase()
+                imageVector = if (it) navItem.selectedIcon else navItem.icon,
+                contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
               )
             }
           },
@@ -66,13 +67,13 @@ fun ClawNavigationBar(
           onClick = {
             if (isCurrentDestination) {
               navItem.listStateResetCallback()
-              return@NavigationBarItem
-            }
-            navController.graph.startDestinationRoute?.let { startDestination ->
-              navController.popBackStack(startDestination, false)
-            }
-            if (navItem.route != Destinations.startDestination.route) {
-              navController.navigate(navItem.route)
+            } else {
+              navController.graph.startDestinationRoute?.let { startDestination ->
+                navController.popBackStack(startDestination, false)
+              }
+              if (navItem.route != Destinations.startDestination.route) {
+                navController.navigate(navItem.route)
+              }
             }
           },
           modifier = Modifier.testTag(navItem.label.uppercase()),
@@ -85,7 +86,7 @@ fun ClawNavigationBar(
 class NavigationItem(
   val label: String,
   val route: String,
-  val icon: Painter,
-  val selectedIcon: Painter,
+  val icon: ImageVector,
+  val selectedIcon: ImageVector,
   val listStateResetCallback: () -> Unit,
 )

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationRail.kt

@@ -0,0 +1,84 @@
+/*
+ * Copyright © 2022-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.ui.decorations
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.LinearOutSlowInEasing
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.navigation.NavController
+import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import kotlinx.collections.immutable.ImmutableList
+
+@Composable
+fun ClawNavigationRail(
+  navController: NavController,
+  items: ImmutableList<NavigationItem>,
+  isVisible: Boolean,
+  modifier: Modifier = Modifier,
+) {
+  AnimatedVisibility(
+    visible = isVisible,
+    enter =
+      slideInHorizontally(
+        // Enters by sliding in from offset -fullWidth to 0.
+        initialOffsetX = { fullWidth -> -fullWidth },
+        animationSpec = tween(durationMillis = AnimationDuration, easing = LinearOutSlowInEasing),
+      ),
+    exit =
+      slideOutHorizontally(
+        // Exits by sliding out from offset 0 to -fullWidth.
+        targetOffsetX = { fullWidth -> -fullWidth },
+        animationSpec = tween(durationMillis = AnimationDuration, easing = FastOutLinearInEasing),
+      ),
+    modifier = Modifier,
+  ) {
+    NavigationRail(modifier = modifier) {
+      Spacer(Modifier.weight(1f))
+      items.forEach { navItem ->
+        val isCurrentDestination = navController.currentDestination?.route == navItem.route
+        NavigationRailItem(
+          icon = {
+            Crossfade(isCurrentDestination, label = "nav-label") {
+              Icon(
+                imageVector = if (it) navItem.selectedIcon else navItem.icon,
+                contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
+              )
+            }
+          },
+          label = { Text(text = navItem.label) },
+          selected = isCurrentDestination,
+          onClick = {
+            if (isCurrentDestination) {
+              navItem.listStateResetCallback()
+            } else {
+              navController.graph.startDestinationRoute?.let { startDestination ->
+                navController.popBackStack(startDestination, false)
+              }
+              if (navItem.route != Destinations.startDestination.route) {
+                navController.navigate(navItem.route)
+              }
+            }
+          },
+          modifier = Modifier.testTag(navItem.label.uppercase()),
+        )
+      }
+      Spacer(Modifier.weight(1f))
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/TransparentSystemBars.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.ui.decorations
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.ui.graphics.Color
+import com.google.accompanist.systemuicontroller.rememberSystemUiController
+
+@Composable
+fun TransparentSystemBars() {
+  val systemUiController = rememberSystemUiController()
+  val useDarkIcons = !isSystemInDarkTheme()
+
+  DisposableEffect(systemUiController, useDarkIcons) {
+    systemUiController.setSystemBarsColor(color = Color.Transparent, darkIcons = useDarkIcons)
+
+    onDispose {}
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -19,8 +19,6 @@ import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.LinkMetadata
 import dev.msfjarvis.claw.model.LobstersPostDetails
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 
 fun Context.getActivity(): ComponentActivity? {
   return when (this) {
@@ -30,14 +28,6 @@ fun Context.getActivity(): ComponentActivity? {
   }
 }
 
-/**
- * Parses a given [String] into a [LocalDateTime]. This method is only intended to be used for dates
- * in the format returned by the Lobsters API, and is not a general purpose parsing solution.
- */
-fun String.toLocalDateTime(): LocalDateTime {
-  return LocalDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this))
-}
-
 @Composable
 fun rememberPostActions(
   urlLauncher: UrlLauncher,
@@ -51,9 +41,10 @@ fun rememberPostActions(
       }
 
       override fun viewComments(postId: String) {
-        navController.navigate(
+        val currentRoute = navController.currentDestination?.route
+        val newRoute =
           Destinations.Comments.route.replace(Destinations.Comments.placeholder, postId)
-        )
+        if (currentRoute != Destinations.Comments.route) navController.navigate(newRoute)
       }
 
       override fun viewCommentsPage(commentsUrl: String) {

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/DatabasePosts.kt

@@ -6,40 +6,67 @@
  */
 package dev.msfjarvis.claw.android.ui.lists
 
+import androidx.activity.compose.ReportDrawn
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Divider
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Inbox
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
 import dev.msfjarvis.claw.database.local.SavedPost
 import java.time.Month
+import kotlinx.collections.immutable.ImmutableMap
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun DatabasePosts(
-  items: Map<Month, List<SavedPost>>,
+  items: ImmutableMap<Month, List<SavedPost>>,
   listState: LazyListState,
   postActions: PostActions,
   modifier: Modifier = Modifier,
 ) {
-  LazyColumn(
-    state = listState,
-    modifier = modifier,
-  ) {
-    items.forEach { (month, posts) ->
-      stickyHeader { MonthHeader(month = month) }
-      items(posts, { it.shortId }) { item ->
-        ListItem(
-          item = item,
-          isSaved = { true },
-          postActions = postActions,
+  ReportDrawn()
+  Box(modifier = modifier.fillMaxSize()) {
+    if (items.isEmpty()) {
+      Column(modifier = Modifier.align(Alignment.Center)) {
+        Icon(
+          imageVector = Icons.Filled.Inbox,
+          contentDescription = "Empty inbox icon",
+          modifier = Modifier.align(Alignment.CenterHorizontally).size(36.dp),
         )
-
-        Divider()
+        Text(text = "No saved posts", style = MaterialTheme.typography.headlineSmall)
+      }
+    } else {
+      LazyColumn(state = listState) {
+        items.forEach { (month, posts) ->
+          stickyHeader(contentType = "month-header") { MonthHeader(month = month) }
+          items(
+            items = posts,
+            key = { it.shortId },
+            contentType = { "LobstersItem" },
+          ) { item ->
+            ListItem(
+              item = item,
+              isSaved = { true },
+              postActions = postActions,
+            )
+            HorizontalDivider()
+          }
+        }
       }
     }
   }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPosts.kt

@@ -1,11 +1,12 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.android.ui.lists
 
+import androidx.activity.compose.ReportDrawnWhen
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -17,7 +18,7 @@ import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
@@ -26,7 +27,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.items
+import androidx.paging.compose.itemContentType
+import androidx.paging.compose.itemKey
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.posts.toDbModel
 import dev.msfjarvis.claw.common.ui.NetworkError
@@ -43,6 +45,7 @@ fun NetworkPosts(
   postActions: PostActions,
   modifier: Modifier = Modifier,
 ) {
+  ReportDrawnWhen { lazyPagingItems.itemCount > 0 }
   val refreshLoadState = lazyPagingItems.loadState.refresh
   val isRefreshing = refreshLoadState == LoadState.Loading
   val pullRefreshState = rememberPullRefreshState(isRefreshing, lazyPagingItems::refresh)
@@ -57,7 +60,12 @@ fun NetworkPosts(
       LazyColumn(
         state = listState,
       ) {
-        items(items = lazyPagingItems, key = { it.shortId }) { item ->
+        items(
+          count = lazyPagingItems.itemCount,
+          key = lazyPagingItems.itemKey { it.shortId },
+          contentType = lazyPagingItems.itemContentType { "LobstersItem" },
+        ) { index ->
+          val item = lazyPagingItems[index]
           if (item != null) {
             val dbModel = item.toDbModel()
             ListItem(
@@ -66,7 +74,7 @@ fun NetworkPosts(
               postActions = postActions,
             )
 
-            Divider()
+            HorizontalDivider()
           }
         }
         if (lazyPagingItems.loadState.append == LoadState.Loading) {

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/lists/SearchList.kt

@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.ui.lists
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.SearchOff
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.isTraversalGroup
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import androidx.paging.PagingData
+import androidx.paging.compose.collectAsLazyPagingItems
+import dev.msfjarvis.claw.common.posts.PostActions
+import dev.msfjarvis.claw.common.ui.SearchBar
+import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.LobstersPost
+import kotlinx.coroutines.flow.Flow
+
+@Composable
+fun SearchList(
+  items: Flow<PagingData<LobstersPost>>,
+  listState: LazyListState,
+  isPostSaved: suspend (SavedPost) -> Boolean,
+  postActions: PostActions,
+  searchQuery: String,
+  setSearchQuery: (String) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val lazyPagingItems = items.collectAsLazyPagingItems()
+  val triggerSearch = { query: String ->
+    setSearchQuery(query)
+    lazyPagingItems.refresh()
+  }
+  DisposableEffect(true) {
+    // Clear search field when navigating away
+    onDispose { setSearchQuery("") }
+  }
+
+  var searchActive by remember { mutableStateOf(false) }
+  Column(modifier = Modifier.semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()) {
+    SearchBar(
+      value = searchQuery,
+      onValueChange = setSearchQuery,
+      onSearch = {
+        triggerSearch(it)
+        searchActive = true
+      },
+      modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp).testTag("search_bar"),
+    )
+    if (searchActive) {
+      NetworkPosts(
+        lazyPagingItems = lazyPagingItems,
+        listState = listState,
+        isPostSaved = isPostSaved,
+        postActions = postActions,
+        modifier = modifier,
+      )
+    } else {
+      Box(modifier = Modifier.fillMaxSize()) {
+        Column(modifier = Modifier.align(Alignment.Center)) {
+          Icon(
+            imageVector = Icons.Filled.SearchOff,
+            contentDescription = "No search results",
+            modifier = Modifier.align(Alignment.CenterHorizontally).size(36.dp),
+          )
+          Text(text = "Nothing to see here", style = MaterialTheme.typography.headlineSmall)
+        }
+      }
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -21,6 +21,10 @@ sealed class Destinations {
     override val route = "saved"
   }
 
+  object Search : Destinations() {
+    override val route = "search"
+  }
+
   object Comments : Destinations() {
     const val placeholder = "{postId}"
     override val route = "comments/$placeholder"
@@ -31,6 +35,10 @@ sealed class Destinations {
     override val route = "user/$placeholder"
   }
 
+  object DataTransfer : Destinations() {
+    override val route: String = "datatransfer"
+  }
+
   companion object {
     val startDestination
       get() = Hottest

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/NavigationType.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.ui.navigation
+
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+
+enum class ClawNavigationType {
+  BOTTOM_NAVIGATION,
+  NAVIGATION_RAIL;
+
+  companion object {
+    fun fromSize(windowSize: WindowWidthSizeClass): ClawNavigationType {
+      return when (windowSize) {
+        WindowWidthSizeClass.Medium,
+        WindowWidthSizeClass.Expanded -> NAVIGATION_RAIL
+        else -> BOTTOM_NAVIGATION
+      }
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/util/HTMLConverterImpl.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/CSRFRepository.kt

@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.viewmodel
+
+import dev.msfjarvis.claw.api.injection.BaseUrl
+import dev.msfjarvis.claw.core.injection.IODispatcher
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.jsoup.Jsoup
+
+/** Helper for extracting CSRF token for authenticated requests to https://lobste.rs. */
+class CSRFRepository
+@Inject
+constructor(
+  private val okHttpClient: OkHttpClient,
+  @IODispatcher private val dispatcher: CoroutineDispatcher,
+  @BaseUrl private val url: String,
+) {
+  suspend fun extractToken(): String? {
+    val request = Request.Builder().url(url).build()
+    return withContext(dispatcher) {
+      okHttpClient.newCall(request).execute().use { response ->
+        val doc = Jsoup.parse(response.body?.string() ?: return@use null)
+        val element = doc.select("meta[name=\"csrf-token\"]").first() ?: return@use null
+        return@use element.attr("content")
+      }
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/ClawViewModel.kt

@@ -6,6 +6,9 @@
  */
 package dev.msfjarvis.claw.android.viewmodel
 
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
@@ -13,18 +16,26 @@ import androidx.paging.PagingConfig
 import com.deliveryhero.whetstone.viewmodel.ContributesViewModel
 import com.slack.eithernet.ApiResult.Failure
 import com.slack.eithernet.ApiResult.Success
-import dev.msfjarvis.claw.android.injection.IODispatcher
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
-import dev.msfjarvis.claw.android.ui.toLocalDateTime
+import dev.msfjarvis.claw.android.paging.SearchPagingSource
 import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.api.LobstersSearchApi
+import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.Comment
 import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
 import java.net.HttpURLConnection
+import java.time.LocalDateTime
 import java.time.Month
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
 import javax.inject.Inject
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
@@ -36,9 +47,13 @@ class ClawViewModel
 @Inject
 constructor(
   private val api: LobstersApi,
+  private val searchApi: LobstersSearchApi,
   private val savedPostsRepository: SavedPostsRepository,
+  private val commentsRepository: CommentsRepository,
   private val linkMetadataRepository: LinkMetadataRepository,
+  private val dataTransferRepository: DataTransferRepository,
   private val pagingSourceFactory: LobstersPagingSource.Factory,
+  private val searchPagingSourceFactory: SearchPagingSource.Factory,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
   private val hottestPostsPager =
@@ -49,6 +64,10 @@ constructor(
     Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
       pagingSourceFactory.create(api::getNewestPosts)
     }
+  private val searchResultsPager =
+    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
+      searchPagingSourceFactory.create { searchApi.searchPosts(searchQuery, it) }
+    }
 
   val hottestPosts
     get() = hottestPostsPager.flow
@@ -62,9 +81,14 @@ constructor(
   val savedPosts
     get() = savedPostsFlow.map(::mapSavedPosts)
 
-  private fun mapSavedPosts(items: List<SavedPost>): Map<Month, List<SavedPost>> {
+  val searchResults
+    get() = searchResultsPager.flow
+
+  var searchQuery by mutableStateOf("")
+
+  private fun mapSavedPosts(items: List<SavedPost>): ImmutableMap<Month, List<SavedPost>> {
     val sorted = items.sortedByDescending { post -> post.createdAt.toLocalDateTime() }
-    return sorted.groupBy { post -> post.createdAt.toLocalDateTime().month }
+    return sorted.groupBy { post -> post.createdAt.toLocalDateTime().month }.toImmutableMap()
   }
 
   suspend fun isPostSaved(post: SavedPost): Boolean {
@@ -99,10 +123,10 @@ constructor(
       }
     }
 
-  suspend fun getSeenComments(postId: String) = savedPostsRepository.getSeenComments(postId)
+  suspend fun getSeenComments(postId: String) = commentsRepository.getSeenComments(postId)
 
   fun markSeenComments(postId: String, comments: List<Comment>) {
-    viewModelScope.launch { savedPostsRepository.markSeenComments(postId, comments) }
+    viewModelScope.launch { commentsRepository.markSeenComments(postId, comments) }
   }
 
   suspend fun getLinkMetadata(url: String) =
@@ -118,4 +142,18 @@ constructor(
         is Failure.ApiFailure -> throw IOException("API returned an invalid response")
       }
     }
+
+  suspend fun importPosts(input: InputStream) = dataTransferRepository.importPosts(input)
+
+  suspend fun exportPosts(output: OutputStream) = dataTransferRepository.exportPosts(output)
+
+  /**
+   * Parses a given [String] into a [LocalDateTime]. This method is only intended to be used for
+   * dates in the format returned by the Lobsters API, and is not a general purpose parsing
+   * solution.
+   */
+  private fun String.toLocalDateTime(): LocalDateTime {
+    if (isEmpty()) return LocalDateTime.now(ZoneId.systemDefault())
+    return LocalDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this))
+  }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/CommentsRepository.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2021-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.viewmodel
+
+import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.database.LobstersDatabase
+import dev.msfjarvis.claw.database.local.PostComments
+import dev.msfjarvis.claw.model.Comment
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+class CommentsRepository
+@Inject
+constructor(
+  database: LobstersDatabase,
+  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+) {
+  private val postCommentsQueries = database.postCommentsQueries
+
+  suspend fun getSeenComments(postId: String) =
+    withContext(dbDispatcher) { postCommentsQueries.getCommentIds(postId).executeAsOneOrNull() }
+
+  suspend fun markSeenComments(postId: String, comments: List<Comment>) {
+    withContext(dbDispatcher) {
+      postCommentsQueries.rememberComments(PostComments(postId, comments.map { it.shortId }))
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/DataTransferRepository.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.viewmodel
+
+import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.database.LobstersDatabase
+import dev.msfjarvis.claw.database.SavedPostSerializer
+import dev.msfjarvis.claw.database.local.SavedPost
+import java.io.InputStream
+import java.io.OutputStream
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
+import kotlinx.serialization.json.encodeToStream
+
+@OptIn(ExperimentalSerializationApi::class)
+class DataTransferRepository
+@Inject
+constructor(
+  private val database: LobstersDatabase,
+  private val json: Json,
+  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
+) {
+  private val serializer = ListSerializer(SavedPostSerializer)
+  private val savedPostQueries = database.savedPostQueries
+
+  suspend fun importPosts(input: InputStream) {
+    val posts: List<SavedPost> =
+      withContext(ioDispatcher) {
+        json.decodeFromStream(
+          serializer,
+          input,
+        )
+      }
+    withContext(dbDispatcher) {
+      database.transaction { posts.forEach(savedPostQueries::insertOrReplacePost) }
+    }
+  }
+
+  suspend fun exportPosts(output: OutputStream) {
+    val posts = withContext(dbDispatcher) { savedPostQueries.selectAllPosts().executeAsList() }
+    withContext(ioDispatcher) { json.encodeToStream(serializer, posts, output) }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/LinkMetadataRepository.kt

@@ -1,21 +1,26 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.android.viewmodel
 
-import dev.msfjarvis.claw.metadata.MetadataExtractor
+import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.model.LinkMetadata
 import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import me.saket.unfurl.Unfurler
 
 class LinkMetadataRepository
 @Inject
 constructor(
-  private val metadataExtractor: MetadataExtractor,
+  private val unfurler: Unfurler,
+  @IODispatcher private val dispatcher: CoroutineDispatcher,
 ) {
   suspend fun getLinkMetadata(url: String): LinkMetadata {
-    return metadataExtractor.getExtractedMetadata(url)
+    val result = withContext(dispatcher) { unfurler.unfurl(url) }
+    return LinkMetadata(url, result?.favicon?.toString())
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/SavedPostsRepository.kt

@@ -8,11 +8,9 @@ package dev.msfjarvis.claw.android.viewmodel
 
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
-import dev.msfjarvis.claw.android.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
 import dev.msfjarvis.claw.database.LobstersDatabase
-import dev.msfjarvis.claw.database.local.PostComments
 import dev.msfjarvis.claw.database.local.SavedPost
-import dev.msfjarvis.claw.model.Comment
 import io.github.aakira.napier.Napier
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -25,7 +23,6 @@ constructor(
   @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
 ) {
   private val savedPostQueries = database.savedPostQueries
-  private val postCommentsQueries = database.postCommentsQueries
   val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
 
   suspend fun savePost(post: SavedPost) {
@@ -47,15 +44,6 @@ constructor(
     withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
   }
 
-  suspend fun getSeenComments(postId: String) =
-    withContext(dbDispatcher) { postCommentsQueries.getCommentIds(postId).executeAsOneOrNull() }
-
-  suspend fun markSeenComments(postId: String, comments: List<Comment>) {
-    withContext(dbDispatcher) {
-      postCommentsQueries.rememberComments(PostComments(postId, comments.map { it.shortId }))
-    }
-  }
-
   private companion object {
     private const val TAG = "SavedPostsRepository"
   }

android/src/main/kotlin/dev/msfjarvis/claw/android/work/SavedPostUpdaterWorker.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -41,7 +41,6 @@ constructor(
       .map { post -> lobstersApi.getPostDetails(post.shortId) }
       .filterIsInstance<Success<LobstersPostDetails>>()
       .map { result -> result.value.toDbModel() }
-      .toList()
       .let { savedPostsRepository.savePosts(it) }
     return Result.success()
   }

android/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -1,6 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background" />
-  <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-  <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

android/src/main/res/values-night/bools.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <resources>
   <bool name="use_light_status_bar">false</bool>
 </resources>

android/src/main/res/values/bools.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <resources>
   <bool name="use_light_status_bar">true</bool>
 </resources>

android/src/main/res/values/strings.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <resources>
   <string name="app_name">Claw</string>
 </resources>

android/src/main/res/values/themes.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <resources>
 
   <style name="Theme.Claw.SplashScreen" parent="Theme.SplashScreen">

android/src/main/res/xml/data_extraction_rules.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright © 2022-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <data-extraction-rules>
   <cloud-backup>
     <include

android/src/main/res/xml/full_backup_content.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright © 2022-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <full-backup-content>
   <include
     domain="database"

android/src/test/kotlin/dev/msfjarvis/claw/android/viewmodel/CSRFRepositoryTest.kt

@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.viewmodel
+
+import com.google.common.truth.Truth.assertThat
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.test.runTest
+import okhttp3.OkHttpClient
+import okhttp3.mockwebserver.Dispatcher
+import okhttp3.mockwebserver.MockResponse
+import okhttp3.mockwebserver.MockWebServer
+import okhttp3.mockwebserver.RecordedRequest
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
+
+class CSRFRepositoryTest {
+  @Test
+  fun `correctly extracts CSRF token`() = runTest {
+    val repo =
+      CSRFRepository(
+        OkHttpClient.Builder().build(),
+        Dispatchers.Default,
+        server.url("/").toString(),
+      )
+    assertThat(repo.extractToken())
+      .isEqualTo(
+        "OZWykgFemPVeOSNmB53-ccKXe458X7xCInO1-qzFU6nk_9RCSrSQqS9OPmA5_pyy8qD3IYAIZ7XfAM3gdhJpkQ"
+      )
+  }
+
+  companion object {
+    private val server = MockWebServer()
+
+    @JvmStatic
+    @BeforeAll
+    fun setup() {
+      val dispatcher =
+        object : Dispatcher() {
+          override fun dispatch(request: RecordedRequest): MockResponse {
+            return when (val path = request.path) {
+              "/" ->
+                MockResponse()
+                  .setResponseCode(200)
+                  .setBody(
+                    javaClass.classLoader!!
+                      .getResourceAsStream("csrf_page.html")
+                      .readAllBytes()
+                      .decodeToString(),
+                  )
+              else -> error("Invalid path: $path")
+            }
+          }
+        }
+      server.dispatcher = dispatcher
+    }
+  }
+}

android/version.properties

@@ -1,5 +1,5 @@
 #
 # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
 #
-versioning-plugin.versionCode=12200
-versioning-plugin.versionName=1.22.0
+versioning-plugin.versionCode=13300
+versioning-plugin.versionName=1.33.0

api/build.gradle.kts

@@ -1,14 +1,14 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+import dev.msfjarvis.claw.gradle.addTestDependencies
 
 plugins {
-  id("dev.msfjarvis.claw.kotlin-android")
   id("dev.msfjarvis.claw.android-library")
+  id("dev.msfjarvis.claw.kotlin-android")
   alias(libs.plugins.anvil)
   alias(libs.plugins.whetstone)
 }
@@ -18,14 +18,16 @@ android { namespace = "dev.msfjarvis.claw.api" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  api(projects.model)
-  api(libs.retrofit)
   api(libs.eithernet)
+  api(libs.retrofit)
+  api(projects.model)
+
   implementation(libs.dagger)
   implementation(libs.javax.inject)
+  implementation(libs.jsoup)
+
   testImplementation(testFixtures(libs.eithernet))
-  testImplementation(libs.kotest.assertions.core)
-  testImplementation(libs.kotest.runner.junit5)
+  testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.kotlinx.serialization.json)
-  testImplementation(libs.retrofit.kotlinxSerializationConverter)
+  addTestDependencies(project)
 }

api/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.0-alpha08" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.0-alpha08)" variant="all" version="8.0.0-alpha08">
+<issues format="6" by="lint 8.2.0-alpha14" type="baseline" client="gradle" dependencies="true" name="AGP (8.2.0-alpha14)" variant="all" version="8.2.0-alpha14">
 
 </issues>

api/src/main/kotlin/dev/msfjarvis/claw/api/LobstersApi.kt

@@ -9,7 +9,6 @@ package dev.msfjarvis.claw.api
 import com.slack.eithernet.ApiResult
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
-import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import retrofit2.http.GET
 import retrofit2.http.Path
@@ -30,12 +29,6 @@ interface LobstersApi {
   @GET("u/{username}.json")
   suspend fun getUser(@Path("username") username: String): ApiResult<User, Unit>
 
-  @GET("t/{tags}.json")
-  suspend fun getPostsByTags(
-    @Path("tags") tag: Tags,
-    @Query("page") page: Int,
-  ): ApiResult<List<LobstersPost>, Unit>
-
   companion object {
     const val BASE_URL = "https://lobste.rs"
   }

api/src/main/kotlin/dev/msfjarvis/claw/api/LobstersSearchApi.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api
+
+import com.slack.eithernet.ApiResult
+import dev.msfjarvis.claw.model.LobstersPost
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface LobstersSearchApi {
+  @GET("/search?what=stories&order=newest")
+  suspend fun searchPosts(
+    @Query("q") searchQuery: String,
+    @Query("page") page: Int,
+  ): ApiResult<List<LobstersPost>, Unit>
+}

api/src/main/kotlin/dev/msfjarvis/claw/api/converters/SearchConverter.kt

@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api.converters
+
+import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.model.User
+import java.lang.reflect.Type
+import okhttp3.ResponseBody
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import org.jsoup.select.Elements
+import retrofit2.Converter
+import retrofit2.Retrofit
+
+object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
+  override fun convert(value: ResponseBody): List<LobstersPost> {
+    val elements =
+      Jsoup.parse(value.string(), LobstersApi.BASE_URL).select("div.story_liner.h-entry")
+    return elements.map(::parsePost)
+  }
+
+  private fun parsePost(elem: Element): LobstersPost {
+    val parent = elem.parent() ?: error("$elem must have a parent")
+    val shortId = parent.attr("data-shortid")
+    val titleElement = elem.select("span.link.h-cite > a")
+    val title = titleElement.text()
+    val url = titleElement.attr("href")
+    val tags = elem.select("span.tags > a").map(Element::text)
+    val (commentCount, commentsUrl) = getCommentsData(elem.select("span.comments_label"))
+    val submitter =
+      getSubmitter(elem.select("div.byline").first() ?: error("No byline element found"))
+    return LobstersPost(
+      shortId = shortId,
+      title = title,
+      url = url,
+      commentCount = commentCount,
+      commentsUrl = commentsUrl,
+      tags = tags,
+      submitter = submitter,
+      // The value of these fields is irrelevant for our use case
+      createdAt = "",
+      description = "",
+    )
+  }
+
+  private fun getCommentsData(elem: Elements): Pair<Int, String> {
+    val linkElement = elem.select("a")
+    val countString = linkElement.text().trimStart().substringBefore(" ")
+    val commentsUrl = linkElement.attr("href")
+    return (countString.toIntOrNull() ?: 0) to commentsUrl
+  }
+
+  /**
+   * Make a bare-bones [User] object given a byline [elem]. We only need this to be usable for
+   * displaying in a list.
+   */
+  private fun getSubmitter(elem: Element): User {
+    val userElement = elem.select("a.u-author")
+    val avatarElement = elem.select("img.avatar")
+    val username = userElement.text()
+    val avatarUrl = avatarElement.attr("src")
+    return User(
+      username = username,
+      about = "",
+      invitedBy = null,
+      avatarUrl = avatarUrl,
+      createdAt = "",
+    )
+  }
+
+  object Factory : Converter.Factory() {
+    override fun responseBodyConverter(
+      type: Type,
+      annotations: Array<out Annotation>,
+      retrofit: Retrofit
+    ): Converter<ResponseBody, List<LobstersPost>> {
+      return SearchConverter
+    }
+  }
+}

api/src/main/kotlin/dev/msfjarvis/claw/api/injection/ApiModule.kt

@@ -1,42 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.api.injection
-
-import com.deliveryhero.whetstone.app.ApplicationScope
-import com.slack.eithernet.ApiResultCallAdapterFactory
-import com.slack.eithernet.ApiResultConverterFactory
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Module
-import dagger.Provides
-import dev.msfjarvis.claw.api.LobstersApi
-import okhttp3.OkHttpClient
-import retrofit2.Converter
-import retrofit2.Retrofit
-import retrofit2.create
-
-@Module
-@ContributesTo(ApplicationScope::class)
-object ApiModule {
-  @Provides
-  fun provideRetrofit(
-    client: OkHttpClient,
-    converterFactories: Set<@JvmSuppressWildcards Converter.Factory>,
-  ): Retrofit {
-    return Retrofit.Builder()
-      .client(client)
-      .baseUrl(LobstersApi.BASE_URL)
-      .addConverterFactory(ApiResultConverterFactory)
-      .addCallAdapterFactory(ApiResultCallAdapterFactory)
-      .apply { converterFactories.forEach(this::addConverterFactory) }
-      .build()
-  }
-
-  @Provides
-  fun provideApi(retrofit: Retrofit): LobstersApi {
-    return retrofit.create()
-  }
-}

api/src/main/kotlin/dev/msfjarvis/claw/api/injection/RetrofitModule.kt

@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api.injection
+
+import com.deliveryhero.whetstone.app.ApplicationScope
+import com.slack.eithernet.ApiResultCallAdapterFactory
+import com.slack.eithernet.ApiResultConverterFactory
+import com.squareup.anvil.annotations.ContributesTo
+import dagger.Module
+import dagger.Provides
+import dagger.multibindings.IntKey
+import dagger.multibindings.IntoMap
+import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.api.LobstersSearchApi
+import dev.msfjarvis.claw.api.converters.SearchConverter
+import javax.inject.Qualifier
+import okhttp3.OkHttpClient
+import retrofit2.CallAdapter
+import retrofit2.Converter
+import retrofit2.Retrofit
+import retrofit2.create
+
+/**
+ * Ideally the multibindings used here would only use [dagger.multibindings.IntoSet], but its lack
+ * of ordering guarantees means that we roll a die on each app launch that [Converter]s and
+ * [CallAdapter]s are in the correct order to be able to deserialize responses. Thus, the module
+ * uses [IntoMap] with [IntKey]s to fake the presence of a fixed order by sorting on the key of the
+ * injected [Map]s when injecting them into [Retrofit].
+ */
+@Module
+@ContributesTo(ApplicationScope::class)
+object RetrofitModule {
+  @Provides
+  fun provideRetrofit(
+    client: OkHttpClient,
+    converterFactories: Map<Int, @JvmSuppressWildcards Converter.Factory>,
+    callAdapterFactories: Map<Int, @JvmSuppressWildcards CallAdapter.Factory>,
+    @BaseUrl baseUrl: String,
+  ): Retrofit {
+    return Retrofit.Builder()
+      .client(client)
+      .baseUrl(baseUrl)
+      .apply { converterFactories.toSortedMap().values.forEach(this::addConverterFactory) }
+      .apply { callAdapterFactories.toSortedMap().values.forEach(this::addCallAdapterFactory) }
+      .build()
+  }
+
+  @Provides
+  @SearchApi
+  fun provideSearchApiRetrofit(
+    client: OkHttpClient,
+    @SearchApi converterFactories: List<@JvmSuppressWildcards Converter.Factory>,
+    callAdapterFactories: Map<Int, @JvmSuppressWildcards CallAdapter.Factory>,
+    @BaseUrl baseUrl: String,
+  ): Retrofit {
+    return Retrofit.Builder()
+      .client(client)
+      .baseUrl(baseUrl)
+      .apply { converterFactories.forEach(this::addConverterFactory) }
+      .apply { callAdapterFactories.toSortedMap().values.forEach(this::addCallAdapterFactory) }
+      .addConverterFactory(SearchConverter.Factory)
+      .build()
+  }
+
+  @Provides fun provideApi(retrofit: Retrofit): LobstersApi = retrofit.create()
+
+  @Provides
+  fun provideSearchApi(@SearchApi retrofit: Retrofit): LobstersSearchApi = retrofit.create()
+
+  @Provides
+  @IntKey(0)
+  @IntoMap
+  fun provideApiResultConverter(): Converter.Factory = ApiResultConverterFactory
+
+  @Provides
+  @IntKey(0)
+  @IntoMap
+  fun provideApiResultCallAdapter(): CallAdapter.Factory = ApiResultCallAdapterFactory
+
+  @Provides
+  @SearchApi
+  fun provideConverters(): List<@JvmSuppressWildcards Converter.Factory> =
+    listOf(
+      ApiResultConverterFactory,
+      SearchConverter.Factory,
+    )
+
+  @Provides @BaseUrl fun provideBaseUrl(): String = LobstersApi.BASE_URL
+}
+
+@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class BaseUrl
+
+/** Internal Dagger [Qualifier] to identify dependencies exclusive to [LobstersSearchApi]. */
+@Qualifier @Retention(AnnotationRetention.RUNTIME) private annotation class SearchApi

api/src/test/kotlin/dev/msfjarvis/claw/api/ApiTest.kt

@@ -6,65 +6,47 @@
  */
 package dev.msfjarvis.claw.api
 
+import com.google.common.truth.Truth.assertThat
 import com.slack.eithernet.ApiResult.Success
 import com.slack.eithernet.test.newEitherNetController
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
-import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
-import io.kotest.core.spec.style.FunSpec
-import io.kotest.matchers.collections.shouldHaveSize
-import io.kotest.matchers.shouldBe
-import io.kotest.matchers.types.shouldBeTypeOf
+import dev.msfjarvis.claw.util.TestUtils.assertIs
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
 
-class ApiTest : FunSpec() {
+class ApiTest {
   private val wrapper = ApiWrapper(newEitherNetController())
   private val api
     get() = wrapper.api
 
-  init {
-    test("api gets correct number of items") {
-      val posts = api.getHottestPosts(1)
-      posts.shouldBeTypeOf<Success<List<LobstersPost>>>()
-      posts.value shouldHaveSize 25
-    }
+  @Test
+  fun `api gets correct number of items`() = runTest {
+    val posts = api.getHottestPosts(1)
+    assertIs<Success<List<LobstersPost>>>(posts)
+    assertThat(posts.value).hasSize(25)
+  }
 
-    test("posts with no urls") {
-      val posts = api.getHottestPosts(1)
-      posts.shouldBeTypeOf<Success<List<LobstersPost>>>()
-      val commentsOnlyPosts = posts.value.asSequence().filter { it.url.isEmpty() }.toSet()
-      commentsOnlyPosts shouldHaveSize 2
-    }
+  @Test
+  fun `posts with no urls`() = runTest {
+    val posts = api.getHottestPosts(1)
+    assertIs<Success<List<LobstersPost>>>(posts)
+    val commentsOnlyPosts = posts.value.asSequence().filter { it.url.isEmpty() }.toSet()
+    assertThat(commentsOnlyPosts).hasSize(2)
+  }
 
-    test("post details with comments") {
-      val postDetails = api.getPostDetails("tdfoqh")
-      postDetails.shouldBeTypeOf<Success<LobstersPostDetails>>()
-      postDetails.value.comments shouldHaveSize 7
-    }
+  @Test
+  fun `post details with comments`() = runTest {
+    val postDetails = api.getPostDetails("tdfoqh")
+    assertIs<Success<LobstersPostDetails>>(postDetails)
+    assertThat(postDetails.value.comments).hasSize(7)
+  }
 
-    test("get user details") {
-      val user = api.getUser("msfjarvis")
-      user.shouldBeTypeOf<Success<User>>()
-      user.value.username shouldBe "msfjarvis"
-    }
-
-    test("get posts by single tag") {
-      var tags = Tags()
-      tags.addTag("meta")
-      val posts = api.getPostsByTags(tags, 1)
-      posts.shouldBeTypeOf<Success<List<LobstersPost>>>()
-      posts.value shouldHaveSize 25
-      posts.value[0].tags.contains("meta")
-    }
-
-    test("get posts by multiple tags") {
-      var tags = Tags()
-      tags.addTag("programming")
-      tags.addTag("rust")
-      val posts = api.getPostsByTags(tags, 1)
-      posts.shouldBeTypeOf<Success<List<LobstersPost>>>()
-      posts.value shouldHaveSize 25
-      posts.value[0].tags.contains("programming") or posts.value[0].tags.contains("rust")
-    }
+  @Test
+  fun `get user details`() = runTest {
+    val user = api.getUser("msfjarvis")
+    assertIs<Success<User>>(user)
+    assertThat(user.value.username).isEqualTo("msfjarvis")
   }
 }

api/src/test/kotlin/dev/msfjarvis/claw/api/ApiWrapper.kt

@@ -12,9 +12,8 @@ import com.slack.eithernet.test.enqueue
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
 import dev.msfjarvis.claw.model.User
-import dev.msfjarvis.claw.util.TestUtils.getJson
+import dev.msfjarvis.claw.util.TestUtils.getResource
 import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonNamingStrategy
 
@@ -24,13 +23,10 @@ class ApiWrapper(controller: EitherNetController<LobstersApi>) {
     ignoreUnknownKeys = true
     namingStrategy = JsonNamingStrategy.SnakeCase
   }
-  private val hottest: List<LobstersPost> = json.decodeFromString(getJson("hottest.json"))
+  private val hottest: List<LobstersPost> = json.decodeFromString(getResource("hottest.json"))
   private val postDetails: LobstersPostDetails =
-    json.decodeFromString(getJson("post_details_tdfoqh.json"))
-  private val user: User = json.decodeFromString(getJson("msfjarvis.json"))
-  private val metaPosts: List<LobstersPost> = json.decodeFromString(getJson("meta.json"))
-  private val programmingRustPosts: List<LobstersPost> =
-    json.decodeFromString(getJson("programming_rust.json"))
+    json.decodeFromString(getResource("post_details_tdfoqh.json"))
+  private val user: User = json.decodeFromString(getResource("msfjarvis.json"))
 
   val api = controller.api
 
@@ -39,7 +35,5 @@ class ApiWrapper(controller: EitherNetController<LobstersApi>) {
     controller.enqueue(LobstersApi::getHottestPosts) { success(hottest) }
     controller.enqueue(LobstersApi::getPostDetails) { success(postDetails) }
     controller.enqueue(LobstersApi::getUser) { success(user) }
-    controller.enqueue(LobstersApi::getPostsByTags) { success(metaPosts) }
-    controller.enqueue(LobstersApi::getPostsByTags) { success(programmingRustPosts) }
   }
 }

api/src/test/kotlin/dev/msfjarvis/claw/api/SearchApiTest.kt

@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api
+
+import com.google.common.truth.Truth.assertThat
+import com.slack.eithernet.ApiResult
+import com.slack.eithernet.test.newEitherNetController
+import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.model.User
+import dev.msfjarvis.claw.util.TestUtils.assertIs
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
+
+class SearchApiTest {
+  private val wrapper = SearchApiWrapper(newEitherNetController())
+  private val api
+    get() = wrapper.api
+
+  @Test
+  fun `search is able to parse HTML`() = runTest {
+    val posts = api.searchPosts("ChatGPT", 1)
+    assertIs<ApiResult.Success<List<LobstersPost>>>(posts)
+    assertThat(posts.value).containsAtLeastElementsIn(results).inOrder()
+    assertThat(posts.value).hasSize(20)
+  }
+
+  private companion object {
+    private val results =
+      listOf(
+        LobstersPost(
+          shortId = "gjlsdg",
+          title = "ChatGPT visits the Emacs doctor",
+          url = "https://xenodium.com/chatgpt-visits-the-emacs-doctor/",
+          createdAt = "",
+          commentCount = 3,
+          commentsUrl = "/s/gjlsdg/chatgpt_visits_emacs_doctor",
+          submitter = User("xenodium", "", null, "/avatars/xenodium-16.png", ""),
+          tags = listOf("ai", "emacs"),
+          description = "",
+        ),
+        LobstersPost(
+          shortId = "astcqf",
+          title =
+            "Implementing a question-answering system for PDF documents using ChatGPT and Redis",
+          url = "https://mstack.nl/blog/20230623-chatgpt-question-pdf-document/",
+          createdAt = "",
+          commentCount = 0,
+          commentsUrl = "/s/astcqf/implementing_question_answering_system",
+          submitter = User("asteroid", "", null, "/avatars/asteroid-16.png", ""),
+          tags = listOf("ai"),
+          description = "",
+        ),
+      )
+  }
+}

api/src/test/kotlin/dev/msfjarvis/claw/api/SearchApiWrapper.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api
+
+import com.slack.eithernet.ApiResult.Companion.success
+import com.slack.eithernet.test.EitherNetController
+import com.slack.eithernet.test.enqueue
+import dev.msfjarvis.claw.api.converters.SearchConverter
+import dev.msfjarvis.claw.util.TestUtils.getResource
+import okhttp3.MediaType
+import okhttp3.ResponseBody
+
+class SearchApiWrapper(controller: EitherNetController<LobstersSearchApi>) {
+  val api = controller.api
+
+  init {
+    controller.enqueue(LobstersSearchApi::searchPosts) {
+      success(
+        SearchConverter.convert(
+          ResponseBody.create(MediaType.get("text/html"), getResource("search_chatgpt_page.html"))
+        )
+      )
+    }
+  }
+}

api/src/test/kotlin/dev/msfjarvis/claw/util/TestUtils.kt

@@ -1,18 +1,28 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.util
 
+import com.google.common.truth.Truth.assertThat
 import java.io.File
+import kotlin.contracts.ExperimentalContracts
+import kotlin.contracts.contract
 
+@OptIn(ExperimentalContracts::class)
 object TestUtils {
-  fun getJson(path: String): String {
+  fun getResource(path: String): String {
     // Load the JSON response
-    val uri = javaClass.classLoader.getResource(path)
+    val uri = javaClass.classLoader!!.getResource(path)
     val file = File(uri.path)
     return String(file.readBytes())
   }
+
+  inline fun <reified T> assertIs(value: Any?): T {
+    contract { returns() implies (value is T) }
+    assertThat(value).isInstanceOf(T::class.java)
+    return value as T
+  }
 }

benchmark/build.gradle.kts

@@ -1,21 +1,27 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+@file:Suppress("UnstableApiUsage")
+
+import com.android.build.api.dsl.ManagedVirtualDevice
 
 plugins {
   alias(libs.plugins.android.test)
-  id("dev.msfjarvis.claw.android-common")
   id("dev.msfjarvis.claw.kotlin-android")
+  alias(libs.plugins.baselineprofile)
 }
 
 android {
   namespace = "dev.msfjarvis.claw.benchmark"
 
-  defaultConfig { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
+  compileSdk = 34
+  defaultConfig {
+    minSdk = 28
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
 
   buildTypes {
     create("benchmark") {
@@ -25,8 +31,22 @@ android {
     }
   }
 
+  testOptions.managedDevices.devices {
+    create<ManagedVirtualDevice>("api31") {
+      device = "Pixel 6"
+      apiLevel = 31
+      systemImageSource = "aosp"
+    }
+  }
+
   targetProjectPath = ":android"
-  experimentalProperties["android.experimental.self-instrumenting"] = true
+  experimentalProperties["android.experimental.r8.dex-startup-optimization"] = true
+}
+
+baselineProfile {
+  managedDevices += "api31"
+  useConnectedDevices = false
+  enableEmulatorDisplay = false
 }
 
 dependencies {
@@ -39,5 +59,3 @@ dependencies {
   implementation(libs.androidx.test.runner)
   implementation(libs.androidx.test.uiautomator)
 }
-
-androidComponents { beforeVariants(selector().all()) { it.enable = it.buildType == "benchmark" } }

benchmark/src/main/AndroidManifest.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright © 2022-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <queries>
     <package android:name="dev.msfjarvis.claw.android" />

benchmark/src/main/kotlin/dev/msfjarvis/claw/benchmark/BaselineProfileBenchmark.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -8,6 +8,7 @@ package dev.msfjarvis.claw.benchmark
 
 import androidx.benchmark.macro.BaselineProfileMode
 import androidx.benchmark.macro.CompilationMode
+import androidx.benchmark.macro.FrameTimingMetric
 import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
@@ -28,29 +29,39 @@ class BaselineProfileBenchmark {
   }
 
   @Test
-  fun startupNoCompilation() {
-    startup(CompilationMode.None())
+  fun noCompilation() {
+    exploreUI(CompilationMode.None())
   }
 
   @Test
-  fun startupBaselineFullyCompiled() {
-    startup(CompilationMode.Full())
+  fun fullyCompiled() {
+    exploreUI(CompilationMode.Full())
   }
 
   @Test
-  fun startupBaselineProfile() {
-    startup(CompilationMode.Partial(baselineProfileMode = BaselineProfileMode.Require))
+  fun baselineProfile() {
+    exploreUI(CompilationMode.Partial(baselineProfileMode = BaselineProfileMode.Require))
   }
 
-  private fun startup(compilationMode: CompilationMode) {
+  private fun exploreUI(compilationMode: CompilationMode) {
     benchmarkRule.measureRepeated(
       packageName = PACKAGE_NAME,
-      metrics = listOf(StartupTimingMetric()),
-      iterations = 10,
+      metrics = listOf(FrameTimingMetric(), StartupTimingMetric()),
+      compilationMode = compilationMode,
       startupMode = StartupMode.COLD,
-      compilationMode = compilationMode
+      iterations = 10,
     ) {
+      device.executeShellCommand("pm clear $PACKAGE_NAME")
+
       startActivityAndWait()
+
+      device.waitForIdle()
+
+      device.savePosts()
+
+      device.exploreScreens()
+
+      device.returnToHottestScreen()
     }
   }
 }

benchmark/src/main/kotlin/dev/msfjarvis/claw/benchmark/BaselineProfileGenerator.kt

@@ -6,7 +6,6 @@
  */
 package dev.msfjarvis.claw.benchmark
 
-import androidx.benchmark.macro.ExperimentalStableBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
@@ -14,7 +13,6 @@ import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-@OptIn(ExperimentalStableBaselineProfilesApi::class)
 class BaselineProfileGenerator {
   @get:Rule val baselineProfileRule = BaselineProfileRule()
   private lateinit var device: UiDevice
@@ -26,11 +24,22 @@ class BaselineProfileGenerator {
   }
 
   @Test
-  fun startup() =
-    baselineProfileRule.collectStableBaselineProfile(
+  fun generateBaselineProfile() =
+    baselineProfileRule.collect(
       packageName = PACKAGE_NAME,
-      maxIterations = 15,
+      maxIterations = 8,
+      includeInStartupProfile = true,
     ) {
+      device.executeShellCommand("pm clear $PACKAGE_NAME")
+
       startActivityAndWait()
+
+      device.waitForIdle()
+
+      device.savePosts()
+
+      device.exploreScreens()
+
+      device.returnToHottestScreen()
     }
 }

benchmark/src/main/kotlin/dev/msfjarvis/claw/benchmark/BenchmarkUtils.kt

@@ -1,60 +1,43 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.benchmark
 
-import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.By
+import androidx.test.uiautomator.BySelector
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
 
 const val PACKAGE_NAME = "dev.msfjarvis.claw.android"
 private const val AWAIT_TIMEOUT = 10_000L
-private const val SAVE_BUTTON_DESC = "Add to saved posts"
+private const val SAVE_BUTTON_ID = "save_button"
 private const val NAV_ID_HOTTEST = "HOTTEST"
 private const val NAV_ID_NEWEST = "NEWEST"
 private const val NAV_ID_SAVED = "SAVED"
-private const val COMMENT_BUTTON_DESC = "Open comments"
 
-@Suppress("Unused")
-fun MacrobenchmarkScope.exploreUI(device: UiDevice) {
-  startActivityAndWait()
-  device.run {
-    savePosts()
-
-    exploreScreens()
-
-    returnToHottestScreen()
-
-    openCommentsScreen()
-  }
+fun UiDevice.savePosts() {
+  waitForObject(By.res(SAVE_BUTTON_ID)).click()
 }
 
-private fun UiDevice.waitForSubmitterName() {
-  wait(Until.hasObject(By.textContains("Submitted by")), AWAIT_TIMEOUT)
-}
-
-private fun UiDevice.savePosts() {
-  waitForSubmitterName()
-  findObjects(By.desc(SAVE_BUTTON_DESC)).forEach { btn -> btn.click() }
-}
-
-private fun UiDevice.exploreScreens() {
+fun UiDevice.exploreScreens() {
   listOf(NAV_ID_HOTTEST, NAV_ID_NEWEST, NAV_ID_SAVED).forEach { tag ->
-    findObject(By.res(tag)).click()
-    waitForSubmitterName()
+    waitForObject(By.res(tag)).click()
+    waitForIdle()
   }
 }
 
-private fun UiDevice.returnToHottestScreen() {
-  findObject(By.res(NAV_ID_HOTTEST)).click()
-  waitForSubmitterName()
+fun UiDevice.returnToHottestScreen() {
+  waitForObject(By.res(NAV_ID_HOTTEST)).click()
 }
 
-private fun UiDevice.openCommentsScreen() {
-  waitForSubmitterName()
-  findObjects(By.desc(COMMENT_BUTTON_DESC)).first().click()
+private fun UiDevice.waitForObject(selector: BySelector, timeout: Long = AWAIT_TIMEOUT): UiObject2 {
+  if (wait(Until.hasObject(selector), timeout)) {
+    return findObject(selector)
+  }
+
+  error("Object with selector [$selector] not found")
 }

build-logic/build.gradle.kts

@@ -1,29 +1,12 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-import org.gradle.api.JavaVersion
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
 plugins { `kotlin-dsl` }
 
-afterEvaluate {
-  tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
-  }
-
-  tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.toString()
-      freeCompilerArgs = freeCompilerArgs + "-Xsam-conversions=class"
-    }
-  }
-}
+kotlin.jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) }
 
 gradlePlugin {
   plugins {
@@ -59,6 +42,10 @@ gradlePlugin {
       id = "dev.msfjarvis.claw.rename-artifacts"
       implementationClass = "dev.msfjarvis.claw.gradle.RenameArtifactsPlugin"
     }
+    register("sentry") {
+      id = "dev.msfjarvis.claw.sentry"
+      implementationClass = "dev.msfjarvis.claw.gradle.SentryPlugin"
+    }
     register("spotless") {
       id = "dev.msfjarvis.claw.spotless"
       implementationClass = "dev.msfjarvis.claw.gradle.SpotlessPlugin"
@@ -77,9 +64,10 @@ gradlePlugin {
 dependencies {
   implementation(libs.build.agp)
   implementation(libs.build.cachefix)
-  implementation(libs.build.detekt)
   implementation(libs.build.kotlin.gradle)
+  implementation(libs.build.r8)
   implementation(libs.build.semver)
+  implementation(libs.build.sentry)
   implementation(libs.build.spotless)
   implementation(libs.build.vcu)
   implementation(libs.build.versions)

build-logic/settings.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -15,7 +15,6 @@ dependencyResolutionManagement {
       filter {
         includeGroup("androidx.databinding")
         includeGroup("com.android")
-        includeGroup("com.android.tools")
         includeGroup("com.android.tools.analytics-library")
         includeGroup("com.android.tools.build")
         includeGroup("com.android.tools.build.jetifier")
@@ -25,6 +24,15 @@ dependencyResolutionManagement {
         includeGroup("com.android.tools.lint")
         includeGroup("com.android.tools.utp")
         includeGroup("com.google.testing.platform")
+        includeModule("com.android.tools", "annotations")
+        includeModule("com.android.tools", "common")
+        includeModule("com.android.tools", "desugar_jdk_libs")
+        includeModule("com.android.tools", "desugar_jdk_libs_configuration")
+        includeModule("com.android.tools", "dvlib")
+        includeModule("com.android.tools", "play-sdk-proto")
+        includeModule("com.android.tools", "repository")
+        includeModule("com.android.tools", "sdklib")
+        includeModule("com.android.tools", "sdk-common")
       }
     }
     exclusiveContent {
@@ -35,6 +43,10 @@ dependencyResolutionManagement {
         includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin")
       }
     }
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/r8-releases/raw/main") }
+      filter { includeModule("com.android.tools", "r8") }
+    }
     mavenCentral()
   }
   versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/AndroidCommonPlugin.kt

@@ -10,24 +10,27 @@ package dev.msfjarvis.claw.gradle
 
 import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.api.dsl.LibraryExtension
-import com.android.build.api.dsl.Lint
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.HasUnitTestBuilder
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
+import dev.msfjarvis.claw.gradle.LintConfig.configureLint
 import org.gradle.android.AndroidCacheFixPlugin
-import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.getByType
 
 class AndroidCommonPlugin : Plugin<Project> {
 
   private companion object {
-    const val COMPILE_SDK = 33
+    const val COMPILE_SDK = 34
     const val MIN_SDK = 26
-    const val TARGET_SDK = 33
+    const val TARGET_SDK = 34
+    const val SLIM_TESTS_PROPERTY = "slimTests"
   }
 
   override fun apply(project: Project) {
@@ -49,43 +52,38 @@ class AndroidCommonPlugin : Plugin<Project> {
         resources.excludes.add("**/META-INF/LGPL2.1")
       }
 
-      compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-      }
-
       testOptions {
         animationsDisabled = true
         unitTests.isReturnDefaultValues = true
       }
     }
-    project.extensions.findByType<ApplicationExtension>()?.run { lint.configureLint(project) }
-    project.extensions.findByType<LibraryExtension>()?.run { lint.configureLint(project) }
+    project.extensions.findByType<ApplicationExtension>()?.lint?.configureLint(project)
+    project.extensions.findByType<LibraryExtension>()?.lint?.configureLint(project)
+    val catalog = project.extensions.getByType<VersionCatalogsExtension>()
+    val libs = catalog.named("libs")
+    project.dependencies.addProvider("lintChecks", libs.findLibrary("slack-compose-lints").get())
   }
-}
 
-private fun Lint.configureLint(project: Project) {
-  abortOnError = false
-  checkReleaseBuilds = false
-  warningsAsErrors = false
-  disable.add("DialogFragmentCallbacksDetector")
-  baseline = project.file("lint-baseline.xml")
-}
-
-private fun Project.configureSlimTests() {
-  // Disable unit test tasks on the release build type for Android Library projects
-  extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
-    beforeVariants(selector().withBuildType("release")) {
-      it.enableUnitTest = false
-      it.enableAndroidTest = false
+  private fun Project.configureSlimTests() {
+    if (!providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) {
+      return
+    }
+    // Disable unit test tasks on the release build type for Android Library projects
+    extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
+      beforeVariants(selector().all()) {
+        if (it.name == "debug") return@beforeVariants
+        (it as HasUnitTestBuilder).enableUnitTest = false
+        it.enableAndroidTest = false
+      }
     }
-  }
 
-  // Disable unit test tasks on the release build type for Android Application projects.
-  extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
-    beforeVariants(selector().withBuildType("release")) {
-      it.enableUnitTest = false
-      it.enableAndroidTest = false
+    // Disable unit test tasks on the release build type for Android Application projects.
+    extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
+      beforeVariants(selector().all()) {
+        if (it.name == "debug") return@beforeVariants
+        (it as HasUnitTestBuilder).enableUnitTest = false
+        it.enableAndroidTest = false
+      }
     }
   }
 }

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/ApplicationPlugin.kt

@@ -34,8 +34,7 @@ class ApplicationPlugin : Plugin<Project> {
       }
 
       buildTypes {
-        named("release") {
-          isMinifyEnabled = true
+        all {
           setProguardFiles(
             listOf(
               "proguard-android-optimize.pro",
@@ -44,6 +43,7 @@ class ApplicationPlugin : Plugin<Project> {
             )
           )
         }
+        named("release") { isMinifyEnabled = true }
         named("debug") {
           applicationIdSuffix = ".debug"
           versionNameSuffix = "-debug"

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/DependencyUpdatesPlugin.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -22,13 +22,7 @@ class DependencyUpdatesPlugin : Plugin<Project> {
     project.pluginManager.apply(VersionsPlugin::class)
     project.pluginManager.apply(VersionCatalogUpdatePlugin::class)
     project.tasks.withType<DependencyUpdatesTask>().configureEach {
-      rejectVersionIf {
-        when (candidate.group) {
-          "com.squareup.okhttp3",
-          "org.jetbrains.kotlin" -> true
-          else -> isNonStable(candidate.version) && !isNonStable(currentVersion)
-        }
-      }
+      rejectVersionIf { isNonStable(candidate.version) && !isNonStable(currentVersion) }
       checkConstraints = true
       checkBuildEnvironmentConstraints = true
       checkForGradleUpdate = true