[WIP] App Overhaul

.github/actions/build-apk/action.yml

@@ -93,19 +93,10 @@ runs:
       shell: bash
       run: |
         apk_path=$(find app/build/outputs/apk/${{ env.FLAVOR_LOWERCASE }}/${{ env.BUILD_TYPE_LOWERCASE }} -name "*.apk" -print -quit)
-        mapping_path=$(find app/build/outputs/mapping/${{ env.FLAVOR_LOWERCASE }}${{ env.BUILD_TYPE_CAPITALIZED }} -name "mapping.txt" -print -quit)
         name=$(basename "$apk_path" .apk)
 
         echo "name=$name" >> $GITHUB_OUTPUT
         echo "path=$apk_path" >> $GITHUB_OUTPUT
-        echo "mapping=$mapping_path" >> $GITHUB_OUTPUT
-
-    - name: Upload mapping as artifact
-      if: ${{ steps.apk.outputs.mapping != '' }}
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ inputs.flavor }}-${{ inputs.buildType }}-mapping
-        path: ${{ steps.apk.outputs.mapping }}
 
     - name: Upload APK as artifact
       uses: actions/upload-artifact@v4

.github/workflows/github.yml

@@ -80,6 +80,7 @@ jobs:
         id: create_release
         uses: actions/create-release@v1
         with:
+          prerelease: ${{ github.event.inputs.track == 'beta' }}
           tag_name: v${{ env.VERSION }}
           release_name: v${{ env.VERSION }}
           body: |
@@ -111,4 +112,4 @@ jobs:
           asset_name: ${{ steps.find_apks.outputs.SPOOFED_NAME }}
           asset_content_type: application/vnd.android.package-archive
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-ci.yml

@@ -30,8 +30,6 @@ on:
         options:
         - production
         - beta
-        - alpha
-        - qa
 
 jobs:
   # Build step for both official & spoofed flavors
@@ -104,8 +102,8 @@ jobs:
         run: |
           [ -f gradle.properties ] && [ "$(tail -c1 gradle.properties)" != "" ] && echo >> gradle.properties
           {
-            echo "gpr.user=${{ inputs.username }}"
-            echo "gpr.key=${{ inputs.token }}"
+            echo "gpr.user=${{ secrets.ACTOR }}"
+            echo "gpr.key=${{ secrets.GH_TOKEN }}"
           } >> gradle.properties
 
       - name: Set up JDK

.github/workflows/telegram.yml

@@ -70,6 +70,7 @@ jobs:
             ${{ env.MESSAGE }}
 
             Branch: ${{ env.BRANCH_NAME }}
