Update colors

Nik-Pavlov · Jun 25, 2019 · e496a04 · e496a04
1 parent 0632a45
commit e496a04
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 28 deletions.
diff --git a/Android/EasyBudget/app/src/main/res/layout/recyclerview_monthly_report_expense_cell.xml b/Android/EasyBudget/app/src/main/res/layout/recyclerview_monthly_report_expense_cell.xml
@@ -15,10 +15,11 @@
 -->
 
 
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
-                android:layout_width="match_parent"
-                android:layout_height="70dp">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="70dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -33,8 +34,9 @@
             android:gravity="center_horizontal"
             android:paddingTop="12dp"
             android:background="@drawable/ic_date"
+            android:backgroundTint="@color/monthly_report_date_color"
             android:layout_gravity="center_vertical"
-            android:textColor="@color/primary"
+            android:textColor="@color/monthly_report_date_color"
             android:textSize="14dp"
             android:textStyle="bold" />
 

diff --git a/Android/EasyBudget/app/src/main/res/layout/recyclerview_monthly_report_header_cell.xml b/Android/EasyBudget/app/src/main/res/layout/recyclerview_monthly_report_header_cell.xml
@@ -14,15 +14,19 @@
    limitations under the License.
 -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="match_parent"
-      android:layout_height="30dp">
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <TextView android:id="@+id/monthly_recycler_view_header_tv"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingLeft="10dp"
-        android:textSize="16dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:textSize="16sp"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:textColor="@android:color/white"
         android:textStyle="bold"
         android:gravity="center_vertical" />

diff --git a/Android/EasyBudget/app/src/main/res/layout/recycleview_expense_cell.xml b/Android/EasyBudget/app/src/main/res/layout/recycleview_expense_cell.xml
@@ -30,7 +30,8 @@
         android:paddingLeft="15dp"
         android:paddingRight="15dp" >
 
-        <ImageView android:id="@+id/positive_indicator"
+        <ImageView
+            android:id="@+id/positive_indicator"
             android:layout_width="30dp"
             android:layout_height="30dp"
             android:layout_marginLeft="5dp"

diff --git a/Android/EasyBudget/app/src/main/res/values-night/colors.xml b/Android/EasyBudget/app/src/main/res/values-night/colors.xml
@@ -15,18 +15,26 @@
 -->
 
 <resources>
-    <color name="window_background">#1c2124</color>
+    <color name="window_background">#000c0b</color>
 
     <color name="primary_light">#444</color>
-    <color name="primary">@color/easy_budget_green_light</color>
-    <color name="action_bar_text_color">@color/easy_budget_green_light</color>
+    <color name="primary">@color/easy_budget_green_night</color>
+    <color name="action_bar_text_color">@color/easy_budget_green_night</color>
     <color name="main_fab_action_color">@color/window_background</color>
-    <color name="home_fab_button_color_pressed">@color/easy_budget_green</color>
+    <color name="home_fab_button_color">@color/easy_budget_green_night</color>
+    <color name="home_fab_button_color_pressed">@color/easy_budget_green_light</color>
+
+    <color name="budget_green">#66BB6A</color>
+    <color name="budget_green_out">#A5D6A7</color>
+    <color name="budget_orange">#FFA726</color>
+    <color name="budget_red">#EF5350</color>
+    <color name="budget_red_out">#EF9A9A</color>
 
     <color name="calendar_today_background_color">@color/window_background</color>
     <color name="calendar_cell_disabled_text_color">#666</color>
     <color name="calendar_month_button_color_disabled">#555</color>
-    <color name="calendar_month_button_color">@color/easy_budget_green_light</color>
+    <color name="calendar_month_button_color">@color/easy_budget_green_night</color>
+    <color name="monthly_report_date_color">@color/easy_budget_green</color>
 
     <color name="recurring_icon_color">#BBB</color>
 

diff --git a/Android/EasyBudget/app/src/main/res/values-night/styles.xml b/Android/EasyBudget/app/src/main/res/values-night/styles.xml
@@ -6,16 +6,4 @@
         <item name="colorButtonNormal">@color/accent_ripple</item>
     </style>
 
-    <style name="NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textColor">@color/easy_budget_green_light</item>
-    </style>
-
-    <style name="NeutralButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textColor">@color/easy_budget_green_light</item>
-    </style>
-
-    <style name="PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
-        <item name="android:textColor">@color/easy_budget_green_light</item>
-    </style>
-
 </resources>
diff --git a/Android/EasyBudget/app/src/main/res/values/colors.xml b/Android/EasyBudget/app/src/main/res/values/colors.xml
@@ -16,6 +16,7 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
     <color name="easy_budget_green">#00897B</color>
+    <color name="easy_budget_green_night">#4DB6AC</color>
     <color name="easy_budget_green_dark">#00695C</color>
     <color name="easy_budget_green_light">#B2DFDB</color>
     <color name="white">#FFF</color>
@@ -76,4 +77,5 @@
     <color name="expense_edit_title_text_color">@color/primary_text</color>
     <color name="monthly_report_categories_title">@color/primary_text</color>
     <color name="monthly_report_categories_value">@color/accent</color>
+    <color name="monthly_report_date_color">@color/primary</color>
 </resources>