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
34a0a00e
Commit
34a0a00e
authored
Nov 29, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated constraint layout to fix layout issue in dialog
parent
dec1094a
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
13 additions
and
18 deletions
+13
-18
build.gradle
app/build.gradle
+1
-1
MagiskDialog.kt
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
+5
-6
item_settings_blank.xml
app/src/main/res/layout/item_settings_blank.xml
+3
-4
item_settings_input.xml
app/src/main/res/layout/item_settings_input.xml
+0
-1
item_settings_selector.xml
app/src/main/res/layout/item_settings_selector.xml
+1
-2
item_settings_toggle.xml
app/src/main/res/layout/item_settings_toggle.xml
+3
-4
No files found.
app/build.gradle
View file @
34a0a00e
...
...
@@ -121,7 +121,7 @@ dependencies {
implementation
"androidx.navigation:navigation-ui-ktx:${vNav}"
implementation
'androidx.biometric:biometric:1.0.0'
implementation
'androidx.constraintlayout:constraintlayout:
1.1.
3'
implementation
'androidx.constraintlayout:constraintlayout:
2.0.0-beta
3'
implementation
'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha03'
implementation
'androidx.browser:browser:1.0.0'
implementation
'androidx.preference:preference:1.1.0'
...
...
app/src/main/java/com/topjohnwu/magisk/view/MagiskDialog.kt
View file @
34a0a00e
...
...
@@ -12,7 +12,6 @@ import android.view.ViewGroup
import
androidx.annotation.DrawableRes
import
androidx.annotation.StringRes
import
androidx.appcompat.app.AlertDialog
import
androidx.core.view.updateLayoutParams
import
androidx.databinding.ViewDataBinding
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.RecyclerView
...
...
@@ -193,11 +192,11 @@ class MagiskDialog @JvmOverloads constructor(
fun
applyView
(
view
:
View
)
=
apply
{
resetView
()
binding
.
dialogBaseContainer
.
addView
(
view
)
view
.
updateLayoutParams
<
ViewGroup
.
LayoutParams
>
{
width
=
ViewGroup
.
LayoutParams
.
MATCH_PARENT
height
=
ViewGroup
.
LayoutParams
.
WRAP_CONTENT
}
binding
.
dialogBaseContainer
.
addView
(
view
,
ViewGroup
.
LayoutParams
.
MATCH_PARENT
,
ViewGroup
.
LayoutParams
.
WRAP_CONTENT
)
}
fun
onDismiss
(
callback
:
OnDialogButtonClickListener
)
=
...
...
app/src/main/res/layout/item_settings_blank.xml
View file @
34a0a00e
...
...
@@ -17,17 +17,16 @@
<com.google.android.material.card.MaterialCardView
style=
"@style/WidgetFoundation.Card"
android:layout_width=
"match_parent"
isEnabled=
"@{item.enabled}"
android:
alpha=
"@{item.enabled ? 1f : .5f}
"
android:
layout_width=
"match_parent
"
android:layout_height=
"wrap_content"
android:alpha=
"@{item.enabled ? 1f : .5f}"
android:onClick=
"@{(view) -> callback.onItemPressed(view, item)}"
tools:layout_gravity=
"center"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:minHeight=
"?listPreferredItemHeightSmall"
android:orientation=
"vertical"
>
<androidx.appcompat.widget.AppCompatImageView
...
...
@@ -75,7 +74,7 @@
android:text=
"@{item.title}"
android:textAppearance=
"@style/AppearanceFoundation.Body"
android:textStyle=
"bold"
tools:lines=
"
1
"
tools:lines=
"
2
"
tools:text=
"@tools:sample/lorem/random"
/>
<androidx.appcompat.widget.AppCompatTextView
...
...
app/src/main/res/layout/item_settings_input.xml
View file @
34a0a00e
...
...
@@ -27,7 +27,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:minHeight=
"?listPreferredItemHeightSmall"
android:orientation=
"vertical"
>
<androidx.appcompat.widget.AppCompatImageView
...
...
app/src/main/res/layout/item_settings_selector.xml
View file @
34a0a00e
...
...
@@ -17,9 +17,9 @@
<com.google.android.material.card.MaterialCardView
style=
"@style/WidgetFoundation.Card"
isEnabled=
"@{item.enabled}"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
isEnabled=
"@{item.enabled}"
android:alpha=
"@{item.enabled ? 1f : .5f}"
android:onClick=
"@{(view) -> item.onPressed(view, callback)}"
tools:layout_gravity=
"center"
>
...
...
@@ -27,7 +27,6 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:minHeight=
"?listPreferredItemHeightSmall"
android:orientation=
"vertical"
>
<androidx.appcompat.widget.AppCompatImageView
...
...
app/src/main/res/layout/item_settings_toggle.xml
View file @
34a0a00e
...
...
@@ -19,17 +19,16 @@
<com.google.android.material.card.MaterialCardView
style=
"@style/WidgetFoundation.Card"
android:layout_width=
"match_parent"
isEnabled=
"@{item.enabled}"
android:
alpha=
"@{item.enabled ? 1f : .5f}
"
android:
layout_width=
"match_parent
"
android:layout_height=
"wrap_content"
android:alpha=
"@{item.enabled ? 1f : .5f}"
android:onClick=
"@{(view) -> item.onPressed(view, callback)}"
tools:layout_gravity=
"center"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:minHeight=
"?listPreferredItemHeightSmall"
android:orientation=
"vertical"
>
<androidx.appcompat.widget.AppCompatImageView
...
...
@@ -46,12 +45,12 @@
<com.google.android.material.switchmaterial.SwitchMaterial
android:id=
"@+id/toggle_indicator"
style=
"@style/WidgetFoundation.Switch"
isEnabled=
"@{item.enabled}"
onTouch=
"@{(view, event) -> item.onTouched(view, callback, event)}"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/l_25"
android:checked=
"@{item.value}"
isEnabled=
"@{item.enabled}"
android:text=
""
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
...
...
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