feat(release): bump version

I'm giving up hope on their paging integration ever shipping

.gitattributes

@@ -1,5 +1,5 @@
 * text=auto eol=lf
-**/dependencies/** linguist-generated
-**/clawicons/** linguist-generated
+**/*.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

@@ -1,12 +1,17 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base",
+    "config:recommended",
     ":dependencyDashboard",
     "helpers:pinGitHubActionDigests",
     "github>msfjarvis/shared-workflows//renovate/automerge"
   ],
   "branchConcurrentLimit": 15,
+  "github-actions": {
+    "fileMatch": [
+       ".github/reusable-workflows/.+\\.ya?ml$",
+    ],
+  },
   "packageRules": [
     {
       matchDatasources: [
@@ -20,43 +25,50 @@
       ],
     },
     {
-      "matchPackageNames": [
-        "androidx.compose.compiler:compiler",
+      "matchDepNames": [
         "com.google.devtools.ksp",
         "dev.drewhamilton.poko",
         "org.jetbrains.kotlin:kotlin-gradle-plugin",
+        "org.jetbrains.kotlin.plugin.compose",
         "org.jetbrains.kotlin.plugin.serialization",
       ],
       "groupName": "Kotlin and Compose",
     },
     {
-      "matchPackagePatterns": [
-        "^androidx.*",
+      "matchPackageNames": [
+        "/^androidx.*/",
       ],
       "groupName": "AndroidX"
     },
     {
-      "matchPackagePatterns": [
-        "^io.sentry",
-        "^sentry",
+      "matchPackageNames": [
+        "/^io.sentry/",
+        "/^sentry/",
       ],
       "groupName": "Sentry"
     },
     {
-      "matchPackagePatterns": [
-        "^com.squareup.anvil"
+      "matchPackageNames": [
+        "/^com.squareup.anvil/"
       ],
       "allowedVersions": "!/.*-1-8$/",
     },
     {
-      "matchPackagePatterns": [
-        "^androidx.glance",
+      "matchPackageNames": [
+        "/^androidx.glance/",
       ],
       "allowedVersions": "<=1.0.0",
     },
-  ],
-  "regexManagers": [
     {
+      "matchPackageNames": [
+        "/.*aboutlibraries.*/",
+      ],
+      "allowedVersions": "<11.3.0",
+    },
+  ],
+  "customManagers": [
+    {
+      "customType": "regex",
       "fileMatch": [
         "SpotlessPlugin\.kt$"
       ],
@@ -67,16 +79,5 @@
       "depNameTemplate": "com.facebook:ktfmt",
       "registryUrlTemplate": "https://repo1.maven.org/maven2/",
     },
-    {
-      "fileMatch": [
-        "gradle/libs.versions.toml"
-      ],
-      "matchStrings": [
-        "composeCompiler = \"(?<currentValue>.*)\""
-      ],
-      "datasourceTemplate": "maven",
-      "depNameTemplate": "androidx.compose.compiler:compiler",
-      "registryUrlTemplate": "https://maven.google.com",
-    },
   ],
 }

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

@@ -0,0 +1,47 @@
+name: 'Setup Gradle'
+description: 'Checks out the repository and sets up Java and Gradle'
+inputs:
+  token:
+    description: 'token input for actions/checkout'
+    required: false
+    default: ${{ github.token }}
+  fetch-depth:
+    description: 'fetch-depth input for actions/checkout'
+    required: false
+    default: 1
+  cache-read-only:
+    description: 'cache-read-only input for gradle/actions/setup-gradle'
+    required: false
+    default: ${{ github.event.repository != null && github.ref_name != github.event.repository.default_branch }}
+  dependency-graph:
+    description: 'dependency-graph input for gradle/actions/setup-gradle'
+    required: false
+    default: 'disabled'
+  persist-credentials:
+    description: 'Control the actions/checkout persist-credentials setting'
+    required: false
+    default: false
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout repository
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      with:
+        fetch-depth: ${{ inputs.fetch-depth }}
+        token: ${{ inputs.token }}
+        lfs: true
+        persist-credentials: ${{ inputs.persist-credentials }}
+
+    - name: Set up JDK
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      with:
+        distribution: temurin
+        java-version: 23
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@94baf225fe0a508e581a564467443d0e2379123b # v4
+      with:
+        add-job-summary: always
+        cache-read-only: ${{ inputs.cache-read-only }}
+        dependency-graph: ${{ inputs.dependency-graph }}
+        validate-wrappers: true

.github/workflows/ci.yml

@@ -18,37 +18,27 @@ jobs:
   check:
     runs-on: macos-14
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - name: Setup build environment
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
       with:
         fetch-depth: 0
-
-    - name: Set up JDK
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
-      with:
         cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-        gradle-home-cache-cleanup: true
-        add-job-summary: always
         dependency-graph: generate-and-submit
 
     - name: Check changelog format
-      uses: mindsers/changelog-reader-action@b97ce03a10d9bdbb07beb491c76a5a01d78cd3ef # v2.2.2
+      uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
       with:
         path: ./CHANGELOG.md
         validation_level: error
 
     - name: Run unit tests
-      run: ./gradlew --no-configuration-cache --stacktrace check -PslimTests
+      run: ./gradlew --no-configuration-cache --stacktrace :build-logic:check check -PslimTests
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: (Fail-only) Upload test report
       if: failure()
-      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+      uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
       with:
           name: Test report
           path: '**/build/reports/tests/**'
@@ -60,47 +50,12 @@ jobs:
       - check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4
+        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4
         with:
           base-ref: refs/heads/main
           head-ref: ${{ github.ref }}
-
-  deploy-release-snapshot:
-    runs-on: macos-14
-    if: "github.event_name == 'push' && github.event.ref == 'refs/heads/main'"
-    needs:
-      - check
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Set up JDK
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
-      with:
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-        gradle-home-cache-cleanup: true
-        add-job-summary: always
-        dependency-graph: generate-and-submit
-
-    - name: Build release APK
-      run: |
-        ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
-
-        ./gradlew --no-configuration-cache --stacktrace collectReleaseApks
-
-        ./scripts/signing-cleanup.sh
-        ./scripts/deploy-snapshot.sh
-      env:
-        AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}

.github/workflows/code_quality_analysis.yml

@@ -1,75 +0,0 @@
-name: Code quality analysis
-
-on:
-  push:
-    branches:
-      - main
-      - renovate/**
-  schedule:
-    - cron: '31 7 * * 3'
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-permissions:
-  contents: read
-  security-events: write
-
-jobs:
-  codeql:
-    name: CodeQL
-    runs-on: macos-14
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-    - name: Set up JDK
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
-      with:
-        cache-read-only: true
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
-      with:
-        languages: java
-        tools: latest
-        queries: +security-extended
-
-    - name: Build project
-      shell: bash
-      run: |
-        ./gradlew assembleDebug assembleRelease
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
-      with:
-        category: "/language:java"
-  mobsfscan:
-    name: MobSF
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Setup python
-        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5
-        with:
-          python-version: 3.8
-
-      - name: Run mobsfscan
-        uses: MobSF/mobsfscan@e29e85c36fa1aa950d7f1b1064345d94a70b2a28
-        with:
-          args: . --sarif --output results.sarif || true
-
-      - name: Upload mobsfscan report
-        uses: github/codeql-action/upload-sarif@8a470fddafa5cbb6266ee11b37ef4d8aae19c571 # v3.24.6
-        with:
-          sarif_file: results.sarif

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
       inAppUpdatePriority:
         description: 'In app update priority (0-5)'
         type: number
-        default: "0"
+        default: 0
         required: false
 
 concurrency:
@@ -15,23 +15,13 @@ jobs:
   publish-google-play-release:
     runs-on: macos-14
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - name: Setup build environment
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
-
-    - name: Set up JDK
-      uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
-      with:
         cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-        gradle-home-cache-cleanup: true
+        persist-credentials: true
 
     - name: Set up Git author
       shell: bash
@@ -54,7 +44,7 @@ jobs:
         echo VERSION="${VERSION}" >> $GITHUB_ENV
 
     - name: Update changelog
-      uses: msfjarvis/keep-a-changelog-new-release@bf43ae42f4e42f137572950af426efcf6e777207 # 2.1.0
+      uses: msfjarvis/keep-a-changelog-new-release@e60399f488b25149c0963a4e22fff928a9277ce7 # v2.2.0
       with:
         tag: v${{ env.VERSION }}
         version: ${{ env.VERSION }}
@@ -69,15 +59,16 @@ jobs:
       env:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
-        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle -PsentryUploadMappings
+        ./gradlew --no-configuration-cache assembleRelease collectReleaseApks collectReleaseBundle -PenableSentry
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh
 
     - name: Get changelog entry
       id: changelog_reader
-      uses: mindsers/changelog-reader-action@b97ce03a10d9bdbb07beb491c76a5a01d78cd3ef # v2.2.2
+      uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
       with:
         version: ${{ env.VERSION }}
         path: ./CHANGELOG.md
@@ -118,6 +109,5 @@ jobs:
 
         # Start the next development iteration
         ./gradlew -q --no-configuration-cache bumpSnapshot
-        truncate -s 0 distribution/whatsnew/whatsnew-en-GB # Clear changelog
         git commit -am 'feat(release): start next development iteration'
         git push -u origin

.github/workflows/tramline-release.yml

@@ -16,35 +16,26 @@ jobs:
   signed-build:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
-
-      - name: Set up JDK
-        uses: actions/setup-java@9704b39bf258b59bc04b50fa2dd55e9ed76b47a8 # v4.1.0
-        with:
-          distribution: temurin
-          java-version: 18
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
+      - name: Setup build environment
+        uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
         with:
           cache-read-only: true
-          gradle-home-cache-cleanup: true
 
       - name: Build release app
         run: |
           ./scripts/setup-age.sh
           ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
-          ./gradlew --no-configuration-cache --stacktrace collectReleaseBundle
+          ./gradlew --no-configuration-cache --stacktrace assembleRelease 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 }}
 
       - name: Upload app bundle
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
+        uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
         with:
           name: release-aab
           path: android/build/outputs/bundle/release/android-release.aab

.gitignore

@@ -247,3 +247,4 @@ keystore.properties
 distribution/
 screenshots/
 claw-export.json
+.kotlin/

.idea/ktfmt.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KtfmtSettings">
+    <option name="enableKtfmt" value="Enabled" />
     <option name="enabled" value="true" />
     <option name="uiFormatterStyle" value="Google (internal)" />
   </component>

CHANGELOG.md

@@ -7,443 +7,549 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.54.0] - 2025-01-31
+
+### Fixed
+
+- Upgrade to Compose 2025-01 releases
+- Upgrade all dependencies
+
+## [1.53.0] - 2024-11-30
+
+### Fixed
+
+- Tablet users can now navigate between hottest/newest/saved posts again
+
+## [1.52.0] - 2024-11-26
+
+### Added
+
+- A brand new tablet-specific UI — Thanks [@ThanaReka](https://github.com/@ThanaReka)
+- Usernames of story authors are highlighted in comments
+
+### Fixed
+
+- Add a workaround for rare crashes while loading SQLite with older devices
+- Fix comments page resetting collapsed state while scrolling
+- Images are cached for longer on disk
+- Navigation bar now renders a solid background on API levels 31 and below
+
+## [1.51.0] - 2024-09-22
+
+### Fixed
+
+- Pull to refresh indicator is no longer hiding behind the top app bar
+- User profile page correctly renders contents below the top app bar
+- Revert unread comment handling changes that caused false positives
+
+## [1.50.0] - 2024-08-30
+
+### Fixed
+
+- Search bar draws under the status bar when hiding keyboard
+- Bottom of the comments page is cut off by the navigation bar
+- Rare crash in comments page
+
+## [1.49.0] - 2024-08-29
+
+### Added
+
+- Opening posts you have previously seen will show the number of new comments since last visit
+
+### Fixed
+
+- Saving posts no longer triggers a page refresh that invalidates scroll position
+
+### Changed
+
+- Change submitter text to 'authored' when applicable
+- Unread comments now have a brighter background rather than a text badge
+- Bottom navigation bar has been redesigned
+
+## [1.48.0] - 2024-06-05
+
+### Added
+
+- Swiping a post from left to right now offers a share action
+
+### Fixed
+
+- Try to workaround an infrequent crash when scrolling hottest/newest posts
+
+### Changed
+
+- Upgrade to Kotlin 2.0.0
+- Upgrade to Compose May beta releases
+
+## [1.47.0] - 2024-05-14
+
+### Changed
+
+- Bring back dividers between posts (I regret my earlier choices)
+- Upgrade to Compose May stable releases
+
+### Fixed
+
+- Navigating to user profiles now works when invoked from the search
+  results page
+- Fix occasional crashes due to the app incorrectly trying to open
+  multiple database connections
+
+## [1.46.0] - 2024-04-24
+
+### Changed
+
+- Remove dividers between posts
+- Post titles in lists are now truncated to be a single line
+
+### Fixed
+
+- Disable logging of network errors to Sentry
+- Add potential workaround for navigation-related crashes
+
+## [1.45.0] - 2024-04-24
+
+### Changed
+
+- Upgrade to Compose April releases
+- Story items are now more compact so you can see more items
+  on your screen.
+
+### Fixed
+
+- Fixed a crash when clicking an item on the bottom navigation bar
+  too quickly
+- Removed buggy deeplinks
+- Clicking a username now correctly navigates to the right page in-app
+
+## [1.44.0] - 2024-03-19
+
+### Fixed
+
+- Fixed a bug in the database code that was triggering crashes for
+  a subset of upgrading users
+
+## [1.43.0] - 2024-03-17
+
+### Fixed
+
+- Fix crash when trying to open a comments-only post from
+  the home screen widget
+
+## [1.42.0] - 2024-03-16
+
+### Fixed
+
+- Adapt to changes in lobste.rs API
+
 ## [1.41.0] - 2024-03-07
 
 ### Fixed
 
-*   Downgrade dependency that was pulling in extraneous storage
-    permissions which the app does not require.
+- Downgrade dependency that was pulling in extraneous storage
+  permissions which the app does not require.
 
 ## [1.40.0] - 2024-03-07
 
 ### Changed
 
-*   Update to Compose March releases
-*   Improve performance of frequently invoked database queries
-*   Refactor UI data model to improve state handling
-*   Make saved posts update in the background more often
-*   Consolidate widget display logic
-*   Rework some theming logic to align with new Material guidelines
+- Update to Compose March releases
+- Improve performance of frequently invoked database queries
+- Refactor UI data model to improve state handling
+- Make saved posts update in the background more often
+- Consolidate widget display logic
+- Rework some theming logic to align with new Material guidelines
 
 ## [1.39.0] - 2024-01-23
 
 ### Changed
 
-*   Add HTML bookmarks as an export format
-*   Rework widget item layout for consistent touch targets
-*   Add attribution for libraries used in the app
-*   Redesign settings screen
-*   Update to Compose December releases
+- Add HTML bookmarks as an export format
+- Rework widget item layout for consistent touch targets
+- Add attribution for libraries used in the app
+- Redesign settings screen
+- Update to Compose December releases
 
 ## [1.38.0] - 2023-11-20
 
 ### Changed
 
-*   Add brand new icon by dzuk
-*   Fix a bug that caused the app to fetch the same 20 posts over and over
-*   Significantly improve scrolling performance when there are a lot of saved posts
-*   Move search feature to its own screen
-*   Make top app and bottom system bars use the same color
-*   Reduce unnecessary API calls in search screen
-*   Upgrade to Compose November releases
-*   Enable logging of SQLite queries
+- Add brand new icon by dzuk
+- Fix a bug that caused the app to fetch the same 20 posts over and over
+- Significantly improve scrolling performance when there are a lot of saved posts
+- Move search feature to its own screen
+- Make top app and bottom system bars use the same color
+- Reduce unnecessary API calls in search screen
+- Upgrade to Compose November releases
+- Enable logging of SQLite queries
 
 ## [1.37.0] - 2023-10-06
 
 ### Changed
 
-*   Fixed a crash that infrequently happened in the comments page
-*   Fixed a crash when trying to list saved posts
-*   Fixed a crash in home screen widget when user had less than 50 saved posts
-*   Upgraded to Compose 1.6.0-alpha07
+- Fixed a crash that infrequently happened in the comments page
+- Fixed a crash when trying to list saved posts
+- Fixed a crash in home screen widget when user had less than 50 saved posts
+- Upgraded to Compose 1.6.0-alpha07
 
 ## [1.36.0] - 2023-10-04
 
 ### Added
 
-*   Introduce an initial attempt at a home screen widget
+- Introduce an initial attempt at a home screen widget
 
 ### Changed
 
-*   Fixed a crash triggered when swiping items
-*   Adjusted pull to refresh component to match Material You theme
+- Fixed a crash triggered when swiping items
+- Adjusted pull to refresh component to match Material You theme
 
 ## [1.35.0] - 2023-09-19
 
 ### Changed
 
-*   Fixed missing vertical spacing between post tags
-*   Fixed user profile links not displaying correctly in-app
-*   Update to Compose October release
+- Fixed missing vertical spacing between post tags
+- Fixed user profile links not displaying correctly in-app
+- Update to Compose October release
 
 ## [1.34.0] - 2023-08-30
 
 ### Added
 
-*   Add a swipe action on each story to open the comments page on `lobste.rs`
-*   Automatically mark posts as "read" and visually distinguish between them
+- Add a swipe action on each story to open the comments page on `lobste.rs`
+- Automatically mark posts as "read" and visually distinguish between them
 
 ### Changed
 
-*   Tweak list items to reduce vertical size and adjust colors
-*   Drop bogus workarounds for native library crashes
-*   Updated Jetpack Compose and SQLite
+- Tweak list items to reduce vertical size and adjust colors
+- Drop bogus workarounds for native library crashes
+- Updated Jetpack Compose and SQLite
 
 ### Fixed
 
-*   Rework how comments are displayed to adapt to lobste.rs API change
+- Rework how comments are displayed to adapt to lobste.rs API change
 
 ## [1.33.0] - 2023-07-31
 
 ### Changed
 
-*   Yet another attempt at fixing native library crashes
-*   Rework how baseline profiles are generated
+- Yet another attempt at fixing native library crashes
+- Rework how baseline profiles are generated
 
 ## [1.32.0] - 2023-07-27
 
 ### Changed
 
-*   Upgrade to AndroidX July 26 release
-*   Revert selectable text feature due to sporadic crashes
+- Upgrade to AndroidX July 26 release
+- Revert selectable text feature due to sporadic crashes
 
 ## [1.31.0] - 2023-07-25
 
 ### Added
 
-*   Added the ability to search for posts
-*   Text in the comments page is now selectable
+- Added the ability to search for posts
+- Text in the comments page is now selectable
 
 ### Changed
 
-*   Upgrade to Compose July release
-*   Upgrade to Kotlin 1.9.0
+- Upgrade to Compose July release
+- Upgrade to Kotlin 1.9.0
 
 ## [1.30.0] - 2023-07-02
 
 ### Changed
 
-*   Added another workaround for native library loading crash
+- Added another workaround for native library loading crash
 
 ## [1.29.0] - 2023-06-08
 
 ### Added
 
-*   Backup and restore options for saved posts
+- Backup and restore options for saved posts
 
 ### Fixed
 
-*   Spamming the comments button no longer causes it to be opened multiple times
-*   Saved posts screen now has a visual indication when you have nothing saved
-*   Iconography has been updated across the board to be more consistent
+- Spamming the comments button no longer causes it to be opened multiple times
+- Saved posts screen now has a visual indication when you have nothing saved
+- Iconography has been updated across the board to be more consistent
 
 ## [1.28.0] - 2023-06-03
 
 ### Changed
 
-*   Navigation transitions have been slightly sped up
+- Navigation transitions have been slightly sped up
 
 ### Fixed
 
-*   Add workaround for a native library loading crash observed on some devices
+- Add workaround for a native library loading crash observed on some devices
 
 ## [1.27.0] - 2023-05-31
 
 ### Changed
 
-*   Small accessibility improvements
-*   Slightly tweak the layout for story items to take less vertical space
-*   Upgrade to Compose `1.5.0-beta01` release
-*   Set accessibility web URI for profile screen
-*   Directly use Material Icons from upstream artifacts
-*   Upgrade dependencies
-*   Add adaptive navigation support (thanks @Yash-Garg)
-*   Use latest SQLite for backing databases
+- Small accessibility improvements
+- Slightly tweak the layout for story items to take less vertical space
+- Upgrade to Compose `1.5.0-beta01` release
+- Set accessibility web URI for profile screen
+- Directly use Material Icons from upstream artifacts
+- Upgrade dependencies
+- Add adaptive navigation support (thanks @Yash-Garg)
+- Use latest SQLite for backing databases
 
 ## [1.26.0] - 2023-05-03
 
 ### Changed
 
-*   Upgrade to Compose May release
-*   Disable Sentry performance reporting
-*   Migrate to Compose Foundation `FlowRow` in `LobstersCard`
+- Upgrade to Compose May release
+- Disable Sentry performance reporting
+- Migrate to Compose Foundation `FlowRow` in `LobstersCard`
 
 ## [1.25.0] - 2023-04-18
 
 ### Changed
 
-*   Make the app draw edge to edge
-*   Simplify Top App Bar color scheme
-*   Rework how baseline profiles are generated
-*   Upgrade to Compose April release
+- Make the app draw edge to edge
+- Simplify Top App Bar color scheme
+- Rework how baseline profiles are generated
+- Upgrade to Compose April release
 
 ## [1.24.0] - 2023-03-24
 
 ### Changed
 
-*   Rebuild app icon assets to align better with Material guidelines
-*   Adopt Slack's Compose lints and address issues found by it
-*   Upgrade to OkHttp 4.x
-*   Upgrade to Compose March release
-*   Start work on support for logging in with lobste.rs
+- Rebuild app icon assets to align better with Material guidelines
+- Adopt Slack's Compose lints and address issues found by it
+- Upgrade to OkHttp 4.x
+- Upgrade to Compose March release
+- Start work on support for logging in with lobste.rs
 
 ## [1.23.0] - 2023-03-02
 
 ### Added
 
-*   Introduce [Sentry](https://sentry.io) for error reporting and performance monitoring
+- Introduce [Sentry](https://sentry.io) for error reporting and performance monitoring
 
 ## [1.22.0] - 2023-03-02
 
 ### Changed
 
-*   In-app browser now respects the user's choice for dark mode
-*   Upgrade dependencies
+- In-app browser now respects the user's choice for dark mode
+- Upgrade dependencies
 
 ## [1.21.0] - 2023-02-09
 
 ### Changed
 
-*   Fix bug that caused the app to crash on launch
+- Fix bug that caused the app to crash on launch
 
 ## [1.20.0] - 2023-02-09
 
 ### Changed
 
-*   Upgrade dependencies
+- Upgrade dependencies
 
 ## [1.19.0] - 2023-02-01
 
 ### Changed
 
-*   Upgrade dependencies
-*   Optimize packaged baseline profiles
+- Upgrade dependencies
+- Optimize packaged baseline profiles
 
 ## [1.18.0] - 2023-01-21
 
 ### Changed
 
-*   Special-case deleted stories in comments API
-*   Fix regression where save button had the incorrect visual state
+- Special-case deleted stories in comments API
+- Fix regression where save button had the incorrect visual state
 
 ## [1.17.0] - 2023-01-12
 
 ### Added
 
-*   The app will now mark new comments as unread when returning to posts
+- The app will now mark new comments as unread when returning to posts
 
 ### Changed
 
-*   Upgrade to Kotlin 1.8.0
-*   Revert questionable app bar scrolling behaviour change
+- Upgrade to Kotlin 1.8.0
+- Revert questionable app bar scrolling behaviour change
 
 ## [1.16.0] - 2022-12-24
 
 ### Changed
 
-*   Fix bug where newest posts tab actually showed hottest posts instead
+- Fix bug where newest posts tab actually showed hottest posts instead
 
 ## [1.15.0] - 2022-12-20
 
 ### Changed
 
-*   Fix a case where collapsing the parent of an already collapsed comment caused it to become expanded
-*   Tweak progress bar UI to use a linear indicator
-*   Allow app bar to hide when scrolling down
-*   Fix bug where refreshing a list of posts caused it to jump around multiple times
+- Fix a case where collapsing the parent of an already collapsed comment caused it to become expanded
+- Tweak progress bar UI to use a linear indicator
+- Allow app bar to hide when scrolling down
+- Fix bug where refreshing a list of posts caused it to jump around multiple times
 
 ## [1.14.0] - 2022-12-12
 
 ### Changed
 
-*   Rework how often saved posts are updated
-*   Collapsing a comment now collapses all comments under it similar to how it works on the website
+- Rework how often saved posts are updated
+- Collapsing a comment now collapses all comments under it similar to how it works on the website
 
 ## [1.13.0] - 2022-12-10
 
 ### Changed
 
-*   Fix crash when viewing [jcs](https://lobste.rs/u/jcs)' comments
+- Fix crash when viewing [jcs](https://lobste.rs/u/jcs)' comments
 
 ## [1.12.0] - 2022-12-09
 
 ### Changed
 
-*   Do not schedule post update job every time the app starts
-*   Improve favicon loading to reduce unnecessary redraws
-*   Fix post lists being reloaded unnecessarily
+- Do not schedule post update job every time the app starts
+- Improve favicon loading to reduce unnecessary redraws
+- Fix post lists being reloaded unnecessarily
 
 ## [1.11.0] - 2022-12-07
 
 ### Changed
 
-*   Upgrade to Compose 2022.12.00 release
-*   Refresh packaged baseline profile
-*   Improve how saved state of posts is queried
+- Upgrade to Compose 2022.12.00 release
+- Refresh packaged baseline profile
+- Improve how saved state of posts is queried
 
 ## [1.10.0] - 2022-11-30
 
 ### Changed
 
-*   Configure Coil image loader with better caching settings
-*   Refresh packaged baseline profile
+- Configure Coil image loader with better caching settings
+- Refresh packaged baseline profile
 
 ## [1.9.0] - 2022-11-28
 
 ### Changed
 
-*   A loading indicator is added to the bottom of the post list to identify when new posts are being fetched
+- A loading indicator is added to the bottom of the post list to identify when new posts are being fetched
 
 ## [1.8.0] - 2022-11-21
 
 ### Changed
 
-*   The release pipeline now automatically generates Play Store release notes from the changelog file
+- The release pipeline now automatically generates Play Store release notes from the changelog file
 
 ### Fixed
 
-*   Downgrade AGP to 8.0.0-alpha07 to fix Baseline Profiles not being packaged
+- Downgrade AGP to 8.0.0-alpha07 to fix Baseline Profiles not being packaged
 
 ## [1.7.0] - 2022-11-19
 
 ### Changed
 
-*   Switch to Compose Material's swipe refresh feature
-*   Change metadata extractor logic to no longer prefer canonical URLs. The submitted URL will be retained as-is now.
-*   Remove navigation transition animations
+- Switch to Compose Material's swipe refresh feature
+- Change metadata extractor logic to no longer prefer canonical URLs. The submitted URL will be retained as-is now.
+- Remove navigation transition animations
 
 ## [1.6.0] - 2022-11-14
 
 ### Changed
 
-*   Migrate dependency injection from Hilt to Anvil + Whetstone
+- Migrate dependency injection from Hilt to Anvil + Whetstone
 
 ## [1.5.0] - 2022-11-10
 
 ### Changed
 
-*   Upgrade to Compose 2022.11.00 release
+- Upgrade to Compose 2022.11.00 release
 
 ## [1.4.0] - 2022-11-02
 
 ### Changed
 
-*   Misc fixes to link metadata extractor
+- Misc fixes to link metadata extractor
 
 ## [1.3.0] - 2022-10-24
 
 ### Changed
 
-*   Prevent errors during link metadata retrieval from crashing the app
-*   Update Jetpack libraries to 2022-10-24 release
+- Prevent errors during link metadata retrieval from crashing the app
+- Update Jetpack libraries to 2022-10-24 release
 
 ## [1.2.0] - 2022-10-17
 
 ### Changed
 
-*   Lazily load link metadata to improve comment page loading speed
-*   Upgrade to latest Compose release
-*   Refactor code to align with Twitter's public Compose guidelines
+- Lazily load link metadata to improve comment page loading speed
+- Upgrade to latest Compose release
+- Refactor code to align with Twitter's public Compose guidelines
 
 ## [1.1.0] - 2022-09-30
 
 ### Added
 
-*   Add score and relative time to comments
+- Add score and relative time to comments
 
 ### Changed
 
-*   Update Jetpack Compose
-*   Declare data backup and transfer rules
-*   Improve legibility of links in comments and user profiles
-*   Commonize and improve how network errors are displayed
+- Update Jetpack Compose
+- Declare data backup and transfer rules
+- Improve legibility of links in comments and user profiles
+- Commonize and improve how network errors are displayed
 
 ## [1.0.0] - 2022-09-20
 
-*   Initial Play Store release
-
-[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.41.0...HEAD
+- Initial Play Store release
 
+[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.54.0...HEAD
+[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
+[1.51.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.50.0...v1.51.0
+[1.50.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.49.0...v1.50.0
+[1.49.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.48.0...v1.49.0
+[1.48.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.47.0...v1.48.0
+[1.47.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.46.0...v1.47.0
+[1.46.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.45.0...v1.46.0
+[1.45.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.44.0...v1.45.0
+[1.44.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.43.0...v1.44.0
+[1.43.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.42.0...v1.43.0
+[1.42.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.41.0...v1.42.0
 [1.41.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.40.0...v1.41.0
-
 [1.40.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.39.0...v1.40.0
-
 [1.39.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.38.0...v1.39.0
-
 [1.38.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.37.0...v1.38.0
-
 [1.37.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.36.0...v1.37.0
-
 [1.36.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.35.0...v1.36.0
-
 [1.35.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.34.0...v1.35.0
-
 [1.34.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.33.0...v1.34.0
-
 [1.33.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.32.0...v1.33.0
-
 [1.32.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.31.0...v1.32.0
-
 [1.31.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.30.0...v1.31.0
-
 [1.30.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.29.0...v1.30.0
-
 [1.29.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.28.0...v1.29.0
-
 [1.28.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.27.0...v1.28.0
-
 [1.27.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.26.0...v1.27.0
-
 [1.26.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.25.0...v1.26.0
-
 [1.25.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.24.0...v1.25.0
-
 [1.24.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.23.0...v1.24.0
-
 [1.23.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.22.0...v1.23.0
-
 [1.22.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.21.0...v1.22.0
-
 [1.21.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.20.0...v1.21.0
-
 [1.20.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.19.0...v1.20.0
-
 [1.19.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.18.0...v1.19.0
-
 [1.18.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.17.0...v1.18.0
-
 [1.17.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.16.0...v1.17.0
-
 [1.16.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.15.0...v1.16.0
-
 [1.15.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.14.0...v1.15.0
-
 [1.14.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.13.0...v1.14.0
-
 [1.13.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.12.0...v1.13.0
-
 [1.12.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.11.0...v1.12.0
-
 [1.11.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.10.0...v1.11.0
-
 [1.10.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.9.0...v1.10.0
-
 [1.9.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.8.0...v1.9.0
-
 [1.8.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.7.0...1.8.0
-
 [1.7.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.6.0...v1.7.0
-
 [1.6.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.5.0...v1.6.0
-
 [1.5.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.4.0...v1.5.0
-
 [1.4.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.3.0...v1.4.0
-
 [1.3.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.2.0...v1.3.0
-
 [1.2.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.1.0...v1.2.0
-
 [1.1.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.0.0...v1.1.0
-
 [1.0.0]: https://github.com/msfjarvis/compose-lobsters/compare/29c374859b17c5fcef03585b8a01c00070de9097...v1.0.0

README.md

@@ -8,10 +8,14 @@ Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), b
        height="80" />
 </a>
 
+<a href="https://android.izzysoft.de/repo/apk/dev.msfjarvis.claw.android">
+  <img src="./.github/izzy-badge.webp"
+       alt="Get it on IzzyOnDroid"
+       height="80" />
+</a>
+
 > [!NOTE]
-> Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/latest).
->
-> They are also published in the Google Play 'Open Testing' channel, which can be opted into via this link: [[Android]](https://play.google.com/store/apps/details?id=dev.msfjarvis.claw.android) [[Web]](https://play.google.com/apps/testing/dev.msfjarvis.claw.android)
+> Daily builds are published to the Google Play 'Open Testing' channel (if there are any changes), which can be opted into via this link: [[Android]](https://play.google.com/store/apps/details?id=dev.msfjarvis.claw.android) [[Web]](https://play.google.com/apps/testing/dev.msfjarvis.claw.android)
 
 <img src="https://github.com/msfjarvis/compose-lobsters/blob/main/.github/readme_feature_light.webp#gh-light-mode-only"
      alt="A grid of screenshots from the app, in clockwise order: the main screen, the comments page, the search page and the saved posts page"

android/build.gradle.kts

@@ -1,12 +1,14 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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:Suppress("UnstableApiUsage")
 
+import com.android.build.api.dsl.ApplicationExtension
 import dev.msfjarvis.claw.gradle.addTestDependencies
+import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
 
 plugins {
   id("dev.msfjarvis.claw.android-application")
@@ -15,34 +17,51 @@ plugins {
   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)
 }
 
-android {
+// Directly using the generated `android` accessor lights up bright red
+extensions.configure<ApplicationExtension> {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig.applicationId = "dev.msfjarvis.claw.android"
+  defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   buildFeatures.compose = true
-  composeOptions {
-    useLiveLiterals = false
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
   buildTypes.create("internal") {
     matchingFallbacks += "release"
     signingConfig = signingConfigs["debug"]
     applicationIdSuffix = ".internal"
+    isDebuggable = true
   }
+  experimentalProperties["android.experimental.enableScreenshotTest"] = true
 }
 
+aboutLibraries.gitHubApiToken = providers.environmentVariable("GITHUB_TOKEN").orNull
+
 baselineProfile {
   mergeIntoMain = true
   saveInSrc = true
-  from(projects.benchmark.dependencyProject)
+  // 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 {
@@ -71,38 +90,58 @@ dependencies {
   implementation(platform(libs.okhttp.bom))
   implementation(libs.aboutLibraries.m3)
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.glance)
   implementation(libs.androidx.compose.glance.m3)
   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.runtime)
+  implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.compose.ui.text)
+  implementation(libs.androidx.compose.ui.util)
   implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.work.runtime)
-  implementation(libs.coil)
   implementation(libs.copydown)
   implementation(libs.dagger)
-  implementation(libs.jsoup)
+  implementation(libs.eithernet)
+  implementation(libs.haze)
+  implementation(libs.haze.materials)
+  implementation(libs.javax.inject)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
-  implementation(libs.material3.pulltorefresh)
+  implementation(libs.kotlinx.serialization.core)
+  implementation(libs.kotlinx.serialization.json)
   implementation(libs.napier)
+  implementation(libs.okhttp.core)
+  implementation(libs.okhttp.loggingInterceptor)
+  implementation(libs.retrofit)
   implementation(libs.sqldelight.extensions.coroutines)
   implementation(libs.swipe)
   implementation(libs.unfurl)
   implementation(projects.api)
   implementation(projects.common)
   implementation(projects.core)
+  implementation(projects.database.core)
   implementation(projects.database.impl)
   implementation(projects.model)
   implementation(projects.web)
 
   kapt(libs.dagger.compiler)
 
-  testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.okhttp.mockwebserver)
+  screenshotTestImplementation(libs.androidx.compose.ui.tooling)
+
   addTestDependencies(project)
+  androidTestImplementation(libs.androidx.test.espresso.core)
+  androidTestImplementation(libs.androidx.test.uiautomator)
+  androidTestImplementation(libs.leakcanary.android.test)
 }

android/lint-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0)" variant="all" version="8.3.0">
+<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">
 
     <issue
         id="VectorPath"

android/proguard-rules-missing-classes.pro

@@ -9,3 +9,16 @@
 -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.layout.DisplayFeature
+-dontwarn androidx.window.extensions.layout.FoldingFeature
+-dontwarn androidx.window.extensions.layout.WindowLayoutComponent
+-dontwarn androidx.window.extensions.layout.WindowLayoutInfo
+-dontwarn androidx.window.sidecar.SidecarDeviceState
+-dontwarn androidx.window.sidecar.SidecarDisplayFeature
+-dontwarn androidx.window.sidecar.SidecarInterface$SidecarCallback
+-dontwarn androidx.window.sidecar.SidecarInterface
+-dontwarn androidx.window.sidecar.SidecarProvider
+-dontwarn androidx.window.sidecar.SidecarWindowLayoutInfo

android/proguard-rules.pro

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

android/src/androidTest/AndroidManifest.xml

@@ -0,0 +1,13 @@
+<!--
+ ~ 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">
+
+  <!-- Performing the heap growth analysis in process requires more heap. -->
+  <application
+      android:largeHeap="true"/>
+</manifest>

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

@@ -0,0 +1,59 @@
+/*
+ * 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/res/values/strings.xml

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ 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.

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

@@ -0,0 +1,3 @@
+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

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

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2021-2024 Harsh Shandilya.
+ ~ 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.

android/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2021-2024 Harsh Shandilya.
+ ~ 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.
@@ -11,7 +11,6 @@
   <application
     android:name=".ClawApplication"
     android:dataExtractionRules="@xml/data_extraction_rules"
-    android:enableOnBackInvokedCallback="true"
     android:fullBackupContent="@xml/full_backup_content"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
@@ -32,108 +31,8 @@
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </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:host="lobste.rs" />
-        <data android:pathPattern="/u/......*" />
-        <data android:scheme="https" />
-      </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"
@@ -161,6 +60,7 @@
         android:value="androidx.startup"
         tools:node="remove" />
     </provider>
+
     <receiver
       android:name=".glance.WidgetReceiver"
       android:exported="true">
@@ -171,6 +71,7 @@
         android:name="android.appwidget.provider"
         android:resource="@xml/saved_posts_widget_info" />
     </receiver>
+
     <!-- Required: set your sentry.io project identifier (DSN) -->
     <meta-data
       android:name="io.sentry.dsn"
@@ -178,17 +79,19 @@
     <!-- enable automatic breadcrumbs for user interactions (clicks, swipes, scrolls) -->
     <meta-data
       android:name="io.sentry.traces.user-interaction.enable"
-      android:value="${enableSentry}" />
+      android:value="true" />
     <meta-data
       android:name="io.sentry.breadcrumbs.user-interaction"
-      android:value="${enableSentry}" />
+      android:value="true" />
     <!-- enable screenshot for crashes -->
     <meta-data
       android:name="io.sentry.attach-screenshot"
-      android:value="${enableSentry}" />
+      android:value="true" />
     <!-- enable view hierarchy for crashes -->
     <meta-data
       android:name="io.sentry.attach-view-hierarchy"
-      android:value="${enableSentry}" />
+      android:value="true" />
+    <!-- set the environment for this build -->
+    <meta-data android:name="io.sentry.environment" android:value="${sentryEnvironment}" />
   </application>
 </manifest>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -23,8 +23,7 @@ import javax.inject.Inject
 @ContributesAppInjector(generateAppComponent = true)
 class ClawApplication : Application(), ApplicationComponentOwner {
 
-  override val applicationComponent by
-    lazy(LazyThreadSafetyMode.NONE) { GeneratedApplicationComponent.create(this) }
+  override val applicationComponent = GeneratedApplicationComponent.create(this)
 
   @Inject lateinit var plugins: Set<@JvmSuppressWildcards AppPlugin>
 

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

@@ -1,17 +1,21 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.foundation.layout.fillMaxSize
 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.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.deliveryhero.whetstone.activity.ContributesActivityInjector
 import dev.msfjarvis.claw.android.ui.screens.LobstersPostsScreen
+import dev.msfjarvis.claw.android.ui.screens.TabletScreen
 
 @ContributesActivityInjector
 class MainActivity : BaseActivity() {
@@ -20,12 +24,25 @@ class MainActivity : BaseActivity() {
   @Composable
   override fun Content() {
     val windowSizeClass = calculateWindowSizeClass(this)
-    LobstersPostsScreen(
-      urlLauncher = urlLauncher,
-      htmlConverter = htmlConverter,
-      windowSizeClass = windowSizeClass,
-      setWebUri = { url -> webUri = url },
-    )
+
+    when (windowSizeClass.widthSizeClass) {
+      WindowWidthSizeClass.Compact -> {
+        LobstersPostsScreen(
+          urlLauncher = urlLauncher,
+          htmlConverter = htmlConverter,
+          windowSizeClass = windowSizeClass,
+          setWebUri = { url -> webUri = url },
+        )
+      }
+
+      else -> {
+        TabletScreen(
+          urlLauncher = urlLauncher,
+          htmlConverter = htmlConverter,
+          modifier = Modifier.fillMaxSize(),
+        )
+      }
+    }
   }
 
   override fun preLaunch() {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.
@@ -43,9 +43,10 @@ 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.isNotEmpty()) actionStartActivity(Intent(Intent.ACTION_VIEW, Uri.parse(post.url)))
-    else commentsAction
+    if (post.url.startsWith('/')) commentsAction
+    else actionStartActivity(Intent(Intent.ACTION_VIEW, Uri.parse(post.url)))
   Box(modifier.padding(8.dp)) {
     Row(
       verticalAlignment = Alignment.CenterVertically,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -22,11 +22,11 @@ object MetadataExtractorModule {
   fun provideUnfurlLogger(): UnfurlLogger {
     return object : UnfurlLogger {
       override fun log(message: String) {
-        Napier.d { message }
+        Napier.d(tag = "Unfurler") { message }
       }
 
       override fun log(e: Throwable, message: String) {
-        Napier.e(e) { message }
+        Napier.e(tag = "Unfurler", throwable = e) { message }
       }
     }
   }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -13,8 +13,11 @@ 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.model.LobstersPost
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.toUIPost
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -24,26 +27,25 @@ class LobstersPagingSource
 constructor(
   @Assisted private val remoteFetcher: RemoteFetcher<LobstersPost>,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-) : PagingSource<Int, LobstersPost>() {
-
-  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
+) : PagingSource<Int, UIPost>() {
+  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, UIPost> {
     val page = params.key ?: STARTING_PAGE_INDEX
     return when (val result = withContext(ioDispatcher) { remoteFetcher.getItemsAtPage(page) }) {
       is Success ->
         LoadResult.Page(
           itemsBefore = (page - 1) * PAGE_SIZE,
-          data = result.value,
+          data = result.value.map(LobstersPost::toUIPost),
           prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
           nextKey = page + 1,
         )
       is Failure.NetworkFailure -> LoadResult.Error(result.error)
       is Failure.UnknownFailure -> LoadResult.Error(result.error)
-      is Failure.HttpFailure,
+      is Failure.HttpFailure -> LoadResult.Error(result.toError())
       is Failure.ApiFailure -> LoadResult.Error(IOException("API returned an invalid response"))
     }
   }
 
-  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int? {
+  override fun getRefreshKey(state: PagingState<Int, UIPost>): Int? {
     return state.anchorPosition?.let { anchorPosition ->
       (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -14,9 +14,12 @@ 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.model.LobstersPost
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.toUIPost
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
@@ -33,14 +36,8 @@ constructor(
   private val searchApi: LobstersSearchApi,
   @Assisted private val queryProvider: () -> String,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-) : PagingSource<Int, LobstersPost>() {
-  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int? {
-    return state.anchorPosition?.let { anchorPosition ->
-      (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
-    }
-  }
-
-  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
+) : PagingSource<Int, UIPost>() {
+  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, UIPost> {
     val searchQuery = queryProvider()
     // If there is no query, we don't need to call the API at all.
     if (searchQuery.isEmpty()) {
@@ -55,19 +52,25 @@ constructor(
         val nextKey = if (result.value.isEmpty()) null else page + 1
         LoadResult.Page(
           itemsBefore = (page - 1) * PAGE_SIZE,
-          data = result.value,
+          data = result.value.map(LobstersPost::toUIPost),
           prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
           nextKey = nextKey,
         )
       }
       is ApiResult.Failure.NetworkFailure -> LoadResult.Error(result.error)
       is ApiResult.Failure.UnknownFailure -> LoadResult.Error(result.error)
-      is ApiResult.Failure.HttpFailure,
+      is ApiResult.Failure.HttpFailure -> LoadResult.Error(result.toError())
       is ApiResult.Failure.ApiFailure ->
         LoadResult.Error(IOException("API returned an invalid response"))
     }
   }
 
+  override fun getRefreshKey(state: PagingState<Int, UIPost>): Int? {
+    return state.anchorPosition?.let { anchorPosition ->
+      (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
+    }
+  }
+
   @AssistedFactory
   interface Factory {
     fun create(queryProvider: () -> String): SearchPagingSource

android/src/main/kotlin/dev/msfjarvis/claw/android/plugins/SentryAndroidPlugin.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.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/ClawNavigationBar.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.
@@ -13,16 +13,29 @@ import androidx.compose.animation.core.LinearOutSlowInEasing
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Icon
-import androidx.compose.material3.NavigationBar
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+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 dev.msfjarvis.claw.android.ui.navigation.Destinations
+import androidx.navigation.compose.currentBackStackEntryAsState
+import dev.chrisbanes.haze.HazeDefaults
+import dev.chrisbanes.haze.HazeState
+import dev.chrisbanes.haze.HazeStyle
+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
 
 const val AnimationDuration = 100
@@ -32,6 +45,7 @@ fun ClawNavigationBar(
   navController: NavController,
   items: ImmutableList<NavigationItem>,
   isVisible: Boolean,
+  hazeState: HazeState,
   modifier: Modifier = Modifier,
 ) {
   AnimatedVisibility(
@@ -48,45 +62,79 @@ fun ClawNavigationBar(
         targetOffsetY = { fullHeight -> fullHeight },
         animationSpec = tween(durationMillis = AnimationDuration, easing = FastOutLinearInEasing),
       ),
-    modifier = Modifier,
-  ) {
-    NavigationBar(modifier = modifier) {
-      items.forEach { navItem ->
-        val isCurrentDestination = navController.currentDestination?.route == navItem.route
-        NavigationBarItem(
-          icon = {
-            Crossfade(isCurrentDestination, label = "nav-label") {
-              Icon(
-                imageVector = if (it) navItem.selectedIcon else navItem.icon,
-                contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
-              )
-            }
-          },
-          label = { Text(text = navItem.label) },
-          selected = isCurrentDestination,
-          onClick = {
-            if (isCurrentDestination) {
-              navItem.listStateResetCallback()
-            } else {
-              navController.graph.startDestinationRoute?.let { startDestination ->
-                navController.popBackStack(startDestination, false)
+    label = "",
+    content = {
+      FloatingNavigationBar(
+        tonalElevation = 16.dp,
+        shape = MaterialTheme.shapes.extraLarge,
+        modifier =
+          modifier
+            .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,
+      ) {
+        val navBackStackEntry = navController.currentBackStackEntryAsState().value
+        val currentDestination = navBackStackEntry?.destination
+        items.forEach { navItem ->
+          val isSelected = currentDestination.matches(navItem.destination)
+          NavigationBarItem(
+            icon = {
+              Crossfade(isSelected, label = "nav-label") {
+                Icon(
+                  imageVector = if (it) navItem.selectedIcon else navItem.icon,
+                  contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
+                )
               }
-              if (navItem.route != Destinations.startDestination.route) {
-                navController.navigate(navItem.route)
+            },
+            label = { Text(text = navItem.label) },
+            selected = isSelected,
+            onClick = {
+              if (isSelected) {
+                navItem.listStateResetCallback()
+              } else {
+                navController.navigate(navItem.destination) {
+                  popUpTo(navController.graph.startDestinationId) { saveState = true }
+                  launchSingleTop = true
+                  restoreState = true
+                }
               }
-            }
-          },
-          modifier = Modifier.testTag(navItem.label.uppercase()),
-        )
+            },
+            modifier = Modifier.testTag(navItem.label.uppercase()),
+          )
+        }
       }
-    }
-  }
+    },
+  )
 }
 
-class NavigationItem(
-  val label: String,
-  val route: String,
+class NavigationItem
+private constructor(
   val icon: ImageVector,
+  val label: String,
+  val destination: Destination,
   val selectedIcon: ImageVector,
   val listStateResetCallback: () -> Unit,
-)
+) {
+  constructor(
+    destination: AppDestinations,
+    listStateResetCallback: () -> Unit,
+  ) : this(
+    destination.icon,
+    destination.label,
+    destination.destination,
+    destination.selectedIcon,
+    listStateResetCallback,
+  ) {}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.
@@ -22,7 +22,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.navigation.NavController
-import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import androidx.navigation.compose.currentBackStackEntryAsState
+import dev.msfjarvis.claw.android.ui.navigation.matches
 import kotlinx.collections.immutable.ImmutableList
 
 @Composable
@@ -49,12 +50,14 @@ fun ClawNavigationRail(
     modifier = Modifier,
   ) {
     NavigationRail(modifier = modifier) {
+      val navBackStackEntry = navController.currentBackStackEntryAsState().value
+      val currentDestination = navBackStackEntry?.destination
       Spacer(Modifier.weight(1f))
       items.forEach { navItem ->
-        val isCurrentDestination = navController.currentDestination?.route == navItem.route
+        val isSelected = currentDestination.matches(navItem.destination)
         NavigationRailItem(
           icon = {
-            Crossfade(isCurrentDestination, label = "nav-label") {
+            Crossfade(isSelected, label = "nav-label") {
               Icon(
                 imageVector = if (it) navItem.selectedIcon else navItem.icon,
                 contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
@@ -62,16 +65,15 @@ fun ClawNavigationRail(
             }
           },
           label = { Text(text = navItem.label) },
-          selected = isCurrentDestination,
+          selected = isSelected,
           onClick = {
-            if (isCurrentDestination) {
+            if (isSelected) {
               navItem.listStateResetCallback()
             } else {
-              navController.graph.startDestinationRoute?.let { startDestination ->
-                navController.popBackStack(startDestination, false)
-              }
-              if (navItem.route != Destinations.startDestination.route) {
-                navController.navigate(navItem.route)
+              navController.navigate(navItem.destination) {
+                popUpTo(navController.graph.startDestinationId) { saveState = true }
+                launchSingleTop = true
+                restoreState = true
               }
             }
           },

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2024 Harsh Shandilya.
+ * 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.
@@ -7,68 +7,77 @@
 package dev.msfjarvis.claw.android.ui
 
 import android.content.Context
-import android.content.ContextWrapper
-import androidx.activity.ComponentActivity
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.navigation.NavController
-import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import android.content.Intent
+import com.slack.eithernet.ApiResult
 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 Context.getActivity(): ComponentActivity? {
-  return when (this) {
-    is ComponentActivity -> this
-    is ContextWrapper -> baseContext.getActivity()
-    else -> null
-  }
-}
-
-@Composable
-fun rememberPostActions(
+fun PostActions(
+  context: Context,
   urlLauncher: UrlLauncher,
-  navController: NavController,
   viewModel: ClawViewModel,
+  navigateToComments: (String) -> Unit,
 ): PostActions {
-  return remember {
-    object : PostActions {
-      override fun viewPost(postId: String, postUrl: String, commentsUrl: String) {
-        viewModel.markPostAsRead(postId)
-        urlLauncher.openUri(postUrl.ifEmpty { commentsUrl })
-      }
+  return object : PostActions {
+    override fun viewPost(postId: String, postUrl: String, commentsUrl: String) {
+      viewModel.markPostAsRead(postId)
+      urlLauncher.openUri(postUrl.ifEmpty { commentsUrl })
+    }
 
-      override fun viewComments(postId: String) {
-        viewModel.markPostAsRead(postId)
-        val currentRoute = navController.currentDestination?.route
-        val newRoute =
-          Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, postId)
-        if (currentRoute != Destinations.Comments.route) navController.navigate(newRoute)
-      }
+    override fun viewComments(postId: String) {
+      viewModel.markPostAsRead(postId)
+      navigateToComments(postId)
+    }
 
-      override fun viewCommentsPage(commentsUrl: String) {
-        // Post links from lobste.rs are of the form $baseUrl/s/$postId/$postTitle
-        // Interestingly, lobste.rs does not actually care for the value of $postTitle, and will
-        // happily accept both a missing as well as a completely arbitrary $postTitle. We
-        // leverage this to create a new URL format which looks like
-        // $baseUrl/s/$postId/$postTitle/r, and does not trigger our deeplinks,
-        // instead opening in the custom tab as we want it to.
-        urlLauncher.openUri(commentsUrl.replaceAfterLast('/', "r"))
-      }
+    override fun viewCommentsPage(post: UIPost) {
+      urlLauncher.openUri(post.commentsUrl)
+    }
 
-      override fun toggleSave(post: UIPost) {
-        viewModel.toggleSave(post)
-      }
+    override fun toggleSave(post: UIPost) {
+      viewModel.toggleSave(post)
+    }
 
-      override suspend fun getComments(postId: String): UIPost {
-        return viewModel.getPostComments(postId)
-      }
+    override fun share(post: UIPost) {
+      val sendIntent: Intent =
+        Intent().apply {
+          action = Intent.ACTION_SEND
+          putExtra(Intent.EXTRA_TEXT, post.url.ifEmpty { post.commentsUrl })
+          putExtra(Intent.EXTRA_TITLE, post.title)
+          type = "text/plain"
+        }
+      val shareIntent = Intent.createChooser(sendIntent, null)
+      context.startActivity(shareIntent)
+    }
 
-      override suspend fun getLinkMetadata(url: String): LinkMetadata {
-        return viewModel.getLinkMetadata(url)
-      }
+    override fun isPostRead(post: UIPost): Boolean = viewModel.isPostRead(post)
+
+    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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -10,6 +10,7 @@ import androidx.activity.compose.ReportDrawn
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
@@ -36,6 +37,7 @@ fun DatabasePosts(
   items: ImmutableMap<String, List<UIPost>>,
   listState: LazyListState,
   postActions: PostActions,
+  contentPadding: PaddingValues,
   modifier: Modifier = Modifier,
 ) {
   ReportDrawn()
@@ -50,11 +52,11 @@ fun DatabasePosts(
         Text(text = "No saved posts", style = MaterialTheme.typography.headlineSmall)
       }
     } else {
-      LazyColumn(state = listState) {
+      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, refresh = {}, postActions = postActions)
+            LobstersListItem(item = item, postActions = postActions)
             HorizontalDivider()
           }
         }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -8,9 +8,9 @@ package dev.msfjarvis.claw.android.ui.lists
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Reply
+import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
 import dev.msfjarvis.claw.common.posts.LobstersCard
@@ -20,19 +20,20 @@ import me.saket.swipe.SwipeAction
 import me.saket.swipe.SwipeableActionsBox
 
 @Composable
-fun LobstersListItem(
-  item: UIPost,
-  postActions: PostActions,
-  refresh: () -> Unit,
-  modifier: Modifier = Modifier,
-) {
+fun LobstersListItem(item: UIPost, postActions: PostActions, modifier: Modifier = Modifier) {
   val commentsAction =
     SwipeAction(
       icon = rememberVectorPainter(Icons.AutoMirrored.Filled.Reply),
       background = MaterialTheme.colorScheme.tertiary,
-      onSwipe = { postActions.viewCommentsPage(item.commentsUrl) },
+      onSwipe = { postActions.viewCommentsPage(item) },
     )
-  SwipeableActionsBox(endActions = listOf(commentsAction)) {
-    LobstersCard(post = item, postActions = postActions, refresh = refresh, modifier = modifier)
+  val shareAction =
+    SwipeAction(
+      icon = rememberVectorPainter(Icons.Filled.Share),
+      background = MaterialTheme.colorScheme.tertiary,
+      onSwipe = { postActions.share(item) },
+    )
+  SwipeableActionsBox(startActions = listOf(shareAction), endActions = listOf(commentsAction)) {
+    LobstersCard(post = item, postActions = postActions, modifier = modifier)
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -7,30 +7,40 @@
 package dev.msfjarvis.claw.android.ui.lists
 
 import androidx.activity.compose.ReportDrawnWhen
-import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.material3.pulltorefresh.PullToRefreshDefaults
+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
+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.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 eu.bambooapps.material3.pullrefresh.PullRefreshIndicator
-import eu.bambooapps.material3.pullrefresh.pullRefresh
-import eu.bambooapps.material3.pullrefresh.rememberPullRefreshState
+import kotlinx.coroutines.flow.MutableStateFlow
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -38,21 +48,33 @@ fun NetworkPosts(
   lazyPagingItems: LazyPagingItems<UIPost>,
   listState: LazyListState,
   postActions: PostActions,
+  contentPadding: PaddingValues,
   modifier: Modifier = Modifier,
 ) {
   ReportDrawnWhen { lazyPagingItems.itemCount > 0 }
-  val refreshLoadState = lazyPagingItems.loadState.refresh
-  val isRefreshing = refreshLoadState == LoadState.Loading && lazyPagingItems.itemCount == 0
-  val pullRefreshState = rememberPullRefreshState(isRefreshing, lazyPagingItems::refresh)
-  Box(modifier = modifier.fillMaxSize().pullRefresh(pullRefreshState)) {
+  val refreshLoadState by rememberUpdatedState(lazyPagingItems.loadState.refresh)
+  val state = rememberPullToRefreshState()
+  PullToRefreshBox(
+    modifier = modifier.fillMaxSize(),
+    isRefreshing = refreshLoadState == LoadState.Loading,
+    state = state,
+    onRefresh = { lazyPagingItems.refresh() },
+    indicator = {
+      PullToRefreshDefaults.Indicator(
+        state = state,
+        isRefreshing = refreshLoadState == LoadState.Loading,
+        modifier = Modifier.align(Alignment.TopCenter).padding(contentPadding),
+      )
+    },
+  ) {
     if (lazyPagingItems.itemCount == 0 && refreshLoadState is LoadState.Error) {
       NetworkError(
         label = "Failed to load posts",
-        error = refreshLoadState.error,
+        error = (refreshLoadState as LoadState.Error).error,
         modifier = Modifier.align(Alignment.Center),
       )
     } else {
-      LazyColumn(state = listState) {
+      LazyColumn(contentPadding = contentPadding, state = listState) {
         items(
           count = lazyPagingItems.itemCount,
           key = lazyPagingItems.itemKey { it.shortId },
@@ -60,11 +82,7 @@ fun NetworkPosts(
         ) { index ->
           val item = lazyPagingItems[index]
           if (item != null) {
-            LobstersListItem(
-              item = item,
-              postActions = postActions,
-              refresh = { lazyPagingItems.refresh() },
-            )
+            LobstersListItem(item = item, postActions = postActions)
             HorizontalDivider()
           }
         }
@@ -80,11 +98,20 @@ fun NetworkPosts(
         }
       }
     }
-    PullRefreshIndicator(
-      refreshing = isRefreshing,
-      state = pullRefreshState,
-      modifier = Modifier.align(Alignment.TopCenter),
-      shadowElevation = 6.dp, // From M2 implementation
+  }
+}
+
+@DevicePreviews
+@Composable
+private fun ListPreview() {
+  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/main/kotlin/dev/msfjarvis/claw/android/ui/lists/SearchList.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.
@@ -7,8 +7,10 @@
 package dev.msfjarvis.claw.android.ui.lists
 
 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
@@ -17,28 +19,29 @@ import androidx.compose.ui.semantics.isTraversalGroup
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import androidx.paging.PagingData
-import androidx.paging.compose.collectAsLazyPagingItems
+import 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.coroutines.flow.Flow
 
 @Composable
 fun SearchList(
-  items: Flow<PagingData<UIPost>>,
+  lazyPagingItems: LazyPagingItems<UIPost>,
   listState: LazyListState,
   postActions: PostActions,
   searchQuery: String,
   setSearchQuery: (String) -> Unit,
+  contentPadding: PaddingValues,
   modifier: Modifier = Modifier,
 ) {
-  val lazyPagingItems = items.collectAsLazyPagingItems()
   val triggerSearch = { query: String ->
     setSearchQuery(query)
     lazyPagingItems.refresh()
   }
-  Column(modifier = modifier.semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()) {
+  Column(
+    modifier =
+      modifier.systemBarsPadding().semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()
+  ) {
     SearchBar(
       value = searchQuery,
       onValueChange = setSearchQuery,
@@ -49,6 +52,7 @@ fun SearchList(
       lazyPagingItems = lazyPagingItems,
       listState = listState,
       postActions = postActions,
+      contentPadding = contentPadding,
     )
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.

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

@@ -0,0 +1,63 @@
+/*
+ * 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 android.os.Parcelable
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.NewReleases
+import androidx.compose.material.icons.filled.Whatshot
+import androidx.compose.material.icons.outlined.FavoriteBorder
+import androidx.compose.material.icons.outlined.NewReleases
+import androidx.compose.material.icons.outlined.Whatshot
+import androidx.compose.ui.graphics.vector.ImageVector
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+sealed interface Destination : Parcelable
+
+@Parcelize @Serializable data object Hottest : Destination
+
+@Parcelize @Serializable data object Newest : Destination
+
+@Parcelize @Serializable data object Saved : Destination
+
+@Parcelize @Serializable data class Comments(val postId: String) : Destination
+
+@Parcelize @Serializable data class User(val username: String) : Destination
+
+@Parcelize @Serializable data object Search : Destination
+
+@Parcelize @Serializable data object Settings : Destination
+
+@Parcelize @Serializable data object AboutLibraries : Destination
+
+enum class AppDestinations(
+  val icon: ImageVector,
+  val label: String,
+  val destination: Destination,
+  val selectedIcon: ImageVector,
+) {
+  HOTTEST(
+    icon = Icons.Outlined.Whatshot,
+    label = "Hottest",
+    destination = Hottest,
+    selectedIcon = Icons.Filled.Whatshot,
+  ),
+  NEWEST(
+    icon = Icons.Outlined.NewReleases,
+    label = "Newest",
+    destination = Newest,
+    selectedIcon = Icons.Filled.NewReleases,
+  ),
+  SAVED(
+    icon = Icons.Outlined.FavoriteBorder,
+    label = "Saved",
+    destination = Saved,
+    selectedIcon = Icons.Filled.Favorite,
+  ),
+}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright © 2021-2024 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
-
-sealed class Destinations {
-  abstract val route: String
-
-  data object Hottest : Destinations() {
-    override val route = "hottest"
-  }
-
-  data object Newest : Destinations() {
-    override val route = "newest"
-  }
-
-  data object Saved : Destinations() {
-    override val route = "saved"
-  }
-
-  data object Comments : Destinations() {
-    const val PLACEHOLDER = "{postId}"
-    override val route = "comments/$PLACEHOLDER"
-  }
-
-  data object User : Destinations() {
-    const val PLACEHOLDER = "{username}"
-    override val route = "user/$PLACEHOLDER"
-  }
-
-  data object Search : Destinations() {
-    override val route = "search"
-  }
-
-  data object Settings : Destinations() {
-    override val route = "settings"
-  }
-
-  data object AboutLibraries : Destinations() {
-    override val route = "about_libraries"
-  }
-
-  companion object {
-    val startDestination
-      get() = Hottest
-  }
-}

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

@@ -0,0 +1,30 @@
+/*
+ * 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/NavigationType.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -7,44 +7,35 @@
 package dev.msfjarvis.claw.android.ui.screens
 
 import android.content.Intent
+import androidx.activity.compose.LocalActivity
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.Image
 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.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.NewReleases
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Tune
-import androidx.compose.material.icons.filled.Whatshot
-import androidx.compose.material.icons.outlined.FavoriteBorder
-import androidx.compose.material.icons.outlined.NewReleases
-import androidx.compose.material.icons.outlined.Whatshot
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -52,40 +43,48 @@ 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.navigation.NavType
+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.navArgument
-import androidx.navigation.navDeepLink
+import androidx.navigation.toRoute
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.deliveryhero.whetstone.compose.injectedViewModel
 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.ClawNavigationBar
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
 import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
-import dev.msfjarvis.claw.android.ui.getActivity
 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.ClawNavigationType
-import dev.msfjarvis.claw.android.ui.navigation.Destinations
-import dev.msfjarvis.claw.android.ui.rememberPostActions
+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.ui.navigation.any
+import dev.msfjarvis.claw.android.ui.navigation.none
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.common.comments.CommentsPage
 import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.ui.decorations.ClawAppBar
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
+import kotlinx.collections.immutable.toPersistentList
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun LobstersPostsScreen(
   urlLauncher: UrlLauncher,
@@ -95,99 +94,87 @@ fun LobstersPostsScreen(
   modifier: Modifier = Modifier,
   viewModel: ClawViewModel = injectedViewModel(),
 ) {
+  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 = rememberPostActions(urlLauncher, navController, viewModel)
-  val backStackEntry by navController.currentBackStackEntryAsState()
-  val currentDestination = backStackEntry?.destination?.route
-  val context = LocalContext.current
+  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.collectAsState(persistentMapOf())
+  val savedPosts by viewModel.savedPostsByMonth.collectAsStateWithLifecycle(persistentMapOf())
 
   val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
 
-  val postIdOverride = context.getActivity()?.intent?.extras?.getString(MainActivity.NAVIGATION_KEY)
-  LaunchedEffect(false) {
+  val postIdOverride = activity?.intent?.extras?.getString(MainActivity.NAVIGATION_KEY)
+  LaunchedEffect(Unit) {
     if (postIdOverride != null) {
-      navController.navigate(
-        Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, postIdOverride)
-      )
+      navController.navigate(Comments(postIdOverride))
     }
   }
 
   val navItems =
     persistentListOf(
-      NavigationItem(
-        label = "Hottest",
-        route = Destinations.Hottest.route,
-        icon = Icons.Outlined.Whatshot,
-        selectedIcon = Icons.Filled.Whatshot,
-      ) {
-        coroutineScope.launch { hottestListState.animateScrollToItem(index = 0) }
+      NavigationItem(AppDestinations.HOTTEST) {
+        coroutineScope.launch {
+          if (hottestPosts.itemCount > 0) hottestListState.animateScrollToItem(index = 0)
+        }
       },
-      NavigationItem(
-        label = "Newest",
-        route = Destinations.Newest.route,
-        icon = Icons.Outlined.NewReleases,
-        selectedIcon = Icons.Filled.NewReleases,
-      ) {
-        coroutineScope.launch { newestListState.animateScrollToItem(index = 0) }
+      NavigationItem(AppDestinations.NEWEST) {
+        coroutineScope.launch {
+          if (newestPosts.itemCount > 0) newestListState.animateScrollToItem(index = 0)
+        }
       },
-      NavigationItem(
-        label = "Saved",
-        route = Destinations.Saved.route,
-        icon = Icons.Outlined.FavoriteBorder,
-        selectedIcon = Icons.Filled.Favorite,
-      ) {
-        coroutineScope.launch { savedListState.animateScrollToItem(index = 0) }
+      NavigationItem(AppDestinations.SAVED) {
+        coroutineScope.launch { if (savedPosts.isNotEmpty()) savedListState.scrollToItem(0) }
       },
     )
+  val navDestinations = navItems.map(NavigationItem::destination).toPersistentList()
 
   Scaffold(
     topBar = {
-      ClawAppBar(
+      TopAppBar(
+        modifier = Modifier.shadow(8.dp),
         navigationIcon = {
           if (
-            navController.previousBackStackEntry != null &&
-              navItems.none { it.route == currentDestination }
+            navController.previousBackStackEntry != null && currentDestination.none(navDestinations)
           ) {
-            IconButton(
-              onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
-            ) {
+            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 (navItems.any { it.route == currentDestination }) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-              Image(
-                painter = painterResource(id = R.drawable.ic_launcher_foreground),
-                contentDescription = null,
-                modifier = Modifier.size(48.dp),
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
-              )
-              Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
-            }
+          if (currentDestination.any(navDestinations)) {
+            Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
           }
         },
         actions = {
-          if (navItems.any { it.route == currentDestination }) {
+          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(Destinations.Settings.route) }) {
+            IconButton(onClick = { navController.navigate(Settings) }) {
               Icon(imageVector = Icons.Filled.Tune, contentDescription = "Settings")
             }
           }
@@ -199,63 +186,60 @@ fun LobstersPostsScreen(
         ClawNavigationBar(
           navController = navController,
           items = navItems,
-          isVisible = navItems.any { it.route == currentDestination },
+          isVisible = currentDestination.any(navDestinations),
+          hazeState = hazeState,
         )
       }
     },
     snackbarHost = { SnackbarHost(snackbarHostState) },
     modifier = modifier.semantics { testTagsAsResourceId = true },
-  ) { paddingValues ->
-    Row(modifier = Modifier.padding(paddingValues)) {
+  ) { contentPadding ->
+    Row {
       AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
         ClawNavigationRail(
           navController = navController,
           items = navItems,
-          isVisible = navItems.any { it.route == currentDestination },
+          isVisible = currentDestination.any(navDestinations),
         )
       }
 
       NavHost(
         navController = navController,
-        startDestination = Destinations.startDestination.route,
+        startDestination = Hottest,
         // Make animations 2x faster than default specs
         enterTransition = { fadeIn(animationSpec = tween(350)) },
         exitTransition = { fadeOut(animationSpec = tween(350)) },
+        modifier = Modifier.hazeSource(hazeState),
       ) {
-        val uri = LobstersApi.BASE_URL
-        composable(route = Destinations.Hottest.route) {
+        composable<Hottest> {
           setWebUri("https://lobste.rs/")
           NetworkPosts(
             lazyPagingItems = hottestPosts,
             listState = hottestListState,
             postActions = postActions,
+            contentPadding = contentPadding,
           )
         }
-        composable(route = Destinations.Newest.route) {
+        composable<Newest> {
           setWebUri("https://lobste.rs/")
           NetworkPosts(
             lazyPagingItems = newestPosts,
             listState = newestListState,
             postActions = postActions,
+            contentPadding = contentPadding,
           )
         }
-        composable(route = Destinations.Saved.route) {
+        composable<Saved> {
           setWebUri(null)
-          DatabasePosts(items = savedPosts, listState = savedListState, postActions = postActions)
+          DatabasePosts(
+            items = savedPosts,
+            listState = savedListState,
+            postActions = postActions,
+            contentPadding = contentPadding,
+          )
         }
-        composable(
-          route = Destinations.Comments.route,
-          arguments = listOf(navArgument("postId") { type = NavType.StringType }),
-          deepLinks =
-            listOf(
-              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.PLACEHOLDER}/.*" },
-              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.PLACEHOLDER}" },
-            ),
-        ) { backStackEntry ->
-          val postId =
-            requireNotNull(backStackEntry.arguments?.getString("postId")) {
-              "Navigating to ${Destinations.Comments.route} without necessary 'postId' argument"
-            }
+        composable<Comments> { backStackEntry ->
+          val postId = backStackEntry.toRoute<Comments>().postId
           setWebUri("https://lobste.rs/s/$postId")
           CommentsPage(
             postId = postId,
@@ -263,32 +247,35 @@ fun LobstersPostsScreen(
             htmlConverter = htmlConverter,
             getSeenComments = viewModel::getSeenComments,
             markSeenComments = viewModel::markSeenComments,
+            contentPadding = contentPadding,
+            openUserProfile = { navController.navigate(User(it)) },
           )
         }
-        composable(
-          route = Destinations.User.route,
-          arguments = listOf(navArgument("username") { type = NavType.StringType }),
-          deepLinks = listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.PLACEHOLDER}" }),
-        ) { backStackEntry ->
-          val username =
-            requireNotNull(backStackEntry.arguments?.getString("username")) {
-              "Navigating to ${Destinations.User.route} without necessary 'username' argument"
-            }
+        composable<User> { backStackEntry ->
+          val username = backStackEntry.toRoute<User>().username
           setWebUri("https://lobste.rs/u/$username")
-          UserProfile(username = username, getProfile = viewModel::getUserProfile)
+          UserProfile(
+            username = username,
+            getProfile = viewModel::getUserProfile,
+            contentPadding = contentPadding,
+            openUserProfile = { navController.navigate(User(it)) },
+          )
         }
-        composable(route = Destinations.Settings.route) {
+        composable<Settings> {
           SettingsScreen(
-            context = context,
-            openLibrariesScreen = { navController.navigate(Destinations.AboutLibraries.route) },
+            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(route = Destinations.AboutLibraries.route) {
-          LibrariesContainer(modifier = Modifier.fillMaxSize())
+        composable<AboutLibraries> {
+          LibrariesContainer(contentPadding = contentPadding, modifier = Modifier.fillMaxSize())
         }
       }
     }

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

@@ -1,29 +1,33 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.navigation.NavType
+import androidx.compose.ui.platform.LocalContext
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
+import androidx.navigation.toRoute
+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.Destinations
-import dev.msfjarvis.claw.android.ui.rememberPostActions
+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
 
 @Composable
 fun SearchScreen(
@@ -33,33 +37,29 @@ fun SearchScreen(
   modifier: Modifier = Modifier,
   viewModel: ClawViewModel = injectedViewModel(),
 ) {
+  val context = LocalContext.current
   val navController = rememberNavController()
-  val postActions = rememberPostActions(urlLauncher, navController, viewModel)
+  val postActions = remember {
+    PostActions(context, urlLauncher, viewModel) { navController.navigate(Comments(it)) }
+  }
   val listState = rememberLazyListState()
-  Scaffold(modifier = modifier) { paddingValues ->
-    NavHost(
-      navController = navController,
-      startDestination = Destinations.Search.route,
-      modifier = Modifier.padding(paddingValues),
-    ) {
-      composable(route = Destinations.Search.route) {
+  val searchResults = viewModel.searchResults.collectAsLazyPagingItems()
+
+  Scaffold(modifier = modifier) { contentPadding ->
+    NavHost(navController = navController, startDestination = Search) {
+      composable<Search> {
         setWebUri("https://lobste.rs/search")
         SearchList(
-          items = viewModel.searchResults,
+          lazyPagingItems = searchResults,
           listState = listState,
           postActions = postActions,
           searchQuery = viewModel.searchQuery,
+          contentPadding = contentPadding,
           setSearchQuery = { query -> viewModel.searchQuery = query },
         )
       }
-      composable(
-        route = Destinations.Comments.route,
-        arguments = listOf(navArgument("postId") { type = NavType.StringType }),
-      ) { backStackEntry ->
-        val postId =
-          requireNotNull(backStackEntry.arguments?.getString("postId")) {
-            "Navigating to ${Destinations.Comments.route} without necessary 'postId' argument"
-          }
+      composable<Comments> { backStackEntry ->
+        val postId = backStackEntry.toRoute<Comments>().postId
         setWebUri("https://lobste.rs/s/$postId")
         CommentsPage(
           postId = postId,
@@ -67,6 +67,18 @@ fun SearchScreen(
           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,
         )
       }
     }

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

@@ -1,23 +1,24 @@
 /*
- * Copyright © 2024 Harsh Shandilya.
+ * 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.content.Context
+import android.net.Uri
 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.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 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.Bookmarks
@@ -39,6 +40,8 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
+import dev.msfjarvis.claw.common.theme.LobstersTheme
+import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
 import java.io.InputStream
 import java.io.OutputStream
 import kotlinx.coroutines.CoroutineScope
@@ -49,28 +52,19 @@ private const val HTML_MIME_TYPE = "application/html"
 
 @Composable
 fun SettingsScreen(
-  context: Context,
   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.fillMaxSize()) {
+  Box(modifier = modifier.padding(contentPadding)) {
     Column {
-      ListItem(
-        headlineContent = { Text("Libraries") },
-        leadingContent = {
-          Icon(
-            imageVector = Icons.AutoMirrored.Filled.LibraryBooks,
-            contentDescription = null,
-            modifier = Modifier.height(32.dp),
-          )
-        },
-        modifier = Modifier.clickable(onClick = openLibrariesScreen),
-      )
       ListItem(
         headlineContent = { Text("Data transfer") },
         leadingContent = {
@@ -85,24 +79,35 @@ fun SettingsScreen(
             horizontalArrangement = Arrangement.spacedBy(32.dp),
             modifier = Modifier.fillMaxWidth(),
           ) {
-            ImportPosts(context, coroutineScope, snackbarHostState, importPosts)
+            ImportPosts(openInputStream, coroutineScope, snackbarHostState, importPosts)
             ExportPosts(
-              context,
               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),
+      )
     }
   }
 }
 
 @Composable
 private fun RowScope.ImportPosts(
-  context: Context,
+  openInputStream: (Uri) -> InputStream?,
   coroutineScope: CoroutineScope,
   snackbarHostState: SnackbarHostState,
   importPosts: suspend (InputStream) -> Unit,
@@ -115,7 +120,7 @@ private fun RowScope.ImportPosts(
         return@rememberLauncherForActivityResult
       }
       coroutineScope.launch {
-        context.contentResolver.openInputStream(uri)?.use { stream ->
+        openInputStream(uri)?.use { stream ->
           importPosts(stream)
           snackbarHostState.showSnackbarDismissing("Successfully imported posts")
         }
@@ -132,9 +137,9 @@ private fun RowScope.ImportPosts(
 
 @Composable
 private fun RowScope.ExportPosts(
-  context: Context,
   coroutineScope: CoroutineScope,
   snackbarHostState: SnackbarHostState,
+  openOutputStream: (Uri) -> OutputStream?,
   exportPostsAsJson: suspend (OutputStream) -> Unit,
   exportPostsAsHtml: suspend (OutputStream) -> Unit,
   modifier: Modifier = Modifier,
@@ -147,7 +152,7 @@ private fun RowScope.ExportPosts(
         return@rememberLauncherForActivityResult
       }
       coroutineScope.launch {
-        context.contentResolver.openOutputStream(uri)?.use { stream ->
+        openOutputStream(uri)?.use { stream ->
           exportPostsAsJson(stream)
           snackbarHostState.showSnackbarDismissing("Successfully exported posts")
         }
@@ -161,7 +166,7 @@ private fun RowScope.ExportPosts(
         return@rememberLauncherForActivityResult
       }
       coroutineScope.launch {
-        context.contentResolver.openOutputStream(uri)?.use { stream ->
+        openOutputStream(uri)?.use { stream ->
           exportPostsAsHtml(stream)
           snackbarHostState.showSnackbarDismissing("Successfully exported posts")
         }
@@ -207,3 +212,11 @@ private suspend fun SnackbarHostState.showSnackbarDismissing(text: String) {
   currentSnackbarData?.dismiss()
   showSnackbar(text)
 }
+
+@ThemePreviews
+@Composable
+private fun SettingsScreenPreview() {
+  LobstersTheme {
+    SettingsScreen({}, SnackbarHostState(), { null }, { null }, {}, {}, {}, PaddingValues())
+  }
+}

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

@@ -0,0 +1,237 @@
+/*
+ * 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

@@ -0,0 +1,170 @@
+/*
+ * 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,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.
@@ -18,9 +18,7 @@ import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
-import androidx.paging.PagingData
 import androidx.paging.cachedIn
-import androidx.paging.map
 import com.deliveryhero.whetstone.app.ApplicationScope
 import com.deliveryhero.whetstone.viewmodel.ContributesViewModel
 import com.slack.eithernet.ApiResult.Failure
@@ -31,19 +29,17 @@ 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.model.LobstersPost
 import dev.msfjarvis.claw.model.UIPost
 import dev.msfjarvis.claw.model.fromSavedPost
-import dev.msfjarvis.claw.model.toSavedPost
 import dev.msfjarvis.claw.model.toUIPost
 import java.io.IOException
 import java.io.InputStream
 import java.io.OutputStream
-import java.net.HttpURLConnection
 import java.time.LocalDateTime
 import java.time.ZoneId
 import java.time.format.DateTimeFormatter
@@ -79,7 +75,6 @@ constructor(
         pagingSourceFactory = { pagingSourceFactory.create(api::getHottestPosts) },
       )
       .flow
-      .map(::mapToUIPost)
       .cachedIn(viewModelScope)
   val newestPosts =
     Pager(
@@ -88,7 +83,6 @@ constructor(
         pagingSourceFactory = { pagingSourceFactory.create(api::getNewestPosts) },
       )
       .flow
-      .map(::mapToUIPost)
       .cachedIn(viewModelScope)
   val searchResults =
     Pager(
@@ -97,7 +91,6 @@ constructor(
         pagingSourceFactory = { searchPagingSourceFactory.create { searchQuery } },
       )
       .flow
-      .map(::mapToUIPost)
   val savedPosts = savedPostsRepository.savedPosts.map { it.map(UIPost.Companion::fromSavedPost) }
   val savedPostsByMonth
     get() = savedPosts.map(::groupSavedPosts)
@@ -112,13 +105,6 @@ constructor(
     viewModelScope.launch { readPostsRepository.readPosts.collectLatest { _readPosts = it } }
   }
 
-  private fun mapToUIPost(pagingData: PagingData<LobstersPost>): PagingData<UIPost> {
-    return pagingData.map { post ->
-      val uiPost = post.toUIPost()
-      uiPost.copy(isSaved = isPostSaved(uiPost), isRead = isPostRead(uiPost))
-    }
-  }
-
   private fun groupSavedPosts(items: List<UIPost>): ImmutableMap<String, List<UIPost>> {
     val sorted =
       items.sortedWith { post1, post2 ->
@@ -140,24 +126,19 @@ constructor(
       .toImmutableMap()
   }
 
-  private fun isPostSaved(post: UIPost): Boolean {
-    return _savedPosts.contains(post.shortId)
+  fun toggleSave(post: UIPost) {
+    viewModelScope.launch {
+      savedPostsRepository.toggleSave(post)
+      withContext(mainDispatcher) { SavedPostsWidget(savedPosts).updateAll(getApplication()) }
+    }
   }
 
-  private fun isPostRead(post: UIPost): Boolean {
+  fun isPostRead(post: UIPost): Boolean {
     return _readPosts.contains(post.shortId)
   }
 
-  fun toggleSave(post: UIPost) {
-    viewModelScope.launch(ioDispatcher) {
-      val saved = isPostSaved(post)
-      if (saved) {
-        savedPostsRepository.removePost(post.toSavedPost())
-      } else {
-        savedPostsRepository.savePost(post.toSavedPost())
-      }
-      withContext(mainDispatcher) { SavedPostsWidget(savedPosts).updateAll(getApplication()) }
-    }
+  fun isPostSaved(post: UIPost): Boolean {
+    return _savedPosts.contains(post.shortId)
   }
 
   suspend fun getPostComments(postId: String) =
@@ -166,13 +147,7 @@ constructor(
         is Success -> result.value.toUIPost()
         is Failure.NetworkFailure -> throw result.error
         is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure -> {
-          if (result.code == HttpURLConnection.HTTP_NOT_FOUND) {
-            throw IOException("Story was removed by moderator")
-          } else {
-            throw IOException("API returned an invalid response")
-          }
-        }
+        is Failure.HttpFailure -> throw result.toError()
         is Failure.ApiFailure -> throw IOException("API returned an invalid response")
       }
     }
@@ -192,7 +167,7 @@ constructor(
         is Success -> result.value
         is Failure.NetworkFailure -> throw result.error
         is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure,
+        is Failure.HttpFailure -> throw result.toError()
         is Failure.ApiFailure -> throw IOException("API returned an invalid response")
       }
     }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -11,9 +11,12 @@ import app.cash.sqldelight.coroutines.mapToList
 import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
 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 kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.withContext
 
 class SavedPostsRepository
@@ -24,9 +27,14 @@ constructor(
 ) {
   val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
 
-  suspend fun savePost(post: SavedPost) {
-    Napier.d(tag = TAG) { "Saving post: ${post.shortId}" }
-    withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post) }
+  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) }
+    } else {
+      Napier.d(tag = TAG) { "Saving post: ${post.shortId}" }
+      withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post.toSavedPost()) }
+    }
   }
 
   suspend fun savePosts(posts: List<SavedPost>) {
@@ -38,11 +46,6 @@ constructor(
     }
   }
 
-  suspend fun removePost(post: SavedPost) {
-    Napier.d(tag = TAG) { "Removing post: ${post.shortId}" }
-    withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
-  }
-
   private companion object {
     private const val TAG = "SavedPostsRepository"
   }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2024 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2024 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2021-2024 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2022-2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2022-2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2023 Harsh Shandilya.
+ ~ 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.

android/src/screenshotTest/kotlin/dev/msfjarvis/claw/android/ui/lists/NetworkPostsTest.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.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/version.properties

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

api/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -11,6 +11,7 @@ plugins {
   id("dev.msfjarvis.claw.kotlin-android")
   alias(libs.plugins.anvil)
   alias(libs.plugins.whetstone)
+  alias(libs.plugins.dependencyAnalysis)
 }
 
 android { namespace = "dev.msfjarvis.claw.api" }
@@ -18,17 +19,19 @@ android { namespace = "dev.msfjarvis.claw.api" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  api(libs.eithernet)
+  api(libs.dagger)
+  api(libs.javax.inject)
+  api(libs.okhttp.core)
   api(libs.retrofit)
   api(projects.model)
 
-  implementation(libs.dagger)
-  implementation(libs.javax.inject)
+  implementation(libs.eithernet)
+  implementation(libs.eithernet.integration.retrofit)
   implementation(libs.jsoup)
 
-  testImplementation(testFixtures(libs.eithernet))
+  testImplementation(libs.eithernet.test.fixtures)
   testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.kotlinx.serialization.core)
   testImplementation(libs.kotlinx.serialization.json)
-  testImplementation(libs.retrofit.kotlinxSerializationConverter)
   addTestDependencies(project)
 }

api/lint-baseline.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="true" name="AGP (8.3.0)" variant="all" version="8.3.0">
+<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>

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.
@@ -19,8 +19,9 @@ object CSRFTokenConverter : Converter<ResponseBody, CSRFToken> {
     val token =
       Jsoup.parse(value.string(), LobstersApi.BASE_URL)
         .select("meta[name=\"csrf-token\"]")
-        .first()!!
-        .attr("content")
+        .firstOrNull()
+        ?.attr("content")
+        .orEmpty()
     return CSRFToken(token)
   }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.
@@ -8,7 +8,6 @@ package dev.msfjarvis.claw.api.converters
 
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.model.LobstersPost
-import dev.msfjarvis.claw.model.User
 import java.lang.reflect.Type
 import okhttp3.ResponseBody
 import org.jsoup.Jsoup
@@ -32,8 +31,12 @@ 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 =
-      getSubmitter(elem.select("div.byline").first() ?: error("No byline element found"))
+    val submitter = elem.select("div.byline > a.u-author").text()
+    val userIsAuthor =
+      (elem.select("div.byline > span").first()?.text() ?: "").contains(
+        "authored",
+        ignoreCase = true,
+      )
     return LobstersPost(
       shortId = shortId,
       title = title,
@@ -45,6 +48,7 @@ object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
       // The value of these fields is irrelevant for our use case
       createdAt = "",
       description = "",
+      userIsAuthor = userIsAuthor,
     )
   }
 
@@ -55,24 +59,6 @@ object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
     return (countString.toIntOrNull() ?: 0) to commentsUrl
   }
 
-  /**
-   * Make a bare-bones [User] object given a byline [elem]. We only need this to be usable for
-   * displaying in a list.
-   */
-  private fun getSubmitter(elem: Element): User {
-    val userElement = elem.select("a.u-author")
-    val avatarElement = elem.select("img.avatar")
-    val username = userElement.text()
-    val avatarUrl = avatarElement.attr("src")
-    return User(
-      username = username,
-      about = "",
-      invitedBy = null,
-      avatarUrl = avatarUrl,
-      createdAt = "",
-    )
-  }
-
   object Factory : Converter.Factory() {
     override fun responseBodyConverter(
       type: Type,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023-2024 Harsh Shandilya.
+ * 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.
@@ -7,8 +7,8 @@
 package dev.msfjarvis.claw.api.injection
 
 import com.deliveryhero.whetstone.app.ApplicationScope
-import com.slack.eithernet.ApiResultCallAdapterFactory
-import com.slack.eithernet.ApiResultConverterFactory
+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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.
@@ -33,7 +33,7 @@ class ApiTest {
     val posts = api.getHottestPosts(1)
     assertIs<Success<List<LobstersPost>>>(posts)
     val commentsOnlyPosts = posts.value.asSequence().filter { it.url.isEmpty() }.toSet()
-    assertThat(commentsOnlyPosts).hasSize(2)
+    assertThat(commentsOnlyPosts).hasSize(1)
   }
 
   @Test

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.
@@ -10,7 +10,6 @@ import com.google.common.truth.Truth.assertThat
 import com.slack.eithernet.ApiResult
 import com.slack.eithernet.test.newEitherNetController
 import dev.msfjarvis.claw.model.LobstersPost
-import dev.msfjarvis.claw.model.User
 import dev.msfjarvis.claw.util.TestUtils.assertIs
 import kotlinx.coroutines.test.runTest
 import org.junit.jupiter.api.Test
@@ -38,9 +37,10 @@ class SearchApiTest {
           createdAt = "",
           commentCount = 3,
           commentsUrl = "https://lobste.rs/s/gjlsdg/chatgpt_visits_emacs_doctor",
-          submitter = User("xenodium", "", null, "/avatars/xenodium-16.png", ""),
+          submitter = "xenodium",
           tags = listOf("ai", "emacs"),
           description = "",
+          userIsAuthor = true,
         ),
         LobstersPost(
           shortId = "astcqf",
@@ -50,9 +50,10 @@ class SearchApiTest {
           createdAt = "",
           commentCount = 0,
           commentsUrl = "https://lobste.rs/s/astcqf/implementing_question_answering_system",
-          submitter = User("asteroid", "", null, "/avatars/asteroid-16.png", ""),
+          submitter = "asteroid",
           tags = listOf("ai"),
           description = "",
+          userIsAuthor = false,
         ),
       )
   }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -15,7 +15,9 @@ import kotlin.contracts.contract
 object TestUtils {
   fun getResource(path: String): String {
     // Load the JSON response
-    val uri = javaClass.classLoader!!.getResource(path)
+    val uri =
+      requireNotNull(javaClass.classLoader) { "if this is null something has gone very wrong" }
+        .getResource(path)
     val file = File(uri.path)
     return String(file.readBytes())
   }

api/src/test/resources/msfjarvis.json

@@ -1 +1 @@
-{"username":"msfjarvis","created_at":"2020-04-24T11:41:56.000-05:00","is_admin":false,"about":"Android and Kotlin developer\r\n","is_moderator":false,"karma":574,"avatar_url":"/avatars/msfjarvis-100.png","invited_by_user":"Amolith","github_username":"msfjarvis","twitter_username":"msfjarvis"}
+{"username":"msfjarvis","created_at":"2020-04-24T11:41:56.000-05:00","is_admin":false,"about":"Android and Kotlin developer, currently working for [Dyte](https://dyte.io/)","is_moderator":false,"karma":1343,"avatar_url":"/avatars/msfjarvis-100.png","invited_by_user":"Amolith","github_username":"msfjarvis"}

benchmark/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2024 Harsh Shandilya.
+ * 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.
@@ -10,6 +10,7 @@ plugins {
   id(libs.plugins.android.test.get().pluginId)
   id("dev.msfjarvis.claw.kotlin-android")
   alias(libs.plugins.baselineprofile)
+  alias(libs.plugins.dependencyAnalysis)
 }
 
 android {

benchmark/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <!--
- ~ Copyright © 2022-2023 Harsh Shandilya.
+ ~ 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.

build-logic/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2024 Harsh Shandilya.
+ * 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.
@@ -7,6 +7,7 @@
 plugins {
   `kotlin-dsl`
   alias(libs.plugins.android.lint)
+  alias(libs.plugins.dependencyAnalysis)
 }
 
 kotlin.jvmToolchain(17)
@@ -78,5 +79,5 @@ dependencies {
   // Expose the generated version catalog API to the plugin.
   implementation(files(libs::class.java.superclass.protectionDomain.codeSource.location))
 
-  lintChecks(libs.androidx.lint)
+  lintChecks(libs.androidx.lint.gradle)
 }

build-logic/lint-baseline.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.3.0" type="baseline" client="gradle" dependencies="false" name="AGP (8.3.0)" variant="all" version="8.3.0">
+<issues format="6" by="lint 8.7.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.7.1)" variant="all" version="8.7.1">
+
+    <issue
+        id="GradleProjectIsolation"
+        message="Avoid using method getRootProject"
+        errorLine1="    val collectorTask = project.rootProject.tasks.named&lt;Copy>(&quot;collectLintReports&quot;)"
+        errorLine2="                                ~~~~~~~~~~~">
+        <location
+            file="src/main/kotlin/dev/msfjarvis/claw/gradle/LintConfig.kt"
+            line="51"
+            column="33"/>
+    </issue>
 
 </issues>