Merge #256

256: Upgrade Dagger and fix dependency mess r=msfjarvis a=msfjarvis

Fixes #255

bors r+

Co-authored-by: Harsh Shandilya <me@msfjarvis.dev>

.git-blame-ignore-revs

@@ -1,5 +1,2 @@
-# KMP removal
-3d496c99c14106a7f433d01a6a9a1301cc89844a
-e7f4c8a7ebe4e907f65af46e6dddfd3a542415c0
-ab2713154f846b3db6d44625d1022bf421b275d0
-cbdfa67d075ec1f8ceec0f3559498cbca01783a0
+cec0e1bbcb7eec6c8eb90807c105cbeab9c01c6c # Reformatted Gradle build files with 2 space indent
+c3cead59934c8c5221694940fc83be57fa50ac20 # Moved data module into app

.gitattributes

@@ -1,3 +0,0 @@
-* text=auto eol=lf
-**/dependencies/** linguist-generated
-**/clawicons/** linguist-generated

.github/ci-gradle.properties

@@ -0,0 +1 @@
+org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

.github/renovate.json

@@ -1,78 +0,0 @@
-{
-  "extends": [
-    "config:base",
-    ":dependencyDashboard",
-    "helpers:pinGitHubActionDigests",
-    "github>msfjarvis/shared-workflows//renovate/automerge"
-  ],
-  "packageRules": [
-    {
-      "matchPackagePatterns": [
-        "^com.android.tools.build",
-        "^com.android.test",
-        "^gradle"
-      ],
-      "enabled": false
-    },
-    {
-      "matchPackagePatterns": [
-        "^kotlin",
-        "^org.jetbrains.kotlin",
-        "^androidx.compose.compiler"
-      ],
-      "groupName": "kotlin"
-    },
-    {
-      "managers": [
-        "gradle"
-      ],
-      "packagePatterns": [
-        "^com.squareup.okhttp3"
-      ],
-      "enabled": false
-    },
-    {
-      "matchDatasources": [
-        "maven"
-      ],
-      "matchPackageNames": [
-        "androidx.compose.compiler:compiler"
-      ],
-      "registryUrls": [
-        "https://maven.google.com/"
-      ]
-    }
-  ],
-  "regexManagers": [
-    {
-      "fileMatch": [
-        "build-logic/kotlin-plugins/src/main/kotlin/dev/msfjarvis/aps/gradle/SpotlessPlugin.kt"
-      ],
-      "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"
-    },
-    {
-      "fileMatch": [
-        "gradle/libs.versions.toml"
-      ],
-      "matchStrings": [
-        "composeCompiler = \"(?<currentValue>.*)\""
-      ],
-      "datasourceTemplate": "maven",
-      "depNameTemplate": "androidx.compose.compiler:compiler"
-    }
-  ]
-}

.github/workflows/ci.yml

@@ -1,79 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-      - renovate/**
-
-  pull_request:
-    branches:
-      - main
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
-
-    - name: Set up JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Run unit tests
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
-      with:
-        arguments: --no-configuration-cache --stacktrace check -PslimTests
-        gradle-home-cache-cleanup: true
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-    - name: Run Detekt
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
-      with:
-        arguments: --no-configuration-cache --stacktrace detektMain
-        gradle-home-cache-cleanup: true
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-    - name: (Fail-only) Upload test report
-      if: failure()
-      uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # tag=v3.1.1
-      with:
-          name: Test report
-          path: android/build/reports
-
-  deploy-release-snapshot:
-    runs-on: ubuntu-latest
-    if: "github.event_name == 'push' && github.event.ref == 'refs/heads/main'"
-    needs: [ "check" ]
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
-
-    - name: Set up JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.0
-      with:
-        distribution: temurin
-        java-version: 18
-
-    - name: Decrypt secrets
-      run: scripts/signing-setup.sh "$ENCRYPT_KEY"
-      env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-
-    - name: Build release app
-      uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
-      with:
-        arguments: --no-configuration-cache --stacktrace collectReleaseApks
-        gradle-home-cache-cleanup: true
-        cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-    - name: Clean secrets
-      run: scripts/signing-cleanup.sh
-
-    - name: Deploy snapshot
-      run: scripts/deploy-snapshot.sh
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/deploy_snapshot.yml

@@ -0,0 +1,42 @@
+on:
+  push:
+    branches:
+      - develop
+
+name: Deploy snapshot builds
+jobs:
+  deploy-release-snapshot:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.head_commit.message, '[ci skip]')"
+    steps:
+    - uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2
+      with:
+        java-version: '11'
+
+    - name: Checkout repository
+      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+    - name: Decrypt secrets
+      run: scripts/signing-setup.sh "$ENCRYPT_KEY"
+      env:
+        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
+
+    - name: Copy CI gradle.properties
+      run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+    - name: Build release app
+      uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+      with:
+        arguments: :app:assembleRelease
+
+    - name: Clean secrets
+      run: scripts/signing-cleanup.sh
+
+    - name: Deploy snapshot
+      run: scripts/deploy-snapshot.sh
+      env:
+        ACTIONS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }}
+        SSH_USERNAME: ${{ secrets.SSH_USERNAME }}
+        SERVER_ADDRESS: ${{ secrets.SERVER_ADDRESS }}
+        SERVER_DESTINATION: ${{ secrets.SERVER_DESTINATION }}
+        SSH_PORT: ${{ secrets.SSH_PORT }}

.github/workflows/pull_request.yml

@@ -0,0 +1,55 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - staging
+      - trying
+
+jobs:
+  run-unit-tests:
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2
+      with:
+        java-version: '11'
+
+    - name: Checkout repository
+      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+
+    - name: Copy CI gradle.properties
+      run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+    - uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+      name: Run unit tests
+      with:
+        arguments: test --stacktrace
+
+    - name: (Fail-only) upload test report
+      if: failure()
+      uses: actions/upload-artifact@27bce4eee761b5bc643f46a8dfb41b430c8d05f6
+      with:
+          name: Test report
+          path: app/build/reports
+
+  stylecheck:
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2
+      with:
+        java-version: '11'
+
+    - name: Checkout repository
+      uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
+      with:
+        fetch-depth: 0
+
+    - name: Copy CI gradle.properties
+      run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
+
+    - uses: burrunan/gradle-cache-action@03c71a8ba93d670980695505f48f49daf43704a6
+      name: Check codestyle with Spotless
+      with:
+        arguments: spotlessCheck

.github/workflows/release.yml

@@ -1,108 +0,0 @@
-name: Release to Google Play
-on:
-  workflow_dispatch:
-
-jobs:
-  publish-google-play-release:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3.1.0
-      with:
-        token: ${{ secrets.POST_RELEASE_GH_TOKEN }}
-        fetch-depth: 0
-
-    - name: Set up JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3.6.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@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2.3.3
-      with:
-        gradle-home-cache-cleanup: true
-        cache-read-only: true
-
-    - name: Decrypt secrets
-      run: scripts/signing-setup.sh "$ENCRYPT_KEY"
-      env:
-        ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
-
-    - 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: Update changelog
-      uses: thomaseizinger/keep-a-changelog-new-release@5bc232893483441c5d6cd6c9dcb1e48abf9a2bae # 1.3.0
-      with:
-        tag: ${{ env.VERSION }}
-
-    - name: Commit changes
-      shell: bash
-      run: |
-        git commit -am 'feat(release): bump version'
-
-    - name: Build release assets
-      shell: bash
-      run: |
-        ./gradlew --no-configuration-cache collectReleaseApks collectReleaseBundle
-
-    - 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@78c9e796b1035c94169c101d8e46cb880194bfc3 # tag=v1.0.19
-      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

@@ -1,102 +1,10 @@
-# Created by https://www.toptal.com/developers/gitignore/api/androidstudio,gradle,intellij+all
-# Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,gradle,intellij+all
 
-### Intellij+all ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-### START CHANGES - We use Gradle auto-import ###
-.idea/artifacts
-.idea/compiler.xml
-.idea/jarRepositories.xml
-.idea/modules.xml
-.idea/*.iml
-.idea/modules
-*.iml
-*.ipr
-### END CHANGES - We use Gradle auto-import ###
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-### Intellij+all Patch ###
-# Ignore everything but code style settings and run configurations
-# that are supposed to be shared within teams.
-
-.idea/*
-
-### START CHANGES - We use Spotless to enforce code style ###
-.idea/codeStyles
-### END CHANGES - We use Spotless to enforce code style ###
-!.idea/runConfigurations
+# Created by https://www.gitignore.io/api/androidstudio,gradle
+# Edit at https://www.gitignore.io/?templates=androidstudio,gradle
 
 ### Gradle ###
 .gradle
-**/build/
-!src/**/build/
+build/
 
 # Ignore Gradle GUI config
 gradle-app.setting
@@ -104,21 +12,14 @@ gradle-app.setting
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
 
-# Avoid ignore Gradle wrappper properties
-!gradle-wrapper.properties
-
 # Cache of project
 .gradletasknamecache
 
-# Eclipse Gradle plugin generated files
-# Eclipse Core
-.project
-# JDT-specific (Eclipse Java Development Tools)
-.classpath
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
 
 ### Gradle Patch ###
-# Java heap dump
-*.hprof
+**/build/
 
 ### AndroidStudio ###
 # Covers files to be ignored for android development using Android Studio.
@@ -126,7 +27,6 @@ gradle-app.setting
 # Built application files
 *.apk
 *.ap_
-*.aab
 
 # Files for the ART/Dalvik VM
 *.dex
@@ -137,13 +37,15 @@ gradle-app.setting
 # Generated files
 bin/
 gen/
+out/
 
 # Gradle files
 .gradle/
-build/
 
 # Signing files
 .signing/
+keystore.jks
+keystore.properties
 
 # Local configuration file (sdk path, etc)
 local.properties
