feat(release): bump version

Thx Static-Var my beloved

.git-blame-ignore-revs

@@ -6,3 +6,6 @@ cbdfa67d075ec1f8ceec0f3559498cbca01783a0
 
 # Renamed Renovate config file
 f304304bc5b64edf189aaa473b05df912067a8bd
+
+# Refactored database module into core and impl
+7b0b206905b8dc1f824a2d2a10e3d94c6b9dd11c

.gitattributes

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

.github/renovate.json5

@@ -1,4 +1,5 @@
 {
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
     "config:base",
     ":dependencyDashboard",
@@ -19,39 +20,39 @@
       ],
     },
     {
-      "matchPackagePatterns": [
-        "^androidx.*",
+      "matchPackageNames": [
+        "androidx.compose.compiler:compiler",
+        "com.google.devtools.ksp",
+        "dev.drewhamilton.poko",
+        "org.jetbrains.kotlin:kotlin-gradle-plugin",
+        "org.jetbrains.kotlin.plugin.serialization",
       ],
-      "groupName": "androidx"
+      "groupName": "Kotlin and Compose",
     },
     {
       "matchPackagePatterns": [
-        "^kotlin",
-        "^org.jetbrains.kotlin",
-        "^androidx.compose.compiler",
-        "^anvil",
-        "^coil",
+        "^androidx.*",
       ],
-      "enabled": false
+      "groupName": "AndroidX"
     },
     {
       "matchPackagePatterns": [
         "^io.sentry",
         "^sentry",
       ],
-      "groupName": "sentry"
+      "groupName": "Sentry"
     },
     {
-      "managers": [
-        "gradle"
+      "matchPackagePatterns": [
+        "^com.squareup.anvil"
       ],
-      "packagePatterns": [
-        // Renovate refuses to stop resolving this from the snapshots repo
-        "^app.cash.sqldelight",
-        // Currently on a pre-release version for bugfixes
-        "com.android.tools:r8",
+      "allowedVersions": "!/.*-1-8$/",
+    },
+    {
+      "matchPackagePatterns": [
+        "^androidx.glance",
       ],
-      "enabled": false
+      "allowedVersions": "<=1.0.0",
     },
   ],
   "regexManagers": [
@@ -77,16 +78,5 @@
       "depNameTemplate": "androidx.compose.compiler:compiler",
       "registryUrlTemplate": "https://maven.google.com",
     },
-    {
-      "fileMatch": [
-        "gradle/libs.versions.toml"
-      ],
-      "matchStrings": [
-        "sentry-sdk = \"(?<currentValue>.*)\""
-      ],
-      "datasourceTemplate": "maven",
-      "depNameTemplate": "io.sentry:sentry-android",
-      "registryUrlTemplate": "https://repo1.maven.org/maven2/",
-    }
-  ]
+  ],
 }

.github/workflows/baseline-profile.yml

@@ -1,105 +0,0 @@
-name: Baseline profile generation
-
-on:
-  # every day at 00:43
-  schedule:
-    - cron: '43 0 * * *'
-  workflow_dispatch:
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  baseline-profile:
-    runs-on: macos-latest
-    timeout-minutes: 45
-    env:
-      TERM: dumb
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-      with:
-        token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
-        fetch-depth: 0
-
-    - name: Accept all SDK licenses
-      shell: bash
-      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-
-    - name: Get build-tools directory
-      id: build-tools-path
-      shell: bash
-      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
-
-    - name: Cache build-tools
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
-      with:
-        path: ${{ steps.build-tools-path.outputs.dir }}
-        key: ${{ runner.os }}-34.0.0-rc3
- 
-    - name: Set up JDK
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Set up Git author
-      shell: bash
-      run: |
-        git config user.name "GitHub Actions"
-        git config user.email noreply@github.com
-
-    - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
-      with:
-        gradle-home-cache-cleanup: true
-        cache-read-only: true
-
-    - name: Decrypt secrets
-      run: |
-        ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
-      env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-
-    # This allows us to build most of what we need without the emulator running
-    # and using resources
-    - name: Build app and benchmark
-      run: ./gradlew :benchmark:assembleBenchmark :android:assembleBenchmark
-
-    - name: Clear unused Gradle Managed Devices
-      run: ./gradlew cleanManagedDevices --unused-only
-
-    - name: Run benchmark on Gradle Managed Device
-      run: |
-        ./gradlew api31BenchmarkAndroidTest \
-          -Dorg.gradle.workers.max=1 \
-          -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile \
-          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
-
-    # If we're on main branch, copy over the baseline profile and
-    # commit it to the repository (if changed)
-    - name: Commit baseline profile into main
-      if: github.ref == 'refs/heads/main'
-      run: |
-        # Pull down any changes which may have been committed while this workflow has been running
-        git pull
-        # Sort the baseline profile, output to android/
-        sort -o android/src/main/baseline-prof.txt benchmark/build/outputs/managed_device_android_test_additional_output/benchmark/api31/BaselineProfileGenerator_generateBaselineProfile-baseline-prof.txt
-        # If the baseline profile has changed, commit it
-        if [[ $(git diff --stat android/src/main/baseline-prof.txt) != '' ]]; then
-          git add android/src/main/baseline-prof.txt
-          git commit -m "chore(android): refresh baseline profile" && git push
-        fi
-
-    # Upload the entire output folder and attach it to the CI run
-    - name: Attach baseline profile
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-      with:
-        name: Baseline profile output
-        path: benchmark/build/outputs/managed_device_android_test_additional_output
-
-    - name: Clean secrets
-      if: always()
-      run: scripts/signing-cleanup.sh

.github/workflows/ci.yml

@@ -12,100 +12,58 @@ on:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   check:
-    runs-on: ubuntu-latest
+    runs-on: macos-14
     steps:
     - name: Checkout repository
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         fetch-depth: 0
 
-    - name: Accept all SDK licenses
-      shell: bash
-      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-
-    - name: Get build-tools directory
-      id: build-tools-path
-      shell: bash
-      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
-
-    - name: Cache build-tools
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
-      with:
-        path: ${{ steps.build-tools-path.outputs.dir }}
-        key: ${{ runner.os }}-34.0.0-rc3
-
     - name: Set up JDK
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         distribution: temurin
         java-version: 18
 
-    - name: Run unit tests
-      uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
       with:
-        arguments: --no-configuration-cache --stacktrace check -PslimTests
-        gradle-home-cache-cleanup: true
         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@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
+      with:
+        path: ./CHANGELOG.md
+        validation_level: error
+
+    - name: Run unit tests
+      run: ./gradlew --no-configuration-cache --stacktrace check -PslimTests
 
     - name: (Fail-only) Upload test report
       if: failure()
-      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
       with:
           name: Test report
-          path: android/build/reports
+          path: '**/build/reports/tests/**'
 
-  deploy-release-snapshot:
-    runs-on: ubuntu-latest
-    if: "github.event_name == 'push' && github.event.ref == 'refs/heads/main'"
-    needs: [ "check" ]
+  dependency-review:
+    runs-on: macos-14
+    if: "github.event_name == 'push' && github.event.ref != 'refs/heads/main'"
+    needs:
+      - check
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - name: Checkout repository
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-    - name: Accept all SDK licenses
-      shell: bash
-      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-
-    - name: Get build-tools directory
-      id: build-tools-path
-      shell: bash
-      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
-
-    - name: Cache build-tools
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
-      with:
-        path: ${{ steps.build-tools-path.outputs.dir }}
-        key: ${{ runner.os }}-34.0.0-rc3
-
-    - name: Set up JDK
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Decrypt secrets
-      run: |
-        ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
-      env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-
-    - name: Build release app
-      uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
-      env:
-        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
-      with:
-        arguments: --no-configuration-cache --stacktrace collectReleaseApks
-        gradle-home-cache-cleanup: true
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-    - name: Clean secrets
-      run: scripts/signing-cleanup.sh
-
-    - name: Deploy snapshot
-      run: scripts/deploy-snapshot.sh
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Dependency Review
+        uses: actions/dependency-review-action@9129d7d40b8c12c1ed0f60400d00c92d437adcce # v4
+        with:
+          base-ref: refs/heads/main
+          head-ref: ${{ github.ref }}

.github/workflows/code_quality_analysis.yml

@@ -0,0 +1,75 @@
+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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      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@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
+      with:
+        languages: java
+        tools: latest
+        queries: +security-extended
+
+    - name: Build project
+      shell: bash
+      run: |
+        ./gradlew assembleDebug assembleInternal
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
+      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@3ab4101902695724f9365a384f86c1074d94e18c # v3.24.7
+        with:
+          sarif_file: results.sarif

.github/workflows/codeql_analysis.yml

@@ -1,66 +0,0 @@
-name: CodeQL
-
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - main
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
-
-    - name: Accept all SDK licenses
-      shell: bash
-      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-
-    - name: Get build-tools directory
-      id: build-tools-path
-      shell: bash
-      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
-
-    - name: Cache build-tools
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
-      with:
-        path: ${{ steps.build-tools-path.outputs.dir }}
-        key: ${{ runner.os }}-34.0.0-rc3
-
-    - name: Set up JDK
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
-      with:
-        gradle-home-cache-cleanup: true
-        cache-read-only: true
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
-      with:
-        languages: java
-        tools: latest
-        queries: +security-extended
-
-    - name: Build project
-      shell: bash
-      run: |
-        ./gradlew assemble -PslimTests
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
-      with:
-        category: "/language:java"

.github/workflows/release.yml

@@ -1,59 +1,50 @@
 name: Release to Google Play
 on:
   workflow_dispatch:
+    inputs:
+      inAppUpdatePriority:
+        description: 'In app update priority (0-5)'
+        type: number
+        default: "0"
+        required: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   publish-google-play-release:
-    runs-on: ubuntu-latest
+    runs-on: macos-14
     steps:
     - name: Checkout repository
-      uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
 
-    - name: Accept all SDK licenses
-      shell: bash
-      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-
-    - name: Get build-tools directory
-      id: build-tools-path
-      shell: bash
-      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
-
-    - name: Cache build-tools
-      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
-      with:
-        path: ${{ steps.build-tools-path.outputs.dir }}
-        key: ${{ runner.os }}-34.0.0-rc3
-
     - name: Set up JDK
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       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
+
     - name: Set up Git author
       shell: bash
       run: |
         git config user.name "GitHub Actions"
         git config user.email noreply@github.com
 
-    - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@40b6781dcdec2762ad36556682ac74e31030cfe2 # v2.5.1
-      with:
-        gradle-home-cache-cleanup: true
-        cache-read-only: true
-
     - name: Decrypt secrets
       run: |
         ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
+        ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
       env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+        AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
 
     - name: Get current version
       shell: bash
@@ -79,14 +70,14 @@ jobs:
         SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
         SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       run: |
-        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle -PsentryUploadMappings
+        ./gradlew --no-configuration-cache 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
@@ -97,11 +88,10 @@ jobs:
         CHANGELOG: ${{ steps.changelog_reader.outputs.changes }}
       run: |
         mkdir -p distribution/whatsnew
-        printf '## Changelog\n\n' > distribution/whatsnew/whatsnew-en-GB
         printf '%s' "${CHANGELOG}" >> distribution/whatsnew/whatsnew-en-GB
 
     - name: Publish bundle to Google Play
