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

Merge develop into master #1

Merged
SemvdH merged 297 commits from develop into main 2021-01-06 22:20:51 +00:00
Conversation 6 Commits 297 Files Changed 143 +15 -15
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ed6d80b399 - Show all commits

10
app/src/main/res/layout/fragment_coupon.xml
View File

@@ -7,15 +7,15 @@
android:background="@color/primaryColour" android:background="@color/primaryColour"
tools:context=".fragments.CouponFragment"> tools:context=".fragments.CouponFragment">
<Button <androidx.appcompat.widget.AppCompatImageButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/buttonColour" android:backgroundTint="@color/primaryColour"
android:text="Back" android:src="@drawable/ic_back_button_24"
app:layout_constraintBottom_toTopOf="@+id/Box1" app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintEnd_toStartOf="@+id/textView" app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="@+id/textView" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"

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

@@ -7,15 +7,15 @@
android:background="@color/primaryColour" android:background="@color/primaryColour"
tools:context=".fragments.SettingsFragment"> tools:context=".fragments.SettingsFragment">
<Button <androidx.appcompat.widget.AppCompatImageButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/buttonColour" android:backgroundTint="@color/primaryColour"
android:text="Back" android:src="@drawable/ic_back_button_24"
app:layout_constraintBottom_toTopOf="@+id/Box1" app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintEnd_toStartOf="@+id/textView" app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="@+id/textView" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"

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

@@ -7,15 +7,15 @@
android:background="@color/primaryColour" android:background="@color/primaryColour"
tools:context=".fragments.StatisticFragment"> tools:context=".fragments.StatisticFragment">
<Button <androidx.appcompat.widget.AppCompatImageButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:backgroundTint="@color/buttonColour" android:backgroundTint="@color/primaryColour"
android:text="Back" android:src="@drawable/ic_back_button_24"
app:layout_constraintBottom_toTopOf="@+id/Box1" app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintEnd_toStartOf="@+id/textView" app:layout_constraintEnd_toStartOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="@+id/textView" />
<TextView <TextView
android:id="@+id/textView" android:id="@+id/textView"