feat(release): bump version

Android Studio's canary version is going through some trouble recognizing test sources

.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,3 +1,4 @@
 * text=auto eol=lf
 **/dependencies/** linguist-generated
 **/clawicons/** linguist-generated
+android/src/main/baseline-prof.txt linguist-generated -diff

.github/renovate.json

@@ -1,41 +0,0 @@
-{
-  "extends": [
-    "config:base",
-    ":dependencyDashboard",
-    "github>msfjarvis/shared-workflows//renovate/automerge"
-  ],
-  "packageRules": [
-    {
-      "managers": [
-        "gradle"
-      ],
-      "packagePatterns": [
-        "^org.jetbrains.kotlin",
-        "^com.squareup.okhttp3"
-      ],
-      "enabled": false
-    }
-  ],
-  "regexManagers": [
-    {
-      "fileMatch": [
-        "build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/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"
-    }
-  ]
-}

.github/renovate.json5

@@ -0,0 +1,91 @@
+{
+  "extends": [
+    "config:base",
+    ":dependencyDashboard",
+    "helpers:pinGitHubActionDigests",
+    "github>msfjarvis/shared-workflows//renovate/automerge"
+  ],
+  "branchConcurrentLimit": 15,
+  "packageRules": [
+    {
+      matchDatasources: [
+        "maven"
+      ],
+      registryUrls: [
+        "https://maven.google.com/",
+        "https://repo1.maven.org/maven2",
+        "https://plugins.gradle.org/m2/",
+      ],
+    },
+    {
+      "matchPackagePatterns": [
+        "^androidx.*",
+      ],
+      "groupName": "androidx"
+    },
+    {
+      "matchPackagePatterns": [
+        "^kotlin",
+        "^org.jetbrains.kotlin",
+        "^androidx.compose.compiler",
+        "^anvil",
+        "^coil",
+      ],
+      "enabled": false
+    },
+    {
+      "matchPackagePatterns": [
+        "^io.sentry",
+        "^sentry",
+      ],
+      "groupName": "sentry"
+    },
+    {
+      "managers": [
+        "gradle"
+      ],
+      "packagePatterns": [
+        // Renovate refuses to stop resolving this from the snapshots repo
+        "^app.cash.sqldelight",
+        // Currently on a pre-release version for bugfixes
+        "com.android.tools:r8",
+      ],
+      "enabled": false
+    },
+  ],
+  "regexManagers": [
+    {
+      "fileMatch": [
+        "SpotlessPlugin\.kt$"
+      ],
+      "matchStrings": [
+        "KTFMT_VERSION = \"(?<currentValue>.*)\""
+      ],
+      "datasourceTemplate": "maven",
+      "depNameTemplate": "com.facebook:ktfmt",
+      "registryUrlTemplate": "https://repo1.maven.org/maven2/",
+    },
+    {
+      "fileMatch": [
+        "gradle/libs.versions.toml"
+      ],
+      "matchStrings": [
+        "composeCompiler = \"(?<currentValue>.*)\""
+      ],
+      "datasourceTemplate": "maven",
+      "depNameTemplate": "androidx.compose.compiler:compiler",
+      "registryUrlTemplate": "https://maven.google.com",
+    },
+    {
+      "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,105 @@
+name: Baseline profile generation
+
+on:
+  # every day at 00:43
+  schedule:
+    - cron: '43 0 * * *'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  baseline-profile:
+    runs-on: macos-latest
+    timeout-minutes: 45
+    env:
+      TERM: dumb
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      with:
+        token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
+        fetch-depth: 0
+
+    - name: Accept all SDK licenses
+      shell: bash
+      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+    - name: Get build-tools directory
+      id: build-tools-path
+      shell: bash
+      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
+
+    - name: Cache build-tools
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      with:
+        path: ${{ steps.build-tools-path.outputs.dir }}
+        key: ${{ runner.os }}-34.0.0-rc3
+ 
+    - name: Set up JDK
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      with:
+        distribution: temurin
+        java-version: 18
+
+    - name: Set up Git author
+      shell: bash
+      run: |
+        git config user.name "GitHub Actions"
+        git config user.email noreply@github.com
+
+    - name: Setup Gradle caching
+      uses: gradle/gradle-build-action@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

@@ -10,34 +10,49 @@ on:
     branches:
       - main
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      with:
+        fetch-depth: 0
+
+    - name: Accept all SDK licenses
+      shell: bash
+      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+    - name: Get build-tools directory
+      id: build-tools-path
+      shell: bash
+      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
+
+    - name: Cache build-tools
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      with:
+        path: ${{ steps.build-tools-path.outputs.dir }}
+        key: ${{ runner.os }}-34.0.0-rc3
 
     - name: Set up JDK
-      uses: actions/setup-java@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@v2.3.3
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
       with:
-        arguments: check -PslimTests
-        gradle-home-cache-cleanup: true
-
-    - name: Run Detekt
-      uses: gradle/gradle-build-action@v2.3.3
-      with:
-        arguments: 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@v3.1.1
+      uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
       with:
           name: Test report
           path: android/build/reports
@@ -48,24 +63,44 @@ jobs:
     needs: [ "check" ]
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Accept all SDK licenses
+      shell: bash
+      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+    - name: Get build-tools directory
+      id: build-tools-path
+      shell: bash
+      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
+
+    - name: Cache build-tools
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      with:
+        path: ${{ steps.build-tools-path.outputs.dir }}
+        key: ${{ runner.os }}-34.0.0-rc3
 
     - name: Set up JDK
-      uses: actions/setup-java@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@v2.3.3
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
+      env:
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
       with:
-        arguments: collectReleaseApks
+        arguments: --no-configuration-cache --stacktrace collectReleaseApks
         gradle-home-cache-cleanup: true
+        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh

.github/workflows/codeql_analysis.yml

@@ -0,0 +1,66 @@
+name: CodeQL
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+
+    - name: Accept all SDK licenses
+      shell: bash
+      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+    - name: Get build-tools directory
+      id: build-tools-path
+      shell: bash
+      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
+
+    - name: Cache build-tools
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      with:
+        path: ${{ steps.build-tools-path.outputs.dir }}
+        key: ${{ runner.os }}-34.0.0-rc3
+
+    - name: Set up JDK
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      with:
+        distribution: temurin
+        java-version: 18
+
+    - name: Setup Gradle caching
+      uses: gradle/gradle-build-action@749f47bda3e44aa060e82d7b3ef7e40d953bd629 # v2.4.2
+      with:
+        gradle-home-cache-cleanup: true
+        cache-read-only: true
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
+      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@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
+      with:
+        category: "/language:java"

.github/workflows/release.yml

@@ -1,42 +1,132 @@
 name: Release to Google Play
 on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
 
 jobs:
   publish-google-play-release:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.1.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      with:
+        token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
+        fetch-depth: 0
+
+    - name: Accept all SDK licenses
+      shell: bash
+      run: printf 'y\ny\ny\ny\ny\ny\n' | $ANDROID_HOME/tools/bin/sdkmanager --licenses
+
+    - name: Get build-tools directory
+      id: build-tools-path
+      shell: bash
+      run: echo "dir=${ANDROID_HOME}/build-tools/34.0.0-rc3" >> "${GITHUB_OUTPUT}"
+
+    - name: Cache build-tools
+      uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3
+      with:
+        path: ${{ steps.build-tools-path.outputs.dir }}
+        key: ${{ runner.os }}-34.0.0-rc3
 
     - name: Set up JDK
-      uses: actions/setup-java@v3.6.0
+      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/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 bundle
-      uses: gradle/gradle-build-action@v2.3.3
-      with:
-        arguments: collectReleaseBundle
-        gradle-home-cache-cleanup: true
+    - name: Get current version
+      shell: bash
+      run: |
+        ./gradlew -q --no-configuration-cache clearPreRelease
+        VERSION="$(tail -n1 android/version.properties | cut -d = -f 2)"
+        echo VERSION="${VERSION}" >> $GITHUB_ENV
 
-    - name: Publish bundle to Google Play
-      uses: r0adkll/upload-google-play@v1.0.19
+    - name: Update changelog
+      uses: msfjarvis/keep-a-changelog-new-release@bf43ae42f4e42f137572950af426efcf6e777207 # 2.1.0
       with:
-        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
-        packageName: dev.msfjarvis.claw.android
-        releaseFiles: android/bundle/*.aab
-        track: production
-        whatsNewDirectory: distribution/whatsnew
-        mappingFile: android/bundle/mapping.txt
+        tag: v${{ env.VERSION }}
+        version: ${{ env.VERSION }}
+
+    - name: Commit changes
+      shell: bash
+      run: |
+        git commit -am 'feat(release): bump version'
+
+    - 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 -PsentryUploadMappings
 
     - name: Clean secrets
       run: scripts/signing-cleanup.sh
+
+    - name: Get changelog entry
+      id: changelog_reader
+      uses: mindsers/changelog-reader-action@b97ce03a10d9bdbb07beb491c76a5a01d78cd3ef # v2.2.2
+      with:
+        version: ${{ env.VERSION }}
+        path: ./CHANGELOG.md
+
+    - name: Write release notes file
+      shell: bash
+      env:
+        CHANGELOG: ${{ steps.changelog_reader.outputs.changes }}
+      run: |
+        mkdir -p distribution/whatsnew
+        printf '## Changelog\n\n' > distribution/whatsnew/whatsnew-en-GB
+        printf '%s' "${CHANGELOG}" >> distribution/whatsnew/whatsnew-en-GB
+
+    - name: Publish bundle to Google Play
+      uses: r0adkll/upload-google-play@70c7397e868b00eccd390222f492ab3e30520d09 # v1.1.1
+      with:
+        mappingFile: android/bundle/mapping.txt
+        packageName: dev.msfjarvis.claw.android
+        releaseFiles: android/bundle/*.aab
+        serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
+        status: completed
+        track: production
+        whatsNewDirectory: distribution/whatsnew
+
+    - name: Post-release work
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.POST_RELEASE_GH_TOKEN }}
+      run: |
+        # Tag the current version
+        git tag "v${VERSION}" -F distribution/whatsnew/whatsnew-en-GB
+
+        # Push the tag to GitHub
+        git push origin "v${VERSION}"
+
+        # Create a GitHub release
+        gh release create "v${VERSION}" --notes-file distribution/whatsnew/whatsnew-en-GB --title "v${VERSION}" ./android/apk/*.apk ./android/bundle/*.aab
+
+        # Start the next development iteration
+        ./gradlew -q --no-configuration-cache bumpSnapshot
+        truncate -s 0 distribution/whatsnew/whatsnew-en-GB # Clear changelog
+        git commit -am 'feat(release): start next development iteration'
+        git push -u origin

.gitignore

@@ -242,3 +242,8 @@ hs_err_pid*
 !/gradle/wrapper/gradle-wrapper.jar
 
 # End of https://www.toptal.com/developers/gitignore/api/androidstudio,gradle,intellij+all
+
+keystore.properties
+distribution/
+screenshots/
+claw-export.json

.rgignore

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

CHANGELOG.md

@@ -0,0 +1,307 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [1.29.0] - 2023-06-08
+
+### Added
+
+*   Backup and restore options for saved posts
+
+### Fixed
+
+*   Spamming the comments button no longer causes it to be opened multiple times
+*   Saved posts screen now has a visual indication when you have nothing saved
+*   Iconography has been updated across the board to be more consistent
+
+## [1.28.0] - 2023-06-03
+
+### Changed
+
+*   Navigation transitions have been slightly sped up
+
+### Fixed
+
+*   Add workaround for a native library loading crash observed on some devices
+
+## [1.27.0] - 2023-05-31
+
+### Changed
+
+*   Small accessibility improvements
+*   Slightly tweak the layout for story items to take less vertical space
+*   Upgrade to Compose `1.5.0-beta01` release
+*   Set accessibility web URI for profile screen
+*   Directly use Material Icons from upstream artifacts
+*   Upgrade dependencies
+*   Add adaptive navigation support (thanks @Yash-Garg)
+*   Use latest SQLite for backing databases
+
+## [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
+
+## [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
+
+## [1.8.0] - 2022-11-21
+
+### Changed
+
+*   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
+
+## [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
+
+## [1.6.0] - 2022-11-14
+
+### Changed
+
+*   Migrate dependency injection from Hilt to Anvil + Whetstone
+
+## [1.5.0] - 2022-11-10
+
+### Changed
+
+*   Upgrade to Compose 2022.11.00 release
+
+## [1.4.0] - 2022-11-02
+
+### Changed
+
+*   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
+
+## [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
+
+## [1.1.0] - 2022-09-30
+
+### Added
+
+*   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
+
+## [1.0.0] - 2022-09-20
+
+*   Initial Play Store release
+
+[Unreleased]: https://github.com/msfjarvis/compose-lobsters/compare/v1.29.0...HEAD
+
+[1.29.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.28.0...v1.29.0
+
+[1.28.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.27.0...v1.28.0
+
+[1.27.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.26.0...v1.27.0
+
+[1.26.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.25.0...v1.26.0
+
+[1.25.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.24.0...v1.25.0
+
+[1.24.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.23.0...v1.24.0
+
+[1.23.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.22.0...v1.23.0
+
+[1.22.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.21.0...v1.22.0
+
+[1.21.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.20.0...v1.21.0
+
+[1.20.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.19.0...v1.20.0
+
+[1.19.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.18.0...v1.19.0
+
+[1.18.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.17.0...v1.18.0
+
+[1.17.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.16.0...v1.17.0
+
+[1.16.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.15.0...v1.16.0
+
+[1.15.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.14.0...v1.15.0
+
+[1.14.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.13.0...v1.14.0
+
+[1.13.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.12.0...v1.13.0
+
+[1.12.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.11.0...v1.12.0
+
+[1.11.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.10.0...v1.11.0
+
+[1.10.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.9.0...v1.10.0
+
+[1.9.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.8.0...v1.9.0
+
+[1.8.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.7.0...1.8.0
+
+[1.7.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.6.0...v1.7.0
+
+[1.6.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.5.0...v1.6.0
+
+[1.5.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.4.0...v1.5.0
+
+[1.4.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.3.0...v1.4.0
+
+[1.3.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.2.0...v1.3.0
+
+[1.2.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.1.0...v1.2.0
+
+[1.1.0]: https://github.com/msfjarvis/compose-lobsters/compare/v1.0.0...v1.1.0
+
+[1.0.0]: https://github.com/msfjarvis/compose-lobsters/compare/29c374859b17c5fcef03585b8a01c00070de9097...v1.0.0

README.md

@@ -2,18 +2,41 @@
 
 Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), built with [Jetpack Compose](https://developer.android.com/jetpack/compose).
 
-![Screenshots](./.github/readme_feature.png)
-
-## 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>
 
-Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/nightly).
+> Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/nightly).
 
+<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" />
+
+## Dependency Diagram
+
+```mermaid
+%%{
+  init: {
+    'theme': 'neutral'
+  }
+}%%
+
+graph LR
+
+  benchmark --> android
+  android --> api
+  android --> common
+  android --> core
+  android --> database
+  android --> model
+  api --> model
+  common --> core
+  common --> database
+  common --> model
+
+```
 ## License
 
 See [LICENSE](LICENSE)

android/benchmark-rules.pro

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

android/build.gradle.kts

@@ -1,25 +1,25 @@
 /*
- * 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")
 
-import dagger.hilt.android.plugin.HiltExtension
+import dev.msfjarvis.claw.gradle.addTestDependencies
 
 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.hilt)
-  alias(libs.plugins.napt)
+  alias(libs.plugins.anvil)
+  alias(libs.plugins.modulegraphassert)
+  alias(libs.plugins.whetstone)
 }
 
-// Hilt's aggregating task fails with NAPT
-extensions.getByType<HiltExtension>().enableAggregatingTask = false
-
 android {
   namespace = "dev.msfjarvis.claw.android"
   defaultConfig { applicationId = "dev.msfjarvis.claw.android" }
@@ -30,48 +30,63 @@ android {
   }
   buildTypes {
     create("benchmark") {
-      signingConfig = signingConfigs.getByName("debug")
-      matchingFallbacks += listOf("release")
+      signingConfig = signingConfigs["debug"]
+      matchingFallbacks += "release"
       isDebuggable = false
+      proguardFile("benchmark-rules.pro")
+      applicationIdSuffix = ".benchmark"
     }
   }
-  lint {
-    abortOnError = false
-    checkReleaseBuilds = false
-    warningsAsErrors = false
-    disable.add("DialogFragmentCallbacksDetector")
-    baseline = file("lint-baseline.xml")
+  packaging { jniLibs { useLegacyPackaging = true } }
+}
+
+moduleGraphAssert {
+  assertOnAnyBuild = true
+  maxHeight = 4
+  restricted = arrayOf(":core -X> :.*")
+}
+
+whetstone {
+  addOns {
+    compose.set(true)
+    workManager.set(true)
   }
 }
 
 dependencies {
   implementation(platform(libs.androidx.compose.bom))
-  annotationProcessor(libs.androidx.hilt.compiler)
-  annotationProcessor(libs.dagger.hilt.compiler)
-  implementation(projects.api)
-  implementation(projects.common)
-  implementation(projects.coroutineUtils)
-  implementation(projects.database)
-  implementation(projects.metadataExtractor)
-  implementation(projects.model)
-  implementation(libs.accompanist.swiperefresh)
+  implementation(platform(libs.okhttp.bom))
   implementation(libs.accompanist.sysuicontroller)
   implementation(libs.androidx.activity.compose)
+  implementation(libs.androidx.compose.material)
+  implementation(libs.androidx.compose.material.icons.extended)
   implementation(libs.androidx.compose.material3)
+  implementation(libs.androidx.compose.material3.window.size)
   implementation(libs.androidx.core.splashscreen)
-  implementation(libs.androidx.hilt.work)
+  implementation(libs.androidx.datastore.preferences)
   implementation(libs.androidx.lifecycle.compose)
   implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.paging.compose)
+  implementation(libs.androidx.profileinstaller)
   implementation(libs.androidx.work.runtime.ktx)
   implementation(libs.coil)
   implementation(libs.copydown)
-  implementation(libs.dagger.hilt.android)
+  implementation(libs.crux)
+  implementation(libs.dagger)
+  implementation(libs.jsoup)
+  implementation(libs.kotlinx.collections.immutable)
   implementation(libs.kotlinx.coroutines.core)
-  implementation(libs.kotlinx.serialization.json)
-  implementation(libs.material.motion.core)
-  implementation(libs.material.motion.navigation)
-  implementation(libs.okhttp.loggingInterceptor)
-  implementation(libs.retrofit.kotlinxSerializationConverter)
+  implementation(libs.napier)
   implementation(libs.sqldelight.extensions.coroutines)
+  implementation(projects.api)
+  implementation(projects.common)
+  implementation(projects.core)
+  implementation(projects.database)
+  implementation(projects.model)
+
+  kapt(libs.dagger.compiler)
+
+  testImplementation(libs.kotlinx.coroutines.test)
+  testImplementation(libs.okhttp.mockwebserver)
+  addTestDependencies(project)
 }

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

android/src/main/AndroidManifest.xml

@@ -6,14 +6,14 @@
   <application
     android:name=".ClawApplication"
     android:dataExtractionRules="@xml/data_extraction_rules"
+    android:enableOnBackInvokedCallback="true"
     android:fullBackupContent="@xml/full_backup_content"
     android:icon="@mipmap/ic_launcher"
     android:label="@string/app_name"
     android:roundIcon="@mipmap/ic_launcher"
     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" />
@@ -25,19 +25,6 @@
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
       </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:scheme="https" />
-        <data android:ssp="//lobste.rs" />
-
-        <data android:host="lobste.rs" />
-        <data android:path="/" />
-        <data android:scheme="https" />
-      </intent-filter>
 
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
@@ -149,6 +136,28 @@
         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>
+    <!-- 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="${enableSentry}" />
+    <meta-data android:name="io.sentry.breadcrumbs.user-interaction" android:value="${enableSentry}" />
+    <!-- enable screenshot for crashes -->
+    <meta-data android:name="io.sentry.attach-screenshot" android:value="${enableSentry}" />
+    <!-- enable view hierarchy for crashes -->
+    <meta-data android:name="io.sentry.attach-view-hierarchy" android:value="${enableSentry}" />
   </application>
 </manifest>

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

@@ -7,53 +7,51 @@
 package dev.msfjarvis.claw.android
 
 import android.app.Application
-import android.os.StrictMode
-import android.util.Log
-import androidx.hilt.work.HiltWorkerFactory
-import androidx.work.Configuration
-import coil.ImageLoader
-import coil.ImageLoaderFactory
-import coil.disk.DiskCache
-import coil.memory.MemoryCache
-import dagger.hilt.android.HiltAndroidApp
-import io.github.aakira.napier.DebugAntilog
-import io.github.aakira.napier.Napier
+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
 
-@HiltAndroidApp
-class ClawApplication : Application(), Configuration.Provider, ImageLoaderFactory {
-  @Inject lateinit var workerFactory: HiltWorkerFactory
+@ContributesAppInjector(generateAppComponent = true)
+class ClawApplication : Application(), ApplicationComponentOwner {
+
+  override val applicationComponent by
+    lazy(LazyThreadSafetyMode.NONE) { GeneratedApplicationComponent.create(this) }
+
+  @Inject lateinit var plugins: Set<@JvmSuppressWildcards AppPlugin>
 
   override fun onCreate() {
+    Whetstone.inject(this)
     super.onCreate()
-    StrictMode.setVmPolicy(StrictMode.VmPolicy.Builder().detectAll().penaltyLog().build())
-    StrictMode.setThreadPolicy(StrictMode.ThreadPolicy.Builder().detectAll().penaltyLog().build())
-    Napier.base(DebugAntilog())
-  }
-
-  override fun getWorkManagerConfiguration(): Configuration {
-    return Configuration.Builder()
-      .setMinimumLoggingLevel(Log.DEBUG)
-      .setWorkerFactory(workerFactory)
-      .build()
-  }
-
-  override fun newImageLoader(): ImageLoader {
-    return ImageLoader.Builder(this)
-      .memoryCache { MemoryCache.Builder(this).maxSizePercent(MEMORY_CACHE_RATIO).build() }
-      .diskCache {
-        DiskCache.Builder()
-          .directory(cacheDir.resolve("image_cache"))
-          .maxSizeBytes(DISK_CACHE_MAX_SIZE)
-          .build()
-      }
-      // Show a short crossfade when loading images asynchronously.
-      .crossfade(true)
-      .build()
+    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 MEMORY_CACHE_RATIO = 0.25
-    private const val DISK_CACHE_MAX_SIZE = 25L * 1024 * 1024 // 25 MB
+    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.
@@ -11,54 +11,40 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
+import androidx.compose.material3.windowsizeclass.ExperimentalMaterial3WindowSizeClassApi
+import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
 import androidx.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 dagger.hilt.android.AndroidEntryPoint
+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
 
-@AndroidEntryPoint
+@ContributesActivityInjector
 class MainActivity : ComponentActivity() {
 
   @Inject lateinit var urlLauncher: UrlLauncher
   @Inject lateinit var htmlConverter: HTMLConverter
   private var webUri: String? = null
 
+  @OptIn(ExperimentalMaterial3WindowSizeClassApi::class)
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     installSplashScreen()
+    Whetstone.inject(this)
+    WindowCompat.setDecorFitsSystemWindows(window, false)
     setContent {
+      val windowSizeClass = calculateWindowSizeClass(this)
+
       LobstersApp(
         urlLauncher = urlLauncher,
         htmlConverter = htmlConverter,
+        windowSizeClass = windowSizeClass,
         setWebUri = { url -> webUri = url },
       )
     }
-    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?) {
@@ -71,8 +57,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.core.coroutines.DispatcherProvider
+import javax.inject.Singleton
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.SupervisorJob
+
+@Module
+@ContributesTo(ApplicationScope::class)
+class DataStoreModule {
+
+  @Singleton
+  @Provides
+  fun provideLoginDatastore(
+    @ForScope(ApplicationScope::class) context: Context,
+    dispatcherProvider: DispatcherProvider,
+  ): DataStore<Preferences> {
+    return PreferenceDataStoreFactory.create(
+      corruptionHandler = null,
+      migrations = emptyList(),
+      scope = CoroutineScope(dispatcherProvider.io() + SupervisorJob()),
+    ) {
+      context.preferencesDataStoreFile("login")
+    }
+  }
+}

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

@@ -1,26 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.injection
-
-import android.content.Context
-import dagger.Module
-import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.qualifiers.ApplicationContext
-import dagger.hilt.components.SingletonComponent
-import dev.msfjarvis.claw.database.LobstersDatabase
-import dev.msfjarvis.claw.database.local.createDatabase
-
-@Module
-@InstallIn(SingletonComponent::class)
-object DatabaseModule {
-
-  @Provides
-  fun provideDatabase(@ApplicationContext context: Context): LobstersDatabase {
-    return createDatabase(context)
-  }
-}

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

@@ -1,29 +1,20 @@
 /*
- * 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.
  */
 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 dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
