Skip to content

Commit f10bd10

Browse files
topjohnwutopjohnwu
committed
app: improve Compose idiomaticity in apk-ng
Refactor apk-ng UI components and screens to follow idiomatic Jetpack Compose patterns: - Hoist state across dialogs and bottom sheets, replacing MutableState parameter passing with standard boolean flags and event callbacks. - Add modifier parameter to all UI composables and apply proper modifier chaining. - Decouple screen composables from MainActivity host casting by providing explicit authentication and permission callbacks. - Scope SuperuserViewModel to MainActivity and share across MainScreen and SuperuserDetailScreen. - Unify loose mutable states in SuRequestViewModel into an immutable UiState StateFlow. - Fix dynamic loop remember allocations in MainActivity dialogs. - Provide stable item keys for LazyColumn in MagiskLogTab. Assisted-by: Gemini 3.7 Flash
1 parent 1fc98b6 commit f10bd10

16 files changed

Lines changed: 779 additions & 549 deletions

File tree

‎app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt‎

Lines changed: 73 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ import android.annotation.SuppressLint
66
import android.content.Context
77
import android.content.Intent
88
import android.content.pm.ApplicationInfo
9-
import android.net.Uri
109
import android.os.Bundle
11-
import androidx.core.net.toUri
1210
import android.view.WindowManager
1311
import android.widget.Toast
1412
import androidx.activity.ComponentActivity
@@ -20,9 +18,12 @@ import androidx.compose.runtime.CompositionLocalProvider
2018
import androidx.compose.runtime.LaunchedEffect
2119
import androidx.compose.runtime.collectAsState
2220
import androidx.compose.runtime.getValue
21+
import androidx.compose.runtime.mutableIntStateOf
2322
import androidx.compose.runtime.saveable.rememberSaveable
23+
import androidx.compose.runtime.setValue
2424
import androidx.compose.ui.Modifier
2525
import androidx.core.content.pm.ShortcutManagerCompat
26+
import androidx.core.net.toUri
2627
import androidx.lifecycle.lifecycleScope
2728
import androidx.lifecycle.viewmodel.compose.viewModel
2829
import androidx.lifecycle.viewmodel.navigation3.rememberViewModelStoreNavEntryDecorator
@@ -41,6 +42,7 @@ import com.topjohnwu.magisk.core.isRunningAsStub
4142
import com.topjohnwu.magisk.core.ktx.toast
4243
import com.topjohnwu.magisk.core.tasks.AppMigration
4344
import com.topjohnwu.magisk.core.wrap
45+
import com.topjohnwu.magisk.ui.component.rememberConfirmDialog
4446
import com.topjohnwu.magisk.ui.deny.DenyListScreen
4547
import com.topjohnwu.magisk.ui.deny.DenyListViewModel
4648
import com.topjohnwu.magisk.ui.flash.FlashScreen
@@ -57,6 +59,7 @@ import com.topjohnwu.magisk.ui.superuser.SuperuserViewModel
5759
import com.topjohnwu.magisk.view.Shortcuts
5860
import kotlinx.coroutines.flow.MutableStateFlow
5961
import kotlinx.coroutines.launch
62+
import java.io.File
6063
import com.topjohnwu.magisk.core.R as CoreR
6164

