From b2d3364042b4b3716d574f31a8372f90082e9fdb Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Mon, 14 Dec 2020 11:05:40 +0100
Subject: [PATCH 1/6] Edited themes

---
 app/src/main/res/values/themes.xml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 30a7222..2e220ef 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,15 +2,10 @@
     <!-- Base application theme. -->
     <style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
+        <item name="colorPrimary">#115571</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <item name="colorSecondary">#31AFB4</item>
         <!-- Customize your theme here. -->
+        <item name="colorButtonNormal">#14212D</item>
     </style>
 </resources>
\ No newline at end of file

From a8add1f58ebd3f017bef9178e3d35ac04cb8e8de Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Mon, 14 Dec 2020 11:09:39 +0100
Subject: [PATCH 2/6] [ADD]Colours to colors file

---
 app/src/main/res/values/colors.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..7f3bc58 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="primaryColour">#115571</color>
+    <color name="secondaryColour">#31AFB4</color>
+    <color name="buttonColour">#14212D</color>
 </resources>
\ No newline at end of file

From 7666e2fc1a0af137bd277ea0ae0d98606623565d Mon Sep 17 00:00:00 2001
From: Robin Koedood <rkoedood8@gmail.com>
Date: Mon, 14 Dec 2020 11:15:45 +0100
Subject: [PATCH 3/6] [ADD]Color in theme

---
 app/src/main/res/values/colors.xml | 6 +++---
 app/src/main/res/values/themes.xml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7f3bc58..cf6f6b1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,7 +7,7 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="primaryColour">#115571</color>
-    <color name="secondaryColour">#31AFB4</color>
-    <color name="buttonColour">#14212D</color>
+    <color name="primaryColour">#FF115571</color>
+    <color name="secondaryColour">#FF31AFB4</color>
+    <color name="buttonColour">#FF14212D</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2e220ef..4951880 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -2,10 +2,10 @@
     <!-- Base application theme. -->
     <style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">#115571</item>
+        <item name="colorPrimary">@color/primaryColour</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">#31AFB4</item>
+        <item name="colorSecondary">@color/secondaryColour</item>
         <!-- Customize your theme here. -->
-        <item name="colorButtonNormal">#14212D</item>
+        <item name="colorButtonNormal">@color/buttonColour</item>
     </style>
 </resources>
\ No newline at end of file

From 759772097ca5dc6f22aa68b0b1180d7e1d0a1423 Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Mon, 14 Dec 2020 11:55:03 +0100
Subject: [PATCH 4/6] menu items added

---
 app/src/main/res/menu/navmenu.xml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 app/src/main/res/menu/navmenu.xml

diff --git a/app/src/main/res/menu/navmenu.xml b/app/src/main/res/menu/navmenu.xml
new file mode 100644
index 0000000..fe187c0
--- /dev/null
+++ b/app/src/main/res/menu/navmenu.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+</menu>
\ No newline at end of file

From f4d74f988035232859be1a9999b724d132d79d0b Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Mon, 14 Dec 2020 11:55:20 +0100
Subject: [PATCH 5/6] added menu items

---
 app/src/main/res/layout/activity_main.xml | 37 +++++++++++++++++++----
 app/src/main/res/menu/navmenu.xml         | 20 ++++++++++++
 app/src/main/res/values/strings.xml       |  4 +++
 3 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 4fc2444..0d171d6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,13 +6,38 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <TextView
-        android:layout_width="wrap_content"
+    <FrameLayout
+        android:id="@+id/fragment_layout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/scroller_devider"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
+    <view
+        android:id="@+id/scroller_devider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="32dp"
+        android:layout_marginEnd="32dp"
+        app:layout_constraintBottom_toTopOf="@id/navbar"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        />
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/navbar"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="Hello World!"
+        android:background="@color/white"
+        app:itemIconTint="@color/primaryColour"
+        app:itemTextColor="@color/primaryColour"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:menu="@menu/navmenu"
+        />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navmenu.xml b/app/src/main/res/menu/navmenu.xml
index fe187c0..eb1895a 100644
--- a/app/src/main/res/menu/navmenu.xml
+++ b/app/src/main/res/menu/navmenu.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <item
+        android:id="@+id/locations"
+        android:title="@string/locations"
+        />
+
+    <item
+        android:id="@+id/routes"
+        android:title="@string/routes"
+        />
+
+    <item
+        android:id="@+id/statistics"
+        android:title="@string/statistics"
+        />
+
+    <item
+        android:id="@+id/settings"
+        android:title="@string/settings"
+        />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51a1649..64df6ce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,4 +2,8 @@
     <string name="app_name">Next Location</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="locations">Locaties</string>
