Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
0f34457a
Commit
0f34457a
authored
Oct 31, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Directly store strings in viewmodel
parent
34c65e13
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
9 deletions
+7
-9
HomeViewModel.kt
...c/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
+6
-6
fragment_magisk.xml
app/src/main/res/layout/fragment_magisk.xml
+1
-3
No files found.
app/src/main/java/com/topjohnwu/magisk/ui/home/HomeViewModel.kt
View file @
0f34457a
...
...
@@ -77,7 +77,7 @@ class HomeViewModel(
""
}
val
safetyNetTitle
=
KObservableField
(
R
.
string
.
safetyNet_check_text
)
val
safetyNetTitle
=
KObservableField
(
R
.
string
.
safetyNet_check_text
.
res
()
)
val
ctsState
=
KObservableField
(
SafetyNetState
.
IDLE
)
val
basicIntegrityState
=
KObservableField
(
SafetyNetState
.
IDLE
)
val
safetyNetState
=
Observer
(
ctsState
,
basicIntegrityState
)
{
...
...
@@ -135,7 +135,7 @@ class HomeViewModel(
fun
safetyNetPressed
()
{
ctsState
.
value
=
SafetyNetState
.
LOADING
basicIntegrityState
.
value
=
SafetyNetState
.
LOADING
safetyNetTitle
.
value
=
R
.
string
.
checking_safetyNet_status
safetyNetTitle
.
value
=
R
.
string
.
checking_safetyNet_status
.
res
()
UpdateSafetyNetEvent
().
publish
()
}
...
...
@@ -144,7 +144,7 @@ class HomeViewModel(
response
and
0
x0F
==
0
->
{
val
hasCtsPassed
=
response
and
SafetyNetHelper
.
CTS_PASS
!=
0
val
hasBasicIntegrityPassed
=
response
and
SafetyNetHelper
.
BASIC_PASS
!=
0
safetyNetTitle
.
value
=
R
.
string
.
safetyNet_check_success
safetyNetTitle
.
value
=
R
.
string
.
safetyNet_check_success
.
res
()
ctsState
.
value
=
if
(
hasCtsPassed
)
{
SafetyNetState
.
PASS
}
else
{
...
...
@@ -164,8 +164,8 @@ class HomeViewModel(
ctsState
.
value
=
SafetyNetState
.
IDLE
basicIntegrityState
.
value
=
SafetyNetState
.
IDLE
safetyNetTitle
.
value
=
when
(
response
)
{
SafetyNetHelper
.
RESPONSE_ERR
->
R
.
string
.
safetyNet_res_invalid
else
->
R
.
string
.
safetyNet_api_error
SafetyNetHelper
.
RESPONSE_ERR
->
R
.
string
.
safetyNet_res_invalid
.
res
()
else
->
R
.
string
.
safetyNet_api_error
.
res
()
}
}
}
...
...
@@ -192,7 +192,7 @@ class HomeViewModel(
_managerState
.
value
=
MagiskState
.
LOADING
ctsState
.
value
=
SafetyNetState
.
IDLE
basicIntegrityState
.
value
=
SafetyNetState
.
IDLE
safetyNetTitle
.
value
=
R
.
string
.
safetyNet_check_text
safetyNetTitle
.
value
=
R
.
string
.
safetyNet_check_text
.
res
()
}.
subscribeK
{
updateSelf
()
ensureEnv
()
...
...
app/src/main/res/layout/fragment_magisk.xml
View file @
0f34457a
...
...
@@ -15,8 +15,6 @@
<import
type=
"com.topjohnwu.magisk.R"
/>
<import
type=
"com.topjohnwu.magisk.extensions.XStringKt"
/>
<variable
name=
"viewModel"
type=
"com.topjohnwu.magisk.ui.home.HomeViewModel"
/>
...
...
@@ -239,7 +237,7 @@
android:layout_marginRight=
"@dimen/margin_generic"
android:gravity=
"center"
android:maxLines=
"1"
android:text=
"@{
XStringKt.res(viewModel.safetyNetTitle)
}"
android:text=
"@{
viewModel.safetyNetTitle
}"
android:textStyle=
"bold"
app:autoSizeMaxTextSize=
"14sp"
app:autoSizeTextType=
"uniform"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment