feat(release): bump version

* chore(deps): update dependency com.facebook:ktfmt to v0.44

* chore: reformat

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

.editorconfig

@@ -0,0 +1,93 @@
+# This .editorconfig section approximates ktfmt's formatting rules. You can include it in an
+# existing .editorconfig file or use it standalone by copying it to <project root>/.editorconfig
+# and making sure your editor is set to read settings from .editorconfig files.
+#
+# It includes editor-specific config options for IntelliJ IDEA.
+#
+# If any option is wrong, PR are welcome
+
+[{*.kt,*.kts}]
+indent_style = space
+insert_final_newline = true
+max_line_length = 100
+indent_size = 2
+ij_continuation_indent_size = 2
+ij_java_names_count_to_use_import_on_demand = 9999
+ij_kotlin_align_in_columns_case_branch = false
+ij_kotlin_align_multiline_binary_operation = false
+ij_kotlin_align_multiline_extends_list = false
+ij_kotlin_align_multiline_method_parentheses = false
+ij_kotlin_align_multiline_parameters = true
+ij_kotlin_align_multiline_parameters_in_calls = false
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_assignment_wrap = normal
+ij_kotlin_blank_lines_after_class_header = 0
+ij_kotlin_blank_lines_around_block_when_branches = 0
+ij_kotlin_blank_lines_before_declaration_with_comment_or_annotation_on_separate_line = 1
+ij_kotlin_block_comment_at_first_column = true
+ij_kotlin_call_parameters_new_line_after_left_paren = true
+ij_kotlin_call_parameters_right_paren_on_new_line = false
+ij_kotlin_call_parameters_wrap = on_every_item
+ij_kotlin_catch_on_new_line = false
+ij_kotlin_class_annotation_wrap = split_into_lines
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_continuation_indent_for_chained_calls = true
+ij_kotlin_continuation_indent_for_expression_bodies = true
+ij_kotlin_continuation_indent_in_argument_lists = true
+ij_kotlin_continuation_indent_in_elvis = false
+ij_kotlin_continuation_indent_in_if_conditions = false
+ij_kotlin_continuation_indent_in_parameter_lists = false
+ij_kotlin_continuation_indent_in_supertype_lists = false
+ij_kotlin_else_on_new_line = false
+ij_kotlin_enum_constants_wrap = off
+ij_kotlin_extends_list_wrap = normal
+ij_kotlin_field_annotation_wrap = split_into_lines
+ij_kotlin_finally_on_new_line = false
+ij_kotlin_if_rparen_on_new_line = false
+ij_kotlin_import_nested_classes = false
+ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
+ij_kotlin_keep_blank_lines_before_right_brace = 2
+ij_kotlin_keep_blank_lines_in_code = 2
+ij_kotlin_keep_blank_lines_in_declarations = 2
+ij_kotlin_keep_first_column_comment = true
+ij_kotlin_keep_indents_on_empty_lines = false
+ij_kotlin_keep_line_breaks = true
+ij_kotlin_lbrace_on_next_line = false
+ij_kotlin_line_comment_add_space = false
+ij_kotlin_line_comment_at_first_column = true
+ij_kotlin_method_annotation_wrap = split_into_lines
+ij_kotlin_method_call_chain_wrap = normal
+ij_kotlin_method_parameters_new_line_after_left_paren = true
+ij_kotlin_method_parameters_right_paren_on_new_line = true
+ij_kotlin_method_parameters_wrap = on_every_item
+ij_kotlin_name_count_to_use_star_import = 9999
+ij_kotlin_name_count_to_use_star_import_for_members = 9999
+ij_kotlin_parameter_annotation_wrap = off
+ij_kotlin_space_after_comma = true
+ij_kotlin_space_after_extend_colon = true
+ij_kotlin_space_after_type_colon = true
+ij_kotlin_space_before_catch_parentheses = true
+ij_kotlin_space_before_comma = false
+ij_kotlin_space_before_extend_colon = true
+ij_kotlin_space_before_for_parentheses = true
+ij_kotlin_space_before_if_parentheses = true
+ij_kotlin_space_before_lambda_arrow = true
+ij_kotlin_space_before_type_colon = false
+ij_kotlin_space_before_when_parentheses = true
+ij_kotlin_space_before_while_parentheses = true
+ij_kotlin_spaces_around_additive_operators = true
+ij_kotlin_spaces_around_assignment_operators = true
+ij_kotlin_spaces_around_equality_operators = true
+ij_kotlin_spaces_around_function_type_arrow = true
+ij_kotlin_spaces_around_logical_operators = true
+ij_kotlin_spaces_around_multiplicative_operators = true
+ij_kotlin_spaces_around_range = false
+ij_kotlin_spaces_around_relational_operators = true
+ij_kotlin_spaces_around_unary_operator = false
+ij_kotlin_spaces_around_when_arrow = true
+ij_kotlin_variable_annotation_wrap = off
+ij_kotlin_while_on_new_line = false
+ij_kotlin_wrap_elvis_expressions = 1
+ij_kotlin_wrap_expression_body_functions = 1
+ij_kotlin_wrap_first_method_in_call_chain = false

.git-blame-ignore-revs

@@ -3,3 +3,6 @@
 e7f4c8a7ebe4e907f65af46e6dddfd3a542415c0
 ab2713154f846b3db6d44625d1022bf421b275d0
 cbdfa67d075ec1f8ceec0f3559498cbca01783a0
+
+# Renamed Renovate config file
+f304304bc5b64edf189aaa473b05df912067a8bd

.gitattributes

