From f3dbb2b1d1d4db84f6942cd5415defb763346646 Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Tue, 12 Jan 2021 10:44:59 +0100
Subject: [PATCH 1/7] big bordfer

---
 app/src/main/res/layout/fragment_settings.xml | 93 ++++++++++++++++++-
 app/src/main/res/values/themes.xml            |  1 +
 2 files changed, 89 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 9ea800a..a421c02 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -31,6 +31,16 @@
         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"
@@ -41,7 +51,6 @@
         app:layout_constraintTop_toBottomOf="@id/textView"
         android:background="@color/primaryColour"
         android:layout_marginHorizontal="20dp"
-
         >
 
         <TextView
@@ -57,7 +66,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"
@@ -79,6 +88,16 @@
 
     </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"
@@ -105,7 +124,7 @@
 
         <View
             android:id="@+id/Balk2"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/buttonColour"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -126,13 +145,22 @@
 
     </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"
         android:layout_height="70dp"
         android:layout_marginHorizontal="20dp"
         android:background="@color/primaryColour"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/Box4"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/Box2"
@@ -151,7 +179,7 @@
 
         <View
             android:id="@+id/Balk3"
-            android:layout_width="1dp"
+            android:layout_width="2dp"
             android:layout_height="match_parent"
             android:background="@color/black"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -168,6 +196,61 @@
             app:layout_constraintStart_toStartOf="@id/Balk3"
             app:layout_constraintTop_toTopOf="parent" />
 
+    </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"
+        android:layout_height="70dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/Box3"
+        android:background="@color/primaryColour"
+        android:layout_marginHorizontal="20dp"
+        >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/colorblind"
+            android:textColor="@color/secondaryColour"
+            android:textSize="20sp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="@id/Balk4"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <View
+            android:id="@+id/Balk4"
+            android:layout_width="2dp"
+            android:layout_height="match_parent"
+            android:background="@color/secondaryColour"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
+        <androidx.appcompat.widget.SwitchCompat
+            android:id="@+id/settingsEyesButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="@id/Balk4"
+            app:layout_constraintTop_toTopOf="parent"
+            />
+
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 1e892a3..bc08dfa 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -8,6 +8,7 @@
         <!-- 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>
 

From e7f152bc009e9b4227d57d98599c87e6372e568c Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Tue, 12 Jan 2021 11:00:44 +0100
Subject: [PATCH 2/7] WAT MOOOOOOI

---
 app/src/main/res/layout/fragment_settings.xml |  3 +-
 .../main/res/layout/fragment_statistic.xml    | 44 +++++++++++++++++--
 app/src/main/res/layout/location_item.xml     | 18 ++++++++
 app/src/main/res/layout/route_item.xml        | 18 ++++++++
 app/src/main/res/values/themes.xml            |  6 ++-
 5 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index a421c02..88bc2be 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -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"
diff --git a/app/src/main/res/layout/fragment_statistic.xml b/app/src/main/res/layout/fragment_statistic.xml
index 8662884..48e16cc 100644
--- a/app/src/main/res/layout/fragment_statistic.xml
+++ b/app/src/main/res/layout/fragment_statistic.xml
@@ -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"
diff --git a/app/src/main/res/layout/location_item.xml b/app/src/main/res/layout/location_item.xml
index 8e537be..10decc4 100644
--- a/app/src/main/res/layout/location_item.xml
+++ b/app/src/main/res/layout/location_item.xml
@@ -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"
diff --git a/app/src/main/res/layout/route_item.xml b/app/src/main/res/layout/route_item.xml
index cc3ac5e..bf4304d 100644
--- a/app/src/main/res/layout/route_item.xml
+++ b/app/src/main/res/layout/route_item.xml
@@ -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"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index bc08dfa..5306d31 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -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>

From 0663dabca519add22470ba0130e6f05c2158427d Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Tue, 12 Jan 2021 11:54:33 +0100
Subject: [PATCH 3/7] Some non-functional changes

---
 .../com/a1/nextlocation/MainActivity.java     |  2 ++
 .../fragments/SettingsFragment.java           | 33 ++++++++++++++++---
 app/src/main/res/layout/fragment_settings.xml |  2 +-
 app/src/main/res/values-night/colors.xml      | 14 ++++++++
 app/src/main/res/values-night/themes.xml      | 29 +++++++++++-----
 app/src/main/res/values/colors.xml            |  3 ++
 6 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/res/values-night/colors.xml

diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/MainActivity.java
index 7c2e1e9..500ccbe 100644
--- a/app/src/main/java/com/a1/nextlocation/MainActivity.java
+++ b/app/src/main/java/com/a1/nextlocation/MainActivity.java
@@ -8,6 +8,7 @@ import android.view.View;
 import android.widget.ImageButton;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -37,6 +38,7 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
      */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         super.onCreate(savedInstanceState);
 
         // initialize saved language from sharedPreferences
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index 9ecfa79..c7a1131 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -13,6 +13,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.Spinner;
 
