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
7e133b0c
Commit
7e133b0c
authored
Aug 27, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UI tweaks for pre API 21
parent
fd808bd5
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
38 deletions
+26
-38
DataBindingAdapters.kt
...a/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
+9
-0
SafetynetViewModel.kt
...a/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
+2
-2
fragment_install_md2.xml
app/src/main/res/layout/fragment_install_md2.xml
+3
-9
fragment_safetynet_md2.xml
app/src/main/res/layout/fragment_safetynet_md2.xml
+5
-21
item_hide_md2.xml
app/src/main/res/layout/item_hide_md2.xml
+4
-1
styles_md2_impl.xml
app/src/main/res/values/styles_md2_impl.xml
+3
-5
No files found.
app/src/main/java/com/topjohnwu/magisk/databinding/DataBindingAdapters.kt
View file @
7e133b0c
...
...
@@ -3,12 +3,14 @@ package com.topjohnwu.magisk.databinding
import
android.animation.ValueAnimator
import
android.graphics.Paint
import
android.graphics.drawable.Drawable
import
android.util.TypedValue
import
android.view.ContextThemeWrapper
import
android.view.View
import
android.view.ViewGroup
import
android.widget.*
import
androidx.annotation.DrawableRes
import
androidx.appcompat.widget.Toolbar
import
androidx.cardview.widget.CardView
import
androidx.core.view.isGone
import
androidx.core.view.isInvisible
import
androidx.core.view.updateLayoutParams
...
...
@@ -302,3 +304,10 @@ fun setListeners(
attrChange
.
onChange
()
}
}
@BindingAdapter
(
"cardBackgroundColorAttr"
)
fun
CardView
.
setCardBackgroundColorAttr
(
attr
:
Int
)
{
val
tv
=
TypedValue
()
context
.
theme
.
resolveAttribute
(
attr
,
tv
,
true
)
setCardBackgroundColor
(
tv
.
data
)
}
app/src/main/java/com/topjohnwu/magisk/ui/safetynet/SafetynetViewModel.kt
View file @
7e133b0c
...
...
@@ -9,7 +9,7 @@ import com.topjohnwu.magisk.utils.set
import
org.json.JSONObject
enum
class
SafetyNetState
{
LOADING
,
PASS
,
FAILED
,
IDLE
LOADING
,
PASS
,
FAILED
}
data class
SafetyNetResult
(
...
...
@@ -42,7 +42,7 @@ class SafetynetViewModel : BaseViewModel() {
@get
:
Bindable
val
isSuccess
get
()
=
currentState
==
PASS
private
var
currentState
=
IDLE
private
var
currentState
=
LOADING
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
checking
,
BR
.
failed
,
BR
.
success
)
init
{
...
...
app/src/main/res/layout/fragment_install_md2.xml
View file @
7e133b0c
...
...
@@ -96,33 +96,27 @@
<CheckBox
gone=
"@{Info.isSAR}"
style=
"@style/WidgetFoundation.Checkbox"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"start|center_vertical"
android:checked=
"@={Config.keepVerity}"
android:gravity=
"center"
android:text=
"@string/keep_dm_verity"
tools:checked=
"true"
/>
<CheckBox
gone=
"@{Info.isFBE}"
style=
"@style/WidgetFoundation.Checkbox"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"start|center_vertical"
android:checked=
"@={Config.keepEnc}"
android:gravity=
"center"
android:text=
"@string/keep_force_encryption"
app:tint=
"?colorPrimary"
/>
<CheckBox
gone=
"@{Info.ramdisk}"
style=
"@style/WidgetFoundation.Checkbox"
android:layout_width=
"
wrap_cont
ent"
android:layout_width=
"
match_par
ent"
android:layout_height=
"wrap_content"
android:layout_gravity=
"start|center_vertical"
android:checked=
"@={Config.recovery}"
android:gravity=
"center"
android:text=
"@string/recovery_mode"
app:tint=
"?colorPrimary"
/>
...
...
app/src/main/res/layout/fragment_safetynet_md2.xml
View file @
7e133b0c
...
...
@@ -7,8 +7,8 @@
<import
type=
"android.os.Build"
/>
<import
type=
"com.topjohnwu.magisk.core.Info"
/>
<import
type=
"com.topjohnwu.magisk.BuildConfig"
/>
<import
type=
"com.topjohnwu.magisk.R"
/>
<variable
name=
"viewModel"
...
...
@@ -40,7 +40,7 @@
android:textAppearance=
"@style/AppearanceFoundation.Title"
/>
<androidx.constraintlayout.widget.ConstraintLayout
invisible
Unless=
"@{viewModel.success || viewModel.failed
}"
invisible
=
"@{viewModel.checking
}"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:paddingTop=
"@dimen/l1"
...
...
@@ -49,6 +49,7 @@
<com.google.android.material.card.MaterialCardView
android:id=
"@+id/safetynet_attestation"
style=
"@style/WidgetFoundation.Card.Elevated"
cardBackgroundColorAttr=
"@{viewModel.success ? R.attr.colorPrimary : R.attr.colorError}"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
...
...
@@ -62,30 +63,13 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintVertical_bias=
".35"
app:layout_constraintWidth_max=
"300dp"
>
app:layout_constraintWidth_max=
"300dp"
tools:cardBackgroundColor=
"?colorPrimary"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<View
goneUnless=
"@{viewModel.failed}"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:alpha=
".5"
android:background=
"?colorError"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<View
goneUnless=
"@{viewModel.success}"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:alpha=
".5"
android:background=
"?colorPrimary"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<TextView
android:id=
"@+id/safetynet_title"
android:layout_width=
"0dp"
...
...
app/src/main/res/layout/item_hide_md2.xml
View file @
7e133b0c
...
...
@@ -77,8 +77,11 @@
<com.topjohnwu.widget.IndeterminateCheckBox
android:id=
"@+id/hide_expand_icon"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:minWidth=
"0dp"
android:minHeight=
"0dp"
android:layout_marginEnd=
"@dimen/l1"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
...
...
app/src/main/res/values/styles_md2_impl.xml
View file @
7e133b0c
...
...
@@ -21,7 +21,7 @@
<item
name=
"cardBackgroundColor"
>
?colorSurfaceVariant
</item>
<item
name=
"cardCornerRadius"
>
@dimen/l_50
</item>
<item
name=
"cardElevation"
>
0dp
</item>
<item
name=
"cardPreventCornerOverlap"
>
tru
e
</item>
<item
name=
"cardPreventCornerOverlap"
>
fals
e
</item>
</style>
<style
name=
"WidgetFoundation.Card.Primary"
>
...
...
@@ -41,20 +41,18 @@
<item
name=
"strokeColor"
>
?colorPrimary
</item>
</style>
<style
name=
"WidgetFoundation.Card.Elevated"
parent=
"Widget.MaterialComponents.CardView"
>
<style
name=
"WidgetFoundation.Card.Elevated"
>
<item
name=
"cardBackgroundColor"
>
?colorSurfaceSurfaceVariant
</item>
<item
name=
"cardCornerRadius"
>
@dimen/l_50
</item>
<item
name=
"cardElevation"
>
@dimen/l_125
</item>
<item
name=
"cardPreventCornerOverlap"
>
true
</item>
</style>
<style
name=
"WidgetFoundation.Card.OnPrimary"
parent=
"Widget.MaterialComponents.CardView"
>
<style
name=
"WidgetFoundation.Card.OnPrimary"
>
<item
name=
"cardCornerRadius"
>
@dimen/l_50
</item>
<item
name=
"cardElevation"
>
0dp
</item>
<item
name=
"strokeColor"
>
?colorOnPrimaryVariant
</item>
<item
name=
"strokeWidth"
>
1dp
</item>
<item
name=
"cardBackgroundColor"
>
?colorPrimary
</item>
<item
name=
"cardPreventCornerOverlap"
>
true
</item>
</style>
...
...
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