--- a/ui/common/build.gradle.kts Tue May 02 17:01:53 2023 -0400
+++ b/ui/common/build.gradle.kts Tue May 02 17:02:58 2023 -0400
@@ -75,7 +75,7 @@
api(libs.appcompat)
implementation(libs.androidx.lifecycle.viewmodel)
implementation(libs.androidx.activity)
- implementation(libs.geekdroid) {
+ api(libs.geekdroid) {
//TODO get rid of dagger platform in geekdroid
exclude("com.google.dagger", "dagger-platform")
}
--- a/ui/common/src/main/java/com/geekorum/aboutoss/ui/common/BaseOpensourceLicenseActivity.kt Tue May 02 17:01:53 2023 -0400
+++ b/ui/common/src/main/java/com/geekorum/aboutoss/ui/common/BaseOpensourceLicenseActivity.kt Tue May 02 17:02:58 2023 -0400
@@ -25,7 +25,7 @@
import androidx.appcompat.app.AppCompatActivity
abstract class BaseOpensourceLicenseActivity : AppCompatActivity() {
- protected val viewModel: OpenSourceLicensesViewModel by viewModels(
+ protected open val viewModel: OpenSourceLicensesViewModel by viewModels(
factoryProducer = {
OpenSourceLicensesViewModel.Factory
}
--- a/ui/material2/build.gradle.kts Tue May 02 17:01:53 2023 -0400
+++ b/ui/material2/build.gradle.kts Tue May 02 17:02:58 2023 -0400
@@ -78,7 +78,7 @@
}
dependencies {
- implementation(project(":ui:common"))
+ api(project(":ui:common"))
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.material)
implementation(libs.androidx.activity.compose)
--- a/ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt Tue May 02 17:01:53 2023 -0400
+++ b/ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt Tue May 02 17:02:58 2023 -0400
@@ -149,12 +149,12 @@
Text(linkifiedLicense,
modifier = Modifier
+ .padding(paddingValues)
+ .consumeWindowInsets(paddingValues)
.padding(horizontal = 16.dp)
.fillMaxSize()
.then(pressIndicator)
- .verticalScroll(scrollState)
- .padding(paddingValues)
- .consumeWindowInsets(paddingValues),
+ .verticalScroll(scrollState),
onTextLayout = {
layoutResult.value = it
}
--- a/ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicensesActivity.kt Tue May 02 17:01:53 2023 -0400
+++ b/ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicensesActivity.kt Tue May 02 17:02:58 2023 -0400
@@ -39,7 +39,7 @@
* You can specify the Material theme to use by setting [themeProvider]
* before launching the activity
*/
-class OpenSourceLicensesActivity : BaseOpensourceLicenseActivity() {
+open class OpenSourceLicensesActivity : BaseOpensourceLicenseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
--- a/ui/material3/build.gradle.kts Tue May 02 17:01:53 2023 -0400
+++ b/ui/material3/build.gradle.kts Tue May 02 17:02:58 2023 -0400
@@ -78,7 +78,7 @@
}
dependencies {
- implementation(project(":ui:common"))
+ api(project(":ui:common"))
implementation(platform(libs.androidx.compose.bom))
implementation(libs.androidx.compose.material3)
implementation(libs.androidx.activity.compose)
--- a/ui/material3/src/main/java/com/geekorum/aboutoss/ui/material3/OpenSourceLicensesActivity.kt Tue May 02 17:01:53 2023 -0400
+++ b/ui/material3/src/main/java/com/geekorum/aboutoss/ui/material3/OpenSourceLicensesActivity.kt Tue May 02 17:02:58 2023 -0400
@@ -45,7 +45,7 @@
* You can specify the Material theme to use by setting [themeProvider]
* before launching the activity
*/
-class OpenSourceLicensesActivity : BaseOpensourceLicenseActivity() {
+open class OpenSourceLicensesActivity : BaseOpensourceLicenseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)