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

Finished IntroductionActivity.kt; fixed a bug in StwParser.kt that would throw an error upon accessing the UI due to a missing withContext() call. This error seemed to (visibly?) happen on API level 24, but not on 30+

Browse Source
This commit is contained in:
denizk0461
2023-06-04 15:34:32 +02:00
parent 01acb1c4b5
commit 26c89108bf
12 changed files with 202 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_introduction.xml
+90 -1
View File
@@ -1,6 +1,95 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layoutAnimation="@anim/layout_animation_fall_down">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image_header"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintDimensionRatio="w,1:1"
android:src="@drawable/pill"
android:tint="?attr/colorPrimary"
android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/text_header"
app:layout_constraintBottom_toBottomOf="@id/text_header"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_header"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:textSize="36sp"
android:fontFamily="@font/lato_blackitalic"
android:text="@string/introduction_welcome_header"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toEndOf="@id/image_header"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="64dp"/>
<ScrollView
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintTop_toBottomOf="@id/text_header"
app:layout_constraintBottom_toTopOf="@id/button_download_schedule"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay"
android:scrollbars="vertical"
android:paddingHorizontal="16dp"
android:paddingTop="24dp"
android:paddingBottom="16dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/introduction_welcome_description"
android:textSize="16sp"/>
</ScrollView>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.TonalButton"
android:id="@+id/button_download_schedule"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/cloud_download"
android:text="@string/introduction_button_download"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="8dp"
android:layout_gravity="center_horizontal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/text_buttons_filler"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/text_buttons_filler"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/introduction_or"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="8dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@id/button_continue"/>
<com.google.android.material.button.MaterialButton
style="@style/Widget.Material3.Button.OutlinedButton"
android:id="@+id/button_continue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:icon="@drawable/arrow_forward"
app:iconGravity="end"
android:text="@string/introduction_button_continue"
android:layout_marginHorizontal="16dp"
android:layout_marginBottom="24dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_event.xml
+2 -1
View File
@@ -42,12 +42,13 @@
app:layout_constraintEnd_toStartOf="@id/button_view_overview"/>
<com.google.android.material.button.MaterialButton
android:visibility="gone"
style="@style/Widget.Material3.Button.IconButton.Outlined"
android:id="@+id/button_view_overview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="0dp"
app:icon="@drawable/sort"
app:icon="@drawable/engineering"
app:iconPadding="0dp"
app:strokeColor="?attr/colorOutlineVariant"
app:layout_constraintTop_toTopOf="@id/app_title_bar"