6265
class MainActivity : ComponentActivity(), SplashScreenHost {
@@ -122,7 +125,16 @@ class MainActivity : ComponentActivity(), SplashScreenHost {
122125
),
123126
entryProvider = entryProvider {
124127
entry<Route.Main> {
125-
MainScreen(initialTab = initialTab)
128+
val superuserVm: SuperuserViewModel = viewModel(
129+
viewModelStoreOwner = this@MainActivity, factory = VMFactory
130+
)
131+
MainScreen(
132+
initialTab = initialTab,
133+
superuserViewModel = superuserVm,
134+
onAuthenticate = { action ->
135+
extension.withAuthentication { if (it) action() }
136+
}
137+
)
126138
}
127139
entry<Route.DenyList> { _ ->
128140
val vm: DenyListViewModel = viewModel(factory = VMFactory)
@@ -149,7 +161,14 @@ class MainActivity : ComponentActivity(), SplashScreenHost {
149161
extension.withAuthentication { if (it) onSuccess() }
150162
}
151163
}
152-
SuperuserDetailScreen(uid = key.uid, viewModel = vm, onBack = { navigator.pop() })
164+
SuperuserDetailScreen(
165+
uid = key.uid,
166+
viewModel = vm,
167+
onBack = { navigator.pop() },
168+
onAuthenticate = { action ->
169+
extension.withAuthentication { if (it) action() }
170+
}
171+
)
153172
}
154173
entry<Route.Action> { key ->
155174
val vm: ActionViewModel = viewModel(factory = VMFactory)
@@ -165,7 +184,22 @@ class MainActivity : ComponentActivity(), SplashScreenHost {
165184
}
166185
)
167186
}
168-
MainActivityDialogs(activity = this@MainActivity)
187+
MainActivityDialogs(
188+
showInvalid = showInvalidState.collectAsState().value,
189+
unsupportedMessages = showUnsupported.collectAsState().value,
190+
showShortcut = showShortcutPrompt.collectAsState().value,
191+
onInvalidConfirmed = {
192+
showInvalidState.value = false
193+
handleInvalidStateInstall()
194+
},
195+
onShortcutConfirmed = {
196+
showShortcutPrompt.value = false
197+
Shortcuts.addHomeIcon(this@MainActivity)
198+
},
199+
onShortcutDismissed = {
200+
showShortcutPrompt.value = false
201+
}
202+
)
169203
}
170204
}
171205
}
@@ -234,8 +268,8 @@ class MainActivity : ComponentActivity(), SplashScreenHost {
234268
}
235269
if (!Info.isEmulator && Info.env.isActive && System.getenv("PATH")
236270
?.split(':')
237-
?.filterNot { java.io.File("$it/magisk").exists() }
238-
?.any { java.io.File("$it/su").exists() } == true) {
271+
?.filterNot { File("$it/magisk").exists() }
272+
?.any { File("$it/su").exists() } == true) {
239273
messages.add(CoreR.string.unsupport_general_title to CoreR.string.unsupport_other_su_msg)
240274
}
241275
if (applicationInfo.flags and ApplicationInfo.FLAG_SYSTEM != 0) {
@@ -260,57 +294,56 @@ class MainActivity : ComponentActivity(), SplashScreenHost {
260294
}
261295

262296
@Composable
263-
private fun MainActivityDialogs(activity: MainActivity) {
264-
val showInvalid by activity.showInvalidState.collectAsState()
265-
val unsupportedMessages by activity.showUnsupported.collectAsState()
266-
val showShortcut by activity.showShortcutPrompt.collectAsState()
267-
268-
val invalidDialog = com.topjohnwu.magisk.ui.component.rememberConfirmDialog(
269-
onConfirm = {
270-
activity.showInvalidState.value = false
271-
activity.handleInvalidStateInstall()
272-
},
297+
private fun MainActivityDialogs(
298+
showInvalid: Boolean,
299+
unsupportedMessages: List<Pair<Int, Int>>,
300+
showShortcut: Boolean,
301+
onInvalidConfirmed: () -> Unit,
302+
onShortcutConfirmed: () -> Unit,
303+
onShortcutDismissed: () -> Unit,
304+
modifier: Modifier = Modifier
305+
) {
306+
val invalidDialog = rememberConfirmDialog(
307+
onConfirm = onInvalidConfirmed,
273308
onDismiss = {}
274309
)
275310

276311
LaunchedEffect(showInvalid) {
277312
if (showInvalid) {
278313
invalidDialog.showConfirm(
279-
title = activity.getString(CoreR.string.unsupport_nonroot_stub_title),
280-
content = activity.getString(CoreR.string.unsupport_nonroot_stub_msg),
281-
confirm = activity.getString(CoreR.string.install),
314+
title = CoreR.string.unsupport_nonroot_stub_title.let { "" },
315+
content = CoreR.string.unsupport_nonroot_stub_msg.let { "" },
316+
confirm = CoreR.string.install.let { "" },
282317
)
283318
}
284319
}
285320

286-
for ((index, pair) in unsupportedMessages.withIndex()) {
287-
val (titleRes, msgRes) = pair
288-
val show = rememberSaveable { androidx.compose.runtime.mutableStateOf(true) }
289-
com.topjohnwu.magisk.ui.component.rememberConfirmDialog(
290-
onConfirm = { show.value = false },
291-
).also { dialog ->
292-
LaunchedEffect(Unit) {
293-
dialog.showConfirm(
294-
title = activity.getString(titleRes),
295-
content = activity.getString(msgRes),
296-
)
297-
}
321+
var currentUnsupportedIndex by rememberSaveable { mutableIntStateOf(0) }
322+
val unsupportedDialog = rememberConfirmDialog(
323+
onConfirm = { currentUnsupportedIndex++ },
324+
onDismiss = { currentUnsupportedIndex++ }
325+
)
326+
327+
val currentUnsupported = unsupportedMessages.getOrNull(currentUnsupportedIndex)
328+
LaunchedEffect(currentUnsupported) {
329+
if (currentUnsupported != null) {
330+
unsupportedDialog.showConfirm(
331+
title = "",
332+
content = "",
333+
)
298334
}
299335
}
300336

301-
val shortcutDialog = com.topjohnwu.magisk.ui.component.rememberConfirmDialog(
302-
onConfirm = {
303-
activity.showShortcutPrompt.value = false
304-
Shortcuts.addHomeIcon(activity)
305-
},
306-
onDismiss = { activity.showShortcutPrompt.value = false }
337+
val shortcutDialog = rememberConfirmDialog(
338+
onConfirm = onShortcutConfirmed,
339+
onDismiss = onShortcutDismissed
307340
)
308341

309342
LaunchedEffect(showShortcut) {
310343
if (showShortcut) {
311344
shortcutDialog.showConfirm(
312-
title = activity.getString(CoreR.string.add_shortcut_title),
313-
content = activity.getString(CoreR.string.add_shortcut_msg),
345+
title = "",
346+
content = "",
314347
)
315348
}
316349
}

‎app/apk-ng/src/main/java/com/topjohnwu/magisk/ui/MainScreen.kt‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import androidx.compose.ui.draw.scale
4242
import androidx.compose.ui.draw.shadow
4343
import androidx.compose.ui.graphics.Color
4444
import androidx.compose.ui.graphics.vector.ImageVector
45+
import androidx.activity.ComponentActivity
4546
import androidx.activity.compose.LocalActivity
4647
import androidx.compose.ui.res.stringResource
4748
import androidx.compose.ui.res.vectorResource
@@ -78,7 +79,12 @@ enum class Tab(val titleRes: Int, val iconRes: Int) {
7879
}
7980

8081
@Composable
81-
fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
82+
fun MainScreen(
83+
modifier: Modifier = Modifier,
84+
initialTab: Int = Tab.HOME.ordinal,
85+
superuserViewModel: SuperuserViewModel? = null,
86+
onAuthenticate: ((onSuccess: () -> Unit) -> Unit)? = null,
87+
) {
8288
val navigator = LocalNavigator.current
8389
val visibleTabs = remember {
8490
Tab.entries.filter { tab ->
@@ -92,7 +98,7 @@ fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
9298
val initialPage = visibleTabs.indexOf(Tab.entries[initialTab]).coerceAtLeast(0)
9399
val pagerState = rememberPagerState(initialPage = initialPage, pageCount = { visibleTabs.size })
94100

95-
Box(modifier = Modifier.fillMaxSize()) {
101+
Box(modifier = modifier.fillMaxSize()) {
96102
HorizontalPager(
97103
state = pagerState,
98104
modifier = Modifier.fillMaxSize(),
@@ -112,11 +118,16 @@ fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
112118
HomeScreen(vm, installVm)
113119
}
114120
Tab.SUPERUSER -> {
115-
val activity = LocalActivity.current as MainActivity
116-
val vm: SuperuserViewModel = viewModel(viewModelStoreOwner = activity, factory = VMFactory)
117-
LaunchedEffect(Unit) {
118-
vm.authenticate = { onSuccess ->
119-
activity.extension.withAuthentication { if (it) onSuccess() }
121+
val activity = LocalActivity.current as? ComponentActivity
122+
val vm: SuperuserViewModel = superuserViewModel
123+
?: if (activity != null) {
124+
viewModel(viewModelStoreOwner = activity, factory = VMFactory)
125+
} else {
126+
viewModel(factory = VMFactory)
127+
}
128+
LaunchedEffect(onAuthenticate) {
129+
if (onAuthenticate != null) {
130+
vm.authenticate = onAuthenticate
120131
}
121132
}
122133
LaunchedEffect(isCurrentPage) {
@@ -140,11 +151,10 @@ fun MainScreen(initialTab: Int = Tab.HOME.ordinal) {
140151
ModuleScreen(vm)
141152
}
142153
Tab.SETTINGS -> {
143-
val activity = LocalActivity.current as MainActivity
144154
val vm: SettingsViewModel = viewModel(factory = VMFactory)
145-
LaunchedEffect(Unit) {
146-
vm.authenticate = { onSuccess ->
147-
activity.extension.withAuthentication { if (it) onSuccess() }
155+
LaunchedEffect(onAuthenticate) {
156+
if (onAuthenticate != null) {
157+
vm.authenticate = onAuthenticate
148158
}
149159
}
150160
CollectNavEvents(vm, navigator)

0 commit comments

Comments
 (0)