From c15125d0c2acca14e16a35416e1c6bf1cc6a8383 Mon Sep 17 00:00:00 2001 From: Bipin Date: Tue, 12 Jan 2021 10:12:17 +0100 Subject: [PATCH] Removed all soul from application :) --- .../main/res/drawable-anydpi/ic_stop_icon.xml | 2 +- app/src/main/res/layout/activity_main.xml | 4 +-- app/src/main/res/layout/coupon_item.xml | 4 +-- app/src/main/res/layout/fragment_home.xml | 4 +-- .../res/layout/fragment_location_detail.xml | 6 ++-- app/src/main/res/layout/fragment_route.xml | 1 + .../main/res/layout/fragment_route_detail.xml | 7 ++-- app/src/main/res/layout/fragment_settings.xml | 18 +++++----- .../main/res/layout/fragment_statistic.xml | 34 +++++++++---------- app/src/main/res/layout/help_popup.xml | 7 ++-- app/src/main/res/layout/location_item.xml | 3 +- app/src/main/res/layout/route_item.xml | 3 +- app/src/main/res/values/colors.xml | 6 ++-- 13 files changed, 52 insertions(+), 47 deletions(-) diff --git a/app/src/main/res/drawable-anydpi/ic_stop_icon.xml b/app/src/main/res/drawable-anydpi/ic_stop_icon.xml index addfeb0..8be9df4 100644 --- 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"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cc1d88c..2e192cb 100644 --- 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" diff --git a/app/src/main/res/layout/coupon_item.xml b/app/src/main/res/layout/coupon_item.xml index 76cff35..9a9a437 100644 --- 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" diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index c97c363..d47b45f 100644 --- 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"/> diff --git a/app/src/main/res/layout/fragment_location_detail.xml b/app/src/main/res/layout/fragment_location_detail.xml index a89a336..007d7ed 100644 --- 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="" /> diff --git a/app/src/main/res/layout/fragment_route.xml b/app/src/main/res/layout/fragment_route.xml index 3904b49..e445af1 100644 --- a/app/src/main/res/layout/fragment_route.xml +++ b/app/src/main/res/layout/fragment_route.xml @@ -19,6 +19,7 @@ @@ -48,7 +48,7 @@ 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" @@ -59,7 +59,7 @@ android:id="@+id/Balk" android:layout_width="1dp" 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" @@ -84,7 +84,7 @@ 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 +96,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" @@ -107,7 +107,7 @@ android:id="@+id/Balk2" android:layout_width="1dp" android:layout_height="match_parent" - android:background="@color/black" + android:background="@color/buttonColour" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -131,7 +131,7 @@ 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_constraintStart_toStartOf="parent" @@ -142,7 +142,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" diff --git a/app/src/main/res/layout/fragment_statistic.xml b/app/src/main/res/layout/fragment_statistic.xml index 5172702..8662884 100644 --- a/app/src/main/res/layout/fragment_statistic.xml +++ b/app/src/main/res/layout/fragment_statistic.xml @@ -14,7 +14,7 @@ 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" @@ -25,7 +25,7 @@ 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 +37,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" @@ -48,7 +48,7 @@ android:id="@+id/Balk" android:layout_width="1dp" 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 +59,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" @@ -74,7 +74,7 @@ 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 +86,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" @@ -97,7 +97,7 @@ android:id="@+id/Balk2" android:layout_width="1dp" 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 +108,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" @@ -123,7 +123,7 @@ 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 +133,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" @@ -144,7 +144,7 @@ android:id="@+id/Balk3" android:layout_width="1dp" 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 +155,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" @@ -170,7 +170,7 @@ 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 +182,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" @@ -193,7 +193,7 @@ android:id="@+id/Balk4" android:layout_width="1dp" 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 +204,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" diff --git a/app/src/main/res/layout/help_popup.xml b/app/src/main/res/layout/help_popup.xml index be39f71..fda4ba9 100644 --- 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"/> diff --git a/app/src/main/res/layout/location_item.xml b/app/src/main/res/layout/location_item.xml index 9e733b9..8e537be 100644 --- a/app/src/main/res/layout/location_item.xml +++ b/app/src/main/res/layout/location_item.xml @@ -4,7 +4,7 @@ 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"> @@ -25,6 +25,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" diff --git a/app/src/main/res/layout/route_item.xml b/app/src/main/res/layout/route_item.xml index eb1e951..cc3ac5e 100644 --- a/app/src/main/res/layout/route_item.xml +++ b/app/src/main/res/layout/route_item.xml @@ -4,7 +4,7 @@ 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"> @@ -21,6 +21,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" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a8f6080..ebfbba9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -7,8 +7,8 @@ #FF018786 #FF000000 #FFFFFFFF - #FF115571 - #FF31AFB4 - #FF14212D + #FFFFFFFF + #FF000000 + #FF000000 #FF0000 \ No newline at end of file