+    <string name="routes">Routes</string>
+    <string name="statistics">Statistieken</string>
+    <string name="settings">Instellingen</string>
 </resources>
\ No newline at end of file

From ad6e171a147208cd2aa6773f3020434713f19701 Mon Sep 17 00:00:00 2001
From: Bart <bartvanmoorsel7@gmail.com>
Date: Mon, 14 Dec 2020 12:22:26 +0100
Subject: [PATCH 6/6] [ADD] bottomNav functionality

TODO: change placeholder icons
---
 .../com/a1/nextlocation/MainActivity.java     | 38 ++++++++++++++++++-
 app/src/main/res/drawable/ic_home.xml         | 10 +++++
 app/src/main/res/drawable/ic_placeholder.xml  | 10 +++++
 app/src/main/res/layout/activity_main.xml     |  4 +-
 app/src/main/res/menu/navmenu.xml             |  4 ++
 5 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_home.xml
 create mode 100644 app/src/main/res/drawable/ic_placeholder.xml

diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/MainActivity.java
index ee7fc67..ea457cf 100644
--- a/app/src/main/java/com/a1/nextlocation/MainActivity.java
+++ b/app/src/main/java/com/a1/nextlocation/MainActivity.java
@@ -1,13 +1,21 @@
 package com.a1.nextlocation;
 
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 
 import android.os.Bundle;
+import android.view.MenuItem;
 
 import com.a1.nextlocation.R;
+import com.a1.nextlocation.fragments.HomeFragment;
+import com.a1.nextlocation.fragments.RouteFragment;
+import com.a1.nextlocation.fragments.SettingsFragment;
+import com.a1.nextlocation.fragments.StatisticFragment;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 public class MainActivity extends AppCompatActivity {
-
     /**
      * onCreate method that creates the main activity
      * @param savedInstanceState the saved instance state of the app
@@ -16,5 +24,33 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        BottomNavigationView bottomNav = findViewById(R.id.navbar);
+        bottomNav.setOnNavigationItemSelectedListener(navListener);
+
+        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, new HomeFragment()).commit();
     }
+
+
+    private BottomNavigationView.OnNavigationItemSelectedListener navListener = item -> {
+        Fragment selectedFragment = null;
+
+        switch (item.getItemId()) {
+            case R.id.locations:
+                selectedFragment = new HomeFragment();
+                break;
+            case R.id.routes:
+                selectedFragment = new RouteFragment();
+                break;
+            case R.id.statistics:
+                selectedFragment = new StatisticFragment();
+                break;
+            case R.id.settings:
+                selectedFragment = new SettingsFragment();
+                break;
+        }
+
+        getSupportFragmentManager().beginTransaction().replace(R.id.fragment_layout, selectedFragment).commit();
+        return true;
+    };
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
new file mode 100644
index 0000000..3a4c7da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_placeholder.xml b/app/src/main/res/drawable/ic_placeholder.xml
new file mode 100644
index 0000000..9a2e721
--- /dev/null
+++ b/app/src/main/res/drawable/ic_placeholder.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24"
+        android:tint="?attr/colorControlNormal">
+    <path
+        android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"
+        android:fillColor="@android:color/white"/>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0d171d6..2acb5fa 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -16,7 +16,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         />
 
-    <view
+    <View
         android:id="@+id/scroller_devider"
         android:layout_width="match_parent"
         android:layout_height="1dp"
@@ -40,4 +40,6 @@
         app:menu="@menu/navmenu"
         />
 
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/navmenu.xml b/app/src/main/res/menu/navmenu.xml
index eb1895a..8029947 100644
--- a/app/src/main/res/menu/navmenu.xml
+++ b/app/src/main/res/menu/navmenu.xml
@@ -4,21 +4,25 @@
     <item
         android:id="@+id/locations"
         android:title="@string/locations"
+        android:icon="@drawable/ic_placeholder"
         />
 
     <item
         android:id="@+id/routes"
         android:title="@string/routes"
+        android:icon="@drawable/ic_placeholder"
         />
 
     <item
         android:id="@+id/statistics"
         android:title="@string/statistics"
+        android:icon="@drawable/ic_placeholder"
         />
 
     <item
         android:id="@+id/settings"
         android:title="@string/settings"
+        android:icon="@drawable/ic_placeholder"
         />
 
 </menu>
\ No newline at end of file