gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2026-06-12 19:11:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use MarkdownText for release notes in core install bottom sheet

Browse Source 
Made-with: Cursor
This commit is contained in:
LoveSy
2026-03-05 12:53:15 +08:00
committed by topjohnwu
parent 299350cb7b
commit b087cb2876
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/apk/src/main/java/com/topjohnwu/magisk/arch/ViewModelFactory.kt
+1 -1
View File
@@ -17,7 +17,7 @@ object VMFactory : ViewModelProvider.Factory {
LogViewModel::class.java -> LogViewModel(ServiceLocator.logRepo)
SuperuserViewModel::class.java -> SuperuserViewModel(ServiceLocator.policyDB)
InstallViewModel::class.java ->
InstallViewModel(ServiceLocator.networkService, ServiceLocator.markwon)
InstallViewModel(ServiceLocator.networkService)
SuRequestViewModel::class.java ->
SuRequestViewModel(ServiceLocator.policyDB, ServiceLocator.timeoutPrefs)
else -> modelClass.newInstance()
app/apk/src/main/java/com/topjohnwu/magisk/ui/home/HomeScreen.kt
+4 -6
View File
@@ -67,6 +67,7 @@ import com.topjohnwu.magisk.core.tasks.MagiskInstaller
import com.topjohnwu.magisk.ui.MainActivity
import com.topjohnwu.magisk.ui.component.ConfirmResult
import com.topjohnwu.magisk.ui.component.LoadingDialogHandle
import com.topjohnwu.magisk.ui.component.MarkdownText
import com.topjohnwu.magisk.ui.component.MarkdownTextAsync
import com.topjohnwu.magisk.ui.component.rememberConfirmDialog
import com.topjohnwu.magisk.ui.component.rememberLoadingDialog
@@ -819,12 +820,9 @@ private fun InstallBottomSheet(
) {
Column(modifier = Modifier.padding(bottom = 16.dp)) {
if (installUiState.notes.isNotEmpty()) {
Text(
text = installUiState.notes,
style = MiuixTheme.textStyles.body2,
color = MiuixTheme.colorScheme.onSurfaceVariantSummary,
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)
)
Box(modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp)) {
MarkdownText(installUiState.notes)
}
HorizontalDivider(thickness = 0.75.dp)
}
app/apk/src/main/java/com/topjohnwu/magisk/ui/install/InstallViewModel.kt
+2 -4
View File
@@ -12,7 +12,6 @@ import com.topjohnwu.magisk.core.ktx.toast
import com.topjohnwu.magisk.core.repository.NetworkService
import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.ui.navigation.Route
import io.noties.markwon.Markwon
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
@@ -25,7 +24,7 @@ import java.io.File
import java.io.IOException
import com.topjohnwu.magisk.core.R as CoreR
class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel() {
class InstallViewModel(svc: NetworkService) : BaseViewModel() {
enum class Method { NONE, PATCH, DIRECT, INACTIVE_SLOT }
@@ -58,9 +57,8 @@ class InstallViewModel(svc: NetworkService, markwon: Markwon) : BaseViewModel()
note
}
}
val spanned = markwon.toMarkdown(noteText)
withContext(Dispatchers.Main) {
_uiState.update { it.copy(notes = spanned.toString()) }
_uiState.update { it.copy(notes = noteText) }
}
} catch (e: IOException) {
Timber.e(e)