msfjarvis/compose-lobsters
1
Fork 0
mirror of https://github.com/msfjarvis/compose-lobsters synced 2025-08-14 08:17:04 +05:30
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor: remove kotlinx-datetime dependency

Browse source
This commit is contained in:
Harsh Shandilya 2022-09-28 20:19:49 +05:30
parent 22667997df
commit 21b5f3e4f3
No known key found for this signature in database
8 changed files with 7 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
android/build.gradle.kts
View file

@ -56,7 +56,6 @@ dependencies {
implementation(libs.copydown) implementation(libs.copydown)
implementation(libs.dagger.hilt.android) implementation(libs.dagger.hilt.android)
implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.datetime)
implementation(libs.kotlinx.serialization.json) implementation(libs.kotlinx.serialization.json)
implementation(libs.material.motion.core) implementation(libs.material.motion.core)
implementation(libs.material.motion.navigation) implementation(libs.material.motion.navigation)

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

@ -18,10 +18,8 @@ import dev.msfjarvis.claw.common.theme.DarkThemeColors
import dev.msfjarvis.claw.common.theme.LightThemeColors import dev.msfjarvis.claw.common.theme.LightThemeColors
import dev.msfjarvis.claw.common.urllauncher.UrlLauncher import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
import dev.msfjarvis.claw.database.local.SavedPost import dev.msfjarvis.claw.database.local.SavedPost
import kotlinx.datetime.Instant import java.time.LocalDateTime
import kotlinx.datetime.LocalDateTime import java.time.format.DateTimeFormatter
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toLocalDateTime
fun Context.getActivity(): ComponentActivity? { fun Context.getActivity(): ComponentActivity? {
return when (this) { return when (this) {
@ -36,7 +34,7 @@ fun Context.getActivity(): ComponentActivity? {
* in the format returned by the Lobsters API, and is not a general purpose parsing solution. * in the format returned by the Lobsters API, and is not a general purpose parsing solution.
*/ */
fun String.toLocalDateTime(): LocalDateTime { fun String.toLocalDateTime(): LocalDateTime {
return Instant.parse(this).toLocalDateTime(TimeZone.currentSystemDefault()) return LocalDateTime.from(DateTimeFormatter.ISO_OFFSET_DATE_TIME.parse(this))
} }
@Composable @Composable

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

@ -10,7 +10,7 @@ import androidx.compose.ui.Modifier
import dev.msfjarvis.claw.common.posts.PostActions import dev.msfjarvis.claw.common.posts.PostActions
import dev.msfjarvis.claw.common.ui.decorations.MonthHeader import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
import dev.msfjarvis.claw.database.local.SavedPost import dev.msfjarvis.claw.database.local.SavedPost
import kotlinx.datetime.Month import java.time.Month
@OptIn(ExperimentalFoundationApi::class) @OptIn(ExperimentalFoundationApi::class)
@Composable @Composable

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

@ -10,13 +10,13 @@ import dev.msfjarvis.claw.android.paging.LobstersPagingSource
import dev.msfjarvis.claw.android.ui.toLocalDateTime import dev.msfjarvis.claw.android.ui.toLocalDateTime
import dev.msfjarvis.claw.api.LobstersApi import dev.msfjarvis.claw.api.LobstersApi
import dev.msfjarvis.claw.database.local.SavedPost import dev.msfjarvis.claw.database.local.SavedPost
import java.time.Month
import javax.inject.Inject import javax.inject.Inject
import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import kotlinx.datetime.Month
@HiltViewModel @HiltViewModel
class ClawViewModel class ClawViewModel

1
common/build.gradle.kts
View file

@ -25,7 +25,6 @@ dependencies {
implementation(libs.compose.richtext.material3) implementation(libs.compose.richtext.material3)
implementation(libs.compose.richtext.ui) implementation(libs.compose.richtext.ui)
implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.datetime)
testImplementation(kotlin("test-junit")) testImplementation(kotlin("test-junit"))
testImplementation(libs.testparameterinjector) testImplementation(libs.testparameterinjector)
} }

2
common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/MonthHeader.kt
View file

@ -13,7 +13,7 @@ import androidx.compose.ui.text.capitalize
import androidx.compose.ui.text.intl.Locale import androidx.compose.ui.text.intl.Locale
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation import dev.msfjarvis.claw.common.ui.surfaceColorAtNavigationBarElevation
import kotlinx.datetime.Month import java.time.Month
@Composable @Composable
fun MonthHeader(month: Month) { fun MonthHeader(month: Month) {

2
common/src/test/kotlin/dev/msfjarvis/claw/android/tests/MonthHeaderTest.kt
View file

@ -2,7 +2,7 @@ package dev.msfjarvis.claw.android.tests
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import dev.msfjarvis.claw.common.ui.decorations.MonthHeader import dev.msfjarvis.claw.common.ui.decorations.MonthHeader
import kotlinx.datetime.Month import java.time.Month
import org.junit.Test import org.junit.Test
class MonthHeaderTest : BasePaparazziTest() { class MonthHeaderTest : BasePaparazziTest() {

1
gradle/libs.versions.toml
View file

@ -66,7 +66,6 @@ dagger-hilt-core = { module = "com.google.dagger:hilt-core", version.ref = "dagg
javapoet = "com.squareup:javapoet:1.13.0" javapoet = "com.squareup:javapoet:1.13.0"
jsoup = "org.jsoup:jsoup:1.15.3" jsoup = "org.jsoup:jsoup:1.15.3"
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" } kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
kotlinx-datetime = "org.jetbrains.kotlinx:kotlinx-datetime:0.4.0"
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" } kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "serialization" }
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" } kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "serialization" }
material_motion-core = { module = "io.github.fornewid:material-motion-compose-core", version.ref = "material_motion" } material_motion-core = { module = "io.github.fornewid:material-motion-compose-core", version.ref = "material_motion" }