common: extract htmlToMarkdown passing style to a composition local

This commit is contained in:
Harsh Shandilya 2021-11-15 23:05:47 +05:30
parent b3fda724ad
commit 4622162d09
No known key found for this signature in database
GPG key ID: 366D7BBAD1031E80
6 changed files with 50 additions and 13 deletions

View file

@ -9,6 +9,7 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.core.view.WindowCompat
import dagger.hilt.android.AndroidEntryPoint
import dev.msfjarvis.claw.android.ui.LobstersApp
import dev.msfjarvis.claw.common.comments.HTMLConverter
import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
import javax.inject.Inject
@ -16,6 +17,7 @@ import javax.inject.Inject
class MainActivity : ComponentActivity() {
@Inject lateinit var urlLauncher: UrlLauncher
@Inject lateinit var htmlConverter: HTMLConverter
private var webUri: String? = null
override fun onCreate(savedInstanceState: Bundle?) {
@ -25,6 +27,7 @@ class MainActivity : ComponentActivity() {
setContent {
LobstersApp(
urlLauncher = urlLauncher,
htmlConverter = htmlConverter,
) { url -> webUri = url }
}
}

View file

@ -0,0 +1,23 @@
package dev.msfjarvis.claw.android.injection
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import dev.msfjarvis.claw.common.comments.HTMLConverter
import io.github.furstenheim.CopyDown
@Module
@InstallIn(SingletonComponent::class)
object HTMLConverterModule {
@Provides
fun provideHTMLConverter() =
object : HTMLConverter {
private val copydown = CopyDown()
override fun convertHTMLToMarkdown(html: String): String {
return copydown.convert(html)
}
}
}

View file

@ -31,11 +31,12 @@ import com.google.accompanist.insets.statusBarsPadding
import com.google.accompanist.systemuicontroller.rememberSystemUiController
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.comments.LocalHTMLConverter
import dev.msfjarvis.claw.common.posts.PostActions
import dev.msfjarvis.claw.common.theme.LobstersTheme
import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
import dev.msfjarvis.claw.database.local.SavedPost
import io.github.furstenheim.CopyDown
private const val ScrollDelta = 50
@ -44,9 +45,9 @@ private const val ScrollDelta = 50
fun LobstersApp(
viewModel: ClawViewModel = viewModel(),
urlLauncher: UrlLauncher,
htmlConverter: HTMLConverter,
setWebUri: (String) -> Unit,
) {
val copydown = remember { CopyDown() }
val systemUiController = rememberSystemUiController()
val scaffoldState = rememberScaffoldState()
val listState = rememberLazyListState()
@ -93,7 +94,11 @@ fun LobstersApp(
}
LobstersTheme(
darkTheme = isSystemInDarkTheme(),
providedValues = arrayOf(LocalUriHandler provides urlLauncher),
providedValues =
arrayOf(
LocalUriHandler provides urlLauncher,
LocalHTMLConverter provides htmlConverter,
),
) {
ProvideWindowInsets {
val useDarkIcons = MaterialTheme.colors.isLight
@ -134,7 +139,6 @@ fun LobstersApp(
CommentsPage(
postId = postId,
getDetails = viewModel::getPostComments,
htmlToMarkdown = { source -> copydown.convert(source) },
paddingValues = paddingValues,
)
}