# HG changeset patch
# User Da Risk <da_risk@geekorum.com>
# Date 1683061378 14400
# Node ID 6ff6774c812106ad1049b791f9d18102b717c0d7
# Parent  9fc6b6b2e0a6a92517a40316619f68d7dbfaa3ab
ui: Make OpenSourceLicensesActivity open so users can override viewModel

diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 ui/common/build.gradle.kts
--- 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")
     }
diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 ui/common/src/main/java/com/geekorum/aboutoss/ui/common/BaseOpensourceLicenseActivity.kt
--- 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
         }
diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 ui/material2/build.gradle.kts
--- 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)
diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 ui/material2/src/main/java/com/geekorum/aboutoss/ui/material/OpenSourceLicenseScreen.kt
--- 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
             }
diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 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	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)
diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 ui/material3/build.gradle.kts
--- 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)
diff -r 9fc6b6b2e0a6 -r 6ff6774c8121 ui/material3/src/main/java/com/geekorum/aboutoss/ui/material3/OpenSourceLicensesActivity.kt
--- 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)