+import dev.msfjarvis.claw.android.ui.util.HTMLConverterImpl
 import dev.msfjarvis.claw.common.comments.HTMLConverter
-import io.github.furstenheim.CopyDown
 
 @Module
-@InstallIn(SingletonComponent::class)
-object HTMLConverterModule {
-
-  @Provides
-  fun provideHTMLConverter() =
-    object : HTMLConverter {
-      private val copydown = CopyDown()
-
-      override fun convertHTMLToMarkdown(html: String): String {
-        return copydown.convert(html)
-      }
-    }
+@ContributesTo(ApplicationScope::class)
+interface HTMLConverterModule {
+  @Binds fun HTMLConverterImpl.bind(): HTMLConverter
 }

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

@@ -7,14 +7,14 @@
 package dev.msfjarvis.claw.android.injection
 
 import com.chimbori.crux.Crux
+import com.deliveryhero.whetstone.app.ApplicationScope
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
 import okhttp3.OkHttpClient
 
 @Module
-@InstallIn(SingletonComponent::class)
+@ContributesTo(ApplicationScope::class)
 object MetadataExtractorModule {
   @Provides
   fun provideCrux(

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.
@@ -7,18 +7,18 @@
 package dev.msfjarvis.claw.android.injection
 
 import android.content.Context
+import com.deliveryhero.whetstone.ForScope
+import com.deliveryhero.whetstone.activity.ActivityScope
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.qualifiers.ActivityContext
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 
 @Module
-@InstallIn(ActivityComponent::class)
+@ContributesTo(ActivityScope::class)
 object UrlLauncherModule {
   @Provides
-  fun provideUrlLauncher(@ActivityContext context: Context): UrlLauncher {
+  fun provideUrlLauncher(@ForScope(ActivityScope::class) context: Context): UrlLauncher {
     return UrlLauncher(context)
   }
 }

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/injection/annotations.kt

@@ -1,15 +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.claw.android.injection
-
-import javax.inject.Qualifier
-
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class DatabaseDispatcher
-
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class MainDispatcher
-
-@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class IODispatcher

android/src/main/kotlin/dev/msfjarvis/claw/android/network/UserAgentInterceptor.kt

@@ -1,25 +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.claw.android.network
-
-import dev.msfjarvis.claw.android.BuildConfig
-import javax.inject.Inject
-import okhttp3.Interceptor
-import okhttp3.Response
-
-/** An OkHttp [Interceptor] that adds a recognizable User-Agent header to all network requests. */
-class UserAgentInterceptor @Inject constructor() : Interceptor {
-  override fun intercept(chain: Interceptor.Chain): Response {
-    return chain.proceed(
-      chain
-        .request()
-        .newBuilder()
-        .header("User-Agent", "Claw-Android/${BuildConfig.VERSION_NAME}/msfjarvis")
-        .build()
-    )
-  }
-}

android/src/main/kotlin/dev/msfjarvis/claw/android/paging/LobstersPagingSource.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,7 +13,7 @@ import com.slack.eithernet.ApiResult.Success
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedFactory
 import dagger.assisted.AssistedInject
-import dev.msfjarvis.claw.android.injection.IODispatcher
+import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.model.LobstersPost
 import java.io.IOException
 import kotlinx.coroutines.CoroutineDispatcher
@@ -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,75 +1,94 @@
 /*
- * 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.android.ui
 
-import androidx.compose.animation.ExperimentalAnimationApi
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.Favorite
+import androidx.compose.material.icons.filled.ImportExport
+import androidx.compose.material.icons.filled.NewReleases
+import androidx.compose.material.icons.filled.Whatshot
+import androidx.compose.material.icons.outlined.FavoriteBorder
+import androidx.compose.material.icons.outlined.NewReleases
+import androidx.compose.material.icons.outlined.Whatshot
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.semantics
+import androidx.compose.ui.semantics.testTagsAsResourceId
 import androidx.compose.ui.text.font.FontWeight
-import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavType
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
+import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
 import androidx.navigation.navDeepLink
 import androidx.paging.compose.collectAsLazyPagingItems
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
+import com.deliveryhero.whetstone.compose.injectedViewModel
 import dev.msfjarvis.claw.android.R
+import dev.msfjarvis.claw.android.ui.datatransfer.DataTransferScreen
 import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
+import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationRail
 import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
+import dev.msfjarvis.claw.android.ui.decorations.TransparentSystemBars
 import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
 import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
+import dev.msfjarvis.claw.android.ui.navigation.ClawNavigationType
 import dev.msfjarvis.claw.android.ui.navigation.Destinations
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.api.LobstersApi
 import dev.msfjarvis.claw.common.comments.CommentsPage
 import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.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
-import soup.compose.material.motion.navigation.MaterialMotionNavHost
-import soup.compose.material.motion.navigation.composable
-import soup.compose.material.motion.navigation.rememberMaterialMotionNavController
 
-@Suppress("ModifierMissing") // Top-level composable, will never have a modifier supplied.
-@OptIn(ExperimentalMaterial3Api::class, ExperimentalAnimationApi::class)
+@OptIn(ExperimentalComposeUiApi::class)
 @Composable
 fun LobstersApp(
   urlLauncher: UrlLauncher,
   htmlConverter: HTMLConverter,
+  windowSizeClass: WindowSizeClass,
   setWebUri: (String?) -> Unit,
-  viewModel: ClawViewModel = viewModel(),
+  modifier: Modifier = Modifier,
+  viewModel: ClawViewModel = injectedViewModel(),
 ) {
-  val systemUiController = rememberSystemUiController()
   val hottestListState = rememberLazyListState()
   val newestListState = rememberLazyListState()
   val savedListState = rememberLazyListState()
-  val navController = rememberMaterialMotionNavController()
+  val navController = rememberNavController()
   val coroutineScope = rememberCoroutineScope()
+  val snackbarHostState = remember { SnackbarHostState() }
   val postActions = rememberPostActions(urlLauncher, navController, viewModel)
   val backStackEntry by navController.currentBackStackEntryAsState()
   val currentDestination = backStackEntry?.destination?.route
@@ -77,67 +96,57 @@ 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())
+
+  val navigationType = ClawNavigationType.fromSize(windowSizeClass.widthSizeClass)
 
   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,
-          icon = ClawIcons.Flame,
-          selectedIcon = ClawIcons.FlameFilled,
+          icon = Icons.Outlined.Whatshot,
+          selectedIcon = Icons.Filled.Whatshot,
         ) {
           coroutineScope.launch { hottestListState.animateScrollToItem(index = 0) }
         },
         NavigationItem(
           label = "Newest",
           route = Destinations.Newest.route,
-          icon = ClawIcons.New,
-          selectedIcon = ClawIcons.NewFilled,
+          icon = Icons.Outlined.NewReleases,
+          selectedIcon = Icons.Filled.NewReleases,
         ) {
           coroutineScope.launch { newestListState.animateScrollToItem(index = 0) }
         },
         NavigationItem(
           label = "Saved",
           route = Destinations.Saved.route,
-          icon = ClawIcons.HeartBorder,
-          selectedIcon = ClawIcons.Heart,
+          icon = Icons.Outlined.FavoriteBorder,
+          selectedIcon = Icons.Filled.Favorite,
         ) {
           coroutineScope.launch { savedListState.animateScrollToItem(index = 0) }
         },
       )
 
-    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 }) {
+            if (
+              navController.previousBackStackEntry != null &&
+                navItems.none { it.route == currentDestination }
+            ) {
               IconButton(
                 onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
               ) {
                 Icon(
-                  painter = ClawIcons.ArrowBack,
+                  imageVector = Icons.Filled.ArrowBack,
                   contentDescription = "Go back to previous screen",
                 )
               }
@@ -148,84 +157,112 @@ fun LobstersApp(
               Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
             }
           },
+          actions = {
+            if (navItems.any { it.route == currentDestination }) {
+              IconButton(onClick = { navController.navigate(Destinations.DataTransfer.route) }) {
+                Icon(
+                  imageVector = Icons.Filled.ImportExport,
+                  contentDescription = "Data transfer options"
+                )
+              }
+            }
+          },
         )
       },
       bottomBar = {
-        ClawNavigationBar(
-          navController = navController,
-          items = navItems,
-          isVisible = navItems.any { it.route == currentDestination },
-        )
+        AnimatedVisibility(visible = navigationType == ClawNavigationType.BOTTOM_NAVIGATION) {
+          ClawNavigationBar(
+            navController = navController,
+            items = navItems,
+            isVisible = navItems.any { it.route == currentDestination },
+          )
+        }
       },
+      snackbarHost = { SnackbarHost(snackbarHostState) },
+      modifier = modifier.semantics { testTagsAsResourceId = true },
     ) { paddingValues ->
-      MaterialMotionNavHost(
-        navController = navController,
-        startDestination = Destinations.startDestination.route,
-        modifier = Modifier.padding(paddingValues),
-      ) {
-        val uri = LobstersApi.BASE_URL
-        composable(
-          route = Destinations.Hottest.route,
-          deepLinks =
-            listOf(navDeepLink { uriPattern = uri }, navDeepLink { uriPattern = "$uri/" }),
+      Row(modifier = Modifier.padding(paddingValues)) {
+        AnimatedVisibility(visible = navigationType == ClawNavigationType.NAVIGATION_RAIL) {
+          ClawNavigationRail(
+            navController = navController,
+            items = navItems,
+            isVisible = navItems.any { it.route == currentDestination },
+          )
+        }
+
+        NavHost(
+          navController = navController,
+          startDestination = Destinations.startDestination.route,
+          // Make animations 2x faster than default specs
+          enterTransition = { fadeIn(animationSpec = tween(350)) },
+          exitTransition = { fadeOut(animationSpec = tween(350)) },
         ) {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            items = hottestPosts,
-            listState = hottestListState,
-            isPostSaved = viewModel::isPostSaved,
-            reloadPosts = viewModel::refreshHottestPosts,
-            postActions = postActions,
-          )
-        }
-        composable(
-          route = Destinations.Newest.route,
-        ) {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            items = newestPosts,
-            listState = newestListState,
-            isPostSaved = viewModel::isPostSaved,
-            reloadPosts = viewModel::refreshNewestPosts,
-            postActions = postActions,
-          )
-        }
-        composable(Destinations.Saved.route) {
-          setWebUri(null)
-          DatabasePosts(
-            items = savedPosts,
-            listState = savedListState,
-            postActions = postActions,
-          )
-        }
-        composable(
-          route = Destinations.Comments.route,
-          arguments = listOf(navArgument("postId") { type = NavType.StringType }),
-          deepLinks =
-            listOf(
-              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}/.*" },
-              navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}" },
-            ),
-        ) { backStackEntry ->
-          val postId = requireNotNull(backStackEntry.arguments?.getString("postId"))
-          setWebUri("https://lobste.rs/s/$postId")
-          CommentsPage(
-            postId = postId,
-            postActions = postActions,
-            htmlConverter = htmlConverter,
-          )
-        }
-        composable(
-          route = Destinations.User.route,
-          arguments = listOf(navArgument("username") { type = NavType.StringType }),
-          deepLinks =
-            listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }),
-        ) { backStackEntry ->
-          val username = requireNotNull(backStackEntry.arguments?.getString("username"))
-          UserProfile(
-            username = username,
-            getProfile = viewModel::getUserProfile,
-          )
+          val uri = LobstersApi.BASE_URL
+          composable(route = Destinations.Hottest.route) {
+            setWebUri("https://lobste.rs/")
+            NetworkPosts(
+              lazyPagingItems = hottestPosts,
+              listState = hottestListState,
+              isPostSaved = viewModel::isPostSaved,
+              postActions = postActions,
+            )
+          }
+          composable(route = Destinations.Newest.route) {
+            setWebUri("https://lobste.rs/")
+            NetworkPosts(
+              lazyPagingItems = newestPosts,
+              listState = newestListState,
+              isPostSaved = viewModel::isPostSaved,
+              postActions = postActions,
+            )
+          }
+          composable(route = Destinations.Saved.route) {
+            setWebUri(null)
+            DatabasePosts(
+              items = savedPosts,
+              listState = savedListState,
+              postActions = postActions,
+            )
+          }
+          composable(
+            route = Destinations.Comments.route,
+            arguments = listOf(navArgument("postId") { type = NavType.StringType }),
+            deepLinks =
+              listOf(
+                navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}/.*" },
+                navDeepLink { uriPattern = "$uri/s/${Destinations.Comments.placeholder}" },
+              ),
+          ) { backStackEntry ->
+            val postId = requireNotNull(backStackEntry.arguments?.getString("postId"))
+            setWebUri("https://lobste.rs/s/$postId")
+            CommentsPage(
+              postId = postId,
+              postActions = postActions,
+              htmlConverter = htmlConverter,
+              getSeenComments = viewModel::getSeenComments,
+              markSeenComments = viewModel::markSeenComments,
+            )
+          }
+          composable(
+            route = Destinations.User.route,
+            arguments = listOf(navArgument("username") { type = NavType.StringType }),
+            deepLinks =
+              listOf(navDeepLink { uriPattern = "$uri/u/${Destinations.User.placeholder}" }),
+          ) { backStackEntry ->
+            val username = requireNotNull(backStackEntry.arguments?.getString("username"))
+            setWebUri("https://lobste.rs/u/$username")
+            UserProfile(
+              username = username,
+              getProfile = viewModel::getUserProfile,
+            )
+          }
+          composable(route = Destinations.DataTransfer.route) {
+            DataTransferScreen(
+              context = context,
+              dataTransferRepository = viewModel.dataTransferRepository,
+              snackbarHostState = snackbarHostState,
+            )
+          }
         }
       }
     }

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

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

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/decorations/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.
@@ -19,16 +19,18 @@ import androidx.compose.material3.NavigationBarItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.graphics.vector.ImageVector
+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
+const val AnimationDuration = 100
 
 @Composable
 fun ClawNavigationBar(
   navController: NavController,
-  items: List<NavigationItem>,
+  items: ImmutableList<NavigationItem>,
   isVisible: Boolean,
   modifier: Modifier = Modifier,
 ) {
@@ -53,10 +55,10 @@ 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()
+                imageVector = if (it) navItem.selectedIcon else navItem.icon,
+                contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
               )
             }
           },
@@ -65,15 +67,16 @@ fun ClawNavigationBar(
           onClick = {
             if (isCurrentDestination) {
               navItem.listStateResetCallback()
-              return@NavigationBarItem
+            } else {
+              navController.graph.startDestinationRoute?.let { startDestination ->
+                navController.popBackStack(startDestination, false)
+              }
+              if (navItem.route != Destinations.startDestination.route) {
+                navController.navigate(navItem.route)
+              }
             }
-            navController.graph.startDestinationRoute?.let { startDestination ->
-              navController.popBackStack(startDestination, false)
-            }
-            if (navItem.route != Destinations.startDestination.route) {
-              navController.navigate(navItem.route)
-            }
-          }
+          },
+          modifier = Modifier.testTag(navItem.label.uppercase()),
         )
       }
     }
@@ -83,7 +86,7 @@ fun ClawNavigationBar(
 class NavigationItem(
   val label: String,
   val route: String,
-  val icon: Painter,
-  val selectedIcon: Painter,
+  val icon: ImageVector,
+  val selectedIcon: ImageVector,
   val listStateResetCallback: () -> Unit,
 )

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

@@ -0,0 +1,84 @@
+/*
+ * 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.android.ui.decorations
+
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.Crossfade
+import androidx.compose.animation.core.FastOutLinearInEasing
+import androidx.compose.animation.core.LinearOutSlowInEasing
+import androidx.compose.animation.core.tween
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.material3.Icon
+import androidx.compose.material3.NavigationRail
+import androidx.compose.material3.NavigationRailItem
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.testTag
+import androidx.navigation.NavController
+import dev.msfjarvis.claw.android.ui.navigation.Destinations
+import kotlinx.collections.immutable.ImmutableList
+
+@Composable
+fun ClawNavigationRail(
+  navController: NavController,
+  items: ImmutableList<NavigationItem>,
+  isVisible: Boolean,
+  modifier: Modifier = Modifier,
+) {
+  AnimatedVisibility(
+    visible = isVisible,
+    enter =
+      slideInHorizontally(
+        // Enters by sliding in from offset -fullWidth to 0.
+        initialOffsetX = { fullWidth -> -fullWidth },
+        animationSpec = tween(durationMillis = AnimationDuration, easing = LinearOutSlowInEasing),
+      ),
+    exit =
+      slideOutHorizontally(
+        // Exits by sliding out from offset 0 to -fullWidth.
+        targetOffsetX = { fullWidth -> -fullWidth },
+        animationSpec = tween(durationMillis = AnimationDuration, easing = FastOutLinearInEasing),
+      ),
+    modifier = Modifier,
+  ) {
+    NavigationRail(modifier = modifier) {
+      Spacer(Modifier.weight(1f))
+      items.forEach { navItem ->
+        val isCurrentDestination = navController.currentDestination?.route == navItem.route
+        NavigationRailItem(
+          icon = {
+            Crossfade(isCurrentDestination, label = "nav-label") {
+              Icon(
+                imageVector = if (it) navItem.selectedIcon else navItem.icon,
+                contentDescription = navItem.label.replaceFirstChar(Char::uppercase),
+              )
+            }
+          },
+          label = { Text(text = navItem.label) },
+          selected = isCurrentDestination,
+          onClick = {
+            if (isCurrentDestination) {
+              navItem.listStateResetCallback()
+            } else {
+              navController.graph.startDestinationRoute?.let { startDestination ->
+                navController.popBackStack(startDestination, false)
+              }
+              if (navItem.route != Destinations.startDestination.route) {
+                navController.navigate(navItem.route)
+              }
+            }
+          },
+          modifier = Modifier.testTag(navItem.label.uppercase()),
+        )
+      }
+      Spacer(Modifier.weight(1f))
+    }
+  }
+}

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/ext.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.
@@ -19,8 +19,6 @@ import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.LinkMetadata
 import dev.msfjarvis.claw.model.LobstersPostDetails
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
 
 fun Context.getActivity(): ComponentActivity? {
   return when (this) {
@@ -30,14 +28,6 @@ fun Context.getActivity(): ComponentActivity? {
   }
 }
 
-/**
- * Parses a given [String] into a [LocalDateTime]. This method is only intended to be used for dates
- * in the format returned by the Lobsters API, and is not a general purpose parsing solution.
- */
-fun String.toLocalDateTime(): LocalDateTime {
-  return LocalDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this))
-}
-
 @Composable
 fun rememberPostActions(
   urlLauncher: UrlLauncher,
@@ -51,9 +41,10 @@ fun rememberPostActions(
       }
 
       override fun viewComments(postId: String) {
-        navController.navigate(
+        val currentRoute = navController.currentDestination?.route
+        val newRoute =
           Destinations.Comments.route.replace(Destinations.Comments.placeholder, postId)
-        )
+        if (currentRoute != Destinations.Comments.route) navController.navigate(newRoute)
       }
 
       override fun viewCommentsPage(commentsUrl: String) {

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

@@ -1,45 +1,72 @@
 /*
- * 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.android.ui.lists
 
+import androidx.activity.compose.ReportDrawn
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Inbox
 import androidx.compose.material3.Divider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
 import dev.msfjarvis.claw.database.local.SavedPost
 import java.time.Month
+import 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,
 ) {
-  LazyColumn(
-    state = listState,
-    modifier = modifier,
-  ) {
-    items.forEach { (month, posts) ->
-      stickyHeader { MonthHeader(month = month) }
-      items(posts) { item ->
-        ListItem(
-          item = item,
-          isSaved = { true },
-          postActions = postActions,
+  ReportDrawn()
+  Box(modifier = modifier.fillMaxSize()) {
+    if (items.isEmpty()) {
+      Column(modifier = Modifier.align(Alignment.Center)) {
+        Icon(
+          imageVector = Icons.Filled.Inbox,
+          contentDescription = "Empty inbox icon",
+          modifier = Modifier.align(Alignment.CenterHorizontally).size(36.dp),
         )
-
-        Divider()
+        Text(text = "No saved posts", style = MaterialTheme.typography.headlineSmall)
+      }
+    } else {
+      LazyColumn(state = listState) {
+        items.forEach { (month, posts) ->
+          stickyHeader(contentType = "month-header") { MonthHeader(month = month) }
+          items(
+            items = posts,
+            key = { it.shortId },
+            contentType = { "LobstersItem" },
+          ) { item ->
+            ListItem(
+              item = item,
+              isSaved = { true },
+              postActions = postActions,
+            )
+            Divider()
+          }
+        }
       }
     }
   }

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

@@ -1,73 +1,71 @@
 /*
- * 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.android.ui.lists
 
+import androidx.activity.compose.ReportDrawnWhen
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material.pullrefresh.PullRefreshIndicator
+import androidx.compose.material.pullrefresh.pullRefresh
+import androidx.compose.material.pullrefresh.rememberPullRefreshState
 import androidx.compose.material3.Divider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 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 com.google.accompanist.swiperefresh.SwipeRefresh
-import com.google.accompanist.swiperefresh.SwipeRefreshIndicator
-import com.google.accompanist.swiperefresh.rememberSwipeRefreshState
+import androidx.paging.compose.itemContentType
+import androidx.paging.compose.itemKey
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.posts.toDbModel
 import dev.msfjarvis.claw.common.ui.NetworkError
+import dev.msfjarvis.claw.common.ui.ProgressBar
 import dev.msfjarvis.claw.database.local.SavedPost
 import dev.msfjarvis.claw.model.LobstersPost
 
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun NetworkPosts(
-  items: LazyPagingItems<LobstersPost>,
+  lazyPagingItems: LazyPagingItems<LobstersPost>,
   listState: LazyListState,
   isPostSaved: suspend (SavedPost) -> Boolean,
-  reloadPosts: () -> Unit,
   postActions: PostActions,
   modifier: Modifier = Modifier,
 ) {
-  val loadState = items.loadState.refresh
-  val isRefreshing = loadState == LoadState.Loading
-  SwipeRefresh(
-    state = rememberSwipeRefreshState(isRefreshing),
-    onRefresh = reloadPosts,
-    indicator = { state, trigger ->
-      val backgroundColor = MaterialTheme.colorScheme.surface
-      SwipeRefreshIndicator(
-        state = state,
-        refreshTriggerDistance = trigger,
-        backgroundColor = backgroundColor,
-        contentColor = contentColorFor(backgroundColor)
+  ReportDrawnWhen { lazyPagingItems.itemCount > 0 }
+  val refreshLoadState = lazyPagingItems.loadState.refresh
+  val isRefreshing = refreshLoadState == LoadState.Loading
+  val pullRefreshState = rememberPullRefreshState(isRefreshing, lazyPagingItems::refresh)
+  Box(modifier = modifier.fillMaxSize().pullRefresh(pullRefreshState)) {
+    if (lazyPagingItems.itemCount == 0 && refreshLoadState is LoadState.Error) {
+      NetworkError(
+        label = "Failed to load posts",
+        error = refreshLoadState.error,
+        modifier = Modifier.align(Alignment.Center),
       )
-    }
-  ) {
-    if (items.itemCount == 0) {
-      Box(modifier = Modifier.fillMaxSize()) {
-        if (loadState is LoadState.Error) {
-          NetworkError(
-            label = "Failed to load posts",
-            error = loadState.error,
-            modifier = Modifier.align(Alignment.Center),
-          )
-        }
-      }
     } else {
       LazyColumn(
         state = listState,
-        modifier = modifier,
       ) {
-        items(items) { 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(
@@ -79,7 +77,24 @@ fun NetworkPosts(
             Divider()
           }
         }
+        if (lazyPagingItems.loadState.append == LoadState.Loading) {
+          item(key = "progressbar") {
+            ProgressBar(
+              modifier =
+                Modifier.fillMaxWidth()
+                  .wrapContentWidth(Alignment.CenterHorizontally)
+                  .padding(vertical = 16.dp),
+            )
+          }
+        }
       }
     }
+    PullRefreshIndicator(
+      refreshing = isRefreshing,
+      state = pullRefreshState,
+      modifier = Modifier.align(Alignment.TopCenter),
+      backgroundColor = MaterialTheme.colorScheme.surface,
+      contentColor = contentColorFor(MaterialTheme.colorScheme.surface),
+    )
   }
 }

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/navigation/Destinations.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.
@@ -31,6 +31,10 @@ sealed class Destinations {
     override val route = "user/$placeholder"
   }
 
+  object DataTransfer : Destinations() {
+    override val route: String = "datatransfer"
+  }
+
   companion object {
     val startDestination
       get() = Hottest

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

@@ -0,0 +1,24 @@
+/*
+ * 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.navigation
+
+import androidx.compose.material3.windowsizeclass.WindowWidthSizeClass
+
+enum class ClawNavigationType {
+  BOTTOM_NAVIGATION,
+  NAVIGATION_RAIL;
+
+  companion object {
+    fun fromSize(windowSize: WindowWidthSizeClass): ClawNavigationType {
+      return when (windowSize) {
+        WindowWidthSizeClass.Medium,
+        WindowWidthSizeClass.Expanded -> NAVIGATION_RAIL
+        else -> BOTTOM_NAVIGATION
+      }
+    }
+  }
+}

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.api.injection.BaseUrl
+import dev.msfjarvis.claw.core.injection.IODispatcher
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.jsoup.Jsoup
+
+/** Helper for extracting CSRF token for authenticated requests to https://lobste.rs. */
+class CSRFRepository
+@Inject
+constructor(
+  private val okHttpClient: OkHttpClient,
+  @IODispatcher private val dispatcher: CoroutineDispatcher,
+  @BaseUrl private val url: String,
+) {
+  suspend fun extractToken(): String? {
+    val request = Request.Builder().url(url).get().build()
+    return withContext(dispatcher) {
+      okHttpClient.newCall(request).execute().use { response ->
+        val doc = Jsoup.parse(response.body?.string() ?: return@use null)
+        val element = doc.select("meta[name=\"csrf-token\"]").first() ?: return@use null
+        return@use element.attr("content")
+      }
+    }
+  }
+}

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

@@ -1,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,42 +10,49 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.paging.Pager
 import androidx.paging.PagingConfig
+import com.deliveryhero.whetstone.viewmodel.ContributesViewModel
 import com.slack.eithernet.ApiResult.Failure
 import com.slack.eithernet.ApiResult.Success
-import dagger.hilt.android.lifecycle.HiltViewModel
-import dev.msfjarvis.claw.android.injection.IODispatcher
 import dev.msfjarvis.claw.android.paging.LobstersPagingSource
-import dev.msfjarvis.claw.android.ui.toLocalDateTime
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.PAGE_SIZE
+import dev.msfjarvis.claw.android.paging.LobstersPagingSource.Companion.STARTING_PAGE_INDEX
 import dev.msfjarvis.claw.api.LobstersApi
+import dev.msfjarvis.claw.core.injection.IODispatcher
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.Comment
 import java.io.IOException
+import java.net.HttpURLConnection
+import java.time.LocalDateTime
 import java.time.Month
+import java.time.format.DateTimeFormatter
 import javax.inject.Inject
+import kotlinx.collections.immutable.ImmutableMap
+import kotlinx.collections.immutable.toImmutableMap
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
-@HiltViewModel
+@ContributesViewModel
 class ClawViewModel
 @Inject
 constructor(
   private val api: LobstersApi,
   private val savedPostsRepository: SavedPostsRepository,
+  private val commentsRepository: CommentsRepository,
   private val linkMetadataRepository: LinkMetadataRepository,
+  val dataTransferRepository: DataTransferRepository,
   private val pagingSourceFactory: LobstersPagingSource.Factory,
   @IODispatcher private val ioDispatcher: CoroutineDispatcher,
 ) : ViewModel() {
-  private var hottestPostsPagingSource: LobstersPagingSource? = null
-  private var newestPostsPagingSource: LobstersPagingSource? = null
   private val hottestPostsPager =
-    Pager(PagingConfig(20)) {
-      pagingSourceFactory.create(api::getHottestPosts).also { hottestPostsPagingSource = it }
+    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
+      pagingSourceFactory.create(api::getHottestPosts)
     }
   private val newestPostsPager =
-    Pager(PagingConfig(20)) {
-      pagingSourceFactory.create(api::getHottestPosts).also { newestPostsPagingSource = it }
+    Pager(PagingConfig(pageSize = PAGE_SIZE), initialKey = STARTING_PAGE_INDEX) {
+      pagingSourceFactory.create(api::getNewestPosts)
     }
 
   val hottestPosts
@@ -60,9 +67,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 {
@@ -86,11 +93,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) = commentsRepository.getSeenComments(postId)
+
+  fun markSeenComments(postId: String, comments: List<Comment>) {
+    viewModelScope.launch { commentsRepository.markSeenComments(postId, comments) }
+  }
+
   suspend fun getLinkMetadata(url: String) =
     withContext(ioDispatcher) { linkMetadataRepository.getLinkMetadata(url) }
 
@@ -105,11 +124,12 @@ constructor(
       }
     }
 
-  fun refreshHottestPosts() {
-    hottestPostsPagingSource?.invalidate()
-  }
-
-  fun refreshNewestPosts() {
-    newestPostsPagingSource?.invalidate()
+  /**
+   * Parses a given [String] into a [LocalDateTime]. This method is only intended to be used for
+   * dates in the format returned by the Lobsters API, and is not a general purpose parsing
+   * solution.
+   */
+  private fun String.toLocalDateTime(): LocalDateTime {
+    return LocalDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this))
   }
 }

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

@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2021-2023 Harsh Shandilya.
+ * Use of this source code is governed by an MIT-style
+ * license that can be found in the LICENSE file or at
+ * https://opensource.org/licenses/MIT.
+ */
+package dev.msfjarvis.claw.android.viewmodel
+
+import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.database.LobstersDatabase
+import dev.msfjarvis.claw.database.local.PostComments
+import dev.msfjarvis.claw.model.Comment
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+class CommentsRepository
+@Inject
+constructor(
+  database: LobstersDatabase,
+  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+) {
+  private val postCommentsQueries = database.postCommentsQueries
+
+  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 }))
+    }
+  }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * 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.core.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.core.injection.IODispatcher
+import dev.msfjarvis.claw.database.LobstersDatabase
+import dev.msfjarvis.claw.database.SavedPostSerializer
+import dev.msfjarvis.claw.database.local.SavedPost
+import java.io.InputStream
+import java.io.OutputStream
+import javax.inject.Inject
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.ExperimentalSerializationApi
+import kotlinx.serialization.builtins.ListSerializer
+import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.decodeFromStream
+import kotlinx.serialization.json.encodeToStream
+
+@OptIn(ExperimentalSerializationApi::class)
+class DataTransferRepository
+@Inject
+constructor(
+  private val database: LobstersDatabase,
+  private val json: Json,
+  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
+  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
+) {
+  private val serializer = ListSerializer(SavedPostSerializer)
+  private val savedPostQueries = database.savedPostQueries
+
+  suspend fun importPosts(input: InputStream) {
+    val posts: List<SavedPost> =
+      withContext(ioDispatcher) {
+        json.decodeFromStream(
+          serializer,
+          input,
+        )
+      }
+    withContext(dbDispatcher) {
+      database.transaction { posts.forEach(savedPostQueries::insertOrReplacePost) }
+    }
+  }
+
+  suspend fun exportPosts(output: OutputStream) {
+    val posts = withContext(dbDispatcher) { savedPostQueries.selectAllPosts().executeAsList() }
+    withContext(ioDispatcher) { json.encodeToStream(serializer, posts, output) }
+  }
+}

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