@@ -1,4 +1,4 @@
 * text=auto eol=lf
 **/dependencies/** linguist-generated
 **/clawicons/** linguist-generated
-android/src/main/baseline-prof.txt linguist-generated
+android/src/main/baseline-prof.txt linguist-generated -diff

.github/renovate.json5

@@ -5,64 +5,56 @@
     "helpers:pinGitHubActionDigests",
     "github>msfjarvis/shared-workflows//renovate/automerge"
   ],
+  "branchConcurrentLimit": 15,
   "packageRules": [
     {
-      "matchPackagePatterns": [
-        "^com.android.tools.build",
-        "^com.android.test",
-        "^gradle"
+      matchDatasources: [
+        "maven"
+      ],
+      registryUrls: [
+        "https://maven.google.com/",
+        "https://repo1.maven.org/maven2",
+        "https://plugins.gradle.org/m2/",
       ],
-      "enabled": false
     },
     {
       "matchPackagePatterns": [
         "^kotlin",
         "^org.jetbrains.kotlin",
-        "^androidx.compose.compiler"
+        "^androidx.compose.compiler",
+        "^anvil",
       ],
-      "groupName": "kotlin"
+      "enabled": false
+    },
+    {
+      "matchPackagePatterns": [
+        "^io.sentry",
+        "^sentry",
+      ],
+      "groupName": "sentry"
     },
     {
       "managers": [
         "gradle"
       ],
       "packagePatterns": [
-        "^com.squareup.okhttp3"
+        // Renovate refuses to stop resolving this from the snapshots repo
+        "^app.cash.sqldelight",
       ],
       "enabled": false
     },
-    {
-      "matchDatasources": [
-        "maven"
-      ],
-      "matchPackageNames": [
-        "androidx.compose.compiler:compiler"
-      ],
-      "registryUrls": [
-        "https://maven.google.com/"
-      ]
-    }
   ],
   "regexManagers": [
     {
       "fileMatch": [
-        "build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt"
+        "SpotlessPlugin\.kt$"
       ],
       "matchStrings": [
         "KTFMT_VERSION = \"(?<currentValue>.*)\""
       ],
       "datasourceTemplate": "maven",
-      "depNameTemplate": "com.facebook:ktfmt"
-    },
-    {
-      "fileMatch": [
-        "build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt"
-      ],
-      "matchStrings": [
-        "TWITTER_RULES_VERSION = \"(?<currentValue>.*)\""
-      ],
-      "datasourceTemplate": "maven",
-      "depNameTemplate": "com.twitter.compose.rules:detekt"
+      "depNameTemplate": "com.facebook:ktfmt",
+      "registryUrlTemplate": "https://repo1.maven.org/maven2/",
     },
     {
       "fileMatch": [
@@ -72,7 +64,19 @@
         "composeCompiler = \"(?<currentValue>.*)\""
       ],
       "datasourceTemplate": "maven",
-      "depNameTemplate": "androidx.compose.compiler:compiler"
+      "depNameTemplate": "androidx.compose.compiler:compiler",
+      "registryUrlTemplate": "https://maven.google.com",
+    },
+    {
+      "fileMatch": [
+        "gradle/libs.versions.toml"
+      ],
+      "matchStrings": [
+        "sentry-sdk = \"(?<currentValue>.*)\""
+      ],
+      "datasourceTemplate": "maven",
+      "depNameTemplate": "io.sentry:sentry-android",
+      "registryUrlTemplate": "https://repo1.maven.org/maven2/",
     }
   ]
 }

.github/workflows/baseline-profile.yml

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

.github/workflows/ci.yml

@@ -11,38 +11,33 @@ on:
       - main
 
 concurrency:
-  group: ${{ github.workflow }}
+  group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      with:
+        fetch-depth: 0
 
     - name: Set up JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.0
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
       with:
         distribution: temurin
         java-version: 18
 
     - name: Run unit tests
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
       with:
-        arguments: --no-configuration-cache --stacktrace check -PslimTests
-        gradle-home-cache-cleanup: true
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-    - name: Run Detekt
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
-      with:
-        arguments: --no-configuration-cache --stacktrace detektMain
+        arguments: --no-configuration-cache --stacktrace check
         gradle-home-cache-cleanup: true
         cache-read-only: ${{ github.ref != 'refs/heads/main' }}
 
     - name: (Fail-only) Upload test report
       if: failure()
-      uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # tag=v3.1.1
+      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       with:
           name: Test report
           path: android/build/reports
@@ -53,21 +48,25 @@ jobs:
     needs: [ "check" ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     - name: Set up JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.0
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
       with:
         distribution: temurin
         java-version: 18
 
     - name: Decrypt secrets
-      run: scripts/signing-setup.sh "$ENCRYPT_KEY"
+      run: |
+        ./scripts/setup-age.sh
+        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
       env:
         ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
 
     - name: Build release app
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
+      env:
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       with:
         arguments: --no-configuration-cache --stacktrace collectReleaseApks
         gradle-home-cache-cleanup: true

.github/workflows/codeql_analysis.yml

@@ -0,0 +1,48 @@
+name: "CodeQL"
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Set up JDK
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      with:
+        distribution: temurin
+        java-version: 18
+
+    - name: Setup Gradle caching
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
+      with:
+        gradle-home-cache-cleanup: true
+        cache-read-only: true
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2
+      with:
+        languages: java
+        tools: latest
+        queries: +security-extended
+
+    - name: Build project
+      shell: bash
+      run: |
+        ./gradlew assemble
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@f3feb00acb00f31a6f60280e6ace9ca31d91c76a # v2.3.2
+      with:
+        category: "/language:java"

.github/workflows/release.yml

@@ -7,13 +7,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       with:
         token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
         fetch-depth: 0
 
     - name: Set up JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.0
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
       with:
         distribution: temurin
         java-version: 18
@@ -25,13 +25,15 @@ jobs:
         git config user.email noreply@github.com
 
     - name: Setup Gradle caching
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
       with:
         gradle-home-cache-cleanup: true
         cache-read-only: true
 
     - name: Decrypt secrets
-      run: scripts/signing-setup.sh "$ENCRYPT_KEY"
+      run: |
+        ./scripts/setup-age.sh
+        ./scripts/signing-setup.sh "$ENCRYPT_KEY"
       env:
         ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
 
@@ -43,9 +45,10 @@ jobs:
         echo VERSION="${VERSION}" >> $GITHUB_ENV
 
     - name: Update changelog
-      uses: thomaseizinger/keep-a-changelog-new-release@5bc232893483441c5d6cd6c9dcb1e48abf9a2bae # 1.3.0
+      uses: msfjarvis/keep-a-changelog-new-release@ce8769801992253adb0209055c236a0cd192500b # 2.0.0
       with:
-        tag: ${{ env.VERSION }}
+        tag: v${{ env.VERSION }}
+        version: ${{ env.VERSION }}
 
     - name: Commit changes
       shell: bash
@@ -54,8 +57,11 @@ jobs:
 
     - name: Build release assets
       shell: bash
+      env:
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+        SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
       run: |
-        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle
+        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle -PsentryUploadMappings
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh
@@ -77,7 +83,7 @@ jobs:
         printf '%s' "${CHANGELOG}" >> distribution/whatsnew/whatsnew-en-GB
 
     - name: Publish bundle to Google Play
-      uses: r0adkll/upload-google-play@78c9e796b1035c94169c101d8e46cb880194bfc3 # tag=v1.0.19
+      uses: r0adkll/upload-google-play@70c7397e868b00eccd390222f492ab3e30520d09 # v1.1.1
       with:
         mappingFile: android/bundle/mapping.txt
         packageName: dev.msfjarvis.claw.android

CHANGELOG.md

@@ -7,92 +7,245 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.26.0] - 2023-05-03
+
+### Changed
+
+*   Upgrade to Compose May release
+*   Disable Sentry performance reporting
+*   Migrate to Compose Foundation `FlowRow` in `LobstersCard`
+
+## [1.25.0] - 2023-04-18
+
+### Changed
+
+*   Make the app draw edge to edge
+*   Simplify Top App Bar color scheme
+*   Rework how baseline profiles are generated
+*   Upgrade to Compose April release
+
+## [1.24.0] - 2023-03-24
+
+### Changed
+
+*   Rebuild app icon assets to align better with Material guidelines
+*   Adopt Slack's Compose lints and address issues found by it
+*   Upgrade to OkHttp 4.x
+*   Upgrade to Compose March release
+*   Start work on support for logging in with lobste.rs
+
+## [1.23.0] - 2023-03-02
+
+### Added
+
+*   Introduce [Sentry](https://sentry.io) for error reporting and performance monitoring
+
+## [1.22.0] - 2023-03-02
+
+### Changed
+
+*   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
+
+## [1.20.0] - 2023-02-09
+
+### Changed
+
+*   Upgrade dependencies
+
+## [1.19.0] - 2023-02-01
+
+### Changed
+
+*   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
+
+## [1.17.0] - 2023-01-12
+
+### Added
+
+*   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
+
+## [1.16.0] - 2022-12-24
+
+### Changed
+
+*   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
+
+## [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
+
+## [1.13.0] - 2022-12-10
+
+### Changed
+
+*   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
+
+## [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
+
 ## [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
+*   Initial Play Store release
 
-[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/1.10.0...HEAD
+[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.26.0...HEAD
 
-[1.10.0]: https://github.com/msfjarvis/compose-lobsters/compare/1.9.0...1.10.0
+[1.26.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.25.0...v1.26.0
 
-[1.9.0]: https://github.com/msfjarvis/compose-lobsters/compare/1.8.0...1.9.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
 

README.md

@@ -2,20 +2,44 @@
 
 Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), built with [Jetpack Compose](https://developer.android.com/jetpack/compose).
 
-<img src="https://github.com/msfjarvis/compose-lobsters/blob/main/.github/readme_feature.webp"
-     alt="Get it on Google Play"
-     height="550" />
-
-## Download
-
 <a href="https://play.google.com/store/apps/details?id=dev.msfjarvis.claw.android">
   <img src="https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png"
        alt="Get it on Google Play"
        height="80" />
 </a>
 
+<img src="https://github.com/msfjarvis/compose-lobsters/blob/main/.github/readme_feature.webp"
+     alt="Side by side screenshots of the app's main page in dark and light UI modes"
+     height="550" />
+
 Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/nightly).
 
+## Dependency Diagram
+```mermaid
+%%{
+  init: {
+    'theme': 'neutral'
+  }
+}%%
+
+graph LR
+
+  benchmark --> android
+  android --> api
+  android --> common
+  android --> core
+  android --> coroutine-utils
+  android --> database
+  android --> metadata-extractor
+  android --> model
+  api --> model
+  common --> core
+  common --> database
+  common --> model
+  metadata-extractor --> model
+  database --> core
+
+```
 ## License
 
 See [LICENSE](LICENSE)

android/build.gradle.kts

@@ -1,28 +1,22 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+@file:Suppress("UnstableApiUsage")
 
 plugins {
   id("dev.msfjarvis.claw.android-application")
   id("dev.msfjarvis.claw.rename-artifacts")
   id("dev.msfjarvis.claw.kotlin-android")
   id("dev.msfjarvis.claw.kotlin-kapt")
+  id("dev.msfjarvis.claw.sentry")
   id("dev.msfjarvis.claw.versioning-plugin")
   alias(libs.plugins.anvil)
   alias(libs.plugins.whetstone)
 }
 
-whetstone {
-  addOns {
-    compose.set(true)
-    workManager.set(true)
-  }
-}
-
 android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig { applicationId = "dev.msfjarvis.claw.android" }
@@ -37,26 +31,27 @@ android {
       matchingFallbacks += "release"
       isDebuggable = false
       proguardFile("benchmark-rules.pro")
+      applicationIdSuffix = ".benchmark"
     }
   }
 }
 
+whetstone {
+  addOns {
+    compose.set(true)
+    workManager.set(true)
+  }
+}
+
 dependencies {
-  kapt(libs.dagger.compiler)
   implementation(platform(libs.androidx.compose.bom))
-  implementation(libs.dagger)
-  implementation(projects.api)
-  implementation(projects.common)
-  implementation(projects.core)
-  implementation(projects.coroutineUtils)
-  implementation(projects.database)
-  implementation(projects.metadataExtractor)
-  implementation(projects.model)
+  implementation(platform(libs.okhttp.bom))
   implementation(libs.accompanist.sysuicontroller)
   implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.material)
   implementation(libs.androidx.compose.material3)
   implementation(libs.androidx.core.splashscreen)
+  implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
@@ -64,6 +59,28 @@ dependencies {
   implementation(libs.androidx.work.runtime.ktx)
   implementation(libs.coil)
   implementation(libs.copydown)
+  implementation(libs.dagger)
+  implementation(libs.jsoup)
+  implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
   implementation(libs.sqldelight.extensions.coroutines)
+  implementation(projects.api)
+  implementation(projects.common)
+  implementation(projects.core)
+  implementation(projects.coroutineUtils)
+  implementation(projects.database)
+  implementation(projects.metadataExtractor)
+  implementation(projects.model)
+
+  kapt(libs.dagger.compiler)
+
+  testImplementation(libs.junit.jupiter.api)
+  testImplementation(libs.truth) { exclude(group = "junit", module = "junit") }
+  testRuntimeOnly(libs.junit.jupiter.engine)
+  testRuntimeOnly(libs.junit.legacy) {
+    // See https://github.com/google/truth/issues/333
+    because("Truth needs it")
+  }
+  testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.okhttp.mockwebserver)
 }

android/lint-baseline.xml

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

android/proguard-android-optimize.pro

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

android/proguard-rules.pro

@@ -1,29 +1,2 @@
-# Keep `Companion` object fields of serializable classes.
-# This avoids serializer lookup through `getDeclaredClasses` as done for named companion objects.
--if @kotlinx.serialization.Serializable class **
--keepclassmembers class <1> {
-    static <1>$Companion Companion;
-}
-
-# Keep `serializer()` on companion objects (both default and named) of serializable classes.
--if @kotlinx.serialization.Serializable class ** {
-    static **$* *;
-}
--keepclassmembers class <2>$<3> {
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
-# Keep `INSTANCE.serializer()` of serializable objects.
--if @kotlinx.serialization.Serializable class ** {
-    public static ** INSTANCE;
-}
--keepclassmembers class <1> {
-    public static <1> INSTANCE;
-    kotlinx.serialization.KSerializer serializer(...);
-}
-
-# @Serializable and @Polymorphic are used at runtime for polymorphic serialization.
--keepattributes RuntimeVisibleAnnotations,AnnotationDefault
-
 -dontobfuscate
 -keepattributes SourceFile, LineNumberTable

android/src/benchmark/AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <!-- Required: set your sentry.io project identifier (DSN) -->
+    <meta-data android:name="io.sentry.dsn" android:value="${sentryDsn}" />
+  </application>
+</manifest>

android/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
     android:supportsRtl="true"
     android:theme="@style/Theme.Claw.SplashScreen"
     android:enableOnBackInvokedCallback="true"
-    tools:targetApi="s">
+    tools:targetApi="tiramisu">
     <profileable
       android:shell="true"
       tools:targetApi="29" />
@@ -149,6 +149,19 @@
         android:name="androidx.work.WorkManagerInitializer"
         android:value="androidx.startup"
         tools:node="remove" />
+      <meta-data
+        android:name="com.deliveryhero.whetstone.worker.WhetstoneWorkerInitializer"
+        android:value="androidx.startup"
+        tools:node="remove" />
     </provider>
+    <!-- https://issuetracker.google.com/issues/258619948 -->
+    <receiver
+      android:name="androidx.profileinstaller.ProfileInstallReceiver"
+      android:permission="android.permission.DUMP"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="androidx.profileinstaller.action.BENCHMARK_OPERATION" />
+      </intent-filter>
+    </receiver>
   </application>
 </manifest>

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

@@ -7,10 +7,17 @@
 package dev.msfjarvis.claw.android
 
 import android.app.Application
+import androidx.work.Constraints
+import androidx.work.ExistingPeriodicWorkPolicy
+import androidx.work.NetworkType
+import androidx.work.PeriodicWorkRequestBuilder
+import androidx.work.WorkManager
 import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.app.ApplicationComponentOwner
 import com.deliveryhero.whetstone.app.ContributesAppInjector
+import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
 import dev.msfjarvis.claw.core.injection.AppPlugin
+import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @ContributesAppInjector(generateAppComponent = true)
@@ -25,5 +32,26 @@ class ClawApplication : Application(), ApplicationComponentOwner {
     Whetstone.inject(this)
     super.onCreate()
     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()
+        )
+        .build()
+    WorkManager.getInstance(this)
+      .enqueueUniquePeriodicWork(
+        "updateSavedPosts",
+        ExistingPeriodicWorkPolicy.UPDATE,
+        postUpdateWorkRequest,
+      )
+  }
+
+  private companion object {
+    private const val POST_REFRESH_PERIOD = 24L // 24 hours
   }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -12,18 +12,12 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.work.Constraints
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.NetworkType
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
+import androidx.core.view.WindowCompat
 import com.deliveryhero.whetstone.Whetstone
 import com.deliveryhero.whetstone.activity.ContributesActivityInjector
 import dev.msfjarvis.claw.android.ui.LobstersApp
-import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
 import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 @ContributesActivityInjector
@@ -37,6 +31,7 @@ class MainActivity : ComponentActivity() {
     super.onCreate(savedInstanceState)
     installSplashScreen()
     Whetstone.inject(this)
+    WindowCompat.setDecorFitsSystemWindows(window, false)
     setContent {
       LobstersApp(
         urlLauncher = urlLauncher,
@@ -44,23 +39,6 @@ class MainActivity : ComponentActivity() {
         setWebUri = { url -> webUri = url },
       )
     }
-    val postUpdateWorkRequest =
-      PeriodicWorkRequestBuilder<SavedPostUpdaterWorker>(POST_REFRESH_PERIOD, TimeUnit.HOURS)
-        .setConstraints(
-          Constraints.Builder()
-            .setRequiresCharging(false)
-            .setRequiresBatteryNotLow(true)
-            .setRequiredNetworkType(NetworkType.CONNECTED)
-            .setRequiresDeviceIdle(true)
-            .build()
-        )
-        .build()
-    WorkManager.getInstance(this@MainActivity)
-      .enqueueUniquePeriodicWork(
-        "updateSavedPosts",
-        ExistingPeriodicWorkPolicy.CANCEL_AND_REENQUEUE,
-        postUpdateWorkRequest,
-      )
   }
 
   override fun onProvideAssistContent(outContent: AssistContent?) {
@@ -73,8 +51,4 @@ class MainActivity : ComponentActivity() {
       }
     }
   }
-
-  private companion object {
-    private const val POST_REFRESH_PERIOD = 24L // 24 hours
-  }
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021 Harsh Shandilya.
+ * Copyright © 2021-2022 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -8,22 +8,13 @@ package dev.msfjarvis.claw.android.injection
 
 import com.deliveryhero.whetstone.app.ApplicationScope
 import com.squareup.anvil.annotations.ContributesTo
+import dagger.Binds
 import dagger.Module
-import dagger.Provides
+import dev.msfjarvis.claw.android.ui.util.HTMLConverterImpl
 import dev.msfjarvis.claw.common.comments.HTMLConverter
-import io.github.furstenheim.CopyDown
 
 @Module
 @ContributesTo(ApplicationScope::class)
-object HTMLConverterModule {
-
-  @Provides
-  fun provideHTMLConverter() =
-    object : HTMLConverter {
-      private val copydown = CopyDown()
-
-      override fun convertHTMLToMarkdown(html: String): String {
-        return copydown.convert(html)
-      }
-    }
+interface HTMLConverterModule {
+  @Binds fun HTMLConverterImpl.bind(): HTMLConverter
 }

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

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

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

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2022 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.injection
+
+import android.app.Application
+import android.util.Log
+import androidx.work.Configuration
+import androidx.work.WorkManager
+import androidx.work.WorkerFactory
+import com.deliveryhero.whetstone.app.ApplicationScope
+import com.squareup.anvil.annotations.ContributesMultibinding
+import dev.msfjarvis.claw.core.injection.AppPlugin
+import javax.inject.Inject
+
+@ContributesMultibinding(ApplicationScope::class)
+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()
+    )
+  }
+}

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

@@ -27,13 +27,14 @@ constructor(
 ) : PagingSource<Int, LobstersPost>() {
 
   override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
-    val page = params.key ?: 1
+    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,
-          prevKey = if (page == 1) null else page - 1,
-          nextKey = page.plus(1)
+          prevKey = if (page == STARTING_PAGE_INDEX) null else page - 1,
+          nextKey = page + 1,
         )
       is Failure.NetworkFailure -> LoadResult.Error(result.error)
       is Failure.UnknownFailure -> LoadResult.Error(result.error)
@@ -42,12 +43,19 @@ constructor(
     }
   }
 
-  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int {
-    return state.pages.size + 1
+  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int? {
+    return state.anchorPosition?.let { anchorPosition ->
+      (anchorPosition / PAGE_SIZE).coerceAtLeast(STARTING_PAGE_INDEX)
+    }
   }
 
   @AssistedFactory
   interface Factory {
     fun create(remoteFetcher: RemoteFetcher<LobstersPost>): LobstersPagingSource
   }
+
+  companion object {
+    const val PAGE_SIZE = 25
+    const val STARTING_PAGE_INDEX = 1
+  }
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -11,18 +11,14 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
@@ -38,10 +34,10 @@ import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import androidx.paging.compose.collectAsLazyPagingItems
 import com.deliveryhero.whetstone.compose.injectedViewModel
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import dev.msfjarvis.claw.android.R
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
 import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
+import dev.msfjarvis.claw.android.ui.decorations.TransparentSystemBars
 import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
 import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
 import dev.msfjarvis.claw.android.ui.navigation.Destinations
@@ -52,9 +48,10 @@ import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.res.ClawIcons
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.ui.decorations.ClawAppBar
-import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile
+import kotlinx.collections.immutable.persistentListOf
+import kotlinx.collections.immutable.persistentMapOf
 import kotlinx.coroutines.launch
 
 @OptIn(
@@ -69,7 +66,6 @@ fun LobstersApp(
   modifier: Modifier = Modifier,
   viewModel: ClawViewModel = injectedViewModel(),
 ) {
-  val systemUiController = rememberSystemUiController()
   val hottestListState = rememberLazyListState()
   val newestListState = rememberLazyListState()
   val savedListState = rememberLazyListState()
@@ -82,17 +78,14 @@ fun LobstersApp(
 
   val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
   val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
-  val savedPosts by viewModel.savedPosts.collectAsState(emptyMap())
+  val savedPosts by viewModel.savedPosts.collectAsState(persistentMapOf())
 
   LobstersTheme(
     dynamicColor = true,
     providedValues = arrayOf(LocalUriHandler provides urlLauncher),
   ) {
-    val currentUiMode = LocalConfiguration.current.uiMode
-    val systemBarsColor = MaterialTheme.colorScheme.surfaceColorAtNavigationBarElevation()
-    val backgroundColor = MaterialTheme.colorScheme.background
     val navItems =
-      listOf(
+      persistentListOf(
         NavigationItem(
           label = "Hottest",
           route = Destinations.Hottest.route,
@@ -119,23 +112,11 @@ fun LobstersApp(
         },
       )
 
-    SideEffect { systemUiController.setStatusBarColor(color = systemBarsColor) }
-
-    // Track UI mode as a key to force a navbar color update when dark theme is toggled
-    LaunchedEffect(currentDestination, currentUiMode) {
-      val color =
-        if (navItems.none { item -> item.route == currentDestination }) {
-          backgroundColor
-        } else {
-          systemBarsColor
-        }
-      systemUiController.setNavigationBarColor(color = color)
-    }
+    TransparentSystemBars()
 
     Scaffold(
       topBar = {
         ClawAppBar(
-          backgroundColor = systemBarsColor,
           navigationIcon = {
             if (navItems.none { it.route == currentDestination }) {
               IconButton(
@@ -217,6 +198,8 @@ fun LobstersApp(
             postId = postId,
             postActions = postActions,
             htmlConverter = htmlConverter,
+            getSeenComments = viewModel::getSeenComments,
+            markSeenComments = viewModel::markSeenComments,
           )
         }
         composable(

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -23,13 +23,14 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.testTag
 import androidx.navigation.NavController
 import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import kotlinx.collections.immutable.ImmutableList
 
 private const val AnimationDuration = 100
 
 @Composable
 fun ClawNavigationBar(
   navController: NavController,
-  items: List<NavigationItem>,
+  items: ImmutableList<NavigationItem>,
   isVisible: Boolean,
   modifier: Modifier = Modifier,
 ) {
@@ -54,7 +55,7 @@ fun ClawNavigationBar(
         val isCurrentDestination = navController.currentDestination?.route == navItem.route
         NavigationBarItem(
           icon = {
-            Crossfade(isCurrentDestination) {
+            Crossfade(isCurrentDestination, label = "nav-label") {
               Icon(
                 painter = if (it) navItem.selectedIcon else navItem.icon,
                 contentDescription = navItem.label.uppercase()

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -17,11 +17,12 @@ import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
 import dev.msfjarvis.claw.database.local.SavedPost
 import java.time.Month
+import kotlinx.collections.immutable.ImmutableMap
 
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun DatabasePosts(
-  items: Map<Month, List<SavedPost>>,
+  items: ImmutableMap<Month, List<SavedPost>>,
   listState: LazyListState,
   postActions: PostActions,
   modifier: Modifier = Modifier,
@@ -32,7 +33,7 @@ fun DatabasePosts(
   ) {
     items.forEach { (month, posts) ->
       stickyHeader { MonthHeader(month = month) }
-      items(posts) { item ->
+      items(posts, { it.shortId }) { item ->
         ListItem(
           item = item,
           isSaved = { true },

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -26,7 +26,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.paging.LoadState
 import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.items
+import androidx.paging.compose.itemContentType
+import androidx.paging.compose.itemKey
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.posts.toDbModel
 import dev.msfjarvis.claw.common.ui.NetworkError
@@ -57,7 +58,12 @@ fun NetworkPosts(
       LazyColumn(
         state = listState,
       ) {
-        items(lazyPagingItems) { item ->
+        items(
+          count = lazyPagingItems.itemCount,
+          key = lazyPagingItems.itemKey { it.shortId },
+          contentType = lazyPagingItems.itemContentType { "LobstersItem" },
+        ) { index ->
+          val item = lazyPagingItems[index]
           if (item != null) {
             val dbModel = item.toDbModel()
             ListItem(
@@ -70,12 +76,12 @@ fun NetworkPosts(
           }
         }
         if (lazyPagingItems.loadState.append == LoadState.Loading) {
-          item {
+          item(key = "progressbar") {
             ProgressBar(
               modifier =
                 Modifier.fillMaxWidth()
                   .wrapContentWidth(Alignment.CenterHorizontally)
-                  .padding(top = 4.dp),
+                  .padding(vertical = 16.dp),
             )
           }
         }

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

@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2022 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.ui.util
+
+import androidx.compose.runtime.Stable
+import dev.msfjarvis.claw.common.comments.HTMLConverter
+import io.github.furstenheim.CopyDown
+import javax.inject.Inject
+
+@Stable
+class HTMLConverterImpl @Inject constructor() : HTMLConverter {
+  private val copydown = CopyDown()
+
+  override fun convertHTMLToMarkdown(html: String): String {
+    return copydown.convert(html)
+  }
+}

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -15,12 +15,18 @@ import com.slack.eithernet.ApiResult.Failure
 import com.slack.eithernet.ApiResult.Success
 import dev.msfjarvis.claw.android.injection.IODispatcher
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
 import dev.msfjarvis.claw.android.ui.toLocalDateTime
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.Comment
 import java.io.IOException
+import java.net.HttpURLConnection
 import java.time.Month
 import javax.inject.Inject
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
@@ -38,9 +44,13 @@ constructor(
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
   private val hottestPostsPager =
-    Pager(PagingConfig(pageSize = 20)) { pagingSourceFactory.create(api::getHottestPosts) }
+    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
+      pagingSourceFactory.create(api::getHottestPosts)
+    }
   private val newestPostsPager =
-    Pager(PagingConfig(pageSize = 20)) { pagingSourceFactory.create(api::getHottestPosts) }
+    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
+      pagingSourceFactory.create(api::getNewestPosts)
+    }
 
   val hottestPosts
     get() = hottestPostsPager.flow
@@ -54,9 +64,9 @@ constructor(
   val savedPosts
     get() = savedPostsFlow.map(::mapSavedPosts)
 
-  private fun mapSavedPosts(items: List<SavedPost>): Map<Month, List<SavedPost>> {
+  private fun mapSavedPosts(items: List<SavedPost>): ImmutableMap<Month, List<SavedPost>> {
     val sorted = items.sortedByDescending { post -> post.createdAt.toLocalDateTime() }
-    return sorted.groupBy { post -> post.createdAt.toLocalDateTime().month }
+    return sorted.groupBy { post -> post.createdAt.toLocalDateTime().month }.toImmutableMap()
   }
 
   suspend fun isPostSaved(post: SavedPost): Boolean {
@@ -80,11 +90,23 @@ constructor(
         is Success -> result.value
         is Failure.NetworkFailure -> throw result.error
         is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure,
+        is Failure.HttpFailure -> {
+          if (result.code == HttpURLConnection.HTTP_NOT_FOUND) {
+            throw IOException("Story was removed by moderator")
+          } else {
+            throw IOException("API returned an invalid response")
+          }
+        }
         is Failure.ApiFailure -> throw IOException("API returned an invalid response")
       }
     }
 
+  suspend fun getSeenComments(postId: String) = savedPostsRepository.getSeenComments(postId)
+
+  fun markSeenComments(postId: String, comments: List<Comment>) {
+    viewModelScope.launch { savedPostsRepository.markSeenComments(postId, comments) }
+  }
+
   suspend fun getLinkMetadata(url: String) =
     withContext(ioDispatcher) { linkMetadataRepository.getLinkMetadata(url) }
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -10,7 +10,9 @@ import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
 import dev.msfjarvis.claw.android.injection.DatabaseDispatcher
 import dev.msfjarvis.claw.database.LobstersDatabase
+import dev.msfjarvis.claw.database.local.PostComments
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.Comment
 import io.github.aakira.napier.Napier
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineDispatcher
@@ -23,6 +25,7 @@ constructor(
   @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
 ) {
   private val savedPostQueries = database.savedPostQueries
+  private val postCommentsQueries = database.postCommentsQueries
   val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
 
   suspend fun savePost(post: SavedPost) {
@@ -30,11 +33,29 @@ constructor(
     withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post) }
   }
 
+  suspend fun savePosts(posts: List<SavedPost>) {
+    Napier.d(tag = TAG) { "Saving posts: ${posts.joinToString(",") { it.shortId }}" }
+    withContext(dbDispatcher) {
+      savedPostQueries.transaction {
+        posts.forEach { post -> savedPostQueries.insertOrReplacePost(post) }
+      }
+    }
+  }
+
   suspend fun removePost(post: SavedPost) {
     Napier.d(tag = TAG) { "Removing post: ${post.shortId}" }
     withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
   }
 
+  suspend fun getSeenComments(postId: String) =
+    withContext(dbDispatcher) { postCommentsQueries.getCommentIds(postId).executeAsOneOrNull() }
+
+  suspend fun markSeenComments(postId: String, comments: List<Comment>) {
+    withContext(dbDispatcher) {
+      postCommentsQueries.rememberComments(PostComments(postId, comments.map { it.shortId }))
+    }
+  }
+
   private companion object {
     private const val TAG = "SavedPostsRepository"
   }

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

@@ -12,15 +12,13 @@ import androidx.work.WorkerParameters
 import com.deliveryhero.whetstone.ForScope
 import com.deliveryhero.whetstone.worker.ContributesWorker
 import com.deliveryhero.whetstone.worker.WorkerScope
-import com.slack.eithernet.ApiResult
+import com.slack.eithernet.ApiResult.Success
 import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.common.posts.toDbModel
+import dev.msfjarvis.claw.model.LobstersPostDetails
 import javax.inject.Inject
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.supervisorScope
 
 /**
  * WorkManager-backed [CoroutineWorker] that gets all the posts from [SavedPostsRepository], fetches
@@ -38,19 +36,13 @@ constructor(
   private val lobstersApi: LobstersApi,
 ) : CoroutineWorker(appContext, workerParams) {
   override suspend fun doWork(): Result {
-    val posts = savedPostsRepository.savedPosts.first()
-    supervisorScope {
-      posts
-        .map { post ->
-          async {
-            val details = lobstersApi.getPostDetails(post.shortId)
-            if (details is ApiResult.Success) {
-              savedPostsRepository.savePost(details.value.toDbModel())
-            }
-          }
-        }
-        .awaitAll()
-    }
+    savedPostsRepository.savedPosts
+      .first()
+      .map { post -> lobstersApi.getPostDetails(post.shortId) }
+      .filterIsInstance<Success<LobstersPostDetails>>()
+      .map { result -> result.value.toDbModel() }
+      .toList()
+      .let { savedPostsRepository.savePosts(it) }
     return Result.success()
   }
 }

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

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background" />
-  <foreground android:drawable="@mipmap/ic_launcher_foreground" />
-  <monochrome android:drawable="@mipmap/ic_launcher_foreground" />
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

android/src/release/AndroidManifest.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+  <application>
+    <!-- Required: set your sentry.io project identifier (DSN) -->
+    <meta-data android:name="io.sentry.dsn" android:value="${sentryDsn}" />
+
+    <!-- enable automatic breadcrumbs for user interactions (clicks, swipes, scrolls) -->
+    <meta-data android:name="io.sentry.traces.user-interaction.enable" android:value="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="true" />
+    <!-- enable view hierarchy for crashes -->
+    <meta-data android:name="io.sentry.attach-view-hierarchy" android:value="true" />
+  </application>
+</manifest>

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

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

android/version.properties

@@ -1,5 +1,5 @@
 #
 # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
 #
-versioning-plugin.versionCode=11000
-versioning-plugin.versionName=1.10.0
+versioning-plugin.versionCode=12600
+versioning-plugin.versionName=1.26.0

api/build.gradle.kts

@@ -1,15 +1,12 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
-  kotlin("android")
-  id("dev.msfjarvis.claw.kotlin-common")
   id("dev.msfjarvis.claw.android-library")
+  id("dev.msfjarvis.claw.kotlin-android")
   alias(libs.plugins.anvil)
   alias(libs.plugins.whetstone)
 }
@@ -19,14 +16,22 @@ android { namespace = "dev.msfjarvis.claw.api" }
 anvil { generateDaggerFactories.set(true) }
 
 dependencies {
-  api(projects.model)
-  api(libs.retrofit)
   api(libs.eithernet)
+  api(libs.retrofit)
+  api(projects.model)
+
   implementation(libs.dagger)
   implementation(libs.javax.inject)
+
   testImplementation(testFixtures(libs.eithernet))
-  testImplementation(libs.kotest.assertions.core)
-  testImplementation(libs.kotest.runner.junit5)
+  testImplementation(libs.junit.jupiter.api)
+  testImplementation(libs.truth) { exclude(group = "junit", module = "junit") }
+  testRuntimeOnly(libs.junit.jupiter.engine)
+  testRuntimeOnly(libs.junit.legacy) {
+    // See https://github.com/google/truth/issues/333
+    because("Truth needs it")
+  }
+  testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.kotlinx.serialization.json)
   testImplementation(libs.retrofit.kotlinxSerializationConverter)
 }

api/lint-baseline.xml

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -9,6 +9,7 @@ package dev.msfjarvis.claw.api
 import com.slack.eithernet.ApiResult
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import retrofit2.http.GET
 import retrofit2.http.Path
@@ -29,6 +30,12 @@ interface LobstersApi {
   @GET("u/{username}.json")
   suspend fun getUser(@Path("username") username: String): ApiResult<User, Unit>
 
+  @GET("t/{tags}.json")
+  suspend fun getPostsByTags(
+    @Path("tags") tag: Tags,
+    @Query("page") page: Int,
+  ): ApiResult<List<LobstersPost>, Unit>
+
   companion object {
     const val BASE_URL = "https://lobste.rs"
   }

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

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

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

@@ -1,50 +1,76 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.api
 
+import com.google.common.truth.Truth.assertThat
 import com.slack.eithernet.ApiResult.Success
 import com.slack.eithernet.test.newEitherNetController
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
-import io.kotest.core.spec.style.FunSpec
-import io.kotest.matchers.collections.shouldHaveSize
-import io.kotest.matchers.shouldBe
-import io.kotest.matchers.types.shouldBeTypeOf
+import dev.msfjarvis.claw.util.TestUtils.assertIs
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
 
-class ApiTest : FunSpec() {
+@OptIn(ExperimentalCoroutinesApi::class)
+class ApiTest {
   private val wrapper = ApiWrapper(newEitherNetController())
   private val api
     get() = wrapper.api
 
-  init {
-    test("api gets correct number of items") {
-      val posts = api.getHottestPosts(1)
-      posts.shouldBeTypeOf<Success<List<LobstersPost>>>()
-      posts.value shouldHaveSize 25
-    }
+  @Test
+  fun `api gets correct number of items`() = runTest {
+    val posts = api.getHottestPosts(1)
+    assertIs<Success<List<LobstersPost>>>(posts)
+    assertThat(posts.value).hasSize(25)
+  }
 
-    test("posts with no urls") {
-      val posts = api.getHottestPosts(1)
-      posts.shouldBeTypeOf<Success<List<LobstersPost>>>()
-      val commentsOnlyPosts = posts.value.asSequence().filter { it.url.isEmpty() }.toSet()
-      commentsOnlyPosts shouldHaveSize 2
-    }
+  @Test
+  fun `posts with no urls`() = runTest {
+    val posts = api.getHottestPosts(1)
+    assertIs<Success<List<LobstersPost>>>(posts)
+    val commentsOnlyPosts = posts.value.asSequence().filter { it.url.isEmpty() }.toSet()
+    assertThat(commentsOnlyPosts).hasSize(2)
+  }
 
-    test("post details with comments") {
-      val postDetails = api.getPostDetails("tdfoqh")
-      postDetails.shouldBeTypeOf<Success<LobstersPostDetails>>()
-      postDetails.value.comments shouldHaveSize 7
-    }
+  @Test
+  fun `post details with comments`() = runTest {
+    val postDetails = api.getPostDetails("tdfoqh")
+    assertIs<Success<LobstersPostDetails>>(postDetails)
+    assertThat(postDetails.value.comments).hasSize(7)
+  }
 
-    test("get user details") {
-      val user = api.getUser("msfjarvis")
-      user.shouldBeTypeOf<Success<User>>()
-      user.value.username shouldBe "msfjarvis"
-    }
+  @Test
+  fun `get user details`() = runTest {
+    val user = api.getUser("msfjarvis")
+    assertIs<Success<User>>(user)
+    assertThat(user.value.username).isEqualTo("msfjarvis")
+  }
+
+  @Test
+  fun `get posts by single tag`() = runTest {
+    val tags = Tags()
+    tags.addTag("meta")
+    val posts = api.getPostsByTags(tags, 1)
+    assertIs<Success<List<LobstersPost>>>(posts)
+    assertThat(posts.value).hasSize(25)
+    assertThat(posts.value[0].tags).contains("meta")
+  }
+
+  @Test
+  fun `get posts by multiple tags`() = runTest {
+    val tags = Tags()
+    tags.addTag("programming")
+    tags.addTag("rust")
+    val posts = api.getPostsByTags(tags, 1)
+    assertIs<Success<List<LobstersPost>>>(posts)
+    assertThat(posts.value).hasSize(25)
+    assertThat(posts.value[0].tags).containsAnyOf("programming", "rust")
   }
 }

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

@@ -1,27 +1,48 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.api
 
+import com.slack.eithernet.ApiResult.Companion.httpFailure
 import com.slack.eithernet.ApiResult.Companion.success
 import com.slack.eithernet.test.EitherNetController
 import com.slack.eithernet.test.enqueue
 import dev.msfjarvis.claw.model.LobstersPost
 import dev.msfjarvis.claw.model.LobstersPostDetails
+import dev.msfjarvis.claw.model.Tags
 import dev.msfjarvis.claw.model.User
 import dev.msfjarvis.claw.util.TestUtils.getJson
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonNamingStrategy
 
+@OptIn(ExperimentalSerializationApi::class)
 class ApiWrapper(controller: EitherNetController<LobstersApi>) {
-  private val json = Json { ignoreUnknownKeys = true }
+  private val json = Json {
+    ignoreUnknownKeys = true
+    namingStrategy = JsonNamingStrategy.SnakeCase
+  }
   private val hottest: List<LobstersPost> = json.decodeFromString(getJson("hottest.json"))
   private val postDetails: LobstersPostDetails =
     json.decodeFromString(getJson("post_details_tdfoqh.json"))
   private val user: User = json.decodeFromString(getJson("msfjarvis.json"))
+  private val metaPosts: List<LobstersPost> = json.decodeFromString(getJson("meta.json"))
+  private val programmingRustPosts: List<LobstersPost> =
+    json.decodeFromString(getJson("programming_rust.json"))
+  private val getPostsBody = { args: Array<Any> ->
+    val tags = args[0] as Tags
+    if ("meta" in tags) {
+      success(metaPosts)
+    } else if ("programming" in tags && "rust" in tags) {
+      success(programmingRustPosts)
+    } else {
+      httpFailure(400)
+    }
+  }
 
   val api = controller.api
 
@@ -30,5 +51,7 @@ class ApiWrapper(controller: EitherNetController<LobstersApi>) {
     controller.enqueue(LobstersApi::getHottestPosts) { success(hottest) }
     controller.enqueue(LobstersApi::getPostDetails) { success(postDetails) }
     controller.enqueue(LobstersApi::getUser) { success(user) }
+    controller.enqueue(LobstersApi::getPostsByTags, getPostsBody)
+    controller.enqueue(LobstersApi::getPostsByTags, getPostsBody)
   }
 }

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

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

benchmark/build.gradle.kts

@@ -1,10 +1,12 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+@file:Suppress("UnstableApiUsage")
+
+import com.android.build.api.dsl.ManagedVirtualDevice
 
 plugins {
   alias(libs.plugins.android.test)
@@ -25,10 +27,24 @@ android {
     }
   }
 
+  testOptions {
+    managedDevices {
+      devices {
+        create<ManagedVirtualDevice>("api31") {
+          device = "Pixel 6"
+          apiLevel = 31
+          systemImageSource = "aosp"
+        }
+      }
+    }
+  }
+
   targetProjectPath = ":android"
   experimentalProperties["android.experimental.self-instrumenting"] = true
 }
 
+androidComponents { beforeVariants(selector().all()) { it.enable = it.buildType == "benchmark" } }
+
 dependencies {
   implementation(libs.androidx.benchmark.macro.junit4)
   implementation(libs.androidx.profileinstaller)
@@ -39,5 +55,3 @@ dependencies {
   implementation(libs.androidx.test.runner)
   implementation(libs.androidx.test.uiautomator)
 }
-
-androidComponents { beforeVariants(selector().all()) { it.enable = it.buildType == "benchmark" } }

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

@@ -11,18 +11,12 @@ import androidx.benchmark.macro.CompilationMode
 import androidx.benchmark.macro.StartupMode
 import androidx.benchmark.macro.StartupTimingMetric
 import androidx.benchmark.macro.junit4.MacrobenchmarkRule
-import androidx.test.filters.LargeTest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import org.junit.Before
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
-@LargeTest
-@Ignore(
-  "These tests fail saying that ProfileInstaller 1.3.0-alpha02 should be used which we already are"
-)
 class BaselineProfileBenchmark {
   @get:Rule val benchmarkRule = MacrobenchmarkRule()
   private lateinit var device: UiDevice
@@ -56,7 +50,7 @@ class BaselineProfileBenchmark {
       startupMode = StartupMode.COLD,
       compilationMode = compilationMode
     ) {
-      exploreUI(device)
+      startActivityAndWait()
     }
   }
 }

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

@@ -1,20 +1,20 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.benchmark
 
+import androidx.benchmark.macro.ExperimentalStableBaselineProfilesApi
 import androidx.benchmark.macro.junit4.BaselineProfileRule
-import androidx.test.filters.MediumTest
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
 
-@MediumTest
+@OptIn(ExperimentalStableBaselineProfilesApi::class)
 class BaselineProfileGenerator {
   @get:Rule val baselineProfileRule = BaselineProfileRule()
   private lateinit var device: UiDevice
@@ -26,6 +26,12 @@ class BaselineProfileGenerator {
   }
 
   @Test
-  fun startup() =
-    baselineProfileRule.collectBaselineProfile(packageName = PACKAGE_NAME) { exploreUI(device) }
+  fun generateBaselineProfile() =
+    baselineProfileRule.collectStableBaselineProfile(
+      packageName = PACKAGE_NAME,
+      stableIterations = 2,
+      maxIterations = 8,
+    ) {
+      startActivityAndWait()
+    }
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -9,9 +9,10 @@ package dev.msfjarvis.claw.benchmark
 import androidx.benchmark.macro.MacrobenchmarkScope
 import androidx.test.uiautomator.By
 import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
 
-const val PACKAGE_NAME = "dev.msfjarvis.claw.android"
+const val PACKAGE_NAME = "dev.msfjarvis.claw.android.benchmark"
 private const val AWAIT_TIMEOUT = 10_000L
 private const val SAVE_BUTTON_DESC = "Add to saved posts"
 private const val NAV_ID_HOTTEST = "HOTTEST"
@@ -19,6 +20,7 @@ private const val NAV_ID_NEWEST = "NEWEST"
 private const val NAV_ID_SAVED = "SAVED"
 private const val COMMENT_BUTTON_DESC = "Open comments"
 
+@Suppress("Unused")
 fun MacrobenchmarkScope.exploreUI(device: UiDevice) {
   startActivityAndWait()
   device.run {
@@ -38,7 +40,7 @@ private fun UiDevice.waitForSubmitterName() {
 
 private fun UiDevice.savePosts() {
   waitForSubmitterName()
-  findObjects(By.desc(SAVE_BUTTON_DESC)).forEach { btn -> btn.click() }
+  findObjects(By.desc(SAVE_BUTTON_DESC)).forEach(UiObject2::click)
 }
 
 private fun UiDevice.exploreScreens() {
@@ -54,6 +56,6 @@ private fun UiDevice.returnToHottestScreen() {
 }
 
 private fun UiDevice.openCommentsScreen() {
-  findObjects(By.desc(COMMENT_BUTTON_DESC)).first().click()
   waitForSubmitterName()
+  findObjects(By.desc(COMMENT_BUTTON_DESC)).first().click()
 }

build-logic/.gitignore

@@ -1 +0,0 @@
-/build

build-logic/android-plugins/build.gradle.kts

@@ -1,57 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-import org.gradle.api.JavaVersion
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins { `kotlin-dsl` }
-
-afterEvaluate {
-  tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
-  }
-
-  tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.toString()
-      freeCompilerArgs = freeCompilerArgs + "-Xsam-conversions=class"
-    }
-  }
-}
-
-gradlePlugin {
-  plugins {
-    register("android-application") {
-      id = "dev.msfjarvis.claw.android-application"
-      implementationClass = "dev.msfjarvis.aps.gradle.ApplicationPlugin"
-    }
-    register("android-common") {
-      id = "dev.msfjarvis.claw.android-common"
-      implementationClass = "dev.msfjarvis.aps.gradle.AndroidCommonPlugin"
-    }
-    register("android-library") {
-      id = "dev.msfjarvis.claw.android-library"
-      implementationClass = "dev.msfjarvis.aps.gradle.LibraryPlugin"
-    }
-    register("rename-artifacts") {
-      id = "dev.msfjarvis.claw.rename-artifacts"
-      implementationClass = "dev.msfjarvis.aps.gradle.RenameArtifactsPlugin"
-    }
-    register("versioning") {
-      id = "dev.msfjarvis.claw.versioning-plugin"
-      implementationClass = "dev.msfjarvis.aps.gradle.versioning.VersioningPlugin"
-    }
-  }
-}
-
-dependencies {
-  implementation(libs.build.agp)
-  implementation(libs.build.cachefix)
-  implementation(libs.build.semver)
-}

build-logic/android-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/AndroidCommonPlugin.kt

@@ -1,102 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-@file:Suppress("UnstableApiUsage")
-
-package dev.msfjarvis.aps.gradle
-
-import com.android.build.api.dsl.LibraryExtension
-import com.android.build.api.dsl.Lint
-import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.BaseExtension
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import org.gradle.android.AndroidCacheFixPlugin
-import org.gradle.api.JavaVersion
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.findByType
-
-private const val SLIM_TESTS_PROPERTY = "slimTests"
-
-class AndroidCommonPlugin : Plugin<Project> {
-
-  private companion object {
-    const val COMPILE_SDK = 33
-    const val MIN_SDK = 26
-    const val TARGET_SDK = 33
-  }
-
-  override fun apply(project: Project) {
-    project.configureSlimTests()
-    project.pluginManager.apply(AndroidCacheFixPlugin::class)
-    project.extensions.findByType<BaseExtension>()?.run {
-      compileSdkVersion(COMPILE_SDK)
-      defaultConfig {
-        minSdk = MIN_SDK
-        targetSdk = TARGET_SDK
-      }
-
-      packagingOptions {
-        resources.excludes.add("**/*.version")
-        resources.excludes.add("**/*.txt")
-        resources.excludes.add("**/*.kotlin_module")
-        resources.excludes.add("**/plugin.properties")
-        resources.excludes.add("**/META-INF/AL2.0")
-        resources.excludes.add("**/META-INF/LGPL2.1")
-      }
-
-      compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-      }
-
-      testOptions {
-        animationsDisabled = true
-        unitTests.isReturnDefaultValues = true
-      }
-    }
-    project.extensions.findByType<BaseAppModuleExtension>()?.run { lint.configureLint(project) }
-    project.extensions.findByType<LibraryExtension>()?.run { lint.configureLint(project) }
-  }
-}
-
-private fun Lint.configureLint(project: Project) {
-  abortOnError = false
-  checkReleaseBuilds = false
-  warningsAsErrors = false
-  disable.add("DialogFragmentCallbacksDetector")
-  baseline = project.file("lint-baseline.xml")
-}
-
-/**
- * When the "slimTests" project property is provided, disable the unit test tasks on `release` build
- * type and `nonFree` product flavor to avoid running the same tests repeatedly in different build
- * variants.
- *
- * Examples: `./gradlew test -PslimTests` will run unit tests for `nonFreeDebug` and `debug` build
- * variants in Android App and Library projects, and all tests in JVM projects.
- */
-private fun Project.configureSlimTests() {
-  if (providers.gradleProperty(SLIM_TESTS_PROPERTY).isPresent) {
-    // Disable unit test tasks on the release build type for Android Library projects
-    extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
-      beforeVariants(selector().withBuildType("release")) {
-        it.enableUnitTest = false
-        it.enableAndroidTest = false
-      }
-    }
-
-    // Disable unit test tasks on the release build type for Android Application projects.
-    extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
-      beforeVariants(selector().withBuildType("release")) {
-        it.enableUnitTest = false
-        it.enableAndroidTest = false
-      }
-    }
-  }
-}

