sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Merge branch 'develop' into routeFragmentDetail

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-12 14:57:28 +01:00
parent d80f23ff82 e57e6cdcda
commit 9e2144bd08
17 changed files with 78 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/res/layout/coupon_item.xml
View File

@@ -5,6 +5,15 @@
android:id="@+id/couponItem"
android:layout_height="wrap_content">
<View
android:layout_width="0dp"
android:layout_height="74dp"
app:layout_constraintTop_toTopOf="@+id/name_box"
app:layout_constraintBottom_toBottomOf="@+id/name_box"
app:layout_constraintLeft_toLeftOf="@+id/name_box"
app:layout_constraintRight_toRightOf="@+id/name_box"
android:background="@color/secondaryColour"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/name_box"
android:layout_width="match_parent"

1
app/src/main/res/layout/fragment_location.xml
View File

@@ -26,7 +26,6 @@
android:layout_marginStart="10dp"
android:layout_marginTop="12dp"
android:background="@drawable/ic_back_button_24"
android:backgroundTint="@color/buttonColour"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

3
app/src/main/res/layout/fragment_settings.xml
View File

@@ -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" />

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

@@ -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" />

32
app/src/main/res/layout/help_popup.xml
View File

@@ -22,24 +22,28 @@
android:paddingVertical="10dp"/>
<ScrollView
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
android:id="@+id/scrollView2"
android:layout_width="300dp"
android:layout_height="450dp">
android:layout_height="400dp"
android:layout_marginHorizontal="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
app:layout_constraintBottom_toTopOf="@id/help_ok_button"
>
<TextView
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpPopTitle"
android:layout_width="280dp"
android:layout_height="430dp"
android:layout_marginStart="10dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:layout_marginBottom="10dp"
android:text="@string/help_discription"
android:textColor="@color/secondaryColour"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"/>
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpPopTitle" />
</ScrollView>
@@ -48,11 +52,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_constraintTop_toBottomOf="@id/scrollView2"
app:layout_constraintStart_toStartOf="parent" />