atridad/Mealient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Start migration to Material 3

Browse Source 
Theme was generated here
https://material-foundation.github.io/material-theme-builder/#/custom
Primary: BB86FC
Secondary: 655A70
Tertiary: 805159
Neutral: 605D62
This commit is contained in:
Kirill Kamakin
2022-04-09 16:48:30 +05:00
parent d52c428ea5
commit 9db89965c0
9 changed files with 133 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/res/layout/fragment_authentication.xml
View File

@@ -42,11 +42,11 @@
</com.google.android.material.textfield.TextInputLayout>
<Button
android:id="@+id/button"
android:text="@string/fragment_authentication_button_login"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
style="@style/SmallMarginButton"
app:layout_constraintTop_toBottomOf="@+id/password_input_layout" />
android:id="@+id/button"
style="@style/SmallMarginButton"
android:text="@string/fragment_authentication_button_login"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/password_input_layout" />
</androidx.constraintlayout.widget.ConstraintLayout>

14
app/src/main/res/layout/fragment_disclaimer.xml
View File

@@ -8,20 +8,16 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/main_text_holder"
style="@style/Widget.MaterialComponents.CardView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginHorizontal="20dp"
android:layout_marginTop="40dp"
android:elevation="0dp"
app:cardCornerRadius="@dimen/rounded_corner_size_default"
app:cardForegroundColor="#26C4C4C4"
app:cardElevation="8dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/okay"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:strokeColor="#FFDCC8BF"
app:strokeWidth="1dp">
app:shapeAppearance="@style/ShapeAppearance.AllCornersRounded">
<TextView
android:id="@+id/main_text"
@@ -36,11 +32,9 @@
<Button
android:id="@+id/okay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_small"
android:clickable="false"
tools:text="Okay (3 seconds)"
style="@style/SmallMarginButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/main_text_holder" />

2
app/src/main/res/layout/fragment_recipe_info.xml
View File

@@ -77,7 +77,7 @@
android:layout_marginHorizontal="8dp"
android:layout_marginTop="11dp"
android:layout_marginBottom="20dp"
app:cardCornerRadius="@dimen/rounded_corner_size_default"
app:shapeAppearance="@style/ShapeAppearance.AllCornersRounded"
app:cardElevation="10dp"
app:layout_constraintBottom_toTopOf="@+id/instructions_header"
app:layout_constraintEnd_toStartOf="@+id/end_guide"

2
app/src/main/res/layout/view_holder_instruction.xml
View File

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_margin="8dp"
app:cardCornerRadius="@dimen/rounded_corner_size_default"
app:shapeAppearance="@style/ShapeAppearance.AllCornersRounded"
app:cardElevation="10dp"
android:layout_height="wrap_content">