demo

MFlisar · Oct 29, 2024 · f7d3702 · f7d3702
1 parent 6752404
commit f7d3702
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 23 deletions.
diff --git a/demo/android/build.gradle.kts b/demo/android/build.gradle.kts
@@ -87,6 +87,7 @@ dependencies {
     implementation(project(":Lumberjack:Extensions:ComposeViewer"))
 
     // a minimal library that provides some useful composables that I use inside demo activities
-    implementation(libs.demoutilities.core)
-    implementation(libs.demoutilities.app)
+    implementation(libs.toolbox.core)
+    implementation(libs.toolbox.ui)
+    implementation(libs.toolbox.app)
 }
diff --git a/demo/android/src/main/java/com/michaelflisar/lumberjack/demo/App.kt b/demo/android/src/main/java/com/michaelflisar/lumberjack/demo/App.kt
@@ -1,8 +1,6 @@
 package com.michaelflisar.lumberjack.demo
 
-import com.michaelflisar.demoutilities.DemoApp
-
-class App : DemoApp() {
+class App : com.michaelflisar.toolbox.androiddemoapp.DemoApp() {
 
     override fun onCreate() {
         super.onCreate()

diff --git a/demo/android/src/main/java/com/michaelflisar/lumberjack/demo/ui/MainActivity.kt b/demo/android/src/main/java/com/michaelflisar/lumberjack/demo/ui/MainActivity.kt
@@ -1,8 +1,5 @@
 package com.michaelflisar.lumberjack.demo.ui
 
-import android.content.Context
-import android.content.ContextWrapper
-import androidx.activity.ComponentActivity
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.OutlinedButton
@@ -18,28 +15,28 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import com.michaelflisar.composethemer.ComposeTheme
-import com.michaelflisar.demoutilities.DemoActivity
-import com.michaelflisar.demoutilities.classes.ToastHelper
-import com.michaelflisar.demoutilities.composables.DemoAppThemeRegionDetailed
-import com.michaelflisar.demoutilities.composables.DemoCollapsibleRegion
-import com.michaelflisar.demoutilities.composables.ExpandedRegionState
 import com.michaelflisar.lumberjack.core.L
 import com.michaelflisar.lumberjack.core.getLatestLogFile
 import com.michaelflisar.lumberjack.demo.DemoLogging
 import com.michaelflisar.lumberjack.extensions.composeviewer.LumberjackDialog
 import com.michaelflisar.lumberjack.extensions.feedback.sendFeedback
 import com.michaelflisar.lumberjack.extensions.viewer.showLog
+import com.michaelflisar.toolbox.androiddemoapp.composables.DemoAppThemeRegionDetailed
+import com.michaelflisar.toolbox.androiddemoapp.composables.DemoCollapsibleRegion
+import com.michaelflisar.toolbox.androiddemoapp.composables.rememberDemoExpandedRegions
+import com.michaelflisar.toolbox.classes.ToastHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-class MainActivity : DemoActivity(
+class MainActivity : com.michaelflisar.toolbox.androiddemoapp.DemoActivity(
     scrollableContent = false
 ) {
 
     @Composable
     override fun ColumnScope.Content(
-        regionsState: ExpandedRegionState, themeState: ComposeTheme.State
+        themeState: ComposeTheme.State
     ) {
+        val regionState = rememberDemoExpandedRegions()
 
         val scope = rememberCoroutineScope()
         LaunchedEffect(Unit) {
@@ -56,10 +53,10 @@ class MainActivity : DemoActivity(
 
 
         DemoAppThemeRegionDetailed(
-            state = regionsState
+            state = regionState
         )
         DemoCollapsibleRegion(
-            title = "Demos", regionId = 1, state = regionsState
+            title = "Demos", regionId = 1, state = regionState
         ) {
             OutlinedButton(modifier = Modifier.fillMaxWidth(), onClick = {
                 L.showLog(context, DemoLogging.FILE_LOGGING_SETUP, mail)
@@ -80,7 +77,7 @@ class MainActivity : DemoActivity(
             }
         }
         DemoCollapsibleRegion(
-            title = "Actions", regionId = 2, state = regionsState
+            title = "Actions", regionId = 2, state = regionState
         ) {
             OutlinedTextField(modifier = Modifier.fillMaxWidth(),
                 value = mail,

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -26,7 +26,7 @@ logback =                   "3.0.0"
 fastscroller =              "1.0.0"
 material =					"1.12.0"
 feedback =                  "2.1.0"
-demoutilities =             "1.0.3"
+toolbox =                   "2.2.0"
 
 [plugins]
 
@@ -77,5 +77,6 @@ logback = 				        	{ module = "com.github.tony19:logback-android", 		    ver
 fastscroller = 				        { module = "com.quiph.ui:recyclerviewfastscroller", 		version.ref = "fastscroller" }
 material = 				        	{ module = "com.google.android.material:material", 		    version.ref = "material" }
 feedback =                          { module = "io.github.mflisar.feedbackmanager:library",     version.ref = "feedback" }
-demoutilities-core =                { module = "io.github.mflisar.demoutilities:core", 			version.ref = "demoutilities" }
-demoutilities-app =                 { module = "io.github.mflisar.demoutilities:app", 			version.ref = "demoutilities" }
+toolbox-core =                      { module = "io.github.mflisar.toolbox:core", 			    version.ref = "toolbox" }
+toolbox-ui =                        { module = "io.github.mflisar.toolbox:ui", 			        version.ref = "toolbox" }
+toolbox-app =                       { module = "io.github.mflisar.toolbox:android-demo-app",    version.ref = "toolbox" }
diff --git a/library/extensions/composeviewer/build.gradle.kts b/library/extensions/composeviewer/build.gradle.kts
@@ -19,7 +19,7 @@ plugins {
 
 // Module
 val artifactId = "extension-composeviewer"
-val androidNamespace =
+val androidNamespace = "com.michaelflisar.lumberjack.extensions.composeviewer"
 
 // Library
 val libraryName = "Lumberjack"
@@ -93,7 +93,7 @@ kotlin {
 }
 
 android {
-    namespace = "com.michaelflisar.lumberjack.extensions.composeviewer"
+    namespace = androidNamespace
 
     compileSdk = app.versions.compileSdk.get().toInt()