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

Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop

Browse Source
This commit is contained in:
Sem van der Hoeven
2021-01-12 14:47:18 +01:00
parent 5e2d49ac08 428fa10433
commit 65e7b99c86
10 changed files with 32 additions and 23 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" />

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

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

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

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

@@ -22,24 +22,25 @@
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="450dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/helpPopTitle">
<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 +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" />

2
app/src/main/res/values-night/themes.xml
View File

@@ -2,7 +2,7 @@
<!-- Base application theme. -->
<style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primaryColour</item>
<item name="colorPrimary">@color/white</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/secondaryColour</item>
<!-- Customize your theme here. -->

2
app/src/main/res/values-nl/strings.xml
View File

@@ -26,7 +26,7 @@
<string name="Dutch">Nederlands</string>
<string name="Chinese">Chinees</string>
<string name="help">HELP</string>
<string name="help_discription">Onderaan het scherm zijn verschillende knoppen te zien. Deze knoppen hebben de volgende functies: \n\nLocaties: toont een lijst met alle locaties die bezocht kunnen worden. Elke locatie wordt kort beschreven. \n\nRoutes: Toont een lijst met alle routes die gelopen kunnen worden. Van elke route wordt een omschrijving gegeven. \n\nStatistieken: Toont persoonlijke statistieken. \n\nInstellingen: Hier kunnen app-instellingen worden aangepast naar eigen voorkeur. \n\nEen locatie ingedrukt houden laat extra informatie zien over de gekozen locatie</string>
<string name="help_discription">Onderaan het scherm zijn verschillende knoppen te zien. Deze knoppen hebben de volgende functies: \n\nLocaties: toont een lijst met alle locaties die bezocht kunnen worden. Elke locatie wordt kort beschreven. \n\nRoutes: Toont een lijst met alle routes die gelopen kunnen worden. Van elke route wordt een omschrijving gegeven. \n\nStatistieken: Toont persoonlijke statistieken. \n\nInstellingen: Hier kunnen app-instellingen worden aangepast naar eigen voorkeur. \n\nEen locatie ingedrukt houden laat extra informatie zien over de gekozen locatie. \n\n\n</string>
<string name="end_location">Eind locatie</string>
<string name="start_location">Start locatie</string>
<string name="following_locations">"Deze route bevat de volgende locaties: "</string>

2
app/src/main/res/values/strings.xml
View File

@@ -24,7 +24,7 @@
<string name="English">English</string>
<string name="Chinese">Chinese</string>
<string name="help">HELP</string>
<string name="help_discription">Hasn\'t been translated yet</string>
<string name="help_discription">Various buttons can be seen at the bottom of the screen. These buttons have the following functions: \n\nLocations: displays a list of all locations that can be visited. Each location is briefly described. \n\nRoutes: Displays a list of all routes that can be walked. A description is given of each route. \n\nStats: Displays personal statistics. \n\nSettings: This is where app settings can be adjusted according to your preferences. \n\nHold down on a location to display additional information about the chosen location. \n\n\n</string>
<string name="notification_title">You\'re close to a location!</string>
<string name="notification_text">You\'re almost at %1$s</string>
<string name="following_locations">This route contains the following locations: </string>

3
app/src/main/res/values/themes.xml
View File

@@ -2,13 +2,14 @@
<!-- Base application theme. -->
<style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primaryColour</item>
<item name="colorPrimary">@color/black</item>
<!-- Secondary brand color. -->
<item name="colorSecondary">@color/secondaryColour</item>
<!-- Customize your theme here. -->
<item name="colorButtonNormal">@color/buttonColour</item>
<item name="colorPrimaryDark">@color/secondaryColour</item>
<item name="android:textSize">16sp</item>
<item name="android:textColor">@color/black</item>
</style>
<style name="Theme.Switches" parent="Theme.MaterialComponents.DayNight.NoActionBar">