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
eae4eff9
Commit
eae4eff9
authored
Dec 06, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed custom dialog behaving oddly while displaying scrollable content
parent
848be8f8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
34 deletions
+58
-34
MagiskDialog.kt
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+25
-4
dialog_magisk_base.xml
app/src/main/res/layout/dialog_magisk_base.xml
+33
-30
No files found.
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
View file @
eae4eff9
...
...
@@ -9,9 +9,12 @@ import android.os.Bundle
import
android.view.LayoutInflater
import
android.view.View
import
android.view.ViewGroup
import
android.view.WindowManager
import
androidx.annotation.DrawableRes
import
androidx.annotation.StringRes
import
androidx.appcompat.app.AlertDialog
import
androidx.appcompat.app.AppCompatDialog
import
androidx.core.view.ViewCompat
import
androidx.core.view.updatePadding
import
androidx.databinding.ViewDataBinding
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
...
...
@@ -26,7 +29,7 @@ import me.tatarka.bindingcollectionadapter2.ItemBinding
class
MagiskDialog
@JvmOverloads
constructor
(
context
:
Context
,
theme
:
Int
=
0
)
:
A
ler
tDialog
(
context
,
theme
)
{
)
:
A
ppCompa
tDialog
(
context
,
theme
)
{
private
val
binding
:
DialogMagiskBaseBinding
=
DialogMagiskBaseBinding
.
inflate
(
LayoutInflater
.
from
(
context
))
...
...
@@ -34,12 +37,30 @@ class MagiskDialog @JvmOverloads constructor(
init
{
binding
.
setVariable
(
BR
.
data
,
data
)
super
.
setView
(
binding
.
root
)
}
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
window
?.
setBackgroundDrawable
(
ColorDrawable
(
Color
.
TRANSPARENT
))
super
.
setContentView
(
binding
.
root
)
window
?.
apply
{
setBackgroundDrawable
(
ColorDrawable
(
Color
.
TRANSPARENT
))
setLayout
(
WindowManager
.
LayoutParams
.
MATCH_PARENT
,
WindowManager
.
LayoutParams
.
MATCH_PARENT
)
}
ViewCompat
.
setOnApplyWindowInsetsListener
(
binding
.
root
)
{
view
,
insets
->
view
.
updatePadding
(
top
=
view
.
paddingTop
+
insets
.
systemWindowInsetTop
,
bottom
=
view
.
paddingBottom
+
insets
.
systemWindowInsetBottom
)
insets
}
binding
.
dialogBaseOutsideContainer
.
setOnClickListener
{
setCanceledOnTouchOutside
(
true
)
}
}
inner
class
Data
{
...
...
app/src/main/res/layout/dialog_magisk_base.xml
View file @
eae4eff9
...
...
@@ -13,6 +13,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:id=
"@+id/dialog_base_outside_container"
android:layout_height=
"match_parent"
>
<com.google.android.material.card.MaterialCardView
...
...
@@ -20,10 +21,11 @@
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:cardElevation=
"@dimen/margin_generic"
app:layout_constrainedHeight=
"true"
app:cardUseCompatPadding=
"true"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraint
Left_toLeft
Of=
"parent"
app:layout_constraint
Right_toRigh
tOf=
"parent"
app:layout_constraint
End_toEnd
Of=
"parent"
app:layout_constraint
Start_toStar
tOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintWidth_default=
"percent"
app:layout_constraintWidth_max=
"400dp"
...
...
@@ -51,8 +53,9 @@
android:id=
"@+id/dialog_base_icon"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
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
...
...
@@ -82,64 +85,64 @@
android:gravity=
"center"
android:text=
"@{data.title}"
android:textAppearance=
"@style/AppearanceFoundation.Title"
app:layout_constraint
Left_toLeftOf=
"@+id/dialog_base_start
"
app:layout_constraint
Right_toRightOf=
"@+id/dialog_base_end
"
app:layout_constraint
End_toEndOf=
"@+id/dialog_base_end
"
app:layout_constraint
Start_toStartOf=
"@+id/dialog_base_start
"
app:layout_constraintTop_toBottomOf=
"@+id/dialog_base_icon"
tools:lines=
"1"
tools:text=
"@tools:sample/lorem/random"
/>
<
androidx.core.widget.NestedScrollView
<
FrameLayout
android:id=
"@+id/dialog_base_scroll"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:layout_constrainedHeight=
"true"
android:layout_marginTop=
"@dimen/l_50"
app:layout_constrainedHeight=
"true"
app:layout_constraintBottom_toTopOf=
"@+id/dialog_base_space"
app:layout_constraint
Left_toLeftOf=
"@+id/dialog_base_start
"
app:layout_constraint
Right_toRightOf=
"@+id/dialog_base_end
"
app:layout_constraint
End_toEndOf=
"@+id/dialog_base_end
"
app:layout_constraint
Start_toStartOf=
"@+id/dialog_base_start
"
app:layout_constraintTop_toBottomOf=
"@+id/dialog_base_title"
>
<LinearLayout
<androidx.core.widget.NestedScrollView
gone=
"@{data.message.length == 0}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
>
android:layout_height=
"wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id=
"@+id/dialog_base_message"
gone=
"@{data.message.length == 0}"
android:layout_width=
"match_parent"
android:layout_height=
"
wrap_cont
ent"
android:layout_height=
"
match_par
ent"
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}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</FrameLayout>
<Space
android:id=
"@+id/dialog_base_space"
android:layout_width=
"wrap_content"
android:layout_height=
"@dimen/l1"
app:layout_constraint
Left_toLeftOf=
"parent
"
app:layout_constraint
Right_toRight
Of=
"parent"
app:layout_constraint
Bottom_toTopOf=
"@+id/dialog_base_buttons
"
/>
app:layout_constraint
Bottom_toTopOf=
"@+id/dialog_base_buttons
"
app:layout_constraint
End_toEnd
Of=
"parent"
app:layout_constraint
Start_toStartOf=
"parent
"
/>
<
ScrollView
<
FrameLayout
android:id=
"@+id/dialog_base_buttons"
style=
"?attr/buttonBarStyle"
android:layout_width=
"
match_parent
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
a
ndroid:fillViewport=
"true
"
a
ndroid:scrollbarAlwaysDrawVerticalTrack=
"true
"
app:layout_constraint
Bottom_toBottom
Of=
"parent"
>
a
pp:layout_constraintBottom_toBottomOf=
"parent
"
a
pp:layout_constraintEnd_toEndOf=
"parent
"
app:layout_constraint
Start_toStart
Of=
"parent"
>
<com.android.internal.widget.ButtonBarLayout
android:layout_width=
"match_parent"
...
...
@@ -223,7 +226,7 @@
</com.android.internal.widget.ButtonBarLayout>
</
ScrollView
>
</
FrameLayout
>
</androidx.constraintlayout.widget.ConstraintLayout>
...
...
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