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

Develop #5

Merged
SemvdH merged 62 commits from develop into main 2021-01-14 10:55:23 +00:00
Conversation 0 Commits 62 Files Changed 46 +83 -6
5 changed files with 83 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7f152bc00 - Show all commits

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

@@ -6,7 +6,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/primaryColour"
android:id="@+id/settingFragment"
tools:context=".fragments.SettingsFragment">
tools:context=".fragments.SettingsFragment"
android:theme="@style/Theme.Switches">
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/settings_back_button"

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

@@ -20,6 +20,15 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<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"
@@ -46,7 +55,7 @@
<View
android:id="@+id/Balk"
android:layout_width="1dp"
android:layout_width="2dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
@@ -69,6 +78,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="0dp"
android:layout_height="74dp"
app:layout_constraintTop_toTopOf="@id/Box2"
app:layout_constraintBottom_toBottomOf="@id/Box2"
app:layout_constraintLeft_toLeftOf="@id/Box2"
app:layout_constraintRight_toRightOf="@id/Box2"
android:background="@color/secondaryColour"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Box2"
android:layout_width="match_parent"
@@ -95,7 +113,7 @@
<View
android:id="@+id/Balk2"
android:layout_width="1dp"
android:layout_width="2dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
@@ -118,6 +136,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="0dp"
android:layout_height="74dp"
app:layout_constraintTop_toTopOf="@id/Box3"
app:layout_constraintBottom_toBottomOf="@id/Box3"
app:layout_constraintLeft_toLeftOf="@id/Box3"
app:layout_constraintRight_toRightOf="@id/Box3"
android:background="@color/secondaryColour"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Box3"
android:layout_width="match_parent"
@@ -142,7 +169,7 @@
<View
android:id="@+id/Balk3"
android:layout_width="1dp"
android:layout_width="2dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"
@@ -165,6 +192,15 @@
</androidx.constraintlayout.widget.ConstraintLayout>
<View
android:layout_width="0dp"
android:layout_height="74dp"
app:layout_constraintTop_toTopOf="@id/Box4"
app:layout_constraintBottom_toBottomOf="@id/Box4"
app:layout_constraintLeft_toLeftOf="@id/Box4"
app:layout_constraintRight_toRightOf="@id/Box4"
android:background="@color/secondaryColour"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/Box4"
android:layout_width="match_parent"
@@ -191,7 +227,7 @@
<View
android:id="@+id/Balk4"
android:layout_width="1dp"
android:layout_width="2dp"
android:layout_height="match_parent"
android:background="@color/secondaryColour"
app:layout_constraintBottom_toBottomOf="parent"

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

@@ -8,6 +8,24 @@
android:id="@+id/locationItem"
android:layout_margin="20dp">
<View
android:layout_width="0dp"
android:layout_height="54dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:background="@color/secondaryColour"/>
<View
android:layout_width="0dp"
android:layout_height="46dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:background="@color/primaryColour"/>
<ImageView
android:id="@+id/location_image"
android:layout_width="50dp"

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

@@ -8,6 +8,24 @@
android:id="@+id/routeItem"
android:layout_margin="20dp">
<View
android:layout_width="0dp"
android:layout_height="54dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:background="@color/secondaryColour"/>
<View
android:layout_width="0dp"
android:layout_height="46dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:background="@color/primaryColour"/>
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"

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

@@ -8,10 +8,14 @@
<!-- Customize your theme here. -->
<item name="colorButtonNormal">@color/buttonColour</item>
<item name="colorPrimaryDark">@color/secondaryColour</item>
<item name="colorControlActivated">@color/teal_700</item>
<item name="android:textSize">16sp</item>
</style>
<style name="Theme.Switches" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<item name="colorControlActivated">@color/buttonColour</item>
<item name="colorSwitchThumbNormal">@color/primaryColour</item>
</style>
<style name="Theme.NextLocationBig" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/primaryColour</item>