Merge branch 'develop'

handydevcom · Nov 5, 2021 · 33d1a9b · 33d1a9b
2 parents b137f82 + a9b8f5d
commit 33d1a9b
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 21 deletions.
diff --git a/app/src/main/assets/whatsnew.htm b/app/src/main/assets/whatsnew.htm
@@ -22,10 +22,17 @@
 </style>
 <body>
 
+<p><b>2.0.25, 5 Nov 2021</b></p>
+<p>
+[*]Fixed some white labels in Filters.
+[*]Fixed category position popup UI.
+[*]Improved accounts list UI, now fits more text fits on screen.
+</p>
+
 <p><b>2.0.24, 29 Sep 2021</b></p>
 <p>
-    [*]Fixed PIN view not working.
-    [*]Fixed alternate color setting for transactions mistaken with Accounts list setting.
+[*]Fixed PIN view not working.
+[*]Fixed alternate color setting for transactions mistaken with Accounts list setting.
 </p>
 
 <p><b>2.0.23, 27 Sep 2021</b></p>

diff --git a/app/src/main/res/layout/blotter.xml b/app/src/main/res/layout/blotter.xml
@@ -15,7 +15,7 @@
 
     <LinearLayout
         android:id="@+id/title_view"
-        android:background="#6B3D29"
+        android:background="@color/bar_color"
         android:layout_width="match_parent"
         android:orientation="horizontal"
         android:visibility="gone"

diff --git a/app/src/main/res/layout/blotter_filter.xml b/app/src/main/res/layout/blotter_filter.xml
@@ -14,7 +14,7 @@
 	>
 	<ScrollView android:layout_height="0dp"
 		android:layout_weight="1" android:layout_width="fill_parent"
-		android:background="@color/brown_background_light"
+		android:background="@color/accent_light_color"
 		>
 		<LinearLayout android:layout_height="wrap_content" android:id="@+id/layout"
 			android:layout_width="fill_parent"

diff --git a/app/src/main/res/layout/calculator.xml b/app/src/main/res/layout/calculator.xml
@@ -12,7 +12,7 @@
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:defaultFocusHighlightEnabled="false"
-    android:background="@color/brown_background"
+    android:background="@color/accent_color"
     android:orientation="vertical">
 
     <LinearLayout

diff --git a/app/src/main/res/layout/category_selector.xml b/app/src/main/res/layout/category_selector.xml
@@ -16,7 +16,7 @@
 		android:layout_height="wrap_content" android:layout_weight="1"
 		android:gravity="center" android:text="@string/no_categories" />
 	<LinearLayout android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:background="@color/brown_background"
+		android:layout_width="fill_parent" android:background="@color/accent_color"
 		android:paddingTop="2dp">
 		<Button android:layout_width="wrap_content"
 			android:layout_height="wrap_content"

diff --git a/app/src/main/res/layout/date_filter.xml b/app/src/main/res/layout/date_filter.xml
@@ -12,11 +12,11 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:minWidth="300dp"
-	android:background="@color/brown_background_light"
+	android:background="@color/accent_light_color"
 	android:orientation="vertical">
 	<Spinner
 		android:id="@+id/period"
-		android:backgroundTint="@color/brown_background"
+		android:backgroundTint="@color/accent_color"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
 		android:textColor="@color/main_text_color"

diff --git a/app/src/main/res/layout/info_dialog.xml b/app/src/main/res/layout/info_dialog.xml
@@ -19,7 +19,7 @@
 		<LinearLayout 
 			android:layout_width="fill_parent"
 			android:layout_height="fill_parent"
-			android:background="@color/brown_background_light"
+			android:background="@color/accent_light_color"
 			android:orientation="vertical"
 			android:id="@+id/list" />
 	</ScrollView>

diff --git a/app/src/main/res/layout/info_dialog_title.xml b/app/src/main/res/layout/info_dialog_title.xml
@@ -12,7 +12,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-        android:background="@color/brown_background">
+        android:background="@color/accent_color">
     <ImageView android:id="@+id/icon"
                android:layout_width="40dp"
                android:layout_height="40dp"

diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
@@ -24,7 +24,7 @@
 			android:layout_height="wrap_content"
 			app:itemIconTint="@android:color/white"
 			app:itemTextColor="@android:color/white"
-			android:background="@color/brown_background"
+			android:background="@color/bar_color"
 			app:layout_constraintLeft_toLeftOf="parent"
 			app:layout_constraintRight_toRightOf="parent"
 			app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/layout/note_filter.xml b/app/src/main/res/layout/note_filter.xml
@@ -14,7 +14,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:minWidth="300dp"
-    android:background="@color/brown_background_light">
+    android:background="@color/accent_light_color">
     <TextView android:layout_width="wrap_content"
         android:layout_height="wrap_content" android:layout_gravity="center"
         android:textColor="@color/main_text_color"
@@ -23,7 +23,7 @@
         android:layout_width="fill_parent"
         android:layout_marginLeft="3dp"
         android:layout_marginRight="3dp"
-        app:backgroundTint="@color/brown_background"
+        app:backgroundTint="@color/accent_color"
         android:textColor="@color/main_text_color"
         android:id="@+id/edNoteContaining" />
     <Button android:layout_height="wrap_content" android:id="@+id/bNoFilter"

diff --git a/app/src/main/res/layout/ok_cancel_buttons.xml b/app/src/main/res/layout/ok_cancel_buttons.xml
@@ -10,7 +10,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/ButtonBar"
-    android:background="@color/brown_background"
+    android:background="@color/accent_color"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content">
 

diff --git a/app/src/main/res/layout/recur.xml b/app/src/main/res/layout/recur.xml
@@ -11,7 +11,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:background="@color/brown_background_light"
+	android:background="@color/accent_light_color"
 	android:orientation="vertical">
 	<View android:layout_height="1dp" android:background="@drawable/divider_horizontal_dark"
 		android:layout_width="fill_parent" android:layout_marginLeft="10dp"

diff --git a/app/src/main/res/layout/totals_details.xml b/app/src/main/res/layout/totals_details.xml
@@ -8,7 +8,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_height="fill_parent" android:layout_width="fill_parent"
-    android:background="@color/brown_background_light"
+    android:background="@color/accent_light_color"
               android:orientation="vertical">
     <ScrollView android:layout_width="fill_parent" android:layout_height="0dp"
                 android:layout_weight="1">

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -13,10 +13,11 @@
     <color name="calculator_background">#424242</color>
     <color name="global_background">#000000</color>
     <color name="alternate_row">#1F1F1F</color>
-    <color name="brown_background">#7e442e</color>
+    <color name="accent_color">#7e442e</color>
     <color name="main_text_color">#7e442e</color>
-    <color name="brown_background_light">#ffe7d5</color>
+    <color name="accent_light_color">#ffe7d5</color>
     <color name="calculator_title">#fff6f1</color>
     <color name="button_background">#491700</color>
     <color name="selected_list_item_color">#40D7CCC8</color>
+    <color name="bar_color">#7e442e</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -95,7 +95,7 @@
         <item name="android:paddingLeft">4dip</item>
         <item name="android:paddingRight">4dip</item>
         <item name="android:paddingBottom">1dip</item>
-        <item name="android:background">@color/brown_background</item>
+        <item name="android:background">@color/bar_color</item>
     </style>
 
     <style name="ProgressBarBudget" parent="@android:style/Widget.ProgressBar.Horizontal">
@@ -107,7 +107,7 @@
     <style name="BottomBar">
         <item name="android:layout_width">fill_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:background">#6B3D29</item>
+        <item name="android:background">@color/bar_color</item>
         <item name="android:minHeight">@dimen/action_button_size</item>
     </style>
 
@@ -163,6 +163,6 @@
 
     <style name="TitleDialogTextStyle" parent="Base.DialogWindowTitle.AppCompat">
         <item name="android:textColor">#ffffff</item>
-        <item name="android:background">@color/brown_background</item>
+        <item name="android:background">@color/accent_color</item>
     </style>
 </resources>