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
feb0f4b7
Commit
feb0f4b7
authored
Aug 12, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix MagiskDialog
parent
6c8fe465
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
115 additions
and
141 deletions
+115
-141
DataBindingAdapters.kt
...in/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+3
-6
MagiskDialog.kt
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+7
-8
dialog_magisk_base.xml
app/src/main/res/layout/dialog_magisk_base.xml
+103
-125
item_list_single_line.xml
app/src/main/res/layout/item_list_single_line.xml
+2
-2
No files found.
app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
View file @
feb0f4b7
...
...
@@ -6,10 +6,7 @@ import android.graphics.drawable.Drawable
import
android.view.ContextThemeWrapper
import
android.view.View
import
android.view.ViewGroup
import
android.widget.ImageView
import
android.widget.PopupMenu
import
android.widget.ProgressBar
import
android.widget.TextView
import
android.widget.*
import
androidx.annotation.DrawableRes
import
androidx.appcompat.widget.Toolbar
import
androidx.core.view.updateLayoutParams
...
...
@@ -166,8 +163,8 @@ fun RecyclerView.setDividers(dividerVertical: Drawable?, dividerHorizontal: Draw
}
@BindingAdapter
(
"app:icon"
)
fun
Material
Button
.
setIconRes
(
res
:
Int
)
{
setIconResource
(
res
)
fun
Button
.
setIconRes
(
res
:
Int
)
{
(
this
as
MaterialButton
).
setIconResource
(
res
)
}
@BindingAdapter
(
"strokeWidth"
)
...
...
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
View file @
feb0f4b7
...
...
@@ -13,6 +13,7 @@ import android.view.WindowManager
import
androidx.annotation.DrawableRes
import
androidx.annotation.StringRes
import
androidx.appcompat.app.AppCompatDialog
import
androidx.appcompat.content.res.AppCompatResources
import
androidx.core.view.ViewCompat
import
androidx.core.view.updatePadding
import
androidx.databinding.Bindable
...
...
@@ -77,13 +78,9 @@ class MagiskDialog(
override
var
callbacks
:
PropertyChangeRegistry
?
=
null
@get
:
Bindable
var
icon
=
0
var
icon
:
Drawable
?
=
null
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
icon
)
@get
:
Bindable
var
iconRaw
:
Drawable
?
=
null
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
iconRaw
)
@get
:
Bindable
var
title
:
CharSequence
=
""
set
(
value
)
=
set
(
value
,
field
,
{
field
=
it
},
BR
.
title
)
...
...
@@ -185,10 +182,12 @@ class MagiskDialog(
apply
{
data
.
message
=
message
}
fun
applyIcon
(
@DrawableRes
drawableRes
:
Int
)
=
apply
{
data
.
icon
=
drawableRes
}
apply
{
data
.
icon
=
AppCompatResources
.
getDrawable
(
context
,
drawableRes
)
}
fun
applyIcon
(
drawable
:
Drawable
)
=
apply
{
data
.
icon
Raw
=
drawable
}
apply
{
data
.
icon
=
drawable
}
fun
applyButton
(
buttonType
:
ButtonType
,
builder
:
ButtonBuilder
.()
->
Unit
)
=
apply
{
val
button
=
when
(
buttonType
)
{
...
...
@@ -269,7 +268,7 @@ class MagiskDialog(
fun
resetTitle
()
=
applyTitle
(
""
)
fun
resetMessage
()
=
applyMessage
(
""
)
fun
resetIcon
()
=
apply
Icon
(
0
)
fun
resetIcon
()
=
apply
{
data
.
icon
=
null
}
fun
resetButtons
()
=
apply
{
ButtonType
.
values
().
forEach
{
...
...
app/src/main/res/layout/dialog_magisk_base.xml
View file @
feb0f4b7
...
...
@@ -52,35 +52,21 @@
android:orientation=
"vertical"
app:layout_constraintGuide_end=
"16dp"
/>
<FrameLayout
<ImageView
style=
"@style/WidgetFoundation.Image.Big"
gone=
"@{data.icon == null}"
android:id=
"@+id/dialog_base_icon"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"center"
android:layout_marginTop=
"@dimen/l1"
android:src=
"@{data.icon}"
app:layout_constraintBottom_toTopOf=
"@+id/dialog_base_title"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
>
<androidx.appcompat.widget.AppCompatImageView
style=
"@style/WidgetFoundation.Icon.Primary"
gone=
"@{data.icon == 0}"
srcCompat=
"@{data.icon}"
android:layout_gravity=
"center"
android:layout_marginTop=
"@dimen/l1"
android:padding=
"0dp"
tools:src=
"@drawable/ic_delete_md2"
/>
<androidx.appcompat.widget.AppCompatImageView
style=
"@style/WidgetFoundation.Image.Big"
gone=
"@{data.iconRaw == null}"
android:layout_gravity=
"center"
android:layout_marginTop=
"@dimen/l1"
android:src=
"@{data.iconRaw}"
app:layout_constraintTop_toTopOf=
"parent"
tools:src=
"@drawable/ic_delete_md2"
/>
</FrameLayout>
<androidx.appcompat.widget.AppCompatTextView
<TextView
gone=
"@{data.title.length == 0}"
android:id=
"@+id/dialog_base_title"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
@@ -94,34 +80,31 @@
tools:lines=
"1"
tools:text=
"@tools:sample/lorem/random"
/>
<FrameLayout
android:id=
"@+id/dialog_base_scroll"
<androidx.core.widget.NestedScrollView
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/l_50"
android:overScrollMode=
"ifContentScrolls"
app:layout_constrainedHeight=
"true"
app:layout_constraintBottom_toTopOf=
"@+id/dialog_base_space"
app:layout_constraintEnd_toEndOf=
"@+id/dialog_base_end"
app:layout_constraintStart_toStartOf=
"@+id/dialog_base_start"
app:layout_constraintTop_toBottomOf=
"@+id/dialog_base_title"
>
<androidx.core.widget.NestedScrollView
gone=
"@{data.message.length == 0}"
<FrameLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
<TextView
gone=
"@{data.message.length == 0}"
android:id=
"@+id/dialog_base_message"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center"
android:text=
"@{data.message}"
android:textAppearance=
"@style/AppearanceFoundation.Body"
tools:lines=
"3"
tools:text=
"@tools:sample/lorem/random"
/>
</androidx.core.widget.NestedScrollView>
<FrameLayout
android:id=
"@+id/dialog_base_container"
gone=
"@{data.message.length != 0}"
...
...
@@ -130,26 +113,23 @@
</FrameLayout>
</androidx.core.widget.NestedScrollView>
<Space
android:id=
"@+id/dialog_base_space"
android:layout_width=
"wrap_content"
android:layout_height=
"@dimen/l
1
"
android:layout_height=
"@dimen/l
_50
"
app:layout_constraintBottom_toTopOf=
"@+id/dialog_base_buttons"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
/>
<
Frame
Layout
<
androidx.appcompat.widget.ButtonBar
Layout
android:id=
"@+id/dialog_base_buttons"
style=
"?attr/buttonBarStyle"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
>
<androidx.appcompat.widget.ButtonBarLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
app:layout_constraintStart_toStartOf=
"parent"
android:gravity=
"bottom|center_horizontal"
android:layoutDirection=
"locale"
android:orientation=
"horizontal"
...
...
@@ -158,7 +138,7 @@
android:paddingEnd=
"12dp"
android:paddingBottom=
"4dp"
>
<com.google.android.material.button.Material
Button
<
Button
android:id=
"@+id/dialog_base_button_4"
style=
"@style/WidgetFoundation.Button.Text"
gone=
"@{data.buttonIDGAF.icon == 0 && data.buttonIDGAF.title.length == 0}"
...
...
@@ -173,7 +153,7 @@
tools:icon=
"@drawable/ic_bug_md2"
tools:text=
"Button 1"
/>
<com.google.android.material.button.Material
Button
<
Button
android:id=
"@+id/dialog_base_button_2"
style=
"@style/WidgetFoundation.Button.Text"
gone=
"@{data.buttonNeutral.icon == 0 && data.buttonNeutral.title.length == 0}"
...
...
@@ -196,7 +176,7 @@
android:layout_weight=
"1"
android:visibility=
"invisible"
/>
<com.google.android.material.button.Material
Button
<
Button
android:id=
"@+id/dialog_base_button_3"
style=
"@style/WidgetFoundation.Button.Text"
gone=
"@{data.buttonNegative.icon == 0 && data.buttonNegative.title.length == 0}"
...
...
@@ -211,7 +191,7 @@
tools:icon=
"@drawable/ic_bug_md2"
tools:text=
"Button 1"
/>
<com.google.android.material.button.Material
Button
<
Button
android:id=
"@+id/dialog_base_button_1"
style=
"@style/WidgetFoundation.Button.Text"
gone=
"@{data.buttonPositive.icon == 0 && data.buttonPositive.title.length == 0}"
...
...
@@ -229,8 +209,6 @@
</androidx.appcompat.widget.ButtonBarLayout>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
...
...
app/src/main/res/layout/item_list_single_line.xml
View file @
feb0f4b7
...
...
@@ -14,7 +14,7 @@
</data>
<
androidx.appcompat.widget.AppCompat
TextView
<TextView
android:id=
"@android:id/text1"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
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