build-logic/build.gradle.kts

@@ -0,0 +1,86 @@
+/*
+ * Copyright © 2022-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+import org.gradle.api.JavaVersion
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.kotlin.dsl.withType
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins { `kotlin-dsl` }
+
+tasks.withType<JavaCompile>().configureEach {
+  sourceCompatibility = JavaVersion.VERSION_11.toString()
+  targetCompatibility = JavaVersion.VERSION_11.toString()
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+  compilerOptions { jvmTarget.set(JvmTarget.JVM_11) }
+}
+
+gradlePlugin {
+  plugins {
+    register("android-application") {
+      id = "dev.msfjarvis.claw.android-application"
+      implementationClass = "dev.msfjarvis.claw.gradle.ApplicationPlugin"
+    }
+    register("android-common") {
+      id = "dev.msfjarvis.claw.android-common"
+      implementationClass = "dev.msfjarvis.claw.gradle.AndroidCommonPlugin"
+    }
+    register("android-library") {
+      id = "dev.msfjarvis.claw.android-library"
+      implementationClass = "dev.msfjarvis.claw.gradle.LibraryPlugin"
+    }
+    register("kotlin-android") {
+      id = "dev.msfjarvis.claw.kotlin-android"
+      implementationClass = "dev.msfjarvis.claw.gradle.KotlinAndroidPlugin"
+    }
+    register("kotlin-common") {
+      id = "dev.msfjarvis.claw.kotlin-common"
+      implementationClass = "dev.msfjarvis.claw.gradle.KotlinCommonPlugin"
+    }
+    register("kotlin-jvm") {
+      id = "dev.msfjarvis.claw.kotlin-jvm"
+      implementationClass = "dev.msfjarvis.claw.gradle.KotlinJvmPlugin"
+    }
+    register("kotlin-kapt") {
+      id = "dev.msfjarvis.claw.kotlin-kapt"
+      implementationClass = "dev.msfjarvis.claw.gradle.KotlinKaptPlugin"
+    }
+    register("rename-artifacts") {
+      id = "dev.msfjarvis.claw.rename-artifacts"
+      implementationClass = "dev.msfjarvis.claw.gradle.RenameArtifactsPlugin"
+    }
+    register("sentry") {
+      id = "dev.msfjarvis.claw.sentry"
+      implementationClass = "dev.msfjarvis.claw.gradle.SentryPlugin"
+    }
+    register("spotless") {
+      id = "dev.msfjarvis.claw.spotless"
+      implementationClass = "dev.msfjarvis.claw.gradle.SpotlessPlugin"
+    }
+    register("versioning") {
+      id = "dev.msfjarvis.claw.versioning-plugin"
+      implementationClass = "dev.msfjarvis.claw.gradle.versioning.VersioningPlugin"
+    }
+    register("versions") {
+      id = "dev.msfjarvis.claw.versions"
+      implementationClass = "dev.msfjarvis.claw.gradle.DependencyUpdatesPlugin"
+    }
+  }
+}
+
+dependencies {
+  implementation(libs.build.agp)
+  implementation(libs.build.cachefix)
+  implementation(libs.build.kotlin.gradle)
+  implementation(libs.build.semver)
+  implementation(libs.build.sentry)
+  implementation(libs.build.spotless)
+  implementation(libs.build.vcu)
+  implementation(libs.build.versions)
+}

build-logic/kotlin-plugins/build.gradle.kts

@@ -1,65 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-import org.gradle.api.JavaVersion
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins { `kotlin-dsl` }
-
-afterEvaluate {
-  tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
-  }
-
-  tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions {
-      jvmTarget = JavaVersion.VERSION_11.toString()
-      freeCompilerArgs = freeCompilerArgs + "-Xsam-conversions=class"
-    }
-  }
-}
-
-gradlePlugin {
-  plugins {
-    register("kotlin-android") {
-      id = "dev.msfjarvis.claw.kotlin-android"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinAndroidPlugin"
-    }
-    register("kotlin-common") {
-      id = "dev.msfjarvis.claw.kotlin-common"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinCommonPlugin"
-    }
-    register("kotlin-kapt") {
-      id = "dev.msfjarvis.claw.kotlin-kapt"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinKaptPlugin"
-    }
-    register("kotlin-library") {
-      id = "dev.msfjarvis.claw.kotlin-library"
-      implementationClass = "dev.msfjarvis.aps.gradle.KotlinLibraryPlugin"
-    }
-    register("spotless") {
-      id = "dev.msfjarvis.claw.spotless"
-      implementationClass = "dev.msfjarvis.aps.gradle.SpotlessPlugin"
-    }
-    register("versions") {
-      id = "dev.msfjarvis.claw.versions"
-      implementationClass = "dev.msfjarvis.aps.gradle.DependencyUpdatesPlugin"
-    }
-  }
-}
-
-dependencies {
-  implementation(libs.build.agp)
-  implementation(libs.build.detekt)
-  implementation(libs.build.kotlin.gradle)
-  implementation(libs.build.kotlin.serialization)
-  implementation(libs.build.spotless)
-  implementation(libs.build.vcu)
-  implementation(libs.build.versions)
-}

build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/Detekt.kt

@@ -1,35 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.aps.gradle
-
-import io.gitlab.arturbosch.detekt.DetektPlugin
-import io.gitlab.arturbosch.detekt.extensions.DetektExtension
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.configure
-
-object Detekt {
-  private const val TWITTER_RULES_VERSION = "0.0.26"
-
-  fun apply(project: Project) {
-    project.pluginManager.apply(DetektPlugin::class.java)
-    project.extensions.configure<DetektExtension> {
-      debug = project.providers.gradleProperty("debugDetekt").isPresent
-      parallel = true
-      ignoredBuildTypes = listOf("benchmark", "release")
-      basePath = project.layout.projectDirectory.toString()
-      baseline =
-        project.rootProject.layout.projectDirectory
-          .dir("detekt-baselines")
-          .file("${project.name}.xml")
-          .asFile
-    }
-    project.dependencies.add(
-      "detektPlugins",
-      "com.twitter.compose.rules:detekt:$TWITTER_RULES_VERSION",
-    )
-  }
-}

build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/KotlinLibraryPlugin.kt

@@ -1,19 +0,0 @@
-/*
- * Copyright © 2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.aps.gradle
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.kotlin.dsl.apply
-
-@Suppress("Unused")
-class KotlinLibraryPlugin : Plugin<Project> {
-
-  override fun apply(project: Project) {
-    project.pluginManager.apply(KotlinCommonPlugin::class)
-  }
-}

build-logic/settings.gradle.kts

@@ -39,7 +39,3 @@ dependencyResolutionManagement {
   }
   versionCatalogs { create("libs") { from(files("../gradle/libs.versions.toml")) } }
 }
-
-include("android-plugins")
-
-include("kotlin-plugins")

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2022-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+@file:Suppress("UnstableApiUsage")
+
+package dev.msfjarvis.claw.gradle
+
+import com.android.build.api.dsl.ApplicationExtension
+import com.android.build.api.dsl.LibraryExtension
+import com.android.build.api.variant.ApplicationAndroidComponentsExtension
+import com.android.build.api.variant.LibraryAndroidComponentsExtension
+import com.android.build.gradle.BaseExtension
+import dev.msfjarvis.claw.gradle.LintConfig.configureLint
+import org.gradle.android.AndroidCacheFixPlugin
+import org.gradle.api.JavaVersion
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.getByType
+
+class AndroidCommonPlugin : Plugin<Project> {
+
+  private companion object {
+    const val COMPILE_SDK = 33
+    const val MIN_SDK = 26
+    const val TARGET_SDK = 33
+  }
+
+  override fun apply(project: Project) {
+    project.configureSlimTests()
+    project.pluginManager.apply(AndroidCacheFixPlugin::class)
+    project.extensions.configure<BaseExtension> {
+      compileSdkVersion(COMPILE_SDK)
+      defaultConfig {
+        minSdk = MIN_SDK
+        targetSdk = TARGET_SDK
+      }
+
+      packagingOptions {
+        resources.excludes.add("**/*.version")
+        resources.excludes.add("**/*.txt")
+        resources.excludes.add("**/*.kotlin_module")
+        resources.excludes.add("**/plugin.properties")
+        resources.excludes.add("**/META-INF/AL2.0")
+        resources.excludes.add("**/META-INF/LGPL2.1")
+      }
+
+      compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+      }
+
+      testOptions {
+        animationsDisabled = true
+        unitTests.isReturnDefaultValues = true
+      }
+    }
+    project.extensions.findByType<ApplicationExtension>()?.lint?.configureLint(project)
+    project.extensions.findByType<LibraryExtension>()?.lint?.configureLint(project)
+    val catalog = project.extensions.getByType<VersionCatalogsExtension>()
+    val libs = catalog.named("libs")
+    project.dependencies.addProvider("lintChecks", libs.findLibrary("slack-compose-lints").get())
+  }
+}
+
+private fun Project.configureSlimTests() {
+  // Disable unit test tasks on the release build type for Android Library projects
+  extensions.findByType<LibraryAndroidComponentsExtension>()?.run {
+    beforeVariants(selector().withBuildType("release")) {
+      it.enableUnitTest = false
+      it.enableAndroidTest = false
+    }
+  }
+
+  // Disable unit test tasks on the release build type for Android Application projects.
+  extensions.findByType<ApplicationAndroidComponentsExtension>()?.run {
+    beforeVariants(selector().withBuildType("release")) {
+      it.enableUnitTest = false
+      it.enableAndroidTest = false
+    }
+  }
+}

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

