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
9e5cb6cb
Commit
9e5cb6cb
authored
Sep 17, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proper way to setup attr colors
parent
8c19654d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
33 additions
and
31 deletions
+33
-31
DataBindingAdapters.kt
...a/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
+14
-0
ViewModelsModule.kt
...src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
+1
-2
SafetynetFragment.kt
...va/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
+1
-4
SafetynetViewModel.kt
...a/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+3
-14
fragment_safetynet_md2.xml
app/src/main/res/layout/fragment_safetynet_md2.xml
+14
-11
No files found.
app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
View file @
9e5cb6cb
...
...
@@ -297,3 +297,17 @@ fun CardView.setCardBackgroundColorAttr(attr: Int) {
fun
ImageView
.
setTint
(
color
:
Int
)
{
ImageViewCompat
.
setImageTintList
(
this
,
ColorStateList
.
valueOf
(
color
))
}
@BindingAdapter
(
"tintAttr"
)
fun
ImageView
.
setTintAttr
(
attr
:
Int
)
{
val
tv
=
TypedValue
()
context
.
theme
.
resolveAttribute
(
attr
,
tv
,
true
)
ImageViewCompat
.
setImageTintList
(
this
,
ColorStateList
.
valueOf
(
tv
.
data
))
}
@BindingAdapter
(
"textColorAttr"
)
fun
TextView
.
setTextColorAttr
(
attr
:
Int
)
{
val
tv
=
TypedValue
()
context
.
theme
.
resolveAttribute
(
attr
,
tv
,
true
)
setTextColor
(
tv
.
data
)
}
app/src/main/java/com/topjohnwu/magisk/di/ViewModelsModule.kt
View file @
9e5cb6cb
package
com.topjohnwu.magisk.di
import
android.view.ContextThemeWrapper
import
com.topjohnwu.magisk.ui.MainViewModel
import
com.topjohnwu.magisk.ui.flash.FlashFragmentArgs
import
com.topjohnwu.magisk.ui.flash.FlashViewModel
...
...
@@ -22,7 +21,7 @@ val viewModelModules = module {
viewModel
{
HomeViewModel
(
get
())
}
viewModel
{
LogViewModel
(
get
())
}
viewModel
{
ModuleViewModel
(
get
(),
get
(),
get
())
}
viewModel
{
(
context
:
ContextThemeWrapper
)
->
SafetynetViewModel
(
context
)
}
viewModel
{
SafetynetViewModel
(
)
}
viewModel
{
SettingsViewModel
(
get
())
}
viewModel
{
SuperuserViewModel
(
get
(),
get
())
}
viewModel
{
ThemeViewModel
()
}
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetFragment.kt
View file @
9e5cb6cb
...
...
@@ -8,14 +8,11 @@ import com.topjohnwu.magisk.R
import
com.topjohnwu.magisk.arch.BaseUIFragment
import
com.topjohnwu.magisk.databinding.FragmentSafetynetMd2Binding
import
org.koin.androidx.viewmodel.ext.android.viewModel
import
org.koin.core.parameter.parametersOf
class
SafetynetFragment
:
BaseUIFragment
<
SafetynetViewModel
,
FragmentSafetynetMd2Binding
>()
{
override
val
layoutRes
=
R
.
layout
.
fragment_safetynet_md2
override
val
viewModel
by
viewModel
<
SafetynetViewModel
>()
{
parametersOf
(
activity
)
}
override
val
viewModel
by
viewModel
<
SafetynetViewModel
>()
override
fun
onStart
()
{
super
.
onStart
()
...
...
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View file @
9e5cb6cb
package
com.topjohnwu.magisk.ui.safetynet
import
android.util.TypedValue
import
android.view.ContextThemeWrapper
import
androidx.databinding.Bindable
import
com.topjohnwu.magisk.BR
import
com.topjohnwu.magisk.R
...
...
@@ -14,7 +12,7 @@ data class SafetyNetResult(
val
dismiss
:
Boolean
=
false
)
class
SafetynetViewModel
(
context
:
ContextThemeWrapper
)
:
BaseViewModel
()
{
class
SafetynetViewModel
:
BaseViewModel
()
{
@get
:
Bindable
var
safetyNetTitle
=
R
.
string
.
empty
...
...
@@ -38,21 +36,12 @@ class SafetynetViewModel(context: ContextThemeWrapper) : BaseViewModel() {
@get
:
Bindable
var
isSuccess
=
false
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
success
,
BR
.
textColor
)
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
success
,
BR
.
textColor
Attr
)
@get
:
Bindable
val
textColor
get
()
=
if
(
isSuccess
)
colorOnPrimary
else
colorOnError
private
val
colorOnPrimary
:
Int
private
val
colorOnError
:
Int
val
textColorAttr
get
()
=
if
(
isSuccess
)
R
.
attr
.
colorOnPrimary
else
R
.
attr
.
colorOnError
init
{
val
tv
=
TypedValue
()
context
.
theme
.
resolveAttribute
(
R
.
attr
.
colorOnPrimary
,
tv
,
true
)
colorOnPrimary
=
tv
.
data
context
.
theme
.
resolveAttribute
(
R
.
attr
.
colorOnError
,
tv
,
true
)
colorOnError
=
tv
.
data
cachedResult
?.
also
{
resolveResponse
(
SafetyNetResult
(
it
))
}
?:
attest
()
...
...
app/src/main/res/layout/fragment_safetynet_md2.xml
View file @
9e5cb6cb
...
...
@@ -80,8 +80,8 @@
android:gravity=
"center"
android:text=
"@{viewModel.safetyNetTitle}"
android:textAppearance=
"@style/AppearanceFoundation.Display.OnPrimary"
android:textColor=
"@{viewModel.textColor}"
android:textStyle=
"bold"
app:textColorAttr=
"@{viewModel.textColorAttr}"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_chainStyle=
"packed"
app:layout_constraintStart_toStartOf=
"parent"
...
...
@@ -94,10 +94,11 @@
android:layout_height=
"4dp"
android:layout_marginTop=
"@dimen/l2"
app:srcCompat=
"@drawable/bg_divider_rounded_on_primary"
app:tint
=
"@{viewModel.textColo
r}"
app:tint
Attr=
"@{viewModel.textColorAtt
r}"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/safetynet_title"
/>
app:layout_constraintTop_toBottomOf=
"@+id/safetynet_title"
tools:tint=
"?colorOnPrimary"
/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id=
"@+id/checkbox_layout"
...
...
@@ -117,8 +118,8 @@
android:text=
"basicIntegrity"
android:textAppearance=
"@style/AppearanceFoundation.Body.OnPrimary"
android:textStyle=
"bold"
android:textColor=
"@{viewModel.textColor}"
android:layout_marginTop=
"@dimen/l2"
app:textColorAttr=
"@{viewModel.textColorAttr}"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintEnd_toEndOf=
"@id/snet_barrier"
app:layout_constraintTop_toTopOf=
"parent"
...
...
@@ -133,8 +134,8 @@
android:text=
"ctsProfile"
android:textAppearance=
"@style/AppearanceFoundation.Body.OnPrimary"
android:textStyle=
"bold"
android:textColor=
"@{viewModel.textColor}"
android:layout_marginTop=
"@dimen/l2"
app:textColorAttr=
"@{viewModel.textColorAttr}"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintEnd_toEndOf=
"@id/snet_barrier"
app:layout_constraintTop_toBottomOf=
"@id/basic_text"
...
...
@@ -152,20 +153,22 @@
isSelected=
"@{viewModel.basicIntegrityState}"
android:layout_gravity=
"center"
app:srcCompat=
"@drawable/ic_check_circle_md2"
app:tint
=
"@{viewModel.textColo
r}"
app:tint
Attr=
"@{viewModel.textColorAtt
r}"
app:layout_constraintStart_toEndOf=
"@id/snet_barrier"
app:layout_constraintTop_toTopOf=
"@id/basic_text"
app:layout_constraintBottom_toBottomOf=
"@id/basic_text"
/>
app:layout_constraintBottom_toBottomOf=
"@id/basic_text"
tools:tint=
"?colorOnPrimary"
/>
<ImageView
style=
"@style/WidgetFoundation.Icon.OnPrimary"
isSelected=
"@{viewModel.ctsState}"
android:layout_gravity=
"center"
app:srcCompat=
"@drawable/ic_check_circle_md2"
app:tint
=
"@{viewModel.textColo
r}"
app:tint
Attr=
"@{viewModel.textColorAtt
r}"
app:layout_constraintStart_toEndOf=
"@id/snet_barrier"
app:layout_constraintTop_toTopOf=
"@id/cts_text"
app:layout_constraintBottom_toBottomOf=
"@id/cts_text"
/>
app:layout_constraintBottom_toBottomOf=
"@id/cts_text"
tools:tint=
"?colorOnPrimary"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
@@ -186,7 +189,7 @@
android:text=
"evalType"
android:textAppearance=
"@style/AppearanceFoundation.Body.OnPrimary"
android:textStyle=
"bold"
a
ndroid:textColor=
"@{viewModel.textColo
r}"
a
pp:textColorAttr=
"@{viewModel.textColorAtt
r}"
tools:ignore=
"HardcodedText"
/>
<TextView
...
...
@@ -195,9 +198,9 @@
android:layout_gravity=
"center_vertical"
android:textAppearance=
"@style/AppearanceFoundation.Body.OnPrimary"
android:textStyle=
"bold"
android:textColor=
"@{viewModel.textColor}"
android:layout_marginStart=
"@dimen/l1"
android:text=
"@{viewModel.evalType}"
app:textColorAttr=
"@{viewModel.textColorAttr}"
tools:text=
"HARDWARE"
/>
</LinearLayout>
...
...
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