Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit b5ca9de

Browse files
committed
Add DemoScaffold
1 parent 1039f2b commit b5ca9de

File tree

2 files changed

+27
-18
lines changed

2 files changed

+27
-18
lines changed

biz/detail/src/main/kotlin/io/goooler/demoapp/detail/ui/RepoDetailActivity.kt

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package io.goooler.demoapp.detail.ui
33
import android.os.Bundle
44
import androidx.activity.compose.setContent
55
import androidx.activity.viewModels
6-
import androidx.compose.foundation.layout.fillMaxSize
76
import androidx.compose.foundation.layout.padding
8-
import androidx.compose.material3.Scaffold
97
import androidx.compose.runtime.collectAsState
108
import androidx.compose.runtime.getValue
119
import androidx.compose.ui.Modifier
@@ -19,26 +17,20 @@ class RepoDetailActivity : BaseActivity() {
1917
override fun onCreate(savedInstanceState: Bundle?) {
2018
super.onCreate(savedInstanceState)
2119

22-
intent.getStringExtra(FULL_NAME)?.let {
23-
vm.fullName = it
24-
vm.refresh()
25-
}
20+
vm.fullName = intent.getStringExtra(FULL_NAME) ?: return
21+
vm.refresh()
2622

2723
setContent {
2824
val model by vm.repoDetailModel.collectAsState()
2925
val isRefreshing by vm.isRefreshing.collectAsState()
30-
DemoTheme {
31-
Scaffold(
32-
modifier = Modifier.fillMaxSize(),
33-
) { innerPadding ->
34-
DetailPageWithSwipeRefresh(
35-
modifier = Modifier.padding(innerPadding),
36-
isRefreshing = isRefreshing,
37-
onRefresh = vm::refresh,
38-
model = model,
39-
onForkClick = vm::fork,
40-
)
41-
}
26+
DemoScaffold { innerPadding ->
27+
DetailPageWithSwipeRefresh(
28+
modifier = Modifier.padding(innerPadding),
29+
isRefreshing = isRefreshing,
30+
onRefresh = vm::refresh,
31+
model = model,
32+
onForkClick = vm::fork,
33+
)
4234
}
4335
}
4436
}

biz/detail/src/main/kotlin/io/goooler/demoapp/detail/ui/Theme.kt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@ package io.goooler.demoapp.detail.ui
22

33
import android.os.Build
44
import androidx.compose.foundation.isSystemInDarkTheme
5+
import androidx.compose.foundation.layout.PaddingValues
6+
import androidx.compose.foundation.layout.fillMaxSize
57
import androidx.compose.material3.MaterialTheme
8+
import androidx.compose.material3.Scaffold
69
import androidx.compose.material3.darkColorScheme
710
import androidx.compose.material3.dynamicDarkColorScheme
811
import androidx.compose.material3.dynamicLightColorScheme
912
import androidx.compose.material3.lightColorScheme
1013
import androidx.compose.runtime.Composable
14+
import androidx.compose.ui.Modifier
1115
import androidx.compose.ui.platform.LocalContext
1216

1317
private val DarkColorScheme = darkColorScheme()
@@ -47,3 +51,16 @@ fun DemoTheme(
4751
content = content,
4852
)
4953
}
54+
55+
@Composable
56+
fun DemoScaffold(
57+
modifier: Modifier = Modifier,
58+
content: @Composable (PaddingValues) -> Unit,
59+
) {
60+
DemoTheme {
61+
Scaffold(
62+
modifier = modifier.fillMaxSize(),
63+
content = content,
64+
)
65+
}
66+
}

0 commit comments

Comments
 (0)