diff --git a/app/build.gradle b/app/build.gradle index fa633888..68727b2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,8 +33,8 @@ android { applicationId "com.handydev.financier" minSdkVersion 21 targetSdkVersion 29 - versionCode 210 - versionName "2.0.10" + versionCode 211 + versionName "2.0.11" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true javaCompileOptions { diff --git a/app/src/main/assets/whatsnew.htm b/app/src/main/assets/whatsnew.htm index b1d24ce0..2f8b6fd6 100644 --- a/app/src/main/assets/whatsnew.htm +++ b/app/src/main/assets/whatsnew.htm @@ -17,6 +17,13 @@ +

2.0.11

+

+ [*] Background is black again!
+ [*] Date and time selection UI is more compact now.
+ [*] Faster selection of rows in Accounts and Blotters.
+

+

2.0.10

[*] Fixed parent category selection.
diff --git a/app/src/main/java/com/handydev/financier/adapter/AccountListAdapter2.java b/app/src/main/java/com/handydev/financier/adapter/AccountListAdapter2.java index 3be65ca1..aee50bb1 100644 --- a/app/src/main/java/com/handydev/financier/adapter/AccountListAdapter2.java +++ b/app/src/main/java/com/handydev/financier/adapter/AccountListAdapter2.java @@ -117,14 +117,10 @@ public void bindView(View view, Context context, Cursor cursor) { } protected void alternateColorIfNeeded(AccountListItemHolder v, Context context, Cursor cursor) { - if(MyPreferences.isAccountAlternateColors(context)) { - if(cursor.getPosition() % 2 == 1) { - v.layout.setBackgroundColor(Color.argb(255, 31, 31, 31)); - } else { - v.layout.setBackgroundColor(Color.TRANSPARENT); - } + if(MyPreferences.isAccountAlternateColors(context) && cursor.getPosition() % 2 == 1) { + v.layout.setBackgroundColor(context.getResources().getColor(R.color.alternate_row)); } else { - v.layout.setBackgroundColor(Color.TRANSPARENT); + v.layout.setBackgroundColor(context.getResources().getColor(R.color.global_background)); } } diff --git a/app/src/main/java/com/handydev/financier/adapter/BlotterListAdapter.java b/app/src/main/java/com/handydev/financier/adapter/BlotterListAdapter.java index c20aaaca..079df665 100644 --- a/app/src/main/java/com/handydev/financier/adapter/BlotterListAdapter.java +++ b/app/src/main/java/com/handydev/financier/adapter/BlotterListAdapter.java @@ -222,14 +222,10 @@ public void onClick(View arg0) { } protected void alternateColorIfNeeded(BlotterViewHolder v, Context context, Cursor cursor) { - if(MyPreferences.isBlotterAlternateColors(context)) { - if(cursor.getPosition() %2 == 1) { - v.layout.setBackgroundColor(Color.argb(255, 31, 31, 31)); - } else { - v.layout.setBackgroundColor(Color.TRANSPARENT); - } + if(MyPreferences.isAccountAlternateColors(context) && cursor.getPosition() % 2 == 1) { + v.layout.setBackgroundColor(context.getResources().getColor(R.color.alternate_row)); } else { - v.layout.setBackgroundColor(Color.TRANSPARENT); + v.layout.setBackgroundColor(context.getResources().getColor(R.color.global_background)); } } diff --git a/app/src/main/res/layout/account_list_item.xml b/app/src/main/res/layout/account_list_item.xml index 57c4b0e5..d5ae0a5c 100644 --- a/app/src/main/res/layout/account_list_item.xml +++ b/app/src/main/res/layout/account_list_item.xml @@ -1,13 +1,4 @@ - + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c649a19b..c486a8b0 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -22,4 +22,6 @@ #00BCD4 #795548 #424242 + #000000 + #1F1F1F \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 3d4c79ae..4bbe29a1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,16 +1,9 @@ - + -