refactor: rewrite comment text rendering

2025-08-14 21:07:04 +05:30 · 2025-02-04 20:04:51 +05:30 · 2025-02-04 20:04:51 +05:30 · be80812dc6
commit be80812dc6
parent 77da21d9b0
18 changed files with 243 additions and 177 deletions
--- a/android/build.gradle.kts
+++ b/android/build.gradle.kts
@ -110,7 +110,6 @@ dependencies {
  implementation(libs.androidx.paging.compose)
  implementation(libs.androidx.profileinstaller)
  implementation(libs.androidx.work.runtime)
-  implementation(libs.copydown)
  implementation(libs.dagger)
  implementation(libs.eithernet)
  implementation(libs.haze)
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/BaseActivity.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/BaseActivity.kt
@ -19,7 +19,6 @@ import androidx.compose.ui.platform.LocalUriHandler
 import androidx.core.net.toUri
 import com.deliveryhero.whetstone.Whetstone
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
-import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.theme.LobstersTheme
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import javax.inject.Inject
@ -29,7 +28,6 @@ import javax.inject.Inject
 abstract class BaseActivity : ComponentActivity() {

  @Inject lateinit var urlLauncher: UrlLauncher
-  @Inject lateinit var htmlConverter: HTMLConverter
  @Inject lateinit var viewModel: ClawViewModel
  var webUri: String? = null

--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/MainActivity.kt
@ -29,18 +29,13 @@ class MainActivity : BaseActivity() {
      WindowWidthSizeClass.Compact -> {
        LobstersPostsScreen(
          urlLauncher = urlLauncher,
-          htmlConverter = htmlConverter,
          windowSizeClass = windowSizeClass,
          setWebUri = { url -> webUri = url },
        )
      }

      else -> {
-        TabletScreen(
-          urlLauncher = urlLauncher,
-          htmlConverter = htmlConverter,
-          modifier = Modifier.fillMaxSize(),
-        )
+        TabletScreen(urlLauncher = urlLauncher, modifier = Modifier.fillMaxSize())
      }
    }
  }
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/SearchActivity.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/SearchActivity.kt
@ -14,11 +14,6 @@ import dev.msfjarvis.claw.android.ui.screens.SearchScreen
 class SearchActivity : BaseActivity() {
  @Composable
  override fun Content() {
-    SearchScreen(
-      urlLauncher = urlLauncher,
-      htmlConverter = htmlConverter,
-      setWebUri = { webUri = it },
-      viewModel = viewModel,
-    )
+    SearchScreen(urlLauncher = urlLauncher, setWebUri = { webUri = it }, viewModel = viewModel)
  }
 }
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/injection/HTMLConverterModule.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/injection/HTMLConverterModule.kt
@ -1,20 +0,0 @@
-/*
- * Copyright © 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 dev.msfjarvis.claw.android.ui.util.HTMLConverterImpl
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-
-@Module
-@ContributesTo(ApplicationScope::class)
-interface HTMLConverterModule {
-  @Binds fun bindHTMLConverter(impl: HTMLConverterImpl): HTMLConverter
-}
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/LobstersPostsScreen.kt
@ -76,7 +76,6 @@ import dev.msfjarvis.claw.android.ui.navigation.any
 import dev.msfjarvis.claw.android.ui.navigation.none
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile
 import kotlinx.collections.immutable.persistentListOf
@ -88,7 +87,6 @@ import kotlinx.coroutines.launch
@Composable
 fun LobstersPostsScreen(
  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
  windowSizeClass: WindowSizeClass,
  setWebUri: (String?) -> Unit,
  modifier: Modifier = Modifier,
@ -244,7 +242,6 @@ fun LobstersPostsScreen(
          CommentsPage(
            postId = postId,
            postActions = postActions,
-            htmlConverter = htmlConverter,
            getSeenComments = viewModel::getSeenComments,
            markSeenComments = viewModel::markSeenComments,
            contentPadding = contentPadding,
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/SearchScreen.kt
@ -25,14 +25,12 @@ import dev.msfjarvis.claw.android.ui.navigation.Search
 import dev.msfjarvis.claw.android.ui.navigation.User
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile

@Composable
 fun SearchScreen(
  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
  setWebUri: (String?) -> Unit,
  modifier: Modifier = Modifier,
  viewModel: ClawViewModel = injectedViewModel(),
@ -64,11 +62,10 @@ fun SearchScreen(
        CommentsPage(
          postId = postId,
          postActions = postActions,
-          htmlConverter = htmlConverter,
          getSeenComments = viewModel::getSeenComments,
          markSeenComments = viewModel::markSeenComments,
-          openUserProfile = { navController.navigate(User(it)) },
          contentPadding = contentPadding,
+          openUserProfile = { navController.navigate(User(it)) },
        )
      }
      composable<User> { backStackEntry ->
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/TabletScreen.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/TabletScreen.kt
@ -66,7 +66,6 @@ import dev.msfjarvis.claw.android.ui.navigation.Saved
 import dev.msfjarvis.claw.android.ui.navigation.User
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.persistentMapOf
@ -82,7 +81,6 @@ private fun ThreePaneScaffoldNavigator<*>.isDetailExpanded() =
@Composable
 fun TabletScreen(
  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
  modifier: Modifier = Modifier,
  viewModel: ClawViewModel = injectedViewModel(),
 ) {
@ -219,12 +217,11 @@ fun TabletScreen(
                  CommentsPage(
                    postId = contentKey.postId,
                    postActions = postActions,
-                    htmlConverter = htmlConverter,
                    getSeenComments = viewModel::getSeenComments,
                    markSeenComments = viewModel::markSeenComments,
-                    openUserProfile = { navController.navigate(User(it)) },
                    contentPadding = PaddingValues(),
                    modifier = Modifier.fillMaxSize(),
+                    openUserProfile = { navController.navigate(User(it)) },
                  )
                }
              }
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/TabletScreen2.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/screens/TabletScreen2.kt
@ -40,7 +40,6 @@ import dev.msfjarvis.claw.android.ui.navigation.Settings
 import dev.msfjarvis.claw.android.ui.navigation.User
 import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.comments.CommentsPage
-import dev.msfjarvis.claw.common.comments.HTMLConverter
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.common.user.UserProfile
 import kotlinx.collections.immutable.persistentMapOf
@ -48,7 +47,6 @@ import kotlinx.collections.immutable.persistentMapOf
@Composable
 fun TabletScreen2(
  urlLauncher: UrlLauncher,
-  htmlConverter: HTMLConverter,
  setWebUri: (String?) -> Unit,
  modifier: Modifier = Modifier,
  viewModel: ClawViewModel = injectedViewModel(),
@ -140,7 +138,6 @@ fun TabletScreen2(
        CommentsPage(
          postId = postId,
          postActions = postActions,
-          htmlConverter = htmlConverter,
          getSeenComments = viewModel::getSeenComments,
          markSeenComments = viewModel::markSeenComments,
          contentPadding = contentPadding,
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/util/HTMLConverterImpl.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/util/HTMLConverterImpl.kt
@ -1,21 +0,0 @@
-/*
- * Copyright © Harsh Shandilya.
- * Use of this source code is governed by an MIT-style
- * license that can be found in the LICENSE file or at
- * https://opensource.org/licenses/MIT.
- */
-package dev.msfjarvis.claw.android.ui.util
-
-import androidx.compose.runtime.Stable
-import dev.msfjarvis.claw.common.comments.HTMLConverter
-import io.github.furstenheim.CopyDown
-import javax.inject.Inject
-
-@Stable
-class HTMLConverterImpl @Inject constructor() : HTMLConverter {
-  private val copydown = CopyDown()
-
-  override fun convertHTMLToMarkdown(html: String): String {
-    return copydown.convert(html)
-  }
-}