TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 10:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated install ui to better fit app's theme

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-10-26 17:40:29 +02:00
parent a41597431c
commit da707afa3f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/topjohnwu/magisk/utils/DataBindingAdapters.kt
View File

@ -40,6 +40,7 @@ import io.reactivex.Observable
import io.reactivex.disposables.Disposable import io.reactivex.disposables.Disposable
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import kotlin.math.hypot import kotlin.math.hypot
import kotlin.math.roundToInt
@BindingAdapter("onNavigationClick") @BindingAdapter("onNavigationClick")
@ -390,3 +391,8 @@ fun MaterialButton.setIconRes(res: Int) {
fun MaterialCardView.setCardElevationBound(elevation: Float) { fun MaterialCardView.setCardElevationBound(elevation: Float) {
cardElevation = elevation cardElevation = elevation
} }
@BindingAdapter("strokeWidth")
fun MaterialCardView.setCardStrokeWidthBound(stroke: Float) {
strokeWidth = stroke.roundToInt()
}

10
app/src/main/res/layout/fragment_install_md2.xml
View File

@ -33,13 +33,12 @@
android:paddingTop="@dimen/l1"> android:paddingTop="@dimen/l1">
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?styleCardElevated" style="?styleCardVariant"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
android:layout_marginEnd="@dimen/l1" android:layout_marginEnd="@dimen/l1"
app:cardCornerRadius="@dimen/l1" app:strokeWidth="@{viewModel.step != 0 ? 0f : @dimen/l_125}">
app:cardElevation="@{viewModel.step != 0 ? 0f : @dimen/l_25}">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -110,14 +109,13 @@
</com.google.android.material.card.MaterialCardView> </com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView <com.google.android.material.card.MaterialCardView
style="?styleCardElevated" style="?styleCardVariant"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/l1" android:layout_marginStart="@dimen/l1"
android:layout_marginTop="@dimen/l1" android:layout_marginTop="@dimen/l1"
android:layout_marginEnd="@dimen/l1" android:layout_marginEnd="@dimen/l1"
app:cardCornerRadius="@dimen/l1" app:strokeWidth="@{viewModel.step != 1 ? 0f : @dimen/l_125}">
app:cardElevation="@{viewModel.step != 1 ? 0f : @dimen/l_25}">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"