feat(release): bump version

This will be reverted back after the release

Revert "feat: re-do comment UI to look like Boost for Reddit"

This reverts commit 03e0a13e1d.

Revert "build: add compose screenshot testing support"

This reverts commit 5992a5fa15.

Revert "feat: rework comment entry layout and enable upvote action"

This reverts commit 4904c76220.

Revert "feat: re-do comment upvote UI"

This reverts commit c32ed849d2.

.gitattributes

@@ -2,4 +2,3 @@
 **/*.html linguist-vendored
 android/src/main/baseline-prof.txt linguist-generated -diff
 android/src/main/generated/** linguist-generated -diff
-**/screenshotTest/**/*.png filter=lfs diff=lfs merge=lfs -text

.github/renovate.json5

@@ -8,8 +8,8 @@
   ],
   "branchConcurrentLimit": 15,
   "github-actions": {
-    "fileMatch": [
-       ".github/reusable-workflows/.+\\.ya?ml$",
+    "managerFilePatterns": [
+       "/.github/reusable-workflows/.+\\.ya?ml$/",
     ],
   },
   "packageRules": [
@@ -54,23 +54,20 @@
       "allowedVersions": "!/.*-1-8$/",
     },
     {
-      "matchPackageNames": [
-        "/^androidx.glance/",
+      "matchManagers": [
+        "github-actions"
       ],
-      "allowedVersions": "<=1.0.0",
-    },
-    {
-      "matchPackageNames": [
-        "/.*aboutlibraries.*/",
+      "matchDepNames": [
+        "msfjarvis/compose-lobsters"
       ],
-      "allowedVersions": "<11.3.0",
+      "enabled": false,
     },
   ],
   "customManagers": [
     {
       "customType": "regex",
-      "fileMatch": [
-        "SpotlessPlugin\.kt$"
+      "managerFilePatterns": [
+        "/SpotlessPlugin\.kt$/"
       ],
       "matchStrings": [
         "KTFMT_VERSION = \"(?<currentValue>.*)\""

.github/reusable-workflows/setup-gradle/action.yml

@@ -25,21 +25,35 @@ runs:
   using: "composite"
   steps:
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       with:
         fetch-depth: ${{ inputs.fetch-depth }}
         token: ${{ inputs.token }}
         lfs: true
         persist-credentials: ${{ inputs.persist-credentials }}
 
+    - name: Validate Gradle wrapper
+      uses: gradle/actions/wrapper-validation@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
+
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         distribution: temurin
-        java-version: 23
+        java-version: 25
+
+    - name: Accept Android SDK licenses
+      shell: bash
+      run: |
+        yes | "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" --licenses || true
+
+    - name: Set global Gradle properties
+      shell: bash
+      run: |
+        mkdir -p ~/.gradle/
+        echo "android.testoptions.manageddevices.emulator.gpu=swiftshader_indirect" >> ~/.gradle/gradle.properties
 
     - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
+      uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6
       with:
         add-job-summary: always
         cache-read-only: ${{ inputs.cache-read-only }}

.github/workflows/ci.yml

@@ -16,17 +16,17 @@ concurrency:
 
 jobs:
   check:
-    runs-on: macos-14
+    runs-on: macos-26
     steps:
     - name: Setup build environment
-      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@92aae743ab8e1c98741128f1bfda3715750f5cf6 # main
       with:
         fetch-depth: 0
         cache-read-only: ${{ github.ref != 'refs/heads/main' }}
         dependency-graph: generate-and-submit
 
     - name: Check changelog format
-      uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
+      uses: mindsers/changelog-reader-action@1faaf50aa09d5793d9a100819973df801febfb31 # v2.4.0
       with:
         path: ./CHANGELOG.md
         validation_level: error
@@ -38,24 +38,43 @@ jobs:
 
     - name: (Fail-only) Upload test report
       if: failure()
-      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+      uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
       with:
           name: Test report
           path: '**/build/reports/tests/**'
 
   dependency-review:
-    runs-on: macos-14
+    runs-on: macos-26
     if: "github.event_name == 'push' && github.event.ref != 'refs/heads/main'"
     needs:
       - check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4
+        uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0
         with:
           base-ref: refs/heads/main
           head-ref: ${{ github.ref }}
+
+  release-app:
+    runs-on: macos-26
+    needs:
+      - check
+    steps:
+      - name: Setup build environment
+        uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@92aae743ab8e1c98741128f1bfda3715750f5cf6 # main
+        with:
+          cache-read-only: true
+
+      - name: Build release app
+        run: |
+          ./scripts/setup-age.sh
+          ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
+          ./gradlew --no-configuration-cache --stacktrace assembleRelease collectReleaseBundle
+          ./scripts/signing-cleanup.sh
+        env:
+          AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}

.github/workflows/release.yml

@@ -13,10 +13,10 @@ concurrency:
 
 jobs:
   publish-google-play-release:
-    runs-on: macos-14
+    runs-on: macos-26
     steps:
     - name: Setup build environment
-      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@92aae743ab8e1c98741128f1bfda3715750f5cf6 # main
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
@@ -40,8 +40,10 @@ jobs:
       shell: bash
       run: |
         ./gradlew -q --no-configuration-cache clearPreRelease
-        VERSION="$(tail -n1 android/version.properties | cut -d = -f 2)"
+        VERSION="$(grep 'versioning-plugin.versionName' android/version.properties | cut -d = -f 2)"
+        VERSION_CODE="$(grep 'versioning-plugin.versionCode' android/version.properties | cut -d = -f 2)"
         echo VERSION="${VERSION}" >> $GITHUB_ENV
+        echo VERSION_CODE="${VERSION_CODE}" >> $GITHUB_ENV
 
     - name: Update changelog
       uses: msfjarvis/keep-a-changelog-new-release@e60399f488b25149c0963a4e22fff928a9277ce7 # v2.2.0
@@ -49,30 +51,68 @@ jobs:
         tag: v${{ env.VERSION }}
         version: ${{ env.VERSION }}
 
+    - name: Get changelog entry
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@1faaf50aa09d5793d9a100819973df801febfb31 # v2.4.0
+      with:
+        version: ${{ env.VERSION }}
+        path: ./CHANGELOG.md
+
+    - name: Write changelog to fastlane metadata
+      shell: bash
+      env:
+        CHANGELOG: ${{ steps.changelog_reader.outputs.changes }}
+      run: |
+        mkdir -p fastlane/metadata/android/en-US/changelogs
+        printf '%s\n' "${CHANGELOG}" > fastlane/metadata/android/en-US/changelogs/${VERSION_CODE}.txt
+
     - name: Commit changes
       shell: bash
       run: |
-        git commit -am 'feat(release): bump version'
+        git add .
+        git commit -m 'feat(release): bump version'
+
+    - name: Calculate VCS info for Sentry
+      shell: bash
+      run: |
+        # Get HEAD commit SHA
+        HEAD_SHA=$(git rev-parse HEAD)
+        echo "SENTRY_VCS_HEAD_SHA=${HEAD_SHA}" >> $GITHUB_ENV
+        
+        # Get parent info (format: commit parent1 [parent2...])
+        PARENTS=$(git rev-list --parents -n 1 HEAD)
+        PARENT_COUNT=$(echo "$PARENTS" | wc -w)
+        
+        if [ "$PARENT_COUNT" -ge 3 ]; then
+          # Merge commit (commit + 2+ parents): use first parent
+          BASE_SHA=$(echo "$PARENTS" | awk '{print $2}')
+        else
+          # Normal commit: use last release
+          LAST_TAG=$(gh release list --limit 1 --json tagName -q '.[0].tagName' || echo "")
+          if [ -n "$LAST_TAG" ]; then
+            BASE_SHA=$(git rev-parse "${LAST_TAG}^{commit}")
+          else
+            BASE_SHA="${HEAD_SHA}"
+          fi
+        fi
+        echo "SENTRY_VCS_BASE_SHA=${BASE_SHA}" >> $GITHUB_ENV
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Build release assets
       shell: bash
       env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        SENTRY_VCS_HEAD_SHA: ${{ env.SENTRY_VCS_HEAD_SHA }}
+        SENTRY_VCS_BASE_SHA: ${{ env.SENTRY_VCS_BASE_SHA }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        ./gradlew --no-configuration-cache assembleRelease collectReleaseApks collectReleaseBundle -PenableSentry
+        ./gradlew --no-configuration-cache assembleRelease uploadSentryProguardMappingsRelease collectReleaseApks collectReleaseBundle -PenableSentry
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh
 
-    - name: Get changelog entry
-      id: changelog_reader
-      uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
-      with:
-        version: ${{ env.VERSION }}
-        path: ./CHANGELOG.md
-
     - name: Write release notes file
       shell: bash
       env:
@@ -82,7 +122,7 @@ jobs:
         printf '%s' "${CHANGELOG}" >> distribution/whatsnew/whatsnew-en-GB
 
     - name: Publish bundle to Google Play
-      uses: r0adkll/upload-google-play@935ef9c68bb393a8e6116b1575626a7f5be3a7fb # v1.1.3
+      uses: r0adkll/upload-google-play@e738b9dd8f2476ea806d921b64aacd24f34515a5 # v1.1.5
       with:
         mappingFile: android/bundle/mapping.txt
         packageName: dev.msfjarvis.claw.android
@@ -104,8 +144,31 @@ jobs:
         # Push the tag to GitHub
         git push origin "v${VERSION}"
 
+        # Create GitHub release notes with footer
+        RELEASE_NOTES=$(mktemp)
+        {
+          cat distribution/whatsnew/whatsnew-en-GB
+          echo ""
+          echo "---"
+          echo ""
+          echo '<a href="https://play.google.com/store/apps/details?id=dev.msfjarvis.claw.android">'
+          echo '  <img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"'
+          echo '       alt="Get it on Google Play"'
+          echo '       height="80" />'
+          echo '</a>'
+          echo ""
+          echo '<a href="https://android.izzysoft.de/repo/apk/dev.msfjarvis.claw.android">'
+          echo '  <img src="./.github/izzy-badge.webp"'
+          echo '       alt="Get it on IzzyOnDroid"'
+          echo '       height="65" />'
+          echo '</a>'
+        } > "$RELEASE_NOTES"
+
         # Create a GitHub release
-        gh release create "v${VERSION}" --notes-file distribution/whatsnew/whatsnew-en-GB --title "v${VERSION}" ./android/apk/*.apk ./android/bundle/*.aab
+        gh release create "v${VERSION}" --notes-file "$RELEASE_NOTES" --title "v${VERSION}" ./android/apk/*.apk ./android/bundle/*.aab
+
+        # Clean up temp file
+        rm "$RELEASE_NOTES"
 
         # Start the next development iteration
         ./gradlew -q --no-configuration-cache bumpSnapshot

.github/workflows/tramline-release.yml

@@ -3,39 +3,70 @@ name: Android release build
 on:
   workflow_dispatch:
     inputs:
-      versionName:
-        description: 'User-facing release version name'
-        required: true
-        default: ""
-      versionCode:
-        description: 'versionCode or build number'
-        required: true
-        default: ''
+      tramline-input:
+        description: "Tramline input"
+        required: false
 
 jobs:
   signed-build:
     runs-on: ubuntu-latest
     steps:
       - name: Setup build environment
-        uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
+        uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@92aae743ab8e1c98741128f1bfda3715750f5cf6 # main
         with:
           cache-read-only: true
+          fetch-depth: 0
+
+      - name: Configure Tramline
+        id: tramline
+        uses: tramlinehq/deploy-action@58cc98c188b9eda853e549ede6a8b2f58fe29516 # v0.1.7
+        with:
+          input: ${{ github.event.inputs.tramline-input }}
+
+      - name: Calculate VCS info for Sentry
+        shell: bash
+        run: |
+          # Get HEAD commit SHA
+          HEAD_SHA=$(git rev-parse HEAD)
+          echo "SENTRY_VCS_HEAD_SHA=${HEAD_SHA}" >> $GITHUB_ENV
+          
+          # Get parent info (format: commit parent1 [parent2...])
+          PARENTS=$(git rev-list --parents -n 1 HEAD)
+          PARENT_COUNT=$(echo "$PARENTS" | wc -w)
+          
+          if [ "$PARENT_COUNT" -ge 3 ]; then
+            # Merge commit (commit + 2+ parents): use first parent
+            BASE_SHA=$(echo "$PARENTS" | awk '{print $2}')
+          else
+            # Normal commit: use last release
+            LAST_TAG=$(gh release list --limit 1 --json tagName -q '.[0].tagName' || echo "")
+            if [ -n "$LAST_TAG" ]; then
+              BASE_SHA=$(git rev-parse "${LAST_TAG}^{commit}")
+            else
+              BASE_SHA="${HEAD_SHA}"
+            fi
+          fi
+          echo "SENTRY_VCS_BASE_SHA=${BASE_SHA}" >> $GITHUB_ENV
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build release app
         run: |
           ./scripts/setup-age.sh
           ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
-          ./gradlew --no-configuration-cache --stacktrace assembleRelease collectReleaseBundle -PenableSentry
+          ./gradlew --no-configuration-cache --stacktrace assembleRelease uploadSentryProguardMappingsRelease collectReleaseBundle -PenableSentry
           ./scripts/signing-cleanup.sh
         env:
           AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          ORG_GRADLE_PROJECT_VERSION_NAME: ${{ github.event.inputs.versionName }}
-          ORG_GRADLE_PROJECT_VERSION_CODE: ${{ github.event.inputs.versionCode }}
+          SENTRY_VCS_HEAD_SHA: ${{ env.SENTRY_VCS_HEAD_SHA }}
+          SENTRY_VCS_BASE_SHA: ${{ env.SENTRY_VCS_BASE_SHA }}
+          ORG_GRADLE_PROJECT_VERSION_NAME: ${{ steps.tramline.outputs.version_name }}
+          ORG_GRADLE_PROJECT_VERSION_CODE: ${{ steps.tramline.outputs.version_code }}
 
       - name: Upload app bundle
-        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
         with:
           name: release-aab
           path: android/build/outputs/bundle/release/android-release.aab

.gitignore

@@ -248,3 +248,4 @@ distribution/
 screenshots/
 claw-export.json
 .kotlin/
+.worktrees/

CHANGELOG.md

@@ -7,6 +7,130 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.65.0] - 2026-05-29
+
+### Fixed
+
+- Address fallout from Lobste.rs changing its HTML markup. This will keep happening :(
+
+### Changed
+
+- The comment expand/collapse indicators now match the Lobsters UI
+
+## [1.64.0] - 2026-05-26
+
+### Added
+
+- Allow logging in to avoid rate limiting problems.
+
+### Changed
+
+- The migration path for tag data format changes in 1.61.0 has been removed.
+- The app no longer uses the unsupported JSON endpoints on lobste.rs, instead relying
+  on parsing the HTML pages instead.
+
+## [1.63.0] - 2026-04-02
+
+### Fixed
+
+- Comments are no longer indicated as unread on the first visit of a post
+
+### Changed
+
+- Post titles in the list view can now take up 2 lines to make ellipsizing less likely
+- Action buttons now have a prominent background to make their touch target more obvious
+- Action buttons now have additional padding to avoid accidental presses when interacting
+  with system gestures
+
+Thanks to Charles Lombardo for contributing the action button UI changes.
+
+## [1.62.0] - 2026-03-10
+
+### Fixed
+
+- Improve comment scrolling performance
+- Ensure saved/read state for posts updates properly in UI
+- All strings in the app are now translatable, open to volunteer contributions.
+
+## [1.61.0] - 2026-02-28
+
+### Fixed
+
+- Collapsed comments state are now persisted across navigation events
+
+### Changed
+
+- Tags use a more muted background color to avoid being distracting.
+- Tag blocks can now be time-bound
+
+## [1.60.0] - 2026-02-14
+
+### Fixed
+
+- Rare crash in widget handling
+- Line-breaking behavior in comments now packs text densely
+- Tag filtering now applies to widgets as well
+
+### Changed
+
+- Links to other posts now open in the app itself
+- Widget handles bad network scenarios better
+
+## [1.59.0] - 2026-01-09
+
+### Fixed
+
+- Crashes from process death
+- Crashes in widget handling
+- Android Auto Backup works again
+
+### Changed
+
+- Added a tag filtering option to settings
+- Comment count badge has been restored
+- Navigation behavior has been improved to avoid too-deep hierarchies
+- Widget clicks are handled reliably
+- Widget UI has been touched up and a preview added for Android 16+
+- User profile page is now scrollable
+
+## [1.58.0] - 2025-12-26
+
+### Fixed
+
+- Avoid crash from trying to import invalid backups
+- Avoid crash when posts move between pages
+
+### Changed
+
+- Widget update is more reliable
+- Increased network timeouts
+- Better network retries and rate limit avoidance
+- Temporarily remove comment count to fix crashes
+
+## [1.57.0] - 2025-12-07
+
+### Changed
+
+- Navigation rewritten for larger screens
+- Comment expand/collapse now uses button UI
+- Comment rendering rewritten for better performance
+- Settings page redesigned
+
+### Fixed
+
+- Database concurrency improvements
+- Upgrade to Compose 2025-12 alpha
+- Swipe action trigger distance increased for Android 16 QPR1 Beta 1
+- Deeply nested comment tree collapsing
+- Post author indication in details
+- Dark mode toggle crash
+
+## [1.55.0] - 2025-02-13
+
+### Fixed
+
+- Adapt to lobsters API change
+
 ## [1.54.0] - 2025-01-31
 
 ### Fixed
@@ -74,7 +198,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Try to workaround an infrequent crash when scrolling hottest/newest posts
+- Try to work around an infrequent crash when scrolling hottest/newest posts
 
 ### Changed
 
@@ -119,7 +243,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Fixed a crash when clicking an item on the bottom navigation bar
   too quickly
-- Removed buggy deeplinks
+- Removed buggy deep links
 - Clicking a username now correctly navigates to the right page in-app
 
 ## [1.44.0] - 2024-03-19
@@ -376,7 +500,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Fix bug where newest posts tab actually showed hottest posts instead
+- Fix bug where the newest posts tab actually showed the hottest posts instead
 
 ## [1.15.0] - 2022-12-20
 
@@ -398,7 +522,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Fix crash when viewing [jcs](https://lobste.rs/u/jcs)' comments
+- Fix crash when viewing comments by ~jcs
 
 ## [1.12.0] - 2022-12-09
 
@@ -497,7 +621,17 @@ 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.54.0...HEAD
+[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.65.0...HEAD
+[1.65.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.64.0...v1.65.0
+[1.64.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.63.0...v1.64.0
+[1.63.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.62.0...v1.63.0
+[1.62.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.61.0...v1.62.0
+[1.61.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.60.0...v1.61.0
+[1.60.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.59.0...v1.60.0
+[1.59.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.58.0...v1.59.0
+[1.58.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.57.0...v1.58.0
+[1.57.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.55.0...v1.57.0
+[1.55.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.54.0...v1.55.0
 [1.54.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.53.0...v1.54.0
 [1.53.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.52.0...v1.53.0
 [1.52.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.51.0...v1.52.0

README.md

@@ -2,6 +2,9 @@
 
 Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), built with [Jetpack Compose](https://developer.android.com/jetpack/compose).
 
+> [!WARNING]
+> This app uses a JSON API that Lobsters does not expose by choice and [the maintainer has no interest in having](https://github.com/lobsters/lobsters/issues/1663#issuecomment-3074472781), so it may break in any manner at any point in time. File an issue [here](https://github.com/msfjarvis/compose-lobsters/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen) if you come across any bugs, do not bother the upstream developers about a feature they don't support.
+
 <a href="https://play.google.com/store/apps/details?id=dev.msfjarvis.claw.android">
   <img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
        alt="Get it on Google Play"

android/build.gradle.kts

@@ -6,35 +6,27 @@
  */
 @file:Suppress("UnstableApiUsage")
 
-import com.android.build.api.dsl.ApplicationExtension
 import dev.msfjarvis.claw.gradle.addTestDependencies
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
+import dev.zacsweers.metro.gradle.DiagnosticSeverity
 
 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")
   id("kotlin-parcelize")
   alias(libs.plugins.aboutlibraries)
-  alias(libs.plugins.android.junit5)
-  alias(libs.plugins.anvil)
   alias(libs.plugins.modulegraphassert)
-  alias(libs.plugins.whetstone)
   alias(libs.plugins.baselineprofile)
   alias(libs.plugins.licensee)
-  alias(libs.plugins.tracelog)
   alias(libs.plugins.kotlin.composeCompiler)
   alias(libs.plugins.kotlin.serialization)
-  alias(libs.plugins.navigation.safeargs)
-  alias(libs.plugins.screenshot)
   alias(libs.plugins.dependencyAnalysis)
+  alias(libs.plugins.metro)
 }
 
-// Directly using the generated `android` accessor lights up bright red
-extensions.configure<ApplicationExtension> {
+android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig.applicationId = "dev.msfjarvis.claw.android"
   defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -45,87 +37,93 @@ extensions.configure<ApplicationExtension> {
     applicationIdSuffix = ".internal"
     isDebuggable = true
   }
-  experimentalProperties["android.experimental.enableScreenshotTest"] = true
 }
 
-aboutLibraries.gitHubApiToken = providers.environmentVariable("GITHUB_TOKEN").orNull
+aboutLibraries.collect.gitHubApiToken = providers.environmentVariable("GITHUB_TOKEN").orNull
 
 baselineProfile {
   mergeIntoMain = true
   saveInSrc = true
-  // dependencyProject is deprecated, needs new APIs in the baseline profile plugin.
-  @Suppress("deprecation") from(projects.benchmark.dependencyProject)
-}
-
-composeCompiler {
-  featureFlags.addAll(
-    ComposeFeatureFlag.OptimizeNonSkippingGroups,
-    ComposeFeatureFlag.PausableComposition,
-  )
 }
 
 licensee {
   allow("Apache-2.0")
   allow("MIT")
+  allow("BSD-3-Clause")
   ignoreDependencies("com.michael-bull.kotlin-result") { because("kotlin-result is ISC licensed") }
   ignoreDependencies("org.commonmark") { because("Commonmark is BSD licensed") }
   allowUrl("https://jsoup.org/license") { because("Jsoup is MIT licensed") }
+  allowUrl("https://opensource.org/license/MIT") { because("Ksoup is MIT licensed") }
 }
 
+metro { unusedGraphInputsSeverity = DiagnosticSeverity.ERROR }
+
 moduleGraphAssert {
   assertOnAnyBuild = true
   maxHeight = 4
   restricted = arrayOf(":core -X> :.*")
 }
 
-whetstone {
-  addOns {
-    compose.set(true)
-    workManager.set(true)
-  }
-}
-
 dependencies {
-  implementation(platform(libs.androidx.compose.bom))
+  baselineProfile(projects.benchmark)
+
   implementation(platform(libs.okhttp.bom))
+  implementation(libs.aboutLibraries.compose.core)
+  implementation(libs.aboutLibraries.core)
   implementation(libs.aboutLibraries.m3)
+  implementation(libs.androidx.activity)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.animation.core)
   implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.foundation.layout)
   implementation(libs.androidx.compose.glance)
+  implementation(libs.androidx.compose.glance.core)
   implementation(libs.androidx.compose.glance.m3)
+  implementation(libs.androidx.compose.material.icons.core)
   implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.compose.material3)
-  implementation(libs.androidx.compose.material3.window.size)
   implementation(libs.androidx.compose.material3.adaptive)
   implementation(libs.androidx.compose.material3.adaptive.layout)
-  implementation(libs.androidx.compose.material3.adaptive.navigation)
-  implementation(libs.androidx.compose.material3.adaptive.navigation.suite)
+  implementation(libs.androidx.compose.material3.window.size)
   implementation(libs.androidx.compose.runtime)
+  implementation(libs.androidx.compose.runtime.saveable)
   implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.compose.ui.graphics)
   implementation(libs.androidx.compose.ui.text)
-  implementation(libs.androidx.compose.ui.util)
+  implementation(libs.androidx.compose.ui.unit)
+  implementation(libs.androidx.annotation)
+  implementation(libs.androidx.collection)
+  implementation(libs.androidx.core)
   implementation(libs.androidx.core.splashscreen)
+  implementation(libs.androidx.lifecycle.common)
   implementation(libs.androidx.lifecycle.compose)
-  implementation(libs.androidx.navigation.compose)
+  implementation(libs.androidx.lifecycle.runtime.compose)
+  implementation(libs.androidx.lifecycle.viewmodel)
+  implementation(libs.androidx.material3.navigation3)
+  implementation(libs.androidx.navigation3.runtime)
+  implementation(libs.androidx.navigation3.ui)
+  implementation(libs.androidx.paging.common)
   implementation(libs.androidx.paging.compose)
-  implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.work.runtime)
-  implementation(libs.copydown)
-  implementation(libs.dagger)
   implementation(libs.eithernet)
   implementation(libs.haze)
-  implementation(libs.haze.materials)
-  implementation(libs.javax.inject)
+  implementation(libs.haze.blur)
+  implementation(libs.kotlin.parcelize.runtime)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
   implementation(libs.kotlinx.serialization.core)
   implementation(libs.kotlinx.serialization.json)
-  implementation(libs.napier)
+  implementation(libs.kotlin.stdlib)
+  implementation(libs.metrox.android)
+  implementation(libs.metrox.viewmodel)
+  implementation(libs.metrox.viewmodel.compose)
   implementation(libs.okhttp.core)
-  implementation(libs.okhttp.loggingInterceptor)
   implementation(libs.retrofit)
+  implementation(libs.sentry)
+  implementation(libs.sentry.android.core)
   implementation(libs.sqldelight.extensions.coroutines)
+  implementation(libs.sqldelight.runtime)
   implementation(libs.swipe)
   implementation(libs.unfurl)
   implementation(projects.api)
@@ -134,14 +132,12 @@ dependencies {
   implementation(projects.database.core)
   implementation(projects.database.impl)
   implementation(projects.model)
-  implementation(projects.web)
 
-  kapt(libs.dagger.compiler)
+  compileOnly(libs.androidx.compose.glance.preview)
 
-  screenshotTestImplementation(libs.androidx.compose.ui.tooling)
+  debugRuntimeOnly(libs.androidx.compose.glance)
+
+  runtimeOnly(libs.androidx.profileinstaller)
 
   addTestDependencies(project)
-  androidTestImplementation(libs.androidx.test.espresso.core)
-  androidTestImplementation(libs.androidx.test.uiautomator)
-  androidTestImplementation(libs.leakcanary.android.test)
 }

android/lint-baseline.xml

@@ -1,15 +1,125 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.7.1" type="baseline" client="gradle" dependencies="true" name="AGP (8.7.1)" variant="all" version="8.7.1">
+<issues format="6" by="lint 9.2.1" type="baseline" client="gradle" dependencies="true" name="AGP (9.2.1)" variant="all" version="9.2.1">
 
     <issue
-        id="VectorPath"
-        message="Very long vector path (918 characters), which is bad for performance. Considering reducing precision, removing minor details or rasterizing vector."
-        errorLine1="        android:pathData=&quot;M431.3,341.2C435.9,337 580.3,236 710.5,223.8C747.3,220.3 790.7,254.7 833.2,312.5C875.9,370.7 892.9,433.4 875.9,443C863.2,450.2 838.6,407.4 758.8,396.3C743.4,394.2 730.4,393.4 719.4,393.5C738.5,423.4 745.6,451.1 737.2,458C733.1,461.4 673.6,438.7 612.9,436.5C570.1,435 535.2,440.9 506.7,451.3C496.9,454.9 486,453.8 477.2,448.3C444.5,427.9 424.2,406.2 418.4,376.2C415.8,362.8 420.9,349.4 431.3,341.2ZM274.7,394.8C285.8,370.1 312.2,325.9 346.3,305.4C383.6,282.9 335,390.3 427.3,489.8C519.5,589.3 586.5,623.8 655.1,581.5C723.7,539.2 746.5,518.1 753,518.7C764,519.6 772.9,536.1 764.4,589.5C763,598.2 761.3,606.5 759.3,614.2C828.7,575 871.7,516.3 889,520C912,524.8 918.3,617.8 852.1,721C811.8,784 768.8,830.7 741.4,857.5C724.3,874 699.7,880 677,873.1C512,822.6 315.5,733.8 202.9,652C193.8,645.2 186.8,635.9 183,625.1C171.8,593.7 161.3,548.1 168.5,495.3C179.5,414.2 222.7,352.9 245.2,335.9C261.9,323.2 267.1,362.4 274.7,394.8Z&quot;"
-        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        id="Instantiatable"
+        message="This class should provide a default constructor (a public constructor with no arguments) (`dev.msfjarvis.claw.android.MainActivity`)"
+        errorLine1="      android:name=&quot;.MainActivity&quot;"
+        errorLine2="                    ~~~~~~~~~~~~~">
         <location
-            file="src/main/res/drawable/ic_launcher_foreground.xml"
-            line="17"
-            column="27"/>
+            file="src/main/AndroidManifest.xml"
+            line="28"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.loadUrl is deprecated; consider using an alternative."
+        errorLine1="              webViewRef?.loadUrl(LOGIN_URL)"
+        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="69"
+            column="15"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.loadUrl is deprecated; consider using an alternative."
+        errorLine1="              webViewRef?.loadUrl(LOGIN_URL)"
+        errorLine2="                                  ~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="69"
+            column="35"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.WebView is deprecated; consider using an alternative."
+        errorLine1="            WebView(context)"
+        errorLine2="            ~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="78"
+            column="13"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.WebView is deprecated; consider using an alternative."
+        errorLine1="            WebView(context)"
+        errorLine2="                    ~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="78"
+            column="21"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.getSettings is deprecated; consider using an alternative."
+        errorLine1="                settings.javaScriptEnabled = true"
+        errorLine2="                ~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="81"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.setWebViewClient is deprecated; consider using an alternative."
+        errorLine1="                webViewClient ="
+        errorLine2="                ^">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="82"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.setWebViewClient is deprecated; consider using an alternative."
+        errorLine1="                  object : WebViewClient() {"
+        errorLine2="                  ^">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="83"
+            column="19"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.loadUrl is deprecated; consider using an alternative."
+        errorLine1="                loadUrl(LOGIN_URL)"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="118"
+            column="17"/>
+    </issue>
+
+    <issue
+        id="DeprecatedCall"
+        message="android.webkit.WebView.loadUrl is deprecated; consider using an alternative."
+        errorLine1="                loadUrl(LOGIN_URL)"
+        errorLine2="                        ~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt"
+            line="118"
+            column="25"/>
+    </issue>
+
+    <issue
+        id="MemberExtensionConflict"
+        message="`KeepUntilTransitionsFinished` is defined both as a member in class `androidx.compose.animation.ExitTransition.Companion` and an extension in package `androidx.compose.animation`. The defined behavior for this is to use the member, but since the extension is explicitly imported into this file, there&apos;s a chance that this was not expected. (One common way this happens is for members to be added to a class after code was already written to use an extension)."
+        errorLine1="                  ) togetherWith ExitTransition.KeepUntilTransitionsFinished"
+        errorLine2="                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt"
+            line="259"
+            column="49"/>
     </issue>
 
 </issues>

android/r8-rules-missing-classes.pro

@@ -1,17 +1,9 @@
--dontwarn android.window.OnBackInvokedCallback
--dontwarn android.window.OnBackInvokedDispatcher
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
 -dontwarn androidx.window.extensions.WindowExtensions
 -dontwarn androidx.window.extensions.WindowExtensionsProvider
 -dontwarn androidx.window.extensions.area.ExtensionWindowAreaPresentation
+-dontwarn androidx.window.extensions.core.util.function.Consumer
+-dontwarn androidx.window.extensions.core.util.function.Function
+-dontwarn androidx.window.extensions.core.util.function.Predicate
 -dontwarn androidx.window.extensions.layout.DisplayFeature
 -dontwarn androidx.window.extensions.layout.FoldingFeature
 -dontwarn androidx.window.extensions.layout.WindowLayoutComponent
@@ -22,3 +14,6 @@
 -dontwarn androidx.window.sidecar.SidecarInterface
 -dontwarn androidx.window.sidecar.SidecarProvider
 -dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo
+-dontwarn io.mcarle.konvert.api.GeneratedKonverter
+-dontwarn com.google.re2j.Matcher
+-dontwarn com.google.re2j.Pattern

android/src/androidTest/kotlin/dev/msfjarvis/claw/android/HeapGrowthCheck.kt

@@ -1,59 +0,0 @@
-/*
- * Copyright © 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
-
-import androidx.test.platform.app.InstrumentationRegistry
-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
-import com.google.common.truth.Truth.assertThat
-import de.mannodermaus.junit5.ActivityScenarioExtension
-import leakcanary.repeatingAndroidInProcessScenario
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.extension.RegisterExtension
-import shark.HeapDiff
-
-class HeapGrowthCheck {
-  @JvmField
-  @RegisterExtension
-  @Suppress("Unused")
-  val scenarioExtension = ActivityScenarioExtension.launch<MainActivity>()
-  private val detector = HeapDiff.repeatingAndroidInProcessScenario()
-  private lateinit var device: UiDevice
-
-  @BeforeEach
-  fun setUp() {
-    val instrumentation = InstrumentationRegistry.getInstrumentation()
-    device = UiDevice.getInstance(instrumentation)
-  }
-
-  @Test
-  fun verify_heap_growth() {
-    val heapGrowth = detector.findRepeatedlyGrowingObjects { device.exploreScreens() }
-    assertThat(heapGrowth.growingObjects).isEmpty()
-  }
-
-  private companion object {
-    fun UiDevice.exploreScreens() {
-      listOf("HOTTEST", "NEWEST", "SAVED").forEach { tag ->
-        waitForObject(By.res(tag)).click()
-        waitForIdle()
-      }
-    }
-
-    private fun UiDevice.waitForObject(selector: BySelector, timeout: Long = 10_000L): UiObject2 {
-      if (wait(Until.hasObject(selector), timeout)) {
-        return findObject(selector)
-      }
-
-      error("Object with selector [$selector] not found")
-    }
-  }
-}

android/src/debug/AndroidManifest.xml

@@ -0,0 +1,46 @@
+<!--
+ ~ Copyright © 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">
+  <application>
+    <activity
+      android:name=".MainActivity"
+      android:exported="true">
+      <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="claw-debug"
+          android:host="comments" />
+      </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="claw-debug"
+          android:host="hottest" />
+      </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="claw-debug"
+          android:host="newest" />
+      </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="claw-debug"
+          android:host="saved" />
+      </intent-filter>
+    </activity>
+  </application>
+</manifest>

android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Dark theme_6497bd62_da39a3ee_0.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:10defb7f6abec5d8bd07e07625e30e5b68d3a330e87f157e8138688f8d7ef0aa
-size 214795

android/src/debug/screenshotTest/reference/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest/DefaultPreview_Light theme_5e9d521d_da39a3ee_0.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:64dd5c002c021774469d7d9a15433678a014f720b6cde2281fbbf20daee98712
-size 216093

android/src/main/AndroidManifest.xml

@@ -10,20 +10,23 @@
   <uses-permission android:name="android.permission.INTERNET" />
   <application
     android:name=".ClawApplication"
+    android:appComponentFactory="dev.msfjarvis.claw.android.BackupSafeAppComponentFactory"
     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"
+    tools:replace="android:appComponentFactory"
     tools:targetApi="tiramisu">
     <profileable
       android:shell="true"
       tools:targetApi="29" />
     <activity
       android:name=".MainActivity"
-      android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
+      android:configChanges="assetsPaths|colorMode|density|fontScale|fontWeightAdjustment|grammaticalGender|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|resourcesUnused|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
       android:launchMode="singleTask"
       android:taskAffinity=""
       android:exported="true">
@@ -31,20 +34,34 @@
         <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" />
+        <data android:scheme="claw" android:host="comments" android:pathPrefix="/" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:scheme="claw" android:host="hottest" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:scheme="claw" android:host="newest" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW" />
+        <category android:name="android.intent.category.DEFAULT" />
+        <data android:scheme="claw" android:host="saved" />
+      </intent-filter>
     </activity>
 
     <activity
-      android:name=".SearchActivity"
-      android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
-      android:exported="true"
-      android:label="Claw Search"
-      android:launchMode="singleTask"
-      android:taskAffinity=""
-      android:theme="@style/Theme.Claw">
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-      </intent-filter>
-    </activity>
+      android:name=".glance.WidgetClickActivity"
+      android:exported="false"
+      android:theme="@android:style/Theme.NoDisplay"
+      android:excludeFromRecents="true"
+      android:taskAffinity="" />
 
     <provider
       android:name="androidx.startup.InitializationProvider"
@@ -55,14 +72,10 @@
         android:name="androidx.work.WorkManagerInitializer"
         android:value="androidx.startup"
         tools:node="remove" />
-      <meta-data
-        android:name="com.deliveryhero.whetstone.worker.WhetstoneWorkerInitializer"
-        android:value="androidx.startup"
-        tools:node="remove" />
     </provider>
 
     <receiver
-      android:name=".glance.WidgetReceiver"
+      android:name=".glance.SavedPostsWidgetReceiver"
       android:exported="true">
       <intent-filter>
         <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -72,6 +85,17 @@
         android:resource="@xml/saved_posts_widget_info" />
     </receiver>
 
+    <receiver
+      android:name=".glance.HottestPostsWidgetReceiver"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+      </intent-filter>
+      <meta-data
+        android:name="android.appwidget.provider"
+        android:resource="@xml/hottest_posts_widget_info" />
+    </receiver>
+
     <!-- Required: set your sentry.io project identifier (DSN) -->
     <meta-data
       android:name="io.sentry.dsn"
@@ -93,5 +117,6 @@
       android:value="true" />
     <!-- set the environment for this build -->
     <meta-data android:name="io.sentry.environment" android:value="${sentryEnvironment}" />
+    <meta-data android:name="io.sentry.auto-init" android:value="false" />
   </application>
 </manifest>

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

@@ -0,0 +1,35 @@
+/*
+ * Copyright © 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
+
+import android.app.Application
+import dev.zacsweers.metrox.android.MetroAppComponentFactory
+
+/**
+ * Custom variant of [android.app.AppComponentFactory] that skips [ClawApplication] init when the
+ * app is running in a backup process for Android Auto Backup. In all normal cases, it will defer to
+ * [MetroAppComponentFactory].
+ */
+@Suppress("unused")
+class BackupSafeAppComponentFactory : MetroAppComponentFactory() {
+
+  override fun instantiateApplicationCompat(cl: ClassLoader, className: String): Application {
+    if (isBackupAgentProcess()) {
+      return Application()
+    }
+    return super.instantiateApplicationCompat(cl, className)
+  }
+
+  private fun isBackupAgentProcess(): Boolean {
+    return try {
+      val processName = Application.getProcessName()
+      processName?.contains("backup") == true
+    } catch (_: Exception) {
+      false
+    }
+  }
+}

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

@@ -1,70 +0,0 @@
-/*
- * Copyright © 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
-
-import android.app.assist.AssistContent
-import android.graphics.Color
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.SystemBarStyle
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
-import androidx.compose.ui.platform.LocalUriHandler
-import com.deliveryhero.whetstone.Whetstone
-import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.theme.LobstersTheme
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import javax.inject.Inject
-
-/** A base class that encapsulates all activities used by Claw. */
-@Stable
-abstract class BaseActivity : ComponentActivity() {
-
-  @Inject lateinit var urlLauncher: UrlLauncher
-  @Inject lateinit var htmlConverter: HTMLConverter
-  @Inject lateinit var viewModel: ClawViewModel
-  var webUri: String? = null
-
-  /** Entrypoint to show a [Composable] as this [ComponentActivity]'s view. */
-  @Composable abstract fun Content()
-
-  /** Overrideable method to call stuff in [onCreate]. */
-  open fun preLaunch() {}
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    preLaunch()
-    Whetstone.inject(this)
-    enableEdgeToEdge(
-      statusBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT),
-      navigationBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT),
-    )
-    setContent {
-      LobstersTheme(
-        dynamicColor = true,
-        providedValues = arrayOf(LocalUriHandler provides urlLauncher),
-      ) {
-        Content()
-      }
-    }
-  }
-
-  override fun onProvideAssistContent(outContent: AssistContent?) {
-    super.onProvideAssistContent(outContent)
-    if (outContent != null) {
-      if (webUri != null) {
-        outContent.webUri = Uri.parse(webUri)
-      } else {
-        outContent.webUri = null
-      }
-    }
-  }
-}

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

