diff --git a/app/src/main/res/layout/coupon_item.xml b/app/src/main/res/layout/coupon_item.xml index 9a9a437..3616344 100644 --- a/app/src/main/res/layout/coupon_item.xml +++ b/app/src/main/res/layout/coupon_item.xml @@ -5,6 +5,15 @@ android:id="@+id/couponItem" android:layout_height="wrap_content"> + + diff --git a/app/src/main/res/layout/fragment_route_detail.xml b/app/src/main/res/layout/fragment_route_detail.xml index 6a3ac04..f88d299 100644 --- a/app/src/main/res/layout/fragment_route_detail.xml +++ b/app/src/main/res/layout/fragment_route_detail.xml @@ -43,7 +43,7 @@ android:layout_width="match_parent" android:layout_height="200dp" android:layout_margin="20dp" - android:background="@color/secondaryColour" + android:background="@color/primaryColour" android:id="@+id/route_scroll_view" app:layout_constraintTop_toBottomOf="@id/route_detail_image" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index d71b96b..240c76e 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -15,8 +15,7 @@ android:layout_height="wrap_content" android:layout_marginStart="10dp" android:layout_marginTop="10dp" - android:backgroundTint="@color/primaryColour" - android:src="@drawable/ic_back_button_24" + android:background="@drawable/ic_back_button_24" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_statistic.xml b/app/src/main/res/layout/fragment_statistic.xml index 48e16cc..61e16ab 100644 --- a/app/src/main/res/layout/fragment_statistic.xml +++ b/app/src/main/res/layout/fragment_statistic.xml @@ -267,8 +267,6 @@ android:layout_marginStart="10dp" android:layout_marginTop="10dp" android:background="@drawable/ic_back_button_24" - android:backgroundTint="@color/buttonColour" - android:src="@drawable/ic_back_button_24" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/help_popup.xml b/app/src/main/res/layout/help_popup.xml index fda4ba9..0e33fb5 100644 --- a/app/src/main/res/layout/help_popup.xml +++ b/app/src/main/res/layout/help_popup.xml @@ -22,24 +22,25 @@ android:paddingVertical="10dp"/> + android:layout_height="450dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/helpPopTitle"> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/helpPopTitle" /> @@ -48,11 +49,13 @@ android:id="@+id/help_ok_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="16dp" android:backgroundTint="@color/buttonColour" + android:textColor="@color/primaryColour" android:text="ok" + app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="@+id/helpPopTitle" /> + + app:layout_constraintStart_toStartOf="parent" /> diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml index eab42f4..2d9f2ee 100644 --- a/app/src/main/res/values-night/themes.xml +++ b/app/src/main/res/values-night/themes.xml @@ -2,7 +2,7 @@