@@ -1,21 +1,49 @@
 /*
- * 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.android.viewmodel
 
-import dev.msfjarvis.claw.metadata.MetadataExtractor
+import com.chimbori.crux.Crux
+import com.chimbori.crux.api.Fields
 import dev.msfjarvis.claw.model.LinkMetadata
 import javax.inject.Inject
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import org.jsoup.Jsoup
 
 class LinkMetadataRepository
 @Inject
 constructor(
-  private val metadataExtractor: MetadataExtractor,
+  private val crux: Crux,
+  private val okHttpClient: OkHttpClient,
 ) {
   suspend fun getLinkMetadata(url: String): LinkMetadata {
-    return metadataExtractor.getExtractedMetadata(url)
+    return run {
+      val parsedUrl = url.toHttpUrlOrNull() ?: return@run null
+      if (!parsedUrl.isHttps) return@run null
+      val request = Request.Builder().url(parsedUrl).build()
+      val htmlContent =
+        okHttpClient.newCall(request).execute().use { response ->
+          val body = response.body ?: return@run null
+          body.string()
+        }
+      val extractedMetadata = crux.extractFrom(parsedUrl, Jsoup.parse(htmlContent, url))
+      val faviconUrl = extractedMetadata[Fields.FAVICON_URL].toString()
+      val readingTime = extractedMetadata[Fields.DURATION_MS].toString()
+      LinkMetadata(
+        url = url,
+        faviconUrl = faviconUrl,
+        readingTime = readingTime,
+      )
+    }
+      ?: LinkMetadata(
+        url = url,
+        faviconUrl = null,
+        readingTime = null,
+      )
   }
 }

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.
@@ -8,7 +8,7 @@ package dev.msfjarvis.claw.android.viewmodel
 
 import app.cash.sqldelight.coroutines.asFlow
 import app.cash.sqldelight.coroutines.mapToList
-import dev.msfjarvis.claw.android.injection.DatabaseDispatcher
+import dev.msfjarvis.claw.core.injection.DatabaseDispatcher
 import dev.msfjarvis.claw.database.LobstersDatabase
 import dev.msfjarvis.claw.database.local.SavedPost
 import io.github.aakira.napier.Napier
@@ -30,6 +30,15 @@ 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) }

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

@@ -7,19 +7,17 @@
 package dev.msfjarvis.claw.android.work
 
 import android.content.Context
-import androidx.hilt.work.HiltWorker
 import androidx.work.CoroutineWorker
 import androidx.work.WorkerParameters
-import com.slack.eithernet.ApiResult
-import dagger.assisted.Assisted
-import dagger.assisted.AssistedInject
+import com.deliveryhero.whetstone.ForScope
+import com.deliveryhero.whetstone.worker.ContributesWorker
+import com.deliveryhero.whetstone.worker.WorkerScope
+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 kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
+import dev.msfjarvis.claw.model.LobstersPostDetails
+import javax.inject.Inject
 import kotlinx.coroutines.flow.first
 
 /**
@@ -28,28 +26,23 @@ import kotlinx.coroutines.flow.first
  * saved posts that were saved before comment counts were added to be able to show a comment count
  * and for new-enough posts that are still getting comments to have an accurate one.
  */