@@ -7,43 +7,62 @@
 package dev.msfjarvis.claw.android
 
 import android.app.Application
+import android.os.Build
+import androidx.glance.appwidget.GlanceAppWidgetManager
 import androidx.work.Constraints
 import androidx.work.ExistingPeriodicWorkPolicy
 import androidx.work.NetworkType
 import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import com.deliveryhero.whetstone.Whetstone
-import com.deliveryhero.whetstone.app.ApplicationComponentOwner
-import com.deliveryhero.whetstone.app.ContributesAppInjector
+import dev.msfjarvis.claw.android.glance.SavedPostsWidgetReceiver
+import dev.msfjarvis.claw.android.injection.AppGraph
 import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
-import dev.msfjarvis.claw.core.injection.AppPlugin
+import dev.msfjarvis.claw.android.work.TagExpirationCleanupWorker
+import dev.zacsweers.metro.createGraphFactory
+import dev.zacsweers.metrox.android.MetroAppComponentProviders
+import dev.zacsweers.metrox.android.MetroApplication
 import java.util.concurrent.TimeUnit
-import javax.inject.Inject
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
 
-@ContributesAppInjector(generateAppComponent = true)
-class ClawApplication : Application(), ApplicationComponentOwner {
+class ClawApplication : Application(), MetroApplication {
 
-  override val applicationComponent = GeneratedApplicationComponent.create(this)
+  val appGraph by lazy { createGraphFactory<AppGraph.Factory>().create(this) }
 
-  @Inject lateinit var plugins: Set<@JvmSuppressWildcards AppPlugin>
+  override val appComponentProviders: MetroAppComponentProviders
+    get() = appGraph
 
+  @OptIn(DelicateCoroutinesApi::class)
   override fun onCreate() {
-    Whetstone.inject(this)
     super.onCreate()
-    plugins.forEach { plugin -> plugin.apply(this) }
+    appGraph.plugins.forEach { plugin -> plugin.apply(this) }
     val postUpdateWorkRequest =
-      PeriodicWorkRequestBuilder<SavedPostUpdaterWorker>(POST_REFRESH_PERIOD, TimeUnit.HOURS)
+      PeriodicWorkRequestBuilder<SavedPostUpdaterWorker>(24, TimeUnit.HOURS)
         .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
         .build()
-    WorkManager.getInstance(this)
-      .enqueueUniquePeriodicWork(
-        "updateSavedPosts",
-        ExistingPeriodicWorkPolicy.KEEP,
-        postUpdateWorkRequest,
-      )
-  }
-
-  private companion object {
-    private const val POST_REFRESH_PERIOD = 24L // 24 hours
+    appGraph.workManager.enqueueUniquePeriodicWork(
+      uniqueWorkName = "updateSavedPosts",
+      existingPeriodicWorkPolicy = ExistingPeriodicWorkPolicy.KEEP,
+      request = postUpdateWorkRequest,
+    )
+    val tagCleanupWorkRequest =
+      PeriodicWorkRequestBuilder<TagExpirationCleanupWorker>(24, TimeUnit.HOURS).build()
+    appGraph.workManager.enqueueUniquePeriodicWork(
+      uniqueWorkName = "cleanupExpiredTags",
+      existingPeriodicWorkPolicy = ExistingPeriodicWorkPolicy.KEEP,
+      request = tagCleanupWorkRequest,
+    )
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+      GlobalScope.launch(appGraph.mainDispatcher) {
+        try {
+          GlanceAppWidgetManager(applicationContext)
+            .setWidgetPreviews(SavedPostsWidgetReceiver::class)
+        } catch (_: IllegalArgumentException) {
+          // Workaround for Motorola Android 15 bug where AppWidgetServiceImpl incorrectly
+          // reports registered widgets as invalid when setting previews.
+          // See: https://claw.sentry.io/share/issue/f8ee09821d8840b9b86293d3ffb627d3/
+        }
+      }
+    }
   }
 }

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

@@ -6,51 +6,116 @@
  */
 package dev.msfjarvis.claw.android
 
-import androidx.compose.foundation.layout.fillMaxSize
+import android.app.Activity
+import android.app.assist.AssistContent
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.SystemBarStyle
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
-import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.platform.UriHandler
+import androidx.core.net.toUri
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.deliveryhero.whetstone.activity.ContributesActivityInjector
+import androidx.lifecycle.ViewModelProvider
+import androidx.navigation3.runtime.NavKey
+import dev.msfjarvis.claw.android.ui.navigation.Comments
+import dev.msfjarvis.claw.android.ui.navigation.Hottest
+import dev.msfjarvis.claw.android.ui.navigation.Newest
+import dev.msfjarvis.claw.android.ui.navigation.Saved
 import dev.msfjarvis.claw.android.ui.screens.LobstersPostsScreen
-import dev.msfjarvis.claw.android.ui.screens.TabletScreen
+import dev.msfjarvis.claw.common.theme.LobstersTheme
+import dev.msfjarvis.claw.core.injection.InjectedViewModelFactory
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
+import dev.zacsweers.metrox.android.ActivityKey
+import dev.zacsweers.metrox.viewmodel.LocalMetroViewModelFactory
 
