A rootless Android app that boots Alpine Linux: run containers (Podman/Docker/LXC) and GUI desktop apps.
fix: move TerminalView creation into ViewModel for navigation survival
ExTvf73dccc5b105
diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.ktindex 1d395bd..8cfa16b 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalScreen.kt@@ -11,7 +11,6 @@ package com.excp.podroid.ui.screens.terminalimport android.app.Activityimport android.graphics.Typefaceimport android.view.WindowManager-import com.termux.terminal.TerminalColorsimport androidx.compose.foundation.backgroundimport androidx.compose.foundation.clickableimport androidx.compose.foundation.horizontalScroll@@ -44,10 +43,8 @@ import androidx.compose.material3.TopAppBarimport androidx.compose.material3.TopAppBarDefaultsimport androidx.compose.runtime.Composableimport androidx.compose.runtime.DisposableEffect-import androidx.compose.runtime.LaunchedEffectimport androidx.compose.runtime.collectAsStateimport androidx.compose.runtime.getValue-import androidx.compose.runtime.rememberimport androidx.compose.ui.Alignmentimport androidx.compose.ui.Modifierimport androidx.compose.ui.draw.clip@@ -63,33 +60,6 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModelimport com.excp.podroid.engine.VmStateimport com.termux.view.TerminalView-private fun parseColor(hex: String): Int {- val clean = hex.removePrefix("#")- val color = when (clean.length) {- 3 -> {- val r = clean[0].digitToIntOrNull(16) ?: return android.graphics.Color.BLACK- val g = clean[1].digitToIntOrNull(16) ?: return android.graphics.Color.BLACK- val b = clean[2].digitToIntOrNull(16) ?: return android.graphics.Color.BLACK- android.graphics.Color.rgb(r * 17, g * 17, b * 17)- }- 6 -> {- val r = clean.substring(0, 2).toInt(16)- val g = clean.substring(2, 4).toInt(16)- val b = clean.substring(4, 6).toInt(16)- android.graphics.Color.rgb(r, g, b)- }- 8 -> {- val a = clean.substring(0, 2).toInt(16)- val r = clean.substring(2, 4).toInt(16)- val g = clean.substring(4, 6).toInt(16)- val b = clean.substring(6, 8).toInt(16)- android.graphics.Color.argb(a, r, g, b)- }- else -> android.graphics.Color.BLACK- }- return color-}-@OptIn(ExperimentalMaterial3Api::class)@Composablefun TerminalScreen(@@ -219,62 +189,35 @@ fun TerminalScreen(is VmState.Running -> {Box(modifier = Modifier.weight(1f).fillMaxWidth()) {- val terminalView = remember(vmState) {- val colorFile = java.io.File(context.filesDir, "colors.properties")- val bgColor = if (colorFile.exists()) {- try {- val props = java.util.Properties()- colorFile.inputStream().use { props.load(it) }- TerminalColors.COLOR_SCHEME.updateWith(props)- val bgHex = props["background"] as? String- if (bgHex != null) parseColor(bgHex) else android.graphics.Color.BLACK- } catch (_: Exception) { android.graphics.Color.BLACK }- } else {- android.graphics.Color.BLACK- }- val fontFile = java.io.File(context.filesDir, "font.ttf")- val typeface = if (fontFile.exists()) {- try { Typeface.createFromFile(fontFile) } catch (_: Exception) { Typeface.MONOSPACE }- } else { Typeface.MONOSPACE }- TerminalView(context, null).apply {- setBackgroundColor(bgColor)- setTextSize(fontSize)- setTypeface(typeface)- keepScreenOn = true- isFocusable = true- isFocusableInTouchMode = true- }- }+ val view = viewModel.getOrCreateTerminalView()- LaunchedEffect(terminalView) {+ DisposableEffect(view) {viewModel.createSession()- viewModel.attachView(terminalView)- terminalView.setTerminalViewClient(viewModel.viewClient)+ viewModel.attachView(view)+ view.setTerminalViewClient(viewModel.viewClient)val sess = viewModel.sessionif (sess != null) {- terminalView.mTermSession = sess- terminalView.mEmulator = sess.emulator+ view.mTermSession = sess+ view.mEmulator = sess.emulator}- terminalView.requestFocus()- }-- LaunchedEffect(terminalView) {- val view = terminalView- view.addOnLayoutChangeListener { v, left, top, right, bottom,- oldLeft, oldTop, oldRight, oldBottom ->+ view.requestFocus()+ val listener = android.view.View.OnLayoutChangeListener { v, left, top, right, bottom,+ oldLeft, oldTop, oldRight, oldBottom ->val w = right - leftval h = bottom - top- if (w <= 0 || h <= 0) return@addOnLayoutChangeListener- if (w == oldRight - oldLeft && h == oldBottom - oldTop) return@addOnLayoutChangeListener+ if (w <= 0 || h <= 0) return@OnLayoutChangeListener+ if (w == oldRight - oldLeft && h == oldBottom - oldTop) return@OnLayoutChangeListener(v as TerminalView).updateSize()}+ view.addOnLayoutChangeListener(listener)+ onDispose {+ view.removeOnLayoutChangeListener(listener)+ }}AndroidView(- factory = { terminalView },- update = { view ->- view.setTextSize(fontSize)- },+ factory = { view },+ update = { v -> v.setTextSize(fontSize) },modifier = Modifier.fillMaxSize(),)diff --git a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.ktindex b23f402..6d11d49 100644--- a/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt+++ b/app/src/main/java/com/excp/podroid/ui/screens/terminal/TerminalViewModel.kt@@ -23,11 +23,14 @@ package com.excp.podroid.ui.screens.terminalimport android.annotation.SuppressLintimport android.content.Context+import android.graphics.Color+import android.graphics.Typefaceimport android.os.Buildimport android.os.VibrationEffectimport android.os.Vibratorimport android.os.VibratorManagerimport android.util.Log+import com.termux.terminal.TerminalColorsimport android.view.KeyEventimport android.view.MotionEventimport androidx.lifecycle.ViewModel@@ -59,10 +62,71 @@ class TerminalViewModel @Inject constructor(val terminalFontSize: StateFlow<Int> = settingsRepository.terminalFontSize.stateIn(viewModelScope, SharingStarted.WhileSubscribed(5000), 20)- @SuppressLint("StaticFieldLeak") // nulled in onCleared(); ViewModel is nav-scoped+ @SuppressLint("StaticFieldLeak") // created once per ViewModel lifetime; ViewModel is nav-scopedprivate var terminalView: TerminalView? = nullprivate var attached = false+ fun getOrCreateTerminalView(): TerminalView {+ terminalView?.let { return it }++ val colorFile = java.io.File(context.filesDir, "colors.properties")+ val bgColor = if (colorFile.exists()) {+ try {+ val props = java.util.Properties()+ colorFile.inputStream().use { props.load(it) }+ TerminalColors.COLOR_SCHEME.updateWith(props)+ val bgHex = props["background"] as? String+ if (bgHex != null) parseColor(bgHex) else android.graphics.Color.BLACK+ } catch (_: Exception) { android.graphics.Color.BLACK }+ } else {+ android.graphics.Color.BLACK+ }++ val fontFile = java.io.File(context.filesDir, "font.ttf")+ val typeface = if (fontFile.exists()) {+ try { Typeface.createFromFile(fontFile) } catch (_: Exception) { Typeface.MONOSPACE }+ } else { Typeface.MONOSPACE }++ val view = TerminalView(context, null).apply {+ setBackgroundColor(bgColor)+ setTextSize(terminalFontSize.value)+ setTypeface(typeface)+ keepScreenOn = true+ isFocusable = true+ isFocusableInTouchMode = true+ }+ terminalView = view+ return view+ }++ private fun parseColor(hex: String): Int {+ val clean = hex.removePrefix("#")+ return when (clean.length) {+ 3 -> {+ val r = clean[0].digitToIntOrNull(16) ?: return android.graphics.Color.BLACK+ val g = clean[1].digitToIntOrNull(16) ?: return android.graphics.Color.BLACK+ val b = clean[2].digitToIntOrNull(16) ?: return android.graphics.Color.BLACK+ android.graphics.Color.rgb(r * 17, g * 17, b * 17)+ }+ 6 -> {+ android.graphics.Color.rgb(+ clean.substring(0, 2).toInt(16),+ clean.substring(2, 4).toInt(16),+ clean.substring(4, 6).toInt(16)+ )+ }+ 8 -> {+ android.graphics.Color.argb(+ clean.substring(0, 2).toInt(16),+ clean.substring(2, 4).toInt(16),+ clean.substring(4, 6).toInt(16),+ clean.substring(6, 8).toInt(16)+ )+ }+ else -> android.graphics.Color.BLACK+ }+ }+var session: TerminalSession? = nullprivate set