Button be working now

barFix
YEP
2021-01-12 13:58:41 +01:00 · 2021-01-12 12:13:29 +01:00 · 2021-01-12 12:09:30 +01:00 · 2021-01-12 12:05:27 +01:00 · 2021-01-12 11:54:33 +01:00 · 2021-01-12 11:00:44 +01:00
20 changed files with 298 additions and 73 deletions
--- 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;
--- a/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
+++ b/app/src/main/java/com/a1/nextlocation/fragments/HomeFragment.java
@@ -249,7 +249,7 @@ public class HomeFragment extends Fragment implements LocationListener {
        // marker icon
        Drawable marker = ContextCompat.getDrawable(requireContext(), R.drawable.ic_baseline_location_on_24);
        marker.setAlpha(255);
-        marker.setTint(getResources().getColor(R.color.primaryColour));
+        marker.setTint(getResources().getColor(R.color.secondaryColour));

        // add all locations to the overlay itemss
        for (com.a1.nextlocation.data.Location location : locations) {
--- 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;
@@ -13,11 +14,13 @@ 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;
 import androidx.fragment.app.FragmentTransaction;

+import com.a1.nextlocation.MainActivity;
 import com.a1.nextlocation.R;

 import org.jetbrains.annotations.NotNull;
@@ -29,6 +32,7 @@ public class SettingsFragment extends Fragment {
    private SharedPreferences.Editor editor;
    private SwitchCompat fontSwitch;
    private SwitchCompat imperialSwitch;
+    private SwitchCompat colorBlindMode;
    private Refreshable refreshable;

    @Override
@@ -42,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
@@ -94,17 +99,37 @@ 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();
        });
+
+        this.colorBlindMode = view.findViewById(R.id.colourblindSwitch);
+        this.colorBlindMode.setChecked(sharedPreferences.getBoolean("colorBlindModeSwitch", false));
+
+        this.colorBlindMode.setOnClickListener(view1 -> {
+            editor.putBoolean("colorBlindModeSwitch", colorBlindMode.isChecked());
+            editor.apply();
+            editor.commit();
+
+            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_NextLocation);
+                AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+                getActivity().recreate();
+                System.out.println("UIT");
+            }
+
+        });
    }

    private void initializeLanguageDropdown(View view) {
--- a/app/src/main/res/drawable-anydpi/ic_stop_icon.xml
+++ b/app/src/main/res/drawable-anydpi/ic_stop_icon.xml
@@ -6,7 +6,7 @@
    android:tint="#333333"
    android:alpha="0.6">
  <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@color/primaryColour"
      android:pathData="M8,16h8V8H8V16zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10s10,-4.48 10,-10S17.52,2 12,2L12,2z"
      android:fillType="evenOdd"/>
 </vector>
--- a/app/src/main/res/drawable/ic_baseline_location_on_24.xml
+++ b/app/src/main/res/drawable/ic_baseline_location_on_24.xml
@@ -5,6 +5,6 @@
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
-      android:fillColor="@color/primaryColour"
+      android:fillColor="@color/secondaryColour"
      android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
 </vector>
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -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"
--- a/app/src/main/res/layout/coupon_item.xml
+++ b/app/src/main/res/layout/coupon_item.xml
@@ -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"
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -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>

--- a/app/src/main/res/layout/fragment_location_detail.xml
+++ b/app/src/main/res/layout/fragment_location_detail.xml
@@ -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,7 +45,7 @@
            android:id="@+id/detail_location_text"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-            android:background="@color/secondaryColour"
+            android:background="@color/primaryColour"
            android:text=""
             />
    </ScrollView>
--- a/app/src/main/res/layout/fragment_route.xml
+++ b/app/src/main/res/layout/fragment_route.xml
@@ -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"
--- a/app/src/main/res/layout/fragment_route_detail.xml
+++ b/app/src/main/res/layout/fragment_route_detail.xml
@@ -45,6 +45,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_marginHorizontal="20dp"
+        android:textColor="@color/secondaryColour"
        android:layout_marginTop="20dp"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.6"
@@ -58,7 +59,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"
@@ -70,9 +71,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"
--- 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"
@@ -25,12 +26,22 @@
        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"
        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"
@@ -39,16 +50,15 @@
        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"
-
        >

        <TextView
            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"
@@ -57,9 +67,9 @@

        <View
            android:id="@+id/Balk"
-            android:layout_width="1dp"
+            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"
@@ -79,12 +89,22 @@

    </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"
        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 +116,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"
@@ -105,9 +125,9 @@

        <View
            android:id="@+id/Balk2"
-            android:layout_width="1dp"
+            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"
@@ -126,13 +146,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/secondaryColour"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:background="@color/primaryColour"
+        app:layout_constraintBottom_toTopOf="@id/Box4"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
        app:layout_constraintTop_toBottomOf="@id/Box2"
@@ -142,7 +171,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"
@@ -151,9 +180,9 @@

        <View
            android:id="@+id/Balk3"
-            android:layout_width="1dp"
+            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"
@@ -168,6 +197,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/colourblindSwitch"
+            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>

--- a/app/src/main/res/layout/fragment_statistic.xml
+++ b/app/src/main/res/layout/fragment_statistic.xml
@@ -14,18 +14,27 @@
        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"
        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"
        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 +46,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"
@@ -46,9 +55,9 @@

        <View
            android:id="@+id/Balk"
-            android:layout_width="1dp"
+            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"
@@ -59,7 +68,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"
@@ -69,12 +78,21 @@

    </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"
        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 +104,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"
@@ -95,9 +113,9 @@

        <View
            android:id="@+id/Balk2"
-            android:layout_width="1dp"
+            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"
@@ -108,7 +126,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"
@@ -118,12 +136,21 @@

    </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/secondaryColour"
+        android:background="@color/primaryColour"
        app:layout_constraintBottom_toTopOf="@id/Box4"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
@@ -133,7 +160,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"
@@ -142,9 +169,9 @@

        <View
            android:id="@+id/Balk3"
-            android:layout_width="1dp"
+            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"
@@ -155,7 +182,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"
@@ -165,12 +192,21 @@

    </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"
        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 +218,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"
@@ -191,9 +227,9 @@

        <View
            android:id="@+id/Balk4"
-            android:layout_width="1dp"
+            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"
@@ -204,7 +240,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"
--- a/app/src/main/res/layout/help_popup.xml
+++ b/app/src/main/res/layout/help_popup.xml
@@ -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" />
--- a/app/src/main/res/layout/location_item.xml
+++ b/app/src/main/res/layout/location_item.xml
@@ -4,10 +4,28 @@
    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">

+    <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"
@@ -25,6 +43,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"
--- a/app/src/main/res/layout/route_item.xml
+++ b/app/src/main/res/layout/route_item.xml
@@ -4,10 +4,28 @@
    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">

+    <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"
@@ -21,6 +39,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"
--- a/app/src/main/res/values-night/colors.xml
+++ 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>
--- 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>
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,8 +7,11 @@
    <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="primaryColour">#FFFFFFFF</color>
+    <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>
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -11,6 +11,11 @@
        <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>
@@ -21,4 +26,7 @@
        <item name="colorPrimaryDark">@color/secondaryColour</item>
        <item name="android:textSize">24sp</item>
    </style>
+
+
+
 </resources>
Author	SHA1	Message	Date
Bipin	7f56cbe30a	Button be working now	2021-01-12 13:58:41 +01:00
Bipin	2f5b53e2b4	barFix	2021-01-12 12:13:29 +01:00
Robin Koedood	4c09192f9a	YEP	2021-01-12 12:09:30 +01:00
Robin Koedood	8740362553	Auto stash before merge of "fuckcolours" and "origin/fuckcolours"	2021-01-12 12:05:27 +01:00
Bipin	0663dabca5	Some non-functional changes	2021-01-12 11:54:33 +01:00
Bipin	e7f152bc00	WAT MOOOOOOI	2021-01-12 11:00:44 +01:00
Bipin	f3dbb2b1d1	big bordfer	2021-01-12 10:44:59 +01:00
Bipin	cf650f6cf4	colourFix	2021-01-12 10:18:04 +01:00
Bipin	c15125d0c2	Removed all soul from application :)	2021-01-12 10:12:17 +01:00