@@ -166,13 +68,6 @@ captures/
 *~
 *.swp
 
-# Keystore files
-*.jks
-*.keystore
-
-# Google Services (e.g. APIs or Firebase)
-# google-services.json
-
 # Android Patch
 gen-external-apklibs
 
@@ -184,6 +79,7 @@ obj/
 
 # IntelliJ IDEA
 *.iml
+*.iws
 /out/
 
 # User-specific configurations
@@ -208,11 +104,20 @@ obj/
 .idea/dynamic.xml
 .idea/uiDesigner.xml
 .idea/assetWizardSettings.xml
-.idea/gradle.xml
-.idea/jarRepositories.xml
-.idea/navEditor.xml
+.idea/deploymentTargetDropDown.xml
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
 
 # Legacy Eclipse project files
+.classpath
+.project
 .cproject
 .settings/
 
@@ -229,19 +134,22 @@ hs_err_pid*
 ## Plugin-specific files:
 
 # mpeltonen/sbt-idea plugin
+.idea_modules/
 
 # JIRA plugin
+atlassian-ide-plugin.xml
 
 # Mongo Explorer plugin
 .idea/mongoSettings.xml
 
 # Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
 
 ### AndroidStudio Patch ###
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/androidstudio,gradle,intellij+all
-
-keystore.properties
-distribution/
+# End of https://www.gitignore.io/api/androidstudio,gradle

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+/artifacts/
+/gradle.xml

.idea/codeInsightSettings.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaProjectCodeInsightSettings">
-    <excluded-names>
-      <name>android.app.LauncherActivity.ListItem</name>
-      <name>android.graphics.Color</name>
-      <name>android.graphics.drawable.Icon</name>
-      <name>android.graphics.fonts.FontFamily</name>
-      <name>android.inputmethodservice.Keyboard.Row</name>
-      <name>android.text.layout.Alignment</name>
-      <name>android.view.RoundedCorner</name>
-      <name>android.view.Surface</name>
-      <name>android.widget.GridLayout.Alignment</name>
-      <name>java.lang.reflect.Modifier</name>
-      <name>java.nio.file.WatchEvent.Modifier</name>
-      <name>java.time.format.TextStyle</name>
-      <name>java.util.Observable</name>
-      <name>org.w3c.dom.Text</name>
-    </excluded-names>
-  </component>
-</project>

.idea/codeStyles/Project.xml

@@ -0,0 +1,143 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <option name="LINE_SEPARATOR" value="&#10;" />
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value />
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="100" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="100" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <codeStyleSettings language="XML">
+      <option name="FORCE_REARRANGE_MODE" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,20 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="previewFile" value="true" />
+    </inspection_tool>
+  </profile>
+</component>

.idea/jarRepositories.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://dl.bintray.com/kotlin/kotlinx" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="maven" />
+      <option name="name" value="maven" />
+      <option name="url" value="https://maven.pkg.jetbrains.space/public/p/compose/dev" />
+    </remote-repository>
+  </component>
+</project>

.idea/kotlinScripting.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinScriptingSettings">
+    <option name="suppressDefinitionsCheck" value="true" />
+  </component>
+</project>

.idea/ktfmt.xml

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

.rgignore

@@ -1,2 +0,0 @@
-*.json
-baseline-prof.txt

CHANGELOG.md

@@ -1,104 +0,0 @@
-# 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.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/1.9.0...HEAD
-
-[1.9.0]: https://github.com/msfjarvis/compose-lobsters/compare/1.8.0...1.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

HACKING.md

