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

yeet

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-12 14:04:25 +01:00
parent efbbe7124b 171c75c645
commit 4cc49c77f6
27 changed files with 445 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/activity_main.xml
View File

@@ -22,9 +22,9 @@
android:id="@+id/navigation_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/primaryColour"
app:itemIconTint="@color/secondaryColour"
app:itemTextColor="@color/primaryColour"
app:itemTextColor="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -13,7 +13,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.4"
@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:text=""
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_home.xml
View File

@@ -24,7 +24,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_marginEnd="20dp"
android:backgroundTint="@color/secondaryColour"
android:backgroundTint="@color/primaryColour"
android:src="@drawable/ic_baseline_outlined_flag_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -37,7 +37,7 @@
android:layout_marginEnd="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/location_list_button"
android:backgroundTint="@color/secondaryColour"
android:backgroundTint="@color/primaryColour"
android:src="@drawable/ic_stop_icon"/>
</androidx.constraintlayout.widget.ConstraintLayout>

6
app/src/main/res/layout/fragment_location_detail.xml
View File

@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text=""
android:textColor="@color/white"
android:textColor="@color/secondaryColour"
android:textSize="30sp"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
@@ -35,7 +35,7 @@
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_margin="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -45,8 +45,8 @@
android:id="@+id/detail_location_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/secondaryColour"
android:layout_marginHorizontal="20dp"
android:background="@color/primaryColour"
android:text=""
/>
</ScrollView>

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

@@ -19,6 +19,7 @@
<TextView
android:id="@+id/route_title"
android:textColor="@color/secondaryColour"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="9dp"

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

@@ -45,11 +45,11 @@
android:layout_margin="20dp"
android:background="@color/secondaryColour"
android:id="@+id/route_scroll_view"
app:layout_constraintBottom_toTopOf="@id/total_distance"
app:layout_constraintTop_toBottomOf="@id/route_detail_image"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
>
app:layout_constraintBottom_toTopOf="@id/total_distance">
<TextView
android:id="@+id/route_detail_tekst"
android:layout_width="match_parent"
@@ -66,7 +66,7 @@
android:layout_marginBottom="45dp"
android:backgroundTint="@color/secondaryColour"
android:text="@string/start_route"
android:textColor="@color/buttonColour"
android:textColor="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
@@ -78,9 +78,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
android:text="@string/total_distance"
android:textColor="@color/buttonColour"
android:textColor="@color/secondaryColour"
app:layout_constraintBottom_toTopOf="@+id/start_route_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"

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

@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/settings"
android:textColor="@color/white"
android:textColor="@color/secondaryColour"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -39,7 +39,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textView"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
android:layout_marginHorizontal="20dp"
>
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/language"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk"
@@ -59,7 +59,7 @@
android:id="@+id/Balk"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -84,7 +84,7 @@
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toTopOf="@id/Box3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -96,7 +96,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/imperial_system"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk2"
@@ -107,7 +107,7 @@
android:id="@+id/Balk2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/buttonColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -131,7 +131,7 @@
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -142,7 +142,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/_65_mode"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk3"

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

@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/statistics"
android:textColor="@color/white"
android:textColor="@color/secondaryColour"
android:textSize="30sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toTopOf="@id/Box2"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -37,7 +37,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/total_distance"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk"
@@ -48,7 +48,7 @@
android:id="@+id/Balk"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -59,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toTopOf="@id/Box3"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -86,7 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/visited_locations"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk2"
@@ -97,7 +97,7 @@
android:id="@+id/Balk2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -108,7 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -123,7 +123,7 @@
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toTopOf="@id/Box4"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -133,7 +133,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/total_time"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk3"
@@ -144,7 +144,7 @@
android:id="@+id/Balk3"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -155,7 +155,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
@@ -170,7 +170,7 @@
android:layout_width="match_parent"
android:layout_height="70dp"
android:layout_marginHorizontal="20dp"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.85"
@@ -182,7 +182,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/coupons_collected"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/Balk4"
@@ -193,7 +193,7 @@
android:id="@+id/Balk4"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="@color/black"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -204,7 +204,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@@ -16,9 +16,9 @@
android:layout_width="300dp"
android:layout_height="50dp"
android:text="@string/help"
android:textColor="@color/black"
android:textColor="@color/secondaryColour"
android:textAlignment="center"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
android:paddingVertical="10dp"/>
<ScrollView
@@ -35,7 +35,7 @@
android:layout_width="280dp"
android:layout_height="430dp"
android:text="@string/help_discription"
android:textColor="@color/white"
android:textColor="@color/secondaryColour"
android:layout_marginStart="10dp"
android:layout_marginEnd="10dp"
android:layout_marginTop="10dp"
@@ -49,6 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:backgroundTint="@color/buttonColour"
android:text="ok"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/helpPopTitle" />

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

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
android:id="@+id/locationItem"
android:layout_margin="20dp">
@@ -25,6 +25,7 @@
android:layout_height="47dp"
android:layout_marginStart="5dp"
android:gravity="left"
android:textColor="@color/secondaryColour"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/secondaryColour"
android:background="@color/primaryColour"
android:id="@+id/routeItem"
android:layout_margin="20dp">
@@ -21,6 +21,7 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/secondaryColour"
android:text=""
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"