+            Track: ${{ github.event.inputs.track }}
             [Workflow run](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
           files: |
             ${{ steps.find_apks.outputs.OFFICIAL_APK_PATH }}

app/build.gradle.kts

@@ -174,10 +174,14 @@ android {
 
 androidComponents {
     onVariants { variant ->
+        val distributionFlavor = variant.productFlavors
+            .firstOrNull { it.first == "distribution" }
+            ?.second
+
         variant.outputs.filterIsInstance<VariantOutputImpl>().forEach { output ->
             output.outputFileName.set(
                 output.versionName.map { vName ->
-                    "MMRL-${vName}-${variant.buildType ?: variant.name}.apk"
+                    "MMRL-$vName-$distributionFlavor.apk"
                 }
             )
         }
@@ -197,9 +201,6 @@ dependencies {
     implementation(projects.compat)
     implementation(projects.datastore)
 
-    implementation(libs.webuix.hwui)
-    implementation(libs.webuix.helper)
-
     implementation(libs.kotlin.stdlib)
 
     implementation(libs.hiddenApiBypass)
@@ -272,6 +273,8 @@ dependencies {
     ksp(libs.square.moshi.kotlin)
 
     implementation(libs.mmrlx.terminal)
+    implementation(libs.mmrlx.ui)
+    implementation(libs.mmrlx.utilities)
     implementation(libs.mmrlx.webui.core)
 
     implementation("dev.chrisbanes.haze:haze:1.6.10")

app/src/main/kotlin/com/dergoogler/mmrl/model/local/FeaturedManager.kt

@@ -5,7 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import com.dergoogler.mmrl.R
 import com.dergoogler.mmrl.datastore.model.WorkingMode
-import com.dergoogler.mmrl.ui.component.listItem.dsl.component.RadioDialogItem
+import dev.mmrlx.compose.ui.list.component.RadioDialogOption
 
 data class FeaturedManager(
     private val nameAs: Any,
@@ -15,7 +15,7 @@ data class FeaturedManager(
 ) {
     @Composable
     fun toRadioDialogItem() =
-        RadioDialogItem(
+        RadioDialogOption(
             title = name,
             value = workingMode,
         )

app/src/main/kotlin/com/dergoogler/mmrl/ui/activity/MMRLComponentActivity.kt

@@ -34,18 +34,17 @@ import com.dergoogler.mmrl.ui.providable.LocalLifecycleScope
 import com.dergoogler.mmrl.ui.providable.LocalMainNavController
 import com.dergoogler.mmrl.ui.providable.LocalNavController
 import com.dergoogler.mmrl.ui.providable.LocalSettings
-import com.dergoogler.mmrl.ui.providable.LocalSuperUserViewModel
 import com.dergoogler.mmrl.ui.providable.LocalUserPreferences
 import com.dergoogler.mmrl.ui.providable.LocalWindowSizeClass
 import com.dergoogler.mmrl.ui.theme.Colors
 import com.dergoogler.mmrl.ui.theme.MMRLAppTheme
 import com.dergoogler.mmrl.viewmodel.SettingsViewModel
-import com.dergoogler.mmrl.viewmodel.SuperUserViewModel
 import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator
 import dagger.hilt.android.AndroidEntryPoint
 import dev.dergoogler.mmrl.compat.BuildCompat
 import dev.dergoogler.mmrl.compat.core.BrickException
 import dev.dergoogler.mmrl.compat.core.MMRLUriHandlerImpl
+import dev.mmrlx.compose.ui.theme.MMRLXTheme
 import timber.log.Timber
 import javax.inject.Inject
 import kotlin.system.exitProcess
@@ -216,31 +215,36 @@ fun BaseContent(
     val currentTheme = Colors.getColor(preferences.themeColor, preferences.isDarkMode())
     val toolbarColor = currentTheme.surface
 
-    MMRLAppTheme(
-        darkMode = preferences.isDarkMode(),
-        navController = navController,
-        themeColor = preferences.themeColor,
-        providerValues =
-            arrayOf(
-                LocalWindowSizeClass provides windowSizeClass,
-                LocalDestinationsNavigator provides navigator,
-                LocalActivity provides activity,
-                LocalSuperUserViewModel provides hiltViewModel<SuperUserViewModel>(activity),
-                LocalSettings provides hiltViewModel<SettingsViewModel>(activity),
-                LocalUserPreferences provides preferences,
-                dev.dergoogler.mmrl.compat.core.LocalUriHandler provides
-                    MMRLUriHandlerImpl(
-                        context,
-                        toolbarColor,
-                    ),
-                LocalLifecycleScope provides activity.lifecycleScope,
-                LocalLifecycle provides activity.lifecycle,
-                LocalUriHandler provides MMRLUriHandlerImpl(context, toolbarColor),
-                LocalNavController provides navController,
-                LocalMainNavController provides mainNavController,
-            ),
-        content = content,
-    )
+    val darkMode = preferences.isDarkMode()
+
+    MMRLXTheme(
+        darkTheme = darkMode,
+    ) {
+        MMRLAppTheme(
+            darkMode = darkMode,
+            navController = navController,
+            themeColor = preferences.themeColor,
+            providerValues =
+                arrayOf(
+                    LocalWindowSizeClass provides windowSizeClass,
+                    LocalDestinationsNavigator provides navigator,
+                    LocalActivity provides activity,
+                    LocalSettings provides hiltViewModel<SettingsViewModel>(activity),
+                    LocalUserPreferences provides preferences,
+                    dev.dergoogler.mmrl.compat.core.LocalUriHandler provides
+                            MMRLUriHandlerImpl(
+                                context,
+                                toolbarColor,
+                            ),
+                    LocalLifecycleScope provides activity.lifecycleScope,
+                    LocalLifecycle provides activity.lifecycle,
+                    LocalUriHandler provides MMRLUriHandlerImpl(context, toolbarColor),
+                    LocalNavController provides navController,
+                    LocalMainNavController provides mainNavController,
+                ),
+            content = content,
+        )
+    }
 }
 
 fun MMRLComponentActivity.setBaseContent(

app/src/main/kotlin/com/dergoogler/mmrl/ui/activity/terminal/action/ActionScreen.kt

@@ -46,6 +46,8 @@ import com.dergoogler.mmrl.ui.providable.LocalUserPreferences
 import com.dergoogler.mmrl.viewmodel.ActionViewModel
 import dev.chrisbanes.haze.hazeSource
 import dev.mmrlx.compose.terminal.Terminal
+import dev.mmrlx.compose.ui.toolbar.ToolbarDefaults
+import dev.mmrlx.compose.ui.toolbar.ToolbarScrollBehavior
 import dev.mmrlx.terminal.TerminalEmulator.Companion.TERMINAL_CURSOR_STYLE_NONE
 import kotlinx.coroutines.launch
 
@@ -54,7 +56,7 @@ fun ActionScreen(viewModel: ActionViewModel) =
     LocalScreenProvider {
         val scope = rememberCoroutineScope()
         val snackbarHostState = remember { SnackbarHostState() }
-        val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+        val scrollBehavior = ToolbarDefaults.pinnedScrollBehavior()
 
         val userPreferences = LocalUserPreferences.current
         val context = LocalContext.current
@@ -174,7 +176,7 @@ private fun TopBar(
     exportLog: () -> Unit,
     event: Event,
     onBack: () -> Unit,
-    scrollBehavior: TopAppBarScrollBehavior,
+    scrollBehavior: ToolbarScrollBehavior,
     enable: Boolean,
 ) = BlurNavigateUpToolbar(
     title = stringResource(id = R.string.action_activity),

app/src/main/kotlin/com/dergoogler/mmrl/ui/activity/terminal/install/InstallScreen.kt

@@ -54,6 +54,8 @@ import com.dergoogler.mmrl.ui.providable.LocalUserPreferences
 import com.dergoogler.mmrl.viewmodel.InstallViewModel
 import dev.chrisbanes.haze.hazeSource
 import dev.mmrlx.compose.terminal.Terminal
+import dev.mmrlx.compose.ui.toolbar.ToolbarDefaults
+import dev.mmrlx.compose.ui.toolbar.ToolbarScrollBehavior
 import dev.mmrlx.terminal.TerminalEmulator.Companion.TERMINAL_CURSOR_STYLE_NONE
 import kotlinx.coroutines.launch
 
@@ -62,7 +64,7 @@ fun InstallScreen(viewModel: InstallViewModel) =
     LocalScreenProvider {
         val scope = rememberCoroutineScope()
         val snackbarHostState = remember { SnackbarHostState() }
-        val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+        val scrollBehavior = ToolbarDefaults.pinnedScrollBehavior()
 
         val userPreferences = LocalUserPreferences.current
         val context = LocalContext.current
@@ -226,7 +228,7 @@ private fun TopBar(
     exportLog: () -> Unit,
     event: Event,
     onBack: () -> Unit,
-    scrollBehavior: TopAppBarScrollBehavior,
+    scrollBehavior: ToolbarScrollBehavior,
     enable: Boolean,
 ) = BlurNavigateUpToolbar(
     title = stringResource(id = R.string.install_screen_title),

app/src/main/kotlin/com/dergoogler/mmrl/ui/component/AntiFeaturesItem.kt

@@ -3,10 +3,10 @@ package com.dergoogler.mmrl.ui.component
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import com.dergoogler.mmrl.R
-import com.dergoogler.mmrl.ui.component.listItem.dsl.ListScope
-import com.dergoogler.mmrl.ui.component.listItem.dsl.component.Item
-import com.dergoogler.mmrl.ui.component.listItem.dsl.component.item.Description
-import com.dergoogler.mmrl.ui.component.listItem.dsl.component.item.Title
+import dev.mmrlx.compose.ui.list.ListScope
+import dev.mmrlx.compose.ui.list.component.Item
+import dev.mmrlx.compose.ui.list.component.item.Description
+import dev.mmrlx.compose.ui.list.component.item.Title
 
 @Composable
 fun ListScope.AntiFeaturesItem(