karolina/weserplaner
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

All sheets now have a button to dismiss the sheet

Browse Source
This commit is contained in:
denizk0461
2023-05-03 21:49:18 +02:00
parent df1d127a17
commit 9e5277a5f6
15 changed files with 210 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/fragment_canteen.xml
+2 -1
View File
@@ -230,7 +230,8 @@
android:contentDescription="@string/canteen_fab_refresh_content_desc"
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"/>
android:layout_marginBottom="@dimen/fab_margin"
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"/>
<!-- <androidx.coordinatorlayout.widget.CoordinatorLayout-->
<!-- android:id="@+id/snackbar_container"-->
app/src/main/res/layout/fragment_event.xml
+3 -2
View File
@@ -14,7 +14,7 @@
<TextView
android:id="@+id/app_title_bar"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/title_schedule"
android:textSize="32sp"
@@ -46,6 +46,7 @@
android:contentDescription="@string/sheet_schedule_update_header_add"
android:layout_gravity="bottom|end"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"/>
android:layout_marginBottom="@dimen/fab_margin"
app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
app/src/main/res/layout/sheet_allergen.xml
+29 -6
View File
@@ -12,14 +12,37 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
android:id="@+id/text_category"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_blackitalic"
android:layout_marginBottom="2dp"
android:paddingHorizontal="24dp"/>
android:paddingHorizontal="24dp">
<TextView
android:id="@+id/text_category"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_blackitalic"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_cancel"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TextButton"
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
app:icon="@drawable/cross"
app:iconPadding="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:iconTint="?attr/colorOnSurfaceVariant"
android:layout_marginStart="16dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/text_title"
app/src/main/res/layout/sheet_allergen_config.xml
+31 -8
View File
@@ -11,15 +11,38 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
android:id="@+id/text_title"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
android:text="@string/allergens_config_header"
android:layout_marginHorizontal="24dp"
android:layout_marginBottom="8dp"/>
android:layout_marginBottom="8dp"
android:paddingHorizontal="24dp">
<TextView
android:id="@+id/text_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
android:text="@string/allergens_config_header"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_cancel"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TextButton"
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
app:icon="@drawable/cross"
app:iconPadding="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:iconTint="?attr/colorOnSurfaceVariant"
android:layout_marginStart="16dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
app/src/main/res/layout/sheet_dev_code.xml
+29 -7
View File
@@ -11,15 +11,37 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
android:id="@+id/text_header"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp"
android:text="@string/sheet_cheat_header"/>
android:paddingHorizontal="24dp">
<TextView
android:id="@+id/text_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_cancel"
android:text="@string/sheet_cheat_header"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TextButton"
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
app:icon="@drawable/cross"
app:iconPadding="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:iconTint="?attr/colorOnSurfaceVariant"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.Material3.TextInputLayout.OutlinedBox"
app/src/main/res/layout/sheet_schedule_update.xml
+18 -9
View File
@@ -12,19 +12,22 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<androidx.coordinatorlayout.widget.CoordinatorLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp">
android:layout_marginBottom="8dp"
android:paddingHorizontal="24dp">
<TextView
android:id="@+id/sheet_title"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_blackitalic"
android:layout_gravity="start|center_vertical"
android:paddingHorizontal="24dp"/>
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_cancel"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TextButton"
@@ -34,11 +37,12 @@
android:minWidth="0dp"
app:icon="@drawable/cross"
app:iconPadding="0dp"
android:layout_gravity="end|center_vertical"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:iconTint="?attr/colorOnSurfaceVariant"
android:paddingHorizontal="24dp"/>
android:layout_marginStart="16dp"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
@@ -54,6 +58,7 @@
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:id="@+id/text_layout_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
@@ -79,6 +84,7 @@
<!-- lecturers -->
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:id="@+id/text_layout_lecturers"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -103,6 +109,7 @@
<!-- room -->
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:id="@+id/text_layout_room"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
@@ -126,12 +133,14 @@
</androidx.appcompat.widget.LinearLayoutCompat>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.OutlinedButton"
android:id="@+id/button_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
app:icon="@drawable/edit_calendar"
android:layout_gravity="end"/>
android:layout_gravity="end"
app:strokeColor="?attr/colorOutlineVariant"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_academic_quarter"
app/src/main/res/layout/sheet_text.xml
+30 -7
View File
@@ -11,14 +11,37 @@
android:layout_height="wrap_content"
android:layout_gravity="center"/>
<TextView
android:id="@+id/text_header"
android:layout_width="wrap_content"
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
android:paddingHorizontal="24dp"
android:layout_marginBottom="8dp"/>
android:layout_marginBottom="8dp"
android:paddingHorizontal="24dp">
<TextView
android:id="@+id/text_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="22sp"
android:fontFamily="@font/lato_bolditalic"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/button_cancel"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TextButton"
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
app:icon="@drawable/cross"
app:iconPadding="0dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:iconTint="?attr/colorOnSurfaceVariant"
android:layout_marginStart="16dp"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"