@@ -0,0 +1,17 @@
+# Hacking on compose-lobsters
+
+This app is built as a very lightweight frontend for [lobste.rs](https://lobste.rs), mainly as an experiment in using [Jetpack Compose](https://d.android.com/jetpack/compose).
+
+The codebase is fairly simple, and the package structure follows [Buffer's](https://buffer.com/resources/android-rethinking-package-structure/).
+
+## Subproject breakdown
+
+- `:api`: Retrofit-backed interface to the [lobste.rs] API
+
+- `:app`: The guts of the Android client
+
+- `:common`: Contains the abstractions we use for sharing strings and browser handling across desktop and mobile
+
+- `:database`: Database layer implemented using SQLDelight to persist saved posts
+
+- `:desktop`: Proof-of-concept desktop client that needs significantly more love than it has received so far

LICENSE

@@ -1,23 +0,0 @@
-Permission is hereby granted, free of charge, to any
-person obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without
-limitation the rights to use, copy, modify, merge,
-publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice
-shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
-TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
-SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.

PRIVACY.md

@@ -1,3 +0,0 @@
-# Privacy policy for Claw
-
-The app does not collect any information about you and thus does not share anything with me or any other third-party. The only difference between using this app versus the [lobste.rs website](https://lobste.rs/) is the `User-Agent` header which is set to `Claw/$VERSION_NAME/msfjarvis` in the app.

README.md

@@ -1,19 +1,39 @@
-# Claw for [lobste.rs](https://lobste.rs) [![CI](https://github.com/msfjarvis/compose-lobsters/actions/workflows/ci.yml/badge.svg)](https://github.com/msfjarvis/compose-lobsters/actions/workflows/ci.yml)
+# Claw for [lobste.rs](https://lobste.rs)
 
-Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs), built with [Jetpack Compose](https://developer.android.com/jetpack/compose).
+Unofficial Android app for read-only access to [lobste.rs](https://lobste.rs) community, built with [Jetpack Compose](https://developer.android.com/jetpack/compose).
 
-![Screenshots](./.github/readme_feature.png)
+Requires Android Studio 2020.3.1 Arctic Fox to work.
 
-## Download
+## Distribution
 
-<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>
+The app will be published to Google Play soon, in the mean time snapshots from the development branch are available [here](https://dl.msfjarvis.dev/Claw)
 
-Snapshots from the development branch can be obtained [here](https://github.com/msfjarvis/compose-lobsters/releases/tag/nightly).
+## Licence
 
-## License
+```
+Copyright (c) 2020 Harsh Shandilya
 
-See [LICENSE](LICENSE)
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+```

android/.gitignore

@@ -1,2 +0,0 @@
-/apk/
-/bundle/

android/build.gradle.kts

@@ -1,67 +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.
- */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
-plugins {
-  id("dev.msfjarvis.claw.android-application")
-  id("dev.msfjarvis.claw.rename-artifacts")
-  id("dev.msfjarvis.claw.kotlin-android")
-  id("dev.msfjarvis.claw.kotlin-kapt")
-  id("dev.msfjarvis.claw.versioning-plugin")
-  alias(libs.plugins.anvil)
-  alias(libs.plugins.whetstone)
-}
-
-whetstone {
-  addOns {
-    compose.set(true)
-    workManager.set(true)
-  }
-}
-
-android {
-  namespace = "dev.msfjarvis.claw.android"
-  defaultConfig { applicationId = "dev.msfjarvis.claw.android" }
-  buildFeatures { compose = true }
-  composeOptions {
-    useLiveLiterals = false
-    kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-  }
-  buildTypes {
-    create("benchmark") {
-      signingConfig = signingConfigs.getByName("debug")
-      matchingFallbacks += listOf("release")
-      isDebuggable = false
-    }
-  }
-}
-
-dependencies {
-  kapt(libs.dagger.compiler)
-  implementation(platform(libs.androidx.compose.bom))
-  implementation(libs.dagger)
-  implementation(projects.api)
-  implementation(projects.common)
-  implementation(projects.core)
-  implementation(projects.coroutineUtils)
-  implementation(projects.database)
-  implementation(projects.metadataExtractor)
-  implementation(projects.model)
-  implementation(libs.accompanist.sysuicontroller)
-  implementation(libs.androidx.activity.compose)
-  implementation(libs.androidx.compose.material)
-  implementation(libs.androidx.compose.material3)
-  implementation(libs.androidx.core.splashscreen)
-  implementation(libs.androidx.lifecycle.compose)
-  implementation(libs.androidx.navigation.compose)
-  implementation(libs.androidx.paging.compose)
-  implementation(libs.androidx.work.runtime.ktx)
-  implementation(libs.coil)
-  implementation(libs.copydown)
-  implementation(libs.kotlinx.coroutines.core)
-  implementation(libs.sqldelight.extensions.coroutines)
-}

android/lint-baseline.xml

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

android/proguard-rules-missing-classes.pro

@@ -1,11 +0,0 @@
--dontwarn android.window.OnBackInvokedCallback
--dontwarn android.window.OnBackInvokedDispatcher
--dontwarn org.bouncycastle.jsse.BCSSLParameters
--dontwarn org.bouncycastle.jsse.BCSSLSocket
--dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE

android/proguard-rules.pro

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

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

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<resources>
-  <string name="app_name">Claw β</string>
-</resources>

android/src/main/AndroidManifest.xml

@@ -1,154 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools">
-
-  <uses-permission android:name="android.permission.INTERNET" />
-  <application
-    android:name=".ClawApplication"
-    android:dataExtractionRules="@xml/data_extraction_rules"
-    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">
-    <profileable
-      android:shell="true"
-      tools:targetApi="29" />
-    <activity
-      android:name=".MainActivity"
-      android:configChanges="colorMode|density|fontScale|keyboard|keyboardHidden|layoutDirection|locale|mcc|mnc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|touchscreen|uiMode"
-      android:exported="true">
-      <intent-filter>
-        <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" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/......" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/s/....../...*" />
-        <data android:scheme="https" />
-      </intent-filter>
-      <intent-filter>
-        <action android:name="android.intent.action.VIEW" />
-
-        <category android:name="android.intent.category.DEFAULT" />
-        <category android:name="android.intent.category.BROWSABLE" />
-
-        <data android:host="lobste.rs" />
-        <data android:pathPattern="/u/......*" />
-        <data android:scheme="https" />
-      </intent-filter>
-    </activity>
-    <provider
-      android:name="androidx.startup.InitializationProvider"
-      android:authorities="${applicationId}.androidx-startup"
-      android:exported="false"
-      tools:node="merge">
-      <meta-data
-        android:name="androidx.work.WorkManagerInitializer"
-        android:value="androidx.startup"
-        tools:node="remove" />
-    </provider>
-  </application>
-</manifest>

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

@@ -1,29 +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
-
-import android.app.Application
-import com.deliveryhero.whetstone.Whetstone
-import com.deliveryhero.whetstone.app.ApplicationComponentOwner
-import com.deliveryhero.whetstone.app.ContributesAppInjector
-import dev.msfjarvis.claw.core.injection.AppPlugin
-import javax.inject.Inject
-
-@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()
-    plugins.forEach { plugin -> plugin.apply(this) }
-  }
-}

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

@@ -1,80 +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
-
-import android.app.assist.AssistContent
-import android.net.Uri
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.work.Constraints
-import androidx.work.ExistingPeriodicWorkPolicy
-import androidx.work.NetworkType
-import androidx.work.PeriodicWorkRequestBuilder
-import androidx.work.WorkManager
-import com.deliveryhero.whetstone.Whetstone
-import com.deliveryhero.whetstone.activity.ContributesActivityInjector
-import dev.msfjarvis.claw.android.ui.LobstersApp
-import dev.msfjarvis.claw.android.work.SavedPostUpdaterWorker
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import java.util.concurrent.TimeUnit
-import javax.inject.Inject
-
-@ContributesActivityInjector
-class MainActivity : ComponentActivity() {
-
-  @Inject lateinit var urlLauncher: UrlLauncher
-  @Inject lateinit var htmlConverter: HTMLConverter
-  private var webUri: String? = null
-
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    installSplashScreen()
-    Whetstone.inject(this)
-    setContent {
-      LobstersApp(
-        urlLauncher = urlLauncher,
-        htmlConverter = htmlConverter,
-        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?) {
-    super.onProvideAssistContent(outContent)
-    if (outContent != null) {
-      if (webUri != null) {
-        outContent.webUri = Uri.parse(webUri)
-      } else {
-        outContent.webUri = null
-      }
-    }
-  }
-
-  private companion object {
-    private const val POST_REFRESH_PERIOD = 24L // 24 hours
-  }
-}

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

@@ -1,40 +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 com.deliveryhero.whetstone.app.ApplicationScope
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Binds
-import dagger.Module
-import dagger.Provides
-import dev.msfjarvis.claw.util.coroutines.DefaultDispatcherProvider
-import dev.msfjarvis.claw.util.coroutines.DispatcherProvider
-import kotlinx.coroutines.CoroutineDispatcher
-
-@Module
-@ContributesTo(ApplicationScope::class)
-interface CoroutineDispatcherModule {
-
-  @Binds fun DefaultDispatcherProvider.bind(): DispatcherProvider
-
-  companion object {
-    @[Provides IODispatcher]
-    fun provideIODispatcher(dispatcherProvider: DispatcherProvider): CoroutineDispatcher {
-      return dispatcherProvider.io()
-    }
-
-    @[Provides DatabaseDispatcher]
-    fun provideDatabaseDispatcher(dispatcherProvider: DispatcherProvider): CoroutineDispatcher {
-      return dispatcherProvider.database()
-    }
-
-    @[Provides MainDispatcher]
-    fun provideMainDispatcher(dispatcherProvider: DispatcherProvider): CoroutineDispatcher {
-      return dispatcherProvider.main()
-    }
-  }
-}

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

@@ -1,29 +0,0 @@
-/*
- * Copyright © 2021 Harsh Shandilya.
- * Use of this 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.Module
-import dagger.Provides
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import io.github.furstenheim.CopyDown
-
-@Module
-@ContributesTo(ApplicationScope::class)
-object HTMLConverterModule {
-
-  @Provides
-  fun provideHTMLConverter() =
-    object : HTMLConverter {
-      private val copydown = CopyDown()
-
-      override fun convertHTMLToMarkdown(html: String): String {
-        return copydown.convert(html)
-      }
-    }
-}

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

@@ -1,25 +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 com.chimbori.crux.Crux
-import com.deliveryhero.whetstone.app.ApplicationScope
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Module
-import dagger.Provides
-import okhttp3.OkHttpClient
-
-@Module
-@ContributesTo(ApplicationScope::class)
-object MetadataExtractorModule {
-  @Provides
-  fun provideCrux(
-    okHttpClient: OkHttpClient,
-  ): Crux {
-    return Crux(okHttpClient = okHttpClient)
-  }
-}

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

@@ -1,24 +0,0 @@
-/*
- * Copyright © 2021 Harsh Shandilya.
- * Use of this 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 com.deliveryhero.whetstone.ForScope
-import com.deliveryhero.whetstone.activity.ActivityScope
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Module
-import dagger.Provides
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-
-@Module
-@ContributesTo(ActivityScope::class)
-object UrlLauncherModule {
-  @Provides
-  fun provideUrlLauncher(@ForScope(ActivityScope::class) context: Context): UrlLauncher {
-    return UrlLauncher(context)
-  }
-}

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/paging/LobstersPagingSource.kt

@@ -1,53 +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.paging
-
-import androidx.paging.PagingSource
-import androidx.paging.PagingState
-import com.slack.eithernet.ApiResult.Failure
-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.model.LobstersPost
-import java.io.IOException
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-
-class LobstersPagingSource
-@AssistedInject
-constructor(
-  @Assisted private val remoteFetcher: RemoteFetcher<LobstersPost>,
-  @IODispatcher private val ioDispatcher: CoroutineDispatcher,
-) : PagingSource<Int, LobstersPost>() {
-
-  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
-    val page = params.key ?: 1
-    return when (val result = withContext(ioDispatcher) { remoteFetcher.getItemsAtPage(page) }) {
-      is Success ->
-        LoadResult.Page(
-          data = result.value,
-          prevKey = if (page == 1) null else page - 1,
-          nextKey = page.plus(1)
-        )
-      is Failure.NetworkFailure -> LoadResult.Error(result.error)
-      is Failure.UnknownFailure -> LoadResult.Error(result.error)
-      is Failure.HttpFailure,
-      is Failure.ApiFailure -> LoadResult.Error(IOException("API returned an invalid response"))
-    }
-  }
-
-  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int {
-    return state.pages.size + 1
-  }
-
-  @AssistedFactory
-  interface Factory {
-    fun create(remoteFetcher: RemoteFetcher<LobstersPost>): LobstersPagingSource
-  }
-}

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

@@ -1,14 +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.paging
-
-import com.slack.eithernet.ApiResult
-
-/** SAM interface to abstract over a remote API that fetches paginated content. */
-fun interface RemoteFetcher<T> {
-  suspend fun getItemsAtPage(page: Int): ApiResult<List<T>, Unit>
-}

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

@@ -1,233 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui
-
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.SideEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.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.text.font.FontWeight
-import androidx.navigation.NavType
-import androidx.navigation.compose.NavHost
-import androidx.navigation.compose.composable
-import androidx.navigation.compose.currentBackStackEntryAsState
-import androidx.navigation.compose.rememberNavController
-import androidx.navigation.navArgument
-import androidx.navigation.navDeepLink
-import androidx.paging.compose.collectAsLazyPagingItems
-import com.deliveryhero.whetstone.compose.injectedViewModel
-import com.google.accompanist.systemuicontroller.rememberSystemUiController
-import dev.msfjarvis.claw.android.R
-import dev.msfjarvis.claw.android.ui.decorations.ClawNavigationBar
-import dev.msfjarvis.claw.android.ui.decorations.NavigationItem
-import dev.msfjarvis.claw.android.ui.lists.DatabasePosts
-import dev.msfjarvis.claw.android.ui.lists.NetworkPosts
-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.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun LobstersApp(
-  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
-  setWebUri: (String?) -> Unit,
-  modifier: Modifier = Modifier,
-  viewModel: ClawViewModel = injectedViewModel(),
-) {
-  val systemUiController = rememberSystemUiController()
-  val hottestListState = rememberLazyListState()
-  val newestListState = rememberLazyListState()
-  val savedListState = rememberLazyListState()
-  val navController = rememberNavController()
-  val coroutineScope = rememberCoroutineScope()
-  val postActions = rememberPostActions(urlLauncher, navController, viewModel)
-  val backStackEntry by navController.currentBackStackEntryAsState()
-  val currentDestination = backStackEntry?.destination?.route
-  val context = LocalContext.current
-
-  val hottestPosts = viewModel.hottestPosts.collectAsLazyPagingItems()
-  val newestPosts = viewModel.newestPosts.collectAsLazyPagingItems()
-  val savedPosts by viewModel.savedPosts.collectAsState(emptyMap())
-
-  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(
-        NavigationItem(
-          label = "Hottest",
-          route = Destinations.Hottest.route,
-          icon = ClawIcons.Flame,
-          selectedIcon = ClawIcons.FlameFilled,
-        ) {
-          coroutineScope.launch { hottestListState.animateScrollToItem(index = 0) }
-        },
-        NavigationItem(
-          label = "Newest",
-          route = Destinations.Newest.route,
-          icon = ClawIcons.New,
-          selectedIcon = ClawIcons.NewFilled,
-        ) {
-          coroutineScope.launch { newestListState.animateScrollToItem(index = 0) }
-        },
-        NavigationItem(
-          label = "Saved",
-          route = Destinations.Saved.route,
-          icon = ClawIcons.HeartBorder,
-          selectedIcon = ClawIcons.Heart,
-        ) {
-          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)
-    }
-
-    Scaffold(
-      topBar = {
-        ClawAppBar(
-          backgroundColor = systemBarsColor,
-          navigationIcon = {
-            if (navItems.none { it.route == currentDestination }) {
-              IconButton(
-                onClick = { if (!navController.popBackStack()) context.getActivity()?.finish() }
-              ) {
-                Icon(
-                  painter = ClawIcons.ArrowBack,
-                  contentDescription = "Go back to previous screen",
-                )
-              }
-            }
-          },
-          title = {
-            if (navItems.any { it.route == currentDestination }) {
-              Text(text = stringResource(R.string.app_name), fontWeight = FontWeight.Bold)
-            }
-          },
-        )
-      },
-      bottomBar = {
-        ClawNavigationBar(
-          navController = navController,
-          items = navItems,
-          isVisible = navItems.any { it.route == currentDestination },
-        )
-      },
-      modifier = modifier,
-    ) { paddingValues ->
-      NavHost(
-        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/" }),
-        ) {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            lazyPagingItems = hottestPosts,
-            listState = hottestListState,
-            isPostSaved = viewModel::isPostSaved,
-            reloadPosts = viewModel::refreshHottestPosts,
-            postActions = postActions,
-          )
-        }
-        composable(
-          route = Destinations.Newest.route,
-        ) {
-          setWebUri("https://lobste.rs/")
-          NetworkPosts(
-            lazyPagingItems = 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,
-          )
-        }
-      }
-    }
-  }
-}

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

@@ -1,89 +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.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.slideInVertically
-import androidx.compose.animation.slideOutVertically
-import androidx.compose.material3.Icon
-import androidx.compose.material3.NavigationBar
-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.navigation.NavController
-import dev.msfjarvis.claw.android.ui.navigation.Destinations
-
-private const val AnimationDuration = 100
-
-@Composable
-fun ClawNavigationBar(
-  navController: NavController,
-  items: List<NavigationItem>,
-  isVisible: Boolean,
-  modifier: Modifier = Modifier,
-) {
-  AnimatedVisibility(
-    visible = isVisible,
-    enter =
-      slideInVertically(
-        // Enters by sliding up from offset 0 to fullHeight.
-        initialOffsetY = { fullHeight -> fullHeight },
-        animationSpec = tween(durationMillis = AnimationDuration, easing = LinearOutSlowInEasing),
-      ),
-    exit =
-      slideOutVertically(
-        // Exits by sliding up from offset 0 to -fullHeight.
-        targetOffsetY = { fullHeight -> fullHeight },
-        animationSpec = tween(durationMillis = AnimationDuration, easing = FastOutLinearInEasing),
-      ),
-    modifier = Modifier,
-  ) {
-    NavigationBar(modifier = modifier) {
-      items.forEach { navItem ->
-        val isCurrentDestination = navController.currentDestination?.route == navItem.route
-        NavigationBarItem(
-          icon = {
-            Crossfade(isCurrentDestination) {
-              Icon(
-                painter = if (it) navItem.selectedIcon else navItem.icon,
-                contentDescription = navItem.label.uppercase()
-              )
-            }
-          },
-          label = { Text(text = navItem.label) },
-          selected = isCurrentDestination,
-          onClick = {
-            if (isCurrentDestination) {
-              navItem.listStateResetCallback()
-              return@NavigationBarItem
-            }
-            navController.graph.startDestinationRoute?.let { startDestination ->
-              navController.popBackStack(startDestination, false)
-            }
-            if (navItem.route != Destinations.startDestination.route) {
-              navController.navigate(navItem.route)
-            }
-          }
-        )
-      }
-    }
-  }
-}
-
-class NavigationItem(
-  val label: String,
-  val route: String,
-  val icon: Painter,
-  val selectedIcon: Painter,
-  val listStateResetCallback: () -> Unit,
-)

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

@@ -1,82 +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.ui
-
-import android.content.Context
-import android.content.ContextWrapper
-import androidx.activity.ComponentActivity
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.navigation.NavController
-import dev.msfjarvis.claw.android.ui.navigation.Destinations
-import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.common.posts.PostActions
-import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
-import dev.msfjarvis.claw.database.local.SavedPost
-import dev.msfjarvis.claw.model.LinkMetadata
-import dev.msfjarvis.claw.model.LobstersPostDetails
-import java.time.LocalDateTime
-import java.time.format.DateTimeFormatter
-
-fun Context.getActivity(): ComponentActivity? {
-  return when (this) {
-    is ComponentActivity -> this
-    is ContextWrapper -> baseContext.getActivity()
-    else -> null
-  }
-}
-
-/**
- * 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,
-  navController: NavController,
-  viewModel: ClawViewModel,
-): PostActions {
-  return remember {
-    object : PostActions {
-      override fun viewPost(postUrl: String, commentsUrl: String) {
-        urlLauncher.openUri(postUrl.ifEmpty { commentsUrl })
-      }
-
-      override fun viewComments(postId: String) {
-        navController.navigate(
-          Destinations.Comments.route.replace(Destinations.Comments.placeholder, postId)
-        )
-      }
-
-      override fun viewCommentsPage(commentsUrl: String) {
-        // Post links from lobste.rs are of the form $baseUrl/s/$postId/$postTitle
-        // Interestingly, lobste.rs does not actually care for the value of $postTitle, and will
-        // happily accept both a missing as well as a completely arbitrary $postTitle. We
-        // leverage this to create a new URL format which looks like
-        // $baseUrl/s/$postId/$postTitle/r, and does not trigger our deeplinks,
-        // instead opening in the custom tab as we want it to.
-        urlLauncher.openUri(commentsUrl.replaceAfterLast('/', "r"))
-      }
-
-      override fun toggleSave(post: SavedPost) {
-        viewModel.toggleSave(post)
-      }
-
-      override suspend fun getComments(postId: String): LobstersPostDetails {
-        return viewModel.getPostComments(postId)
-      }
-
-      override suspend fun getLinkMetadata(url: String): LinkMetadata {
-        return viewModel.getLinkMetadata(url)
-      }
-    }
-  }
-}

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

@@ -1,46 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui.lists
-
-import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.LazyListState
-import androidx.compose.foundation.lazy.items
-import androidx.compose.material3.Divider
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-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
-
-@OptIn(ExperimentalFoundationApi::class)
-@Composable
-fun DatabasePosts(
-  items: Map<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,
-        )
-
-        Divider()
-      }
-    }
-  }
-}

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

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

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

@@ -1,93 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui.lists
-
-import androidx.compose.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 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(
-  lazyPagingItems: LazyPagingItems<LobstersPost>,
-  listState: LazyListState,
-  isPostSaved: suspend (SavedPost) -> Boolean,
-  reloadPosts: () -> Unit,
-  postActions: PostActions,
-  modifier: Modifier = Modifier,
-) {
-  val refreshLoadState = lazyPagingItems.loadState.refresh
-  val isRefreshing = refreshLoadState == LoadState.Loading
-  val pullRefreshState = rememberPullRefreshState(isRefreshing, reloadPosts)
-  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),
-      )
-    } else {
-      LazyColumn(
-        state = listState,
-      ) {
-        items(lazyPagingItems) { item ->
-          if (item != null) {
-            val dbModel = item.toDbModel()
-            ListItem(
-              item = dbModel,
-              isSaved = isPostSaved,
-              postActions = postActions,
-            )
-
-            Divider()
-          }
-        }
-        if (lazyPagingItems.loadState.append == LoadState.Loading) {
-          item {
-            ProgressBar(
-              modifier =
-                Modifier.fillMaxWidth()
-                  .wrapContentWidth(Alignment.CenterHorizontally)
-                  .padding(top = 4.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,38 +0,0 @@
-/*
- * Copyright © 2021-2022 Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui.navigation
-
-sealed class Destinations {
-  abstract val route: String
-
-  object Hottest : Destinations() {
-    override val route = "hottest"
-  }
-
-  object Newest : Destinations() {
-    override val route = "newest"
-  }
-
-  object Saved : Destinations() {
-    override val route = "saved"
-  }
-
-  object Comments : Destinations() {
-    const val placeholder = "{postId}"
-    override val route = "comments/$placeholder"
-  }
-
-  object User : Destinations() {
-    const val placeholder = "{username}"
-    override val route = "user/$placeholder"
-  }
-
-  companion object {
-    val startDestination
-      get() = Hottest
-  }
-}

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

@@ -1,115 +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.viewmodel
-
-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 dev.msfjarvis.claw.android.injection.IODispatcher
-import dev.msfjarvis.claw.android.paging.LobstersPagingSource
-import dev.msfjarvis.claw.android.ui.toLocalDateTime
-import dev.msfjarvis.claw.api.LobstersApi
-import dev.msfjarvis.claw.database.local.SavedPost
-import java.io.IOException
-import java.time.Month
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-@ContributesViewModel
-class ClawViewModel
-@Inject
-constructor(
-  private val api: LobstersApi,
-  private val savedPostsRepository: SavedPostsRepository,
-  private val linkMetadataRepository: LinkMetadataRepository,
-  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 }
-    }
-  private val newestPostsPager =
-    Pager(PagingConfig(20)) {
-      pagingSourceFactory.create(api::getHottestPosts).also { newestPostsPagingSource = it }
-    }
-
-  val hottestPosts
-    get() = hottestPostsPager.flow
-
-  val newestPosts
-    get() = newestPostsPager.flow
-
-  private val savedPostsFlow
-    get() = savedPostsRepository.savedPosts
-
-  val savedPosts
-    get() = savedPostsFlow.map(::mapSavedPosts)
-
-  private fun mapSavedPosts(items: List<SavedPost>): Map<Month, List<SavedPost>> {
-    val sorted = items.sortedByDescending { post -> post.createdAt.toLocalDateTime() }
-    return sorted.groupBy { post -> post.createdAt.toLocalDateTime().month }
-  }
-
-  suspend fun isPostSaved(post: SavedPost): Boolean {
-    return savedPostsFlow.first().any { savedPost -> savedPost.shortId == post.shortId }
-  }
-
-  fun toggleSave(post: SavedPost) {
-    viewModelScope.launch(ioDispatcher) {
-      val saved = isPostSaved(post)
-      if (saved) {
-        savedPostsRepository.removePost(post)
-      } else {
-        savedPostsRepository.savePost(post)
-      }
-    }
-  }
-
-  suspend fun getPostComments(postId: String) =
-    withContext(ioDispatcher) {
-      when (val result = api.getPostDetails(postId)) {
-        is Success -> result.value
-        is Failure.NetworkFailure -> throw result.error
-        is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure,
-        is Failure.ApiFailure -> throw IOException("API returned an invalid response")
-      }
-    }
-
-  suspend fun getLinkMetadata(url: String) =
-    withContext(ioDispatcher) { linkMetadataRepository.getLinkMetadata(url) }
-
-  suspend fun getUserProfile(username: String) =
-    withContext(ioDispatcher) {
-      when (val result = api.getUser(username)) {
-        is Success -> result.value
-        is Failure.NetworkFailure -> throw result.error
-        is Failure.UnknownFailure -> throw result.error
-        is Failure.HttpFailure,
-        is Failure.ApiFailure -> throw IOException("API returned an invalid response")
-      }
-    }
-
-  fun refreshHottestPosts() {
-    hottestPostsPagingSource?.invalidate()
-  }
-
-  fun refreshNewestPosts() {
-    newestPostsPagingSource?.invalidate()
-  }
-}

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

@@ -1,21 +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.viewmodel
-
-import dev.msfjarvis.claw.metadata.MetadataExtractor
-import dev.msfjarvis.claw.model.LinkMetadata
-import javax.inject.Inject
-
-class LinkMetadataRepository
-@Inject
-constructor(
-  private val metadataExtractor: MetadataExtractor,
-) {
-  suspend fun getLinkMetadata(url: String): LinkMetadata {
-    return metadataExtractor.getExtractedMetadata(url)
-  }
-}

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

@@ -1,41 +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.viewmodel
-
-import app.cash.sqldelight.coroutines.asFlow
-import app.cash.sqldelight.coroutines.mapToList
-import dev.msfjarvis.claw.android.injection.DatabaseDispatcher
-import dev.msfjarvis.claw.database.LobstersDatabase
-import dev.msfjarvis.claw.database.local.SavedPost
-import io.github.aakira.napier.Napier
-import javax.inject.Inject
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-
-class SavedPostsRepository
-@Inject
-constructor(
-  database: LobstersDatabase,
-  @DatabaseDispatcher private val dbDispatcher: CoroutineDispatcher,
-) {
-  private val savedPostQueries = database.savedPostQueries
-  val savedPosts = savedPostQueries.selectAllPosts().asFlow().mapToList(dbDispatcher)
-
-  suspend fun savePost(post: SavedPost) {
-    Napier.d(tag = TAG) { "Saving post: ${post.shortId}" }
-    withContext(dbDispatcher) { savedPostQueries.insertOrReplacePost(post) }
-  }
-
-  suspend fun removePost(post: SavedPost) {
-    Napier.d(tag = TAG) { "Removing post: ${post.shortId}" }
-    withContext(dbDispatcher) { savedPostQueries.deletePost(post.shortId) }
-  }
-
-  private companion object {
-    private const val TAG = "SavedPostsRepository"
-  }
-}

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

@@ -1,56 +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.work
-
-import android.content.Context
-import androidx.work.CoroutineWorker
-import androidx.work.WorkerParameters
-import com.deliveryhero.whetstone.ForScope
-import com.deliveryhero.whetstone.worker.ContributesWorker
-import com.deliveryhero.whetstone.worker.WorkerScope
-import com.slack.eithernet.ApiResult
-import dev.msfjarvis.claw.android.viewmodel.SavedPostsRepository
-import dev.msfjarvis.claw.api.LobstersApi
-import dev.msfjarvis.claw.common.posts.toDbModel
-import javax.inject.Inject
-import kotlinx.coroutines.async
-import kotlinx.coroutines.awaitAll
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.supervisorScope
-
-/**
- * WorkManager-backed [CoroutineWorker] that gets all the posts from [SavedPostsRepository], fetches
- * their newest state using the [LobstersApi] and then writes them back to the database. This allows
- * 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.
- */
-@ContributesWorker
-class SavedPostUpdaterWorker
-@Inject
-constructor(
-  @ForScope(WorkerScope::class) appContext: Context,
-  workerParams: WorkerParameters,
-  private val savedPostsRepository: SavedPostsRepository,
-  private val lobstersApi: LobstersApi,
-) : CoroutineWorker(appContext, workerParams) {
-  override suspend fun doWork(): Result {
-    val posts = savedPostsRepository.savedPosts.first()
-    supervisorScope {
-      posts
-        .map { post ->
-          async {
-            val details = lobstersApi.getPostDetails(post.shortId)
-            if (details is ApiResult.Success) {
-              savedPostsRepository.savePost(details.value.toDbModel())
-            }
-          }
-        }
-        .awaitAll()
-    }
-    return Result.success()
-  }
-}

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

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

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

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

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

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

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

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<data-extraction-rules>
-  <cloud-backup>
-    <include
-      domain="database"
-      path="databases" />
-  </cloud-backup>
-
-  <device-transfer>
-    <include
-      domain="database"
-      path="databases" />
-  </device-transfer>
-</data-extraction-rules>

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

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<full-backup-content>
-  <include
-    domain="database"
-    path="databases" />
-</full-backup-content>

android/version.properties

@@ -1,5 +0,0 @@
-#
-# This file was automatically generated by 'versioning-plugin'. DO NOT EDIT MANUALLY.
-#
-versioning-plugin.versionCode=10900
-versioning-plugin.versionName=1.9.0

api/build.gradle.kts

@@ -1,32 +1,14 @@
-/*
- * 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.
- */
-@file:Suppress("DSL_SCOPE_VIOLATION", "UnstableApiUsage")
-
 plugins {
-  kotlin("android")
-  id("dev.msfjarvis.claw.kotlin-common")
-  id("dev.msfjarvis.claw.android-library")
-  alias(libs.plugins.anvil)
-  alias(libs.plugins.whetstone)
+  kotlin("jvm")
+  id("com.google.devtools.ksp")
+  `lobsters-plugin`
 }
 
-android { namespace = "dev.msfjarvis.claw.api" }
-
-anvil { generateDaggerFactories.set(true) }
-
 dependencies {
-  api(projects.model)
-  api(libs.retrofit)
-  api(libs.eithernet)
-  implementation(libs.dagger)
-  implementation(libs.javax.inject)
-  testImplementation(testFixtures(libs.eithernet))
-  testImplementation(kotlin("test-junit"))
-  testImplementation(libs.kotlinx.coroutines.core)
-  testImplementation(libs.kotlinx.serialization.json)
-  testImplementation(libs.retrofit.kotlinxSerializationConverter)
+  api(libs.thirdparty.retrofit.lib)
+  ksp(libs.thirdparty.moshix.ksp)
+  implementation(libs.thirdparty.retrofit.moshiConverter)
+  testImplementation(libs.kotlin.coroutines.core)
+  testImplementation(libs.testing.kotlintest.junit)
+  testImplementation(libs.testing.mockWebServer)
 }

api/lint-baseline.xml

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

api/src/main/java/dev/msfjarvis/lobsters/data/api/LobstersApi.kt

@@ -0,0 +1,22 @@
+package dev.msfjarvis.lobsters.data.api
+
+import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.model.LobstersPostDetails
+import retrofit2.http.GET
+import retrofit2.http.Path
+import retrofit2.http.Query
+
+/** Simple interface defining an API for lobste.rs */
+interface LobstersApi {
+
+  @GET("hottest.json") suspend fun getHottestPosts(@Query("page") page: Int): List<LobstersPost>
+
+  @GET("newest.json") suspend fun getNewestPosts(@Query("page") page: Int): List<LobstersPost>
+
+  @GET("s/{postId}.json")
+  suspend fun getPostDetails(@Path("postId") postId: String): LobstersPostDetails
+
+  companion object {
+    const val BASE_URL = "https://lobste.rs"
+  }
+}

api/src/main/java/dev/msfjarvis/lobsters/model/Comment.kt

@@ -0,0 +1,20 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class Comment(
+  @Json(name = "short_id") val shortId: String,
+  @Json(name = "short_id_url") val shortIdUrl: String,
+  @Json(name = "created_at") val createdAt: String,
+  @Json(name = "updated_at") val updatedAt: String,
+  @Json(name = "is_deleted") val isDeleted: Boolean,
+  @Json(name = "is_moderated") val isModerated: Boolean,
+  val score: Long,
+  val flags: Long,
+  val comment: String,
+  val url: String,
+  @Json(name = "indent_level") val indentLevel: Long,
+  @Json(name = "commenting_user") val user: User,
+)

api/src/main/java/dev/msfjarvis/lobsters/model/KeybaseSignature.kt

@@ -0,0 +1,10 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class KeybaseSignature(
+  @Json(name = "kb_username") val kbUsername: String,
+  @Json(name = "sig_hash") val sigHash: String,
+)

api/src/main/java/dev/msfjarvis/lobsters/model/LobstersPost.kt

@@ -0,0 +1,20 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class LobstersPost(
+  @Json(name = "short_id") val shortId: String,
+  @Json(name = "short_id_url") val shortIdUrl: String,
+  @Json(name = "created_at") val createdAt: String,
+  val title: String,
+  val url: String,
+  val score: Long,
+  val flags: Long,
+  @Json(name = "comment_count") val commentCount: Long,
+  val description: String,
+  @Json(name = "comments_url") val commentsUrl: String,
+  @Json(name = "submitter_user") val submitter: User,
+  val tags: List<String>,
+)

api/src/main/java/dev/msfjarvis/lobsters/model/LobstersPostDetails.kt

@@ -0,0 +1,21 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class LobstersPostDetails(
+  @Json(name = "short_id") val shortId: String,
+  @Json(name = "short_id_url") val shortIdUrl: String,
+  @Json(name = "created_at") val createdAt: String,
+  val title: String,
+  val url: String,
+  val score: Long,
+  val flags: Long,
+  @Json(name = "comment_count") val commentCount: Long,
+  val description: String,
+  @Json(name = "comments_url") val commentsUrl: String,
+  @Json(name = "submitter_user") val submitter: User,
+  val tags: List<String>,
+  val comments: List<Comment>,
+)

api/src/main/java/dev/msfjarvis/lobsters/model/User.kt

@@ -0,0 +1,19 @@
+package dev.msfjarvis.lobsters.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+class User(
+  val username: String,
+  @Json(name = "created_at") val createdAt: String,
+  @Json(name = "is_admin") val isAdmin: Boolean,
+  val about: String,
+  @Json(name = "is_moderator") val isModerator: Boolean,
+  val karma: Long = 0,
+  @Json(name = "avatar_url") val avatarUrl: String,
+  @Json(name = "invited_by_user") val invitedByUser: String,
+  @Json(name = "github_username") val githubUsername: String? = null,
+  @Json(name = "twitter_username") val twitterUsername: String? = null,
+  @Json(name = "keybase_signatures") val keybaseSignatures: List<KeybaseSignature> = emptyList(),
+)

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

@@ -1,35 +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.api
-
-import com.slack.eithernet.ApiResult
-import dev.msfjarvis.claw.model.LobstersPost
-import dev.msfjarvis.claw.model.LobstersPostDetails
-import dev.msfjarvis.claw.model.User
-import retrofit2.http.GET
-import retrofit2.http.Path
-import retrofit2.http.Query
-
-/** Simple interface defining an API for lobste.rs */
-interface LobstersApi {
-
-  @GET("hottest.json")
-  suspend fun getHottestPosts(@Query("page") page: Int): ApiResult<List<LobstersPost>, Unit>
-
-  @GET("newest.json")
-  suspend fun getNewestPosts(@Query("page") page: Int): ApiResult<List<LobstersPost>, Unit>
-
-  @GET("s/{postId}.json")
-  suspend fun getPostDetails(@Path("postId") postId: String): ApiResult<LobstersPostDetails, Unit>
-
-  @GET("u/{username}.json")
-  suspend fun getUser(@Path("username") username: String): ApiResult<User, Unit>
-
-  companion object {
-    const val BASE_URL = "https://lobste.rs"
-  }
-}

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

@@ -1,42 +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.api.injection
-
-import com.deliveryhero.whetstone.app.ApplicationScope
-import com.slack.eithernet.ApiResultCallAdapterFactory
-import com.slack.eithernet.ApiResultConverterFactory
-import com.squareup.anvil.annotations.ContributesTo
-import dagger.Module
-import dagger.Provides
-import dev.msfjarvis.claw.api.LobstersApi
-import okhttp3.OkHttpClient
-import retrofit2.Converter
-import retrofit2.Retrofit
-import retrofit2.create
-
-@Module
-@ContributesTo(ApplicationScope::class)
-object ApiModule {
-  @Provides
-  fun provideRetrofit(
-    client: OkHttpClient,
-    converterFactories: Set<@JvmSuppressWildcards Converter.Factory>,
-  ): Retrofit {
-    return Retrofit.Builder()
-      .client(client)
-      .baseUrl(LobstersApi.BASE_URL)
-      .addConverterFactory(ApiResultConverterFactory)
-      .addCallAdapterFactory(ApiResultCallAdapterFactory)
-      .apply { converterFactories.forEach(this::addConverterFactory) }
-      .build()
-  }
-
-  @Provides
-  fun provideApi(retrofit: Retrofit): LobstersApi {
-    return retrofit.create()
-  }
-}

api/src/test/java/dev/msfjarvis/lobsters/data/api/LobstersApiTest.kt

@@ -0,0 +1,89 @@
+package dev.msfjarvis.lobsters.data.api
+
+import com.squareup.moshi.Moshi
+import dev.msfjarvis.lobsters.util.TestUtils
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+import kotlin.test.fail
+import kotlinx.coroutines.runBlocking
+import mockwebserver3.Dispatcher
+import mockwebserver3.MockResponse
+import mockwebserver3.MockWebServer
+import mockwebserver3.RecordedRequest
+import okhttp3.OkHttpClient
+import org.junit.AfterClass
+import org.junit.BeforeClass
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.create
+
+class LobstersApiTest {
+
+  companion object {
+    private val webServer = MockWebServer()
+    private val moshi = Moshi.Builder().build()
+    private val okHttp = OkHttpClient.Builder().build()
+    private val retrofit =
+      Retrofit.Builder()
+        .client(okHttp)
+        .baseUrl("http://localhost:8080/")
+        .addConverterFactory(MoshiConverterFactory.create(moshi))
+        .build()
+    private val apiClient = retrofit.create<LobstersApi>()
+
+    @JvmStatic
+    @BeforeClass
+    fun setUp() {
+      webServer.start(8080)
+      webServer.dispatcher =
+        object : Dispatcher() {
+          override fun dispatch(request: RecordedRequest): MockResponse {
+            val path = requireNotNull(request.path)
+            return when {
+              path.startsWith("/hottest") ->
+                MockResponse().setBody(TestUtils.getJson("hottest.json")).setResponseCode(200)
+              path.startsWith("/s/") ->
+                MockResponse()
+                  .setBody(TestUtils.getJson("post_details_d9ucpe.json"))
+                  .setResponseCode(200)
+              else -> fail("'$path' unexpected")
+            }
+          }
+        }
+    }
+
+    @JvmStatic
+    @AfterClass
+    fun tearDown() {
+      webServer.shutdown()
+    }
+  }
+
+  @Test
+  fun `api gets correct number of items`() = runBlocking {
+    val posts = apiClient.getHottestPosts(1)
+    assertEquals(25, posts.size)
+  }
+
+  @Test
+  fun `no moderator posts in test data`() = runBlocking {
+    val posts = apiClient.getHottestPosts(1)
+    val moderatorPosts = posts.asSequence().filter { it.submitter.isModerator }.toSet()
+    assertTrue(moderatorPosts.isEmpty())
+  }
+
+  @Test
+  fun `posts with no urls`() = runBlocking {
+    val posts = apiClient.getHottestPosts(1)
+    val commentsOnlyPosts = posts.asSequence().filter { it.url.isEmpty() }.toSet()
+    assertEquals(2, commentsOnlyPosts.size)
+  }
+
+  @Test
+  fun `post details with comments`() = runBlocking {
+    val postDetails = apiClient.getPostDetails("d9ucpe")
+    assertEquals(7, postDetails.commentCount)
+    assertEquals(7, postDetails.comments.size)
+  }
+}

api/src/test/java/dev/msfjarvis/lobsters/util/TestUtils.kt

@@ -1,10 +1,4 @@
-/*
- * Copyright © 2021 Harsh Shandilya.
- * Use of this 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
+package dev.msfjarvis.lobsters.util
 
 import java.io.File
 

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

@@ -1,52 +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.api
-
-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.User
-import kotlin.test.Test
-import kotlin.test.assertEquals
-import kotlin.test.assertIs
-import kotlinx.coroutines.runBlocking
-
-class ApiTest {
-  private val wrapper = ApiWrapper(newEitherNetController())
-  private val api
-    get() = wrapper.api
-
-  @Test
-  fun `api gets correct number of items`() = runBlocking {
-    val posts = api.getHottestPosts(1)
-    assertIs<Success<List<LobstersPost>>>(posts)
-    assertEquals(25, posts.value.size)
-  }
-
-  @Test
-  fun `posts with no urls`() = runBlocking {
-    val posts = api.getHottestPosts(1)
-    assertIs<Success<List<LobstersPost>>>(posts)
-    val commentsOnlyPosts = posts.value.asSequence().filter { it.url.isEmpty() }.toSet()
-    assertEquals(2, commentsOnlyPosts.size)
-  }
-
-  @Test
-  fun `post details with comments`() = runBlocking {
-    val postDetails = api.getPostDetails("tdfoqh")
-    assertIs<Success<LobstersPostDetails>>(postDetails)
-    assertEquals(7, postDetails.value.comments.size)
-  }
-
-  @Test
-  fun `get user details`() = runBlocking {
-    val user = api.getUser("msfjarvis")
-    assertIs<Success<User>>(user)
-    assertEquals("msfjarvis", user.value.username)
-  }
-}

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

@@ -1,34 +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.api
-
-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.User
-import dev.msfjarvis.claw.util.TestUtils.getJson
-import kotlinx.serialization.decodeFromString
-import kotlinx.serialization.json.Json
-
-class ApiWrapper(controller: EitherNetController<LobstersApi>) {
-  private val json = Json { ignoreUnknownKeys = true }
-  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"))
-
-  val api = controller.api
-
-  init {
-    controller.enqueue(LobstersApi::getHottestPosts) { success(hottest) }
-    controller.enqueue(LobstersApi::getNewestPosts) { success(hottest) }
-    controller.enqueue(LobstersApi::getPostDetails) { success(postDetails) }
-    controller.enqueue(LobstersApi::getUser) { success(user) }
-  }
-}

api/src/test/resources/msfjarvis.json

@@ -1 +0,0 @@
-{"username":"msfjarvis","created_at":"2020-04-24T11:41:56.000-05:00","is_admin":false,"about":"Android and Kotlin developer\r\n","is_moderator":false,"karma":574,"avatar_url":"/avatars/msfjarvis-100.png","invited_by_user":"Amolith","github_username":"msfjarvis","twitter_username":"msfjarvis"}

app/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+  id("com.android.application")
+  kotlin("android")
+  kotlin("kapt")
+  id("dagger.hilt.android.plugin")
+  id("org.jetbrains.compose")
+  `versioning-plugin`
+  `lobsters-plugin`
+  `core-library-desugaring`
+}
+
+android { defaultConfig { applicationId = "dev.msfjarvis.lobsters" } }
+
+dependencies {
+  kapt(libs.androidx.hilt.daggerCompiler)
+  implementation(projects.api)
+  implementation(projects.common)
+  implementation(projects.database)
+  implementation(libs.androidx.appcompat)
+  implementation(libs.androidx.browser)
+  implementation(libs.androidx.datastore)
+  implementation(libs.androidx.compose.activity)
+  implementation(libs.androidx.compose.foundation)
+  implementation(libs.androidx.compose.lifecycleViewModel)
+  implementation(libs.androidx.compose.material)
+  implementation(libs.androidx.compose.navigation)
+  implementation(libs.androidx.compose.paging)
+  implementation(libs.androidx.compose.uiTooling)
+  implementation(libs.androidx.hilt.dagger)
+  implementation(libs.bundles.androidxLifecycle)
+  implementation(libs.kotlin.coroutines.android)
+  implementation(libs.thirdparty.accompanist.coil)
+  implementation(libs.thirdparty.accompanist.flow)
+  implementation(libs.thirdparty.moshi.lib)
+  implementation(libs.thirdparty.moshix.metadatareflect)
+  implementation(libs.thirdparty.retrofit.moshiConverter)
+  testImplementation(libs.testing.kotlintest.junit)
+  androidTestImplementation(libs.testing.kotlintest.junit)
+}

app/proguard-android-optimize.txt

@@ -16,7 +16,7 @@
 }
 
 -keepclassmembers class * implements android.os.Parcelable {
-    public static final ** CREATOR;
+  public static final ** CREATOR;
 }
 
 -keep class androidx.annotation.Keep

app/proguard-rules.pro

@@ -0,0 +1,8 @@
+-keepattributes *Annotation*, EnclosingMethod, InnerClasses
+-dontwarn org.jetbrains.kotlin.**
+-dontwarn androidx.compose.animation.tooling.ComposeAnimation
+-dontwarn android.view.RenderNode
+-dontwarn android.view.DisplayListCanvas
+-dontwarn sun.misc.Unsafe
+-dontobfuscate
+-dontoptimize

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <application>
+    <!--
+    If you don't need the activityTestRule, then you can switch to createComposeRule and add
+    an empty activity here for the test harness to launch. Not having this activity is what
+    broke my tests when I first started writing them with createComposeRule. Future me will thank
+    past me for writing this note here.
+    -->
+    <activity android:name="androidx.activity.ComponentActivity" />
+  </application>
+</manifest>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Claw β</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="dev.msfjarvis.lobsters"
+  android:sharedUserId="${applicationId}.uid">
+
+  <uses-permission android:name="android.permission.INTERNET" />
+
+  <application
+    android:name=".ClawApplication"
+    android:allowBackup="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.AppCompat.DayNight">
+    <activity
+      android:name=".ui.main.MainActivity"
+      android:exported="true"
+      android:label="@string/app_name"
+      android:theme="@style/Platform.Theme.Claw">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+      <intent-filter android:label="@string/hottest_posts">
+        <action android:name="android.intent.action.VIEW" />
+
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+
+        <data
+          android:ssp="//lobste.rs"
+          android:scheme="https" />
+
+        <data
+          android:host="lobste.rs"
+          android:scheme="https"
+          android:path="/"/>
+      </intent-filter>
+
+      <intent-filter android:label="@string/newest_posts">
+        <action android:name="android.intent.action.VIEW" />
+
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+
+        <data
+          android:host="lobste.rs"
+          android:scheme="https"
+          android:pathPrefix="/recent" />
+      </intent-filter>
+
+
+      <intent-filter android:label="@string/open_comments">
+        <action android:name="android.intent.action.VIEW" />
+
+        <category android:name="android.intent.category.DEFAULT" />
+        <category android:name="android.intent.category.BROWSABLE" />
+
+        <data
+          android:host="lobste.rs"
+          android:scheme="https"
+          android:pathPattern="/s/......"/>
+
+        <data
+          android:host="lobste.rs"
+          android:scheme="https"
+          android:pathPattern="/s/....../"/>
+
+        <data
+          android:host="lobste.rs"
+          android:scheme="https"
+          android:pathPattern="/s/....../...*"/>
+      </intent-filter>
+    </activity>
+    <activity
+      android:name=".ui.settings.SettingsActivity"
+      android:theme="@style/Platform.Theme.Claw"
+      android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+      </intent-filter>
+    </activity>
+  </application>
+
+</manifest>

app/src/main/java/dev/msfjarvis/lobsters/ClawApplication.kt

@@ -0,0 +1,6 @@
+package dev.msfjarvis.lobsters
+
+import android.app.Application
+import dagger.hilt.android.HiltAndroidApp
+
+@HiltAndroidApp class ClawApplication : Application()

app/src/main/java/dev/msfjarvis/lobsters/data/backup/BackupHandler.kt

@@ -0,0 +1,28 @@
+package dev.msfjarvis.lobsters.data.backup
+
+import com.squareup.moshi.Moshi
+import com.squareup.moshi.adapter
+import dev.msfjarvis.lobsters.data.local.SavedPost
+import dev.msfjarvis.lobsters.data.repo.LobstersRepository
+import javax.inject.Inject
+
+@OptIn(ExperimentalStdlibApi::class)
+class BackupHandler
+@Inject
+constructor(
+  private val repository: LobstersRepository,
+  moshi: Moshi,
+) {
+  private val adapter = moshi.adapter<List<SavedPost>>()
+
+  suspend fun exportSavedPosts(): ByteArray {
+    val posts = repository.getAllPostsFromCache()
+    return adapter.toJson(posts).toByteArray(Charsets.UTF_8)
+  }
+
+  suspend fun importSavedPosts(json: ByteArray) {
+    val posts = requireNotNull(adapter.fromJson(json.toString(Charsets.UTF_8)))
+    repository.addPosts(posts)
+    repository.updateCache()
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/data/preferences/ClawPreferences.kt

@@ -0,0 +1,24 @@
+package dev.msfjarvis.lobsters.data.preferences
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+
+class ClawPreferences
+@Inject
+constructor(
+  private val dataStore: DataStore<Preferences>,
+) {
+  private val sortKey = booleanPreferencesKey("post_sorting_order")
+
+  val sortingOrder: Flow<Boolean>
+    get() = dataStore.data.map { preferences -> preferences[sortKey] ?: false }
+
+  suspend fun toggleSortingOrder() {
+    dataStore.edit { preferences -> preferences[sortKey] = (preferences[sortKey] ?: false).not() }
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/data/remote/LobstersPagingSource.kt

@@ -0,0 +1,29 @@
+package dev.msfjarvis.lobsters.data.remote
+
+import androidx.paging.PagingSource
+import androidx.paging.PagingState
+import dev.msfjarvis.lobsters.model.LobstersPost
+
+class LobstersPagingSource(
+  private val getMorePosts: suspend (Int) -> List<LobstersPost>,
+) : PagingSource<Int, LobstersPost>() {
+
+  override suspend fun load(params: LoadParams<Int>): LoadResult<Int, LobstersPost> {
+    return try {
+      val page = params.key ?: 1
+      val posts = getMorePosts(page)
+
+      LoadResult.Page(
+        data = posts,
+        prevKey = if (page == 1) null else page - 1,
+        nextKey = page.plus(1)
+      )
+    } catch (e: Exception) {
+      LoadResult.Error(e)
+    }
+  }
+
+  override fun getRefreshKey(state: PagingState<Int, LobstersPost>): Int {
+    return state.pages.size + 1
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/data/repo/LobstersRepository.kt

@@ -0,0 +1,82 @@
+package dev.msfjarvis.lobsters.data.repo
+
+import dev.msfjarvis.lobsters.data.api.LobstersApi
+import dev.msfjarvis.lobsters.data.local.SavedPost
+import dev.msfjarvis.lobsters.database.LobstersDatabase
+import dev.msfjarvis.lobsters.model.LobstersPost
+import dev.msfjarvis.lobsters.model.LobstersPostDetails
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.withContext
+
+class LobstersRepository(
+  private val lobstersApi: LobstersApi,
+  private val lobstersDatabase: LobstersDatabase,
+) {
+
+  private val savedPostsCache: MutableMap<String, SavedPost> = mutableMapOf()
+  private val _isCacheReady = MutableStateFlow(false)
+  val isCacheReady = _isCacheReady.asStateFlow()
+
+  fun isPostSaved(postId: String): Boolean {
+    return savedPostsCache.containsKey(postId)
+  }
+
+  fun getAllPostsFromCache(): List<SavedPost> {
+    return savedPostsCache.values.toList()
+  }
+
+  suspend fun fetchHottestPosts(page: Int): List<LobstersPost> =
+    withContext(Dispatchers.IO) {
+      return@withContext lobstersApi.getHottestPosts(page)
+    }
+
+  suspend fun fetchNewestPosts(page: Int): List<LobstersPost> =
+    withContext(Dispatchers.IO) {
+      return@withContext lobstersApi.getNewestPosts(page)
+    }
+
+  suspend fun fetchPostDetails(postId: String): LobstersPostDetails =
+    withContext(Dispatchers.IO) {
+      return@withContext lobstersApi.getPostDetails(postId)
+    }
+
+  // https://issuetracker.google.com/issues/181221325
+  @Suppress("NewApi")
+  suspend fun updateCache() {
+    _isCacheReady.value = false
+    val posts = getSavedPosts()
+    posts.forEach { savedPostsCache[it.shortId] = it }
+    _isCacheReady.value = true
+  }
+
+  private suspend fun getSavedPosts(): List<SavedPost> =
+    withContext(Dispatchers.IO) {
+      return@withContext lobstersDatabase.savedPostQueries.selectAllPosts().executeAsList()
+    }
+
+  suspend fun addPost(post: SavedPost) =
+    withContext(Dispatchers.IO) {
+      if (!savedPostsCache.containsKey(post.shortId)) {
+        savedPostsCache.putIfAbsent(post.shortId, post)
+        lobstersDatabase.savedPostQueries.insertOrReplacePost(post)
+      }
+    }
+
+  suspend fun addPosts(posts: List<SavedPost>) {
+    withContext(Dispatchers.IO) {
+      lobstersDatabase.transaction {
+        posts.forEach { lobstersDatabase.savedPostQueries.insertOrReplacePost(it) }
+      }
+    }
+  }
+
+  suspend fun removePost(post: SavedPost) =
+    withContext(Dispatchers.IO) {
+      if (savedPostsCache.containsKey(post.shortId)) {
+        savedPostsCache.remove(post.shortId)
+        lobstersDatabase.savedPostQueries.deletePost(post.shortId)
+      }
+    }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/ApiModule.kt

@@ -0,0 +1,58 @@
+package dev.msfjarvis.lobsters.injection
+
+import android.util.Log
+import com.squareup.moshi.Moshi
+import dagger.Lazy
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dev.msfjarvis.lobsters.data.api.LobstersApi
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.moshi.MoshiConverterFactory
+import retrofit2.create
+
+@Module
+@InstallIn(SingletonComponent::class)
+object ApiModule {
+
+  @Provides
+  @BaseUrlQualifier
+  fun provideBaseUrl(): String {
+    return LobstersApi.BASE_URL
+  }
+
+  @Provides
+  fun provideClient(): OkHttpClient {
+    return OkHttpClient.Builder()
+      .addNetworkInterceptor { chain ->
+        val request = chain.request()
+        Log.d("LobstersApi", "${request.method()}: ${request.url()}")
+        chain.proceed(request)
+      }
+      .build()
+  }
+
+  /**
+   * Using [Lazy] here is a trick I picked up from Zac Sweers, which he explained in more detail
+   * here: https://www.zacsweers.dev/dagger-party-tricks-deferred-okhttp-init/
+   */
+  @Provides
+  fun provideRetrofit(
+    client: Lazy<OkHttpClient>,
+    moshi: Lazy<Moshi>,
+    @BaseUrlQualifier baseUrl: String
+  ): Retrofit {
+    return Retrofit.Builder()
+      .client(client.get())
+      .baseUrl(baseUrl)
+      .addConverterFactory(MoshiConverterFactory.create(moshi.get()))
+      .build()
+  }
+
+  @Provides
+  fun provideApi(retrofit: Retrofit): LobstersApi {
+    return retrofit.create()
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/BackupModule.kt

@@ -0,0 +1,21 @@
+package dev.msfjarvis.lobsters.injection
+
+import com.squareup.moshi.Moshi
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityComponent
+import dev.msfjarvis.lobsters.data.backup.BackupHandler
+import dev.msfjarvis.lobsters.data.repo.LobstersRepository
+
+@Module
+@InstallIn(ActivityComponent::class)
+object BackupModule {
+  @Provides
+  fun provideBackupHandler(
+    repository: LobstersRepository,
+    moshi: Moshi,
+  ): BackupHandler {
+    return BackupHandler(repository, moshi)
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/BaseUrlQualifier.kt

@@ -0,0 +1,9 @@
+package dev.msfjarvis.lobsters.injection
+
+import javax.inject.Qualifier
+
+/**
+ * Qualifier for a string value that needs to be provided to the [ApiModule.provideRetrofit] method
+ * as the base URL of our API.
+ */
+@Qualifier @Retention(AnnotationRetention.RUNTIME) annotation class BaseUrlQualifier

app/src/main/java/dev/msfjarvis/lobsters/injection/DataStoreModule.kt

@@ -0,0 +1,36 @@
+package dev.msfjarvis.lobsters.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 dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Qualifier
+
+@Qualifier
+@Retention(AnnotationRetention.RUNTIME)
+annotation class PreferenceStoreFileNameQualifier
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataStoreModule {
+
+  @Provides
+  fun provideDataStore(
+    @ApplicationContext context: Context,
+    @PreferenceStoreFileNameQualifier fileName: String,
+  ): DataStore<Preferences> {
+    return PreferenceDataStoreFactory.create { context.preferencesDataStoreFile(fileName) }
+  }
+
+  @Provides
+  @PreferenceStoreFileNameQualifier
+  fun provideDataStoreFilename(): String {
+    return "Claw_preferences"
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/DatabaseModule.kt

@@ -0,0 +1,29 @@
+package dev.msfjarvis.lobsters.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.lobsters.data.local.DriverFactory
+import dev.msfjarvis.lobsters.data.local.createDatabase
+import dev.msfjarvis.lobsters.database.LobstersDatabase
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DatabaseModule {
+
+  @Provides
+  @Singleton
+  fun providesDriverFactory(@ApplicationContext context: Context): DriverFactory {
+    return DriverFactory(context)
+  }
+
+  @Provides
+  @Singleton
+  fun providesLobstersDatabase(driverFactory: DriverFactory): LobstersDatabase {
+    return createDatabase(driverFactory)
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/MoshiModule.kt

@@ -0,0 +1,21 @@
+package dev.msfjarvis.lobsters.injection
+
+import com.squareup.moshi.Moshi
+import dagger.Module
+import dagger.Provides
+import dagger.Reusable
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dev.zacsweers.moshix.reflect.MetadataKotlinJsonAdapterFactory
+
+@Module
+@InstallIn(SingletonComponent::class)
+object MoshiModule {
+  @Provides
+  @Reusable
+  fun provideMoshi(): Moshi {
+    return Moshi.Builder()
+      .add(MetadataKotlinJsonAdapterFactory())
+      .build()
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/PreferenceModule.kt

@@ -0,0 +1,23 @@
+package dev.msfjarvis.lobsters.injection
+
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dev.msfjarvis.lobsters.data.preferences.ClawPreferences
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object PreferenceModule {
+
+  @Provides
+  @Singleton
+  fun provideClawPreferences(
+    dataStore: DataStore<Preferences>,
+  ): ClawPreferences {
+    return ClawPreferences(dataStore)
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/RepositoryModule.kt

@@ -0,0 +1,24 @@
+package dev.msfjarvis.lobsters.injection
+
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import dev.msfjarvis.lobsters.data.api.LobstersApi
+import dev.msfjarvis.lobsters.data.repo.LobstersRepository
+import dev.msfjarvis.lobsters.database.LobstersDatabase
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object RepositoryModule {
+
+  @Singleton
+  @Provides
+  fun provideLobstersRepository(
+    lobstersApi: LobstersApi,
+    lobstersDatabase: LobstersDatabase
+  ): LobstersRepository {
+    return LobstersRepository(lobstersApi, lobstersDatabase)
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/injection/UrlLauncherModule.kt

@@ -0,0 +1,18 @@
+package dev.msfjarvis.lobsters.injection
+
+import android.content.Context
+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.lobsters.ui.urllauncher.UrlLauncher
+
+@Module
+@InstallIn(ActivityComponent::class)
+object UrlLauncherModule {
+  @Provides
+  fun provideUrlLauncher(@ActivityContext context: Context): UrlLauncher {
+    return UrlLauncher(context)
+  }
+}

app/src/main/java/dev/msfjarvis/lobsters/ui/comments/CommentEntry.kt

@@ -0,0 +1,63 @@
+package dev.msfjarvis.lobsters.ui.comments
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.material.LocalTextStyle
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import dev.msfjarvis.lobsters.model.Comment
+import dev.msfjarvis.lobsters.ui.posts.SubmitterName
+import dev.msfjarvis.lobsters.util.toNormalizedHtml
+import dev.msfjarvis.lobsters.utils.Strings
+import dev.msfjarvis.lobsters.utils.get
+
+@Composable
+fun CommentEntry(
+  comment: Comment,
+) {
+  val indentLevel = comment.indentLevel.toInt() - 1
+
+  Row(modifier = Modifier.height(IntrinsicSize.Min)) {
+    CommentTreeColors(indentLevel = indentLevel)
+    Column(modifier = Modifier.padding(bottom = 4.dp, end = 8.dp, start = 12.dp, top = 4.dp)) {
+      CompositionLocalProvider(LocalTextStyle provides TextStyle(fontWeight = FontWeight.Bold)) {
+        SubmitterName(
+          text = comment.user.username,
+          avatarUrl = comment.user.avatarUrl,
+          contentDescription = Strings.AvatarContentDescription.get(comment.user.username),
+        )
+      }
+      Text(text = comment.comment.toNormalizedHtml(), modifier = Modifier.padding(top = 8.dp))
+    }
+  }
+}
+
+@Composable
+private fun CommentTreeColors(
+  indentLevel: Int,
+  modifier: Modifier = Modifier,
+) {
+  Box(modifier = modifier) {
+    for (level in 1..indentLevel) {
+      Box(
+        modifier =
+          Modifier.padding(start = (level * 12).dp)
+            .fillMaxHeight()
+            .width(1.dp)
+            .background(CommentTreeColor[level % CommentTreeColor.size])
+      )
+    }
+  }
+}