@@ -1,20 +1,20 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 @file:Suppress("UnstableApiUsage")
 
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
+import com.android.build.api.dsl.ApplicationExtension
 import com.android.build.gradle.AppPlugin
-import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
-import dev.msfjarvis.aps.gradle.signing.configureBuildSigning
+import dev.msfjarvis.claw.gradle.signing.configureBuildSigning
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.configure
 
 @Suppress("Unused")
 class ApplicationPlugin : Plugin<Project> {
@@ -22,9 +22,7 @@ class ApplicationPlugin : Plugin<Project> {
   override fun apply(project: Project) {
     project.pluginManager.apply(AppPlugin::class)
     project.pluginManager.apply(AndroidCommonPlugin::class)
-    project.extensions.getByType<BaseAppModuleExtension>().run {
-      adbOptions.installOptions("--user 0")
-
+    project.extensions.configure<ApplicationExtension> {
       dependenciesInfo {
         includeInBundle = false
         includeInApk = false

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

@@ -1,10 +1,10 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import com.github.benmanes.gradle.versions.VersionsPlugin
 import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
@@ -13,7 +13,7 @@ import nl.littlerobots.vcu.plugin.VersionCatalogUpdatePlugin
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.withType
 
 @Suppress("Unused")
@@ -22,17 +22,20 @@ class DependencyUpdatesPlugin : Plugin<Project> {
     project.pluginManager.apply(VersionsPlugin::class)
     project.pluginManager.apply(VersionCatalogUpdatePlugin::class)
     project.tasks.withType<DependencyUpdatesTask>().configureEach {
-      rejectVersionIf {
-        when (candidate.group) {
-          "com.squareup.okhttp3",
-          "org.jetbrains.kotlin" -> true
-          else -> false
-        }
-      }
+      rejectVersionIf { isNonStable(candidate.version) && !isNonStable(currentVersion) }
+      checkConstraints = true
+      checkBuildEnvironmentConstraints = true
       checkForGradleUpdate = true
     }
-    project.extensions.getByType<VersionCatalogUpdateExtension>().run {
+    project.extensions.configure<VersionCatalogUpdateExtension> {
       keep.keepUnusedLibraries.set(true)
     }
   }
+
+  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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project

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

@@ -1,10 +1,10 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import org.gradle.api.JavaVersion
 import org.gradle.api.Plugin
@@ -13,25 +13,32 @@ import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.testing.Test
 import org.gradle.api.tasks.testing.logging.TestLogEvent
 import org.gradle.kotlin.dsl.withType
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile
 
 @Suppress("Unused")
 class KotlinCommonPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
-    Detekt.apply(project)
+    if (project.rootProject == project) {
+      LintConfig.configureRootProject(project)
+    } else if (project.name != "benchmark") {
+      LintConfig.configureSubProject(project)
+    }
     project.tasks.run {
       withType<JavaCompile>().configureEach {
         sourceCompatibility = JavaVersion.VERSION_11.toString()
         targetCompatibility = JavaVersion.VERSION_11.toString()
       }
-      withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-          allWarningsAsErrors =
-            false // project.providers.environmentVariable("GITHUB_WORKFLOW").isPresent
-          jvmTarget = JavaVersion.VERSION_11.toString()
-          freeCompilerArgs = freeCompilerArgs + ADDITIONAL_COMPILER_ARGS
-          languageVersion = "1.7"
+      withType<KotlinJvmCompile>().configureEach {
+        compilerOptions {
+          allWarningsAsErrors.set(
+            project.providers.environmentVariable("GITHUB_WORKFLOW").isPresent
+          )
+          jvmTarget.set(JvmTarget.JVM_11)
+          freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
+          languageVersion.set(KotlinVersion.KOTLIN_1_7)
         }
       }
       withType<Test>().configureEach {

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

@@ -0,0 +1,26 @@
+/*
+ * Copyright © 2022-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.gradle
+
+import com.android.build.api.dsl.Lint
+import com.android.build.gradle.LintPlugin
+import dev.msfjarvis.claw.gradle.LintConfig.configureLint
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.findByType
+import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
+
+@Suppress("Unused")
+class KotlinJvmPlugin : Plugin<Project> {
+  override fun apply(project: Project) {
+    project.pluginManager.apply(KotlinPluginWrapper::class)
+    project.pluginManager.apply(LintPlugin::class)
+    project.extensions.findByType<Lint>()?.configureLint(project, isJVM = true)
+    project.pluginManager.apply(KotlinCommonPlugin::class)
+  }
+}

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

@@ -1,15 +1,15 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2022 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.configure
 import org.jetbrains.kotlin.gradle.internal.Kapt3GradleSubplugin
 import org.jetbrains.kotlin.gradle.plugin.KaptExtension
 import org.jetbrains.kotlin.gradle.plugin.KotlinAndroidPluginWrapper
@@ -23,7 +23,7 @@ class KotlinKaptPlugin : Plugin<Project> {
       apply(Kapt3GradleSubplugin::class)
     }
     project.afterEvaluate {
-      project.extensions.getByType<KaptExtension>().run {
+      project.extensions.configure<KaptExtension> {
         javacOptions {
           if (hasDaggerCompilerDependency()) {
             // https://dagger.dev/dev-guide/compiler-options#fastinit-mode

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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import com.android.build.gradle.LibraryPlugin
 import org.gradle.api.Plugin

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

@@ -0,0 +1,57 @@
+/*
+ * 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.gradle
+
+import com.android.build.api.dsl.Lint
+import org.gradle.api.Project
+import org.gradle.api.tasks.Copy
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.register
+
+object LintConfig {
+  fun Lint.configureLint(project: Project, isJVM: Boolean = false) {
+    quiet = project.providers.environmentVariable("CI").isPresent
+    abortOnError = true
+    checkReleaseBuilds = true
+    warningsAsErrors = true
+    ignoreWarnings = false
+    checkAllWarnings = true
+    noLines = false
+    showAll = true
+    explainIssues = true
+    textReport = false
+    xmlReport = false
+    htmlReport = true
+    sarifReport = true
+    if (!isJVM) {
+      enable += "ComposeM2Api"
+      error += "ComposeM2Api"
+    }
+    baseline = project.file("lint-baseline.xml")
+  }
+
+  fun configureRootProject(project: Project) {
+    project.tasks.register<Copy>("collectLintReports") {
+      into(project.layout.buildDirectory.dir("lint-reports"))
+    }
+  }
+
+  fun configureSubProject(project: Project) {
+    val collectorTask = project.rootProject.tasks.named<Copy>("collectLintReports")
+    val lintTask = project.tasks.named("lint")
+    val name = project.name
+
+    collectorTask.configure {
+      from(project.layout.buildDirectory.file("reports")) {
+        include("*.sarif")
+        rename { it.replace("-results", "-results-$name") }
+      }
+      dependsOn(":$name:lint")
+    }
+    lintTask.configure { finalizedBy(collectorTask) }
+  }
+}

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

@@ -4,17 +4,16 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import com.android.build.api.artifact.SingleArtifact
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.VariantOutputConfiguration
-import dev.msfjarvis.aps.gradle.artifacts.CollectApksTask
-import dev.msfjarvis.aps.gradle.artifacts.CollectBundleTask
-import java.util.Locale
+import dev.msfjarvis.claw.gradle.artifacts.CollectApksTask
+import dev.msfjarvis.claw.gradle.artifacts.CollectBundleTask
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.register
 
 @Suppress("Unused")
@@ -22,9 +21,9 @@ class RenameArtifactsPlugin : Plugin<Project> {
 
   override fun apply(project: Project) {
     project.pluginManager.withPlugin("com.android.application") {
-      project.extensions.getByType<ApplicationAndroidComponentsExtension>().run {
+      project.extensions.configure<ApplicationAndroidComponentsExtension> {
         onVariants { variant ->
-          val taskPrefix = "collect${variant.name.capitalize(Locale.ROOT)}"
+          val taskPrefix = "collect${variant.name.replaceFirstChar { it.uppercase() }}"
           project.tasks.register<CollectApksTask>("${taskPrefix}Apks") {
             variantName.set(variant.name)
             apkFolder.set(variant.artifacts.get(SingleArtifact.APK))

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

@@ -0,0 +1,69 @@
+/*
+ * 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.gradle
+
+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.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")
+      project.extensions.configure<ApplicationAndroidComponentsExtension> {
+        onVariants(selector().all()) { variant ->
+          val sentryDsn = project.providers.environmentVariable(SENTRY_DSN_PROPERTY)
+          variant.manifestPlaceholders.put("sentryDsn", sentryDsn.getOrElse(""))
+        }
+      }
+      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)
+        uploadNativeSymbols.set(false)
+        autoUploadNativeSymbols.set(false)
+        includeNativeSources.set(false)
+        ignoredVariants.set(emptySet())
+        ignoredBuildTypes.set(setOf("benchmark", "debug"))
+        ignoredFlavors.set(emptySet())
+        tracingInstrumentation {
+          enabled.set(true)
+          debug.set(false)
+          forceInstrumentDependencies.set(false)
+          features.set(EnumSet.allOf(InstrumentationFeature::class.java))
+        }
+        experimentalGuardsquareSupport.set(false)
+        autoInstallation {
+          enabled.set(true)
+          sentryVersion.set(libs.findVersion("sentry-sdk").get().requiredVersion)
+        }
+        includeDependenciesReport.set(true)
+      }
+      with(project.dependencies) {
+        addProvider("implementation", platform(libs.findLibrary("sentry-bom").get()))
+      }
+    }
+  }
+
+  private companion object {
+
+    private const val SENTRY_DSN_PROPERTY = "SENTRY_DSN"
+    private const val SENTRY_UPLOAD_MAPPINGS_PROPERTY = "sentryUploadMappings"
+  }
+}

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

@@ -1,10 +1,10 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle
+package dev.msfjarvis.claw.gradle
 
 import com.diffplug.gradle.spotless.SpotlessExtension
 import com.diffplug.gradle.spotless.SpotlessPlugin
@@ -12,7 +12,7 @@ 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.getByType
+import org.gradle.kotlin.dsl.configure
 
 @Suppress("Unused")
 class SpotlessPlugin : Plugin<Project> {
@@ -22,7 +22,7 @@ class SpotlessPlugin : Plugin<Project> {
       throw GradleException("Spotless plugin must only be applied to the root project.")
     }
     project.pluginManager.apply(SpotlessPlugin::class)
-    project.extensions.getByType<SpotlessExtension>().run {
+    project.extensions.configure<SpotlessExtension> {
       kotlin {
         ktfmt(KTFMT_VERSION).googleStyle()
         target("**/*.kt")
@@ -46,6 +46,6 @@ class SpotlessPlugin : Plugin<Project> {
   }
 
   private companion object {
-    private const val KTFMT_VERSION = "0.41"
+    private const val KTFMT_VERSION = "0.44"
   }
 }

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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle.artifacts
+package dev.msfjarvis.claw.gradle.artifacts
 
 import com.android.build.api.variant.BuiltArtifactsLoader
 import java.io.File

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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle.artifacts
+package dev.msfjarvis.claw.gradle.artifacts
 
 import java.io.File
 import java.nio.file.Files

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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle.signing
+package dev.msfjarvis.claw.gradle.signing
 
 import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
 import java.util.Properties

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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle.versioning
+package dev.msfjarvis.claw.gradle.versioning
 
 const val VERSIONING_PROP_FILE = "version.properties"
 const val VERSIONING_PROP_VERSION_NAME = "versioning-plugin.versionName"

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

@@ -1,10 +1,10 @@
 /*
- * Copyright © 2022 Harsh Shandilya.
+ * Copyright © 2022-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle.versioning
+package dev.msfjarvis.claw.gradle.versioning
 
 import com.android.build.api.variant.ApplicationAndroidComponentsExtension
 import com.android.build.api.variant.VariantOutputConfiguration
@@ -14,14 +14,14 @@ import java.util.Properties
 import java.util.concurrent.atomic.AtomicBoolean
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.kotlin.dsl.getByType
+import org.gradle.kotlin.dsl.configure
 import org.gradle.kotlin.dsl.register
 import org.gradle.kotlin.dsl.withType
 
 /**
  * A Gradle [Plugin] that takes a [Project] with the [AppPlugin] applied and dynamically sets the
  * versionCode and versionName properties based on values read from a [VERSIONING_PROP_FILE] file in
- * the [Project.getBuildDir] directory. It also adds Gradle tasks to bump the major, minor, and
+ * the [Project.getProjectDir] directory. It also adds Gradle tasks to bump the major, minor, and
  * patch versions along with one to prepare the next snapshot.
  */
 @Suppress("Unused")
@@ -46,11 +46,15 @@ class VersioningPlugin : Plugin<Project> {
         }
       project.plugins.withType<AppPlugin> {
         androidAppPluginApplied.set(true)
-        extensions.getByType<ApplicationAndroidComponentsExtension>().onVariants { variant ->
-          val mainOutput =
-            variant.outputs.single { it.outputType == VariantOutputConfiguration.OutputType.SINGLE }
-          mainOutput.versionName.set(versionName)
-          mainOutput.versionCode.set(versionCode)
+        extensions.configure<ApplicationAndroidComponentsExtension> {
+          onVariants { variant ->
+            val mainOutput =
+              variant.outputs.single {
+                it.outputType == VariantOutputConfiguration.OutputType.SINGLE
+              }
+            mainOutput.versionName.set(versionName)
+            mainOutput.versionCode.set(versionCode)
+          }
         }
       }
       val version = Semver(versionName)

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

@@ -4,7 +4,7 @@
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-package dev.msfjarvis.aps.gradle.versioning
+package dev.msfjarvis.claw.gradle.versioning
 
 import com.vdurmont.semver4j.Semver
 import org.gradle.api.DefaultTask

build.gradle.kts

@@ -1,14 +1,18 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION")
-
 plugins {
   id("dev.msfjarvis.claw.spotless")
   id("dev.msfjarvis.claw.versions")
   id("dev.msfjarvis.claw.kotlin-common")
   alias(libs.plugins.android.test) apply false
+  alias(libs.plugins.modulegraph)
+}
+
+moduleGraphConfig {
+  readmePath.set(project.layout.projectDirectory.file("README.md").asFile.absolutePath)
+  heading.set("## Dependency Diagram")
 }

common/build.gradle.kts

@@ -1,48 +1,18 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
+@file:Suppress("UnstableApiUsage")
 
 plugins {
-  kotlin("android")
-  id("dev.msfjarvis.claw.kotlin-common")
   id("dev.msfjarvis.claw.android-library")
+  id("dev.msfjarvis.claw.kotlin-android")
   alias(libs.plugins.anvil)
   alias(libs.plugins.whetstone)
 }
 
-anvil { generateDaggerFactories.set(true) }
-
-androidComponents { beforeVariants { it.enableUnitTest = false } }
-
-dependencies {
-  implementation(platform(libs.androidx.compose.bom))
-  api(libs.napier)
-  implementation(projects.core)
-  implementation(projects.database)
-  implementation(projects.model)
-  implementation(libs.accompanist.flowlayout)
-  implementation(libs.androidx.browser)
-  implementation(libs.androidx.compose.animation)
-  implementation(libs.androidx.compose.foundation)
-  implementation(libs.androidx.compose.material)
-  implementation(libs.androidx.compose.material3)
-  implementation(libs.androidx.compose.runtime)
-  implementation(libs.androidx.compose.ui.text)
-  implementation(libs.androidx.compose.ui.tooling)
-  implementation(libs.androidx.compose.ui.tooling.preview)
-  implementation(libs.coil.compose)
-  implementation(libs.compose.richtext.markdown)
-  implementation(libs.compose.richtext.material3)
-  implementation(libs.compose.richtext.ui)
-  implementation(libs.kotlinx.coroutines.core)
-  testImplementation(kotlin("test-junit"))
-  testImplementation(libs.testparameterinjector)
-}
-
 android {
   buildFeatures {
     androidResources = true
@@ -54,3 +24,31 @@ android {
   }
   namespace = "dev.msfjarvis.claw.common"
 }
+
+androidComponents { beforeVariants { it.enableUnitTest = false } }
+
+anvil { generateDaggerFactories.set(true) }
+
+dependencies {
+  implementation(platform(libs.androidx.compose.bom))
+  api(libs.napier)
+  implementation(projects.core)
+  implementation(projects.database)
+  implementation(projects.model)
+  implementation(libs.androidx.browser)
+  implementation(libs.androidx.compose.animation)
+  implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.material3)
+  implementation(libs.androidx.compose.runtime)
+  implementation(libs.androidx.compose.ui.text)
+  implementation(libs.androidx.compose.ui.tooling)
+  implementation(libs.androidx.compose.ui.tooling.preview)
+  implementation(libs.coil.compose)
+  implementation(libs.compose.richtext.markdown)
+  implementation(libs.compose.richtext.material3)
+  implementation(libs.compose.richtext.ui)
+  implementation(libs.kotlinx.collections.immutable)
+  implementation(libs.kotlinx.coroutines.core)
+  testImplementation(kotlin("test-junit"))
+  testImplementation(libs.testparameterinjector)
+}

common/lint-baseline.xml

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

common/src/main/kotlin/dev/msfjarvis/claw/common/NetworkState.kt

@@ -1,13 +1,15 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
  */
 package dev.msfjarvis.claw.common
 
-sealed class NetworkState {
+internal sealed class NetworkState {
   class Success<T>(val data: T) : NetworkState()
+
   class Error(val error: Throwable, val description: String) : NetworkState()
+
   object Loading : NetworkState()
 }

common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2021-2022 Harsh Shandilya.
+ * Copyright © 2021-2023 Harsh Shandilya.
  * Use of this source code is governed by an MIT-style
  * license that can be found in the LICENSE file or at
  * https://opensource.org/licenses/MIT.
@@ -20,24 +20,22 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.produceState
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.posts.PostTitle
@@ -46,14 +44,14 @@ import dev.msfjarvis.claw.common.posts.TagRow
 import dev.msfjarvis.claw.common.res.ClawIcons
 import dev.msfjarvis.claw.common.ui.NetworkImage
 import dev.msfjarvis.claw.common.ui.ThemedRichText
-import dev.msfjarvis.claw.model.Comment
 import dev.msfjarvis.claw.model.LinkMetadata
 import dev.msfjarvis.claw.model.LobstersPostDetails
 import java.time.Instant
 import java.time.temporal.TemporalAccessor
+import kotlinx.collections.immutable.toImmutableList
 
 @Composable
-fun CommentsHeader(
+internal fun CommentsHeader(
   postDetails: LobstersPostDetails,
   postActions: PostActions,
   htmlConverter: HTMLConverter,
@@ -74,7 +72,7 @@ fun CommentsHeader(
       verticalArrangement = Arrangement.spacedBy(8.dp),
     ) {
       PostTitle(title = postDetails.title)
-      TagRow(tags = postDetails.tags)
+      TagRow(tags = postDetails.tags.toImmutableList())
       Spacer(Modifier.height(4.dp))
 
       if (linkMetadata.url.isNotBlank()) {
@@ -104,7 +102,7 @@ fun CommentsHeader(
 }
 
 @Composable
-fun PostLink(
+private fun PostLink(
   linkMetadata: LinkMetadata,
   modifier: Modifier = Modifier,
 ) {
@@ -114,22 +112,13 @@ fun PostLink(
       shape = RoundedCornerShape(8.dp),
     )
   ) {
-    Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.spacedBy(16.dp)) {
-      if (linkMetadata.faviconUrl != null) {
-        NetworkImage(
-          url = linkMetadata.faviconUrl!!,
-          placeholder = ClawIcons.Web,
-          contentDescription = "",
-          modifier = Modifier.size(24.dp),
-        )
-      } else {
-        Icon(
-          painter = ClawIcons.Web,
-          contentDescription = null,
-          tint = MaterialTheme.colorScheme.onSecondary,
-          modifier = Modifier.clip(CircleShape),
-        )
-      }
+    Row(modifier = Modifier.padding(16.dp), horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+      NetworkImage(
+        url = linkMetadata.faviconUrl,
+        placeholder = ClawIcons.Web,
+        contentDescription = "",
+        modifier = Modifier.size(24.dp),
+      )
       Text(
         text = linkMetadata.url,
         overflow = TextOverflow.Ellipsis,
@@ -145,18 +134,19 @@ private val CommentEntryPadding = 16f.dp
 
 @OptIn(ExperimentalAnimationApi::class)
 @Composable
-fun CommentEntry(
-  comment: Comment,
+internal fun CommentEntry(
+  commentNode: CommentNode,
   htmlConverter: HTMLConverter,
+  toggleExpanded: (CommentNode) -> Unit,
   modifier: Modifier = Modifier,
 ) {
-  var expanded by remember(comment) { mutableStateOf(true) }
   val uriHandler = LocalUriHandler.current
+  val comment = commentNode.comment
   Box(
     modifier =
       modifier
         .fillMaxWidth()
-        .clickable { expanded = !expanded }
+        .clickable { toggleExpanded(commentNode) }
         .background(MaterialTheme.colorScheme.background)
         .padding(
           start = CommentEntryPadding * comment.indentLevel,
@@ -171,6 +161,7 @@ fun CommentEntry(
           buildCommenterString(
             commenterName = comment.user.username,
             score = comment.score,
+            isUnread = commentNode.isUnread,
             createdAt = comment.createdAt,
             updatedAt = comment.updatedAt,
           ),
@@ -179,7 +170,7 @@ fun CommentEntry(
         modifier =
           Modifier.clickable { uriHandler.openUri("https://lobste.rs/u/${comment.user.username}") },
       )
-      AnimatedContent(targetState = expanded) { expandedState ->
+      AnimatedContent(targetState = commentNode.isExpanded) { expandedState ->
         if (expandedState) {
           ThemedRichText(
             text = htmlConverter.convertHTMLToMarkdown(comment.comment),
@@ -195,6 +186,7 @@ fun CommentEntry(
 fun buildCommenterString(
   commenterName: String,
   score: Int,
+  isUnread: Boolean,
   createdAt: TemporalAccessor,
   updatedAt: TemporalAccessor,
 ): AnnotatedString {
@@ -233,5 +225,17 @@ fun buildCommenterString(
       append(updatedRelative.toString())
       append(')')
     }
+    if (isUnread) {
+      append(' ')
+      withStyle(
+        style =
+          SpanStyle(
+            fontWeight = FontWeight.Bold,
+            color = MaterialTheme.colorScheme.error,
+          )
+      ) {
+        append("(unread)")
+      }
+    }
   }
 }