-      uses: r0adkll/upload-google-play@70c7397e868b00eccd390222f492ab3e30520d09 # v1.1.1
+      uses: r0adkll/upload-google-play@935ef9c68bb393a8e6116b1575626a7f5be3a7fb # v1.1.3
       with:
         mappingFile: android/bundle/mapping.txt
         packageName: dev.msfjarvis.claw.android
@@ -110,6 +100,7 @@ jobs:
         status: completed
         track: production
         whatsNewDirectory: distribution/whatsnew
+        inAppUpdatePriority: ${{ inputs.inAppUpdatePriority }}
 
     - name: Post-release work
       shell: bash

.github/workflows/tramline-release.yml

@@ -0,0 +1,51 @@
+name: Android release build
+
+on:
+  workflow_dispatch:
+    inputs:
+      versionName:
+        description: 'User-facing release version name'
+        required: true
+        default: ""
+      versionCode:
+        description: 'versionCode or build number'
+        required: true
+        default: ''
+
+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@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+        with:
+          distribution: temurin
+          java-version: 18
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3
+        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 -PenableSentry collectReleaseBundle
+          ./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
+        with:
+          name: release-aab
+          path: android/build/outputs/bundle/release/android-release.aab

.ignore

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

CHANGELOG.md

@@ -7,6 +7,124 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [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.
+
+## [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
+
+## [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
+
+## [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
+
+## [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
+
+## [1.36.0] - 2023-10-04
+
+### Added
+
+*   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
+
+## [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
+
+## [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
+
+### Changed
+
+*   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
+
+## [1.33.0] - 2023-07-31
+
+### Changed
+
+*   Yet another attempt at fixing native library crashes
+*   Rework how baseline profiles are generated
+
+## [1.32.0] - 2023-07-27
+
+### Changed
+
+*   Upgrade to AndroidX July 26 release
+*   Revert selectable text feature due to sporadic crashes
+
+## [1.31.0] - 2023-07-25
+
+### Added
+
+*   Added the ability to search for posts
+*   Text in the comments page is now selectable
+
+### Changed
+
+*   Upgrade to Compose July release
+*   Upgrade to Kotlin 1.9.0
+
 ## [1.30.0] - 2023-07-02
 
 ### Changed
@@ -250,7 +368,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 *   Initial Play Store release
 
-[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.30.0...HEAD
+[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.42.0...HEAD
+
+[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
 

README.md

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

android/benchmark-rules.pro

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

android/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -15,29 +15,42 @@ plugins {
   id("dev.msfjarvis.claw.kotlin-kapt")
   id("dev.msfjarvis.claw.sentry")
   id("dev.msfjarvis.claw.versioning-plugin")
+  alias(libs.plugins.aboutlibraries)
   alias(libs.plugins.anvil)
   alias(libs.plugins.modulegraphassert)
   alias(libs.plugins.whetstone)
+  alias(libs.plugins.baselineprofile)
+  alias(libs.plugins.licensee)
+  alias(libs.plugins.tracelog)
 }
 
 android {
   namespace = "dev.msfjarvis.claw.android"
-  defaultConfig { applicationId = "dev.msfjarvis.claw.android" }
-  buildFeatures { compose = true }
+  defaultConfig.applicationId = "dev.msfjarvis.claw.android"
+  buildFeatures.compose = true
   composeOptions {
     useLiveLiterals = false
     kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
   }
-  buildTypes {
-    create("benchmark") {
-      signingConfig = signingConfigs["debug"]
-      matchingFallbacks += "release"
-      isDebuggable = false
-      proguardFile("benchmark-rules.pro")
-      applicationIdSuffix = ".benchmark"
-    }
+  buildTypes.create("internal") {
+    matchingFallbacks += "release"
+    signingConfig = signingConfigs["debug"]
+    applicationIdSuffix = ".internal"
   }
-  packaging { jniLibs { useLegacyPackaging = true } }
+}
+
+baselineProfile {
+  mergeIntoMain = true
+  saveInSrc = true
+  from(projects.benchmark.dependencyProject)
+}
+
+licensee {
+  allow("Apache-2.0")
+  allow("MIT")
+  ignoreDependencies("com.michael-bull.kotlin-result") { because("kotlin-result is ISC licensed") }
+  ignoreDependencies("org.commonmark") { because("Commonmark is BSD licensed") }
+  allowUrl("https://jsoup.org/license") { because("Jsoup is MIT licensed") }
 }
 
 moduleGraphAssert {
@@ -56,14 +69,14 @@ whetstone {
 dependencies {
   implementation(platform(libs.androidx.compose.bom))
   implementation(platform(libs.okhttp.bom))
-  implementation(libs.accompanist.sysuicontroller)
+  implementation(libs.aboutLibraries.m3)
   implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.compose.material)
+  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.core.splashscreen)
-  implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
@@ -71,19 +84,21 @@ dependencies {
   implementation(libs.androidx.work.runtime)
   implementation(libs.coil)
   implementation(libs.copydown)
-  implementation(libs.crux)
   implementation(libs.dagger)
   implementation(libs.jsoup)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.material3.pulltorefresh)
   implementation(libs.napier)
-  implementation(libs.soloader)
   implementation(libs.sqldelight.extensions.coroutines)
+  implementation(libs.swipe)
+  implementation(libs.unfurl)
   implementation(projects.api)
   implementation(projects.common)
   implementation(projects.core)
-  implementation(projects.database)
+  implementation(projects.database.impl)
   implementation(projects.model)
+  implementation(projects.web)
 
   kapt(libs.dagger.compiler)
 

android/lint-baseline.xml

@@ -1,4 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.0.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.0.1)" variant="all" version="8.0.1">
+<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">
+
+    <issue
+        id="VectorPath"
+        message="Very long vector path (918 characters), which is bad for performance. Considering reducing precision, removing minor details or rasterizing vector."
+        errorLine1="        android:pathData=&quot;M431.3,341.2C435.9,337 580.3,236 710.5,223.8C747.3,220.3 790.7,254.7 833.2,312.5C875.9,370.7 892.9,433.4 875.9,443C863.2,450.2 838.6,407.4 758.8,396.3C743.4,394.2 730.4,393.4 719.4,393.5C738.5,423.4 745.6,451.1 737.2,458C733.1,461.4 673.6,438.7 612.9,436.5C570.1,435 535.2,440.9 506.7,451.3C496.9,454.9 486,453.8 477.2,448.3C444.5,427.9 424.2,406.2 418.4,376.2C415.8,362.8 420.9,349.4 431.3,341.2ZM274.7,394.8C285.8,370.1 312.2,325.9 346.3,305.4C383.6,282.9 335,390.3 427.3,489.8C519.5,589.3 586.5,623.8 655.1,581.5C723.7,539.2 746.5,518.1 753,518.7C764,519.6 772.9,536.1 764.4,589.5C763,598.2 761.3,606.5 759.3,614.2C828.7,575 871.7,516.3 889,520C912,524.8 918.3,617.8 852.1,721C811.8,784 768.8,830.7 741.4,857.5C724.3,874 699.7,880 677,873.1C512,822.6 315.5,733.8 202.9,652C193.8,645.2 186.8,635.9 183,625.1C171.8,593.7 161.3,548.1 168.5,495.3C179.5,414.2 222.7,352.9 245.2,335.9C261.9,323.2 267.1,362.4 274.7,394.8Z&quot;"
+        errorLine2="                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/drawable/ic_launcher_foreground.xml"
+            line="17"
+            column="27"/>
+    </issue>
 
 </issues>

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

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

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

@@ -0,0 +1,9 @@
+<!--
+ ~ 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.
+ -->
+<resources>
+  <string name="app_name">Claw 🤫</string>
+</resources>

android/src/main/AndroidManifest.xml

@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ Copyright © 2021-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.
+ -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools">
 
@@ -20,6 +25,8 @@
     <activity
       android:name=".MainActivity"
       android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
+      android:launchMode="singleTask"
+      android:taskAffinity=""
       android:exported="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
@@ -127,6 +134,19 @@
         <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"
+      android:exported="true"
+      android:label="Claw Search"
+      android:launchMode="singleTask"
+      android:taskAffinity=""
+      android:theme="@style/Theme.Claw">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+      </intent-filter>
+    </activity>
+
     <provider
       android:name="androidx.startup.InitializationProvider"
       android:authorities="${applicationId}.androidx-startup"
@@ -141,23 +161,36 @@
         android:value="androidx.startup"
         tools:node="remove" />
     </provider>
-    <!-- https://issuetracker.google.com/issues/258619948 -->
     <receiver
-      android:name="androidx.profileinstaller.ProfileInstallReceiver"
-      android:permission="android.permission.DUMP"
+      android:name=".glance.WidgetReceiver"
       android:exported="true">
       <intent-filter>
-        <action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
+        <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
       </intent-filter>
+      <meta-data
+        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" android:value="${sentryDsn}" />
+    <meta-data
+      android:name="io.sentry.dsn"
+      android:value="${sentryDsn}" />
     <!-- enable automatic breadcrumbs for user interactions (clicks, swipes, scrolls) -->
-    <meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="${enableSentry}" />
-    <meta-data android:name="io.sentry.breadcrumbs.user-interaction" android:value="${enableSentry}" />
+    <meta-data
+      android:name="io.sentry.traces.user-interaction.enable"
+      android:value="true" />
+    <meta-data
+      android:name="io.sentry.breadcrumbs.user-interaction"
+      android:value="true" />
     <!-- enable screenshot for crashes -->
-    <meta-data android:name="io.sentry.attach-screenshot" android:value="${enableSentry}" />
+    <meta-data
+      android:name="io.sentry.attach-screenshot"
+      android:value="true" />
     <!-- enable view hierarchy for crashes -->
-    <meta-data android:name="io.sentry.attach-view-hierarchy" android:value="${enableSentry}" />
+    <meta-data
+      android:name="io.sentry.attach-view-hierarchy"
+      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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -15,7 +15,6 @@ import androidx.work.WorkManager
 import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.app.ApplicationComponentOwner
 import com.deliveryhero.whetstone.app.ContributesAppInjector
-import com.facebook.soloader.SoLoader
 import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
 import dev.msfjarvis.claw.core.injection.AppPlugin
 import java.util.concurrent.TimeUnit
@@ -32,23 +31,15 @@ class ClawApplication : Application(), ApplicationComponentOwner {
   override fun onCreate() {
     Whetstone.inject(this)
     super.onCreate()
-    SoLoader.init(this, false)
     plugins.forEach { plugin -> plugin.apply(this) }
     val postUpdateWorkRequest =
       PeriodicWorkRequestBuilder<SavedPostUpdaterWorker>(POST_REFRESH_PERIOD, TimeUnit.HOURS)
-        .setConstraints(
-          Constraints.Builder()
-            .setRequiresCharging(false)
-            .setRequiresBatteryNotLow(true)
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .setRequiresDeviceIdle(true)
-            .build()
-        )
+        .setConstraints(Constraints.Builder().setRequiredNetworkType(NetworkType.CONNECTED).build())
         .build()
     WorkManager.getInstance(this)
       .enqueueUniquePeriodicWork(
         "updateSavedPosts",
-        ExistingPeriodicWorkPolicy.UPDATE,
+        ExistingPeriodicWorkPolicy.KEEP,
         postUpdateWorkRequest,
       )
   }

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

@@ -1,60 +1,39 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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
 
-import android.app.assist.AssistContent
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
+import androidx.compose.runtime.Composable
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.core.view.WindowCompat
-import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.activity.ContributesActivityInjector
-import dev.msfjarvis.claw.android.ui.LobstersApp
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import javax.inject.Inject
+import dev.msfjarvis.claw.android.ui.screens.LobstersPostsScreen
 
 @ContributesActivityInjector
-class MainActivity : ComponentActivity() {
-
-  @Inject lateinit var urlLauncher: UrlLauncher
-  @Inject lateinit var htmlConverter: HTMLConverter
-  private var webUri: String? = null
+class MainActivity : BaseActivity() {
 
   @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    installSplashScreen()
-    Whetstone.inject(this)
-    WindowCompat.setDecorFitsSystemWindows(window, false)
-    setContent {
-      val windowSizeClass = calculateWindowSizeClass(this)
-
-      LobstersApp(
-        urlLauncher = urlLauncher,
-        htmlConverter = htmlConverter,
-        windowSizeClass = windowSizeClass,
-        setWebUri = { url -> webUri = url },
-      )
-    }
+  @Composable
+  override fun Content() {
+    val windowSizeClass = calculateWindowSizeClass(this)
+    LobstersPostsScreen(
+      urlLauncher = urlLauncher,
+      htmlConverter = htmlConverter,
+      windowSizeClass = windowSizeClass,
+      setWebUri = { url -> webUri = url },
+    )
   }
 
-  override fun onProvideAssistContent(outContent: AssistContent?) {
-    super.onProvideAssistContent(outContent)
-    if (outContent != null) {
-      if (webUri != null) {
-        outContent.webUri = Uri.parse(webUri)
-      } else {
-        outContent.webUri = null
-      }
-    }
+  override fun preLaunch() {
+    super.preLaunch()
+    installSplashScreen()
+  }
+
+  companion object {
+    const val NAVIGATION_KEY = "postId"
   }
 }

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

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

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2023-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.glance
+
+import android.content.Context
+import android.os.Build
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.unit.dp
+import androidx.glance.GlanceId
+import androidx.glance.GlanceModifier
+import androidx.glance.GlanceTheme
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.appWidgetBackground
+import androidx.glance.appwidget.lazy.LazyColumn
+import androidx.glance.appwidget.lazy.items
+import androidx.glance.appwidget.provideContent
+import androidx.glance.background
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.fillMaxSize
+import androidx.glance.layout.padding
+import androidx.glance.material3.ColorProviders
+import androidx.glance.text.Text
+import androidx.glance.text.TextStyle
+import dev.msfjarvis.claw.common.theme.DarkThemeColors
+import dev.msfjarvis.claw.common.theme.LightThemeColors
+import dev.msfjarvis.claw.model.UIPost
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
+
+class SavedPostsWidget(private val posts: Flow<List<UIPost>>) : GlanceAppWidget() {
+  override suspend fun provideGlance(context: Context, id: GlanceId) {
+    val postWindow = posts.first().take(50).toImmutableList()
+    provideContent {
+      GlanceTheme(
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) GlanceTheme.colors
+        else ColorProviders(light = LightThemeColors, dark = DarkThemeColors)
+      ) {
+        WidgetHost(postWindow)
+      }
+    }
+  }
+}
+
+@Composable
+fun WidgetHost(posts: ImmutableList<UIPost>, modifier: GlanceModifier = GlanceModifier) {
+  LazyColumn(
+    modifier =
+      modifier.fillMaxSize().background(GlanceTheme.colors.background).appWidgetBackground(),
+    horizontalAlignment = Alignment.CenterHorizontally,
+  ) {
+    item {
+      val style = MaterialTheme.typography.titleLarge
+      Text(
+        text = "Saved posts",
+        style =
+          TextStyle(
+            color = GlanceTheme.colors.onBackground,
+            fontSize = style.fontSize,
+            fontWeight = style.fontWeight.toGlance(),
+            fontStyle = style.fontStyle.toGlance(),
+          ),
+        modifier = GlanceModifier.padding(vertical = 8.dp),
+      )
+    }
+    items(posts) { post -> WidgetListEntry(post = post) }
+  }
+}

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

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

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

@@ -0,0 +1,30 @@
+/*
+ * Copyright © 2023-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.glance
+
+import android.content.Context
+import android.content.Intent
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+import com.deliveryhero.whetstone.Whetstone
+import com.deliveryhero.whetstone.broadcastreceiver.ContributesBroadcastReceiverInjector
+import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
+import javax.inject.Inject
+
+@ContributesBroadcastReceiverInjector
+class WidgetReceiver : GlanceAppWidgetReceiver() {
+
+  @Inject lateinit var viewModel: ClawViewModel
+
+  override val glanceAppWidget: GlanceAppWidget
+    get() = SavedPostsWidget(viewModel.savedPosts)
+
+  override fun onReceive(context: Context, intent: Intent) {
+    Whetstone.inject(this, context)
+    super.onReceive(context, intent)
+  }
+}

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

@@ -0,0 +1,27 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.glance
+
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
+
+fun FontWeight?.toGlance(): androidx.glance.text.FontWeight? {
+  return when (this) {
+    FontWeight.Normal -> androidx.glance.text.FontWeight.Normal
+    FontWeight.Medium -> androidx.glance.text.FontWeight.Medium
+    FontWeight.Bold -> androidx.glance.text.FontWeight.Bold
+    else -> null
+  }
+}
+
+fun FontStyle?.toGlance(): androidx.glance.text.FontStyle? {
+  return when (this) {
+    FontStyle.Normal -> androidx.glance.text.FontStyle.Normal
+    FontStyle.Italic -> androidx.glance.text.FontStyle.Italic
+    else -> null
+  }
+}

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

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

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

@@ -16,5 +16,5 @@ import dev.msfjarvis.claw.common.comments.HTMLConverter
 @Module
 @ContributesTo(ApplicationScope::class)
 interface HTMLConverterModule {
-  @Binds fun HTMLConverterImpl.bind(): HTMLConverter
+  @Binds fun bindHTMLConverter(impl: HTMLConverterImpl): HTMLConverter
 }

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

@@ -1,25 +1,38 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * 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.injection
 
-import com.chimbori.crux.Crux
 import com.deliveryhero.whetstone.app.ApplicationScope
 import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
+import io.github.aakira.napier.Napier
+import me.saket.unfurl.UnfurlLogger
+import me.saket.unfurl.Unfurler
 import okhttp3.OkHttpClient
 
 @Module
 @ContributesTo(ApplicationScope::class)
 object MetadataExtractorModule {
   @Provides
-  fun provideCrux(
-    okHttpClient: OkHttpClient,
-  ): Crux {
-    return Crux(okHttpClient = okHttpClient)
+  fun provideUnfurlLogger(): UnfurlLogger {
+    return object : UnfurlLogger {
+      override fun log(message: String) {
+        Napier.d { message }
+      }
+
+      override fun log(e: Throwable, message: String) {
+        Napier.e(e) { message }
+      }
+    }
+  }
+
+  @Provides
+  fun provideUnfurler(okHttpClient: OkHttpClient, logger: UnfurlLogger): Unfurler {
+    return Unfurler(httpClient = okHttpClient, logger = logger)
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -7,9 +7,9 @@
 package dev.msfjarvis.claw.android.injection
 
 import android.content.Context
-import com.deliveryhero.whetstone.ForScope
 import com.deliveryhero.whetstone.activity.ActivityScope
 import com.squareup.anvil.annotations.ContributesTo
+import com.squareup.anvil.annotations.optional.ForScope
 import dagger.Module
 import dagger.Provides
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-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.
@@ -17,18 +17,14 @@ import dev.msfjarvis.claw.core.injection.AppPlugin
 import javax.inject.Inject
 
 @ContributesMultibinding(ApplicationScope::class)
-class WorkManagerPlugin
-@Inject
-constructor(
-  private val workerFactory: WorkerFactory,
-) : AppPlugin {
+class WorkManagerPlugin @Inject constructor(private val workerFactory: WorkerFactory) : AppPlugin {
   override fun apply(application: Application) {
     WorkManager.initialize(
       application,
       Configuration.Builder()
         .setWorkerFactory(workerFactory)
         .setMinimumLoggingLevel(Log.DEBUG)
-        .build()
+        .build(),
     )
   }
 }

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

@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2021-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.paging
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import com.slack.eithernet.ApiResult
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
+import dev.msfjarvis.claw.api.LobstersSearchApi
+import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.model.LobstersPost
+import java.io.IOException
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+/**
+ * Specialized variant of [LobstersPagingSource] to prevent hammering the Lobsters search endpoint
+ * with unnecessary requests. Rather than abstract out the API call this paging source takes in the
+ * relevant parameters to short-circuit when there is no query specified in order to avoid calling
+ * the API at all.
+ */
+class SearchPagingSource
+@AssistedInject
+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> {
+    val searchQuery = queryProvider()
+    // If there is no query, we don't need to call the API at all.
+    if (searchQuery.isEmpty()) {
+      return LoadResult.Page(itemsBefore = 0, data = emptyList(), prevKey = null, nextKey = null)
+    }
+    val page = params.key ?: STARTING_PAGE_INDEX
+    val result = withContext(ioDispatcher) { searchApi.searchPosts(searchQuery, page) }
+    return when (result) {
+      is ApiResult.Success -> {
+        // Optimization: prevent fetching more pages if we found no items, this means
+        // there is no active search query.
+        val nextKey = if (result.value.isEmpty()) null else page + 1
+        LoadResult.Page(
+          itemsBefore = (page - 1) * PAGE_SIZE,
+          data = result.value,
+          prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
+          nextKey = nextKey,
+        )
+      }
+      is ApiResult.Failure.NetworkFailure -> LoadResult.Error(result.error)
+      is ApiResult.Failure.UnknownFailure -> LoadResult.Error(result.error)
+      is ApiResult.Failure.HttpFailure,
+      is ApiResult.Failure.ApiFailure ->
+        LoadResult.Error(IOException("API returned an invalid response"))
+    }
+  }
+
+  @AssistedFactory
+  interface Factory {
+    fun create(queryProvider: () -> String): SearchPagingSource
+  }
+}

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

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

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

@@ -1,270 +0,0 @@
-/*
- * Copyright © 2021-2023 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui
-
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.core.tween
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
-import androidx.compose.material.icons.filled.Favorite
-import androidx.compose.material.icons.filled.ImportExport
-import androidx.compose.material.icons.filled.NewReleases
-import androidx.compose.material.icons.filled.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.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.SnackbarHost
-import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Text
-import androidx.compose.material3.windowsizeclass.WindowSizeClass
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.semantics.semantics
-import androidx.compose.ui.semantics.testTagsAsResourceId
-import androidx.compose.ui.text.font.FontWeight
-import androidx.navigation.NavType
-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.paging.compose.collectAsLazyPagingItems
-import com.deliveryhero.whetstone.compose.injectedViewModel
-import dev.msfjarvis.claw.android.R
-import dev.msfjarvis.claw.android.ui.datatransfer.DataTransferScreen
-import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
-import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
-import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
-import dev.msfjarvis.claw.android.ui.decorations.TransparentSystemBars
-import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
-import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
-import dev.msfjarvis.claw.android.ui.navigation.ClawNavigationType
-import dev.msfjarvis.claw.android.ui.navigation.Destinations
-import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.api.LobstersApi
-import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.theme.LobstersTheme
-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.coroutines.launch
-
-@OptIn(ExperimentalComposeUiApi::class)
-@Composable
-fun LobstersApp(
-  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
-  windowSizeClass: WindowSizeClass,
-  setWebUri: (String?) -> Unit,
-  modifier: Modifier = Modifier,
-  viewModel: ClawViewModel = injectedViewModel(),
-) {
-  val hottestListState = rememberLazyListState()
-  val newestListState = rememberLazyListState()
-  val savedListState = rememberLazyListState()
-  val navController = rememberNavController()
-  val coroutineScope = rememberCoroutineScope()
-  val snackbarHostState = remember { SnackbarHostState() }
-  val postActions = rememberPostActions(urlLauncher, navController, viewModel)
-  val backStackEntry by navController.currentBackStackEntryAsState()
-  val currentDestination = backStackEntry?.destination?.route
-  val context = LocalContext.current
-
-  val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
-  val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
-  val savedPosts by viewModel.savedPosts.collectAsState(persistentMapOf())
-
-  val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
-
-  LobstersTheme(
-    dynamicColor = true,
-    providedValues = arrayOf(LocalUriHandler provides urlLauncher),
-  ) {
-    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(
-          label = "Newest",
-          route = Destinations.Newest.route,
-          icon = Icons.Outlined.NewReleases,
-          selectedIcon = Icons.Filled.NewReleases,
-        ) {
-          coroutineScope.launch { 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) }
-        },
-      )
-
-    TransparentSystemBars()
-
-    Scaffold(
-      topBar = {
-        ClawAppBar(
-          navigationIcon = {
-            if (
-              navController.previousBackStackEntry != null &&
-                navItems.none { it.route == currentDestination }
-            ) {
-              IconButton(
-                onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
-              ) {
-                Icon(
-                  imageVector = Icons.Filled.ArrowBack,
-                  contentDescription = "Go back to previous screen",
-                )
-              }
-            }
-          },
-          title = {
-            if (navItems.any { it.route == currentDestination }) {
-              Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
-            }
-          },
-          actions = {
-            if (navItems.any { it.route == currentDestination }) {
-              IconButton(onClick = { navController.navigate(Destinations.DataTransfer.route) }) {
-                Icon(
-                  imageVector = Icons.Filled.ImportExport,
-                  contentDescription = "Data transfer options"
-                )
-              }
-            }
-          },
-        )
-      },
-      bottomBar = {
-        AnimatedVisibility(visible = navigationType == ClawNavigationType.BOTTOM_NAVIGATION) {
-          ClawNavigationBar(
-            navController = navController,
-            items = navItems,
-            isVisible = navItems.any { it.route == currentDestination },
-          )
-        }
-      },
-      snackbarHost = { SnackbarHost(snackbarHostState) },
-      modifier = modifier.semantics { testTagsAsResourceId = true },
-    ) { paddingValues ->
-      Row(modifier = Modifier.padding(paddingValues)) {
-        AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
-          ClawNavigationRail(
-            navController = navController,
-            items = navItems,
-            isVisible = navItems.any { it.route == currentDestination },
-          )
-        }
-
-        NavHost(
-          navController = navController,
-          startDestination = Destinations.startDestination.route,
-          // Make animations 2x faster than default specs
-          enterTransition = { fadeIn(animationSpec = tween(350)) },
-          exitTransition = { fadeOut(animationSpec = tween(350)) },
-        ) {
-          val uri = LobstersApi.BASE_URL
-          composable(route = Destinations.Hottest.route) {
-            setWebUri("https://lobste.rs/")
-            NetworkPosts(
-              lazyPagingItems = hottestPosts,
-              listState = hottestListState,
-              isPostSaved = viewModel::isPostSaved,
-              postActions = postActions,
-            )
-          }
-          composable(route = Destinations.Newest.route) {
-            setWebUri("https://lobste.rs/")
-            NetworkPosts(
-              lazyPagingItems = newestPosts,
-              listState = newestListState,
-              isPostSaved = viewModel::isPostSaved,
-              postActions = postActions,
-            )
-          }
-          composable(route = Destinations.Saved.route) {
-            setWebUri(null)
-            DatabasePosts(
-              items = savedPosts,
-              listState = savedListState,
-              postActions = postActions,
-            )
-          }
-          composable(
-            route = Destinations.Comments.route,
-            arguments = listOf(navArgument("postId") { type = NavType.StringType }),
-            deepLinks =
-              listOf(
-                navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}/.*" },
-                navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}" },
-              ),
-          ) { backStackEntry ->
-            val postId = requireNotNull(backStackEntry.arguments?.getString("postId"))
-            setWebUri("https://lobste.rs/s/$postId")
-            CommentsPage(
-              postId = postId,
-              postActions = postActions,
-              htmlConverter = htmlConverter,
-              getSeenComments = viewModel::getSeenComments,
-              markSeenComments = viewModel::markSeenComments,
-            )
-          }
-          composable(
-            route = Destinations.User.route,
-            arguments = listOf(navArgument("username") { type = NavType.StringType }),
-            deepLinks =
-              listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }),
-          ) { backStackEntry ->
-            val username = requireNotNull(backStackEntry.arguments?.getString("username"))
-            setWebUri("https://lobste.rs/u/$username")
-            UserProfile(
-              username = username,
-              getProfile = viewModel::getUserProfile,
-            )
-          }
-          composable(route = Destinations.DataTransfer.route) {
-            DataTransferScreen(
-              context = context,
-              dataTransferRepository = viewModel.dataTransferRepository,
-              snackbarHostState = snackbarHostState,
-            )
-          }
-        }
-      }
-    }
-  }
-}

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * Copyright © 2022-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.
@@ -16,9 +16,8 @@ import dev.msfjarvis.claw.android.ui.navigation.Destinations
 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.database.local.SavedPost
 import dev.msfjarvis.claw.model.LinkMetadata
-import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.UIPost
 
 fun Context.getActivity(): ComponentActivity? {
   return when (this) {
@@ -36,14 +35,16 @@ fun rememberPostActions(
 ): PostActions {
   return remember {
     object : PostActions {
-      override fun viewPost(postUrl: String, commentsUrl: String) {
+      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)
+          Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, postId)
         if (currentRoute != Destinations.Comments.route) navController.navigate(newRoute)
       }
 
@@ -57,11 +58,11 @@ fun rememberPostActions(
         urlLauncher.openUri(commentsUrl.replaceAfterLast('/', "r"))
       }
 
-      override fun toggleSave(post: SavedPost) {
+      override fun toggleSave(post: UIPost) {
         viewModel.toggleSave(post)
       }
 
-      override suspend fun getComments(postId: String): LobstersPostDetails {
+      override suspend fun getComments(postId: String): UIPost {
         return viewModel.getPostComments(postId)
       }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -17,7 +17,7 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Inbox
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -27,14 +27,13 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
-import dev.msfjarvis.claw.database.local.SavedPost
-import java.time.Month
+import dev.msfjarvis.claw.model.UIPost
 import kotlinx.collections.immutable.ImmutableMap
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun DatabasePosts(
-  items: ImmutableMap<Month, List<SavedPost>>,
+  items: ImmutableMap<String, List<UIPost>>,
   listState: LazyListState,
   postActions: PostActions,
   modifier: Modifier = Modifier,
@@ -53,17 +52,10 @@ fun DatabasePosts(
     } else {
       LazyColumn(state = listState) {
         items.forEach { (month, posts) ->
-          stickyHeader(contentType = "month-header") { MonthHeader(month = month) }
-          items(
-            items = posts,
-            contentType = { "LobstersItem" },
-          ) { item ->
-            ListItem(
-              item = item,
-              isSaved = { true },
-              postActions = postActions,
-            )
-            Divider()
+          stickyHeader(contentType = "month-header") { MonthHeader(label = month) }
+          items(items = posts, key = { it.shortId }, contentType = { "LobstersItem" }) { item ->
+            LobstersListItem(item = item, refresh = {}, postActions = postActions)
+            HorizontalDivider()
           }
         }
       }

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

@@ -1,31 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui.lists
-
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.produceState
-import androidx.compose.ui.Modifier
-import dev.msfjarvis.claw.common.posts.LobstersCard
-import dev.msfjarvis.claw.common.posts.PostActions
-import dev.msfjarvis.claw.database.local.SavedPost
-
-@Composable
-fun ListItem(
-  item: SavedPost,
-  isSaved: suspend (SavedPost) -> Boolean,
-  postActions: PostActions,
-  modifier: Modifier = Modifier,
-) {
-  val saved by produceState(false, item) { value = isSaved(item) }
-  LobstersCard(
-    post = item,
-    isSaved = saved,
-    postActions = postActions,
-    modifier = modifier,
-  )
-}

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

@@ -0,0 +1,38 @@
+/*
+ * 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.lists
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Reply
+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
+import dev.msfjarvis.claw.common.posts.PostActions
+import dev.msfjarvis.claw.model.UIPost
+import me.saket.swipe.SwipeAction
+import me.saket.swipe.SwipeableActionsBox
+
+@Composable
+fun LobstersListItem(
+  item: UIPost,
+  postActions: PostActions,
+  refresh: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val commentsAction =
+    SwipeAction(
+      icon = rememberVectorPainter(Icons.AutoMirrored.Filled.Reply),
+      background = MaterialTheme.colorScheme.tertiary,
+      onSwipe = { postActions.viewCommentsPage(item.commentsUrl) },
+    )
+  SwipeableActionsBox(endActions = listOf(commentsAction)) {
+    LobstersCard(post = item, postActions = postActions, refresh = refresh, modifier = modifier)
+  }
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -14,13 +14,8 @@ 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.material.ExperimentalMaterialApi
-import androidx.compose.material.pullrefresh.PullRefreshIndicator
-import androidx.compose.material.pullrefresh.pullRefresh
-import androidx.compose.material.pullrefresh.rememberPullRefreshState
-import androidx.compose.material3.Divider
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.contentColorFor
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -28,25 +23,26 @@ import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
 import androidx.paging.compose.itemContentType
+import androidx.paging.compose.itemKey
 import dev.msfjarvis.claw.common.posts.PostActions
-import dev.msfjarvis.claw.common.posts.toDbModel
 import dev.msfjarvis.claw.common.ui.NetworkError
 import dev.msfjarvis.claw.common.ui.ProgressBar
-import dev.msfjarvis.claw.database.local.SavedPost
-import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.model.UIPost
+import eu.bambooapps.material3.pullrefresh.PullRefreshIndicator
+import eu.bambooapps.material3.pullrefresh.pullRefresh
+import eu.bambooapps.material3.pullrefresh.rememberPullRefreshState
 
-@OptIn(ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun NetworkPosts(
-  lazyPagingItems: LazyPagingItems<LobstersPost>,
+  lazyPagingItems: LazyPagingItems<UIPost>,
   listState: LazyListState,
-  isPostSaved: suspend (SavedPost) -> Boolean,
   postActions: PostActions,
   modifier: Modifier = Modifier,
 ) {
   ReportDrawnWhen { lazyPagingItems.itemCount > 0 }
   val refreshLoadState = lazyPagingItems.loadState.refresh
-  val isRefreshing = refreshLoadState == LoadState.Loading
+  val isRefreshing = refreshLoadState == LoadState.Loading && lazyPagingItems.itemCount == 0
   val pullRefreshState = rememberPullRefreshState(isRefreshing, lazyPagingItems::refresh)
   Box(modifier = modifier.fillMaxSize().pullRefresh(pullRefreshState)) {
     if (lazyPagingItems.itemCount == 0 && refreshLoadState is LoadState.Error) {
@@ -56,23 +52,20 @@ fun NetworkPosts(
         modifier = Modifier.align(Alignment.Center),
       )
     } else {
-      LazyColumn(
-        state = listState,
-      ) {
+      LazyColumn(state = listState) {
         items(
           count = lazyPagingItems.itemCount,
+          key = lazyPagingItems.itemKey { it.shortId },
           contentType = lazyPagingItems.itemContentType { "LobstersItem" },
         ) { index ->
           val item = lazyPagingItems[index]
           if (item != null) {
-            val dbModel = item.toDbModel()
-            ListItem(
-              item = dbModel,
-              isSaved = isPostSaved,
+            LobstersListItem(
+              item = item,
               postActions = postActions,
+              refresh = { lazyPagingItems.refresh() },
             )
-
-            Divider()
+            HorizontalDivider()
           }
         }
         if (lazyPagingItems.loadState.append == LoadState.Loading) {
@@ -81,7 +74,7 @@ fun NetworkPosts(
               modifier =
                 Modifier.fillMaxWidth()
                   .wrapContentWidth(Alignment.CenterHorizontally)
-                  .padding(vertical = 16.dp),
+                  .padding(vertical = 16.dp)
             )
           }
         }
@@ -91,8 +84,7 @@ fun NetworkPosts(
       refreshing = isRefreshing,
       state = pullRefreshState,
       modifier = Modifier.align(Alignment.TopCenter),
-      backgroundColor = MaterialTheme.colorScheme.surface,
-      contentColor = contentColorFor(MaterialTheme.colorScheme.surface),
+      shadowElevation = 6.dp, // From M2 implementation
     )
   }
 }

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2023-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.lists
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.semantics.isTraversalGroup
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
+import androidx.paging.PagingData
+import androidx.paging.compose.collectAsLazyPagingItems
+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>>,
+  listState: LazyListState,
+  postActions: PostActions,
+  searchQuery: String,
+  setSearchQuery: (String) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val lazyPagingItems = items.collectAsLazyPagingItems()
+  val triggerSearch = { query: String ->
+    setSearchQuery(query)
+    lazyPagingItems.refresh()
+  }
+  Column(modifier = modifier.semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()) {
+    SearchBar(
+      value = searchQuery,
+      onValueChange = setSearchQuery,
+      onSearch = { triggerSearch(it) },
+      modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp).testTag("search_bar"),
+    )
+    NetworkPosts(
+      lazyPagingItems = lazyPagingItems,
+      listState = listState,
+      postActions = postActions,
+    )
+  }
+}

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.
@@ -9,30 +9,38 @@ package dev.msfjarvis.claw.android.ui.navigation
 sealed class Destinations {
   abstract val route: String
 
-  object Hottest : Destinations() {
+  data object Hottest : Destinations() {
     override val route = "hottest"
   }
 
-  object Newest : Destinations() {
+  data object Newest : Destinations() {
     override val route = "newest"
   }
 
-  object Saved : Destinations() {
+  data object Saved : Destinations() {
     override val route = "saved"
   }
 
-  object Comments : Destinations() {
-    const val placeholder = "{postId}"
-    override val route = "comments/$placeholder"
+  data object Comments : Destinations() {
+    const val PLACEHOLDER = "{postId}"
+    override val route = "comments/$PLACEHOLDER"
   }
 
-  object User : Destinations() {
-    const val placeholder = "{username}"
-    override val route = "user/$placeholder"
+  data object User : Destinations() {
+    const val PLACEHOLDER = "{username}"
+    override val route = "user/$PLACEHOLDER"
   }
 
-  object DataTransfer : Destinations() {
-    override val route: String = "datatransfer"
+  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 {

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

@@ -0,0 +1,296 @@
+/*
+ * 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.screens
+
+import android.content.Intent
+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.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.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.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.navigation.NavType
+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.paging.compose.collectAsLazyPagingItems
+import com.deliveryhero.whetstone.compose.injectedViewModel
+import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
+import dev.msfjarvis.claw.android.MainActivity
+import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.android.SearchActivity
+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.ClawNavigationType
+import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import dev.msfjarvis.claw.android.ui.rememberPostActions
+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.coroutines.launch
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun LobstersPostsScreen(
+  urlLauncher: UrlLauncher,
+  htmlConverter: HTMLConverter,
+  windowSizeClass: WindowSizeClass,
+  setWebUri: (String?) -> Unit,
+  modifier: Modifier = Modifier,
+  viewModel: ClawViewModel = injectedViewModel(),
+) {
+  val hottestListState = rememberLazyListState()
+  val newestListState = rememberLazyListState()
+  val savedListState = rememberLazyListState()
+  val navController = rememberNavController()
+  val coroutineScope = rememberCoroutineScope()
+  val snackbarHostState = remember { SnackbarHostState() }
+  val postActions = rememberPostActions(urlLauncher, navController, viewModel)
+  val backStackEntry by navController.currentBackStackEntryAsState()
+  val currentDestination = backStackEntry?.destination?.route
+  val context = LocalContext.current
+
+  val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
+  val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
+  val savedPosts by viewModel.savedPostsByMonth.collectAsState(persistentMapOf())
+
+  val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
+
+  val postIdOverride = context.getActivity()?.intent?.extras?.getString(MainActivity.NAVIGATION_KEY)
+  LaunchedEffect(false) {
+    if (postIdOverride != null) {
+      navController.navigate(
+        Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, 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(
+        label = "Newest",
+        route = Destinations.Newest.route,
+        icon = Icons.Outlined.NewReleases,
+        selectedIcon = Icons.Filled.NewReleases,
+      ) {
+        coroutineScope.launch { 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) }
+      },
+    )
+
+  Scaffold(
+    topBar = {
+      ClawAppBar(
+        navigationIcon = {
+          if (
+            navController.previousBackStackEntry != null &&
+              navItems.none { it.route == currentDestination }
+          ) {
+            IconButton(
+              onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
+            ) {
+              Icon(
+                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                contentDescription = "Go back to previous screen",
+              )
+            }
+          }
+        },
+        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)
+            }
+          }
+        },
+        actions = {
+          if (navItems.any { it.route == currentDestination }) {
+            IconButton(
+              onClick = { context.startActivity(Intent(context, SearchActivity::class.java)) }
+            ) {
+              Icon(imageVector = Icons.Filled.Search, contentDescription = "Search posts")
+            }
+            IconButton(onClick = { navController.navigate(Destinations.Settings.route) }) {
+              Icon(imageVector = Icons.Filled.Tune, contentDescription = "Settings")
+            }
+          }
+        },
+      )
+    },
+    bottomBar = {
+      AnimatedVisibility(visible = navigationType == ClawNavigationType.BOTTOM_NAVIGATION) {
+        ClawNavigationBar(
+          navController = navController,
+          items = navItems,
+          isVisible = navItems.any { it.route == currentDestination },
+        )
+      }
+    },
+    snackbarHost = { SnackbarHost(snackbarHostState) },
+    modifier = modifier.semantics { testTagsAsResourceId = true },
+  ) { paddingValues ->
+    Row(modifier = Modifier.padding(paddingValues)) {
+      AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
+        ClawNavigationRail(
+          navController = navController,
+          items = navItems,
+          isVisible = navItems.any { it.route == currentDestination },
+        )
+      }
+
+      NavHost(
+        navController = navController,
+        startDestination = Destinations.startDestination.route,
+        // Make animations 2x faster than default specs
+        enterTransition = { fadeIn(animationSpec = tween(350)) },
+        exitTransition = { fadeOut(animationSpec = tween(350)) },
+      ) {
+        val uri = LobstersApi.BASE_URL
+        composable(route = Destinations.Hottest.route) {
+          setWebUri("https://lobste.rs/")
+          NetworkPosts(
+            lazyPagingItems = hottestPosts,
+            listState = hottestListState,
+            postActions = postActions,
+          )
+        }
+        composable(route = Destinations.Newest.route) {
+          setWebUri("https://lobste.rs/")
+          NetworkPosts(
+            lazyPagingItems = newestPosts,
+            listState = newestListState,
+            postActions = postActions,
+          )
+        }
+        composable(route = Destinations.Saved.route) {
+          setWebUri(null)
+          DatabasePosts(items = savedPosts, listState = savedListState, postActions = postActions)
+        }
+        composable(
+          route = Destinations.Comments.route,
+          arguments = listOf(navArgument("postId") { type = NavType.StringType }),
+          deepLinks =
+            listOf(
+              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.PLACEHOLDER}/.*" },
+              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.PLACEHOLDER}" },
+            ),
+        ) { backStackEntry ->
+          val postId =
+            requireNotNull(backStackEntry.arguments?.getString("postId")) {
+              "Navigating to ${Destinations.Comments.route} without necessary 'postId' argument"
+            }
+          setWebUri("https://lobste.rs/s/$postId")
+          CommentsPage(
+            postId = postId,
+            postActions = postActions,
+            htmlConverter = htmlConverter,
+            getSeenComments = viewModel::getSeenComments,
+            markSeenComments = viewModel::markSeenComments,
+          )
+        }
+        composable(
+          route = Destinations.User.route,
+          arguments = listOf(navArgument("username") { type = NavType.StringType }),
+          deepLinks = listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.PLACEHOLDER}" }),
+        ) { backStackEntry ->
+          val username =
+            requireNotNull(backStackEntry.arguments?.getString("username")) {
+              "Navigating to ${Destinations.User.route} without necessary 'username' argument"
+            }
+          setWebUri("https://lobste.rs/u/$username")
+          UserProfile(username = username, getProfile = viewModel::getUserProfile)
+        }
+        composable(route = Destinations.Settings.route) {
+          SettingsScreen(
+            context = context,
+            openLibrariesScreen = { navController.navigate(Destinations.AboutLibraries.route) },
+            importPosts = viewModel::importPosts,
+            exportPostsAsJson = viewModel::exportPostsAsJson,
+            exportPostsAsHtml = viewModel::exportPostsAsHtml,
+            snackbarHostState = snackbarHostState,
+          )
+        }
+        composable(route = Destinations.AboutLibraries.route) {
+          LibrariesContainer(modifier = Modifier.fillMaxSize())
+        }
+      }
+    }
+  }
+}

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

@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2023-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.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.ui.Modifier
+import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import androidx.navigation.navArgument
+import com.deliveryhero.whetstone.compose.injectedViewModel
+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.viewmodel.ClawViewModel
+import dev.msfjarvis.claw.common.comments.CommentsPage
+import dev.msfjarvis.claw.common.comments.HTMLConverter
+import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
+
+@Composable
+fun SearchScreen(
+  urlLauncher: UrlLauncher,
+  htmlConverter: HTMLConverter,
+  setWebUri: (String?) -> Unit,
+  modifier: Modifier = Modifier,
+  viewModel: ClawViewModel = injectedViewModel(),
+) {
+  val navController = rememberNavController()
+  val postActions = rememberPostActions(urlLauncher, navController, viewModel)
+  val listState = rememberLazyListState()
+  Scaffold(modifier = modifier) { paddingValues ->
+    NavHost(
+      navController = navController,
+      startDestination = Destinations.Search.route,
+      modifier = Modifier.padding(paddingValues),
+    ) {
+      composable(route = Destinations.Search.route) {
+        setWebUri("https://lobste.rs/search")
+        SearchList(
+          items = viewModel.searchResults,
+          listState = listState,
+          postActions = postActions,
+          searchQuery = viewModel.searchQuery,
+          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"
+          }
+        setWebUri("https://lobste.rs/s/$postId")
+        CommentsPage(
+          postId = postId,
+          postActions = postActions,
+          htmlConverter = htmlConverter,
+          getSeenComments = viewModel::getSeenComments,
+          markSeenComments = viewModel::markSeenComments,
+        )
+      }
+    }
+  }
+}

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

@@ -0,0 +1,209 @@
+/*
+ * Copyright © 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.screens
+
+import android.content.Context
+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.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.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.LibraryBooks
+import androidx.compose.material.icons.filled.Bookmarks
+import androidx.compose.material.icons.filled.Code
+import androidx.compose.material.icons.filled.ImportExport
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import java.io.InputStream
+import java.io.OutputStream
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+private const val JSON_MIME_TYPE = "application/json"
+private const val HTML_MIME_TYPE = "application/html"
+
+@Composable
+fun SettingsScreen(
+  context: Context,
+  openLibrariesScreen: () -> Unit,
+  snackbarHostState: SnackbarHostState,
+  importPosts: suspend (InputStream) -> Unit,
+  exportPostsAsJson: suspend (OutputStream) -> Unit,
+  exportPostsAsHtml: suspend (OutputStream) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val coroutineScope = rememberCoroutineScope()
+  Box(modifier = modifier.fillMaxSize()) {
+    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 = {
+          Icon(
+            imageVector = Icons.Filled.ImportExport,
+            contentDescription = null,
+            modifier = Modifier.height(32.dp),
+          )
+        },
+        supportingContent = {
+          Row(
+            horizontalArrangement = Arrangement.spacedBy(32.dp),
+            modifier = Modifier.fillMaxWidth(),
+          ) {
+            ImportPosts(context, coroutineScope, snackbarHostState, importPosts)
+            ExportPosts(
+              context,
+              coroutineScope,
+              snackbarHostState,
+              exportPostsAsJson,
+              exportPostsAsHtml,
+            )
+          }
+        },
+      )
+    }
+  }
+}
+
+@Composable
+private fun RowScope.ImportPosts(
+  context: Context,
+  coroutineScope: CoroutineScope,
+  snackbarHostState: SnackbarHostState,
+  importPosts: suspend (InputStream) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val importAction =
+    rememberLauncherForActivityResult(ActivityResultContracts.GetContent()) { uri ->
+      if (uri == null) {
+        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
+        return@rememberLauncherForActivityResult
+      }
+      coroutineScope.launch {
+        context.contentResolver.openInputStream(uri)?.use { stream ->
+          importPosts(stream)
+          snackbarHostState.showSnackbarDismissing("Successfully imported posts")
+        }
+      }
+    }
+  OutlinedButton(
+    onClick = { importAction.launch(JSON_MIME_TYPE) },
+    shape = MaterialTheme.shapes.extraSmall,
+    modifier = modifier.fillMaxWidth(0.30f).weight(0.5f),
+  ) {
+    Text(text = "Import")
+  }
+}
+
+@Composable
+private fun RowScope.ExportPosts(
+  context: Context,
+  coroutineScope: CoroutineScope,
+  snackbarHostState: SnackbarHostState,
+  exportPostsAsJson: suspend (OutputStream) -> Unit,
+  exportPostsAsHtml: suspend (OutputStream) -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val jsonExportAction =
+    rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument(JSON_MIME_TYPE)) { uri
+      ->
+      if (uri == null) {
+        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
+        return@rememberLauncherForActivityResult
+      }
+      coroutineScope.launch {
+        context.contentResolver.openOutputStream(uri)?.use { stream ->
+          exportPostsAsJson(stream)
+          snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+        }
+      }
+    }
+  val htmlExportAction =
+    rememberLauncherForActivityResult(ActivityResultContracts.CreateDocument(HTML_MIME_TYPE)) { uri
+      ->
+      if (uri == null) {
+        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
+        return@rememberLauncherForActivityResult
+      }
+      coroutineScope.launch {
+        context.contentResolver.openOutputStream(uri)?.use { stream ->
+          exportPostsAsHtml(stream)
+          snackbarHostState.showSnackbarDismissing("Successfully exported posts")
+        }
+      }
+    }
+  var expanded by remember { mutableStateOf(false) }
+  OutlinedButton(
+    onClick = { expanded = true },
+    shape = MaterialTheme.shapes.extraSmall,
+    modifier = modifier.fillMaxWidth(0.30f).weight(0.5f),
+  ) {
+    Text(text = "Export")
+    DropdownMenu(expanded = expanded, onDismissRequest = { expanded = false }) {
+      DropdownMenuItem(
+        text = { Text("JSON") },
+        onClick = {
+          expanded = false
+          jsonExportAction.launch("claw-export.json")
+        },
+        leadingIcon = {
+          Icon(imageVector = Icons.Filled.Code, contentDescription = "Export as JSON")
+        },
+      )
+      DropdownMenuItem(
+        text = { Text("Bookmarks") },
+        onClick = {
+          expanded = false
+          htmlExportAction.launch("claw-export.html")
+        },
+        leadingIcon = {
+          Icon(
+            imageVector = Icons.Filled.Bookmarks,
+            contentDescription = "Export as browser bookmarks",
+          )
+        },
+      )
+    }
+  }
+}
+
+/** Shows a Snackbar but dismisses any existing ones first. */
+private suspend fun SnackbarHostState.showSnackbarDismissing(text: String) {
+  currentSnackbarData?.dismiss()
+  showSnackbar(text)
+}

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

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

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

@@ -1,35 +1,57 @@
 /*
- * Copyright © 2021-2023 Harsh Shandilya.
+ * 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.viewmodel
 
-import androidx.lifecycle.ViewModel
+import android.app.Application
+import android.content.Context
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.text.capitalize
+import androidx.compose.ui.text.intl.Locale
+import androidx.glance.appwidget.updateAll
+import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.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
 import com.slack.eithernet.ApiResult.Success
+import com.squareup.anvil.annotations.optional.ForScope
+import dev.msfjarvis.claw.android.glance.SavedPostsWidget
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
+import dev.msfjarvis.claw.android.paging.SearchPagingSource
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.core.injection.IODispatcher
-import dev.msfjarvis.claw.database.local.SavedPost
+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.Month
+import java.time.ZoneId
 import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 import kotlinx.collections.immutable.ImmutableMap
 import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.collectLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -39,58 +61,109 @@ class ClawViewModel
 @Inject
 constructor(
   private val api: LobstersApi,
-  private val savedPostsRepository: SavedPostsRepository,
   private val commentsRepository: CommentsRepository,
+  private val readPostsRepository: ReadPostsRepository,
+  private val savedPostsRepository: SavedPostsRepository,
   private val linkMetadataRepository: LinkMetadataRepository,
-  val dataTransferRepository: DataTransferRepository,
+  private val dataTransferRepository: DataTransferRepository,
   private val pagingSourceFactory: LobstersPagingSource.Factory,
+  private val searchPagingSourceFactory: SearchPagingSource.Factory,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-) : ViewModel() {
-  private val hottestPostsPager =
-    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
-      pagingSourceFactory.create(api::getHottestPosts)
-    }
-  private val newestPostsPager =
-    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
-      pagingSourceFactory.create(api::getNewestPosts)
-    }
+  @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
+  @ForScope(ApplicationScope::class) context: Context,
+) : AndroidViewModel(context as Application) {
+  val hottestPosts =
+    Pager(
+        config = PagingConfig(pageSize = PAGE_SIZE),
+        initialKey = STARTING_PAGE_INDEX,
+        pagingSourceFactory = { pagingSourceFactory.create(api::getHottestPosts) },
+      )
+      .flow
+      .map(::mapToUIPost)
+      .cachedIn(viewModelScope)
+  val newestPosts =
+    Pager(
+        config = PagingConfig(pageSize = PAGE_SIZE),
+        initialKey = STARTING_PAGE_INDEX,
+        pagingSourceFactory = { pagingSourceFactory.create(api::getNewestPosts) },
+      )
+      .flow
+      .map(::mapToUIPost)
+      .cachedIn(viewModelScope)
+  val searchResults =
+    Pager(
+        PagingConfig(pageSize = PAGE_SIZE),
+        initialKey = STARTING_PAGE_INDEX,
+        pagingSourceFactory = { searchPagingSourceFactory.create { searchQuery } },
+      )
+      .flow
+      .map(::mapToUIPost)
+  val savedPosts = savedPostsRepository.savedPosts.map { it.map(UIPost.Companion::fromSavedPost) }
+  val savedPostsByMonth
+    get() = savedPosts.map(::groupSavedPosts)
 
-  val hottestPosts
-    get() = hottestPostsPager.flow
+  var searchQuery by mutableStateOf("")
 
-  val newestPosts
-    get() = newestPostsPager.flow
+  private var _readPosts = emptyList<String>()
+  private var _savedPosts = emptyList<String>()
 
-  private val savedPostsFlow
-    get() = savedPostsRepository.savedPosts
-
-  val savedPosts
-    get() = savedPostsFlow.map(::mapSavedPosts)
-
-  private fun mapSavedPosts(items: List<SavedPost>): ImmutableMap<Month, List<SavedPost>> {
-    val sorted = items.sortedByDescending { post -> post.createdAt.toLocalDateTime() }
-    return sorted.groupBy { post -> post.createdAt.toLocalDateTime().month }.toImmutableMap()
+  init {
+    viewModelScope.launch { savedPosts.collectLatest { _savedPosts = it.map(UIPost::shortId) } }
+    viewModelScope.launch { readPostsRepository.readPosts.collectLatest { _readPosts = it } }
   }
 
-  suspend fun isPostSaved(post: SavedPost): Boolean {
-    return savedPostsFlow.first().any { savedPost -> savedPost.shortId == post.shortId }
+  private fun mapToUIPost(pagingData: PagingData<LobstersPost>): PagingData<UIPost> {
+    return pagingData.map { post ->
+      val uiPost = post.toUIPost()
+      uiPost.copy(isSaved = isPostSaved(uiPost), isRead = isPostRead(uiPost))
+    }
   }
 
-  fun toggleSave(post: SavedPost) {
+  private fun groupSavedPosts(items: List<UIPost>): ImmutableMap<String, List<UIPost>> {
+    val sorted =
+      items.sortedWith { post1, post2 ->
+        val post1Date = post1.createdAt.toLocalDateTime()
+        val post2Date = post2.createdAt.toLocalDateTime()
+        if (post2Date.isBefore(post1Date)) {
+          -1
+        } else if (post2Date.isAfter(post1Date)) {
+          1
+        } else {
+          0
+        }
+      }
+    return sorted
+      .groupBy { post ->
+        val time = post.createdAt.toLocalDateTime()
+        "${time.month.name.lowercase().capitalize(Locale.current)} ${time.year}"
+      }
+      .toImmutableMap()
+  }
+
+  private fun isPostSaved(post: UIPost): Boolean {
+    return _savedPosts.contains(post.shortId)
+  }
+
+  private 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)
+        savedPostsRepository.removePost(post.toSavedPost())
       } else {
-        savedPostsRepository.savePost(post)
+        savedPostsRepository.savePost(post.toSavedPost())
       }
+      withContext(mainDispatcher) { SavedPostsWidget(savedPosts).updateAll(getApplication()) }
     }
   }
 
   suspend fun getPostComments(postId: String) =
     withContext(ioDispatcher) {
       when (val result = api.getPostDetails(postId)) {
-        is Success -> result.value
+        is Success -> result.value.toUIPost()
         is Failure.NetworkFailure -> throw result.error
         is Failure.UnknownFailure -> throw result.error
         is Failure.HttpFailure -> {
@@ -124,12 +197,25 @@ constructor(
       }
     }
 
+  suspend fun importPosts(input: InputStream) = dataTransferRepository.importPosts(input)
+
+  suspend fun exportPostsAsJson(output: OutputStream) =
+    dataTransferRepository.exportPostsAsJson(output)
+
+  suspend fun exportPostsAsHtml(output: OutputStream) =
+    dataTransferRepository.exportPostsAsHTML(output)
+
+  fun markPostAsRead(postId: String) {
+    viewModelScope.launch { readPostsRepository.markRead(postId) }
+  }
+
   /**
    * Parses a given [String] into a [LocalDateTime]. This method is only intended to be used for
    * dates in the format returned by the Lobsters API, and is not a general purpose parsing
    * solution.
    */
   private fun String.toLocalDateTime(): LocalDateTime {
+    if (isEmpty()) return LocalDateTime.now(ZoneId.systemDefault())
     return LocalDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this))
   }
 }

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

@@ -7,8 +7,8 @@
 package dev.msfjarvis.claw.android.viewmodel
 
 import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
-import dev.msfjarvis.claw.database.LobstersDatabase
 import dev.msfjarvis.claw.database.local.PostComments
+import dev.msfjarvis.claw.database.local.PostCommentsQueries
 import dev.msfjarvis.claw.model.Comment
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -17,10 +17,9 @@ import kotlinx.coroutines.withContext
 class CommentsRepository
 @Inject
 constructor(
-  database: LobstersDatabase,
+  private val postCommentsQueries: PostCommentsQueries,
   @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
 ) {
-  private val postCommentsQueries = database.postCommentsQueries
 
   suspend fun getSeenComments(postId: String) =
     withContext(dbDispatcher) { postCommentsQueries.getCommentIds(postId).executeAsOneOrNull() }

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

@@ -1,20 +1,21 @@
 /*
- * Copyright © 2023 Harsh Shandilya.
+ * Copyright © 2023-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.viewmodel
 
-import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
 import dev.msfjarvis.claw.core.injection.IODispatcher
-import dev.msfjarvis.claw.database.LobstersDatabase
 import dev.msfjarvis.claw.database.SavedPostSerializer
 import dev.msfjarvis.claw.database.local.SavedPost
 import java.io.InputStream
 import java.io.OutputStream
+import java.time.Instant
+import java.time.format.DateTimeFormatter
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.builtins.ListSerializer
@@ -26,29 +27,69 @@ import kotlinx.serialization.json.encodeToStream
 class DataTransferRepository
 @Inject
 constructor(
-  private val database: LobstersDatabase,
   private val json: Json,
-  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+  private val savedPostsRepository: SavedPostsRepository,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
   private val serializer = ListSerializer(SavedPostSerializer)
-  private val savedPostQueries = database.savedPostQueries
 
   suspend fun importPosts(input: InputStream) {
     val posts: List<SavedPost> =
-      withContext(ioDispatcher) {
-        json.decodeFromStream(
-          serializer,
-          input,
-        )
-      }
-    withContext(dbDispatcher) {
-      database.transaction { posts.forEach(savedPostQueries::insertOrReplacePost) }
-    }
+      withContext(ioDispatcher) { json.decodeFromStream(serializer, input) }
+    savedPostsRepository.savePosts(posts)
   }
 
-  suspend fun exportPosts(output: OutputStream) {
-    val posts = withContext(dbDispatcher) { savedPostQueries.selectAllPosts().executeAsList() }
+  suspend fun exportPostsAsJson(output: OutputStream) {
+    val posts = savedPostsRepository.savedPosts.first()
     withContext(ioDispatcher) { json.encodeToStream(serializer, posts, output) }
   }
+
+  suspend fun exportPostsAsHTML(output: OutputStream) {
+    fun computeTimestamp(post: SavedPost): Long {
+      val temporal = DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(post.createdAt)
+      val instant = Instant.from(temporal)
+      return instant.toEpochMilli()
+    }
+
+    val posts = savedPostsRepository.savedPosts.first()
+    val header =
+      """
+      <!DOCTYPE NETSCAPE-Bookmark-file-1>
+      <!-- This is an automatically generated file.
+           It will be read and overwritten.
+           DO NOT EDIT! -->
+      <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+      <TITLE>Bookmarks</TITLE>
+      <H1>Bookmarks</H1>
+    """
+        .trimIndent()
+    val html = buildString {
+      append(header)
+      append("<DD><p>\n")
+      for (post in posts) {
+        append(
+          """
+          <DT><A HREF="${post.url.ifEmpty { post.commentsUrl }}" ADD_DATE="${computeTimestamp(post)}" PRIVATE="0" TAGS="${post.tags.joinToString(",")}">${post.title}</A>
+          <DD>${post.title}
+
+        """
+            .trimIndent()
+        )
+      }
+      append(
+        """
+        <DT><A HREF="https://example.com/" ADD_DATE="0" PRIVATE="0" TAGS="delete,me,pls">Padding post</A>
+        <DD>Linkding ignores the last entry so this pads the difference for imports
+
+      """
+          .trimIndent()
+      )
+      append("</DD></p>\n")
+    }
+    withContext(ioDispatcher) {
+      val writer = output.bufferedWriter()
+      writer.write(html)
+      writer.flush()
+    }
+  }
 }

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

@@ -6,44 +6,21 @@
  */
 package dev.msfjarvis.claw.android.viewmodel
 
-import com.chimbori.crux.Crux
-import com.chimbori.crux.api.Fields
+import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.model.LinkMetadata
 import javax.inject.Inject
-import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import org.jsoup.Jsoup
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import me.saket.unfurl.Unfurler
 
 class LinkMetadataRepository
 @Inject
 constructor(
-  private val crux: Crux,
-  private val okHttpClient: OkHttpClient,
+  private val unfurler: Unfurler,
+  @IODispatcher private val dispatcher: CoroutineDispatcher,
 ) {
   suspend fun getLinkMetadata(url: String): LinkMetadata {
-    return run {
-      val parsedUrl = url.toHttpUrlOrNull() ?: return@run null
-      if (!parsedUrl.isHttps) return@run null
-      val request = Request.Builder().url(parsedUrl).build()
-      val htmlContent =
-        okHttpClient.newCall(request).execute().use { response ->
-          val body = response.body ?: return@run null
-          body.string()
-        }
-      val extractedMetadata = crux.extractFrom(parsedUrl, Jsoup.parse(htmlContent, url))
-      val faviconUrl = extractedMetadata[Fields.FAVICON_URL].toString()
-      val readingTime = extractedMetadata[Fields.DURATION_MS].toString()
-      LinkMetadata(
-        url = url,
-        faviconUrl = faviconUrl,
-        readingTime = readingTime,
-      )
-    }
-      ?: LinkMetadata(
-        url = url,
-        faviconUrl = null,
-        readingTime = null,
-      )
+    val result = withContext(dispatcher) { unfurler.unfurl(url) }
+    return LinkMetadata(url, result?.favicon?.toString())
   }
 }

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

@@ -0,0 +1,28 @@
+/*
+ * 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.viewmodel
+
+import app.cash.sqldelight.coroutines.asFlow
+import app.cash.sqldelight.coroutines.mapToList
+import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.database.local.ReadPostsQueries
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+class ReadPostsRepository
+@Inject
+constructor(
+  private val readPostsQueries: ReadPostsQueries,
+  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+) {
+  val readPosts = readPostsQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
+
+  suspend fun markRead(postId: String) {
+    withContext(dbDispatcher) { readPostsQueries.markRead(postId) }
+  }
+}

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

@@ -9,8 +9,8 @@ package dev.msfjarvis.claw.android.viewmodel
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
 import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
-import dev.msfjarvis.claw.database.LobstersDatabase
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.database.local.SavedPostQueries
 import io.github.aakira.napier.Napier
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -19,10 +19,9 @@ import kotlinx.coroutines.withContext
 class SavedPostsRepository
 @Inject
 constructor(
-  database: LobstersDatabase,
+  private val savedPostQueries: SavedPostQueries,
   @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
 ) {
-  private val savedPostQueries = database.savedPostQueries
   val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
 
   suspend fun savePost(post: SavedPost) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * Copyright © 2022-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.
@@ -7,18 +7,23 @@
 package dev.msfjarvis.claw.android.work
 
 import android.content.Context
+import androidx.glance.appwidget.updateAll
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.deliveryhero.whetstone.ForScope
 import com.deliveryhero.whetstone.worker.ContributesWorker
 import com.deliveryhero.whetstone.worker.WorkerScope
 import com.slack.eithernet.ApiResult.Success
+import com.squareup.anvil.annotations.optional.ForScope
+import dev.msfjarvis.claw.android.glance.SavedPostsWidget
 import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
 import dev.msfjarvis.claw.api.LobstersApi
-import dev.msfjarvis.claw.common.posts.toDbModel
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.fromSavedPost
+import dev.msfjarvis.claw.model.toSavedPost
 import javax.inject.Inject
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.map
 
 /**
  * WorkManager-backed [CoroutineWorker] that gets all the posts from [SavedPostsRepository], fetches
@@ -40,8 +45,12 @@ constructor(
       .first()
       .map { post -> lobstersApi.getPostDetails(post.shortId) }
       .filterIsInstance<Success<LobstersPostDetails>>()
-      .map { result -> result.value.toDbModel() }
+      .map { result -> result.value.toSavedPost() }
       .let { savedPostsRepository.savePosts(it) }
+    SavedPostsWidget(
+        savedPostsRepository.savedPosts.map { it.map(UIPost.Companion::fromSavedPost) }
+      )
+      .updateAll(applicationContext)
     return Result.success()
   }
 }

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

@@ -0,0 +1,18 @@
+<!--
+ ~ Copyright © 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.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?android:colorControlNormal"
+    android:alpha="0.6"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M21.99,4c0,-1.1 -0.89,-2 -1.99,-2L4,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h14l4,4 -0.01,-18zM20,4v13.17L18.83,16L4,16L4,4h16zM6,12h12v2L6,14zM6,9h12v2L6,11zM6,6h12v2L6,8z"/>
+</vector>

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

@@ -0,0 +1,20 @@
+<!--
+ ~ Copyright © 2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="1080"
+    android:viewportHeight="1080">
+  <group android:scaleX="0.7"
+      android:scaleY="0.7"
+      android:translateX="162"
+      android:translateY="162">
+    <path
+        android:pathData="M431.3,341.2C435.9,337 580.3,236 710.5,223.8C747.3,220.3 790.7,254.7 833.2,312.5C875.9,370.7 892.9,433.4 875.9,443C863.2,450.2 838.6,407.4 758.8,396.3C743.4,394.2 730.4,393.4 719.4,393.5C738.5,423.4 745.6,451.1 737.2,458C733.1,461.4 673.6,438.7 612.9,436.5C570.1,435 535.2,440.9 506.7,451.3C496.9,454.9 486,453.8 477.2,448.3C444.5,427.9 424.2,406.2 418.4,376.2C415.8,362.8 420.9,349.4 431.3,341.2ZM274.7,394.8C285.8,370.1 312.2,325.9 346.3,305.4C383.6,282.9 335,390.3 427.3,489.8C519.5,589.3 586.5,623.8 655.1,581.5C723.7,539.2 746.5,518.1 753,518.7C764,519.6 772.9,536.1 764.4,589.5C763,598.2 761.3,606.5 759.3,614.2C828.7,575 871.7,516.3 889,520C912,524.8 918.3,617.8 852.1,721C811.8,784 768.8,830.7 741.4,857.5C724.3,874 699.7,880 677,873.1C512,822.6 315.5,733.8 202.9,652C193.8,645.2 186.8,635.9 183,625.1C171.8,593.7 161.3,548.1 168.5,495.3C179.5,414.2 222.7,352.9 245.2,335.9C261.9,323.2 267.1,362.4 274.7,394.8Z"
+        android:fillColor="#FF4529"/>
+  </group>
+</vector>

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

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

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-  <bool name="use_light_status_bar">false</bool>
-</resources>

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-  <bool name="use_light_status_bar">true</bool>
-</resources>

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

@@ -0,0 +1,9 @@
+<!--
+ ~ Copyright © 2021-2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
+<resources>
+  <color name="ic_launcher_background">#540C00</color>
+</resources>

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

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

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

@@ -1,20 +1,17 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<!--
+ ~ 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.
+ -->
 <resources>
 
   <style name="Theme.Claw.SplashScreen" parent="Theme.SplashScreen">
-    <item name="windowSplashScreenBackground">#FF6C0000</item>
-    <item name="windowSplashScreenAnimatedIcon">@mipmap/ic_launcher_foreground</item>
+    <item name="windowSplashScreenBackground">@color/ic_launcher_background</item>
+    <item name="windowSplashScreenAnimatedIcon">@drawable/ic_launcher_foreground</item>
     <item name="windowSplashScreenAnimationDuration">1000</item>
     <item name="postSplashScreenTheme">@style/Theme.Claw</item>
   </style>
 
-  <style name="Platform.Theme.Claw" parent="android:Theme.Material.Light.NoActionBar" />
-
-  <style name="Base.Theme.Claw" parent="Platform.Theme.Claw">
-    <item name="android:windowActionModeOverlay">true</item>
-  </style>
-
-  <style name="Theme.Claw" parent="Base.Theme.Claw">
-    <item name="android:windowLightStatusBar">@bool/use_light_status_bar</item>
-  </style>
+  <style name="Theme.Claw" parent="android:Theme.Material.NoActionBar" />
 </resources>

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

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

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

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

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

@@ -0,0 +1,15 @@
+<!--
+ ~ Copyright © 2023 Harsh Shandilya.
+ ~ Use of this source code is governed by an MIT-style
+ ~ license that can be found in the LICENSE file or at
+ ~ https://opensource.org/licenses/MIT.
+ -->
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/glance_default_loading_layout"
+    android:minWidth="349dp"
+    android:minHeight="110dp"
+    android:minResizeWidth="349dp"
+    android:minResizeHeight="110dp"
+    android:resizeMode="vertical|horizontal"
+    android:updatePeriodMillis="1800000"
+    android:widgetCategory="home_screen" />

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

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

android/version.properties

@@ -1,5 +1,5 @@
 #
 # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
 #
-versioning-plugin.versionCode=13000
-versioning-plugin.versionName=1.30.0
+versioning-plugin.versionCode=14200
+versioning-plugin.versionName=1.42.0

api/build.gradle.kts

@@ -24,9 +24,11 @@ dependencies {
 
   implementation(libs.dagger)
   implementation(libs.javax.inject)
+  implementation(libs.jsoup)
 
   testImplementation(testFixtures(libs.eithernet))
   testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.kotlinx.serialization.json)
+  testImplementation(libs.retrofit.kotlinxSerializationConverter)
   addTestDependencies(project)
 }

api/lint-baseline.xml

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

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

@@ -0,0 +1,9 @@
+/*
+ * Copyright © 2022-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api
+
+@JvmInline value class CSRFToken(val value: String)

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

@@ -9,32 +9,26 @@ package dev.msfjarvis.claw.api
 import com.slack.eithernet.ApiResult
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
-import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import retrofit2.http.GET
 import retrofit2.http.Path
-import retrofit2.http.Query
 
 /** Simple interface defining an API for lobste.rs */
 interface LobstersApi {
 
-  @GET("hottest.json")
-  suspend fun getHottestPosts(@Query("page") page: Int): ApiResult<List<LobstersPost>, Unit>
+  @GET("page/{page}.json")
+  suspend fun getHottestPosts(@Path("page") page: Int): ApiResult<List<LobstersPost>, Unit>
 
-  @GET("newest.json")
-  suspend fun getNewestPosts(@Query("page") page: Int): ApiResult<List<LobstersPost>, Unit>
+  @GET("newest/page/{page}.json")
+  suspend fun getNewestPosts(@Path("page") page: Int): ApiResult<List<LobstersPost>, Unit>
 
   @GET("s/{postId}.json")
   suspend fun getPostDetails(@Path("postId") postId: String): ApiResult<LobstersPostDetails, Unit>
 
-  @GET("u/{username}.json")
+  @GET("~{username}.json")
   suspend fun getUser(@Path("username") username: String): ApiResult<User, Unit>
 
-  @GET("t/{tags}.json")
-  suspend fun getPostsByTags(
-    @Path("tags") tag: Tags,
-    @Query("page") page: Int,
-  ): ApiResult<List<LobstersPost>, Unit>
+  @GET("/") suspend fun getCSRFToken(): ApiResult<CSRFToken, Unit>
 
   companion object {
     const val BASE_URL = "https://lobste.rs"

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

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

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.api.converters
+
+import dev.msfjarvis.claw.api.CSRFToken
+import dev.msfjarvis.claw.api.LobstersApi
+import java.lang.reflect.Type
+import okhttp3.ResponseBody
+import org.jsoup.Jsoup
+import retrofit2.Converter
+import retrofit2.Retrofit
+
+object CSRFTokenConverter : Converter<ResponseBody, CSRFToken> {
+  override fun convert(value: ResponseBody): CSRFToken {
+    val token =
+      Jsoup.parse(value.string(), LobstersApi.BASE_URL)
+        .select("meta[name=\"csrf-token\"]")
+        .first()!!
+        .attr("content")
+    return CSRFToken(token)
+  }
+
+  object Factory : Converter.Factory() {
+    override fun responseBodyConverter(
+      type: Type,
+      annotations: Array<out Annotation>,
+      retrofit: Retrofit,
+    ): Converter<ResponseBody, CSRFToken> {
+      return CSRFTokenConverter
+    }
+  }
+}

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

@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2023-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.api.converters
+
+import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.model.LobstersPost
+import java.lang.reflect.Type
+import okhttp3.ResponseBody
+import org.jsoup.Jsoup
+import org.jsoup.nodes.Element
+import org.jsoup.select.Elements
+import retrofit2.Converter
+import retrofit2.Retrofit
+
+object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
+  override fun convert(value: ResponseBody): List<LobstersPost> {
+    val elements =
+      Jsoup.parse(value.string(), LobstersApi.BASE_URL).select("div.story_liner.h-entry")
+    return elements.map(::parsePost)
+  }
+
+  private fun parsePost(elem: Element): LobstersPost {
+    val parent = elem.parent() ?: error("$elem must have a parent")
+    val shortId = parent.attr("data-shortid")
+    val titleElement = elem.select("span.link.h-cite > a")
+    val title = titleElement.text()
+    val url = titleElement.attr("href")
+    val tags = elem.select("span.tags > a").map(Element::text)
+    val (commentCount, commentsUrl) = getCommentsData(elem.select("span.comments_label"))
+    val submitter = elem.select("div.byline > a.u-author").text()
+    return LobstersPost(
+      shortId = shortId,
+      title = title,
+      url = url,
+      commentCount = commentCount,
+      commentsUrl = commentsUrl,
+      tags = tags,
+      submitter = submitter,
+      // The value of these fields is irrelevant for our use case
+      createdAt = "",
+      description = "",
+    )
+  }
+
+  private fun getCommentsData(elem: Elements): Pair<Int, String> {
+    val linkElement = elem.select("a")
+    val countString = linkElement.text().trimStart().substringBefore(" ")
+    val commentsUrl = LobstersApi.BASE_URL + linkElement.attr("href")
+    return (countString.toIntOrNull() ?: 0) to commentsUrl
+  }
+
+  object Factory : Converter.Factory() {
+    override fun responseBodyConverter(
+      type: Type,
+      annotations: Array<out Annotation>,
+      retrofit: Retrofit,
+    ): Converter<ResponseBody, List<LobstersPost>> {
+      return SearchConverter
+    }
+  }
+}

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * Copyright © 2022-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.
@@ -11,7 +11,6 @@ import com.slack.eithernet.ApiResult.Success
 import com.slack.eithernet.test.newEitherNetController
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
-import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import dev.msfjarvis.claw.util.TestUtils.assertIs
 import kotlinx.coroutines.test.runTest
@@ -34,14 +33,14 @@ 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
   fun `post details with comments`() = runTest {
     val postDetails = api.getPostDetails("tdfoqh")
     assertIs<Success<LobstersPostDetails>>(postDetails)
-    assertThat(postDetails.value.comments).hasSize(7)
+    assertThat(postDetails.value.comments).hasSize(10)
   }
 
   @Test
@@ -52,23 +51,12 @@ class ApiTest {
   }
 
   @Test
-  fun `get posts by single tag`() = runTest {
-    val tags = Tags()
-    tags.addTag("meta")
-    val posts = api.getPostsByTags(tags, 1)
-    assertIs<Success<List<LobstersPost>>>(posts)
-    assertThat(posts.value).hasSize(25)
-    assertThat(posts.value[0].tags).contains("meta")
-  }
-
-  @Test
-  fun `get posts by multiple tags`() = runTest {
-    val tags = Tags()
-    tags.addTag("programming")
-    tags.addTag("rust")
-    val posts = api.getPostsByTags(tags, 1)
-    assertIs<Success<List<LobstersPost>>>(posts)
-    assertThat(posts.value).hasSize(25)
-    assertThat(posts.value[0].tags).containsAnyOf("programming", "rust")
+  fun `retrieve CSRF token`() = runTest {
+    val token = api.getCSRFToken()
+    assertIs<Success<CSRFToken>>(token)
+    assertThat(token.value.value)
+      .isEqualTo(
+        "OZWykgFemPVeOSNmB53-ccKXe458X7xCInO1-qzFU6nk_9RCSrSQqS9OPmA5_pyy8qD3IYAIZ7XfAM3gdhJpkQ"
+      )
   }
 }