# HG changeset patch # User Da Risk # Date 1681429006 14400 # Node ID 448854642714fd55c0f281fbc1958f1108823de2 # Parent 3d88feb1156b64a0bfa3496edb43bcd4bcb1ead3 ui:material: Add activity in manifest and allow to configure the theme used diff -r 3d88feb1156b -r 448854642714 ui/material2/src/main/AndroidManifest.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/ui/material2/src/main/AndroidManifest.xml Thu Apr 13 19:36:46 2023 -0400 @@ -0,0 +1,34 @@ + + + + + + + + \ No newline at end of file diff -r 3d88feb1156b -r 448854642714 ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicensesActivity.kt --- a/ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicensesActivity.kt Thu Apr 13 17:37:13 2023 -0400 +++ b/ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicensesActivity.kt Thu Apr 13 19:36:46 2023 -0400 @@ -37,16 +37,24 @@ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContent { - MaterialTheme { + themeProvider { DependencyNavHost( openSourceLicensesViewModel = viewModel, navigateUp = { - onNavigateUp() + if (!onNavigateUp()) { + finish() + } } ) } } } + + companion object { + var themeProvider: @Composable (@Composable () -> Unit) -> Unit = { content -> + MaterialTheme(content = content) + } + } }