+import androidx.appcompat.app.AppCompatDelegate;
 import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
@@ -29,6 +30,7 @@ public class SettingsFragment extends Fragment {
     private SharedPreferences.Editor editor;
     private SwitchCompat fontSwitch;
     private SwitchCompat imperialSwitch;
+    private SwitchCompat colourblindSwitch;
     private Refreshable refreshable;
 
     @Override
@@ -94,17 +96,38 @@ public class SettingsFragment extends Fragment {
             if(fontSwitch.isChecked())
             {
                 requireActivity().setTheme(R.style.Theme_NextLocationBig);
-                editor.putBoolean("fontSwitch",true);
-                editor.apply();
             }
             if(!fontSwitch.isChecked())
             {
-                requireActivity().setTheme(R.style.Theme_NextLocation);
-                editor.putBoolean("fontSwitch",false);
-                editor.apply();
+                requireActivity().setTheme(R.style.Theme_NextLocation);;
             }
+            editor.putBoolean("fontSwitch",fontSwitch.isChecked());
+            editor.apply();
             editor.commit();
         });
+
+        //Initialises colourblind mode switchCompat
+        this.colourblindSwitch = view.findViewById(R.id.colourblindSwitch);
+        fontSwitch.setChecked(sharedPreferences.getBoolean("colourblindSwitch", false));
+
+        //Initial check to see what setting was last chosen
+        if (colourblindSwitch.isChecked()){
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+        }else if (!colourblindSwitch.isChecked()){
+            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+        }
+
+        colourblindSwitch.setOnClickListener(view1 -> {
+            if (colourblindSwitch.isChecked()){
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+            }else if (!colourblindSwitch.isChecked()){
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+            }
+            editor.putBoolean("colourblindSwitch", colourblindSwitch.isChecked());
+            editor.apply();
+            editor.commit();
+        });
+
     }
 
     private void initializeLanguageDropdown(View view) {
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 88bc2be..2b1128a 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -243,7 +243,7 @@
             />
 
         <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/settingsEyesButton"
+            android:id="@+id/colourblindSwitch"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..a8f6080
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+    <color name="primaryColour">#FF115571</color>
+    <color name="secondaryColour">#FF31AFB4</color>
+    <color name="buttonColour">#FF14212D</color>
+    <color name="red">#FF0000</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index b20724e..5306d31 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -2,15 +2,28 @@
     <!-- Base application theme. -->
     <style name="Theme.NextLocation" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/black</item>
+        <item name="colorPrimary">@color/primaryColour</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_200</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <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>
+    </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>
+        <!-- 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">24sp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ebfbba9..4cad898 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -11,4 +11,7 @@
     <color name="secondaryColour">#FF000000</color>
     <color name="buttonColour">#FF000000</color>
     <color name="red">#FF0000</color>
+    <color name="primaryColourCB">#FF115571</color>
+    <color name="secondaryColourCB">#FF31AFB4</color>
+    <color name="buttonColourCB">#FF14212D</color>
 </resources>
\ No newline at end of file

From 87403625531dfd25cf634b47ebdb86e78d6bb329 Mon Sep 17 00:00:00 2001
From: Robin Koedood <rkoedood8@gmail.com>
Date: Tue, 12 Jan 2021 12:05:27 +0100
Subject: [PATCH 4/7] Auto stash before merge of "fuckcolours" and
 "origin/fuckcolours"

---
 .../fragments/SettingsFragment.java           | 37 +++++++++----------
 app/src/main/res/values/themes.xml            |  3 ++
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index c7a1131..e0a2937 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -19,6 +20,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.fragment.app.FragmentTransaction;
 
+import com.a1.nextlocation.MainActivity;
 import com.a1.nextlocation.R;
 
 import org.jetbrains.annotations.NotNull;
@@ -30,7 +32,7 @@ public class SettingsFragment extends Fragment {
     private SharedPreferences.Editor editor;
     private SwitchCompat fontSwitch;
     private SwitchCompat imperialSwitch;
-    private SwitchCompat colourblindSwitch;
+    private SwitchCompat colorBlindMode;
     private Refreshable refreshable;
 
     @Override
@@ -106,28 +108,23 @@ public class SettingsFragment extends Fragment {
             editor.commit();
         });
 
-        //Initialises colourblind mode switchCompat
-        this.colourblindSwitch = view.findViewById(R.id.colourblindSwitch);
-        fontSwitch.setChecked(sharedPreferences.getBoolean("colourblindSwitch", false));
-
-        //Initial check to see what setting was last chosen
-        if (colourblindSwitch.isChecked()){
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-        }else if (!colourblindSwitch.isChecked()){
-            AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-        }
-
-        colourblindSwitch.setOnClickListener(view1 -> {
-            if (colourblindSwitch.isChecked()){
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-            }else if (!colourblindSwitch.isChecked()){
-                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
-            }
-            editor.putBoolean("colourblindSwitch", colourblindSwitch.isChecked());
+        this.colorBlindMode = view.findViewById(R.id.settingsEyesButton);
+        this.colorBlindMode.setOnClickListener(view1 -> {
+            editor.putBoolean("colorBlindModeSwitch", imperialSwitch.isChecked());
             editor.apply();
             editor.commit();
-        });
 
+            if (colorBlindMode.isChecked()){
+                requireActivity().setTheme(R.style.Theme_NextLocation);
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                System.out.println("AAN");
+            }else if (!colorBlindMode.isChecked()){
+                requireActivity().setTheme(R.style.Theme_NextLocationNight);
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                System.out.println("UIT");
+            }
+
+        });
     }
 
     private void initializeLanguageDropdown(View view) {
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 5306d31..d3ca57a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -26,4 +26,7 @@
         <item name="colorPrimaryDark">@color/secondaryColour</item>
         <item name="android:textSize">24sp</item>
     </style>
+
+
+
 </resources>
\ No newline at end of file

From 4c09192f9a314097c8e879073cf73e66048977f3 Mon Sep 17 00:00:00 2001
From: Robin Koedood <rkoedood8@gmail.com>
Date: Tue, 12 Jan 2021 12:09:30 +0100
Subject: [PATCH 5/7] YEP

---
 app/src/main/java/com/a1/nextlocation/MainActivity.java     | 1 -
 .../com/a1/nextlocation/fragments/SettingsFragment.java     | 6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/a1/nextlocation/MainActivity.java b/app/src/main/java/com/a1/nextlocation/MainActivity.java
index 500ccbe..209e51d 100644
--- a/app/src/main/java/com/a1/nextlocation/MainActivity.java
+++ b/app/src/main/java/com/a1/nextlocation/MainActivity.java
@@ -38,7 +38,6 @@ public class MainActivity extends AppCompatActivity implements Refreshable {
      */
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         super.onCreate(savedInstanceState);
 
         // initialize saved language from sharedPreferences
diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index e0a2937..6155a58 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -108,7 +108,7 @@ public class SettingsFragment extends Fragment {
             editor.commit();
         });
 
-        this.colorBlindMode = view.findViewById(R.id.settingsEyesButton);
+        this.colorBlindMode = view.findViewById(R.id.colourblindSwitch);
         this.colorBlindMode.setOnClickListener(view1 -> {
             editor.putBoolean("colorBlindModeSwitch", imperialSwitch.isChecked());
             editor.apply();
@@ -117,10 +117,12 @@ public class SettingsFragment extends Fragment {
             if (colorBlindMode.isChecked()){
                 requireActivity().setTheme(R.style.Theme_NextLocation);
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+                getActivity().recreate();
                 System.out.println("AAN");
             }else if (!colorBlindMode.isChecked()){
-                requireActivity().setTheme(R.style.Theme_NextLocationNight);
+                requireActivity().setTheme(R.style.Theme_NextLocation);
                 AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                getActivity().recreate();
                 System.out.println("UIT");
             }
 

From 2f5b53e2b4ae9f598ad71d9fb488edf27dacb59e Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Tue, 12 Jan 2021 12:13:29 +0100
Subject: [PATCH 6/7] barFix

---
 app/src/main/res/layout/fragment_settings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 2b1128a..d71b96b 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -127,7 +127,7 @@
             android:id="@+id/Balk2"
             android:layout_width="2dp"
             android:layout_height="match_parent"
-            android:background="@color/buttonColour"
+            android:background="@color/secondaryColour"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -182,7 +182,7 @@
             android:id="@+id/Balk3"
             android:layout_width="2dp"
             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"

From 7f56cbe30ae863f7237de01c976800a0c9857049 Mon Sep 17 00:00:00 2001
From: Bipin <floriantjager@gmail.com>
Date: Tue, 12 Jan 2021 13:58:41 +0100
Subject: [PATCH 7/7] Button be working now

---
 .../java/com/a1/nextlocation/fragments/SettingsFragment.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
index 6155a58..ecc623d 100644
--- a/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/SettingsFragment.java
@@ -46,6 +46,7 @@ public class SettingsFragment extends Fragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         editor = getContext().getSharedPreferences("Settings", Context.MODE_PRIVATE).edit();
+
     }
 
     @Override
@@ -109,8 +110,10 @@ public class SettingsFragment extends Fragment {
         });
 
         this.colorBlindMode = view.findViewById(R.id.colourblindSwitch);
+        this.colorBlindMode.setChecked(sharedPreferences.getBoolean("colorBlindModeSwitch", false));
+
         this.colorBlindMode.setOnClickListener(view1 -> {
-            editor.putBoolean("colorBlindModeSwitch", imperialSwitch.isChecked());
+            editor.putBoolean("colorBlindModeSwitch", colorBlindMode.isChecked());
             editor.apply();
             editor.commit();