-@ContributesActivityInjector
-class MainActivity : BaseActivity() {
+@OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
+@ContributesIntoMap(AppScope::class, binding<Activity>())
+@ActivityKey
+@Inject
+class MainActivity(
+  private val uriHandler: UriHandler,
+  private val viewModelFactory: InjectedViewModelFactory,
+) : ComponentActivity() {
 
-  @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
-  @Composable
-  override fun Content() {
-    val windowSizeClass = calculateWindowSizeClass(this)
+  override val defaultViewModelProviderFactory: ViewModelProvider.Factory
+    get() = viewModelFactory
 
-    when (windowSizeClass.widthSizeClass) {
-      WindowWidthSizeClass.Compact -> {
+  var webUri: String? = null
+  var deepLinkDestination by mutableStateOf<NavKey?>(null)
+    private set
+
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    installSplashScreen()
+    enableEdgeToEdge(
+      statusBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT)
+      // Don't set navigation bar style, the default matches the platform behavior.
+    )
+    handleIntent(intent)
+    setContent {
+      LobstersTheme(
+        dynamicColor = true,
+        providedValues =
+          arrayOf(
+            LocalUriHandler provides uriHandler,
+            LocalMetroViewModelFactory provides viewModelFactory,
+          ),
+      ) {
+        val windowSizeClass = calculateWindowSizeClass(this)
         LobstersPostsScreen(
-          urlLauncher = urlLauncher,
-          htmlConverter = htmlConverter,
+          uriHandler = uriHandler,
           windowSizeClass = windowSizeClass,
           setWebUri = { url -> webUri = url },
-        )
-      }
-
-      else -> {
-        TabletScreen(
-          urlLauncher = urlLauncher,
-          htmlConverter = htmlConverter,
-          modifier = Modifier.fillMaxSize(),
+          deepLinkDestination = deepLinkDestination,
+          clearDeepLink = { deepLinkDestination = null },
         )
       }
     }
   }
 
-  override fun preLaunch() {
-    super.preLaunch()
-    installSplashScreen()
+  override fun onNewIntent(intent: Intent) {
+    super.onNewIntent(intent)
+    handleIntent(intent)
   }
 
-  companion object {
-    const val NAVIGATION_KEY = "postId"
+  private fun handleIntent(intent: Intent) {
+    val data = intent.data
+    if (data != null && data.scheme == BuildConfig.DEEPLINK_SCHEME) {
+      when (data.host) {
+        "comments" -> {
+          val postId = data.pathSegments.firstOrNull()
+          if (postId != null) {
+            deepLinkDestination = Comments(postId)
+          }
+        }
+        "newest" -> deepLinkDestination = Newest
+        "hottest" -> deepLinkDestination = Hottest
+        "saved" -> deepLinkDestination = Saved
+      }
+    }
+  }
+
+  override fun onProvideAssistContent(outContent: AssistContent?) {
+    super.onProvideAssistContent(outContent)
+    val uri = webUri
+    if (outContent != null) {
+      if (uri != null) {
+        outContent.webUri = uri.toUri()
+      } else {
+        outContent.webUri = null
+      }
+    }
   }
 }

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

@@ -1,24 +0,0 @@
-/*
- * Copyright © 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
-
-import androidx.compose.runtime.Composable
-import com.deliveryhero.whetstone.activity.ContributesActivityInjector
-import dev.msfjarvis.claw.android.ui.screens.SearchScreen
-
-@ContributesActivityInjector
-class SearchActivity : BaseActivity() {
-  @Composable
-  override fun Content() {
-    SearchScreen(
-      urlLauncher = urlLauncher,
-      htmlConverter = htmlConverter,
-      setWebUri = { webUri = it },
-      viewModel = viewModel,
-    )
-  }
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/HottestPostsWidget.kt

@@ -0,0 +1,157 @@
+/*
+ * Copyright © 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.glance
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
+import androidx.glance.GlanceId
+import androidx.glance.GlanceModifier
+import androidx.glance.GlanceTheme
+import androidx.glance.LocalContext
+import androidx.glance.action.clickable
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.action.actionStartActivity
+import androidx.glance.appwidget.cornerRadius
+import androidx.glance.appwidget.lazy.items
+import androidx.glance.appwidget.provideContent
+import androidx.glance.background
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.Box
+import androidx.glance.layout.fillMaxWidth
+import androidx.glance.layout.padding
+import androidx.glance.text.Text
+import androidx.glance.text.TextAlign
+import androidx.glance.text.TextStyle
+import com.slack.eithernet.ApiResult
+import dev.msfjarvis.claw.android.BuildConfig
+import dev.msfjarvis.claw.android.ClawApplication
+import dev.msfjarvis.claw.android.MainActivity
+import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.database.local.CachedRemotePost
+import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.fromCachedRemotePost
+import dev.msfjarvis.claw.model.toUIPost
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.first
+
+class HottestPostsWidget : GlanceAppWidget() {
+
+  override suspend fun provideGlance(context: Context, id: GlanceId) {
+    val appGraph = (context.applicationContext as ClawApplication).appGraph
+    val cachedRemotePostsRepository = appGraph.cachedRemotePostsRepository
+    val tagBlockRepository = appGraph.tagBlockRepository
+    val filteredTags =
+      try {
+        tagBlockRepository.getSavedTags().first()
+      } catch (_: Exception) {
+        emptySet()
+      }
+    val posts =
+      when (val postsResult = appGraph.lobstersApi.getHottestPosts(1)) {
+        is ApiResult.Success -> {
+          val uiPosts = postsResult.value.posts.map(LobstersPost::toUIPost)
+          // Cache the posts for future use when network is unavailable
+          // Using try-catch to prevent widget rendering failures if caching fails
+          try {
+            val cachedPosts = uiPosts.mapIndexed { index, post ->
+              CachedRemotePost(
+                shortId = post.shortId,
+                title = post.title,
+                url = post.url,
+                createdAt = post.createdAt,
+                commentCount = post.commentCount,
+                commentsUrl = post.commentsUrl,
+                submitterName = post.submitter,
+                tags = post.tags,
+                description = post.description,
+                userIsAuthor = post.userIsAuthor,
+                insertionOrder = index,
+              )
+            }
+            cachedRemotePostsRepository.savePosts(cachedPosts)
+          } catch (_: Exception) {
+            // Silently ignore caching failures - widget should still render
+          }
+          uiPosts.toImmutableList()
+        }
+        else -> {
+          // Fall back to cached posts when network fails
+          cachedRemotePostsRepository
+            .getCachedPosts()
+            .map(UIPost::fromCachedRemotePost)
+            .toImmutableList()
+        }
+      }
+    // Filter out posts with tags that are in the filtered tags set
+    val filteredPosts =
+      if (filteredTags.isEmpty()) {
+        posts
+      } else {
+        posts
+          .filter { post -> post.tags.none { tag -> filteredTags.contains(tag) } }
+          .toImmutableList()
+      }
+    provideContent { LobstersGlanceTheme { Content(context, filteredPosts) } }
+  }
+
+  override suspend fun providePreview(context: Context, widgetCategory: Int) {
+    provideContent { Content(context, samplePosts()) }
+  }
+
+  @SuppressLint("ComposeUnstableReceiver")
+  @Composable
+  private fun Content(
+    context: Context,
+    posts: ImmutableList<UIPost>,
+    modifier: GlanceModifier = GlanceModifier,
+  ) {
+    WidgetContainer(
+      "Hottest posts",
+      listContent = {
+        items(posts) { post ->
+          Box(GlanceModifier.padding(horizontal = 16.dp, vertical = 4.dp)) { WidgetPostEntry(post) }
+        }
+        item {
+          Box(
+            contentAlignment = Alignment.Center,
+            modifier = GlanceModifier.fillMaxWidth().padding(16.dp),
+          ) {
+            Box(
+              contentAlignment = Alignment.Center,
+              modifier =
+                GlanceModifier.background(GlanceTheme.colors.primary)
+                  .cornerRadius(20.dp)
+                  .padding(horizontal = 24.dp, vertical = 10.dp)
+                  .clickable(
+                    actionStartActivity(
+                      Intent(Intent.ACTION_VIEW, "${BuildConfig.DEEPLINK_SCHEME}://hottest".toUri())
+                        .apply {
+                          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                          setClass(LocalContext.current, MainActivity::class.java)
+                        }
+                    )
+                  ),
+            ) {
+              Text(
+                text = context.getString(R.string.see_more_posts),
+                style =
+                  TextStyle(color = GlanceTheme.colors.onPrimary, textAlign = TextAlign.Center),
+              )
+            }
+          }
+        }
+      },
+      modifier = modifier,
+    )
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/HottestPostsWidgetReceiver.kt

@@ -6,25 +6,26 @@
  */
 package dev.msfjarvis.claw.android.glance
 
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import androidx.glance.appwidget.GlanceAppWidget
 import androidx.glance.appwidget.GlanceAppWidgetReceiver
-import com.deliveryhero.whetstone.Whetstone
-import com.deliveryhero.whetstone.broadcastreceiver.ContributesBroadcastReceiverInjector
-import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import javax.inject.Inject
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
+import dev.zacsweers.metrox.android.BroadcastReceiverKey
 
-@ContributesBroadcastReceiverInjector
-class WidgetReceiver : GlanceAppWidgetReceiver() {
-
-  @Inject lateinit var viewModel: ClawViewModel
+@ContributesIntoMap(AppScope::class, binding<BroadcastReceiver>())
+@BroadcastReceiverKey
+@Inject
+class HottestPostsWidgetReceiver() : GlanceAppWidgetReceiver() {
 
   override val glanceAppWidget: GlanceAppWidget
-    get() = SavedPostsWidget(viewModel.savedPosts)
+    get() = HottestPostsWidget()
 
   override fun onReceive(context: Context, intent: Intent) {
-    Whetstone.inject(this, context)
     super.onReceive(context, intent)
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/SavedPostsWidget.kt

@@ -6,69 +6,106 @@
  */
 package dev.msfjarvis.claw.android.glance
 
+import android.annotation.SuppressLint
 import android.content.Context
-import android.os.Build
-import androidx.compose.material3.MaterialTheme
+import android.content.Intent
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
+import androidx.core.net.toUri
+import androidx.glance.GlanceComposable
 import androidx.glance.GlanceId
 import androidx.glance.GlanceModifier
 import androidx.glance.GlanceTheme
+import androidx.glance.LocalContext
+import androidx.glance.action.clickable
 import androidx.glance.appwidget.GlanceAppWidget
-import androidx.glance.appwidget.appWidgetBackground
-import androidx.glance.appwidget.lazy.LazyColumn
+import androidx.glance.appwidget.action.actionStartActivity
+import androidx.glance.appwidget.cornerRadius
 import androidx.glance.appwidget.lazy.items
 import androidx.glance.appwidget.provideContent
 import androidx.glance.background
 import androidx.glance.layout.Alignment
-import androidx.glance.layout.fillMaxSize
+import androidx.glance.layout.Box
+import androidx.glance.layout.fillMaxWidth
 import androidx.glance.layout.padding
-import androidx.glance.material3.ColorProviders
+import androidx.glance.preview.ExperimentalGlancePreviewApi
+import androidx.glance.preview.Preview
 import androidx.glance.text.Text
+import androidx.glance.text.TextAlign
 import androidx.glance.text.TextStyle
-import dev.msfjarvis.claw.common.theme.DarkThemeColors
-import dev.msfjarvis.claw.common.theme.LightThemeColors
+import dev.msfjarvis.claw.android.BuildConfig
+import dev.msfjarvis.claw.android.ClawApplication
+import dev.msfjarvis.claw.android.MainActivity
+import dev.msfjarvis.claw.android.R
 import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.fromSavedPost
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.toImmutableList
-import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.first
 
-class SavedPostsWidget(private val posts: Flow<List<UIPost>>) : GlanceAppWidget() {
-  override suspend fun provideGlance(context: Context, id: GlanceId) {
-    val postWindow = posts.first().take(50).toImmutableList()
-    provideContent {
-      GlanceTheme(
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) GlanceTheme.colors
-        else ColorProviders(light = LightThemeColors, dark = DarkThemeColors)
-      ) {
-        WidgetHost(postWindow)
-      }
-    }
-  }
-}
+class SavedPostsWidget : GlanceAppWidget() {
 
-@Composable
-fun WidgetHost(posts: ImmutableList<UIPost>, modifier: GlanceModifier = GlanceModifier) {
-  LazyColumn(
-    modifier =
-      modifier.fillMaxSize().background(GlanceTheme.colors.background).appWidgetBackground(),
-    horizontalAlignment = Alignment.CenterHorizontally,
-  ) {
-    item {
-      val style = MaterialTheme.typography.titleLarge
-      Text(
-        text = "Saved posts",
-        style =
-          TextStyle(
-            color = GlanceTheme.colors.onBackground,
-            fontSize = style.fontSize,
-            fontWeight = style.fontWeight.toGlance(),
-            fontStyle = style.fontStyle.toGlance(),
-          ),
-        modifier = GlanceModifier.padding(vertical = 8.dp),
-      )
-    }
-    items(posts) { post -> WidgetListEntry(post = post) }
+  override suspend fun provideGlance(context: Context, id: GlanceId) {
+    val appGraph = (context.applicationContext as ClawApplication).appGraph
+    val posts = appGraph.savedPostsRepository.getRecentPosts(50)
+    val postWindow = posts.first().map(UIPost::fromSavedPost).toImmutableList()
+    provideContent { LobstersGlanceTheme { Content(postWindow) } }
+  }
+
+  override suspend fun providePreview(context: Context, widgetCategory: Int) {
+    provideContent { Content(samplePosts()) }
+  }
+
+  @SuppressLint("ComposeUnstableReceiver")
+  @Composable
+  private fun Content(posts: ImmutableList<UIPost>, modifier: GlanceModifier = GlanceModifier) {
+    val context = LocalContext.current
+    WidgetContainer(
+      title = context.getString(R.string.saved_posts),
+      listContent = {
+        items(posts) { post ->
+          Box(GlanceModifier.padding(horizontal = 16.dp, vertical = 4.dp)) { WidgetPostEntry(post) }
+        }
+        item {
+          Box(
+            contentAlignment = Alignment.Center,
+            modifier = GlanceModifier.fillMaxWidth().padding(16.dp),
+          ) {
+            Box(
+              contentAlignment = Alignment.Center,
+              modifier =
+                GlanceModifier.background(GlanceTheme.colors.primary)
+                  .cornerRadius(20.dp)
+                  .padding(horizontal = 24.dp, vertical = 10.dp)
+                  .clickable(
+                    actionStartActivity(
+                      Intent(Intent.ACTION_VIEW, "${BuildConfig.DEEPLINK_SCHEME}://saved".toUri())
+                        .apply {
+                          addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                          setClass(LocalContext.current, MainActivity::class.java)
+                        }
+                    )
+                  ),
+            ) {
+              Text(
+                text = context.getString(R.string.see_more_posts),
+                style =
+                  TextStyle(color = GlanceTheme.colors.onPrimary, textAlign = TextAlign.Center),
+              )
+            }
+          }
+        }
+      },
+      modifier = modifier,
+    )
+  }
+
+  @SuppressLint("ComposeUnstableReceiver")
+  @OptIn(ExperimentalGlancePreviewApi::class)
+  @Preview
+  @GlanceComposable
+  @Composable
+  private fun Preview() {
+    Content(samplePosts())
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/SavedPostsWidgetReceiver.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright © 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.glance
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
+import dev.zacsweers.metrox.android.BroadcastReceiverKey
+
+@ContributesIntoMap(AppScope::class, binding<BroadcastReceiver>())
+@BroadcastReceiverKey
+@Inject
+class SavedPostsWidgetReceiver() : GlanceAppWidgetReceiver() {
+
+  override val glanceAppWidget: GlanceAppWidget
+    get() = SavedPostsWidget()
+
+  override fun onReceive(context: Context, intent: Intent) {
+    super.onReceive(context, intent)
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/WidgetClickActivity.kt

@@ -0,0 +1,96 @@
+/*
+ * Copyright © 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.glance
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import androidx.core.net.toUri
+import dev.msfjarvis.claw.android.BuildConfig
+import dev.msfjarvis.claw.android.MainActivity
+import io.sentry.Breadcrumb
+import io.sentry.Sentry
+import io.sentry.SentryLevel
+
+/**
+ * Trampoline activity for handling widget clicks with explicit components.
+ *
+ * This activity is required to fix COMPOSE-LOBSTERS-9X/9P/8M. Glance's LazyColumn requires all
+ * actionStartActivity intents to have an explicit component set. For external URLs, we route
+ * through this activity which then launches the appropriate intent (either internal deep link or
+ * external browser).
+ *
+ * @see:
+ * https://developer.android.com/reference/kotlin/androidx/glance/appwidget/action/package-summary#actionStartActivity(android.content.Intent,androidx.glance.action.ActionParameters)
+ */
+class WidgetClickActivity : Activity() {
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+
+    val url = intent.getStringExtra(EXTRA_URL)
+    val shortId = intent.getStringExtra(EXTRA_SHORT_ID)
+    val action = intent.action
+
+    when {
+      // Handle comments deep link
+      action == ACTION_OPEN_COMMENTS && shortId != null -> {
+        Sentry.addBreadcrumb(
+          Breadcrumb().apply {
+            category = "widget_click_debug"
+            message = "Comment deeplink"
+            level = SentryLevel.INFO
+          }
+        )
+        val commentsIntent =
+          Intent(Intent.ACTION_VIEW, "${BuildConfig.DEEPLINK_SCHEME}://comments/$shortId".toUri())
+            .apply {
+              addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+              setClass(this@WidgetClickActivity, MainActivity::class.java)
+            }
+        startActivity(commentsIntent)
+      }
+      // Handle external URL
+      url != null && (url.startsWith("http://") || url.startsWith("https://")) -> {
+        Sentry.addBreadcrumb(
+          Breadcrumb().apply {
+            category = "widget_click_debug"
+            message = "External URL"
+            level = SentryLevel.INFO
+          }
+        )
+        val urlIntent = Intent(Intent.ACTION_VIEW, url.toUri())
+        startActivity(urlIntent)
+      }
+      // Handle internal/relative URL as comments link
+      url != null && (url.startsWith('/') || url.isEmpty()) -> {
+        Sentry.addBreadcrumb(
+          Breadcrumb().apply {
+            category = "widget_click_debug"
+            message = "Relative URL, parsed as a comment link"
+            level = SentryLevel.INFO
+          }
+        )
+        // For internal URLs without shortId, extract it from the URL or use comments action
+        val commentsIntent =
+          Intent(Intent.ACTION_VIEW, "${BuildConfig.DEEPLINK_SCHEME}://comments/$shortId".toUri())
+            .apply {
+              addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+              setClass(this@WidgetClickActivity, MainActivity::class.java)
+            }
+        startActivity(commentsIntent)
+      }
+    }
+
+    finish()
+  }
+
+  companion object {
+    const val ACTION_OPEN_COMMENTS = "dev.msfjarvis.claw.OPEN_COMMENTS"
+    const val EXTRA_URL = "dev.msfjarvis.claw.EXTRA_URL"
+    const val EXTRA_SHORT_ID = "dev.msfjarvis.claw.EXTRA_SHORT_ID"
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/WidgetListEntry.kt

@@ -1,77 +0,0 @@
-/*
- * Copyright © 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.glance
-
-import android.content.Intent
-import android.net.Uri
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.unit.dp
-import androidx.glance.GlanceComposable
-import androidx.glance.GlanceModifier
-import androidx.glance.GlanceTheme
-import androidx.glance.Image
-import androidx.glance.ImageProvider
-import androidx.glance.action.ActionParameters.Key
-import androidx.glance.action.actionParametersOf
-import androidx.glance.action.actionStartActivity
-import androidx.glance.action.clickable
-import androidx.glance.appwidget.action.actionStartActivity
-import androidx.glance.appwidget.cornerRadius
-import androidx.glance.background
-import androidx.glance.layout.Alignment
-import androidx.glance.layout.Box
-import androidx.glance.layout.Row
-import androidx.glance.layout.fillMaxWidth
-import androidx.glance.layout.padding
-import androidx.glance.text.Text
-import androidx.glance.text.TextStyle
-import dev.msfjarvis.claw.android.MainActivity
-import dev.msfjarvis.claw.android.MainActivity.Companion.NAVIGATION_KEY
-import dev.msfjarvis.claw.android.R
-import dev.msfjarvis.claw.model.UIPost
-
-private val destinationKey = Key<String>(NAVIGATION_KEY)
-
-@Composable
-@GlanceComposable
-fun WidgetListEntry(post: UIPost, modifier: GlanceModifier = GlanceModifier) {
-  val titleStyle = MaterialTheme.typography.titleMedium
-  val commentsAction =
-    actionStartActivity<MainActivity>(actionParametersOf(destinationKey to post.shortId))
-  // If the URL starts with a /, it's a relative URL and we should open the comments page directly.
-  val postAction =
-    if (post.url.startsWith('/')) commentsAction
-    else actionStartActivity(Intent(Intent.ACTION_VIEW, Uri.parse(post.url)))
-  Box(modifier.padding(8.dp)) {
-    Row(
-      verticalAlignment = Alignment.CenterVertically,
-      modifier =
-        GlanceModifier.fillMaxWidth()
-          .background(GlanceTheme.colors.surfaceVariant)
-          .cornerRadius(4.dp)
-          .padding(8.dp),
-    ) {
-      Text(
-        text = post.title,
-        modifier = GlanceModifier.defaultWeight().padding(start = 4.dp).clickable(postAction),
-        style =
-          TextStyle(
-            color = GlanceTheme.colors.onSurfaceVariant,
-            fontSize = titleStyle.fontSize,
-            fontWeight = titleStyle.fontWeight.toGlance(),
-            fontStyle = titleStyle.fontStyle.toGlance(),
-          ),
-      )
-      Image(
-        provider = ImageProvider(R.drawable.ic_comment),
-        contentDescription = "${post.commentCount} comments",
-        modifier = GlanceModifier.padding(end = 4.dp).clickable(commentsAction),
-      )
-    }
-  }
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/WidgetPostEntry.kt

@@ -0,0 +1,97 @@
+/*
+ * Copyright © 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.glance
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import androidx.glance.ColorFilter
+import androidx.glance.GlanceComposable
+import androidx.glance.GlanceModifier
+import androidx.glance.GlanceTheme
+import androidx.glance.Image
+import androidx.glance.ImageProvider
+import androidx.glance.LocalContext
+import androidx.glance.action.clickable
+import androidx.glance.appwidget.action.actionStartActivity
+import androidx.glance.appwidget.cornerRadius
+import androidx.glance.background
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.Row
+import androidx.glance.layout.fillMaxWidth
+import androidx.glance.layout.padding
+import androidx.glance.preview.ExperimentalGlancePreviewApi
+import androidx.glance.preview.Preview
+import androidx.glance.text.Text
+import androidx.glance.text.TextStyle
+import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.model.UIPost
+
+@SuppressLint("ArgInFormattedQuantityStringRes")
+@Composable
+@GlanceComposable
+fun WidgetPostEntry(post: UIPost, modifier: GlanceModifier = GlanceModifier) {
+  val titleStyle = MaterialTheme.typography.bodyMedium
+  val context = LocalContext.current
+  val commentsAction =
+    actionStartActivity(
+      Intent(context, WidgetClickActivity::class.java).apply {
+        action = WidgetClickActivity.ACTION_OPEN_COMMENTS
+        putExtra(WidgetClickActivity.EXTRA_SHORT_ID, post.shortId)
+      }
+    )
+  val postAction =
+    if (post.url.startsWith('/') || post.url.isEmpty()) commentsAction
+    else
+      actionStartActivity(
+        Intent(context, WidgetClickActivity::class.java).apply {
+          putExtra(WidgetClickActivity.EXTRA_URL, post.url)
+          putExtra(WidgetClickActivity.EXTRA_SHORT_ID, post.shortId)
+        }
+      )
+  Row(
+    verticalAlignment = Alignment.CenterVertically,
+    modifier =
+      modifier.fillMaxWidth().cornerRadius(8.dp).background(GlanceTheme.colors.secondaryContainer),
+  ) {
+    Text(
+      text = post.title,
+      modifier =
+        GlanceModifier.defaultWeight()
+          .clickable(postAction)
+          .padding(horizontal = 8.dp, vertical = 4.dp)
+          .padding(start = 4.dp),
+      maxLines = 1,
+      style =
+        TextStyle(color = GlanceTheme.colors.onSecondaryContainer, fontSize = titleStyle.fontSize),
+    )
+    Image(
+      provider = ImageProvider(R.drawable.ic_comment),
+      contentDescription =
+        context.resources.getQuantityString(
+          R.plurals.comments,
+          post.commentCount,
+          post.commentCount,
+        ),
+      colorFilter = ColorFilter.tint(GlanceTheme.colors.onSecondaryContainer),
+      modifier =
+        GlanceModifier.clickable(commentsAction)
+          .padding(horizontal = 8.dp, vertical = 4.dp)
+          .padding(horizontal = 4.dp),
+    )
+  }
+}
+
+@OptIn(ExperimentalGlancePreviewApi::class)
+@Preview
+@GlanceComposable
+@Composable
+private fun WidgetPostEntryPreview() {
+  WidgetPostEntry(samplePosts(1).first())
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/glance/util.kt

@@ -6,22 +6,67 @@
  */
 package dev.msfjarvis.claw.android.glance
 
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
+import android.annotation.SuppressLint
+import android.os.Build
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.glance.GlanceComposable
+import androidx.glance.GlanceModifier
+import androidx.glance.GlanceTheme
+import androidx.glance.appwidget.cornerRadius
+import androidx.glance.appwidget.lazy.LazyColumn
+import androidx.glance.appwidget.lazy.LazyListScope
+import androidx.glance.background
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.Column
+import androidx.glance.layout.Row
+import androidx.glance.layout.fillMaxSize
+import androidx.glance.layout.fillMaxWidth
+import androidx.glance.layout.padding
+import androidx.glance.material3.ColorProviders
+import androidx.glance.text.Text
+import androidx.glance.text.TextStyle
+import dev.msfjarvis.claw.common.posts.TEST_POST
+import dev.msfjarvis.claw.common.theme.DarkThemeColors
+import dev.msfjarvis.claw.common.theme.LightThemeColors
+import dev.msfjarvis.claw.model.UIPost
+import kotlinx.collections.immutable.PersistentList
+import kotlinx.collections.immutable.toPersistentList
 
-fun FontWeight?.toGlance(): androidx.glance.text.FontWeight? {
-  return when (this) {
-    FontWeight.Normal -> androidx.glance.text.FontWeight.Normal
-    FontWeight.Medium -> androidx.glance.text.FontWeight.Medium
-    FontWeight.Bold -> androidx.glance.text.FontWeight.Bold
-    else -> null
+@Composable
+fun LobstersGlanceTheme(content: @GlanceComposable @Composable () -> Unit) {
+  GlanceTheme(
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) GlanceTheme.colors
+    else ColorProviders(light = LightThemeColors, dark = DarkThemeColors),
+    content,
+  )
+}
+
+@Composable
+fun WidgetContainer(
+  title: String,
+  listContent: LazyListScope.() -> Unit,
+  modifier: GlanceModifier = GlanceModifier,
+) {
+  Column(
+    modifier.fillMaxSize().background(GlanceTheme.colors.widgetBackground).cornerRadius(16.dp)
+  ) {
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalAlignment = Alignment.CenterHorizontally,
+      modifier = GlanceModifier.padding(16.dp).fillMaxWidth(),
+    ) {
+      Text(text = title, style = TextStyle(fontSize = 18.sp, color = GlanceTheme.colors.onSurface))
+    }
+    LazyColumn(content = listContent)
   }
 }
 
-fun FontStyle?.toGlance(): androidx.glance.text.FontStyle? {
-  return when (this) {
-    FontStyle.Normal -> androidx.glance.text.FontStyle.Normal
-    FontStyle.Italic -> androidx.glance.text.FontStyle.Italic
-    else -> null
-  }
+@SuppressLint("VisibleForTests")
+fun samplePosts(
+  count: Int = 5,
+  mutator: UIPost.(idx: Int) -> UIPost = { this },
+): PersistentList<UIPost> {
+  return buildList(count) { repeat(count) { add(TEST_POST.mutator(it)) } }.toPersistentList()
 }

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

@@ -0,0 +1,61 @@
+/*
+ * Copyright © 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.work.ListenableWorker
+import androidx.work.WorkManager
+import dev.msfjarvis.claw.android.viewmodel.CachedRemotePostsRepository
+import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
+import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.common.tags.TagBlockRepository
+import dev.msfjarvis.claw.core.coroutines.MainDispatcher
+import dev.msfjarvis.claw.core.injection.AppPlugin
+import dev.msfjarvis.claw.core.injection.InjectedWorkerFactory
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.DependencyGraph
+import dev.zacsweers.metro.Multibinds
+import dev.zacsweers.metro.Provides
+import dev.zacsweers.metro.SingleIn
+import dev.zacsweers.metrox.android.MetroAppComponentProviders
+import dev.zacsweers.metrox.viewmodel.ViewModelGraph
+import kotlin.reflect.KClass
+import kotlinx.coroutines.CoroutineDispatcher
+
+@DependencyGraph(AppScope::class)
+interface AppGraph : MetroAppComponentProviders, ViewModelGraph {
+  val plugins: Set<AppPlugin>
+
+  val workManager: WorkManager
+
+  @Provides
+  @SingleIn(AppScope::class)
+  fun providesWorkManager(application: Context): WorkManager {
+    return WorkManager.getInstance(application)
+  }
+
+  @Multibinds
+  val workerProviders:
+    Map<KClass<out ListenableWorker>, () -> InjectedWorkerFactory.WorkerInstanceFactory<*>>
+
+  val workerFactory: InjectedWorkerFactory
+
+  val savedPostsRepository: SavedPostsRepository
+
+  val cachedRemotePostsRepository: CachedRemotePostsRepository
+
+  val lobstersApi: LobstersApi
+
+  val tagBlockRepository: TagBlockRepository
+
+  @MainDispatcher val mainDispatcher: CoroutineDispatcher
+
+  @DependencyGraph.Factory
+  fun interface Factory {
+    fun create(@Provides context: Context): AppGraph
+  }
+}

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

@@ -1,20 +0,0 @@
-/*
- * Copyright © 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.deliveryhero.whetstone.app.ApplicationScope
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Binds
-import dagger.Module
-import dev.msfjarvis.claw.android.ui.util.HTMLConverterImpl
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-
-@Module
-@ContributesTo(ApplicationScope::class)
-interface HTMLConverterModule {
-  @Binds fun bindHTMLConverter(impl: HTMLConverterImpl): HTMLConverter
-}

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

@@ -6,27 +6,27 @@
  */
 package dev.msfjarvis.claw.android.injection
 
-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 android.util.Log
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Provides
 import me.saket.unfurl.UnfurlLogger
 import me.saket.unfurl.Unfurler
 import okhttp3.OkHttpClient
 
-@Module
-@ContributesTo(ApplicationScope::class)
+@BindingContainer
+@ContributesTo(AppScope::class)
 object MetadataExtractorModule {
   @Provides
   fun provideUnfurlLogger(): UnfurlLogger {
     return object : UnfurlLogger {
       override fun log(message: String) {
-        Napier.d(tag = "Unfurler") { message }
+        Log.d("Unfurler", message)
       }
 
       override fun log(e: Throwable, message: String) {
-        Napier.e(tag = "Unfurler", throwable = e) { message }
+        Log.e("Unfurler", message, e)
       }
     }
   }

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

@@ -0,0 +1,37 @@
+/*
+ * Copyright © 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.app.Application
+import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.core.injection.AppPlugin
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoSet
+import dev.zacsweers.metro.Inject
+import io.sentry.SentryOptions
+import io.sentry.TypeCheckHint.OKHTTP_REQUEST
+import io.sentry.android.core.SentryAndroid
+import okhttp3.Request
+
+@ContributesIntoSet(AppScope::class)
+@Inject
+class SentryConfigurationPlugin : AppPlugin {
+  override fun apply(application: Application) {
+    SentryAndroid.init(application) { options ->
+      options.beforeSend = SentryOptions.BeforeSendCallback { event, hint ->
+        val request = hint.getAs(OKHTTP_REQUEST, Request::class.java)
+
+        // Drop all OkHttp errors that are not about Lobsters specifically.
+        if (request != null && !LobstersApi.BASE_URL.contains(request.url.host)) {
+          null
+        } else {
+          event
+        }
+      }
+    }
+  }
+}

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

@@ -1,24 +0,0 @@
-/*
- * Copyright © 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 com.deliveryhero.whetstone.activity.ActivityScope
-import com.squareup.anvil.annotations.ContributesTo
-import com.squareup.anvil.annotations.optional.ForScope
-import dagger.Module
-import dagger.Provides
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-
-@Module
-@ContributesTo(ActivityScope::class)
-object UrlLauncherModule {
-  @Provides
-  fun provideUrlLauncher(@ForScope(ActivityScope::class) context: Context): UrlLauncher {
-    return UrlLauncher(context)
-  }
-}

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

@@ -11,13 +11,14 @@ import android.util.Log
 import androidx.work.Configuration
 import androidx.work.WorkManager
 import androidx.work.WorkerFactory
-import com.deliveryhero.whetstone.app.ApplicationScope
-import com.squareup.anvil.annotations.ContributesMultibinding
 import dev.msfjarvis.claw.core.injection.AppPlugin
-import javax.inject.Inject
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoSet
+import dev.zacsweers.metro.Inject
 
-@ContributesMultibinding(ApplicationScope::class)
-class WorkManagerPlugin @Inject constructor(private val workerFactory: WorkerFactory) : AppPlugin {
+@ContributesIntoSet(AppScope::class)
+@Inject
+class WorkManagerPlugin(private val workerFactory: WorkerFactory) : AppPlugin {
   override fun apply(application: Application) {
     WorkManager.initialize(
       application,

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

@@ -10,23 +10,22 @@ import androidx.paging.PagingSource
 import androidx.paging.PagingState
 import com.slack.eithernet.ApiResult.Failure
 import com.slack.eithernet.ApiResult.Success
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedFactory
-import dagger.assisted.AssistedInject
-import dev.msfjarvis.claw.android.ui.toError
-import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.api.toError
+import dev.msfjarvis.claw.core.coroutines.IODispatcher
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.UIPost
 import dev.msfjarvis.claw.model.toUIPost
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
-class LobstersPagingSource
 @AssistedInject
-constructor(
+class LobstersPagingSource(
   @Assisted private val remoteFetcher: RemoteFetcher<LobstersPost>,
-  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
+  @param:IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : PagingSource<Int, UIPost>() {
   override suspend fun load(params: LoadParams<Int>): LoadResult<Int, UIPost> {
     val page = params.key ?: STARTING_PAGE_INDEX

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

@@ -9,17 +9,17 @@ 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.android.ui.toError
 import dev.msfjarvis.claw.api.LobstersSearchApi
-import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.api.toError
+import dev.msfjarvis.claw.core.coroutines.IODispatcher
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.UIPost
 import dev.msfjarvis.claw.model.toUIPost
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -30,12 +30,11 @@ import kotlinx.coroutines.withContext
  * relevant parameters to short-circuit when there is no query specified in order to avoid calling
  * the API at all.
  */
-class SearchPagingSource
 @AssistedInject
-constructor(
+class SearchPagingSource(
   private val searchApi: LobstersSearchApi,
   @Assisted private val queryProvider: () -> String,
-  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
+  @param:IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : PagingSource<Int, UIPost>() {
   override suspend fun load(params: LoadParams<Int>): LoadResult<Int, UIPost> {
     val searchQuery = queryProvider()

android/src/main/kotlin/dev/msfjarvis/claw/android/plugins/SentryAndroidPlugin.kt

@@ -1,21 +0,0 @@
-/*
- * Copyright © 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.plugins
-
-import android.app.Application
-import com.deliveryhero.whetstone.app.ApplicationScope
-import com.squareup.anvil.annotations.ContributesMultibinding
-import dev.msfjarvis.claw.core.injection.AppPlugin
-import io.sentry.android.core.SentryAndroid
-import javax.inject.Inject
-
-@ContributesMultibinding(ApplicationScope::class)
-class SentryAndroidPlugin @Inject constructor() : AppPlugin {
-  override fun apply(application: Application) {
-    SentryAndroid.init(application)
-  }
-}

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

@@ -0,0 +1,81 @@
+/*
+ * Copyright © 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 android.app.Activity
+import androidx.compose.foundation.layout.size
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Tune
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.navigation3.runtime.NavKey
+import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.android.ui.navigation.Search
+import dev.msfjarvis.claw.android.ui.navigation.Settings
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun ClawAppBar(
+  activity: Activity?,
+  isTopLevel: Boolean,
+  navigateTo: (NavKey) -> Unit,
+  popBackStack: () -> NavKey?,
+  modifier: Modifier = Modifier,
+) {
+  TopAppBar(
+    modifier = modifier.shadow(8.dp),
+    navigationIcon = {
+      if (!isTopLevel) {
+        IconButton(onClick = { if (popBackStack() == null) activity?.finish() }) {
+          Icon(
+            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+            contentDescription = stringResource(R.string.go_back_to_previous_screen),
+          )
+        }
+      } else {
+        Icon(
+          painter = painterResource(id = R.drawable.ic_launcher_foreground),
+          contentDescription = stringResource(R.string.the_app_icon_for_claw),
+          modifier = Modifier.size(48.dp),
+        )
+      }
+    },
+    title = {
+      if (isTopLevel) {
+        Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
+      }
+    },
+    actions = {
+      if (isTopLevel) {
+        IconButton(onClick = { navigateTo(Search) }) {
+          Icon(
+            imageVector = Icons.Filled.Search,
+            contentDescription = stringResource(R.string.search_posts),
+          )
+        }
+        IconButton(onClick = { navigateTo(Settings) }) {
+          Icon(
+            imageVector = Icons.Filled.Tune,
+            contentDescription = stringResource(R.string.settings),
+          )
+        }
+      }
+    },
+  )
+}

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

@@ -26,15 +26,12 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.unit.dp
-import androidx.navigation.NavController
-import androidx.navigation.compose.currentBackStackEntryAsState
-import dev.chrisbanes.haze.HazeDefaults
+import androidx.navigation3.runtime.NavKey
 import dev.chrisbanes.haze.HazeState
-import dev.chrisbanes.haze.HazeStyle
+import dev.chrisbanes.haze.blur.HazeBlurDefaults
+import dev.chrisbanes.haze.blur.blurEffect
 import dev.chrisbanes.haze.hazeEffect
 import dev.msfjarvis.claw.android.ui.navigation.AppDestinations
-import dev.msfjarvis.claw.android.ui.navigation.Destination
-import dev.msfjarvis.claw.android.ui.navigation.matches
 import dev.msfjarvis.claw.common.ui.FloatingNavigationBar
 import kotlinx.collections.immutable.ImmutableList
 
@@ -42,8 +39,9 @@ const val AnimationDuration = 100
 
 @Composable
 fun ClawNavigationBar(
-  navController: NavController,
   items: ImmutableList<NavigationItem>,
+  currentNavKey: NavKey?,
+  navigateTo: (NavKey) -> Unit,
   isVisible: Boolean,
   hazeState: HazeState,
   modifier: Modifier = Modifier,
@@ -64,6 +62,7 @@ fun ClawNavigationBar(
       ),
     label = "",
     content = {
+      val surfaceColor = MaterialTheme.colorScheme.surface
       FloatingNavigationBar(
         tonalElevation = 16.dp,
         shape = MaterialTheme.shapes.extraLarge,
@@ -72,23 +71,18 @@ fun ClawNavigationBar(
             .padding(horizontal = 16.dp)
             .navigationBarsPadding()
             .clip(MaterialTheme.shapes.extraLarge)
-            .hazeEffect(
-              hazeState,
-              style =
-                HazeStyle(
-                  backgroundColor = MaterialTheme.colorScheme.surface,
-                  tints = emptyList(),
-                  blurRadius = 24.dp,
-                  noiseFactor = 0f,
-                ),
-            ),
-        containerColor =
-          if (HazeDefaults.blurEnabled()) Color.Transparent else MaterialTheme.colorScheme.surface,
+            .hazeEffect(hazeState) {
+              blurEffect {
+                backgroundColor = surfaceColor
+                colorEffects = emptyList()
+                blurRadius = 24.dp
+                noiseFactor = 0f
+              }
+            },
+        containerColor = if (HazeBlurDefaults.blurEnabled()) Color.Transparent else surfaceColor,
       ) {
-        val navBackStackEntry = navController.currentBackStackEntryAsState().value
-        val currentDestination = navBackStackEntry?.destination
         items.forEach { navItem ->
-          val isSelected = currentDestination.matches(navItem.destination)
+          val isSelected = currentNavKey == navItem.navKey
           NavigationBarItem(
             icon = {
               Crossfade(isSelected, label = "nav-label") {
@@ -104,11 +98,7 @@ fun ClawNavigationBar(
               if (isSelected) {
                 navItem.listStateResetCallback()
               } else {
-                navController.navigate(navItem.destination) {
-                  popUpTo(navController.graph.startDestinationId) { saveState = true }
-                  launchSingleTop = true
-                  restoreState = true
-                }
+                navigateTo(navItem.navKey)
               }
             },
             modifier = Modifier.testTag(navItem.label.uppercase()),
@@ -123,7 +113,7 @@ class NavigationItem
 private constructor(
   val icon: ImageVector,
   val label: String,
-  val destination: Destination,
+  val navKey: NavKey,
   val selectedIcon: ImageVector,
   val listStateResetCallback: () -> Unit,
 ) {
@@ -133,7 +123,7 @@ private constructor(
   ) : this(
     destination.icon,
     destination.label,
-    destination.destination,
+    destination.navKey,
     destination.selectedIcon,
     listStateResetCallback,
   ) {}

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

@@ -21,15 +21,14 @@ 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 androidx.navigation.compose.currentBackStackEntryAsState
-import dev.msfjarvis.claw.android.ui.navigation.matches
+import androidx.navigation3.runtime.NavKey
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
 fun ClawNavigationRail(
-  navController: NavController,
   items: ImmutableList<NavigationItem>,
+  currentNavKey: NavKey?,
+  navigateTo: (NavKey) -> Unit,
   isVisible: Boolean,
   modifier: Modifier = Modifier,
 ) {
@@ -50,11 +49,9 @@ fun ClawNavigationRail(
     modifier = Modifier,
   ) {
     NavigationRail(modifier = modifier) {
-      val navBackStackEntry = navController.currentBackStackEntryAsState().value
-      val currentDestination = navBackStackEntry?.destination
       Spacer(Modifier.weight(1f))
       items.forEach { navItem ->
-        val isSelected = currentDestination.matches(navItem.destination)
+        val isSelected = currentNavKey == navItem.navKey
         NavigationRailItem(
           icon = {
             Crossfade(isSelected, label = "nav-label") {
@@ -70,11 +67,7 @@ fun ClawNavigationRail(
             if (isSelected) {
               navItem.listStateResetCallback()
             } else {
-              navController.navigate(navItem.destination) {
-                popUpTo(navController.graph.startDestinationId) { saveState = true }
-                launchSingleTop = true
-                restoreState = true
-              }
+              navigateTo(navItem.navKey)
             }
           },
           modifier = Modifier.testTag(navItem.label.uppercase()),

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

@@ -8,25 +8,22 @@ package dev.msfjarvis.claw.android.ui
 
 import android.content.Context
 import android.content.Intent
-import com.slack.eithernet.ApiResult
+import androidx.compose.ui.platform.UriHandler
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.posts.PostActions
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.model.LinkMetadata
 import dev.msfjarvis.claw.model.UIPost
-import java.io.IOException
-import java.net.HttpURLConnection
 
 fun PostActions(
   context: Context,
-  urlLauncher: UrlLauncher,
+  uriHandler: UriHandler,
   viewModel: ClawViewModel,
   navigateToComments: (String) -> Unit,
 ): PostActions {
   return object : PostActions {
     override fun viewPost(postId: String, postUrl: String, commentsUrl: String) {
       viewModel.markPostAsRead(postId)
-      urlLauncher.openUri(postUrl.ifEmpty { commentsUrl })
+      uriHandler.openUri(postUrl.ifEmpty { commentsUrl })
     }
 
     override fun viewComments(postId: String) {
@@ -35,7 +32,7 @@ fun PostActions(
     }
 
     override fun viewCommentsPage(post: UIPost) {
-      urlLauncher.openUri(post.commentsUrl)
+      uriHandler.openUri(post.commentsUrl)
     }
 
     override fun toggleSave(post: UIPost) {
@@ -58,26 +55,8 @@ fun PostActions(
 
     override fun isPostSaved(post: UIPost): Boolean = viewModel.isPostSaved(post)
 
-    override suspend fun getComments(postId: String): UIPost {
-      return viewModel.getPostComments(postId)
-    }
-
     override suspend fun getLinkMetadata(url: String): LinkMetadata {
       return viewModel.getLinkMetadata(url)
     }
   }
 }
-
-/**
- * Convert an [ApiResult.Failure.HttpFailure] to a scoped down error with a more useful user-facing
- * message.
- */
-@Suppress("NOTHING_TO_INLINE") // We inline this to eliminate the stacktrace frame.
-inline fun <T : Any> ApiResult.Failure.HttpFailure<T>.toError(): Throwable =
-  when (code) {
-    HttpURLConnection.HTTP_NOT_FOUND -> IOException("Story was removed by moderator")
-    HttpURLConnection.HTTP_INTERNAL_ERROR,
-    HttpURLConnection.HTTP_BAD_GATEWAY,
-    HttpURLConnection.HTTP_UNAVAILABLE -> IOException("It appears lobste.rs is currently down")
-    else -> IOException("API returned an invalid response")
-  }

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

@@ -25,7 +25,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import dev.msfjarvis.claw.android.R
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
 import dev.msfjarvis.claw.model.UIPost
@@ -46,17 +48,27 @@ fun DatabasePosts(
       Column(modifier = Modifier.align(Alignment.Center)) {
         Icon(
           imageVector = Icons.Filled.Inbox,
-          contentDescription = "Empty inbox icon",
+          contentDescription = stringResource(R.string.empty_inbox_icon),
           modifier = Modifier.align(Alignment.CenterHorizontally).size(36.dp),
         )
-        Text(text = "No saved posts", style = MaterialTheme.typography.headlineSmall)
+        Text(
+          text = stringResource(R.string.no_saved_posts),
+          style = MaterialTheme.typography.headlineSmall,
+        )
       }
     } else {
       LazyColumn(state = listState, contentPadding = contentPadding) {
         items.forEach { (month, posts) ->
           stickyHeader(contentType = "month-header") { MonthHeader(label = month) }
           items(items = posts, key = { it.shortId }, contentType = { "LobstersItem" }) { item ->
-            LobstersListItem(item = item, postActions = postActions)
+            val isSaved = postActions.isPostSaved(item)
+            val isRead = postActions.isPostRead(item)
+            LobstersListItem(
+              item = item,
+              isSaved = isSaved,
+              isRead = isRead,
+              postActions = postActions,
+            )
             HorizontalDivider()
           }
         }

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

@@ -13,14 +13,25 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.unit.dp
+import dev.msfjarvis.claw.android.glance.samplePosts
 import dev.msfjarvis.claw.common.posts.LobstersCard
 import dev.msfjarvis.claw.common.posts.PostActions
+import dev.msfjarvis.claw.common.posts.TEST_POST_ACTIONS
+import dev.msfjarvis.claw.common.theme.LobstersTheme
+import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
 import dev.msfjarvis.claw.model.UIPost
 import me.saket.swipe.SwipeAction
 import me.saket.swipe.SwipeableActionsBox
 
 @Composable
-fun LobstersListItem(item: UIPost, postActions: PostActions, modifier: Modifier = Modifier) {
+fun LobstersListItem(
+  item: UIPost,
+  isSaved: Boolean,
+  isRead: Boolean,
+  postActions: PostActions,
+  modifier: Modifier = Modifier,
+) {
   val commentsAction =
     SwipeAction(
       icon = rememberVectorPainter(Icons.AutoMirrored.Filled.Reply),
@@ -33,7 +44,31 @@ fun LobstersListItem(item: UIPost, postActions: PostActions, modifier: Modifier
       background = MaterialTheme.colorScheme.tertiary,
       onSwipe = { postActions.share(item) },
     )
-  SwipeableActionsBox(startActions = listOf(shareAction), endActions = listOf(commentsAction)) {
-    LobstersCard(post = item, postActions = postActions, modifier = modifier)
+  SwipeableActionsBox(
+    startActions = listOf(shareAction),
+    endActions = listOf(commentsAction),
+    swipeThreshold = 80.dp,
+    backgroundUntilSwipeThreshold = MaterialTheme.colorScheme.surfaceVariant,
+  ) {
+    LobstersCard(
+      post = item,
+      isSaved = isSaved,
+      isRead = isRead,
+      postActions = postActions,
+      modifier = modifier,
+    )
+  }
+}
+
+@ThemePreviews
+@Composable
+private fun ItemPreview() {
+  LobstersTheme {
+    LobstersListItem(
+      item = samplePosts(1).first(),
+      isSaved = true,
+      isRead = true,
+      postActions = TEST_POST_ACTIONS,
+    )
   }
 }

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

@@ -31,15 +31,16 @@ import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemContentType
-import androidx.paging.compose.itemKey
+import dev.msfjarvis.claw.android.glance.samplePosts
 import dev.msfjarvis.claw.common.posts.PostActions
-import dev.msfjarvis.claw.common.posts.TEST_POST
 import dev.msfjarvis.claw.common.posts.TEST_POST_ACTIONS
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.NetworkError
 import dev.msfjarvis.claw.common.ui.ProgressBar
 import dev.msfjarvis.claw.common.ui.preview.DevicePreviews
 import dev.msfjarvis.claw.model.UIPost
+import kotlinx.collections.immutable.ImmutableSet
+import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.flow.MutableStateFlow
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -49,6 +50,7 @@ fun NetworkPosts(
   listState: LazyListState,
   postActions: PostActions,
   contentPadding: PaddingValues,
+  filteredTags: ImmutableSet<String>,
   modifier: Modifier = Modifier,
 ) {
   ReportDrawnWhen { lazyPagingItems.itemCount > 0 }
@@ -77,13 +79,24 @@ fun NetworkPosts(
       LazyColumn(contentPadding = contentPadding, state = listState) {
         items(
           count = lazyPagingItems.itemCount,
-          key = lazyPagingItems.itemKey { it.shortId },
+          // Intentionally keyed on just the index to avoid crashes
+          key = { index -> index },
           contentType = lazyPagingItems.itemContentType { "LobstersItem" },
         ) { index ->
           val item = lazyPagingItems[index]
           if (item != null) {
-            LobstersListItem(item = item, postActions = postActions)
-            HorizontalDivider()
+            val shouldShowPost = item.tags.none { tag -> filteredTags.contains(tag) }
+            if (shouldShowPost) {
+              val isSaved = postActions.isPostSaved(item)
+              val isRead = postActions.isPostRead(item)
+              LobstersListItem(
+                item = item,
+                isSaved = isSaved,
+                isRead = isRead,
+                postActions = postActions,
+              )
+              HorizontalDivider()
+            }
           }
         }
         if (lazyPagingItems.loadState.append == LoadState.Loading) {
@@ -104,7 +117,7 @@ fun NetworkPosts(
 @DevicePreviews
 @Composable
 private fun ListPreview() {
-  val items = List(20) { TEST_POST.copy(shortId = "${TEST_POST.shortId}${it}") }
+  val items = samplePosts(20) { this.copy(shortId = "${this.shortId}${it}") }
   val flow = MutableStateFlow(PagingData.from(items))
   LobstersTheme {
     NetworkPosts(
@@ -112,6 +125,7 @@ private fun ListPreview() {
       listState = rememberLazyListState(),
       postActions = TEST_POST_ACTIONS,
       contentPadding = PaddingValues(),
+      filteredTags = persistentSetOf(),
     )
   }
 }

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

@@ -10,19 +10,16 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.systemBarsPadding
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 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.compose.LazyPagingItems
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.SearchBar
 import dev.msfjarvis.claw.model.UIPost
+import kotlinx.collections.immutable.ImmutableSet
 
 @Composable
 fun SearchList(
@@ -32,16 +29,14 @@ fun SearchList(
   searchQuery: String,
   setSearchQuery: (String) -> Unit,
   contentPadding: PaddingValues,
+  filteredTags: ImmutableSet<String>,
   modifier: Modifier = Modifier,
 ) {
   val triggerSearch = { query: String ->
     setSearchQuery(query)
     lazyPagingItems.refresh()
   }
-  Column(
-    modifier =
-      modifier.systemBarsPadding().semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()
-  ) {
+  Column(modifier.padding(contentPadding).fillMaxWidth()) {
     SearchBar(
       value = searchQuery,
       onValueChange = setSearchQuery,
@@ -52,7 +47,8 @@ fun SearchList(
       lazyPagingItems = lazyPagingItems,
       listState = listState,
       postActions = postActions,
-      contentPadding = contentPadding,
+      contentPadding = PaddingValues(0.dp),
+      filteredTags = filteredTags,
     )
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/login/LobstersLoginWebView.kt

@@ -1,45 +0,0 @@
-/*
- * Copyright © 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.login
-
-import android.webkit.CookieManager
-import android.webkit.WebView
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import com.google.accompanist.web.AccompanistWebViewClient
-import com.google.accompanist.web.WebView
-import com.google.accompanist.web.rememberWebViewState
-import dev.msfjarvis.claw.api.LobstersApi
-import io.github.aakira.napier.Napier
-import okhttp3.HttpUrl.Companion.toHttpUrl
-
-@Suppress("Unused")
-@Composable
-fun LobstersLoginWebView(modifier: Modifier = Modifier) {
-  val state = rememberWebViewState(url = "https://lobste.rs/login")
-  val webClient = remember {
-    object : AccompanistWebViewClient() {
-      override fun onPageFinished(view: WebView, url: String?) {
-        super.onPageFinished(view, url)
-        Napier.d(tag = "WebView") { "onPageFinished(url=$url)" }
-        if (url != null && url.toHttpUrl() == LobstersApi.BASE_URL.toHttpUrl()) {
-          val cookies = CookieManager.getInstance().getCookie(LobstersApi.BASE_URL)
-          val trap =
-            cookies
-              .split(";")
-              .associate {
-                val split = it.split("=")
-                split[0] to split[1]
-              }["lobsters_trap"]
-          Napier.d(tag = "WebView") { "lobsters_trap=${trap}" }
-        }
-      }
-    }
-  }
-  WebView(state = state, client = webClient, modifier = modifier, captureBackPresses = false)
-}

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

@@ -15,49 +15,56 @@ import androidx.compose.material.icons.outlined.FavoriteBorder
 import androidx.compose.material.icons.outlined.NewReleases
 import androidx.compose.material.icons.outlined.Whatshot
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.navigation3.runtime.NavKey
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
-sealed interface Destination : Parcelable
+interface TopLevelDestination
 
-@Parcelize @Serializable data object Hottest : Destination
+interface NonStackable
 
-@Parcelize @Serializable data object Newest : Destination
+@Parcelize @Serializable data object Hottest : NavKey, TopLevelDestination, Parcelable
 
-@Parcelize @Serializable data object Saved : Destination
+@Parcelize @Serializable data object Newest : NavKey, TopLevelDestination, Parcelable
 
-@Parcelize @Serializable data class Comments(val postId: String) : Destination
+@Parcelize @Serializable data object Saved : NavKey, TopLevelDestination, Parcelable
 
-@Parcelize @Serializable data class User(val username: String) : Destination
+@Parcelize @Serializable data class Comments(val postId: String) : NavKey, Parcelable, NonStackable
 
-@Parcelize @Serializable data object Search : Destination
+@Parcelize @Serializable data class User(val username: String) : NavKey, Parcelable, NonStackable
 
-@Parcelize @Serializable data object Settings : Destination
+@Parcelize @Serializable data object Search : NavKey, Parcelable
 
-@Parcelize @Serializable data object AboutLibraries : Destination
+@Parcelize @Serializable data object Settings : NavKey, Parcelable
+
+@Parcelize @Serializable data object AboutLibraries : NavKey, Parcelable
+
+@Parcelize @Serializable data object TagFiltering : NavKey, Parcelable
+
+@Parcelize @Serializable data object Login : NavKey, Parcelable
 
 enum class AppDestinations(
   val icon: ImageVector,
   val label: String,
-  val destination: Destination,
+  val navKey: NavKey,
   val selectedIcon: ImageVector,
 ) {
   HOTTEST(
     icon = Icons.Outlined.Whatshot,
     label = "Hottest",
-    destination = Hottest,
+    navKey = Hottest,
     selectedIcon = Icons.Filled.Whatshot,
   ),
   NEWEST(
     icon = Icons.Outlined.NewReleases,
     label = "Newest",
-    destination = Newest,
+    navKey = Newest,
     selectedIcon = Icons.Filled.NewReleases,
   ),
   SAVED(
     icon = Icons.Outlined.FavoriteBorder,
     label = "Saved",
-    destination = Saved,
+    navKey = Saved,
     selectedIcon = Icons.Filled.Favorite,
   ),
 }

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

@@ -1,30 +0,0 @@
-/*
- * Copyright © 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.navigation.NavDestination
-import androidx.navigation.NavDestination.Companion.hasRoute
-import androidx.navigation.NavDestination.Companion.hierarchy
-import kotlinx.collections.immutable.ImmutableList
-
-/**
- * Walk through the [NavDestination]'s [hierarchy] to see if it has any destination that matches the
- * route defined by [dest].
- */
-fun NavDestination?.matches(dest: Destination): Boolean {
-  return this?.hierarchy?.any { it.hasRoute(dest::class) } == true
-}
-
-/** Check if this [NavDestination] [matches] any of the potential navigation [destinations]. */
-fun NavDestination?.any(destinations: ImmutableList<Destination>): Boolean {
-  return destinations.any { this?.matches(it) == true }
-}
-
-/** Check if this [NavDestination] [matches] none of the potential navigation [destinations]. */
-fun NavDestination?.none(destinations: ImmutableList<Destination>): Boolean {
-  return destinations.none { this?.matches(it) == true }
-}

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

@@ -0,0 +1,241 @@
+/** Taken from https://github.com/getsentry/sentry-java/pull/5023 */
+@file:Suppress("UnstableApiUsage") // Sentry internal APIs are used by this module
+
+package dev.msfjarvis.claw.android.ui.navigation
+
+import android.annotation.SuppressLint
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberUpdatedState
+import androidx.compose.runtime.snapshotFlow
+import io.sentry.Breadcrumb
+import io.sentry.BuildConfig
+import io.sentry.Hint
+import io.sentry.IScopes
+import io.sentry.ITransaction
+import io.sentry.ScopesAdapter
+import io.sentry.SentryIntegrationPackageStorage
+import io.sentry.SentryLevel
+import io.sentry.SentryOptions
+import io.sentry.SpanStatus
+import io.sentry.TransactionContext
+import io.sentry.TransactionOptions
+import io.sentry.TypeCheckHint
+import io.sentry.protocol.TransactionNameSource
+import io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion
+import kotlinx.coroutines.flow.drop
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+
+private const val TRACE_ORIGIN = "auto.navigation.navigation3"
+private const val NAVIGATION_OP = "navigation"
+
+/** Holder for the active navigation transaction in a composition scope. */
+internal class NavigationTransactionHolder {
+  internal var activeTransaction: ITransaction? = null
+}
+
+/**
+ * A Composable that observes a back stack [List] and captures a [Breadcrumb] and starts an
+ * [ITransaction] for each navigation event, sending them to Sentry.
+ *
+ * This integration is designed for Android Navigation 3 which uses a back stack-based approach with
+ * Compose state observation instead of traditional listeners.
+ *
+ * Each invocation of this composable maintains independent transaction state, allowing multiple
+ * navigation instances (e.g., in split-screen or multi-pane layouts) to coexist without
+ * interference.
+ *
+ * @param T The type of keys in the back stack
+ * @param backStack The current back stack to observe for navigation changes
+ * @param enableNavigationBreadcrumbs Whether the integration should capture breadcrumbs for
+ *   navigation events.
+ * @param enableNavigationTracing Whether the integration should start a new idle [ITransaction]
+ *   with [SentryOptions.idleTimeout] for navigation events.
+ * @param keyToRoute A function to extract a route name from a back stack key. Defaults to
+ *   [Any.toString].
+ * @param scopes The [IScopes] instance to use for capturing events. Defaults to the singleton
+ *   instance.
+ */
+@Composable
+fun <T> SentryNavigation3Traced(
+  @SuppressLint("ComposeUnstableCollections") backStack: List<T>,
+  enableNavigationBreadcrumbs: Boolean = true,
+  enableNavigationTracing: Boolean = true,
+  keyToRoute: (T) -> String? = { it.toString() },
+  scopes: IScopes = ScopesAdapter.getInstance(),
+) {
+  val backStackSnapshot by rememberUpdatedState(backStack)
+  val enableBreadcrumbsSnapshot by rememberUpdatedState(enableNavigationBreadcrumbs)
+  val enableTracingSnapshot by rememberUpdatedState(enableNavigationTracing)
+  val keyToRouteSnapshot by rememberUpdatedState(keyToRoute)
+  val scopesSnapshot by rememberUpdatedState(scopes)
+
+  val transactionHolder = remember { NavigationTransactionHolder() }
+
+  DisposableEffect(Unit) {
+    addIntegrationToSdkVersion("Navigation3")
+
+    val observer =
+      SentryBackStackObserver(
+        enableNavigationBreadcrumbs = enableBreadcrumbsSnapshot,
+        enableNavigationTracing = enableTracingSnapshot,
+        keyToRoute = keyToRouteSnapshot,
+        scopes = scopesSnapshot,
+        transactionHolder = transactionHolder,
+      )
+
+    @SuppressLint("RawDispatchersUse")
+    val scope =
+      kotlinx.coroutines.CoroutineScope(
+        kotlinx.coroutines.Dispatchers.Main + kotlinx.coroutines.SupervisorJob()
+      )
+    @SuppressLint("DenyListedApi")
+    val job =
+      snapshotFlow { backStackSnapshot }
+        .drop(1) // Skip initial state
+        .onEach { currentStack ->
+          val currentKey = currentStack.lastOrNull()
+          val previousKey = observer.previousKey
+          if (currentKey != null && currentKey != previousKey) {
+            observer.handleNavigation(currentKey, currentStack)
+            observer.previousKey = currentKey
+          }
+        }
+        .launchIn(scope)
+
+    onDispose { job.cancel() }
+  }
+}
+
+/** Internal observer that monitors back stack changes and creates Sentry events. */
+internal class SentryBackStackObserver<T>(
+  private val enableNavigationBreadcrumbs: Boolean,
+  private val enableNavigationTracing: Boolean,
+  private val keyToRoute: (T) -> String?,
+  private val scopes: IScopes,
+  private val transactionHolder: NavigationTransactionHolder,
+) {
+  internal var previousKey: T? = null
+
+  private val isPerformanceEnabled: Boolean
+    get() = scopes.options.isTracingEnabled && enableNavigationTracing
+
+  init {
+    SentryIntegrationPackageStorage.getInstance()
+      .addPackage("maven:io.sentry:sentry-android-navigation3", BuildConfig.VERSION_NAME)
+  }
+
+  internal fun handleNavigation(currentKey: T, currentStack: List<T>) {
+    val currentRoute = keyToRoute(currentKey)
+    if (currentRoute != null) {
+      addBreadcrumb(currentRoute, currentStack)
+
+      if (scopes.options.isEnableScreenTracking) {
+        scopes.configureScope { it.screen = currentRoute }
+      }
+
+      startTracing(currentRoute, currentStack)
+    }
+  }
+
+  private fun addBreadcrumb(toRoute: String, currentStack: List<T>) {
+    if (!enableNavigationBreadcrumbs) {
+      return
+    }
+
+    val breadcrumb =
+      Breadcrumb().apply {
+        type = NAVIGATION_OP
+        category = NAVIGATION_OP
+
+        val fromKey = previousKey
+        if (fromKey != null) {
+          val fromRoute = keyToRoute(fromKey)
+          if (fromRoute != null) {
+            data["from"] = fromRoute
+          }
+        }
+
+        data["to"] = toRoute
+
+        // Capture back stack keys as a list
+        val backStackKeys = currentStack.mapNotNull { keyToRoute(it) }
+        if (backStackKeys.isNotEmpty()) {
+          data["back_stack"] = backStackKeys
+        }
+
+        level = SentryLevel.INFO
+      }
+
+    val hint = Hint()
+    hint.set(TypeCheckHint.ANDROID_NAV_DESTINATION, toRoute)
+    scopes.addBreadcrumb(breadcrumb, hint)
+  }
+
+  private fun startTracing(routeName: String, currentStack: List<T>) {
+    if (!isPerformanceEnabled) {
+      io.sentry.util.TracingUtils.startNewTrace(scopes)
+      return
+    }
+
+    // Finish previous transaction in this navigation scope
+    if (transactionHolder.activeTransaction != null) {
+      stopTracing()
+    }
+
+    val transactionOptions =
+      TransactionOptions().also {
+        it.isWaitForChildren = true
+        it.idleTimeout = scopes.options.idleTimeout
+
+        // Set deadline timeout based on configured option
+        val deadlineTimeoutMillis = scopes.options.deadlineTimeout
+        // No deadline when zero or negative value is set
+        it.deadlineTimeout = if (deadlineTimeoutMillis <= 0) null else deadlineTimeoutMillis
+
+        it.isTrimEnd = true
+      }
+
+    val transaction =
+      scopes.startTransaction(
+        TransactionContext(routeName, TransactionNameSource.ROUTE, NAVIGATION_OP),
+        transactionOptions,
+      )
+
+    transaction.spanContext.origin = TRACE_ORIGIN
+
+    // Capture back stack keys as data
+    val backStackKeys = currentStack.mapNotNull { keyToRoute(it) }
+    if (backStackKeys.isNotEmpty()) {
+      transaction.setData("back_stack", backStackKeys)
+    }
+
+    scopes.configureScope { scope ->
+      scope.withTransaction { tx ->
+        if (tx == null) {
+          scope.transaction = transaction
+        }
+      }
+    }
+    transactionHolder.activeTransaction = transaction
+  }
+
+  private fun stopTracing() {
+    val status = transactionHolder.activeTransaction?.status ?: SpanStatus.OK
+    transactionHolder.activeTransaction?.finish(status)
+
+    // clear transaction from scope so others can bind to it
+    scopes.configureScope { scope ->
+      scope.withTransaction { tx ->
+        if (tx == transactionHolder.activeTransaction) {
+          scope.clearTransaction()
+        }
+      }
+    }
+
+    transactionHolder.activeTransaction = null
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt

@@ -6,28 +6,27 @@
  */
 package dev.msfjarvis.claw.android.ui.screens
 
-import android.content.Intent
+import androidx.activity.compose.BackHandler
 import androidx.activity.compose.LocalActivity
+import androidx.annotation.VisibleForTesting
 import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.EnterTransition
+import androidx.compose.animation.ExitTransition
 import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Search
-import androidx.compose.material.icons.filled.Tune
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.navigation3.ListDetailSceneStrategy
+import androidx.compose.material3.adaptive.navigation3.rememberListDetailSceneStrategy
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -35,29 +34,25 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.semantics.testTagsAsResourceId
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
+import androidx.navigation3.runtime.NavKey
+import androidx.navigation3.runtime.entryProvider
+import androidx.navigation3.runtime.rememberNavBackStack
+import androidx.navigation3.runtime.rememberSaveableStateHolderNavEntryDecorator
+import androidx.navigation3.ui.NavDisplay
 import androidx.paging.compose.collectAsLazyPagingItems
-import com.deliveryhero.whetstone.compose.injectedViewModel
+import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
 import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
 import dev.chrisbanes.haze.HazeState
 import dev.chrisbanes.haze.hazeSource
-import dev.msfjarvis.claw.android.MainActivity
 import dev.msfjarvis.claw.android.R
-import dev.msfjarvis.claw.android.SearchActivity
 import dev.msfjarvis.claw.android.ui.PostActions
+import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
 import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
@@ -68,216 +63,308 @@ import dev.msfjarvis.claw.android.ui.navigation.AppDestinations
 import dev.msfjarvis.claw.android.ui.navigation.ClawNavigationType
 import dev.msfjarvis.claw.android.ui.navigation.Comments
 import dev.msfjarvis.claw.android.ui.navigation.Hottest
+import dev.msfjarvis.claw.android.ui.navigation.Login
 import dev.msfjarvis.claw.android.ui.navigation.Newest
+import dev.msfjarvis.claw.android.ui.navigation.NonStackable
 import dev.msfjarvis.claw.android.ui.navigation.Saved
+import dev.msfjarvis.claw.android.ui.navigation.Search
+import dev.msfjarvis.claw.android.ui.navigation.SentryNavigation3Traced
 import dev.msfjarvis.claw.android.ui.navigation.Settings
+import dev.msfjarvis.claw.android.ui.navigation.TagFiltering
+import dev.msfjarvis.claw.android.ui.navigation.TopLevelDestination
 import dev.msfjarvis.claw.android.ui.navigation.User
-import dev.msfjarvis.claw.android.ui.navigation.any
-import dev.msfjarvis.claw.android.ui.navigation.none
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
+import dev.msfjarvis.claw.android.viewmodel.SettingsViewModel
 import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
+import dev.msfjarvis.claw.common.tags.TagFilterViewModel
+import dev.msfjarvis.claw.common.tags.TagList
 import dev.msfjarvis.claw.common.user.UserProfile
+import dev.zacsweers.metrox.viewmodel.metroViewModel
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.collections.immutable.toPersistentList
+import kotlinx.collections.immutable.persistentSetOf
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class)
+@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterial3AdaptiveApi::class)
 @Composable
 fun LobstersPostsScreen(
-  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
+  uriHandler: UriHandler,
   windowSizeClass: WindowSizeClass,
   setWebUri: (String?) -> Unit,
   modifier: Modifier = Modifier,
-  viewModel: ClawViewModel = injectedViewModel(),
+  deepLinkDestination: NavKey? = null,
+  clearDeepLink: () -> Unit = {},
+  viewModel: ClawViewModel = metroViewModel(),
+  settingsViewModel: SettingsViewModel = metroViewModel(),
+  tagFilterViewModel: TagFilterViewModel = metroViewModel(key = "tag_filter"),
 ) {
+  val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
+
+  val libraries by produceLibraries()
+  val backStack = rememberNavBackStack(Hottest)
+  val listDetailStrategy = rememberListDetailSceneStrategy<NavKey>()
+
+  // region Pain
   val context = LocalContext.current
   val activity = LocalActivity.current
   val hottestListState = rememberLazyListState()
   val newestListState = rememberLazyListState()
   val savedListState = rememberLazyListState()
-  val navController = rememberNavController()
-  val navBackStackEntry = navController.currentBackStackEntryAsState().value
-  val currentDestination = navBackStackEntry?.destination
   val coroutineScope = rememberCoroutineScope()
   val snackbarHostState = remember { SnackbarHostState() }
-  val postActions = remember {
-    PostActions(context, urlLauncher, viewModel) { navController.navigate(Comments(it)) }
-  }
   val hazeState = remember { HazeState() }
 
-  val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
-  val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
   val savedPosts by viewModel.savedPostsByMonth.collectAsStateWithLifecycle(persistentMapOf())
+  val savedPostsCount by viewModel.savedPostsCount.collectAsStateWithLifecycle(0L)
 
-  val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
+  val filteredTags by tagFilterViewModel.filteredTags.collectAsStateWithLifecycle(persistentSetOf())
+  val isLoggedIn by settingsViewModel.isLoggedIn.collectAsStateWithLifecycle(false)
+  val username by settingsViewModel.username.collectAsStateWithLifecycle(null)
 
-  val postIdOverride = activity?.intent?.extras?.getString(MainActivity.NAVIGATION_KEY)
-  LaunchedEffect(Unit) {
-    if (postIdOverride != null) {
-      navController.navigate(Comments(postIdOverride))
+  LaunchedEffect(deepLinkDestination) {
+    if (deepLinkDestination != null) {
+      navigateTo(backStack, deepLinkDestination, allowStacking = true)
+      clearDeepLink()
     }
   }
 
   val navItems =
     persistentListOf(
       NavigationItem(AppDestinations.HOTTEST) {
-        coroutineScope.launch {
-          if (hottestPosts.itemCount > 0) hottestListState.animateScrollToItem(index = 0)
-        }
+        coroutineScope.launch { hottestListState.animateScrollToItem(index = 0) }
       },
       NavigationItem(AppDestinations.NEWEST) {
-        coroutineScope.launch {
-          if (newestPosts.itemCount > 0) newestListState.animateScrollToItem(index = 0)
-        }
+        coroutineScope.launch { newestListState.animateScrollToItem(index = 0) }
       },
       NavigationItem(AppDestinations.SAVED) {
         coroutineScope.launch { if (savedPosts.isNotEmpty()) savedListState.scrollToItem(0) }
       },
     )
-  val navDestinations = navItems.map(NavigationItem::destination).toPersistentList()
+  // endregion
+
+  val postActions = remember {
+    PostActions(context, uriHandler, viewModel) {
+      navigateTo(backStack, Comments(it), allowStacking = false)
+    }
+  }
+
+  BackHandler(enabled = backStack.size > 1) { popBackStack(backStack) }
 
   Scaffold(
     topBar = {
-      TopAppBar(
-        modifier = Modifier.shadow(8.dp),
-        navigationIcon = {
-          if (
-            navController.previousBackStackEntry != null && currentDestination.none(navDestinations)
-          ) {
-            IconButton(onClick = { if (!navController.popBackStack()) activity?.finish() }) {
-              Icon(
-                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                contentDescription = "Go back to previous screen",
-              )
-            }
-          } else {
-            Icon(
-              painter = painterResource(id = R.drawable.ic_launcher_foreground),
-              contentDescription = "The app icon for Claw",
-              modifier = Modifier.size(48.dp),
-            )
-          }
-        },
-        title = {
-          if (currentDestination.any(navDestinations)) {
-            Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
-          }
-        },
-        actions = {
-          if (currentDestination.any(navDestinations)) {
-            IconButton(
-              onClick = { context.startActivity(Intent(context, SearchActivity::class.java)) }
-            ) {
-              Icon(imageVector = Icons.Filled.Search, contentDescription = "Search posts")
-            }
-            IconButton(onClick = { navController.navigate(Settings) }) {
-              Icon(imageVector = Icons.Filled.Tune, contentDescription = "Settings")
-            }
-          }
-        },
+      ClawAppBar(
+        activity = activity,
+        isTopLevel = backStack.lastOrNull() is TopLevelDestination,
+        navigateTo = { destination -> navigateTo(backStack, destination) },
+        popBackStack = { popBackStack(backStack) },
       )
     },
     bottomBar = {
+      val currentDestination = backStack.lastOrNull()
       AnimatedVisibility(visible = navigationType == ClawNavigationType.BOTTOM_NAVIGATION) {
         ClawNavigationBar(
-          navController = navController,
           items = navItems,
-          isVisible = currentDestination.any(navDestinations),
+          currentNavKey = currentDestination,
+          navigateTo = { destination -> navigateTo(backStack, destination) },
+          isVisible = backStack.lastOrNull() is TopLevelDestination,
           hazeState = hazeState,
         )
       }
     },
     snackbarHost = { SnackbarHost(snackbarHostState) },
-    modifier = modifier.semantics { testTagsAsResourceId = true },
+    modifier = Modifier.semantics { testTagsAsResourceId = true },
   ) { contentPadding ->
+    SentryNavigation3Traced(backStack = backStack)
     Row {
       AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
+        val currentDestination = backStack.lastOrNull()
         ClawNavigationRail(
-          navController = navController,
           items = navItems,
-          isVisible = currentDestination.any(navDestinations),
+          currentNavKey = currentDestination,
+          navigateTo = { destination -> navigateTo(backStack, destination) },
+          isVisible = backStack.lastOrNull() is TopLevelDestination,
         )
       }
-
-      NavHost(
-        navController = navController,
-        startDestination = Hottest,
-        // Make animations 2x faster than default specs
-        enterTransition = { fadeIn(animationSpec = tween(350)) },
-        exitTransition = { fadeOut(animationSpec = tween(350)) },
-        modifier = Modifier.hazeSource(hazeState),
-      ) {
-        composable<Hottest> {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            lazyPagingItems = hottestPosts,
-            listState = hottestListState,
-            postActions = postActions,
-            contentPadding = contentPadding,
-          )
-        }
-        composable<Newest> {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            lazyPagingItems = newestPosts,
-            listState = newestListState,
-            postActions = postActions,
-            contentPadding = contentPadding,
-          )
-        }
-        composable<Saved> {
-          setWebUri(null)
-          DatabasePosts(
-            items = savedPosts,
-            listState = savedListState,
-            postActions = postActions,
-            contentPadding = contentPadding,
-          )
-        }
-        composable<Comments> { backStackEntry ->
-          val postId = backStackEntry.toRoute<Comments>().postId
-          setWebUri("https://lobste.rs/s/$postId")
-          CommentsPage(
-            postId = postId,
-            postActions = postActions,
-            htmlConverter = htmlConverter,
-            getSeenComments = viewModel::getSeenComments,
-            markSeenComments = viewModel::markSeenComments,
-            contentPadding = contentPadding,
-            openUserProfile = { navController.navigate(User(it)) },
-          )
-        }
-        composable<User> { backStackEntry ->
-          val username = backStackEntry.toRoute<User>().username
-          setWebUri("https://lobste.rs/u/$username")
-          UserProfile(
-            username = username,
-            getProfile = viewModel::getUserProfile,
-            contentPadding = contentPadding,
-            openUserProfile = { navController.navigate(User(it)) },
-          )
-        }
-        composable<Settings> {
-          SettingsScreen(
-            openInputStream = context.contentResolver::openInputStream,
-            openOutputStream = context.contentResolver::openOutputStream,
-            openLibrariesScreen = { navController.navigate(AboutLibraries) },
-            importPosts = viewModel::importPosts,
-            exportPostsAsJson = viewModel::exportPostsAsJson,
-            exportPostsAsHtml = viewModel::exportPostsAsHtml,
-            snackbarHostState = snackbarHostState,
-            contentPadding = contentPadding,
-            modifier = Modifier.fillMaxSize(),
-          )
-        }
-        composable<AboutLibraries> {
-          LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize())
-        }
-      }
+      NavDisplay(
+        backStack = backStack,
+        modifier = modifier.hazeSource(hazeState),
+        sceneStrategies = listOf(listDetailStrategy),
+        entryDecorators = listOf(rememberSaveableStateHolderNavEntryDecorator()),
+        onBack = {
+          if (popBackStack(backStack) == null) {
+            activity?.finish()
+          }
+        },
+        predictivePopTransitionSpec = {
+          slideInHorizontally(initialOffsetX = { -it }, animationSpec = tween(200)) togetherWith
+            slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
+        },
+        entryProvider =
+          entryProvider {
+            entry<Hottest>(
+              metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
+            ) {
+              setWebUri("https://lobste.rs/")
+              val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
+              NetworkPosts(
+                lazyPagingItems = hottestPosts,
+                listState = hottestListState,
+                postActions = postActions,
+                contentPadding = contentPadding,
+                filteredTags = filteredTags,
+              )
+            }
+            entry<Newest>(
+              metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
+            ) {
+              setWebUri("https://lobste.rs/")
+              val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
+              NetworkPosts(
+                lazyPagingItems = newestPosts,
+                listState = newestListState,
+                postActions = postActions,
+                contentPadding = contentPadding,
+                filteredTags = filteredTags,
+              )
+            }
+            entry<Saved>(
+              metadata = ListDetailSceneStrategy.listPane(detailPlaceholder = { Placeholder() })
+            ) {
+              setWebUri(null)
+              DatabasePosts(
+                items = savedPosts,
+                listState = savedListState,
+                postActions = postActions,
+                contentPadding = contentPadding,
+              )
+            }
+            entry<Comments>(metadata = ListDetailSceneStrategy.detailPane()) { dest ->
+              val commentsPostActions = remember {
+                PostActions(context, uriHandler, viewModel) {
+                  navigateTo(backStack, Comments(it), allowStacking = true)
+                }
+              }
+              CommentsPage(
+                postId = dest.postId,
+                postActions = commentsPostActions,
+                contentPadding = contentPadding,
+                openUserProfile = { navigateTo(backStack, User(it)) },
+              )
+            }
+            entry<User>(
+              metadata =
+                NavDisplay.transitionSpec {
+                  slideInHorizontally(
+                    initialOffsetX = { it },
+                    animationSpec = tween(200),
+                  ) togetherWith ExitTransition.KeepUntilTransitionsFinished
+                } +
+                  NavDisplay.popTransitionSpec {
+                    // Slide old content down, revealing the new content in place underneath
+                    EnterTransition.None togetherWith
+                      slideOutHorizontally(targetOffsetX = { it }, animationSpec = tween(200))
+                  } +
+                  ListDetailSceneStrategy.extraPane()
+            ) { dest ->
+              UserProfile(
+                username = dest.username,
+                contentPadding = contentPadding,
+                openUserProfile = { navigateTo(backStack, User(it)) },
+              )
+            }
+            entry<Settings>(metadata = ListDetailSceneStrategy.extraPane()) {
+              SettingsScreen(
+                openInputStream = context.contentResolver::openInputStream,
+                openOutputStream = context.contentResolver::openOutputStream,
+                openLibrariesScreen = { navigateTo(backStack, AboutLibraries) },
+                openRepository = {
+                  uriHandler.openUri("https://github.com/msfjarvis/compose-lobsters")
+                },
+                openTagFiltering = { navigateTo(backStack, TagFiltering) },
+                openLoginScreen = { navigateTo(backStack, Login) },
+                onLogout = { settingsViewModel.logout() },
+                isLoggedIn = isLoggedIn,
+                username = username,
+                importPosts = viewModel::importPosts,
+                exportPostsAsJson = viewModel::exportPostsAsJson,
+                exportPostsAsHtml = viewModel::exportPostsAsHtml,
+                savedPostsCount = savedPostsCount,
+                snackbarHostState = snackbarHostState,
+                contentPadding = contentPadding,
+                modifier = Modifier.fillMaxSize(),
+              )
+            }
+            entry<Login>(metadata = ListDetailSceneStrategy.extraPane()) {
+              LoginScreen(
+                onLoginSuccess = settingsViewModel::saveCookie,
+                popBackStack = { popBackStack(backStack) },
+                modifier = Modifier.fillMaxSize(),
+              )
+            }
+            entry<Search>(metadata = ListDetailSceneStrategy.extraPane()) {
+              setWebUri("https://lobste.rs/search")
+              SearchScreen(postActions = postActions, contentPadding = contentPadding)
+            }
+            entry<AboutLibraries>(metadata = ListDetailSceneStrategy.extraPane()) {
+              LibrariesContainer(
+                libraries = libraries,
+                contentPadding = contentPadding,
+                modifier = Modifier.fillMaxSize(),
+              )
+            }
+            entry<TagFiltering> { TagList(contentPadding = contentPadding) }
+          },
+      )
     }
   }
 }
+
+@VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+fun navigateTo(
+  backStack: MutableList<NavKey>,
+  destination: NavKey,
+  allowStacking: Boolean = false,
+) {
+  if (destination is TopLevelDestination) {
+    backStack.clear()
+    if (destination != Hottest) {
+      backStack.add(Hottest)
+    }
+    backStack.add(destination)
+    return
+  }
+
+  if (destination is NonStackable) {
+    if (allowStacking && destination is Comments) {
+      val lastItem = backStack.lastOrNull()
+      if (lastItem is Comments && lastItem.postId == destination.postId) {
+        return
+      }
+      backStack.add(destination)
+      return
+    }
+
+    val existingEntry = backStack.firstOrNull {
+      it is NonStackable && it::class.java.isAssignableFrom(destination::class.java)
+    }
+
+    if (existingEntry != null) {
+      backStack.remove(existingEntry)
+    }
+  }
+
+  backStack.add(destination)
+}
+
+private fun popBackStack(backStack: MutableList<NavKey>): NavKey? {
+  if (backStack.size <= 1) {
+    return null
+  }
+
+  return backStack.removeAt(backStack.lastIndex)
+}
+
+@Composable
+private fun Placeholder(modifier: Modifier = Modifier) {
+  Text(text = stringResource(R.string.no_post_selected), modifier = modifier)
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LoginScreen.kt

@@ -0,0 +1,131 @@
+/*
+ * Copyright © 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.screens
+
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.webkit.CookieManager
+import android.webkit.WebResourceError
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Button
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+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.unit.dp
+import androidx.compose.ui.viewinterop.AndroidView
+
+private const val LOGIN_URL = "https://lobste.rs/login"
+private const val LOBSTERS_URL = "https://lobste.rs"
+
+internal fun parseAuthenticatedUsername(usernameResult: String): String? {
+  return usernameResult.removeSurrounding("\"").takeUnless { it.isBlank() || it == "null" }
+}
+
+@Composable
+fun LoginScreen(
+  onLoginSuccess: (String, String) -> Unit,
+  popBackStack: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  var isLoading by remember { mutableStateOf(true) }
+  var hasError by remember { mutableStateOf(false) }
+  var webViewRef by remember { mutableStateOf<WebView?>(null) }
+
+  Scaffold(modifier = modifier) { contentPadding ->
+    Box(modifier = Modifier.padding(contentPadding).fillMaxSize()) {
+      if (hasError) {
+        Column(
+          modifier = Modifier.align(Alignment.Center),
+          horizontalAlignment = Alignment.CenterHorizontally,
+          verticalArrangement = Arrangement.Center,
+        ) {
+          Text("Failed to load login page.")
+          Spacer(modifier = Modifier.height(12.dp))
+          Button(
+            onClick = {
+              hasError = false
+              isLoading = true
+              webViewRef?.loadUrl(LOGIN_URL)
+            }
+          ) {
+            Text("Retry")
+          }
+        }
+      } else {
+        AndroidView(
+          factory = { context ->
+            WebView(context)
+              .apply {
+                @SuppressLint("SetJavaScriptEnabled")
+                settings.javaScriptEnabled = true
+                webViewClient =
+                  object : WebViewClient() {
+                    override fun onPageStarted(view: WebView, url: String, favicon: Bitmap?) {
+                      isLoading = true
+                    }
+
+                    override fun onPageFinished(view: WebView, url: String) {
+                      isLoading = false
+                      if (!url.contains("/login")) {
+                        @SuppressLint("DeprecatedCall")
+                        view.evaluateJavascript(
+                          "document.body && document.body.getAttribute('data-username')"
+                        ) { usernameResult ->
+                          val username = parseAuthenticatedUsername(usernameResult)
+                          if (username != null) {
+                            val cookie = CookieManager.getInstance().getCookie(LOBSTERS_URL)
+                            if (cookie != null) {
+                              onLoginSuccess(cookie, username)
+                              popBackStack()
+                            }
+                          }
+                        }
+                      }
+                    }
+
+                    override fun onReceivedError(
+                      view: WebView,
+                      request: WebResourceRequest,
+                      error: WebResourceError,
+                    ) {
+                      if (request.isForMainFrame) {
+                        isLoading = false
+                        hasError = true
+                      }
+                    }
+                  }
+                loadUrl(LOGIN_URL)
+              }
+              .also { webViewRef = it }
+          },
+          modifier = Modifier.fillMaxSize(),
+        )
+      }
+
+      if (isLoading && !hasError) {
+        LinearProgressIndicator(modifier = Modifier.fillMaxWidth().align(Alignment.TopCenter))
+      }
+    }
+  }
+}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt

@@ -6,81 +6,40 @@
  */
 package dev.msfjarvis.claw.android.ui.screens
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.toRoute
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.paging.compose.collectAsLazyPagingItems
-import com.deliveryhero.whetstone.compose.injectedViewModel
-import dev.msfjarvis.claw.android.ui.PostActions
 import dev.msfjarvis.claw.android.ui.lists.SearchList
-import dev.msfjarvis.claw.android.ui.navigation.Comments
-import dev.msfjarvis.claw.android.ui.navigation.Search
-import dev.msfjarvis.claw.android.ui.navigation.User
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import dev.msfjarvis.claw.common.user.UserProfile
+import dev.msfjarvis.claw.common.posts.PostActions
+import dev.msfjarvis.claw.common.tags.TagFilterViewModel
+import dev.zacsweers.metrox.viewmodel.metroViewModel
+import kotlinx.collections.immutable.toPersistentSet
 
 @Composable
 fun SearchScreen(
-  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
-  setWebUri: (String?) -> Unit,
+  postActions: PostActions,
+  contentPadding: PaddingValues,
   modifier: Modifier = Modifier,
-  viewModel: ClawViewModel = injectedViewModel(),
+  viewModel: ClawViewModel = metroViewModel(),
+  tagFilterViewModel: TagFilterViewModel = metroViewModel(key = "tag_filter"),
 ) {
-  val context = LocalContext.current
-  val navController = rememberNavController()
-  val postActions = remember {
-    PostActions(context, urlLauncher, viewModel) { navController.navigate(Comments(it)) }
-  }
   val listState = rememberLazyListState()
   val searchResults = viewModel.searchResults.collectAsLazyPagingItems()
+  val filteredTags by tagFilterViewModel.filteredTags.collectAsStateWithLifecycle(emptySet())
 
-  Scaffold(modifier = modifier) { contentPadding ->
-    NavHost(navController = navController, startDestination = Search) {
-      composable<Search> {
-        setWebUri("https://lobste.rs/search")
-        SearchList(
-          lazyPagingItems = searchResults,
-          listState = listState,
-          postActions = postActions,
-          searchQuery = viewModel.searchQuery,
-          contentPadding = contentPadding,
-          setSearchQuery = { query -> viewModel.searchQuery = query },
-        )
-      }
-      composable<Comments> { backStackEntry ->
-        val postId = backStackEntry.toRoute<Comments>().postId
-        setWebUri("https://lobste.rs/s/$postId")
-        CommentsPage(
-          postId = postId,
-          postActions = postActions,
-          htmlConverter = htmlConverter,
-          getSeenComments = viewModel::getSeenComments,
-          markSeenComments = viewModel::markSeenComments,
-          openUserProfile = { navController.navigate(User(it)) },
-          contentPadding = contentPadding,
-        )
-      }
-      composable<User> { backStackEntry ->
-        val username = backStackEntry.toRoute<User>().username
-        setWebUri("https://lobste.rs/u/$username")
-        UserProfile(
-          username = username,
-          getProfile = viewModel::getUserProfile,
-          openUserProfile = { navController.navigate(User(it)) },
-          contentPadding = contentPadding,
-        )
-      }
-    }
-  }
+  SearchList(
+    lazyPagingItems = searchResults,
+    listState = listState,
+    postActions = postActions,
+    searchQuery = viewModel.searchQuery,
+    contentPadding = contentPadding,
+    setSearchQuery = { query -> viewModel.searchQuery = query },
+    filteredTags = filteredTags.toPersistentSet(),
+    modifier = modifier,
+  )
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SettingsScreen.kt

@@ -11,21 +11,22 @@ import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.LibraryBooks
+import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material.icons.filled.Bookmarks
 import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.filled.FilterList
 import androidx.compose.material.icons.filled.ImportExport
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
@@ -39,9 +40,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import dev.msfjarvis.claw.android.BuildConfig
+import dev.msfjarvis.claw.android.R
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
+import io.sentry.Sentry
 import java.io.InputStream
 import java.io.OutputStream
 import kotlinx.coroutines.CoroutineScope
@@ -50,67 +55,194 @@ import kotlinx.coroutines.launch
 private const val JSON_MIME_TYPE = "application/json"
 private const val HTML_MIME_TYPE = "application/html"
 
-@Composable
-fun SettingsScreen(
-  openLibrariesScreen: () -> Unit,
-  snackbarHostState: SnackbarHostState,
-  openInputStream: (Uri) -> InputStream?,
-  openOutputStream: (Uri) -> OutputStream?,
-  importPosts: suspend (InputStream) -> Unit,
-  exportPostsAsJson: suspend (OutputStream) -> Unit,
-  exportPostsAsHtml: suspend (OutputStream) -> Unit,
-  contentPadding: PaddingValues,
-  modifier: Modifier = Modifier,
-) {
-  val coroutineScope = rememberCoroutineScope()
-  Box(modifier = modifier.padding(contentPadding)) {
-    Column {
-      ListItem(
-        headlineContent = { Text("Data transfer") },
-        leadingContent = {
-          Icon(
-            imageVector = Icons.Filled.ImportExport,
-            contentDescription = null,
-            modifier = Modifier.height(32.dp),
-          )
-        },
-        supportingContent = {
-          Row(
-            horizontalArrangement = Arrangement.spacedBy(32.dp),
-            modifier = Modifier.fillMaxWidth(),
-          ) {
-            ImportPosts(openInputStream, coroutineScope, snackbarHostState, importPosts)
-            ExportPosts(
-              coroutineScope,
-              snackbarHostState,
-              openOutputStream,
-              exportPostsAsJson,
-              exportPostsAsHtml,
-            )
-          }
-        },
-      )
-      ListItem(
-        headlineContent = { Text("Libraries") },
-        leadingContent = {
-          Icon(
-            imageVector = Icons.AutoMirrored.Filled.LibraryBooks,
-            contentDescription = null,
-            modifier = Modifier.height(32.dp),
-          )
-        },
-        modifier = Modifier.clickable(onClick = openLibrariesScreen),
-      )
-    }
+internal fun loggedInAccountText(username: String?): String {
+  return if (username.isNullOrBlank()) {
+    "Sign out of your lobste.rs account"
+  } else {
+    "Logged in as $username"
   }
 }
 
 @Composable
-private fun RowScope.ImportPosts(
+fun SettingsScreen(
+  openLibrariesScreen: () -> Unit,
+  openRepository: () -> Unit,
+  openTagFiltering: () -> Unit,
+  openLoginScreen: () -> Unit,
+  onLogout: () -> Unit,
+  isLoggedIn: Boolean,
+  username: String?,
+  snackbarHostState: SnackbarHostState,
+  openInputStream: (Uri) -> InputStream?,
+  openOutputStream: (Uri) -> OutputStream?,
+  importPosts: suspend (InputStream) -> Result<Unit>,
+  exportPostsAsJson: suspend (OutputStream) -> Unit,
+  exportPostsAsHtml: suspend (OutputStream) -> Unit,
+  contentPadding: PaddingValues,
+  savedPostsCount: Long,
+  modifier: Modifier = Modifier,
+) {
+  val coroutineScope = rememberCoroutineScope()
+  Column(modifier.padding(contentPadding)) {
+    // Account Section
+    SectionHeader(title = "Account")
+    if (isLoggedIn) {
+      ListItem(
+        headlineContent = { Text("Log out") },
+        supportingContent = { Text(loggedInAccountText(username)) },
+        leadingContent = {
+          Icon(
+            imageVector = Icons.Filled.AccountCircle,
+            contentDescription = null,
+            modifier = Modifier.height(32.dp),
+          )
+        },
+        modifier = Modifier.clickable(onClick = onLogout),
+      )
+    } else {
+      ListItem(
+        headlineContent = { Text("Log in with lobste.rs") },
+        supportingContent = { Text("Sign in to your lobste.rs account") },
+        leadingContent = {
+          Icon(
+            imageVector = Icons.Filled.AccountCircle,
+            contentDescription = null,
+            modifier = Modifier.height(32.dp),
+          )
+        },
+        modifier = Modifier.clickable(onClick = openLoginScreen),
+      )
+    }
+    Spacer(modifier = Modifier.height(24.dp))
+
+    // Data Management Section
+    SectionHeader(title = stringResource(R.string.data_management))
+    ListItem(
+      headlineContent = { Text(stringResource(R.string.data_transfer)) },
+      supportingContent = { Text(stringResource(R.string.import_and_export_your_saved_posts)) },
+      leadingContent = {
+        Icon(
+          imageVector = Icons.Filled.ImportExport,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      },
+      trailingContent = {
+        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+          ImportPosts(openInputStream, coroutineScope, snackbarHostState, importPosts)
+          ExportPosts(
+            coroutineScope,
+            snackbarHostState,
+            openOutputStream,
+            exportPostsAsJson,
+            exportPostsAsHtml,
+          )
+        }
+      },
+    )
+
+    Spacer(modifier = Modifier.height(24.dp))
+
+    // App Information Section
+    SectionHeader(title = stringResource(R.string.app_information))
+    ListItem(
+      headlineContent = { Text(stringResource(R.string.version)) },
+      supportingContent = {
+        Text(
+          stringResource(
+            R.string.version_placeholder,
+            BuildConfig.VERSION_NAME,
+            BuildConfig.VERSION_CODE,
+          )
+        )
+      },
+      leadingContent = {
+        Icon(
+          imageVector = Icons.Filled.Code,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      },
+    )
+    ListItem(
+      headlineContent = { Text(stringResource(R.string.saved_posts)) },
+      supportingContent = { Text(stringResource(R.string.posts_saved_locally, savedPostsCount)) },
+      leadingContent = {
+        Icon(
+          imageVector = Icons.Filled.Bookmarks,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      },
+    )
+    ListItem(
+      headlineContent = { Text(stringResource(R.string.tag_filtering)) },
+      supportingContent = { Text(stringResource(R.string.filter_posts_by_tags)) },
+      leadingContent = {
+        Icon(
+          imageVector = Icons.Filled.FilterList,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      },
+      modifier = Modifier.clickable(onClick = openTagFiltering),
+    )
+
+    Spacer(modifier = Modifier.height(24.dp))
+
+    // About Section
+    SectionHeader(title = stringResource(R.string.about))
+    ListItem(
+      headlineContent = { Text(stringResource(R.string.libraries)) },
+      supportingContent = {
+        Text(stringResource(R.string.view_open_source_libraries_used_in_this_))
+      },
+      leadingContent = {
+        Icon(
+          imageVector = Icons.AutoMirrored.Filled.LibraryBooks,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      },
+      modifier = Modifier.clickable(onClick = openLibrariesScreen),
+    )
+    ListItem(
+      headlineContent = { Text(stringResource(R.string.source_code)) },
+      supportingContent = { Text(stringResource(R.string.view_the_source_code_on_github)) },
+      leadingContent = {
+        Icon(
+          imageVector = Icons.Filled.Code,
+          contentDescription = null,
+          modifier = Modifier.height(32.dp),
+        )
+      },
+      modifier = Modifier.clickable(onClick = openRepository),
+    )
+  }
+}
+
+@Composable
+private fun SectionHeader(title: String, modifier: Modifier = Modifier) {
+  Column(modifier = modifier) {
+    Text(
+      text = title,
+      style = MaterialTheme.typography.titleMedium,
+      color = MaterialTheme.colorScheme.primary,
+      modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
+    )
+    HorizontalDivider(
+      modifier = Modifier.padding(horizontal = 16.dp),
+      color = MaterialTheme.colorScheme.outlineVariant,
+    )
+  }
+}
+
+@Composable
+private fun ImportPosts(
   openInputStream: (Uri) -> InputStream?,
   coroutineScope: CoroutineScope,
   snackbarHostState: SnackbarHostState,
-  importPosts: suspend (InputStream) -> Unit,
+  importPosts: suspend (InputStream) -> Result<Unit>,
   modifier: Modifier = Modifier,
 ) {
   val importAction =
@@ -120,28 +252,39 @@ private fun RowScope.ImportPosts(
         return@rememberLauncherForActivityResult
       }
       coroutineScope.launch {
-        openInputStream(uri)?.use { stream ->
-          importPosts(stream)
-          snackbarHostState.showSnackbarDismissing("Successfully imported posts")
+        try {
+          openInputStream(uri)?.use { stream ->
+            val result = importPosts(stream)
+            if (result.isSuccess) {
+              snackbarHostState.showSnackbarDismissing("Successfully imported posts")
+            } else {
+              snackbarHostState.showSnackbarDismissing("Failed to import posts")
+            }
+          } ?: snackbarHostState.showSnackbarDismissing("Unable to open selected file")
+        } catch (e: Exception) {
+          snackbarHostState.showSnackbarDismissing("Failed to open file: ${e.message}")
         }
       }
     }
   OutlinedButton(
-    onClick = { importAction.launch(JSON_MIME_TYPE) },
+    onClick = {
+      importAction.launch(JSON_MIME_TYPE)
+      Sentry.metrics().count("import", 1.0)
+    },
     shape = MaterialTheme.shapes.extraSmall,
-    modifier = modifier.fillMaxWidth(0.30f).weight(0.5f),
+    modifier = modifier,
   ) {
-    Text(text = "Import")
+    Text(text = stringResource(R.string.import_action))
   }
 }
 
 @Composable
-private fun RowScope.ExportPosts(
+private inline fun ExportPosts(
   coroutineScope: CoroutineScope,
   snackbarHostState: SnackbarHostState,
-  openOutputStream: (Uri) -> OutputStream?,
-  exportPostsAsJson: suspend (OutputStream) -> Unit,
-  exportPostsAsHtml: suspend (OutputStream) -> Unit,
+  crossinline openOutputStream: (Uri) -> OutputStream?,
+  crossinline exportPostsAsJson: suspend (OutputStream) -> Unit,
+  crossinline exportPostsAsHtml: suspend (OutputStream) -> Unit,
   modifier: Modifier = Modifier,
 ) {
   val jsonExportAction =
@@ -152,9 +295,19 @@ private fun RowScope.ExportPosts(
         return@rememberLauncherForActivityResult
       }
       coroutineScope.launch {
-        openOutputStream(uri)?.use { stream ->
-          exportPostsAsJson(stream)
-          snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+        try {
+          openOutputStream(uri)?.use { stream ->
+            exportPostsAsJson(stream)
+            snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+            Sentry.metrics().count("json_export_success", 1.0)
+          }
+            ?: run {
+              snackbarHostState.showSnackbarDismissing("Unable to open output file")
+              Sentry.metrics().count("json_export_failure", 1.0)
+            }
+        } catch (e: Exception) {
+          snackbarHostState.showSnackbarDismissing("Failed to export posts: ${e.message}")
+          Sentry.metrics().count("json_export_failure", 1.0)
         }
       }
     }
@@ -166,9 +319,19 @@ private fun RowScope.ExportPosts(
         return@rememberLauncherForActivityResult
       }
       coroutineScope.launch {
-        openOutputStream(uri)?.use { stream ->
-          exportPostsAsHtml(stream)
-          snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+        try {
+          openOutputStream(uri)?.use { stream ->
+            exportPostsAsHtml(stream)
+            snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+            Sentry.metrics().count("html_export_success", 1.0)
+          }
+            ?: run {
+              snackbarHostState.showSnackbarDismissing("Unable to open output file")
+              Sentry.metrics().count("html_export_failure", 1.0)
+            }
+        } catch (e: Exception) {
+          snackbarHostState.showSnackbarDismissing("Failed to export posts: ${e.message}")
+          Sentry.metrics().count("html_export_failure", 1.0)
         }
       }
     }
@@ -176,22 +339,25 @@ private fun RowScope.ExportPosts(
   OutlinedButton(
     onClick = { expanded = true },
     shape = MaterialTheme.shapes.extraSmall,
-    modifier = modifier.fillMaxWidth(0.30f).weight(0.5f),
+    modifier = modifier,
   ) {
-    Text(text = "Export")
+    Text(text = stringResource(R.string.export))
     DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
       DropdownMenuItem(
-        text = { Text("JSON") },
+        text = { Text(stringResource(R.string.json)) },
         onClick = {
           expanded = false
           jsonExportAction.launch("claw-export.json")
         },
         leadingIcon = {
-          Icon(imageVector = Icons.Filled.Code, contentDescription = "Export as JSON")
+          Icon(
+            imageVector = Icons.Filled.Code,
+            contentDescription = stringResource(R.string.export_as_json),
+          )
         },
       )
       DropdownMenuItem(
-        text = { Text("Bookmarks") },
+        text = { Text(stringResource(R.string.bookmarks)) },
         onClick = {
           expanded = false
           htmlExportAction.launch("claw-export.html")
@@ -199,7 +365,7 @@ private fun RowScope.ExportPosts(
         leadingIcon = {
           Icon(
             imageVector = Icons.Filled.Bookmarks,
-            contentDescription = "Export as browser bookmarks",
+            contentDescription = stringResource(R.string.export_as_browser_bookmarks),
           )
         },
       )
@@ -208,7 +374,7 @@ private fun RowScope.ExportPosts(
 }
 
 /** Shows a Snackbar but dismisses any existing ones first. */
-private suspend fun SnackbarHostState.showSnackbarDismissing(text: String) {
+private suspend inline fun SnackbarHostState.showSnackbarDismissing(text: String) {
   currentSnackbarData?.dismiss()
   showSnackbar(text)
 }
@@ -217,6 +383,22 @@ private suspend fun SnackbarHostState.showSnackbarDismissing(text: String) {
 @Composable
 private fun SettingsScreenPreview() {
   LobstersTheme {
-    SettingsScreen({}, SnackbarHostState(), { null }, { null }, {}, {}, {}, PaddingValues())
+    SettingsScreen(
+      openLibrariesScreen = {},
+      openRepository = {},
+      openTagFiltering = {},
+      openLoginScreen = {},
+      onLogout = {},
+      isLoggedIn = false,
+      username = null,
+      snackbarHostState = SnackbarHostState(),
+      openInputStream = { null },
+      openOutputStream = { null },
+      importPosts = { Result.success(Unit) },
+      exportPostsAsJson = {},
+      exportPostsAsHtml = {},
+      contentPadding = PaddingValues(),
+      savedPostsCount = 42,
+    )
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/TabletScreen.kt

@@ -1,237 +0,0 @@
-/*
- * Copyright © 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:OptIn(ExperimentalMaterial3AdaptiveApi::class)
-
-package dev.msfjarvis.claw.android.ui.screens
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
-import androidx.compose.material3.adaptive.layout.AnimatedPane
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffold
-import androidx.compose.material3.adaptive.layout.ListDetailPaneScaffoldRole
-import androidx.compose.material3.adaptive.layout.PaneAdaptedValue
-import androidx.compose.material3.adaptive.navigation.BackNavigationBehavior
-import androidx.compose.material3.adaptive.navigation.ThreePaneScaffoldNavigator
-import androidx.compose.material3.adaptive.navigation.rememberListDetailPaneScaffoldNavigator
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.rememberNavController
-import androidx.paging.compose.collectAsLazyPagingItems
-import com.deliveryhero.whetstone.compose.injectedViewModel
-import dev.msfjarvis.claw.android.R
-import dev.msfjarvis.claw.android.ui.PostActions
-import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
-import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
-import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
-import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
-import dev.msfjarvis.claw.android.ui.navigation.AppDestinations
-import dev.msfjarvis.claw.android.ui.navigation.Comments
-import dev.msfjarvis.claw.android.ui.navigation.Hottest
-import dev.msfjarvis.claw.android.ui.navigation.Newest
-import dev.msfjarvis.claw.android.ui.navigation.Saved
-import dev.msfjarvis.claw.android.ui.navigation.User
-import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import kotlinx.collections.immutable.persistentListOf
-import kotlinx.collections.immutable.persistentMapOf
-import kotlinx.coroutines.launch
-
-private fun ThreePaneScaffoldNavigator<*>.isListExpanded() =
-  scaffoldValue[ListDetailPaneScaffoldRole.List] == PaneAdaptedValue.Expanded
-
-private fun ThreePaneScaffoldNavigator<*>.isDetailExpanded() =
-  scaffoldValue[ListDetailPaneScaffoldRole.Detail] == PaneAdaptedValue.Expanded
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TabletScreen(
-  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
-  modifier: Modifier = Modifier,
-  viewModel: ClawViewModel = injectedViewModel(),
-) {
-  val context = LocalContext.current
-  val hottestListState = rememberLazyListState()
-  val newestListState = rememberLazyListState()
-  val savedListState = rememberLazyListState()
-  val navController = rememberNavController()
-  val coroutineScope = rememberCoroutineScope()
-  val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
-  val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
-  val savedPosts by viewModel.savedPostsByMonth.collectAsStateWithLifecycle(persistentMapOf())
-  val navigator = rememberListDetailPaneScaffoldNavigator<Comments>()
-  val backBehavior =
-    if (navigator.isListExpanded() && navigator.isDetailExpanded()) {
-      BackNavigationBehavior.PopUntilContentChange
-    } else {
-      BackNavigationBehavior.PopUntilScaffoldValueChange
-    }
-
-  val postActions = remember {
-    PostActions(context, urlLauncher, viewModel) {
-      coroutineScope.launch {
-        navigator.navigateTo(pane = ListDetailPaneScaffoldRole.Detail, contentKey = Comments(it))
-      }
-    }
-  }
-
-  val navItems =
-    persistentListOf(
-      NavigationItem(AppDestinations.HOTTEST) {
-        coroutineScope.launch {
-          if (hottestPosts.itemCount > 0) hottestListState.animateScrollToItem(index = 0)
-        }
-      },
-      NavigationItem(AppDestinations.NEWEST) {
-        coroutineScope.launch {
-          if (newestPosts.itemCount > 0) newestListState.animateScrollToItem(index = 0)
-        }
-      },
-      NavigationItem(AppDestinations.SAVED) {
-        coroutineScope.launch {
-          if (savedPosts.isNotEmpty()) savedListState.animateScrollToItem(index = 0)
-        }
-      },
-    )
-
-  BackHandler(navigator.canNavigateBack(backBehavior)) {
-    coroutineScope.launch { navigator.navigateBack(backBehavior) }
-  }
-
-  Scaffold(
-    topBar = {
-      TopAppBar(
-        navigationIcon = {
-          if (navigator.canNavigateBack(backBehavior)) {
-            IconButton(
-              onClick = { coroutineScope.launch { navigator.navigateBack(backBehavior) } }
-            ) {
-              Icon(
-                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                contentDescription = "Go back to previous screen",
-              )
-            }
-          } else {
-            Icon(
-              painter = painterResource(id = R.drawable.ic_launcher_foreground),
-              contentDescription = "The app icon for Claw",
-              modifier = Modifier.size(48.dp),
-            )
-          }
-        },
-        title = {
-          if (!navigator.canNavigateBack(backBehavior)) {
-            Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
-          }
-        },
-      )
-    },
-    content = { paddingValues ->
-      Row {
-        ClawNavigationRail(navController = navController, items = navItems, isVisible = true)
-        ListDetailPaneScaffold(
-          modifier = modifier.padding(paddingValues),
-          directive = navigator.scaffoldDirective,
-          value = navigator.scaffoldValue,
-          listPane = {
-            AnimatedPane {
-              NavHost(
-                navController = navController,
-                startDestination = Hottest,
-                enterTransition = { fadeIn(tween(350)) },
-                exitTransition = { fadeOut(tween(350)) },
-              ) {
-                composable<Hottest> {
-                  NetworkPosts(
-                    lazyPagingItems = hottestPosts,
-                    listState = hottestListState,
-                    postActions = postActions,
-                    contentPadding = PaddingValues(),
-                  )
-                }
-                composable<Newest> {
-                  NetworkPosts(
-                    lazyPagingItems = newestPosts,
-                    listState = newestListState,
-                    postActions = postActions,
-                    contentPadding = PaddingValues(),
-                  )
-                }
-                composable<Saved> {
-                  DatabasePosts(
-                    items = savedPosts,
-                    listState = savedListState,
-                    postActions = postActions,
-                    contentPadding = PaddingValues(),
-                  )
-                }
-              }
-            }
-          },
-          detailPane = {
-            AnimatedPane {
-              when (val contentKey = navigator.currentDestination?.contentKey) {
-                null -> {
-                  Box(Modifier.fillMaxSize()) {
-                    Text(
-                      text = "Select a post to view comments",
-                      modifier = Modifier.align(Alignment.Center),
-                    )
-                  }
-                }
-                else -> {
-                  CommentsPage(
-                    postId = contentKey.postId,
-                    postActions = postActions,
-                    htmlConverter = htmlConverter,
-                    getSeenComments = viewModel::getSeenComments,
-                    markSeenComments = viewModel::markSeenComments,
-                    openUserProfile = { navController.navigate(User(it)) },
-                    contentPadding = PaddingValues(),
-                    modifier = Modifier.fillMaxSize(),
-                  )
-                }
-              }
-            }
-          },
-        )
-      }
-    },
-  )
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/TabletScreen2.kt

@@ -1,170 +0,0 @@
-/*
- * Copyright © 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.screens
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.Icon
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Text
-import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.paging.compose.collectAsLazyPagingItems
-import com.deliveryhero.whetstone.compose.injectedViewModel
-import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
-import dev.msfjarvis.claw.android.ui.PostActions
-import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
-import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
-import dev.msfjarvis.claw.android.ui.navigation.AboutLibraries
-import dev.msfjarvis.claw.android.ui.navigation.AppDestinations
-import dev.msfjarvis.claw.android.ui.navigation.Comments
-import dev.msfjarvis.claw.android.ui.navigation.Hottest
-import dev.msfjarvis.claw.android.ui.navigation.Newest
-import dev.msfjarvis.claw.android.ui.navigation.Saved
-import dev.msfjarvis.claw.android.ui.navigation.Settings
-import dev.msfjarvis.claw.android.ui.navigation.User
-import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import dev.msfjarvis.claw.common.user.UserProfile
-import kotlinx.collections.immutable.persistentMapOf
-
-@Composable
-fun TabletScreen2(
-  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
-  setWebUri: (String?) -> Unit,
-  modifier: Modifier = Modifier,
-  viewModel: ClawViewModel = injectedViewModel(),
-) {
-  // TODO: Needs a custom Saver implementation, should probably be an ArrayDeque
-  val navigationBackStack = rememberSaveable {
-    mutableStateListOf(AppDestinations.HOTTEST.destination)
-  }
-
-  val context = LocalContext.current
-  val hottestListState = rememberLazyListState()
-  val newestListState = rememberLazyListState()
-  val savedListState = rememberLazyListState()
-  val snackbarHostState = remember { SnackbarHostState() }
-  val postActions = remember {
-    PostActions(context, urlLauncher, viewModel) { navigationBackStack.add(Comments(it)) }
-  }
-
-  val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
-  val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
-  val savedPosts by viewModel.savedPostsByMonth.collectAsStateWithLifecycle(persistentMapOf())
-
-  BackHandler(navigationBackStack.size > 1) {
-    navigationBackStack.removeAt(navigationBackStack.size - 1)
-  }
-
-  val contentPadding = PaddingValues()
-
-  NavigationSuiteScaffold(
-    navigationSuiteItems = {
-      AppDestinations.entries.forEach {
-        item(
-          icon = { Icon(imageVector = it.icon, contentDescription = it.label) },
-          selected = it.destination == navigationBackStack.first(),
-          onClick = { navigationBackStack.add(it.destination) },
-        )
-      }
-    },
-    modifier = modifier,
-  ) {
-    when (navigationBackStack.first()) {
-      AboutLibraries -> {
-        LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize())
-      }
-      Hottest -> {
-        setWebUri("https://lobste.rs/")
-        NetworkPosts(
-          lazyPagingItems = hottestPosts,
-          listState = hottestListState,
-          postActions = postActions,
-          contentPadding = contentPadding,
-        )
-      }
-      Newest -> {
-        setWebUri("https://lobste.rs/")
-        NetworkPosts(
-          lazyPagingItems = newestPosts,
-          listState = newestListState,
-          postActions = postActions,
-          contentPadding = contentPadding,
-        )
-      }
-      Saved -> {
-        setWebUri(null)
-        DatabasePosts(
-          items = savedPosts,
-          listState = savedListState,
-          postActions = postActions,
-          contentPadding = contentPadding,
-        )
-      }
-      Settings -> {
-        setWebUri(null)
-        SettingsScreen(
-          openInputStream = context.contentResolver::openInputStream,
-          openOutputStream = context.contentResolver::openOutputStream,
-          openLibrariesScreen = { navigationBackStack.add(AboutLibraries) },
-          importPosts = viewModel::importPosts,
-          exportPostsAsJson = viewModel::exportPostsAsJson,
-          exportPostsAsHtml = viewModel::exportPostsAsHtml,
-          snackbarHostState = snackbarHostState,
-          contentPadding = contentPadding,
-          modifier = Modifier.fillMaxSize(),
-        )
-      }
-      is Comments -> {
-        val postId = (navigationBackStack.first() as Comments).postId
-        setWebUri("https://lobste.rs/s/$postId")
-        CommentsPage(
-          postId = postId,
-          postActions = postActions,
-          htmlConverter = htmlConverter,
-          getSeenComments = viewModel::getSeenComments,
-          markSeenComments = viewModel::markSeenComments,
-          contentPadding = contentPadding,
-          openUserProfile = { navigationBackStack.add(User(it)) },
-        )
-      }
-      is User -> {
-        val username = (navigationBackStack.first() as User).username
-        setWebUri("https://lobste.rs/u/$username")
-        UserProfile(
-          username = username,
-          getProfile = viewModel::getUserProfile,
-          contentPadding = contentPadding,
-          openUserProfile = { navigationBackStack.add(User(it)) },
-        )
-      }
-      else -> {
-        Box(Modifier.fillMaxSize()) {
-          Text(
-            text = "Unexpected destination: ${navigationBackStack.first()}, please report this bug",
-            modifier = Modifier.align(Alignment.Center),
-          )
-        }
-      }
-    }
-  }
-}

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

@@ -1,21 +0,0 @@
-/*
- * Copyright © 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.util
-
-import androidx.compose.runtime.Stable
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import io.github.furstenheim.CopyDown
-import javax.inject.Inject
-
-@Stable
-class HTMLConverterImpl @Inject constructor() : HTMLConverter {
-  private val copydown = CopyDown()
-
-  override fun convertHTMLToMarkdown(html: String): String {
-    return copydown.convert(html)
-  }
-}

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

@@ -0,0 +1,51 @@
+/*
+ * Copyright © 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 android.util.Log
+import app.cash.sqldelight.coroutines.asFlow
+import app.cash.sqldelight.coroutines.mapToList
+import dev.msfjarvis.claw.android.BuildConfig
+import dev.msfjarvis.claw.core.coroutines.DatabaseReadDispatcher
+import dev.msfjarvis.claw.core.coroutines.DatabaseWriteDispatcher
+import dev.msfjarvis.claw.database.local.CachedRemotePost
+import dev.msfjarvis.claw.database.local.CachedRemotePostQueries
+import dev.zacsweers.metro.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+@Inject
+class CachedRemotePostsRepository(
+  private val cachedRemotePostQueries: CachedRemotePostQueries,
+  @param:DatabaseReadDispatcher private val readDispatcher: CoroutineDispatcher,
+  @param:DatabaseWriteDispatcher private val writeDispatcher: CoroutineDispatcher,
+) {
+  val cachedPosts = cachedRemotePostQueries.selectAllPosts().asFlow().mapToList(readDispatcher)
+
+  fun getRecentPosts(limit: Long) =
+    cachedRemotePostQueries.selectRecentPosts(limit).asFlow().mapToList(readDispatcher)
+
+  suspend fun getCachedPosts(): List<CachedRemotePost> {
+    return withContext(readDispatcher) { cachedRemotePostQueries.selectAllPosts().executeAsList() }
+  }
+
+  suspend fun savePosts(posts: List<CachedRemotePost>) {
+    if (BuildConfig.DEBUG) {
+      Log.d(TAG, "Caching remote posts: ${posts.joinToString(",") { it.shortId }}")
+    }
+    withContext(writeDispatcher) {
+      cachedRemotePostQueries.transaction {
+        cachedRemotePostQueries.deleteAllPosts()
+        posts.forEach { post -> cachedRemotePostQueries.insertOrReplacePost(post) }
+      }
+    }
+  }
+
+  private companion object {
+    private const val TAG = "CachedRemotePostsRepository"
+  }
+}

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

@@ -15,75 +15,92 @@ import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.intl.Locale
 import androidx.glance.appwidget.updateAll
 import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
+import androidx.paging.PagingData
 import androidx.paging.cachedIn
-import com.deliveryhero.whetstone.app.ApplicationScope
-import com.deliveryhero.whetstone.viewmodel.ContributesViewModel
-import com.slack.eithernet.ApiResult.Failure
-import com.slack.eithernet.ApiResult.Success
-import com.squareup.anvil.annotations.optional.ForScope
 import dev.msfjarvis.claw.android.glance.SavedPostsWidget
 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.paging.SearchPagingSource
-import dev.msfjarvis.claw.android.ui.toError
 import dev.msfjarvis.claw.api.LobstersApi
-import dev.msfjarvis.claw.core.injection.IODispatcher
-import dev.msfjarvis.claw.core.injection.MainDispatcher
-import dev.msfjarvis.claw.model.Comment
+import dev.msfjarvis.claw.api.toPostsResult
+import dev.msfjarvis.claw.core.coroutines.IODispatcher
+import dev.msfjarvis.claw.core.coroutines.MainDispatcher
 import dev.msfjarvis.claw.model.UIPost
 import dev.msfjarvis.claw.model.fromSavedPost
-import dev.msfjarvis.claw.model.toUIPost
-import java.io.IOException
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
+import dev.zacsweers.metrox.viewmodel.ViewModelKey
 import java.io.InputStream
 import java.io.OutputStream
 import java.time.LocalDateTime
 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.Flow
 import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-@ContributesViewModel
-class ClawViewModel
 @Inject
-constructor(
+@ViewModelKey
+@ContributesIntoMap(scope = AppScope::class, binding = binding<ViewModel>())
+class ClawViewModel(
+  context: Context,
   private val api: LobstersApi,
-  private val commentsRepository: CommentsRepository,
   private val readPostsRepository: ReadPostsRepository,
   private val savedPostsRepository: SavedPostsRepository,
   private val linkMetadataRepository: LinkMetadataRepository,
   private val dataTransferRepository: DataTransferRepository,
   private val pagingSourceFactory: LobstersPagingSource.Factory,
   private val searchPagingSourceFactory: SearchPagingSource.Factory,
-  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-  @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
-  @ForScope(ApplicationScope::class) context: Context,
+  @param:IODispatcher private val ioDispatcher: CoroutineDispatcher,
+  @param:MainDispatcher private val mainDispatcher: CoroutineDispatcher,
 ) : AndroidViewModel(context as Application) {
-  val hottestPosts =
-    Pager(
-        config = PagingConfig(pageSize = PAGE_SIZE),
-        initialKey = STARTING_PAGE_INDEX,
-        pagingSourceFactory = { pagingSourceFactory.create(api::getHottestPosts) },
-      )
-      .flow
-      .cachedIn(viewModelScope)
-  val newestPosts =
-    Pager(
-        config = PagingConfig(pageSize = PAGE_SIZE),
-        initialKey = STARTING_PAGE_INDEX,
-        pagingSourceFactory = { pagingSourceFactory.create(api::getNewestPosts) },
-      )
-      .flow
-      .cachedIn(viewModelScope)
+  private var _hottestPosts: Flow<PagingData<UIPost>>? = null
+  val hottestPosts: Flow<PagingData<UIPost>>
+    get() {
+      if (_hottestPosts == null) {
+        _hottestPosts =
+          Pager(
+              config = PagingConfig(pageSize = PAGE_SIZE),
+              initialKey = STARTING_PAGE_INDEX,
+              pagingSourceFactory = {
+                pagingSourceFactory.create { page -> api.getHottestPosts(page).toPostsResult() }
+              },
+            )
+            .flow
+            .cachedIn(viewModelScope)
+      }
+      return requireNotNull(_hottestPosts) { "_hottestPosts should be initialized here" }
+    }
+
+  private var _newestPosts: Flow<PagingData<UIPost>>? = null
+  val newestPosts: Flow<PagingData<UIPost>>
+    get() {
+      if (_newestPosts == null) {
+        _newestPosts =
+          Pager(
+              config = PagingConfig(pageSize = PAGE_SIZE),
+              initialKey = STARTING_PAGE_INDEX,
+              pagingSourceFactory = {
+                pagingSourceFactory.create { page -> api.getNewestPosts(page).toPostsResult() }
+              },
+            )
+            .flow
+            .cachedIn(viewModelScope)
+      }
+      return requireNotNull(_newestPosts) { "_newestPosts should be initialized here" }
+    }
+
   val searchResults =
     Pager(
         PagingConfig(pageSize = PAGE_SIZE),
@@ -92,44 +109,37 @@ constructor(
       )
       .flow
   val savedPosts = savedPostsRepository.savedPosts.map { it.map(UIPost.Companion::fromSavedPost) }
+  val savedPostsCount = savedPostsRepository.savedPosts.map { it.size.toLong() }
   val savedPostsByMonth
-    get() = savedPosts.map(::groupSavedPosts)
+    get() =
+      savedPostsRepository.savedPostsSortedByDate.map { posts ->
+        posts
+          .map(UIPost.Companion::fromSavedPost)
+          .groupBy { post ->
+            val time = post.createdAt.toLocalDateTime()
+            "${time.month.name.lowercase().capitalize(Locale.current)} ${time.year}"
+          }
+          .toImmutableMap()
+      }
 
   var searchQuery by mutableStateOf("")
 
-  private var _readPosts = emptyList<String>()
-  private var _savedPosts = emptyList<String>()
+  private var _readPosts by mutableStateOf(emptySet<String>())
+  private var _savedPosts by mutableStateOf(emptySet<String>())
 
   init {
-    viewModelScope.launch { savedPosts.collectLatest { _savedPosts = it.map(UIPost::shortId) } }
-    viewModelScope.launch { readPostsRepository.readPosts.collectLatest { _readPosts = it } }
-  }
-
-  private fun groupSavedPosts(items: List<UIPost>): ImmutableMap<String, List<UIPost>> {
-    val sorted =
-      items.sortedWith { post1, post2 ->
-        val post1Date = post1.createdAt.toLocalDateTime()
-        val post2Date = post2.createdAt.toLocalDateTime()
-        if (post2Date.isBefore(post1Date)) {
-          -1
-        } else if (post2Date.isAfter(post1Date)) {
-          1
-        } else {
-          0
-        }
-      }
-    return sorted
-      .groupBy { post ->
-        val time = post.createdAt.toLocalDateTime()
-        "${time.month.name.lowercase().capitalize(Locale.current)} ${time.year}"
-      }
-      .toImmutableMap()
+    viewModelScope.launch {
+      savedPosts.collectLatest { _savedPosts = it.map(UIPost::shortId).toSet() }
+    }
+    viewModelScope.launch {
+      readPostsRepository.readPosts.collectLatest { _readPosts = it.toSet() }
+    }
   }
 
   fun toggleSave(post: UIPost) {
     viewModelScope.launch {
       savedPostsRepository.toggleSave(post)
-      withContext(mainDispatcher) { SavedPostsWidget(savedPosts).updateAll(getApplication()) }
+      withContext(mainDispatcher) { SavedPostsWidget().updateAll(getApplication()) }
     }
   }
 
@@ -141,38 +151,11 @@ constructor(
     return _savedPosts.contains(post.shortId)
   }
 
-  suspend fun getPostComments(postId: String) =
-    withContext(ioDispatcher) {
-      when (val result = api.getPostDetails(postId)) {
-        is Success -> result.value.toUIPost()
-        is Failure.NetworkFailure -> throw result.error
-        is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure -> throw result.toError()
-        is Failure.ApiFailure -> throw IOException("API returned an invalid response")
-      }
-    }
-
-  suspend fun getSeenComments(postId: String) = commentsRepository.getSeenComments(postId)
-
-  fun markSeenComments(postId: String, comments: List<Comment>) {
-    viewModelScope.launch { commentsRepository.markSeenComments(postId, comments) }
-  }
-
   suspend fun getLinkMetadata(url: String) =
     withContext(ioDispatcher) { linkMetadataRepository.getLinkMetadata(url) }
 
-  suspend fun getUserProfile(username: String) =
-    withContext(ioDispatcher) {
-      when (val result = api.getUser(username)) {
-        is Success -> result.value
-        is Failure.NetworkFailure -> throw result.error
-        is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure -> throw result.toError()
-        is Failure.ApiFailure -> throw IOException("API returned an invalid response")
-      }
-    }
-
-  suspend fun importPosts(input: InputStream) = dataTransferRepository.importPosts(input)
+  suspend fun importPosts(input: InputStream): Result<Unit> =
+    dataTransferRepository.importPosts(input)
 
   suspend fun exportPostsAsJson(output: OutputStream) =
     dataTransferRepository.exportPostsAsJson(output)

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

@@ -6,14 +6,14 @@
  */
 package dev.msfjarvis.claw.android.viewmodel
 
-import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.core.coroutines.IODispatcher
 import dev.msfjarvis.claw.database.SavedPostSerializer
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.zacsweers.metro.Inject
 import java.io.InputStream
 import java.io.OutputStream
 import java.time.Instant
 import java.time.format.DateTimeFormatter
-import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
@@ -23,20 +23,24 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
 import kotlinx.serialization.json.encodeToStream
 
-@OptIn(ExperimentalSerializationApi::class)
-class DataTransferRepository
 @Inject
-constructor(
+@OptIn(ExperimentalSerializationApi::class)
+class DataTransferRepository(
   private val json: Json,
   private val savedPostsRepository: SavedPostsRepository,
-  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
+  @param:IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
   private val serializer = ListSerializer(SavedPostSerializer)
 
-  suspend fun importPosts(input: InputStream) {
-    val posts: List<SavedPost> =
-      withContext(ioDispatcher) { json.decodeFromStream(serializer, input) }
-    savedPostsRepository.savePosts(posts)
+  suspend fun importPosts(input: InputStream): Result<Unit> {
+    return try {
+      val posts: List<SavedPost> =
+        withContext(ioDispatcher) { json.decodeFromStream(serializer, input) }
+      savedPostsRepository.savePosts(posts)
+      Result.success(Unit)
+    } catch (t: Throwable) {
+      Result.failure(t)
+    }
   }
 
   suspend fun exportPostsAsJson(output: OutputStream) {
@@ -61,7 +65,7 @@ constructor(
       <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
       <TITLE>Bookmarks</TITLE>
       <H1>Bookmarks</H1>
-    """
+      """
         .trimIndent()
     val html = buildString {
       append(header)
@@ -69,10 +73,9 @@ constructor(
       for (post in posts) {
         append(
           """
-          <DT><A HREF="${post.url.ifEmpty { post.commentsUrl }}" ADD_DATE="${computeTimestamp(post)}" PRIVATE="0" TAGS="${post.tags.joinToString(",")}">${post.title}</A>
-          <DD>${post.title}
-
-        """
+            <DT><A HREF="${post.url.ifEmpty { post.commentsUrl }}" ADD_DATE="${computeTimestamp(post)}" PRIVATE="0" TAGS="${post.tags.joinToString(",")}">${post.title}</A>
+            <DD>${post.title}
+          """
             .trimIndent()
         )
       }
@@ -80,16 +83,11 @@ constructor(
         """
         <DT><A HREF="https://example.com/" ADD_DATE="0" PRIVATE="0" TAGS="delete,me,pls">Padding post</A>
         <DD>Linkding ignores the last entry so this pads the difference for imports
-
-      """
+        """
           .trimIndent()
       )
       append("</DD></p>\n")
     }
-    withContext(ioDispatcher) {
-      val writer = output.bufferedWriter()
-      writer.write(html)
-      writer.flush()
-    }
+    withContext(ioDispatcher) { output.bufferedWriter().use { writer -> writer.write(html) } }
   }
 }

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

@@ -6,18 +6,17 @@
  */
 package dev.msfjarvis.claw.android.viewmodel
 
-import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.core.coroutines.IODispatcher
 import dev.msfjarvis.claw.model.LinkMetadata
-import javax.inject.Inject
+import dev.zacsweers.metro.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import me.saket.unfurl.Unfurler
 
-class LinkMetadataRepository
 @Inject
-constructor(
+class LinkMetadataRepository(
   private val unfurler: Unfurler,
-  @IODispatcher private val dispatcher: CoroutineDispatcher,
+  @param:IODispatcher private val dispatcher: CoroutineDispatcher,
 ) {
   suspend fun getLinkMetadata(url: String): LinkMetadata {
     val result = withContext(dispatcher) { unfurler.unfurl(url) }

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

@@ -8,21 +8,22 @@ package dev.msfjarvis.claw.android.viewmodel
 
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
-import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.core.coroutines.DatabaseReadDispatcher
+import dev.msfjarvis.claw.core.coroutines.DatabaseWriteDispatcher
 import dev.msfjarvis.claw.database.local.ReadPostsQueries
-import javax.inject.Inject
+import dev.zacsweers.metro.Inject
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 
-class ReadPostsRepository
 @Inject
-constructor(
+class ReadPostsRepository(
   private val readPostsQueries: ReadPostsQueries,
-  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+  @param:DatabaseReadDispatcher private val readDispatcher: CoroutineDispatcher,
+  @param:DatabaseWriteDispatcher private val writeDispatcher: CoroutineDispatcher,
 ) {
-  val readPosts = readPostsQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
+  val readPosts = readPostsQueries.selectAllPosts().asFlow().mapToList(readDispatcher)
 
   suspend fun markRead(postId: String) {
-    withContext(dbDispatcher) { readPostsQueries.markRead(postId) }
+    withContext(writeDispatcher) { readPostsQueries.markRead(postId) }
   }
 }

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

@@ -6,40 +6,57 @@
  */
 package dev.msfjarvis.claw.android.viewmodel
 
+import android.util.Log
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
-import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.android.BuildConfig
+import dev.msfjarvis.claw.core.coroutines.DatabaseReadDispatcher
+import dev.msfjarvis.claw.core.coroutines.DatabaseWriteDispatcher
 import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.database.local.SavedPostQueries
 import dev.msfjarvis.claw.model.UIPost
 import dev.msfjarvis.claw.model.toSavedPost
-import io.github.aakira.napier.Napier
-import javax.inject.Inject
+import dev.zacsweers.metro.Inject
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.withContext
 
-class SavedPostsRepository
 @Inject
-constructor(
+class SavedPostsRepository(
   private val savedPostQueries: SavedPostQueries,
-  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+  @param:DatabaseReadDispatcher private val readDispatcher: CoroutineDispatcher,
+  @param:DatabaseWriteDispatcher private val writeDispatcher: CoroutineDispatcher,
 ) {
-  val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
+  val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(readDispatcher)
+  val savedPostsSortedByDate =
+    savedPostQueries.selectAllPostsSortedByDate().asFlow().mapToList(readDispatcher)
+
+  fun getPostsFromLastNDays(days: Long) =
+    savedPostQueries.selectPostsFromLastNDays(days.toString()).asFlow().mapToList(readDispatcher)
+
+  fun getRecentPosts(limit: Long) =
+    savedPostQueries.selectRecentPosts(limit).asFlow().mapToList(readDispatcher)
 
   suspend fun toggleSave(post: UIPost) {
-    if (savedPosts.firstOrNull().orEmpty().any { it.shortId == post.shortId }) {
-      Napier.d(tag = TAG) { "Removing post: ${post.shortId}" }
-      withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
+    val exists =
+      withContext(readDispatcher) { savedPostQueries.postExists(post.shortId).executeAsOne() }
+    if (exists) {
+      if (BuildConfig.DEBUG) {
+        Log.d(TAG, "Removing post: ${post.shortId}")
+      }
+      withContext(writeDispatcher) { savedPostQueries.deletePost(post.shortId) }
     } else {
-      Napier.d(tag = TAG) { "Saving post: ${post.shortId}" }
-      withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post.toSavedPost()) }
+      if (BuildConfig.DEBUG) {
+        Log.d(TAG, "Saving post: ${post.shortId}")
+      }
+      withContext(writeDispatcher) { savedPostQueries.insertOrReplacePost(post.toSavedPost()) }
     }
   }
 
   suspend fun savePosts(posts: List<SavedPost>) {
-    Napier.d(tag = TAG) { "Saving posts: ${posts.joinToString(",") { it.shortId }}" }
-    withContext(dbDispatcher) {
+    if (BuildConfig.DEBUG) {
+      Log.d(TAG, "Saving posts: ${posts.joinToString(",") { it.shortId }}")
+    }
+    withContext(writeDispatcher) {
       savedPostQueries.transaction {
         posts.forEach { post -> savedPostQueries.insertOrReplacePost(post) }
       }

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright © 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 androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dev.msfjarvis.claw.core.network.SessionCookieStore
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
+import dev.zacsweers.metrox.viewmodel.ViewModelKey
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.stateIn
+
+@Inject
+@ViewModelKey
+@ContributesIntoMap(scope = AppScope::class, binding = binding<ViewModel>())
+class SettingsViewModel(
+  private val sessionCookieStore: SessionCookieStore,
+  private val webViewCookieStore: WebViewCookieStore,
+) : ViewModel() {
+
+  val isLoggedIn =
+    sessionCookieStore
+      .isLoggedIn()
+      .stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5_000),
+        initialValue = false,
+      )
+
+  val username =
+    sessionCookieStore
+      .username()
+      .stateIn(
+        scope = viewModelScope,
+        started = SharingStarted.WhileSubscribed(5_000),
+        initialValue = null,
+      )
+
+  fun logout() {
+    sessionCookieStore.clear()
+    webViewCookieStore.clearLobstersCookies()
+  }
+
+  fun saveCookie(cookie: String, username: String) {
+    sessionCookieStore.set(cookie, username)
+  }
+}

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

@@ -0,0 +1,25 @@
+/*
+ * Copyright © 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 android.webkit.CookieManager
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+
+interface WebViewCookieStore {
+  fun clearLobstersCookies()
+}
+
+@Inject
+@ContributesBinding(AppScope::class)
+class AndroidWebViewCookieStore : WebViewCookieStore {
+  override fun clearLobstersCookies() {
+    CookieManager.getInstance().removeAllCookies(null)
+    CookieManager.getInstance().flush()
+  }
+}

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

@@ -10,47 +10,81 @@ import android.content.Context
 import androidx.glance.appwidget.updateAll
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.deliveryhero.whetstone.worker.ContributesWorker
-import com.deliveryhero.whetstone.worker.WorkerScope
 import com.slack.eithernet.ApiResult.Success
-import com.squareup.anvil.annotations.optional.ForScope
 import dev.msfjarvis.claw.android.glance.SavedPostsWidget
 import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
 import dev.msfjarvis.claw.api.LobstersApi
-import dev.msfjarvis.claw.model.LobstersPostDetails
-import dev.msfjarvis.claw.model.UIPost
-import dev.msfjarvis.claw.model.fromSavedPost
+import dev.msfjarvis.claw.core.injection.InjectedWorkerFactory
+import dev.msfjarvis.claw.core.injection.WorkerKey
+import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.toSavedPost
-import javax.inject.Inject
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.binding
+import kotlin.random.Random
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
 
 /**
- * WorkManager-backed [CoroutineWorker] that gets all the posts from [SavedPostsRepository], fetches
- * their newest state using the [LobstersApi] and then writes them back to the database. This allows
- * saved posts that were saved before comment counts were added to be able to show a comment count
- * and for new-enough posts that are still getting comments to have an accurate one.
+ * WorkManager-backed [CoroutineWorker] that gets all the posts from [SavedPostsRepository] that
+ * were created in the last 30 days, fetches their newest state using the [LobstersApi] and then
+ * writes them back to the database. API calls are staggered with a configurable delay to avoid rate
+ * limiting. This allows saved posts to stay up-to-date with current comment counts and other
+ * metadata changes.
  */
-@ContributesWorker
-class SavedPostUpdaterWorker
-@Inject
-constructor(
-  @ForScope(WorkerScope::class) appContext: Context,
-  workerParams: WorkerParameters,
+@AssistedInject
+class SavedPostUpdaterWorker(
+  context: Context,
+  @Assisted params: WorkerParameters,
   private val savedPostsRepository: SavedPostsRepository,
   private val lobstersApi: LobstersApi,
-) : CoroutineWorker(appContext, workerParams) {
+) : CoroutineWorker(context, params) {
   override suspend fun doWork(): Result {
-    savedPostsRepository.savedPosts
-      .first()
-      .map { post -> lobstersApi.getPostDetails(post.shortId) }
-      .filterIsInstance<Success<LobstersPostDetails>>()
-      .map { result -> result.value.toSavedPost() }
-      .let { savedPostsRepository.savePosts(it) }
-    SavedPostsWidget(
-        savedPostsRepository.savedPosts.map { it.map(UIPost.Companion::fromSavedPost) }
-      )
-      .updateAll(applicationContext)
+    val postsToUpdate = savedPostsRepository.getPostsFromLastNDays(DAYS_TO_UPDATE).first()
+
+    if (postsToUpdate.isEmpty()) {
+      return Result.success()
+    }
+
+    val updatedPosts = mutableListOf<SavedPost>()
+
+    for ((index, post) in postsToUpdate.withIndex()) {
+      when (val result = lobstersApi.getPostDetails(post.shortId)) {
+        is Success -> {
+          updatedPosts.add(result.value.toSavedPost())
+        }
+        else -> {}
+      }
+
+      if (index < postsToUpdate.lastIndex) {
+        // Add a random delay between API calls to avoid rate limiting
+        val delayMs = Random.nextLong(MIN_DELAY_MS, MAX_DELAY_MS)
+        delay(delayMs)
+      }
+    }
+
+    if (updatedPosts.isNotEmpty()) {
+      savedPostsRepository.savePosts(updatedPosts)
+      SavedPostsWidget().updateAll(applicationContext)
+    }
+
     return Result.success()
   }
+
+  private companion object {
+    const val DAYS_TO_UPDATE = 30L
+    const val MIN_DELAY_MS = 500L
+    const val MAX_DELAY_MS = 2000L
+  }
+
+  @WorkerKey(SavedPostUpdaterWorker::class)
+  @ContributesIntoMap(
+    AppScope::class,
+    binding = binding<InjectedWorkerFactory.WorkerInstanceFactory<*>>(),
+  )
+  @AssistedFactory
+  abstract class Factory : InjectedWorkerFactory.WorkerInstanceFactory<SavedPostUpdaterWorker>
 }

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright © 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.work
+
+import android.content.Context
+import androidx.work.CoroutineWorker
+import androidx.work.WorkerParameters
+import dev.msfjarvis.claw.common.tags.TagBlockRepository
+import dev.msfjarvis.claw.core.injection.InjectedWorkerFactory
+import dev.msfjarvis.claw.core.injection.WorkerKey
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.Assisted
+import dev.zacsweers.metro.AssistedFactory
+import dev.zacsweers.metro.AssistedInject
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.binding
+
+@AssistedInject
+class TagExpirationCleanupWorker(
+  context: Context,
+  @Assisted params: WorkerParameters,
+  private val tagBlockRepository: TagBlockRepository,
+) : CoroutineWorker(context, params) {
+  override suspend fun doWork(): Result {
+    tagBlockRepository.removeExpiredTags()
+    return Result.success()
+  }
+
+  @WorkerKey(TagExpirationCleanupWorker::class)
+  @ContributesIntoMap(
+    AppScope::class,
+    binding = binding<InjectedWorkerFactory.WorkerInstanceFactory<*>>(),
+  )
+  @AssistedFactory
+  abstract class Factory : InjectedWorkerFactory.WorkerInstanceFactory<TagExpirationCleanupWorker>
+}

android/src/main/res/drawable/ic_comment.xml

@@ -9,8 +9,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24"
-    android:tint="?android:colorControlNormal"
-    android:alpha="0.6"
+    android:tint="?android:attr/colorControlNormal"
     android:autoMirrored="true">
   <path
       android:fillColor="@android:color/white"

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

@@ -4,6 +4,41 @@
  ~ license that can be found in the LICENSE file or at
  ~ https://opensource.org/licenses/MIT.
  -->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Claw</string>
+  <string name="saved_posts_widget_description">View your saved Lobsters posts</string>
+  <string name="hottest_posts_widget_description">View the hottest posts on Lobsters</string>
+  <string name="saved_posts">Saved posts</string>
+  <string name="see_more_posts">See more posts</string>
+  <plurals name="comments">
+    <item quantity="one">%1$d comment</item>
+    <item quantity="other">%1$d comments</item>
+  </plurals>
+  <string name="no_post_selected">No post selected</string>
+  <string name="data_management">Data Management</string>
+  <string name="data_transfer">Data transfer</string>
+  <string name="import_and_export_your_saved_posts">Import and export your saved posts</string>
+  <string name="app_information">App Information</string>
+  <string name="version">Version</string>
+  <string name="version_placeholder">%1$s (%2$s)</string>
+  <string name="posts_saved_locally">%1$s posts saved locally</string>
+  <string name="tag_filtering">Tag filtering</string>
+  <string name="filter_posts_by_tags">Filter posts by tags</string>
+  <string name="about">About</string>
+  <string name="libraries">Libraries</string>
+  <string name="view_open_source_libraries_used_in_this_">View open source libraries used in this app</string>
+  <string name="source_code">Source code</string>
+  <string name="view_the_source_code_on_github">View the source code on GitHub</string>
+  <string name="import_action">Import</string>
+  <string name="export">Export</string>
+  <string name="json">JSON</string>
+  <string name="export_as_json">Export as JSON</string>
+  <string name="bookmarks">Bookmarks</string>
+  <string name="export_as_browser_bookmarks">Export as browser bookmarks</string>
+  <string name="go_back_to_previous_screen">Go back to previous screen</string>
+  <string name="the_app_icon_for_claw">The app icon for Claw</string>
+  <string name="search_posts">Search posts</string>
+  <string name="settings">Settings</string>
+  <string name="empty_inbox_icon">Empty inbox icon</string>
+  <string name="no_saved_posts">No saved posts</string>
 </resources>

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

@@ -8,12 +8,12 @@
   <cloud-backup>
     <include
       domain="database"
-      path="databases" />
+      path="." />
   </cloud-backup>
 
   <device-transfer>
     <include
       domain="database"
-      path="databases" />
+      path="." />
   </device-transfer>
 </data-extraction-rules>

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

@@ -7,5 +7,5 @@
 <full-backup-content>
   <include
     domain="database"
-    path="databases" />
+    path="." />
 </full-backup-content>

android/src/main/res/xml/hottest_posts_widget_info.xml

@@ -0,0 +1,17 @@
+<!--
+ ~ Copyright © 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.
+ -->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/hottest_posts_widget_description"
+    android:previewImage="@drawable/hottest_posts_widget_preview"
+    android:initialLayout="@layout/glance_default_loading_layout"
+    android:minWidth="349dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="349dp"
+    android:minResizeHeight="110dp"
+    android:resizeMode="vertical|horizontal"
+    android:updatePeriodMillis="1800000"
+    android:widgetCategory="home_screen" />

android/src/main/res/xml/saved_posts_widget_info.xml

@@ -5,6 +5,8 @@
  ~ https://opensource.org/licenses/MIT.
  -->
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/saved_posts_widget_description"
+    android:previewImage="@drawable/saved_posts_widget_preview"
     android:initialLayout="@layout/glance_default_loading_layout"
     android:minWidth="349dp"
     android:minHeight="110dp"

android/src/screenshotTest/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest.kt

@@ -1,37 +0,0 @@
-/*
- * Copyright © 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 android.annotation.SuppressLint
-import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.runtime.Composable
-import androidx.paging.PagingData
-import androidx.paging.compose.collectAsLazyPagingItems
-import dev.msfjarvis.claw.common.posts.TEST_POST
-import dev.msfjarvis.claw.common.posts.TEST_POST_ACTIONS
-import dev.msfjarvis.claw.common.theme.LobstersTheme
-import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
-import kotlinx.coroutines.flow.MutableStateFlow
-
-@SuppressLint("ComposePreviewPublic", "ComposeUnstableReceiver")
-class NetworkPostsTest {
-  @ThemePreviews
-  @Composable
-  fun DefaultPreview() {
-    val items = List(20) { TEST_POST.copy(shortId = "${TEST_POST.shortId}${it}") }
-    val flow = MutableStateFlow(PagingData.from(items))
-    LobstersTheme {
-      NetworkPosts(
-        lazyPagingItems = flow.collectAsLazyPagingItems(),
-        listState = rememberLazyListState(),
-        postActions = TEST_POST_ACTIONS,
-        contentPadding = PaddingValues(),
-      )
-    }
-  }
-}

android/src/test/kotlin/dev/msfjarvis/claw/android/ui/screens/BackStackBehaviorTest.kt

@@ -0,0 +1,71 @@
+/*
+ * Copyright © 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.screens
+
+import androidx.navigation3.runtime.NavKey
+import com.google.common.truth.Truth.assertThat
+import dev.msfjarvis.claw.android.ui.navigation.Comments
+import dev.msfjarvis.claw.android.ui.navigation.Hottest
+import dev.msfjarvis.claw.android.ui.navigation.Newest
+import dev.msfjarvis.claw.android.ui.navigation.Saved
+import org.junit.jupiter.api.Test
+
+class BackStackBehaviorTest {
+
+  private fun makeBackStack(vararg keys: NavKey) = mutableListOf(*keys)
+
+  @Test
+  fun `navigating from between top level destinations prevents stacking`() {
+    val backStack = makeBackStack(Hottest)
+
+    navigateTo(backStack, Newest)
+
+    assertThat(backStack).containsExactly(Hottest, Newest).inOrder()
+
+    navigateTo(backStack, Saved)
+
+    assertThat(backStack).containsExactly(Hottest, Saved).inOrder()
+  }
+
+  @Test
+  fun `NonStackable destinations do not stack by default`() {
+    val backStack = makeBackStack(Hottest, Comments("abc123"))
+
+    navigateTo(backStack, Comments("def456"))
+
+    assertThat(backStack).containsExactly(Hottest, Comments("def456")).inOrder()
+  }
+
+  @Test
+  fun `NonStackable destinations stack when allowStacking = true`() {
+    val backStack = makeBackStack(Hottest, Comments("abc123"))
+
+    navigateTo(backStack, Comments("def456"), allowStacking = true)
+
+    assertThat(backStack).containsExactly(Hottest, Comments("abc123"), Comments("def456")).inOrder()
+  }
+
+  @Test
+  fun `Same destination cannot be stacked on itself`() {
+    val backStack = makeBackStack(Hottest, Comments("abc123"))
+
+    navigateTo(backStack, Comments("abc123"), allowStacking = true)
+
+    assertThat(backStack).containsExactly(Hottest, Comments("abc123")).inOrder()
+  }
+
+  @Test
+  fun `Same destination can be stacked with a gap in between`() {
+    val backStack = makeBackStack(Hottest, Comments("abc123"), Comments("def456"))
+
+    navigateTo(backStack, Comments("abc123"), allowStacking = true)
+
+    assertThat(backStack)
+      .containsExactly(Hottest, Comments("abc123"), Comments("def456"), Comments("abc123"))
+      .inOrder()
+  }
+}

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

@@ -0,0 +1,72 @@
+/*
+ * Copyright © 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 dev.msfjarvis.claw.core.network.SessionCookieStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import org.junit.jupiter.api.Test
+
+class SettingsViewModelTest {
+
+  @Test
+  fun `logout clears persisted and webview sessions`() {
+    val sessionCookieStore = FakeSessionCookieStore()
+    val webViewCookieStore = FakeWebViewCookieStore()
+    val viewModel = SettingsViewModel(sessionCookieStore, webViewCookieStore)
+
+    viewModel.logout()
+
+    assertThat(sessionCookieStore.cleared).isTrue()
+    assertThat(webViewCookieStore.cleared).isTrue()
+  }
+
+  @Test
+  fun `saveCookie persists username`() {
+    val sessionCookieStore = FakeSessionCookieStore()
+    val viewModel = SettingsViewModel(sessionCookieStore, FakeWebViewCookieStore())
+
+    viewModel.saveCookie("cookie=value", "alice")
+
+    assertThat(sessionCookieStore.savedCookie).isEqualTo("cookie=value")
+    assertThat(sessionCookieStore.savedUsername).isEqualTo("alice")
+  }
+
+  private class FakeSessionCookieStore : SessionCookieStore {
+    var cleared = false
+    var savedCookie: String? = null
+    var savedUsername: String? = null
+
+    override fun get(): String? = savedCookie
+
+    override fun getUsername(): String? = savedUsername
+
+    override fun set(cookie: String, username: String) {
+      savedCookie = cookie
+      savedUsername = username
+    }
+
+    override fun clear() {
+      cleared = true
+      savedCookie = null
+      savedUsername = null
+    }
+
+    override fun isLoggedIn(): Flow<Boolean> = flowOf(savedUsername != null)
+
+    override fun username(): Flow<String?> = flowOf(savedUsername)
+  }
+
+  private class FakeWebViewCookieStore : WebViewCookieStore {
+    var cleared = false
+
+    override fun clearLobstersCookies() {
+      cleared = true
+    }
+  }
+}

android/version.properties

@@ -1,5 +1,5 @@
 #
 # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
 #
-versioning-plugin.versionCode=15400
-versioning-plugin.versionName=1.54.0
+versioning-plugin.versionCode=16500
+versioning-plugin.versionName=1.65.0

api/build.gradle.kts

@@ -7,31 +7,26 @@
 import dev.msfjarvis.claw.gradle.addTestDependencies
 
 plugins {
-  id("dev.msfjarvis.claw.android-library")
-  id("dev.msfjarvis.claw.kotlin-android")
-  alias(libs.plugins.anvil)
-  alias(libs.plugins.whetstone)
+  id("dev.msfjarvis.claw.kotlin-jvm")
+  alias(libs.plugins.kotlin.serialization)
   alias(libs.plugins.dependencyAnalysis)
+  alias(libs.plugins.metro)
 }
 
-android { namespace = "dev.msfjarvis.claw.api" }
-
-anvil { generateDaggerFactories.set(true) }
-
 dependencies {
-  api(libs.dagger)
-  api(libs.javax.inject)
+  api(libs.eithernet)
+  api(libs.kotlinx.serialization.core)
   api(libs.okhttp.core)
   api(libs.retrofit)
   api(projects.model)
 
-  implementation(libs.eithernet)
   implementation(libs.eithernet.integration.retrofit)
-  implementation(libs.jsoup)
+  implementation(libs.ksoup)
+  implementation(libs.kspoon)
+  implementation(libs.retrofit.kotlinxSerializationConverter)
 
   testImplementation(libs.eithernet.test.fixtures)
+  testImplementation(libs.kotlin.reflect)
   testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.kotlinx.serialization.core)
-  testImplementation(libs.kotlinx.serialization.json)
   addTestDependencies(project)
 }

api/lint-baseline.xml

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

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

@@ -0,0 +1,91 @@
+/*
+ * Copyright © 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 com.slack.eithernet.ApiResult.Failure
+import com.slack.eithernet.ApiResult.Success
+import dev.zacsweers.metro.Inject
+import java.io.IOException
+import okhttp3.MultipartBody
+
+private const val XML_HTTP_REQUEST = "XMLHttpRequest"
+
+@Inject
+class AuthenticatedLobstersApi(private val api: LobstersApi) {
+
+  suspend fun upvoteComment(commentId: String): ApiResult<Unit, Unit> {
+    return withCSRFToken { csrfToken ->
+      api.upvoteComment(commentId, csrfToken, XML_HTTP_REQUEST, part("reason", ""))
+    }
+  }
+
+  suspend fun unvoteComment(commentId: String): ApiResult<Unit, Unit> {
+    return withCSRFToken { csrfToken ->
+      api.unvoteComment(commentId, csrfToken, XML_HTTP_REQUEST, part("reason", ""))
+    }
+  }
+
+  suspend fun reply(commentId: String, comment: String): ApiResult<Unit, Unit> {
+    return withCSRFToken { csrfToken ->
+      when (val formResponse = api.getReplyForm(commentId, csrfToken, XML_HTTP_REQUEST)) {
+        is Success -> {
+          val form = formResponse.value
+          if (!form.isValid()) {
+            ApiResult.unknownFailure(IOException("Lobsters reply form was missing required fields"))
+          } else {
+
+            api.postReply(
+              csrfToken = csrfToken,
+              requestedWith = XML_HTTP_REQUEST,
+              authenticityToken = part("authenticity_token", form.authenticityToken),
+              storyId = part("story_id", form.storyId),
+              method = part("_method", form.method),
+              parentCommentShortId = part("parent_comment_short_id", form.parentCommentShortId),
+              comment = part("comment", comment),
+              commit = part("commit", "Post"),
+            )
+          }
+        }
+        is Failure -> formResponse.toUnitFailure()
+      }
+    }
+  }
+
+  private suspend fun withCSRFToken(
+    block: suspend (String) -> ApiResult<Unit, Unit>
+  ): ApiResult<Unit, Unit> {
+    return when (val token = api.getCSRFToken()) {
+      is Success -> {
+        val value = token.value.value
+        if (value.isBlank()) {
+          ApiResult.unknownFailure(IOException("Lobsters CSRF token was empty"))
+        } else {
+          block(value)
+        }
+      }
+      is Failure -> token.toUnitFailure()
+    }
+  }
+
+  private fun ReplyForm.isValid(): Boolean =
+    authenticityToken.isNotBlank() &&
+      storyId.isNotBlank() &&
+      method.isNotBlank() &&
+      parentCommentShortId.isNotBlank()
+
+  private fun part(name: String, value: String): MultipartBody.Part =
+    MultipartBody.Part.createFormData(name, value)
+
+  private fun Failure<*>.toUnitFailure(): Failure<Unit> =
+    when (this) {
+      is Failure.ApiFailure -> ApiResult.apiFailure(error as? Unit)
+      is Failure.HttpFailure -> ApiResult.httpFailure(code, error as? Unit)
+      is Failure.NetworkFailure -> ApiResult.networkFailure(error)
+      is Failure.UnknownFailure -> ApiResult.unknownFailure(error)
+    }
+}

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

@@ -7,29 +7,91 @@
 package dev.msfjarvis.claw.api
 
 import com.slack.eithernet.ApiResult
+import com.slack.eithernet.ApiResult.Failure
+import com.slack.eithernet.ApiResult.Success
+import dev.burnoo.kspoon.annotation.Selector
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.Tag
 import dev.msfjarvis.claw.model.User
+import kotlinx.serialization.Serializable
+import okhttp3.MultipartBody
 import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Multipart
+import retrofit2.http.POST
+import retrofit2.http.Part
 import retrofit2.http.Path
 
+@Serializable class PostsPage(@Selector("li.story") val posts: List<LobstersPost> = emptyList())
+
+@Serializable class TagsPage(@Selector("ol.category_tags > li") val tags: List<Tag> = emptyList())
+
+fun ApiResult<PostsPage, Unit>.toPostsResult(): ApiResult<List<LobstersPost>, Unit> =
+  when (this) {
+    is Success -> ApiResult.success(value.posts)
+    is Failure.ApiFailure -> ApiResult.apiFailure(error)
+    is Failure.HttpFailure -> ApiResult.httpFailure(code, error)
+    is Failure.NetworkFailure -> ApiResult.networkFailure(error)
+    is Failure.UnknownFailure -> ApiResult.unknownFailure(error)
+  }
+
 /** Simple interface defining an API for lobste.rs */
 interface LobstersApi {
 
-  @GET("page/{page}.json")
-  suspend fun getHottestPosts(@Path("page") page: Int): ApiResult<List<LobstersPost>, Unit>
+  @GET("page/{page}")
+  suspend fun getHottestPosts(@Path("page") page: Int): ApiResult<PostsPage, Unit>
 
-  @GET("newest/page/{page}.json")
-  suspend fun getNewestPosts(@Path("page") page: Int): ApiResult<List<LobstersPost>, Unit>
+  @GET("newest/page/{page}")
+  suspend fun getNewestPosts(@Path("page") page: Int): ApiResult<PostsPage, Unit>
 
-  @GET("s/{postId}.json")
+  @GET("s/{postId}")
   suspend fun getPostDetails(@Path("postId") postId: String): ApiResult<LobstersPostDetails, Unit>
 
-  @GET("~{username}.json")
-  suspend fun getUser(@Path("username") username: String): ApiResult<User, Unit>
+  @GET("~{username}") suspend fun getUser(@Path("username") username: String): ApiResult<User, Unit>
 
   @GET("/") suspend fun getCSRFToken(): ApiResult<CSRFToken, Unit>
 
+  @GET("tags") suspend fun getTags(): ApiResult<TagsPage, Unit>
+
+  @Multipart
+  @POST("comments/{commentId}/upvote")
+  suspend fun upvoteComment(
+    @Path("commentId") commentId: String,
+    @Header("x-csrf-token") csrfToken: String,
+    @Header("x-requested-with") requestedWith: String,
+    @Part reason: MultipartBody.Part,
+  ): ApiResult<Unit, Unit>
+
+  @Multipart
+  @POST("comments/{commentId}/unvote")
+  suspend fun unvoteComment(
+    @Path("commentId") commentId: String,
+    @Header("x-csrf-token") csrfToken: String,
+    @Header("x-requested-with") requestedWith: String,
+    @Part reason: MultipartBody.Part,
+  ): ApiResult<Unit, Unit>
+
+  @GET("comments/{commentId}/reply")
+  suspend fun getReplyForm(
+    @Path("commentId") commentId: String,
+    @Header("x-csrf-token") csrfToken: String,
+    @Header("x-requested-with") requestedWith: String,
+  ): ApiResult<ReplyForm, Unit>
+
+  @Multipart
+  @POST("comments")
+  suspend fun postReply(
+    @Header("x-csrf-token") csrfToken: String,
+    @Header("x-requested-with") requestedWith: String,
+    @Part authenticityToken: MultipartBody.Part,
+    @Part storyId: MultipartBody.Part,
+    @Part method: MultipartBody.Part,
+    @Part parentCommentShortId: MultipartBody.Part,
+    @Part comment: MultipartBody.Part,
+    @Part commit: MultipartBody.Part,
+  ): ApiResult<Unit, Unit>
+
   companion object {
     const val BASE_URL = "https://lobste.rs"
   }

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

@@ -0,0 +1,14 @@
+/*
+ * Copyright © 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
+
+data class ReplyForm(
+  val authenticityToken: String,
+  val storyId: String,
+  val method: String,
+  val parentCommentShortId: String,
+)

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

@@ -6,18 +6,18 @@
  */
 package dev.msfjarvis.claw.api.converters
 
+import com.fleeksoft.ksoup.Ksoup
 import dev.msfjarvis.claw.api.CSRFToken
 import dev.msfjarvis.claw.api.LobstersApi
 import java.lang.reflect.Type
 import okhttp3.ResponseBody
-import org.jsoup.Jsoup
 import retrofit2.Converter
 import retrofit2.Retrofit
 
 object CSRFTokenConverter : Converter<ResponseBody, CSRFToken> {
   override fun convert(value: ResponseBody): CSRFToken {
     val token =
-      Jsoup.parse(value.string(), LobstersApi.BASE_URL)
+      Ksoup.parse(value.string(), baseUri = LobstersApi.BASE_URL)
         .select("meta[name=\"csrf-token\"]")
         .firstOrNull()
         ?.attr("content")
@@ -30,8 +30,8 @@ object CSRFTokenConverter : Converter<ResponseBody, CSRFToken> {
       type: Type,
       annotations: Array<out Annotation>,
       retrofit: Retrofit,
-    ): Converter<ResponseBody, CSRFToken> {
-      return CSRFTokenConverter
+    ): Converter<ResponseBody, *>? {
+      return if (type == CSRFToken::class.java) CSRFTokenConverter else null
     }
   }
 }

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

@@ -0,0 +1,40 @@
+/*
+ * Copyright © 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 com.fleeksoft.ksoup.Ksoup
+import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.api.ReplyForm
+import java.lang.reflect.Type
+import okhttp3.ResponseBody
+import retrofit2.Converter
+import retrofit2.Retrofit
+
+object ReplyFormConverter : Converter<ResponseBody, ReplyForm> {
+  override fun convert(value: ResponseBody): ReplyForm {
+    val document = Ksoup.parse(value.string(), baseUri = LobstersApi.BASE_URL)
+    fun inputValue(name: String): String =
+      document.select("input[name=\"$name\"]").firstOrNull()?.attr("value").orEmpty()
+
+    return ReplyForm(
+      authenticityToken = inputValue("authenticity_token"),
+      storyId = inputValue("story_id"),
+      method = inputValue("_method"),
+      parentCommentShortId = inputValue("parent_comment_short_id"),
+    )
+  }
+
+  object Factory : Converter.Factory() {
+    override fun responseBodyConverter(
+      type: Type,
+      annotations: Array<out Annotation>,
+      retrofit: Retrofit,
+    ): Converter<ResponseBody, *>? {
+      return if (type == ReplyForm::class.java) ReplyFormConverter else null
+    }
+  }
+}

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

@@ -6,21 +6,21 @@
  */
 package dev.msfjarvis.claw.api.converters
 
+import com.fleeksoft.ksoup.Ksoup
+import com.fleeksoft.ksoup.nodes.Element
+import com.fleeksoft.ksoup.select.Elements
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.model.LobstersPost
 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)
+    return Ksoup.parse(value.string(), baseUri = LobstersApi.BASE_URL)
+      .select("div.story_liner.h-entry")
+      .map(::parsePost)
   }
 
   private fun parsePost(elem: Element): LobstersPost {
@@ -31,7 +31,8 @@ object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
     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 = elem.select("div.byline > a.u-author").text()
+    val submitter =
+      elem.select("div.byline > a[href^=/~]:not([tabindex]):not([aria-hidden=true])").text()
     val userIsAuthor =
       (elem.select("div.byline > span").first()?.text() ?: "").contains(
         "authored",

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

@@ -0,0 +1,29 @@
+/*
+ * Copyright © 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 java.lang.reflect.Type
+import kotlin.Unit
+import okhttp3.ResponseBody
+import retrofit2.Converter
+import retrofit2.Retrofit
+
+object UnitConverter : Converter<ResponseBody, Unit> {
+  override fun convert(value: ResponseBody) {
+    value.close()
+  }
+
+  object Factory : Converter.Factory() {
+    override fun responseBodyConverter(
+      type: Type,
+      annotations: Array<out Annotation>,
+      retrofit: Retrofit,
+    ): Converter<ResponseBody, *>? {
+      return if (type == Unit::class.java) UnitConverter else null
+    }
+  }
+}

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

@@ -6,24 +6,32 @@
  */
 package dev.msfjarvis.claw.api.injection
 
-import com.deliveryhero.whetstone.app.ApplicationScope
+import com.fleeksoft.ksoup.Ksoup
 import com.slack.eithernet.integration.retrofit.ApiResultCallAdapterFactory
 import com.slack.eithernet.integration.retrofit.ApiResultConverterFactory
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Module
-import dagger.Provides
-import dagger.multibindings.IntKey
-import dagger.multibindings.IntoMap
+import dev.burnoo.kspoon.Kspoon
+import dev.msfjarvis.claw.api.AuthenticatedLobstersApi
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.api.LobstersSearchApi
 import dev.msfjarvis.claw.api.converters.CSRFTokenConverter
+import dev.msfjarvis.claw.api.converters.ReplyFormConverter
 import dev.msfjarvis.claw.api.converters.SearchConverter
-import javax.inject.Named
-import javax.inject.Qualifier
+import dev.msfjarvis.claw.api.converters.UnitConverter
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.BindingContainer
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.IntKey
+import dev.zacsweers.metro.IntoMap
+import dev.zacsweers.metro.Named
+import dev.zacsweers.metro.Provides
+import dev.zacsweers.metro.Qualifier
+import dev.zacsweers.metro.SingleIn
+import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.OkHttpClient
 import retrofit2.CallAdapter
 import retrofit2.Converter
 import retrofit2.Retrofit
+import retrofit2.converter.kotlinx.serialization.asConverterFactory
 import retrofit2.create
 
 /**
@@ -33,14 +41,15 @@ import retrofit2.create
  * 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)
+@BindingContainer
+@ContributesTo(AppScope::class)
 object RetrofitModule {
   @Provides
+  @SingleIn(AppScope::class)
   fun provideRetrofit(
     client: OkHttpClient,
-    converterFactories: Map<Int, @JvmSuppressWildcards Converter.Factory>,
-    callAdapterFactories: Map<Int, @JvmSuppressWildcards CallAdapter.Factory>,
+    converterFactories: Map<Int, Converter.Factory>,
+    callAdapterFactories: Map<Int, CallAdapter.Factory>,
     @Named("LobstersURL") baseUrl: String,
   ): Retrofit {
     return Retrofit.Builder()
@@ -53,10 +62,11 @@ object RetrofitModule {
 
   @Provides
   @SearchApi
+  @SingleIn(AppScope::class)
   fun provideSearchApiRetrofit(
     client: OkHttpClient,
-    @SearchApi converterFactories: List<@JvmSuppressWildcards Converter.Factory>,
-    callAdapterFactories: Map<Int, @JvmSuppressWildcards CallAdapter.Factory>,
+    @SearchApi converterFactories: List<Converter.Factory>,
+    callAdapterFactories: Map<Int, CallAdapter.Factory>,
     @Named("LobstersURL") baseUrl: String,
   ): Retrofit {
     return Retrofit.Builder()
@@ -68,9 +78,17 @@ object RetrofitModule {
       .build()
   }
 
-  @Provides fun provideApi(retrofit: Retrofit): LobstersApi = retrofit.create()
+  @Provides
+  @SingleIn(AppScope::class)
+  fun provideApi(retrofit: Retrofit): LobstersApi = retrofit.create()
 
   @Provides
+  @SingleIn(AppScope::class)
+  fun provideAuthenticatedApi(api: LobstersApi): AuthenticatedLobstersApi =
+    AuthenticatedLobstersApi(api)
+
+  @Provides
+  @SingleIn(AppScope::class)
   fun provideSearchApi(@SearchApi retrofit: Retrofit): LobstersSearchApi = retrofit.create()
 
   @Provides
@@ -78,19 +96,40 @@ object RetrofitModule {
   @IntoMap
   fun provideApiResultConverter(): Converter.Factory = ApiResultConverterFactory
 
+  @Provides
+  @IntKey(1)
+  @IntoMap
+  fun provideCSRFTokenConverter(): Converter.Factory = CSRFTokenConverter.Factory
+
+  @Provides
+  @IntKey(2)
+  @IntoMap
+  fun provideReplyFormConverter(): Converter.Factory = ReplyFormConverter.Factory
+
+  @Provides
+  @IntKey(3)
+  @IntoMap
+  fun provideUnitConverter(): Converter.Factory = UnitConverter.Factory
+
+  @Provides
+  @IntKey(4)
+  @IntoMap
+  fun provideKspoonConverter(): Converter.Factory =
+    Kspoon {
+        parse = { html -> Ksoup.parse(html, baseUri = LobstersApi.BASE_URL) }
+        coerceInputValues = true
+      }
+      .toFormat()
+      .asConverterFactory("text/html".toMediaType())
+
   @Provides
   @IntKey(0)
   @IntoMap
   fun provideApiResultCallAdapter(): CallAdapter.Factory = ApiResultCallAdapterFactory
 
-  @Provides
-  @IntKey(Int.MAX_VALUE)
-  @IntoMap
-  fun provideCSRFTokenConverter(): Converter.Factory = CSRFTokenConverter.Factory
-
   @Provides
   @SearchApi
-  fun provideConverters(): List<@JvmSuppressWildcards Converter.Factory> =
+  fun provideConverters(): List<Converter.Factory> =
     listOf(ApiResultConverterFactory, SearchConverter.Factory)
 
   @Provides @Named("LobstersURL") fun provideLobstersUrl(): String = LobstersApi.BASE_URL

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright © 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.Failure
+import java.io.IOException
+import java.net.HttpURLConnection
+
+@Suppress("NOTHING_TO_INLINE") // We inline this to eliminate the stacktrace frame.
+inline fun <T : Any> Failure.HttpFailure<T>.toError(): Throwable =
+  when (code) {
+    HttpURLConnection.HTTP_NOT_FOUND -> IOException("Story was removed by moderator")
+    HttpURLConnection.HTTP_INTERNAL_ERROR,
+    HttpURLConnection.HTTP_BAD_GATEWAY,
+    HttpURLConnection.HTTP_UNAVAILABLE -> IOException("It appears lobste.rs is currently down")
+    else -> IOException("API returned an invalid response")
+  }

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

@@ -6,13 +6,16 @@
  */
 package dev.msfjarvis.claw.api
 
+import com.fleeksoft.ksoup.Ksoup
 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.burnoo.kspoon.Kspoon
 import dev.msfjarvis.claw.model.LobstersPostDetails
 import dev.msfjarvis.claw.model.User
 import dev.msfjarvis.claw.util.TestUtils.assertIs
+import java.time.Instant
+import java.time.format.DateTimeFormatter
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
 
@@ -24,23 +27,130 @@ class ApiTest {
   @Test
   fun `api gets correct number of items`() = runTest {
     val posts = api.getHottestPosts(1)
-    assertIs<Success<List<LobstersPost>>>(posts)
-    assertThat(posts.value).hasSize(25)
+    assertIs<Success<PostsPage>>(posts)
+    assertThat(posts.value.posts).hasSize(25)
   }
 
   @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(1)
+    assertIs<Success<PostsPage>>(posts)
+    val commentsOnlyPosts = posts.value.posts.asSequence().filter { it.url.isEmpty() }.toSet()
+    assertThat(commentsOnlyPosts).hasSize(0)
+  }
+
+  @Test
+  fun `api parses hottest HTML fixture fields`() = runTest {
+    val posts = api.getHottestPosts(1)
+    assertIs<Success<PostsPage>>(posts)
+
+    val firstPost = posts.value.posts[0]
+    assertThat(firstPost.shortId).isEqualTo("jp3nva")
+    assertThat(firstPost.title).isEqualTo("You probably don't need Yocto, and that's fine")
+    assertThat(firstPost.submitter).isEqualTo("rw-rw-rw-")
+    assertThat(firstPost.commentCount).isEqualTo(9)
+    assertThat(firstPost.commentsUrl)
+      .isEqualTo("https://lobste.rs/s/jp3nva/you_probably_don_t_need_yocto_s_fine")
+    assertThat(firstPost.tags).containsExactly("linux")
+    assertThat(firstPost.userIsAuthor).isTrue()
+    assertThat(firstPost.createdAt).isEqualTo("2026-05-29T09:08:12Z")
+    DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(firstPost.createdAt)
+
+    val secondPost = posts.value.posts[1]
+    assertThat(secondPost.shortId).isEqualTo("lc26ar")
+    assertThat(secondPost.title).isEqualTo("SQLite Does Not Accept Agentic Code")
+    assertThat(secondPost.submitter).isEqualTo("hoistbypetard")
+    assertThat(secondPost.commentCount).isEqualTo(15)
+    assertThat(secondPost.commentsUrl)
+      .isEqualTo("https://lobste.rs/s/lc26ar/sqlite_does_not_accept_agentic_code")
+    assertThat(secondPost.tags).containsExactly("vibecoding")
+    assertThat(secondPost.userIsAuthor).isFalse()
+
+    val noCommentsPost = posts.value.posts.first { it.shortId == "1fkt8w" }
+    assertThat(noCommentsPost.title).isEqualTo("Patching my guitar amp's firmware")
+    assertThat(noCommentsPost.submitter).isEqualTo("mcf")
+    assertThat(noCommentsPost.commentCount).isEqualTo(0)
+    assertThat(noCommentsPost.commentsUrl)
+      .isEqualTo("https://lobste.rs/s/1fkt8w/patching_my_guitar_amp_s_firmware")
+    assertThat(noCommentsPost.tags).containsExactly("hardware", "reversing")
+    assertThat(noCommentsPost.userIsAuthor).isTrue()
+  }
+
+  @Test
+  fun `api gets newest posts`() = runTest {
+    val posts = api.getNewestPosts(1)
+    assertIs<Success<PostsPage>>(posts)
+    assertThat(posts.value.posts).hasSize(25)
   }
 
   @Test
   fun `post details with comments`() = runTest {
     val postDetails = api.getPostDetails("tdfoqh")
     assertIs<Success<LobstersPostDetails>>(postDetails)
-    assertThat(postDetails.value.comments).hasSize(10)
+    val comments = postDetails.value.comments
+    assertThat(comments).hasSize(10)
+    assertThat(comments.first().user).isEqualTo("dpercy")
+    assertThat(comments.first { it.shortId == "pcvbcd" }.score).isEqualTo(2)
+    assertThat(comments.first().comment).contains("Maybe take the max, instead of the sum?")
+    assertThat(comments.first { it.shortId == "pcvbcd" }.parentComment).isEqualTo("m3wyu5")
+    assertThat(comments.first { it.shortId == "lqqn3a" }.parentComment).isEqualTo("owddle")
+  }
+
+  @Test
+  fun `comments without visible upvoter count have one point from the author`() {
+    val kspoon = Kspoon {
+      parse = { html -> Ksoup.parse(html, baseUri = LobstersApi.BASE_URL) }
+      coerceInputValues = true
+    }
+
+    val postDetails =
+      kspoon.parse<LobstersPostDetails>(
+        """
+        <ol class="stories">
+          <li class="story" data-shortid="story1">
+            <span class="link h-cite"><a href="/s/story1/test">Test story</a></span>
+            <div class="byline">
+              <a class="u-author" href="/~/submitter">submitter</a>
+              <time data-at-unix="1710000000"></time>
+            </div>
+          </li>
+        </ol>
+        <ol class="comments">
+          <li class="comments_subtree">
+            <div class="comment" data-shortid="abc123">
+              <div class="voters"></div>
+              <div class="details">
+                <div class="byline">
+                  <a href="/~/author">author</a>
+                  <a href="/c/abc123"><time data-at-unix="1710000000"></time></a>
+                </div>
+                <div class="comment_text"><p>Hello</p></div>
+              </div>
+            </div>
+          </li>
+        </ol>
+        """
+          .trimIndent()
+      )
+
+    assertThat(postDetails.comments.single().score).isEqualTo(1)
+  }
+
+  @Test
+  fun `edited comments expose a single timestamp and edited state`() = runTest {
+    val postDetails = api.getPostDetails("tdfoqh")
+    assertIs<Success<LobstersPostDetails>>(postDetails)
+
+    val editedComment = postDetails.value.comments.first { it.shortId == "pcvbcd" }
+    assertThat(editedComment.edited).isTrue()
+    assertThat(Instant.from(editedComment.timestamp).epochSecond).isEqualTo(1658588955)
+  }
+
+  @Test
+  fun `post details preserves upvoted comments`() = runTest {
+    val postDetails = wrapper.upvotedPostDetails
+    assertThat(postDetails.comments.filter { it.isUpvoted }.map { it.shortId })
+      .containsExactly("ncdsfc")
   }
 
   @Test
@@ -56,7 +166,27 @@ class ApiTest {
     assertIs<Success<CSRFToken>>(token)
     assertThat(token.value.value)
       .isEqualTo(
-        "OZWykgFemPVeOSNmB53-ccKXe458X7xCInO1-qzFU6nk_9RCSrSQqS9OPmA5_pyy8qD3IYAIZ7XfAM3gdhJpkQ"
+        "dvJ8r_CkOImcHQ5ZLUWlJeQVoPEPQ3rK85DNgiZJcehafqwYP8jESW8AhMf0uQGLqqLbsarYiISCghnDaUd6wA"
       )
   }
+
+  @Test
+  fun `retrieve tags`() = runTest {
+    val tags = api.getTags()
+    assertIs<Success<TagsPage>>(tags)
+    assertThat(tags.value.tags).isNotEmpty()
+    val rubyTag = tags.value.tags.first { it.tag == "ruby" }
+    assertThat(rubyTag.description).isEqualTo("Ruby programming")
+    assertThat(rubyTag.privileged).isFalse()
+    assertThat(rubyTag.active).isTrue()
+    assertThat(rubyTag.category).isEmpty()
+    assertThat(rubyTag.isMedia).isFalse()
+    assertThat(rubyTag.hotnessMod).isEqualTo(0.0)
+
+    val newsTag = tags.value.tags.first { it.tag == "news" }
+    assertThat(newsTag.active).isFalse()
+
+    val videoTag = tags.value.tags.first { it.tag == "video" }
+    assertThat(videoTag.isMedia).isTrue()
+  }
 }

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

@@ -6,44 +6,79 @@
  */
 package dev.msfjarvis.claw.api
 
+import com.fleeksoft.ksoup.Ksoup
 import com.slack.eithernet.ApiResult.Companion.success
 import com.slack.eithernet.test.EitherNetController
 import com.slack.eithernet.test.enqueue
+import dev.burnoo.kspoon.Kspoon
 import dev.msfjarvis.claw.api.converters.CSRFTokenConverter
-import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
 import dev.msfjarvis.claw.model.User
 import dev.msfjarvis.claw.util.TestUtils.getResource
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonNamingStrategy
-import okhttp3.MediaType
-import okhttp3.ResponseBody
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.ResponseBody.Companion.toResponseBody
 
-@OptIn(ExperimentalSerializationApi::class)
 class ApiWrapper(controller: EitherNetController<LobstersApi>) {
-  private val json = Json {
-    ignoreUnknownKeys = true
-    namingStrategy = JsonNamingStrategy.SnakeCase
+  private val kspoon = Kspoon {
+    parse = { html -> Ksoup.parse(html, baseUri = LobstersApi.BASE_URL) }
+    coerceInputValues = true
   }
-  private val hottest: List<LobstersPost> = json.decodeFromString(getResource("hottest.json"))
+  private val postsPage: PostsPage = kspoon.parse<PostsPage>(getResource("hottest_page.html"))
   private val postDetails: LobstersPostDetails =
-    json.decodeFromString(getResource("post_details_tdfoqh.json"))
-  private val user: User = json.decodeFromString(getResource("msfjarvis.json"))
+    kspoon.parse(getResource("post_details_tdfoqh.html"))
+  val upvotedPostDetails: LobstersPostDetails =
+    kspoon.parse(getResource("post_details_upvoted.html"))
+  private val user: User = kspoon.parse(getResource("msfjarvis.html"))
+  private val tags: TagsPage = kspoon.parse(getResource("tags.html"))
 
   val api = controller.api
+  val authenticatedApi = AuthenticatedLobstersApi(api)
 
   init {
-    controller.enqueue(LobstersApi::getHottestPosts) { success(hottest) }
-    controller.enqueue(LobstersApi::getHottestPosts) { success(hottest) }
+    controller.enqueue(LobstersApi::getHottestPosts) { success(postsPage) }
+    controller.enqueue(LobstersApi::getHottestPosts) { success(postsPage) }
+    controller.enqueue(LobstersApi::getHottestPosts) { success(postsPage) }
+    controller.enqueue(LobstersApi::getNewestPosts) { success(postsPage) }
     controller.enqueue(LobstersApi::getPostDetails) { success(postDetails) }
     controller.enqueue(LobstersApi::getUser) { success(user) }
+    controller.enqueue(LobstersApi::getTags) { success(tags) }
     controller.enqueue(LobstersApi::getCSRFToken) {
       success(
         CSRFTokenConverter.convert(
-          ResponseBody.create(MediaType.get("text/html"), getResource("csrf_page.html"))
+          getResource("csrf_page.html").toResponseBody("text/html".toMediaType())
         )
       )
     }
+    controller.enqueue(LobstersApi::getCSRFToken) {
+      success(
+        CSRFTokenConverter.convert(
+          getResource("csrf_page.html").toResponseBody("text/html".toMediaType())
+        )
+      )
+    }
+    controller.enqueue(LobstersApi::getCSRFToken) {
+      success(
+        CSRFTokenConverter.convert(
+          getResource("csrf_page.html").toResponseBody("text/html".toMediaType())
+        )
+      )
+    }
+    controller.enqueue(LobstersApi::getCSRFToken) {
+      success(
+        CSRFTokenConverter.convert(
+          getResource("csrf_page.html").toResponseBody("text/html".toMediaType())
+        )
+      )
+    }
+    controller.enqueue(LobstersApi::upvoteComment) { success(Unit) }
+    controller.enqueue(LobstersApi::unvoteComment) { success(Unit) }
+    controller.enqueue(LobstersApi::getReplyForm) {
+      success(
+        dev.msfjarvis.claw.api.converters.ReplyFormConverter.convert(
+          getResource("reply_form.html").toResponseBody("text/html".toMediaType())
+        )
+      )
+    }
+    controller.enqueue(LobstersApi::postReply) { success(Unit) }
   }
 }

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

@@ -0,0 +1,39 @@
+/*
+ * Copyright © 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.Success
+import com.slack.eithernet.test.newEitherNetController
+import dev.msfjarvis.claw.util.TestUtils.assertIs
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
+
+class AuthenticatedLobstersApiTest {
+  private val wrapper = ApiWrapper(newEitherNetController())
+  private val authenticatedApi = wrapper.authenticatedApi
+
+  @Test
+  fun `upvote comment succeeds`() = runTest {
+    val result = authenticatedApi.upvoteComment("0unzyg")
+
+    assertIs<Success<Unit>>(result)
+  }
+
+  @Test
+  fun `unvote comment succeeds`() = runTest {
+    val result = authenticatedApi.unvoteComment("0unzyg")
+
+    assertIs<Success<Unit>>(result)
+  }
+
+  @Test
+  fun `reply succeeds`() = runTest {
+    val result = authenticatedApi.reply("edtrox", "Thanks for the details!")
+
+    assertIs<Success<Unit>>(result)
+  }
+}