Skip to content

Commit cd959fe

Browse files
committed
ライセンス画面更新
1 parent 2eb6695 commit cd959fe

1 file changed

Lines changed: 31 additions & 11 deletions

File tree

  • AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/license

AndroidApp/ui/src/main/kotlin/me/nya_n/notificationnotifier/ui/screen/license/LicenseScreen.kt

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,56 @@
11
package me.nya_n.notificationnotifier.ui.screen.license
22

3-
import android.webkit.WebView
4-
import android.webkit.WebViewClient
3+
import androidx.compose.foundation.background
4+
import androidx.compose.foundation.layout.Box
5+
import androidx.compose.foundation.layout.fillMaxWidth
6+
import androidx.compose.foundation.layout.height
57
import androidx.compose.foundation.layout.padding
8+
import androidx.compose.material3.AlertDialogDefaults
9+
import androidx.compose.material3.MaterialTheme
610
import androidx.compose.material3.SnackbarHostState
711
import androidx.compose.runtime.Composable
12+
import androidx.compose.runtime.getValue
813
import androidx.compose.runtime.remember
914
import androidx.compose.ui.Modifier
15+
import androidx.compose.ui.graphics.Color
1016
import androidx.compose.ui.tooling.preview.Preview
11-
import androidx.compose.ui.viewinterop.AndroidView
17+
import androidx.compose.ui.unit.dp
1218
import androidx.navigation.NavController
1319
import androidx.navigation.compose.rememberNavController
20+
import com.mikepenz.aboutlibraries.ui.compose.LibraryDefaults
21+
import com.mikepenz.aboutlibraries.ui.compose.android.produceLibraries
22+
import com.mikepenz.aboutlibraries.ui.compose.m3.LibrariesContainer
23+
import com.mikepenz.aboutlibraries.ui.compose.m3.libraryColors
1424
import me.nya_n.notificationnotifier.ui.common.AppScaffold
1525
import me.nya_n.notificationnotifier.ui.theme.AppTheme
1626

1727
@Composable
1828
fun LicenseScreen(navController: NavController) {
1929
val snackbarHostState = remember { SnackbarHostState() }
30+
val libraries by produceLibraries()
2031
AppScaffold(
2132
snackbarHostState = snackbarHostState,
2233
onBack = {
2334
navController.popBackStack()
2435
}
2536
) {
26-
AndroidView(
27-
modifier = Modifier.padding(it),
28-
factory = { context ->
29-
WebView(context).apply {
30-
webViewClient = WebViewClient()
31-
loadUrl("file:///android_asset/open_source_licenses.html")
32-
}
33-
},
37+
LibrariesContainer(
38+
libraries,
39+
Modifier.padding(it),
40+
colors = LibraryDefaults.libraryColors(
41+
libraryBackgroundColor = Color.Transparent,
42+
dialogBackgroundColor = AlertDialogDefaults.containerColor,
43+
dialogConfirmButtonColor = AlertDialogDefaults.textContentColor
44+
),
45+
divider = {
46+
Box(
47+
Modifier
48+
.fillMaxWidth()
49+
.height(1.dp)
50+
.padding(horizontal = 16.dp)
51+
.background(MaterialTheme.colorScheme.secondaryContainer)
52+
)
53+
}
3454
)
3555
}
3656
}

0 commit comments

Comments
 (0)