Skip to content

Commit b252023

Browse files
authored
Merge pull request #270 from rainxchzed/chore-bumb-versions
2 parents 02329e1 + 0177257 commit b252023

34 files changed

Lines changed: 72 additions & 104 deletions

File tree

build-logic/convention/src/main/kotlin/KmpLibraryConventionPlugin.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ class KmpLibraryConventionPlugin : Plugin<Project> {
2929

3030
dependencies {
3131
"commonMainImplementation"(libs.findLibrary("kotlinx-serialization-json").get())
32-
"commonTestImplementation"(libs.findLibrary("kotlin-test").get())
3332
}
3433
}
3534
}

composeApp/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
kotlin {
1010
sourceSets {
1111
androidMain.dependencies {
12-
implementation(compose.preview)
12+
implementation(libs.androidx.compose.ui.tooling.preview)
1313
implementation(libs.androidx.activity.compose)
1414

1515
implementation(libs.core.splashscreen)
@@ -67,7 +67,8 @@ kotlin {
6767
implementation(libs.jetbrains.compose.material3)
6868
implementation(compose.ui)
6969
implementation(compose.components.resources)
70-
implementation(compose.components.uiToolingPreview)
70+
71+
implementation(libs.androidx.compose.ui.tooling.preview)
7172
implementation(libs.jetbrains.compose.viewmodel)
7273
implementation(libs.jetbrains.lifecycle.compose)
7374
}
-4.01 KB
Binary file not shown.
-3.98 KB
Binary file not shown.

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/Main.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package zed.rainxch.githubstore
22

33
import androidx.compose.foundation.isSystemInDarkTheme
4-
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
54
import androidx.compose.runtime.Composable
65
import androidx.compose.runtime.LaunchedEffect
76
import androidx.compose.runtime.getValue
87
import androidx.lifecycle.compose.collectAsStateWithLifecycle
98
import androidx.navigation.compose.rememberNavController
10-
import org.jetbrains.compose.ui.tooling.preview.Preview
119
import org.koin.compose.viewmodel.koinViewModel
1210
import zed.rainxch.core.presentation.theme.GithubStoreTheme
1311
import zed.rainxch.core.presentation.utils.ApplyAndroidSystemBars
@@ -18,9 +16,7 @@ import zed.rainxch.githubstore.app.navigation.GithubStoreGraph
1816
import zed.rainxch.githubstore.app.components.RateLimitDialog
1917
import zed.rainxch.githubstore.app.components.SessionExpiredDialog
2018

21-
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
2219
@Composable
23-
@Preview
2420
fun App(deepLinkUri: String? = null) {
2521
val viewModel: MainViewModel = koinViewModel()
2622
val state by viewModel.state.collectAsStateWithLifecycle()

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/components/RateLimitDialog.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,20 @@ import androidx.compose.runtime.Composable
1616
import androidx.compose.runtime.remember
1717
import androidx.compose.ui.Modifier
1818
import androidx.compose.ui.text.font.FontWeight
19+
import androidx.compose.ui.tooling.preview.Preview
1920
import androidx.compose.ui.unit.dp
2021
import org.jetbrains.compose.resources.stringResource
21-
import org.jetbrains.compose.ui.tooling.preview.Preview
2222
import zed.rainxch.core.domain.model.RateLimitInfo
2323
import zed.rainxch.core.presentation.theme.GithubStoreTheme
24-
import zed.rainxch.githubstore.core.presentation.res.*
24+
import zed.rainxch.githubstore.core.presentation.res.Res
25+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_close
26+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_exceeded
27+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_ok
28+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_resets_in_minutes
29+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_sign_in
30+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_tip_sign_in
31+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_used_all
32+
import zed.rainxch.githubstore.core.presentation.res.rate_limit_used_all_free
2533

2634
@Composable
2735
fun RateLimitDialog(

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/deeplink/DeepLinkParser.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ object DeepLinkParser {
8989
}
9090
}
9191
result.toString()
92-
} catch (e: Exception) {
92+
} catch (_: Exception) {
9393
value
9494
}
9595
}

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/di/SharedModules.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ package zed.rainxch.githubstore.app.di
33
import org.koin.core.module.Module
44
import org.koin.core.module.dsl.viewModel
55
import org.koin.dsl.module
6-
import zed.rainxch.core.domain.network.Downloader
7-
import zed.rainxch.core.domain.repository.StarredRepository
8-
import zed.rainxch.core.domain.system.Installer
96
import zed.rainxch.githubstore.MainViewModel
107

118
val mainModule: Module = module {

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/AppNavigation.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import androidx.compose.ui.layout.onGloballyPositioned
1818
import androidx.compose.ui.platform.LocalDensity
1919
import androidx.compose.ui.unit.dp
2020
import androidx.lifecycle.compose.collectAsStateWithLifecycle
21-
import androidx.lifecycle.viewmodel.compose.viewModel
2221
import androidx.navigation.NavHostController
2322
import androidx.navigation.compose.NavHost
2423
import androidx.navigation.compose.composable

composeApp/src/commonMain/kotlin/zed/rainxch/githubstore/app/navigation/BottomNavigation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ import androidx.compose.ui.layout.onGloballyPositioned
4747
import androidx.compose.ui.layout.positionInParent
4848
import androidx.compose.ui.platform.LocalDensity
4949
import androidx.compose.ui.text.font.FontWeight
50+
import androidx.compose.ui.tooling.preview.Preview
5051
import androidx.compose.ui.unit.dp
5152
import androidx.compose.ui.unit.sp
5253
import io.github.fletchmckee.liquid.liquid
5354
import io.github.fletchmckee.liquid.rememberLiquidState
5455
import kotlinx.coroutines.launch
5556
import org.jetbrains.compose.resources.stringResource
56-
import org.jetbrains.compose.ui.tooling.preview.Preview
5757
import zed.rainxch.core.domain.getPlatform
5858
import zed.rainxch.core.domain.model.Platform
5959
import zed.rainxch.core.presentation.locals.LocalBottomNavigationLiquid

0 commit comments

Comments
 (0)