-@Suppress("DEPRECATION") // We're being nasty
-@HiltWorker
+@ContributesWorker
 class SavedPostUpdaterWorker
-@AssistedInject
+@Inject
 constructor(
+  @ForScope(WorkerScope::class) appContext: Context,
+  workerParams: WorkerParameters,
   private val savedPostsRepository: SavedPostsRepository,
   private val lobstersApi: LobstersApi,
-  @Assisted appContext: Context,
-  @Assisted workerParams: WorkerParameters,
 ) : CoroutineWorker(appContext, workerParams) {
   override suspend fun doWork(): Result {
-    val posts = savedPostsRepository.savedPosts.first()
-    posts
-      .map { post ->
-        CoroutineScope(coroutineContext + Job()).async {
-          val details = runCatching { lobstersApi.getPostDetails(post.shortId) }.getOrNull()
-          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/test/kotlin/dev/msfjarvis/claw/android/viewmodel/CSRFRepositoryTest.kt

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

android/version.properties

@@ -1,5 +1,5 @@
 #
 # This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
 #
-versioning-plugin.versionCode=10400
-versioning-plugin.versionName=1.4.0
+versioning-plugin.versionCode=12900
+versioning-plugin.versionName=1.29.0

api/build.gradle.kts

@@ -1,23 +1,32 @@
 /*
- * 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")
+import dev.msfjarvis.claw.gradle.addTestDependencies
 
 plugins {
-  kotlin("jvm")
-  id("dev.msfjarvis.claw.kotlin-library")
+  id("dev.msfjarvis.claw.android-library")
+  id("dev.msfjarvis.claw.kotlin-android")
+  alias(libs.plugins.anvil)
+  alias(libs.plugins.whetstone)
 }
 
+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(kotlin("test-junit"))
-  testImplementation(libs.kotlinx.coroutines.core)
+  testImplementation(libs.kotlinx.coroutines.test)
   testImplementation(libs.kotlinx.serialization.json)
-  testImplementation(libs.retrofit.kotlinxSerializationConverter)
+  addTestDependencies(project)
 }

api/lint-baseline.xml

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

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,42 +1,39 @@
 /*
- * 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.android.injection
+package dev.msfjarvis.claw.api.injection
 
-import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.deliveryhero.whetstone.app.ApplicationScope
 import com.slack.eithernet.ApiResultCallAdapterFactory
 import com.slack.eithernet.ApiResultConverterFactory
+import com.squareup.anvil.annotations.ContributesTo
 import dagger.Module
 import dagger.Provides
-import dagger.hilt.InstallIn
-import dagger.hilt.components.SingletonComponent
 import dev.msfjarvis.claw.api.LobstersApi
-import kotlinx.serialization.ExperimentalSerializationApi
-import kotlinx.serialization.json.Json
-import okhttp3.MediaType.Companion.toMediaType
+import javax.inject.Qualifier
 import okhttp3.OkHttpClient
+import retrofit2.Converter
 import retrofit2.Retrofit
 import retrofit2.create
 
-@OptIn(ExperimentalSerializationApi::class)
 @Module
-@InstallIn(SingletonComponent::class)
+@ContributesTo(ApplicationScope::class)
 object ApiModule {
   @Provides
   fun provideRetrofit(
     client: OkHttpClient,
-    json: Json,
+    converterFactories: Set<@JvmSuppressWildcards Converter.Factory>,
+    @BaseUrl baseUrl: String,
   ): Retrofit {
-    val contentType = "application/json".toMediaType()
     return Retrofit.Builder()
       .client(client)
-      .baseUrl(LobstersApi.BASE_URL)
+      .baseUrl(baseUrl)
       .addConverterFactory(ApiResultConverterFactory)
-      .addConverterFactory(json.asConverterFactory(contentType))
       .addCallAdapterFactory(ApiResultCallAdapterFactory)
+      .apply { converterFactories.forEach(this::addConverterFactory) }
       .build()
   }
 
@@ -45,8 +42,7 @@ object ApiModule {
     return retrofit.create()
   }
 
-  @Provides
-  fun provideJsonSerializer(): Json {
-    return Json { ignoreUnknownKeys = true }
-  }
+  @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,20 +1,21 @@
 /*
- * 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 kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertIs
-import kotlinx.coroutines.runBlocking
+import dev.msfjarvis.claw.util.TestUtils.assertIs
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.Test
 
 class ApiTest {
   private val wrapper = ApiWrapper(newEitherNetController())
@@ -22,31 +23,52 @@ class ApiTest {
     get() = wrapper.api
 
   @Test
-  fun `api gets correct number of items`() = runBlocking {
+  fun `api gets correct number of items`() = runTest {
     val posts = api.getHottestPosts(1)
     assertIs<Success<List<LobstersPost>>>(posts)
-    assertEquals(25, posts.value.size)
+    assertThat(posts.value).hasSize(25)
   }
 
   @Test
-  fun `posts with no urls`() = runBlocking {
+  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()
-    assertEquals(2, commentsOnlyPosts.size)
+    assertThat(commentsOnlyPosts).hasSize(2)
   }
 
   @Test
-  fun `post details with comments`() = runBlocking {
+  fun `post details with comments`() = runTest {
     val postDetails = api.getPostDetails("tdfoqh")
     assertIs<Success<LobstersPostDetails>>(postDetails)
-    assertEquals(7, postDetails.value.comments.size)
+    assertThat(postDetails.value.comments).hasSize(7)
   }
 
   @Test
-  fun `get user details`() = runBlocking {
+  fun `get user details`() = runTest {
     val user = api.getUser("msfjarvis")
     assertIs<Success<User>>(user)
-    assertEquals("msfjarvis", user.value.username)
+    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,34 +1,56 @@
 /*
- * 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.decodeFromString
+import kotlinx.serialization.ExperimentalSerializationApi
 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
 
   init {
     controller.enqueue(LobstersApi::getHottestPosts) { success(hottest) }
-    controller.enqueue(LobstersApi::getNewestPosts) { success(hottest) }
+    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)
@@ -15,13 +17,28 @@ plugins {
 android {
   namespace = "dev.msfjarvis.claw.benchmark"
 
-  defaultConfig { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" }
+  defaultConfig {
+    minSdk = 28
+    testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+  }
 
   buildTypes {
     create("benchmark") {
       isDebuggable = true
-      signingConfig = getByName("debug").signingConfig
-      matchingFallbacks += listOf("release")
+      signingConfig = signingConfigs["debug"]
+      matchingFallbacks += "release"
+    }
+  }
+
+  testOptions {
+    managedDevices {
+      devices {
+        create<ManagedVirtualDevice>("api31") {
+          device = "Pixel 6"
+          apiLevel = 31
+          systemImageSource = "aosp"
+        }
+      }
     }
   }
 
@@ -29,6 +46,8 @@ 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 +58,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,14 +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.Rule
 import org.junit.Test
 
-@LargeTest
 class BaselineProfileBenchmark {
   @get:Rule val benchmarkRule = MacrobenchmarkRule()
   private lateinit var device: UiDevice
@@ -52,7 +50,7 @@ class BaselineProfileBenchmark {
       startupMode = StartupMode.COLD,
       compilationMode = compilationMode
     ) {
-      exploreUI(device)
+      startActivityAndWait()
     }
   }
 }

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

@@ -1,22 +1,18 @@
 /*
- * 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.ExperimentalBaselineProfilesApi
 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
 
-@ExperimentalBaselineProfilesApi
-@MediumTest
 class BaselineProfileGenerator {
   @get:Rule val baselineProfileRule = BaselineProfileRule()
   private lateinit var device: UiDevice
@@ -28,6 +24,11 @@ class BaselineProfileGenerator {
   }
 
   @Test
-  fun startup() =
-    baselineProfileRule.collectBaselineProfile(packageName = PACKAGE_NAME) { exploreUI(device) }
+  fun generateBaselineProfile() =
+    baselineProfileRule.collectBaselineProfile(
+      packageName = PACKAGE_NAME,
+      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,19 +9,53 @@ 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"
+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 {
-    listOf("HOTTEST", "NEWEST", "SAVED").forEach { desc ->
-      findObject(By.desc(desc)).click()
-      waitForIdle()
-    }
-    findObject(By.desc("HOTTEST")).click()
-    waitForIdle()
-    findObjects(By.desc("Open comments")).first().click()
-    waitForIdle()
+    savePosts()
+
+    exploreScreens()
+
+    returnToHottestScreen()
+
+    openCommentsScreen()
   }
 }
+
+private fun UiDevice.waitForSubmitterName() {
+  wait(Until.hasObject(By.textContains("Submitted by")), AWAIT_TIMEOUT)
+}
+
+private fun UiDevice.savePosts() {
+  waitForSubmitterName()
+  findObjects(By.desc(SAVE_BUTTON_DESC)).forEach(UiObject2::click)
+}
+
+private fun UiDevice.exploreScreens() {
+  listOf(NAV_ID_HOTTEST, NAV_ID_NEWEST, NAV_ID_SAVED).forEach { tag ->
+    findObject(By.res(tag)).click()
+    waitForSubmitterName()
+  }
+}
+
+private fun UiDevice.returnToHottestScreen() {
+  findObject(By.res(NAV_ID_HOTTEST)).click()
+  waitForSubmitterName()
+}
+
+private fun UiDevice.openCommentsScreen() {
+  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,110 +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 com.android.build.api.dsl.TestExtension
-import com.android.build.api.variant.ApplicationAndroidComponentsExtension
-import com.android.build.api.variant.LibraryAndroidComponentsExtension
-import com.android.build.gradle.TestedExtension
-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"
-
-@Suppress("UnstableApiUsage")
-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<TestedExtension>()?.run {
-      compileSdkVersion(COMPILE_SDK)
-      defaultConfig {
-        minSdk = MIN_SDK
-        targetSdk = TARGET_SDK
-      }
-
-      sourceSets {
-        named("main") { java.srcDirs("src/main/kotlin") }
-        named("test") { java.srcDirs("src/test/kotlin") }
-        named("androidTest") { java.srcDirs("src/androidTest/kotlin") }
-      }
-
-      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<TestExtension>()?.run {
-      compileSdk = COMPILE_SDK
-      defaultConfig {
-        minSdk = MIN_SDK
-        targetSdk = TARGET_SDK
-      }
-      compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-      }
-
-      testOptions {
-        animationsDisabled = true
-        unitTests.isReturnDefaultValues = true
-      }
-    }
-  }
-}
-
-/**
- * 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.
- */
-internal 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,87 @@
+/*
+ * 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_17.toString()
+  targetCompatibility = JavaVersion.VERSION_17.toString()
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+  compilerOptions { jvmTarget.set(JvmTarget.JVM_17) }
+}
+
+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.r8)
+  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,61 +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-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.22"
-
-  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

@@ -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.
@@ -15,7 +15,6 @@ dependencyResolutionManagement {
       filter {
         includeGroup("androidx.databinding")
         includeGroup("com.android")
-        includeGroup("com.android.tools")
         includeGroup("com.android.tools.analytics-library")
         includeGroup("com.android.tools.build")
         includeGroup("com.android.tools.build.jetifier")
@@ -25,6 +24,15 @@ dependencyResolutionManagement {
         includeGroup("com.android.tools.lint")
         includeGroup("com.android.tools.utp")
         includeGroup("com.google.testing.platform")
+        includeModule("com.android.tools", "annotations")
+        includeModule("com.android.tools", "common")
+        includeModule("com.android.tools", "desugar_jdk_libs")
+        includeModule("com.android.tools", "desugar_jdk_libs_configuration")
+        includeModule("com.android.tools", "dvlib")
+        includeModule("com.android.tools", "play-sdk-proto")
+        includeModule("com.android.tools", "repository")
+        includeModule("com.android.tools", "sdklib")
+        includeModule("com.android.tools", "sdk-common")
       }
     }
     exclusiveContent {
@@ -35,11 +43,11 @@ dependencyResolutionManagement {
         includeModule("gradle.plugin.org.gradle.android", "android-cache-fix-gradle-plugin")
       }
     }
+    exclusiveContent {
+      forRepository { maven("https://storage.googleapis.com/r8-releases/raw/main") }
+      filter { includeModule("com.android.tools", "r8") }
+    }
     mavenCentral()
   }
   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_17
+        targetCompatibility = JavaVersion.VERSION_17
+      }
+
+      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,29 +13,38 @@ 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()
+        sourceCompatibility = JavaVersion.VERSION_17.toString()
+        targetCompatibility = JavaVersion.VERSION_17.toString()
       }
-      withType<KotlinCompile>().configureEach {
-        kotlinOptions {
-          allWarningsAsErrors = 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_17)
+          freeCompilerArgs.addAll(ADDITIONAL_COMPILER_ARGS)
+          languageVersion.set(KotlinVersion.KOTLIN_1_7)
         }
       }
       withType<Test>().configureEach {
         maxParallelForks = Runtime.getRuntime().availableProcessors() * 2
         testLogging { events(TestLogEvent.PASSED, TestLogEvent.SKIPPED, TestLogEvent.FAILED) }
+        useJUnitPlatform()
       }
     }
   }

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

@@ -0,0 +1,53 @@
+/*
+ * 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.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.apply
+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
+
+@Suppress("Unused")
+class KotlinKaptPlugin : Plugin<Project> {
+
+  override fun apply(project: Project) {
+    project.pluginManager.run {
+      apply(KotlinAndroidPluginWrapper::class)
+      apply(Kapt3GradleSubplugin::class)
+    }
+    project.afterEvaluate {
+      project.extensions.configure<KaptExtension> {
+        javacOptions {
+          if (hasDaggerCompilerDependency()) {
+            // https://dagger.dev/dev-guide/compiler-options#fastinit-mode
+            option("-Adagger.fastInit=enabled")
+            // Enable the better, experimental error messages
+            // https://github.com/google/dagger/commit/0d2505a727b54f47b8677f42dd4fc5c1924e37f5
+            option("-Adagger.experimentalDaggerErrorMessages=enabled")
+            // KAPT nests errors causing real issues to be suppressed in CI logs
+            option("-Xmaxerrs", 500)
+            // Enables per-module validation for faster error detection
+            // https://github.com/google/dagger/commit/325b516ac6a53d3fc973d247b5231fafda9870a2
+            option("-Adagger.moduleBindingValidation=ERROR")
+          }
+        }
+      }
+    }
+    project.tasks
+      .matching { it.name.startsWith("kapt") && it.name.endsWith("UnitTestKotlin") }
+      .configureEach { enabled = false }
+  }
+
+  private fun Project.hasDaggerCompilerDependency(): Boolean {
+    return configurations.any {
+      it.dependencies.any { dependency -> dependency.name == "dagger-compiler" }
+    }
+  }
+}