mirror of
https://github.com/topjohnwu/Magisk.git
synced 2024-12-24 22:07:39 +00:00
Updated install ui to better fit app's theme
This commit is contained in:
parent
a41597431c
commit
da707afa3f
@ -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")
|
||||
@ -389,4 +390,9 @@ fun MaterialButton.setIconRes(res: Int) {
|
||||
@BindingAdapter("cardElevation")
|
||||
fun MaterialCardView.setCardElevationBound(elevation: Float) {
|
||||
cardElevation = elevation
|
||||
}
|
||||
|
||||
@BindingAdapter("strokeWidth")
|
||||
fun MaterialCardView.setCardStrokeWidthBound(stroke: Float) {
|
||||
strokeWidth = stroke.roundToInt()
|
||||
}
|
@ -33,13 +33,12 @@
|
||||
android:paddingTop="@dimen/l1">
|
||||
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
style="?styleCardElevated"
|
||||
style="?styleCardVariant"
|
||||
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="?styleCardElevated"
|
||||
style="?styleCardVariant"
|
||||
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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user