feat(release): bump version

Fixes COMPOSE-LOBSTERS-2E

.github/renovate.json5

@@ -7,6 +7,11 @@
     "github>msfjarvis/shared-workflows//renovate/automerge"
   ],
   "branchConcurrentLimit": 15,
+  "github-actions": {
+    "fileMatch": [
+       ".github/reusable-workflows/.+\\.ya?ml$",
+    ],
+  },
   "packageRules": [
     {
       matchDatasources: [
@@ -22,6 +27,7 @@
     {
       "matchPackageNames": [
         "androidx.compose.compiler:compiler",
+        "com.google.devtools.ksp",
         "dev.drewhamilton.poko",
         "org.jetbrains.kotlin:kotlin-gradle-plugin",
         "org.jetbrains.kotlin.plugin.serialization",
@@ -32,24 +38,26 @@
       "matchPackagePatterns": [
         "^androidx.*",
       ],
-      "matchPackageNames": [
-      ],
-      "groupName": "androidx"
+      "groupName": "AndroidX"
     },
     {
       "matchPackagePatterns": [
         "^io.sentry",
         "^sentry",
       ],
-      "groupName": "sentry"
+      "groupName": "Sentry"
     },
     {
-      "matchPackageNames": [
-        "com.android.tools:r8",
-        "com.squareup.anvil",
-        "dev.chrisbanes.compose:compose-bom",
+      "matchPackagePatterns": [
+        "^com.squareup.anvil"
       ],
-      "enabled": false,
+      "allowedVersions": "!/.*-1-8$/",
+    },
+    {
+      "matchPackagePatterns": [
+        "^androidx.glance",
+      ],
+      "allowedVersions": "<=1.0.0",
     },
   ],
   "regexManagers": [

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

@@ -0,0 +1,42 @@
+name: 'Setup Gradle'
+description: 'Checks out the repository and sets up Java and Gradle'
+inputs:
+  token:
+    description: 'token input for actions/checkout'
+    required: false
+    default: ${{ github.token }}
+  fetch-depth:
+    description: 'fetch-depth input for actions/checkout'
+    required: false
+    default: 1
+  cache-read-only:
+    description: 'cache-read-only input for gradle/actions/setup-gradle'
+    required: false
+    default: ${{ github.event.repository != null && github.ref_name != github.event.repository.default_branch }}
+  dependency-graph:
+    description: 'dependency-graph input for gradle/actions/setup-gradle'
+    required: false
+    default: 'disabled'
+runs:
+  using: "composite"
+  steps:
+    - name: Checkout repository
+      uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+      with:
+        fetch-depth: ${{ inputs.fetch-depth }}
+        token: ${{ inputs.token }}
+
+    - name: Set up JDK
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      with:
+        distribution: temurin
+        java-version: 22
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@db19848a5fa7950289d3668fb053140cf3028d43 # v3
+      with:
+        gradle-home-cache-cleanup: true
+        cache-read-only: ${{ inputs.cache-read-only }}
+        add-job-summary: always
+        dependency-graph: ${{ inputs.dependency-graph }}
+        validate-wrappers: true

.github/workflows/ci.yml

@@ -12,87 +12,46 @@ 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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - name: Setup build environment
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
       with:
         fetch-depth: 0
-
-    - name: Set up JDK
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Run unit tests
-      uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
-      with:
-        arguments: --no-configuration-cache --stacktrace check -PslimTests
-        gradle-home-cache-cleanup: true
         cache-read-only: ${{ github.ref != 'refs/heads/main' }}
         dependency-graph: generate-and-submit
 
+    - name: 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@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
       with:
           name: Test report
-          path: android/build/reports
+          path: '**/build/reports/tests/**'
 
   dependency-review:
-    runs-on: ubuntu-latest
+    runs-on: macos-14
+    if: "github.event_name == 'push' && github.event.ref != 'refs/heads/main'"
     needs:
       - check
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
 
       - name: Dependency Review
-        uses: actions/dependency-review-action@6c5ccdad469c9f8a2996bfecaec55a631a347034 # v3
+        uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4
         with:
           base-ref: refs/heads/main
           head-ref: ${{ github.ref }}
-
-  deploy-release-snapshot:
-    runs-on: ubuntu-latest
-    if: "github.event_name == 'push' && github.event.ref == 'refs/heads/main'"
-    needs:
-      - check
-      - dependency-review
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
-    - name: Set up JDK
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Decrypt secrets
-      run: |
-        ./scripts/setup-age.sh
-        ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
-      env:
-        AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
-
-    - name: Build release app
-      uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
-      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 }}

.github/workflows/code_quality_analysis.yml

@@ -0,0 +1,67 @@
+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: Setup build environment
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
+      with:
+        fetch-depth: 0
+        cache-read-only: true
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+      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@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+      with:
+        category: "/language:java"
+  mobsfscan:
+    name: MobSF
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+
+      - name: Setup python
+        uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d # v5
+        with:
+          python-version: 3.8
+
+      - name: Run mobsfscan
+        uses: MobSF/mobsfscan@849b749e7f3244c7b4f418ff858a9fa4e1406115
+        with:
+          args: . --sarif --output results.sarif || true
+
+      - name: Upload mobsfscan report
+        uses: github/codeql-action/upload-sarif@2e230e8fe0ad3a14a340ad0815ddb96d599d2aff # v3.25.8
+        with:
+          sarif_file: results.sarif

.github/workflows/codeql_analysis.yml

@@ -1,53 +0,0 @@
-name: CodeQL
-
-on:
-  push:
-    branches:
-      - renovate/**
-  workflow_dispatch:
-  schedule:
-    - cron: '31 7 * * 3'
-
-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@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
-
-    - name: Set up JDK
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
-      with:
-        gradle-home-cache-cleanup: true
-        cache-read-only: true
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
-      with:
-        languages: java
-        tools: latest
-        queries: +security-extended
-
-    - name: Build project
-      shell: bash
-      run: |
-        ./gradlew assembleDebug assembleRelease
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ddccb873888234080b77e9bc2d4764d5ccaaccf9 # v2.21.9
-      with:
-        category: "/language:java"

.github/workflows/release.yml

@@ -5,7 +5,7 @@ on:
       inAppUpdatePriority:
         description: 'In app update priority (0-5)'
         type: number
-        default: "0"
+        default: 0
         required: false
 
 concurrency:
@@ -13,19 +13,14 @@ concurrency:
 
 jobs:
   publish-google-play-release:
-    runs-on: ubuntu-latest
+    runs-on: macos-14
     steps:
-    - name: Checkout repository
-      uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+    - name: Setup build environment
+      uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
-
-    - name: Set up JDK
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
-      with:
-        distribution: temurin
-        java-version: 18
+        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
 
     - name: Set up Git author
       shell: bash
@@ -33,12 +28,6 @@ jobs:
         git config user.name "GitHub Actions"
         git config user.email noreply@github.com
 
-    - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@842c587ad8aa4c68eeba24c396e15af4c2e9f30a # v2.9.0
-      with:
-        gradle-home-cache-cleanup: true
-        cache-read-only: true
-
     - name: Decrypt secrets
       run: |
         ./scripts/setup-age.sh
@@ -54,7 +43,7 @@ jobs:
         echo VERSION="${VERSION}" >> $GITHUB_ENV
 
     - name: Update changelog
-      uses: msfjarvis/keep-a-changelog-new-release@bf43ae42f4e42f137572950af426efcf6e777207 # 2.1.0
+      uses: msfjarvis/keep-a-changelog-new-release@e60399f488b25149c0963a4e22fff928a9277ce7 # v2.2.0
       with:
         tag: v${{ env.VERSION }}
         version: ${{ env.VERSION }}
@@ -70,14 +59,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 assembleRelease collectReleaseApks collectReleaseBundle -PenableSentry
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh
 
     - name: Get changelog entry
       id: changelog_reader
-      uses: mindsers/changelog-reader-action@b97ce03a10d9bdbb07beb491c76a5a01d78cd3ef # v2.2.2
+      uses: mindsers/changelog-reader-action@32aa5b4c155d76c94e4ec883a223c947b2f02656 # v2.2.3
       with:
         version: ${{ env.VERSION }}
         path: ./CHANGELOG.md
@@ -88,11 +77,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@9cf8fd30c9e616ec761db3b9abb2b0f15842ce58 # v1.1.2
+      uses: r0adkll/upload-google-play@935ef9c68bb393a8e6116b1575626a7f5be3a7fb # v1.1.3
       with:
         mappingFile: android/bundle/mapping.txt
         packageName: dev.msfjarvis.claw.android

.github/workflows/tramline-release.yml

@@ -0,0 +1,41 @@
+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: Setup build environment
+        uses: msfjarvis/compose-lobsters/.github/reusable-workflows/setup-gradle@main
+        with:
+          cache-read-only: true
+
+      - name: Build release app
+        run: |
+          ./scripts/setup-age.sh
+          ./scripts/signing-setup.sh "$AGE_SECRET_KEY"
+          ./gradlew --no-configuration-cache --stacktrace assembleRelease collectReleaseBundle -PenableSentry
+          ./scripts/signing-cleanup.sh
+        env:
+          AGE_SECRET_KEY: ${{ secrets.AGE_SECRET_KEY }}
+          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          ORG_GRADLE_PROJECT_VERSION_NAME: ${{ github.event.inputs.versionName }}
+          ORG_GRADLE_PROJECT_VERSION_CODE: ${{ github.event.inputs.versionCode }}
+
+      - name: Upload app bundle
+        uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
+        with:
+          name: release-aab
+          path: android/build/outputs/bundle/release/android-release.aab

.gitignore

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

.ignore

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

CHANGELOG.md

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

README.md

@@ -8,7 +8,14 @@ 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).
+<a href="https://android.izzysoft.de/repo/apk/dev.msfjarvis.claw.android">
+  <img src="./.github/izzy-badge.webp"
+       alt="Get it on IzzyOnDroid"
+       height="80" />
+</a>
+
+> [!NOTE]
+> Daily builds are published to the Google Play 'Open Testing' channel (if there are any changes), which can be opted into via this link: [[Android]](https://play.google.com/store/apps/details?id=dev.msfjarvis.claw.android) [[Web]](https://play.google.com/apps/testing/dev.msfjarvis.claw.android)
 
 <img src="https://github.com/msfjarvis/compose-lobsters/blob/main/.github/readme_feature_light.webp#gh-light-mode-only"
      alt="A grid of screenshots from the app, in clockwise order: the main screen, the comments page, the search page and the saved posts page"
@@ -18,30 +25,6 @@ Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), b
      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" />
 
-## Module dependency graph
-
-```mermaid
-%%{
-  init: {
-    'theme': 'dark'
-  }
-}%%
-
-graph TB
-
-  model --> database
-  benchmark --> android
-  android --> api
-  android --> common
-  android --> core
-  android --> database
-  android --> model
-  android --> benchmark
-  api --> model
-  common --> core
-  common --> database
-  common --> model
-```
 ## License
 
 See [LICENSE](LICENSE)

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,24 +15,29 @@ 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.android.junit5)
   alias(libs.plugins.anvil)
   alias(libs.plugins.modulegraphassert)
   alias(libs.plugins.whetstone)
   alias(libs.plugins.baselineprofile)
   alias(libs.plugins.licensee)
   alias(libs.plugins.tracelog)
+  alias(libs.plugins.kotlin.composeCompiler)
 }
 
 android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig.applicationId = "dev.msfjarvis.claw.android"
+  defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
   buildFeatures.compose = true
-  composeOptions {
-    useLiveLiterals = false
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
+  composeOptions { useLiveLiterals = false }
+  buildTypes.create("internal") {
+    matchingFallbacks += "release"
+    signingConfig = signingConfigs["debug"]
+    applicationIdSuffix = ".internal"
+    debuggable(true)
   }
-  // kotlinx.serialization 1.6.0-RC regression
-  packagingOptions.resources.pickFirsts += "**/*.bin"
 }
 
 baselineProfile {
@@ -41,14 +46,15 @@ baselineProfile {
   from(projects.benchmark.dependencyProject)
 }
 
+composeCompiler { enableStrongSkippingMode = true }
+
 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") }
-  allowUrl("https://opensource.org/licenses/isc-license.txt") {
-    because("kotlin-result is ISC licensed")
-  }
+  allowUrl("https://opensource.org/licenses/MIT") { because("That's the MIT license text") }
 }
 
 moduleGraphAssert {
@@ -67,38 +73,53 @@ whetstone {
 dependencies {
   implementation(platform(libs.androidx.compose.bom))
   implementation(platform(libs.okhttp.bom))
+  implementation(libs.aboutLibraries.m3)
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.glance)
   implementation(libs.androidx.compose.glance.m3)
   implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.compose.material3.window.size)
+  implementation(libs.androidx.compose.runtime)
+  implementation(libs.androidx.compose.ui)
+  implementation(libs.androidx.compose.ui.text)
+  implementation(libs.androidx.compose.ui.util)
   implementation(libs.androidx.core.splashscreen)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
   implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.work.runtime)
-  implementation(libs.coil)
   implementation(libs.copydown)
   implementation(libs.dagger)
-  implementation(libs.jsoup)
+  implementation(libs.eithernet)
+  implementation(libs.javax.inject)
   implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
+  implementation(libs.kotlinx.serialization.core)
+  implementation(libs.kotlinx.serialization.json)
   implementation(libs.material3.pulltorefresh)
   implementation(libs.napier)
+  implementation(libs.okhttp.core)
+  implementation(libs.okhttp.loggingInterceptor)
+  implementation(libs.retrofit)
   implementation(libs.sqldelight.extensions.coroutines)
   implementation(libs.swipe)
   implementation(libs.unfurl)
   implementation(projects.api)
   implementation(projects.common)
   implementation(projects.core)
+  implementation(projects.database.core)
   implementation(projects.database.impl)
   implementation(projects.model)
+  implementation(projects.web)
 
   kapt(libs.dagger.compiler)
 
-  testImplementation(libs.kotlinx.coroutines.test)
-  testImplementation(libs.okhttp.mockwebserver)
   addTestDependencies(project)
+  androidTestImplementation(libs.androidx.test.espresso.core)
+  androidTestImplementation(libs.androidx.test.uiautomator)
+  androidTestImplementation(libs.leakcanary.android.test)
 }

android/lint-baseline.xml

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

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

android/src/androidTest/AndroidManifest.xml

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

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

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

android/src/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,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.
@@ -11,7 +11,6 @@
   <application
     android:name=".ClawApplication"
     android:dataExtractionRules="@xml/data_extraction_rules"
-    android:enableOnBackInvokedCallback="true"
     android:fullBackupContent="@xml/full_backup_content"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
@@ -25,113 +24,28 @@
     <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" />
         <category android:name="android.intent.category.LAUNCHER" />
       </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.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/u/......*" />
-        <data android:scheme="https" />
+        <action android:name="android.intent.action.MAIN" />
       </intent-filter>
     </activity>
+
     <provider
       android:name="androidx.startup.InitializationProvider"
       android:authorities="${applicationId}.androidx-startup"
@@ -146,32 +60,38 @@
         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" />
-      </intent-filter>
-    </receiver>
-    <receiver android:name=".glance.WidgetReceiver"
-        android:exported="true">
       <intent-filter>
         <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
       </intent-filter>
       <meta-data
-          android:name="android.appwidget.provider"
-          android:resource="@xml/saved_posts_widget_info" />
+        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.
@@ -23,8 +23,7 @@ import javax.inject.Inject
 @ContributesAppInjector(generateAppComponent = true)
 class ClawApplication : Application(), ApplicationComponentOwner {
 
-  override val applicationComponent by
-    lazy(LazyThreadSafetyMode.NONE) { GeneratedApplicationComponent.create(this) }
+  override val applicationComponent = GeneratedApplicationComponent.create(this)
 
   @Inject lateinit var plugins: Set<@JvmSuppressWildcards AppPlugin>
 
@@ -34,19 +33,12 @@ class ClawApplication : Application(), ApplicationComponentOwner {
     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,67 +1,36 @@
 /*
- * 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.activity.enableEdgeToEdge
 import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
 import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
-import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.runtime.Composable
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-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.theme.LobstersTheme
-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)
-    enableEdgeToEdge()
-    setContent {
-      val windowSizeClass = calculateWindowSizeClass(this)
-      LobstersTheme(
-        dynamicColor = true,
-        providedValues = arrayOf(LocalUriHandler provides urlLauncher),
-      ) {
-        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 {

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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -28,46 +28,47 @@ 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.database.local.SavedPost
+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: List<SavedPost>,
-) : GlanceAppWidget() {
+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()
+        WidgetHost(postWindow)
       }
     }
   }
-
-  @Composable
-  private fun WidgetHost() {
-    LazyColumn(
-      modifier =
-        GlanceModifier.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) }
-    }
-  }
+}
+
+@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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -14,6 +14,8 @@ 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
@@ -26,36 +28,32 @@ import androidx.glance.layout.Box
 import androidx.glance.layout.Row
 import androidx.glance.layout.fillMaxWidth
 import androidx.glance.layout.padding
-import androidx.glance.layout.wrapContentWidth
 import androidx.glance.text.Text
-import androidx.glance.text.TextAlign
 import androidx.glance.text.TextStyle
 import dev.msfjarvis.claw.android.MainActivity
 import dev.msfjarvis.claw.android.MainActivity.Companion.NAVIGATION_KEY
-import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.model.UIPost
 
 private val destinationKey = Key<String>(NAVIGATION_KEY)
 
 @Composable
 @GlanceComposable
-fun WidgetListEntry(
-  post: SavedPost,
-  modifier: GlanceModifier = GlanceModifier,
-) {
+fun WidgetListEntry(post: UIPost, modifier: GlanceModifier = GlanceModifier) {
   val titleStyle = MaterialTheme.typography.titleMedium
-  val subtitleStyle = MaterialTheme.typography.labelLarge
   val commentsAction =
     actionStartActivity<MainActivity>(actionParametersOf(destinationKey to post.shortId))
+  // If the URL starts with a /, it's a relative URL and we should open the comments page directly.
   val postAction =
-    if (post.url.isNotEmpty()) actionStartActivity(Intent(Intent.ACTION_VIEW, Uri.parse(post.url)))
-    else commentsAction
+    if (post.url.startsWith('/')) commentsAction
+    else actionStartActivity(Intent(Intent.ACTION_VIEW, Uri.parse(post.url)))
   Box(modifier.padding(8.dp)) {
     Row(
       verticalAlignment = Alignment.CenterVertically,
       modifier =
         GlanceModifier.fillMaxWidth()
           .background(GlanceTheme.colors.surfaceVariant)
-          .cornerRadius(16.dp)
+          .cornerRadius(4.dp)
           .padding(8.dp),
     ) {
       Text(
@@ -67,23 +65,13 @@ fun WidgetListEntry(
             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),
       )
-      post.commentCount?.let { count ->
-        Text(
-          text = "$count comments",
-          modifier =
-            GlanceModifier.wrapContentWidth().padding(end = 4.dp).clickable(commentsAction),
-          style =
-            TextStyle(
-              color = GlanceTheme.colors.onSurfaceVariant,
-              fontSize = subtitleStyle.fontSize,
-              fontWeight = subtitleStyle.fontWeight.toGlance(),
-              fontStyle = subtitleStyle.fontStyle.toGlance(),
-              textAlign = TextAlign.End,
-            )
-        )
-      }
     }
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -14,8 +14,6 @@ import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.broadcastreceiver.ContributesBroadcastReceiverInjector
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import javax.inject.Inject
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
 
 @ContributesBroadcastReceiverInjector
 class WidgetReceiver : GlanceAppWidgetReceiver() {
@@ -23,7 +21,7 @@ class WidgetReceiver : GlanceAppWidgetReceiver() {
   @Inject lateinit var viewModel: ClawViewModel
 
   override val glanceAppWidget: GlanceAppWidget
-    get() = SavedPostsWidget(runBlocking { viewModel.savedPosts.first().take(50) })
+    get() = SavedPostsWidget(viewModel.savedPosts)
 
   override fun onReceive(context: Context, intent: Intent) {
     Whetstone.inject(this, context)

android/src/main/kotlin/dev/msfjarvis/claw/android/injection/MetadataExtractorModule.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.
@@ -22,23 +22,17 @@ object MetadataExtractorModule {
   fun provideUnfurlLogger(): UnfurlLogger {
     return object : UnfurlLogger {
       override fun log(message: String) {
-        Napier.d { message }
+        Napier.d(tag = "Unfurler") { message }
       }
 
       override fun log(e: Throwable, message: String) {
-        Napier.e(e) { message }
+        Napier.e(tag = "Unfurler", throwable = e) { message }
       }
     }
   }
 
   @Provides
-  fun provideUnfurler(
-    okHttpClient: OkHttpClient,
-    logger: UnfurlLogger,
-  ): Unfurler {
-    return Unfurler(
-      httpClient = okHttpClient,
-      logger = logger,
-    )
+  fun provideUnfurler(okHttpClient: OkHttpClient, logger: UnfurlLogger): Unfurler {
+    return Unfurler(httpClient = okHttpClient, logger = logger)
   }
 }

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/LobstersPagingSource.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.
@@ -13,10 +13,16 @@ import com.slack.eithernet.ApiResult.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
+import dev.msfjarvis.claw.android.viewmodel.ReadPostsRepository
+import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
 import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.toUIPost
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 
 class LobstersPagingSource
@@ -24,15 +30,33 @@ class LobstersPagingSource
 constructor(
   @Assisted private val remoteFetcher: RemoteFetcher<LobstersPost>,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-) : PagingSource<Int, LobstersPost>() {
+  private val savedPostsRepository: SavedPostsRepository,
+  private val readPostsRepository: ReadPostsRepository,
+) : PagingSource<Int, UIPost>() {
+  private lateinit var savedPosts: List<String>
+  private lateinit var readPosts: List<String>
 
-  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
+  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, UIPost> {
+    if (!::savedPosts.isInitialized) {
+      savedPosts = savedPostsRepository.savedPosts.first().map(SavedPost::shortId)
+    }
+    if (!::readPosts.isInitialized) {
+      readPosts = readPostsRepository.readPosts.first()
+    }
     val page = params.key ?: STARTING_PAGE_INDEX
     return when (val result = withContext(ioDispatcher) { remoteFetcher.getItemsAtPage(page) }) {
       is Success ->
         LoadResult.Page(
           itemsBefore = (page - 1) * PAGE_SIZE,
-          data = result.value,
+          data =
+            result.value.map {
+              it
+                .toUIPost()
+                .copy(
+                  isSaved = savedPosts.contains(it.shortId),
+                  isRead = readPosts.contains(it.shortId),
+                )
+            },
           prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
           nextKey = page + 1,
         )
@@ -43,7 +67,7 @@ constructor(
     }
   }
 
-  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int? {
+  override fun getRefreshKey(state: PagingState<Int, UIPost>): Int? {
     return state.anchorPosition?.let { anchorPosition ->
       (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
     }

android/src/main/kotlin/dev/msfjarvis/claw/android/paging/SearchPagingSource.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,40 +14,66 @@ import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
+import dev.msfjarvis.claw.android.viewmodel.ReadPostsRepository
+import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
+import dev.msfjarvis.claw.api.LobstersSearchApi
 import dev.msfjarvis.claw.core.injection.IODispatcher
-import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.toUIPost
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.withContext
 
 /**
- * Duplicate of [LobstersPagingSource] with an additional optimization to not continue loading
- * further pages if nothing is found in the current one. This is required to prevent the app from
- * hammering the search endpoint with up to 70 consecutive requests for the search results of a
- * blank query.
+ * 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(
-  @Assisted private val remoteFetcher: RemoteFetcher<LobstersPost>,
+  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)
-    }
-  }
+  private val savedPostsRepository: SavedPostsRepository,
+  private val readPostsRepository: ReadPostsRepository,
+) : PagingSource<Int, UIPost>() {
+  private lateinit var savedPosts: List<String>
+  private lateinit var readPosts: List<String>
 
-  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
+  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, UIPost> {
+    if (!::savedPosts.isInitialized) {
+      savedPosts = savedPostsRepository.savedPosts.first().map(SavedPost::shortId)
+    }
+    if (!::readPosts.isInitialized) {
+      readPosts = readPostsRepository.readPosts.first()
+    }
+    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
-    return when (val result = withContext(ioDispatcher) { remoteFetcher.getItemsAtPage(page) }) {
+    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,
+          data =
+            result.value.map {
+              it
+                .toUIPost()
+                .copy(
+                  isSaved = savedPosts.contains(it.shortId),
+                  isRead = readPosts.contains(it.shortId),
+                )
+            },
           prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
           nextKey = nextKey,
         )
@@ -60,8 +86,14 @@ constructor(
     }
   }
 
+  override fun getRefreshKey(state: PagingState<Int, UIPost>): Int? {
+    return state.anchorPosition?.let { anchorPosition ->
+      (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
+    }
+  }
+
   @AssistedFactory
   interface Factory {
-    fun create(remoteFetcher: RemoteFetcher<LobstersPost>): SearchPagingSource
+    fun create(queryProvider: () -> String): SearchPagingSource
   }
 }

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

@@ -1,138 +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 java.io.InputStream
-import java.io.OutputStream
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-
-private const val MIME_TYPE = "application/json"
-
-@Composable
-fun DataTransferScreen(
-  context: Context,
-  importPosts: suspend (InputStream) -> Unit,
-  exportPosts: suspend (OutputStream) -> Unit,
-  snackbarHostState: SnackbarHostState,
-  modifier: Modifier = Modifier,
-) {
-  val coroutineScope = rememberCoroutineScope()
-  Column(modifier = modifier) {
-    ImportOption(context, coroutineScope, importPosts, snackbarHostState)
-    ExportOption(context, coroutineScope, exportPosts, snackbarHostState)
-  }
-}
-
-@Composable
-private fun ImportOption(
-  context: Context,
-  coroutineScope: CoroutineScope,
-  importPosts: suspend (InputStream) -> Unit,
-  snackbarHostState: SnackbarHostState,
-) {
-  val importAction =
-    rememberLauncherForActivityResult(GetContent()) { uri ->
-      if (uri == null) {
-        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
-        return@rememberLauncherForActivityResult
-      }
-      coroutineScope.launch {
-        context.contentResolver.openInputStream(uri)?.use { stream ->
-          importPosts(stream)
-          snackbarHostState.showSnackbarDismissing("Successfully imported posts")
-        }
-      }
-    }
-  SettingsActionItem(
-    title = "Import saved posts",
-    description = "Import saved posts from a previously generated export",
-    icon = Icons.Filled.Download,
-  ) {
-    importAction.launch(MIME_TYPE)
-  }
-}
-
-@Composable
-private fun ExportOption(
-  context: Context,
-  coroutineScope: CoroutineScope,
-  exportPosts: suspend (OutputStream) -> Unit,
-  snackbarHostState: SnackbarHostState,
-) {
-  val exportAction =
-    rememberLauncherForActivityResult(CreateDocument(MIME_TYPE)) { uri ->
-      if (uri == null) {
-        coroutineScope.launch { snackbarHostState.showSnackbarDismissing("No file selected") }
-        return@rememberLauncherForActivityResult
-      }
-      coroutineScope.launch {
-        context.contentResolver.openOutputStream(uri)?.use { stream ->
-          exportPosts(stream)
-          snackbarHostState.showSnackbarDismissing("Successfully exported posts")
-        }
-      }
-    }
-  SettingsActionItem(
-    title = "Export posts to file",
-    description = "Write all saved posts into a JSON file that can be imported at a later date",
-    icon = Icons.Filled.Upload,
-  ) {
-    exportAction.launch("claw-export.json")
-  }
-}
-
-@Composable
-private fun SettingsActionItem(
-  title: String,
-  modifier: Modifier = Modifier,
-  description: String? = null,
-  icon: ImageVector? = null,
-  onClick: (() -> Unit)? = null,
-) {
-  ListItem(
-    headlineContent = { Text(title) },
-    supportingContent = { description?.let { Text(it) } },
-    leadingContent = {
-      icon?.let {
-        Icon(
-          imageVector = icon,
-          contentDescription = null,
-          modifier = Modifier.height(32.dp),
-        )
-      }
-    },
-    modifier = modifier.clickable { onClick?.invoke() },
-  )
-}
-
-/** Shows a Snackbar but dismisses any existing ones first. */
-private suspend fun SnackbarHostState.showSnackbarDismissing(
-  text: String,
-) {
-  currentSnackbarData?.dismiss()
-  showSnackbar(text)
-}

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

@@ -1,49 +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.decorations
-
-import androidx.compose.foundation.layout.RowScope
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.shadow
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.unit.dp
-import dev.msfjarvis.claw.common.theme.LobstersTheme
-import dev.msfjarvis.claw.common.ui.preview.DevicePreviews
-import dev.msfjarvis.claw.common.ui.preview.ThemePreviews
-
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun ClawAppBar(
-  modifier: Modifier = Modifier,
-  navigationIcon: @Composable () -> Unit = {},
-  title: @Composable () -> Unit = {},
-  actions: @Composable RowScope.() -> Unit = {},
-) {
-  TopAppBar(
-    title = title,
-    modifier = modifier.shadow(8.dp),
-    colors = TopAppBarDefaults.topAppBarColors(),
-    navigationIcon = navigationIcon,
-    actions = actions,
-  )
-}
-
-@DevicePreviews
-@ThemePreviews
-@Composable
-fun ClawAppBarPreview() {
-  LobstersTheme {
-    ClawAppBar(
-      title = { Text("Claw", fontWeight = FontWeight.Bold) },
-    )
-  }
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationBar.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.

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/ClawNavigationRail.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.

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.
@@ -8,6 +8,7 @@ package dev.msfjarvis.claw.android.ui
 
 import android.content.Context
 import android.content.ContextWrapper
+import android.content.Intent
 import androidx.activity.ComponentActivity
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
@@ -16,9 +17,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) {
@@ -30,6 +30,7 @@ fun Context.getActivity(): ComponentActivity? {
 
 @Composable
 fun rememberPostActions(
+  context: Context,
   urlLauncher: UrlLauncher,
   navController: NavController,
   viewModel: ClawViewModel,
@@ -45,25 +46,31 @@ fun rememberPostActions(
         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)
       }
 
-      override fun viewCommentsPage(commentsUrl: String) {
-        // Post links from lobste.rs are of the form $baseUrl/s/$postId/$postTitle
-        // Interestingly, lobste.rs does not actually care for the value of $postTitle, and will
-        // happily accept both a missing as well as a completely arbitrary $postTitle. We
-        // leverage this to create a new URL format which looks like
-        // $baseUrl/s/$postId/$postTitle/r, and does not trigger our deeplinks,
-        // instead opening in the custom tab as we want it to.
-        urlLauncher.openUri(commentsUrl.replaceAfterLast('/', "r"))
+      override fun viewCommentsPage(post: UIPost) {
+        urlLauncher.openUri(post.commentsUrl)
       }
 
-      override fun toggleSave(post: SavedPost) {
+      override fun toggleSave(post: UIPost) {
         viewModel.toggleSave(post)
       }
 
-      override suspend fun getComments(postId: String): LobstersPostDetails {
+      override fun share(post: UIPost) {
+        val sendIntent: Intent =
+          Intent().apply {
+            action = Intent.ACTION_SEND
+            putExtra(Intent.EXTRA_TEXT, post.url.ifEmpty { post.commentsUrl })
+            putExtra(Intent.EXTRA_TITLE, post.title)
+            type = "text/plain"
+          }
+        val shareIntent = Intent.createChooser(sendIntent, null)
+        context.startActivity(shareIntent)
+      }
+
+      override suspend fun 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.
@@ -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,18 +52,9 @@ fun DatabasePosts(
     } else {
       LazyColumn(state = listState) {
         items.forEach { (month, posts) ->
-          stickyHeader(contentType = "month-header") { MonthHeader(month = month) }
-          items(
-            items = posts,
-            key = { it.shortId },
-            contentType = { "LobstersItem" },
-          ) { item ->
-            ListItem(
-              item = item,
-              isSaved = { true },
-              isRead = { false },
-              postActions = postActions,
-            )
+          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/LobstersListItem.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.
@@ -8,43 +8,37 @@ package dev.msfjarvis.claw.android.ui.lists
 
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.Reply
+import androidx.compose.material.icons.filled.Share
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.produceState
 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.database.local.SavedPost
+import dev.msfjarvis.claw.model.UIPost
 import me.saket.swipe.SwipeAction
 import me.saket.swipe.SwipeableActionsBox
 
 @Composable
-fun ListItem(
-  item: SavedPost,
-  isSaved: suspend (SavedPost) -> Boolean,
-  isRead: suspend (String) -> Boolean,
+fun LobstersListItem(
+  item: UIPost,
   postActions: PostActions,
+  refresh: () -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  val saved by produceState(false, item) { value = isSaved(item) }
-  val read by produceState(false, item.shortId) { value = isRead(item.shortId) }
   val commentsAction =
     SwipeAction(
       icon = rememberVectorPainter(Icons.AutoMirrored.Filled.Reply),
       background = MaterialTheme.colorScheme.tertiary,
-      onSwipe = { postActions.viewCommentsPage(item.commentsUrl) },
+      onSwipe = { postActions.viewCommentsPage(item) },
     )
-  SwipeableActionsBox(
-    endActions = listOf(commentsAction),
-  ) {
-    LobstersCard(
-      post = item,
-      isSaved = saved,
-      isRead = read,
-      postActions = postActions,
-      modifier = modifier,
+  val shareAction =
+    SwipeAction(
+      icon = rememberVectorPainter(Icons.Filled.Share),
+      background = MaterialTheme.colorScheme.tertiary,
+      onSwipe = { postActions.share(item) },
     )
+  SwipeableActionsBox(startActions = listOf(shareAction), endActions = listOf(commentsAction)) {
+    LobstersCard(post = item, postActions = postActions, 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,6 +14,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
@@ -21,32 +22,35 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
+import androidx.paging.PagingData
 import androidx.paging.compose.LazyPagingItems
+import androidx.paging.compose.collectAsLazyPagingItems
 import androidx.paging.compose.itemContentType
 import androidx.paging.compose.itemKey
 import dev.msfjarvis.claw.common.posts.PostActions
+import dev.msfjarvis.claw.common.posts.TEST_POST
+import dev.msfjarvis.claw.common.posts.TEST_POST_ACTIONS
+import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.NetworkError
 import dev.msfjarvis.claw.common.ui.ProgressBar
-import dev.msfjarvis.claw.database.local.SavedPost
-import dev.msfjarvis.claw.model.LobstersPost
-import dev.msfjarvis.claw.model.toSavedPost
+import dev.msfjarvis.claw.common.ui.preview.DevicePreviews
+import dev.msfjarvis.claw.model.UIPost
 import eu.bambooapps.material3.pullrefresh.PullRefreshIndicator
 import eu.bambooapps.material3.pullrefresh.pullRefresh
 import eu.bambooapps.material3.pullrefresh.rememberPullRefreshState
+import kotlinx.coroutines.flow.MutableStateFlow
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun NetworkPosts(
-  lazyPagingItems: LazyPagingItems<LobstersPost>,
+  lazyPagingItems: LazyPagingItems<UIPost>,
   listState: LazyListState,
-  isPostSaved: suspend (SavedPost) -> Boolean,
-  isPostRead: suspend (String) -> 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,24 +60,19 @@ fun NetworkPosts(
         modifier = Modifier.align(Alignment.Center),
       )
     } else {
-      LazyColumn(
-        state = listState,
-      ) {
+      LazyColumn(state = listState) {
         items(
           count = lazyPagingItems.itemCount,
-          key = lazyPagingItems.itemKey { it.shortId },
+          key = lazyPagingItems.itemKey { item -> "${item.shortId}-${item.hashCode()}" },
           contentType = lazyPagingItems.itemContentType { "LobstersItem" },
         ) { index ->
           val item = lazyPagingItems[index]
           if (item != null) {
-            val dbModel = item.toSavedPost()
-            ListItem(
-              item = dbModel,
-              isSaved = isPostSaved,
-              isRead = isPostRead,
+            LobstersListItem(
+              item = item,
               postActions = postActions,
+              refresh = { lazyPagingItems.refresh() },
             )
-
             HorizontalDivider()
           }
         }
@@ -83,7 +82,7 @@ fun NetworkPosts(
               modifier =
                 Modifier.fillMaxWidth()
                   .wrapContentWidth(Alignment.CenterHorizontally)
-                  .padding(vertical = 16.dp),
+                  .padding(vertical = 16.dp)
             )
           }
         }
@@ -97,3 +96,17 @@ fun NetworkPosts(
     )
   }
 }
+
+@DevicePreviews
+@Composable
+private fun ListPreview() {
+  val items = List(20) { TEST_POST.copy(shortId = "${TEST_POST.shortId}${it}") }
+  val flow = MutableStateFlow(PagingData.from(items))
+  LobstersTheme {
+    NetworkPosts(
+      lazyPagingItems = flow.collectAsLazyPagingItems(),
+      listState = rememberLazyListState(),
+      postActions = TEST_POST_ACTIONS,
+    )
+  }
+}

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

@@ -1,30 +1,16 @@
 /*
- * 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.ui.lists
 
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.SearchOff
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.semantics.isTraversalGroup
@@ -35,15 +21,13 @@ import androidx.paging.PagingData
 import androidx.paging.compose.collectAsLazyPagingItems
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.SearchBar
-import dev.msfjarvis.claw.database.local.SavedPost
-import dev.msfjarvis.claw.model.LobstersPost
+import dev.msfjarvis.claw.model.UIPost
 import kotlinx.coroutines.flow.Flow
 
 @Composable
 fun SearchList(
-  items: Flow<PagingData<LobstersPost>>,
+  items: Flow<PagingData<UIPost>>,
   listState: LazyListState,
-  isPostSaved: suspend (SavedPost) -> Boolean,
   postActions: PostActions,
   searchQuery: String,
   setSearchQuery: (String) -> Unit,
@@ -54,42 +38,17 @@ fun SearchList(
     setSearchQuery(query)
     lazyPagingItems.refresh()
   }
-  DisposableEffect(true) {
-    // Clear search field when navigating away
-    onDispose { setSearchQuery("") }
-  }
-
-  var searchActive by remember { mutableStateOf(false) }
-  Column(modifier = Modifier.semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()) {
+  Column(modifier = modifier.semantics { isTraversalGroup = true }.zIndex(1f).fillMaxWidth()) {
     SearchBar(
       value = searchQuery,
       onValueChange = setSearchQuery,
-      onSearch = {
-        triggerSearch(it)
-        searchActive = true
-      },
+      onSearch = { triggerSearch(it) },
       modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp).testTag("search_bar"),
     )
-    if (searchActive) {
-      NetworkPosts(
-        lazyPagingItems = lazyPagingItems,
-        listState = listState,
-        isPostSaved = isPostSaved,
-        isPostRead = { false },
-        postActions = postActions,
-        modifier = modifier,
-      )
-    } else {
-      Box(modifier = Modifier.fillMaxSize()) {
-        Column(modifier = Modifier.align(Alignment.Center)) {
-          Icon(
-            imageVector = Icons.Filled.SearchOff,
-            contentDescription = "No search results",
-            modifier = Modifier.align(Alignment.CenterHorizontally).size(36.dp),
-          )
-          Text(text = "Nothing to see here", style = MaterialTheme.typography.headlineSmall)
-        }
-      }
-    }
+    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 © 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,34 +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 Search : Destinations() {
+  data object Comments : Destinations() {
+    const val PLACEHOLDER = "{postId}"
+    override val route = "comments/$PLACEHOLDER"
+  }
+
+  data object User : Destinations() {
+    const val PLACEHOLDER = "{username}"
+    override val route = "user/$PLACEHOLDER"
+  }
+
+  data object Search : Destinations() {
     override val route = "search"
   }
 
-  object Comments : Destinations() {
-    const val placeholder = "{postId}"
-    override val route = "comments/$placeholder"
+  data object Settings : Destinations() {
+    override val route = "settings"
   }
 
-  object User : Destinations() {
-    const val placeholder = "{username}"
-    override val route = "user/$placeholder"
-  }
-
-  object DataTransfer : Destinations() {
-    override val route: String = "datatransfer"
+  data object AboutLibraries : Destinations() {
+    override val route = "about_libraries"
   }
 
   companion object {

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

@@ -1,35 +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.ui
+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.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.ImportExport
 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.Search
 import androidx.compose.material.icons.outlined.Whatshot
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -39,34 +43,36 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.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.ui.datatransfer.DataTransferScreen
-import dev.msfjarvis.claw.android.ui.decorations.ClawAppBar
+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.lists.SearchList
 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.urllauncher.UrlLauncher
@@ -75,9 +81,9 @@ import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalComposeUiApi::class)
+@OptIn(ExperimentalComposeUiApi::class, ExperimentalMaterial3Api::class)
 @Composable
-fun LobstersApp(
+fun LobstersPostsScreen(
   urlLauncher: UrlLauncher,
   htmlConverter: HTMLConverter,
   windowSizeClass: WindowSizeClass,
@@ -85,17 +91,16 @@ fun LobstersApp(
   modifier: Modifier = Modifier,
   viewModel: ClawViewModel = injectedViewModel(),
 ) {
+  val context = LocalContext.current
   val hottestListState = rememberLazyListState()
   val newestListState = rememberLazyListState()
   val savedListState = rememberLazyListState()
-  val searchListState = rememberLazyListState()
   val navController = rememberNavController()
   val coroutineScope = rememberCoroutineScope()
   val snackbarHostState = remember { SnackbarHostState() }
-  val postActions = rememberPostActions(urlLauncher, navController, viewModel)
+  val postActions = rememberPostActions(context, 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()
@@ -104,10 +109,10 @@ fun LobstersApp(
   val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
 
   val postIdOverride = context.getActivity()?.intent?.extras?.getString(MainActivity.NAVIGATION_KEY)
-  LaunchedEffect(false) {
+  LaunchedEffect(Unit) {
     if (postIdOverride != null) {
       navController.navigate(
-        Destinations.Comments.route.replace(Destinations.Comments.placeholder, postIdOverride)
+        Destinations.Comments.route.replace(Destinations.Comments.PLACEHOLDER, postIdOverride)
       )
     }
   }
@@ -120,7 +125,9 @@ fun LobstersApp(
         icon = Icons.Outlined.Whatshot,
         selectedIcon = Icons.Filled.Whatshot,
       ) {
-        coroutineScope.launch { hottestListState.animateScrollToItem(index = 0) }
+        coroutineScope.launch {
+          if (hottestPosts.itemCount > 0) hottestListState.animateScrollToItem(index = 0)
+        }
       },
       NavigationItem(
         label = "Newest",
@@ -128,7 +135,9 @@ fun LobstersApp(
         icon = Icons.Outlined.NewReleases,
         selectedIcon = Icons.Filled.NewReleases,
       ) {
-        coroutineScope.launch { newestListState.animateScrollToItem(index = 0) }
+        coroutineScope.launch {
+          if (newestPosts.itemCount > 0) newestListState.animateScrollToItem(index = 0)
+        }
       },
       NavigationItem(
         label = "Saved",
@@ -136,54 +145,53 @@ fun LobstersApp(
         icon = Icons.Outlined.FavoriteBorder,
         selectedIcon = Icons.Filled.Favorite,
       ) {
-        coroutineScope.launch { savedListState.animateScrollToItem(index = 0) }
-      },
-      NavigationItem(
-        label = "Search",
-        route = Destinations.Search.route,
-        icon = Icons.Outlined.Search,
-        selectedIcon = Icons.Filled.Search,
-      ) {
-        coroutineScope.launch { searchListState.animateScrollToItem(index = 0) }
+        coroutineScope.launch { if (savedPosts.isNotEmpty()) savedListState.scrollToItem(0) }
       },
     )
 
   Scaffold(
     topBar = {
-      if (currentDestination != Destinations.Search.route) {
-        ClawAppBar(
-          navigationIcon = {
-            if (
-              navController.previousBackStackEntry != null &&
-                navItems.none { it.route == currentDestination }
+      TopAppBar(
+        modifier = Modifier.shadow(8.dp),
+        navigationIcon = {
+          if (
+            navController.previousBackStackEntry != null &&
+              navItems.none { it.route == currentDestination }
+          ) {
+            IconButton(
+              onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
             ) {
-              IconButton(
-                onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() },
-              ) {
-                Icon(
-                  imageVector = Icons.AutoMirrored.Filled.ArrowBack,
-                  contentDescription = "Go back to previous screen",
-                )
-              }
+              Icon(
+                imageVector = Icons.AutoMirrored.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)
+          } else {
+            Icon(
+              painter = painterResource(id = R.drawable.ic_launcher_foreground),
+              contentDescription = "The app icon for Claw",
+              modifier = Modifier.size(48.dp),
+            )
+          }
+        },
+        title = {
+          if (navItems.any { it.route == currentDestination }) {
+            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")
             }
-          },
-          actions = {
-            if (navItems.any { it.route == currentDestination }) {
-              IconButton(onClick = { navController.navigate(Destinations.DataTransfer.route) }) {
-                Icon(
-                  imageVector = Icons.Filled.ImportExport,
-                  contentDescription = "Data transfer options",
-                )
-              }
+            IconButton(onClick = { navController.navigate(Destinations.Settings.route) }) {
+              Icon(imageVector = Icons.Filled.Tune, contentDescription = "Settings")
             }
-          },
-        )
-      }
+          }
+        },
+      )
     },
     bottomBar = {
       AnimatedVisibility(visible = navigationType == ClawNavigationType.BOTTOM_NAVIGATION) {
@@ -213,14 +221,11 @@ fun LobstersApp(
         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,
-            isPostRead = viewModel::isPostRead,
             postActions = postActions,
           )
         }
@@ -229,38 +234,16 @@ fun LobstersApp(
           NetworkPosts(
             lazyPagingItems = newestPosts,
             listState = newestListState,
-            isPostSaved = viewModel::isPostSaved,
-            isPostRead = viewModel::isPostRead,
             postActions = postActions,
           )
         }
         composable(route = Destinations.Saved.route) {
           setWebUri(null)
-          DatabasePosts(
-            items = savedPosts,
-            listState = savedListState,
-            postActions = postActions,
-          )
-        }
-        composable(Destinations.Search.route) {
-          setWebUri("https://lobste.rs/search")
-          SearchList(
-            items = viewModel.searchResults,
-            listState = searchListState,
-            isPostSaved = viewModel::isPostSaved,
-            postActions = postActions,
-            searchQuery = viewModel.searchQuery,
-            setSearchQuery = { query -> viewModel.searchQuery = query },
-          )
+          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")) {
@@ -273,13 +256,16 @@ fun LobstersApp(
             htmlConverter = htmlConverter,
             getSeenComments = viewModel::getSeenComments,
             markSeenComments = viewModel::markSeenComments,
+            openUserProfile = {
+              navController.navigate(
+                Destinations.User.route.replace(Destinations.User.PLACEHOLDER, it)
+              )
+            },
           )
         }
         composable(
           route = Destinations.User.route,
           arguments = listOf(navArgument("username") { type = NavType.StringType }),
-          deepLinks =
-            listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }),
         ) { backStackEntry ->
           val username =
             requireNotNull(backStackEntry.arguments?.getString("username")) {
@@ -289,16 +275,26 @@ fun LobstersApp(
           UserProfile(
             username = username,
             getProfile = viewModel::getUserProfile,
+            openUserProfile = {
+              navController.navigate(
+                Destinations.User.route.replace(Destinations.User.PLACEHOLDER, it)
+              )
+            },
           )
         }
-        composable(route = Destinations.DataTransfer.route) {
-          DataTransferScreen(
+        composable(route = Destinations.Settings.route) {
+          SettingsScreen(
             context = context,
+            openLibrariesScreen = { navController.navigate(Destinations.AboutLibraries.route) },
             importPosts = viewModel::importPosts,
-            exportPosts = viewModel::exportPosts,
+            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,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.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.compose.ui.platform.LocalContext
+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
+import dev.msfjarvis.claw.common.user.UserProfile
+
+@Composable
+fun SearchScreen(
+  urlLauncher: UrlLauncher,
+  htmlConverter: HTMLConverter,
+  setWebUri: (String?) -> Unit,
+  modifier: Modifier = Modifier,
+  viewModel: ClawViewModel = injectedViewModel(),
+) {
+  val navController = rememberNavController()
+  val postActions = rememberPostActions(LocalContext.current, 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,
+          openUserProfile = { username: String ->
+            navController.navigate(
+              Destinations.User.route.replace(Destinations.User.PLACEHOLDER, username)
+            )
+          },
+        )
+      }
+      composable(
+        route = Destinations.User.route,
+        arguments = listOf(navArgument("username") { type = NavType.StringType }),
+      ) { 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,
+          openUserProfile = {
+            navController.navigate(
+              Destinations.User.route.replace(Destinations.User.PLACEHOLDER, it)
+            )
+          },
+        )
+      }
+    }
+  }
+}

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/ClawViewModel.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.
@@ -11,11 +11,14 @@ 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.cachedIn
 import com.deliveryhero.whetstone.app.ApplicationScope
 import com.deliveryhero.whetstone.viewmodel.ContributesViewModel
 import com.slack.eithernet.ApiResult.Failure
@@ -27,24 +30,24 @@ import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZ
 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.api.LobstersSearchApi
 import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.core.injection.MainDispatcher
-import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.Comment
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.fromSavedPost
+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
@@ -54,7 +57,6 @@ class ClawViewModel
 @Inject
 constructor(
   private val api: LobstersApi,
-  private val searchApi: LobstersSearchApi,
   private val commentsRepository: CommentsRepository,
   private val readPostsRepository: ReadPostsRepository,
   private val savedPostsRepository: SavedPostsRepository,
@@ -66,70 +68,75 @@ constructor(
   @MainDispatcher private val mainDispatcher: CoroutineDispatcher,
   @ForScope(ApplicationScope::class) context: Context,
 ) : AndroidViewModel(context as Application) {
-  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)
-    }
-  private val searchResultsPager =
-    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
-      searchPagingSourceFactory.create { searchApi.searchPosts(searchQuery, it) }
-    }
-
-  val hottestPosts
-    get() = hottestPostsPager.flow
-
-  val newestPosts
-    get() = newestPostsPager.flow
-
-  val savedPosts
-    get() =
-      savedPostsRepository.savedPosts.map {
-        it.sortedByDescending { post -> post.createdAt.toLocalDateTime() }
-      }
-
+  val hottestPosts =
+    Pager(
+        config = PagingConfig(pageSize = PAGE_SIZE),
+        initialKey = STARTING_PAGE_INDEX,
+        pagingSourceFactory = { pagingSourceFactory.create(api::getHottestPosts) },
+      )
+      .flow
+      .cachedIn(viewModelScope)
+  val newestPosts =
+    Pager(
+        config = PagingConfig(pageSize = PAGE_SIZE),
+        initialKey = STARTING_PAGE_INDEX,
+        pagingSourceFactory = { pagingSourceFactory.create(api::getNewestPosts) },
+      )
+      .flow
+      .cachedIn(viewModelScope)
+  val searchResults =
+    Pager(
+        PagingConfig(pageSize = PAGE_SIZE),
+        initialKey = STARTING_PAGE_INDEX,
+        pagingSourceFactory = { searchPagingSourceFactory.create { searchQuery } },
+      )
+      .flow
+  val savedPosts = savedPostsRepository.savedPosts.map { it.map(UIPost.Companion::fromSavedPost) }
   val savedPostsByMonth
-    get() = savedPosts.map(::mapSavedPosts)
-
-  val searchResults
-    get() = searchResultsPager.flow
+    get() = savedPosts.map(::groupSavedPosts)
 
   var searchQuery by mutableStateOf("")
 
-  private fun mapSavedPosts(items: List<SavedPost>): ImmutableMap<Month, List<SavedPost>> {
+  private var _readPosts = emptyList<String>()
+  private var _savedPosts = emptyList<String>()
+
+  init {
+    viewModelScope.launch { savedPosts.collectLatest { _savedPosts = it.map(UIPost::shortId) } }
+    viewModelScope.launch { readPostsRepository.readPosts.collectLatest { _readPosts = it } }
+  }
+
+  private fun groupSavedPosts(items: List<UIPost>): ImmutableMap<String, List<UIPost>> {
     val sorted =
       items.sortedWith { post1, post2 ->
-        post2.createdAt.toLocalDateTime().compareTo(post1.createdAt.toLocalDateTime())
+        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 -> post.createdAt.toLocalDateTime().month }.toImmutableMap()
+    return sorted
+      .groupBy { post ->
+        val time = post.createdAt.toLocalDateTime()
+        "${time.month.name.lowercase().capitalize(Locale.current)} ${time.year}"
+      }
+      .toImmutableMap()
   }
 
-  suspend fun isPostSaved(post: SavedPost): Boolean {
-    return savedPosts.first().any { savedPost -> savedPost.shortId == post.shortId }
-  }
-
-  fun toggleSave(post: SavedPost) {
-    viewModelScope.launch(ioDispatcher) {
-      val saved = isPostSaved(post)
-      if (saved) {
-        savedPostsRepository.removePost(post)
-      } else {
-        savedPostsRepository.savePost(post)
-      }
-      val newPosts = savedPosts.first()
-      withContext(mainDispatcher) {
-        SavedPostsWidget(newPosts.take(50)).updateAll(getApplication())
-      }
+  fun toggleSave(post: UIPost) {
+    viewModelScope.launch {
+      savedPostsRepository.toggleSave(post)
+      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 -> {
@@ -165,14 +172,16 @@ constructor(
 
   suspend fun importPosts(input: InputStream) = dataTransferRepository.importPosts(input)
 
-  suspend fun exportPosts(output: OutputStream) = dataTransferRepository.exportPosts(output)
+  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) }
   }
 
-  suspend fun isPostRead(postId: String) = readPostsRepository.isRead(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

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.SavedPostSerializer
 import dev.msfjarvis.claw.database.local.SavedPost
-import dev.msfjarvis.claw.database.local.SavedPostQueries
 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
@@ -27,27 +28,68 @@ class DataTransferRepository
 @Inject
 constructor(
   private val json: Json,
-  private val savedPostQueries: SavedPostQueries,
-  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+  private val savedPostsRepository: SavedPostsRepository,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) {
   private val serializer = ListSerializer(SavedPostSerializer)
 
   suspend fun importPosts(input: InputStream) {
     val posts: List<SavedPost> =
-      withContext(ioDispatcher) {
-        json.decodeFromStream(
-          serializer,
-          input,
-        )
-      }
-    withContext(dbDispatcher) {
-      savedPostQueries.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/ReadPostsRepository.kt

@@ -1,11 +1,13 @@
 /*
- * 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 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
@@ -18,11 +20,9 @@ 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) }
   }
-
-  suspend fun isRead(postId: String): Boolean =
-    withContext(dbDispatcher) { readPostsQueries.isRead(postId).executeAsOneOrNull() != null }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/viewmodel/SavedPostsRepository.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.
@@ -11,6 +11,8 @@ import app.cash.sqldelight.coroutines.mapToList
 import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
 import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.database.local.SavedPostQueries
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.toSavedPost
 import io.github.aakira.napier.Napier
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -24,9 +26,14 @@ constructor(
 ) {
   val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
 
-  suspend fun savePost(post: SavedPost) {
-    Napier.d(tag = TAG) { "Saving post: ${post.shortId}" }
-    withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post) }
+  suspend fun toggleSave(post: UIPost) {
+    if (post.isSaved) {
+      Napier.d(tag = TAG) { "Removing post: ${post.shortId}" }
+      withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
+    } else {
+      Napier.d(tag = TAG) { "Saving post: ${post.shortId}" }
+      withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post.toSavedPost()) }
+    }
   }
 
   suspend fun savePosts(posts: List<SavedPost>) {
@@ -38,11 +45,6 @@ constructor(
     }
   }
 
-  suspend fun removePost(post: SavedPost) {
-    Napier.d(tag = TAG) { "Removing post: ${post.shortId}" }
-    withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
-  }
-
   private companion object {
     private const val TAG = "SavedPostsRepository"
   }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022-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.
@@ -18,9 +18,12 @@ import dev.msfjarvis.claw.android.glance.SavedPostsWidget
 import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.UIPost
+import dev.msfjarvis.claw.model.fromSavedPost
 import dev.msfjarvis.claw.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
@@ -44,7 +47,10 @@ constructor(
       .filterIsInstance<Success<LobstersPostDetails>>()
       .map { result -> result.value.toSavedPost() }
       .let { savedPostsRepository.savePosts(it) }
-    SavedPostsWidget(savedPostsRepository.savedPosts.first().take(50)).updateAll(applicationContext)
+    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

@@ -5,7 +5,7 @@
  ~ 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/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/themes.xml

@@ -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.
@@ -7,17 +7,11 @@
 <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" />
+  <style name="Theme.Claw" parent="android:Theme.Material.NoActionBar" />
 </resources>

android/version.properties

@@ -1,5 +1,5 @@
 #
 # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
 #
-versioning-plugin.versionCode=13700
-versioning-plugin.versionName=1.37.0
+versioning-plugin.versionCode=14800
+versioning-plugin.versionName=1.48.0

api/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.
@@ -18,16 +18,18 @@ android { namespace = "dev.msfjarvis.claw.api" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  api(libs.eithernet)
+  api(libs.dagger)
+  api(libs.javax.inject)
+  api(libs.okhttp.core)
   api(libs.retrofit)
   api(projects.model)
 
-  implementation(libs.dagger)
-  implementation(libs.javax.inject)
+  implementation(libs.eithernet)
   implementation(libs.jsoup)
 
   testImplementation(testFixtures(libs.eithernet))
   testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.kotlinx.serialization.core)
   testImplementation(libs.kotlinx.serialization.json)
   addTestDependencies(project)
 }

api/lint-baseline.xml

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

@@ -12,16 +12,15 @@ import dev.msfjarvis.claw.model.LobstersPostDetails
 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>

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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -8,7 +8,6 @@ package dev.msfjarvis.claw.api.converters
 
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.model.LobstersPost
-import dev.msfjarvis.claw.model.User
 import java.lang.reflect.Type
 import okhttp3.ResponseBody
 import org.jsoup.Jsoup
@@ -32,8 +31,7 @@ object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
     val url = titleElement.attr("href")
     val tags = elem.select("span.tags > a").map(Element::text)
     val (commentCount, commentsUrl) = getCommentsData(elem.select("span.comments_label"))
-    val submitter =
-      getSubmitter(elem.select("div.byline").first() ?: error("No byline element found"))
+    val submitter = elem.select("div.byline > a.u-author").text()
     return LobstersPost(
       shortId = shortId,
       title = title,
@@ -55,29 +53,11 @@ object SearchConverter : Converter<ResponseBody, List<LobstersPost>> {
     return (countString.toIntOrNull() ?: 0) to commentsUrl
   }
 
-  /**
-   * Make a bare-bones [User] object given a byline [elem]. We only need this to be usable for
-   * displaying in a list.
-   */
-  private fun getSubmitter(elem: Element): User {
-    val userElement = elem.select("a.u-author")
-    val avatarElement = elem.select("img.avatar")
-    val username = userElement.text()
-    val avatarUrl = avatarElement.attr("src")
-    return User(
-      username = username,
-      about = "",
-      invitedBy = null,
-      avatarUrl = avatarUrl,
-      createdAt = "",
-    )
-  }
-
   object Factory : Converter.Factory() {
     override fun responseBodyConverter(
       type: Type,
       annotations: Array<out Annotation>,
-      retrofit: Retrofit
+      retrofit: Retrofit,
     ): Converter<ResponseBody, List<LobstersPost>> {
       return SearchConverter
     }

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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -18,6 +18,7 @@ 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
@@ -40,7 +41,7 @@ object RetrofitModule {
     client: OkHttpClient,
     converterFactories: Map<Int, @JvmSuppressWildcards Converter.Factory>,
     callAdapterFactories: Map<Int, @JvmSuppressWildcards CallAdapter.Factory>,
-    @BaseUrl baseUrl: String,
+    @Named("LobstersURL") baseUrl: String,
   ): Retrofit {
     return Retrofit.Builder()
       .client(client)
@@ -56,7 +57,7 @@ object RetrofitModule {
     client: OkHttpClient,
     @SearchApi converterFactories: List<@JvmSuppressWildcards Converter.Factory>,
     callAdapterFactories: Map<Int, @JvmSuppressWildcards CallAdapter.Factory>,
-    @BaseUrl baseUrl: String,
+    @Named("LobstersURL") baseUrl: String,
   ): Retrofit {
     return Retrofit.Builder()
       .client(client)
@@ -90,15 +91,10 @@ object RetrofitModule {
   @Provides
   @SearchApi
   fun provideConverters(): List<@JvmSuppressWildcards Converter.Factory> =
-    listOf(
-      ApiResultConverterFactory,
-      SearchConverter.Factory,
-    )
+    listOf(ApiResultConverterFactory, SearchConverter.Factory)
 
-  @Provides @BaseUrl fun provideBaseUrl(): String = LobstersApi.BASE_URL
+  @Provides @Named("LobstersURL") fun provideLobstersUrl(): String = LobstersApi.BASE_URL
 }
 
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class BaseUrl
-
 /** Internal Dagger [Qualifier] to identify dependencies exclusive to [LobstersSearchApi]. */
 @Qualifier @Retention(AnnotationRetention.RUNTIME) private annotation class SearchApi

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

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

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

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

api/src/test/resources/msfjarvis.json

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

benchmark/build.gradle.kts

@@ -1,13 +1,11 @@
 /*
- * 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.
  */
 @file:Suppress("UnstableApiUsage")
 
-import com.android.build.api.dsl.ManagedVirtualDevice
-
 plugins {
   id(libs.plugins.android.test.get().pluginId)
   id("dev.msfjarvis.claw.kotlin-android")
@@ -30,21 +28,11 @@ android {
       matchingFallbacks += "release"
     }
   }
-
-  testOptions.managedDevices.devices {
-    create<ManagedVirtualDevice>("api31") {
-      device = "Pixel 6"
-      apiLevel = 31
-      systemImageSource = "aosp"
-    }
-  }
-
   targetProjectPath = ":android"
 }
 
 baselineProfile {
-  managedDevices += "api31"
-  useConnectedDevices = false
+  useConnectedDevices = true
   enableEmulatorDisplay = false
 }
 

build-logic/build.gradle.kts

@@ -1,12 +1,15 @@
 /*
- * 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.
  */
-plugins { `kotlin-dsl` }
+plugins {
+  `kotlin-dsl`
+  alias(libs.plugins.android.lint)
+}
 
-kotlin.jvmToolchain { languageVersion.set(JavaLanguageVersion.of(17)) }
+kotlin.jvmToolchain(17)
 
 gradlePlugin {
   plugins {
@@ -61,14 +64,19 @@ gradlePlugin {
   }
 }
 
+lint.baseline = project.file("lint-baseline.xml")
+
 dependencies {
   implementation(libs.build.agp)
   implementation(libs.build.cachefix)
   implementation(libs.build.kotlin.gradle)
-  implementation(libs.build.r8)
   implementation(libs.build.semver)
   implementation(libs.build.sentry)
   implementation(libs.build.spotless)
   implementation(libs.build.vcu)
-  implementation(libs.build.versions)
+
+  // Expose the generated version catalog API to the plugin.
+  implementation(files(libs::class.java.superclass.protectionDomain.codeSource.location))
+
+  lintChecks(libs.androidx.lint)
 }

build-logic/lint-baseline.xml

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

build-logic/settings.gradle.kts

@@ -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.
@@ -8,31 +8,42 @@
 
 rootProject.name = "build-logic"
 
+pluginManagement {
+  plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" }
+  repositories {
+    exclusiveContent {
+      forRepository { gradlePluginPortal() }
+      filter {
+        includeModule(
+          "org.gradle.toolchains.foojay-resolver-convention",
+          "org.gradle.toolchains.foojay-resolver-convention.gradle.plugin",
+        )
+        includeModule("org.gradle.toolchains", "foojay-resolver")
+        includeModule("org.gradle.kotlin.kotlin-dsl", "org.gradle.kotlin.kotlin-dsl.gradle.plugin")
+        includeModule("org.gradle.kotlin", "gradle-kotlin-dsl-plugins")
+      }
+    }
+    exclusiveContent {
+      forRepository { google() }
+      filter {
+        includeGroup("androidx.databinding")
+        includeGroup("com.google.testing.platform")
+        includeGroupAndSubgroups("com.android")
+      }
+    }
+    mavenCentral { mavenContent { releasesOnly() } }
+  }
+}
+
 dependencyResolutionManagement {
   repositories {
     exclusiveContent {
       forRepository(::google)
       filter {
         includeGroup("androidx.databinding")
-        includeGroup("com.android")
-        includeGroup("com.android.tools.analytics-library")
-        includeGroup("com.android.tools.build")
-        includeGroup("com.android.tools.build.jetifier")
-        includeGroup("com.android.databinding")
-        includeGroup("com.android.tools.ddms")
-        includeGroup("com.android.tools.layoutlib")
-        includeGroup("com.android.tools.lint")
-        includeGroup("com.android.tools.utp")
+        includeGroup("androidx.lint")
+        includeGroupByRegex("com.android.*")
         includeGroup("com.google.testing.platform")
-        includeModule("com.android.tools", "annotations")
-        includeModule("com.android.tools", "common")
-        includeModule("com.android.tools", "desugar_jdk_libs")
-        includeModule("com.android.tools", "desugar_jdk_libs_configuration")
-        includeModule("com.android.tools", "dvlib")
-        includeModule("com.android.tools", "play-sdk-proto")
-        includeModule("com.android.tools", "repository")
-        includeModule("com.android.tools", "sdklib")
-        includeModule("com.android.tools", "sdk-common")
       }
     }
     exclusiveContent {
@@ -43,11 +54,7 @@ dependencyResolutionManagement {
         includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin")
       }
     }
-    exclusiveContent {
-      forRepository { maven("https://storage.googleapis.com/r8-releases/raw/main") }
-      filter { includeModule("com.android.tools", "r8") }
-    }
-    mavenCentral()
+    mavenCentral { mavenContent { releasesOnly() } }
   }
   versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
 }

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

@@ -15,14 +15,13 @@ import com.android.build.api.variant.HasUnitTestBuilder
 import com.android.build.api.variant.LibraryAndroidComponentsExtension
 import com.android.build.gradle.BaseExtension
 import dev.msfjarvis.claw.gradle.LintConfig.configureLint
+import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.android.AndroidCacheFixPlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.findByType
-import org.gradle.kotlin.dsl.getByType
 
 class AndroidCommonPlugin : Plugin<Project> {
 
@@ -59,10 +58,9 @@ class AndroidCommonPlugin : Plugin<Project> {
     }
     project.extensions.findByType<ApplicationExtension>()?.lint?.configureLint(project)
     project.extensions.findByType<LibraryExtension>()?.lint?.configureLint(project)
-    val catalog = project.extensions.getByType<VersionCatalogsExtension>()
-    val libs = catalog.named("libs")
-    project.dependencies.addProvider("lintChecks", libs.findLibrary("slack-compose-lints").get())
-    project.dependencies.addProvider("lintChecks", libs.findLibrary("slack-lints").get())
+    val libs = project.extensions.getByName("libs") as LibrariesForLibs
+    project.dependencies.addProvider("lintChecks", libs.slack.compose.lints)
+    project.dependencies.addProvider("lintChecks", libs.slack.lints)
   }
 
   private fun Project.configureSlimTests() {
@@ -74,7 +72,7 @@ class AndroidCommonPlugin : Plugin<Project> {
       beforeVariants(selector().all()) {
         if (it.name == "debug") return@beforeVariants
         (it as HasUnitTestBuilder).enableUnitTest = false
-        it.enableAndroidTest = false
+        it.androidTest.enable = false
       }
     }
 
@@ -83,7 +81,7 @@ class AndroidCommonPlugin : Plugin<Project> {
       beforeVariants(selector().all()) {
         if (it.name == "debug") return@beforeVariants
         (it as HasUnitTestBuilder).enableUnitTest = false
-        it.enableAndroidTest = false
+        it.androidTest.enable = false
       }
     }
   }

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/ApplicationPlugin.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.
@@ -33,24 +33,22 @@ class ApplicationPlugin : Plugin<Project> {
         buildConfig = true
       }
 
-      buildTypes {
-        all {
-          setProguardFiles(
-            listOf(
-              "proguard-android-optimize.pro",
-              "proguard-rules.pro",
-              "proguard-rules-missing-classes.pro",
-            )
+      buildTypes.configureEach {
+        setProguardFiles(
+          listOf(
+            "proguard-android-optimize.pro",
+            "proguard-rules.pro",
+            "proguard-rules-missing-classes.pro",
           )
-        }
-        named("release") { isMinifyEnabled = true }
-        named("debug") {
+        )
+        if (name == "release") {
+          isMinifyEnabled = !project.providers.environmentVariable("DISABLE_MINIFY").isPresent
+        } else if (name == "debug") {
           applicationIdSuffix = ".debug"
           versionNameSuffix = "-debug"
           isMinifyEnabled = false
         }
       }
-
       project.configureBuildSigning()
     }
   }

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

@@ -1,41 +1,36 @@
 /*
- * Copyright © 2022-2023 Harsh Shandilya.
+ * 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.gradle
 
-import com.github.benmanes.gradle.versions.VersionsPlugin
-import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+import com.github.zafarkhaja.semver.Version
+import kotlin.jvm.optionals.getOrNull
 import nl.littlerobots.vcu.plugin.VersionCatalogUpdateExtension
 import nl.littlerobots.vcu.plugin.VersionCatalogUpdatePlugin
+import nl.littlerobots.vcu.plugin.versionSelector
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.withType
 
 @Suppress("Unused")
 class DependencyUpdatesPlugin : Plugin<Project> {
   override fun apply(project: Project) {
-    project.pluginManager.apply(VersionsPlugin::class)
     project.pluginManager.apply(VersionCatalogUpdatePlugin::class)
-    project.tasks.withType<DependencyUpdatesTask>().configureEach {
-      rejectVersionIf { isNonStable(candidate.version) && !isNonStable(currentVersion) }
-      checkConstraints = true
-      checkBuildEnvironmentConstraints = true
-      checkForGradleUpdate = true
-    }
     project.extensions.configure<VersionCatalogUpdateExtension> {
       keep.keepUnusedLibraries.set(true)
+      versionSelector {
+        val currentVersion = Version.tryParse(it.currentVersion).getOrNull()
+        val newVersion = Version.tryParse(it.candidate.version).getOrNull()
+        if (currentVersion == null || newVersion == null) {
+          false
+        } else {
+          newVersion.isHigherThan(currentVersion)
+        }
+      }
     }
   }
-
-  private fun isNonStable(version: String): Boolean {
-    val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase().contains(it) }
-    val regex = "^[0-9,.v-]+(-r)?$".toRegex()
-    val isStable = stableKeyword || regex.matches(version)
-    return isStable.not()
-  }
 }

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinAndroidPlugin.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.

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinCommonPlugin.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.
@@ -31,7 +31,7 @@ class KotlinCommonPlugin : Plugin<Project> {
         compilerOptions {
           allWarningsAsErrors.set(true)
           freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
-          languageVersion.set(KotlinVersion.KOTLIN_1_8)
+          languageVersion.set(KotlinVersion.KOTLIN_1_9)
         }
       }
       withType<Test>().configureEach {
@@ -43,10 +43,7 @@ class KotlinCommonPlugin : Plugin<Project> {
   }
 
   companion object {
-    private val ADDITIONAL_COMPILER_ARGS =
-      listOf(
-        "-opt-in=kotlin.RequiresOptIn",
-      )
+    private val ADDITIONAL_COMPILER_ARGS = listOf("-opt-in=kotlin.RequiresOptIn")
 
     val JVM_TOOLCHAIN_ACTION =
       Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) }

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/KotlinKaptPlugin.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.
@@ -41,7 +41,7 @@ class KotlinKaptPlugin : Plugin<Project> {
       }
     }
     project.tasks
-      .matching { it.name.startsWith("kapt") && it.name.endsWith("UnitTestKotlin") }
+      .named { it.startsWith("kapt") && it.endsWith("UnitTestKotlin") }
       .configureEach { enabled = false }
   }
 

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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -34,8 +34,10 @@ object LintConfig {
     }
     baseline = project.file("lint-baseline.xml")
     // This is extremely annoying
+    disable += "AndroidGradlePluginVersion"
+    disable += "GradleDependency"
     disable += "NewerVersionAvailable"
-    // Jetpack Compose lints are incompatible with AGP 8.3.0-alpha06
+    // Can't do anything about this
     disable += "ObsoleteLintCustomCheck"
   }
 

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

@@ -1,5 +1,5 @@
 /*
- * 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.
@@ -10,54 +10,71 @@ import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import io.sentry.android.gradle.extensions.InstrumentationFeature
 import io.sentry.android.gradle.extensions.SentryPluginExtension
 import java.util.EnumSet
+import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.getByType
 
 @Suppress("Unused")
 class SentryPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
     project.pluginManager.withPlugin("com.android.application") {
-      val catalog = project.extensions.getByType<VersionCatalogsExtension>()
-      val libs = catalog.named("libs")
+      val libs = project.extensions.getByName("libs") as LibrariesForLibs
       project.extensions.configure<ApplicationAndroidComponentsExtension> {
         onVariants(selector().all()) { variant ->
           val sentryDsn = project.providers.environmentVariable(SENTRY_DSN_PROPERTY)
+          val enableSentry =
+            project.providers.gradleProperty(SENTRY_ENABLE_GRADLE_PROPERTY).isPresent
           variant.manifestPlaceholders.put("sentryDsn", sentryDsn.getOrElse(""))
-          variant.manifestPlaceholders.put("enableSentry", "${variant.name == "release"}")
+          variant.manifestPlaceholders.put(
+            "sentryEnvironment",
+            when {
+              variant.name.contains("release", true) && enableSentry -> "production"
+              variant.name.contains("release", true) && !enableSentry -> "nightly"
+              else -> "dev"
+            },
+          )
         }
       }
       project.plugins.apply(io.sentry.android.gradle.SentryPlugin::class)
       project.extensions.configure<SentryPluginExtension> {
-        val enableMappings =
-          project.providers.gradleProperty(SENTRY_UPLOAD_MAPPINGS_PROPERTY).isPresent
-        includeProguardMapping.set(enableMappings)
-        autoUploadProguardMapping.set(enableMappings)
+        includeProguardMapping.set(true)
+        autoUploadProguardMapping.set(true)
         uploadNativeSymbols.set(false)
         autoUploadNativeSymbols.set(false)
         includeNativeSources.set(false)
         ignoredVariants.set(emptySet())
-        ignoredBuildTypes.set(setOf("benchmark", "debug"))
+        ignoredBuildTypes.set(setOf("benchmark"))
         ignoredFlavors.set(emptySet())
         tracingInstrumentation {
           enabled.set(true)
           debug.set(false)
+          logcat.enabled.set(true)
           forceInstrumentDependencies.set(false)
           features.set(EnumSet.allOf(InstrumentationFeature::class.java))
         }
-        experimentalGuardsquareSupport.set(false)
+        dexguardEnabled.set(false)
         autoInstallation {
           enabled.set(true)
-          sentryVersion.set(libs.findVersion("sentry-sdk").get().requiredVersion)
+          sentryVersion.set(libs.versions.sentry.sdk)
         }
         includeDependenciesReport.set(true)
+        includeSourceContext.set(true)
+        autoUploadSourceContext.set(true)
+        additionalSourceDirsForSourceContext.set(emptySet())
+        debug.set(false)
+        org.set("claw")
+        projectName.set("compose-lobsters")
+        authToken.set(project.providers.environmentVariable("SENTRY_AUTH_TOKEN"))
+        url.set(null)
+        telemetry.set(false)
+        telemetryDsn.set(null)
       }
       with(project.dependencies) {
-        addProvider("implementation", platform(libs.findLibrary("sentry-bom").get()))
+        addProvider("implementation", platform(libs.sentry.bom))
+        addProvider("implementation", libs.sentry.android)
       }
     }
   }
@@ -65,6 +82,6 @@ class SentryPlugin : Plugin<Project> {
   private companion object {
 
     private const val SENTRY_DSN_PROPERTY = "SENTRY_DSN"
-    private const val SENTRY_UPLOAD_MAPPINGS_PROPERTY = "sentryUploadMappings"
+    private const val SENTRY_ENABLE_GRADLE_PROPERTY = "enableSentry"
   }
 }

build-logic/src/main/kotlin/dev/msfjarvis/claw/gradle/SpotlessPlugin.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.
@@ -8,11 +8,13 @@ package dev.msfjarvis.claw.gradle
 
 import com.diffplug.gradle.spotless.SpotlessExtension
 import com.diffplug.gradle.spotless.SpotlessPlugin
+import com.diffplug.gradle.spotless.SpotlessTask
 import org.gradle.api.GradleException
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
 import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.withType
 
 @Suppress("Unused")
 class SpotlessPlugin : Plugin<Project> {
@@ -43,13 +45,16 @@ class SpotlessPlugin : Plugin<Project> {
         endWithNewline()
         licenseHeaderFile(
           project.file("spotless/license.xml"),
-          "<(adaptive-icon|appwidget-provider|data-extraction-rules|full-backup-content|manifest|resources)"
+          "<(adaptive-icon|appwidget-provider|data-extraction-rules|full-backup-content|manifest|vector|resources)",
         )
       }
     }
+    project.tasks.withType<SpotlessTask>().configureEach {
+      notCompatibleWithConfigurationCache("https://github.com/diffplug/spotless/issues/987")
+    }
   }
 
   private companion object {
-    private const val KTFMT_VERSION = "0.46"
+    private const val KTFMT_VERSION = "0.49"
   }
 }

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

@@ -1,36 +1,38 @@
 /*
- * 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.gradle
 
+import org.gradle.accessors.dm.LibrariesForLibs
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.MinimalExternalModuleDependency
-import org.gradle.api.artifacts.VersionCatalogsExtension
 import org.gradle.kotlin.dsl.DependencyHandlerScope
 import org.gradle.kotlin.dsl.exclude
-import org.gradle.kotlin.dsl.getByType
 
 /** Extension function to configure JUnit5 dependencies with the Truth assertion library. */
 fun DependencyHandlerScope.addTestDependencies(project: Project) {
-  val catalog = project.extensions.getByType<VersionCatalogsExtension>()
-  val libs = catalog.named("libs")
-  addProvider("testImplementation", libs.findLibrary("junit-jupiter-api").get())
-  addProvider<MinimalExternalModuleDependency, ExternalModuleDependency>(
-    "testImplementation",
-    libs.findLibrary("truth").get(),
-  ) {
-    exclude(group = "junit", module = "junit")
-  }
-  addProvider("testRuntimeOnly", libs.findLibrary("junit-jupiter-engine").get())
-  addProvider<MinimalExternalModuleDependency, ExternalModuleDependency>(
-    "testRuntimeOnly",
-    libs.findLibrary("junit-legacy").get(),
-  ) {
-    // See https://github.com/google/truth/issues/333
-    because("Truth needs it")
-  }
+  val libs = project.extensions.getByName("libs") as LibrariesForLibs
+  arrayOf("test", "androidTest")
+    .filter { sourceSet -> project.configurations.findByName("${sourceSet}Implementation") != null }
+    .forEach { sourceSet ->
+      addProvider("${sourceSet}Implementation", libs.junit.jupiter.api)
+      addProvider<MinimalExternalModuleDependency, ExternalModuleDependency>(
+        "${sourceSet}Implementation",
+        libs.truth,
+      ) {
+        exclude(group = "junit", module = "junit")
+      }
+      addProvider("${sourceSet}RuntimeOnly", libs.junit.jupiter.engine)
+      addProvider<MinimalExternalModuleDependency, ExternalModuleDependency>(
+        "${sourceSet}RuntimeOnly",
+        libs.junit.legacy,
+      ) {
+        // See https://github.com/google/truth/issues/333
+        because("Truth needs it")
+      }
+    }
 }

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

@@ -1,37 +1,34 @@
 /*
- * 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.
  */
 package dev.msfjarvis.claw.gradle.signing
 
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import com.android.build.api.dsl.ApplicationBuildType
+import com.android.build.api.dsl.CommonExtension
 import java.util.Properties
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
 
 private const val KEYSTORE_CONFIG_PATH = "keystore.properties"
 
 /** Configure signing for all build types. */
-@Suppress("UnstableApiUsage")
 internal fun Project.configureBuildSigning() {
   val keystoreConfigFile = rootProject.layout.projectDirectory.file(KEYSTORE_CONFIG_PATH)
   if (keystoreConfigFile.asFile.exists()) {
-    extensions.configure<BaseAppModuleExtension> {
+    extensions.configure<CommonExtension<*, ApplicationBuildType, *, *, *, *>>("android") {
       val contents = providers.fileContents(keystoreConfigFile).asText
       val keystoreProperties = Properties()
       keystoreProperties.load(contents.get().byteInputStream())
-      signingConfigs {
-        register("release") {
+      val releaseSigningConfig =
+        signingConfigs.register("release") {
           keyAlias = keystoreProperties["keyAlias"] as String
           keyPassword = keystoreProperties["keyPassword"] as String
           storeFile = rootProject.file(keystoreProperties["storeFile"] as String)
           storePassword = keystoreProperties["storePassword"] as String
         }
-      }
-      val signingConfig = signingConfigs.getByName("release")
-      buildTypes.all { setSigningConfig(signingConfig) }
+      buildTypes.configureEach { signingConfig = releaseSigningConfig.get() }
     }
   }
 }