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
da707afa
Commit
da707afa
authored
Oct 26, 2019
by
Viktor De Pasquale
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated install ui to better fit app's theme
parent
a4159743
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
DataBindingAdapters.kt
...in/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
+6
-0
fragment_install_md2.xml
app/src/main/res/layout/fragment_install_md2.xml
+4
-6
No files found.
app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
View file @
da707afa
...
...
@@ -40,6 +40,7 @@ import io.reactivex.Observable
import
io.reactivex.disposables.Disposable
import
java.util.concurrent.TimeUnit
import
kotlin.math.hypot
import
kotlin.math.roundToInt
@BindingAdapter
(
"onNavigationClick"
)
...
...
@@ -390,3 +391,8 @@ fun MaterialButton.setIconRes(res: Int) {
fun
MaterialCardView
.
setCardElevationBound
(
elevation
:
Float
)
{
cardElevation
=
elevation
}
@BindingAdapter
(
"strokeWidth"
)
fun
MaterialCardView
.
setCardStrokeWidthBound
(
stroke
:
Float
)
{
strokeWidth
=
stroke
.
roundToInt
()
}
\ No newline at end of file
app/src/main/res/layout/fragment_install_md2.xml
View file @
da707afa
...
...
@@ -33,13 +33,12 @@
android:paddingTop=
"@dimen/l1"
>
<com.google.android.material.card.MaterialCardView
style=
"?styleCard
Elevated
"
style=
"?styleCard
Variant
"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
app:cardCornerRadius=
"@dimen/l1"
app:cardElevation=
"@{viewModel.step != 0 ? 0f : @dimen/l_25}"
>
app:strokeWidth=
"@{viewModel.step != 0 ? 0f : @dimen/l_125}"
>
<LinearLayout
android:layout_width=
"match_parent"
...
...
@@ -110,14 +109,13 @@
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
style=
"?styleCard
Elevated
"
style=
"?styleCard
Variant
"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"@dimen/l1"
android:layout_marginTop=
"@dimen/l1"
android:layout_marginEnd=
"@dimen/l1"
app:cardCornerRadius=
"@dimen/l1"
app:cardElevation=
"@{viewModel.step != 1 ? 0f : @dimen/l_25}"
>
app:strokeWidth=
"@{viewModel.step != 1 ? 0f : @dimen/l_125}"
>
<LinearLayout
android:layout_width=
"match_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