Added safety notice and support section description

This commit is contained in:
Viktor De Pasquale
2019-11-01 19:02:30 +01:00
parent 6720725d27
commit 7d5555f82e
5 changed files with 79 additions and 19 deletions

View File

@@ -52,6 +52,7 @@ object Config : PreferenceModel, DBConfig {
const val SHOW_SYSTEM_APP = "show_system"
const val DOWNLOAD_PATH = "download_path"
const val REDESIGN = "redesign"
const val SAFETY = "safety_notice"
// system state
const val MAGISKHIDE = "magiskhide"
@@ -117,6 +118,7 @@ object Config : PreferenceModel, DBConfig {
var suNotification by preferenceStrInt(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST)
var updateChannel by preferenceStrInt(Key.UPDATE_CHANNEL, defaultChannel)
var safetyNotice by preference(Key.SAFETY, true)
var redesign by preference(Key.REDESIGN, false)
@Deprecated("Use extended dark theme")
var darkTheme by preference(Key.DARK_THEME, true)

View File

@@ -2,6 +2,7 @@ package com.topjohnwu.magisk.redesign.home
import android.Manifest
import com.topjohnwu.magisk.BuildConfig
import com.topjohnwu.magisk.Config
import com.topjohnwu.magisk.Info
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.data.repository.MagiskRepository
@@ -34,6 +35,8 @@ class HomeViewModel(
private val repoMagisk: MagiskRepository
) : CompatViewModel() {
val isNoticeVisible = KObservableField(Config.safetyNotice)
val stateMagisk = KObservableField(MagiskState.LOADING)
val stateManager = KObservableField(MagiskState.LOADING)
val stateTextMagisk = Observer(stateMagisk) {
@@ -143,6 +146,11 @@ class HomeViewModel(
fun toggle(kof: KObservableField<Boolean>) = kof.toggle()
fun hideNotice() {
Config.safetyNotice = false
isNoticeVisible.value = false
}
private fun ensureEnv() {
val invalidStates = listOf(
MagiskState.NOT_INSTALLED,