From ec680e5a47fdbbb86209947d32291e4e6449ad29 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Wed, 14 Nov 2018 14:34:08 +0100
Subject: [PATCH] Issue #564 - Background header for light theme

---
 .../gouv/etalab/mastodon/helper/Helper.java   | 31 ++++++++++++++-----
 app/src/main/res/layout/nav_header_main.xml   |  4 +--
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 4b49819de..b11c5a086 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -1489,9 +1489,17 @@ public class Helper {
             if( urlHeader.startsWith("/") ){
                 urlHeader = Helper.getLiveInstanceWithProtocol(activity) + account.getHeader();
             }
-            LinearLayout main_header_container = headerLayout.findViewById(R.id.main_header_container);
-            if( theme == Helper.THEME_LIGHT){
-                main_header_container.setBackgroundDrawable( activity.getResources().getDrawable(R.drawable.side_nav_bar_dark));
+            ImageView owner_accounts = headerLayout.findViewById(R.id.owner_accounts);
+            ImageView header_option_info = headerLayout.findViewById(R.id.header_option_info);
+            ImageView header_option_menu = headerLayout.findViewById(R.id.header_option_menu);
+            if( theme == Helper.THEME_DARK || theme == Helper.THEME_BLACK){
+                changeDrawableColor(activity, owner_accounts,R.color.dark_text);
+                changeDrawableColor(activity, header_option_info,R.color.dark_text);
+                changeDrawableColor(activity, header_option_menu,R.color.dark_text);
+            }else {
+                changeDrawableColor(activity, owner_accounts,R.color.light_black);
+                changeDrawableColor(activity, header_option_info,R.color.light_black);
+                changeDrawableColor(activity, header_option_menu,R.color.light_black);
             }
             if (!urlHeader.contains("missing.png")) {
                 Glide.with(activity.getApplicationContext())
@@ -1502,11 +1510,20 @@ public class Helper {
                             public void onResourceReady(@NonNull Bitmap resource, Transition<? super Bitmap> transition) {
                                 ImageView backgroundImage = headerLayout.findViewById(R.id.back_ground_image);
                                 backgroundImage.setImageBitmap(resource);
-                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-                                    backgroundImage.setImageAlpha(60);
-                                }else {
-                                    backgroundImage.setAlpha(60);
+                                if( theme == THEME_LIGHT){
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                                        backgroundImage.setImageAlpha(80);
+                                    }else {
+                                        backgroundImage.setAlpha(80);
+                                    }
+                                }else{
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                                        backgroundImage.setImageAlpha(60);
+                                    }else {
+                                        backgroundImage.setAlpha(60);
+                                    }
                                 }
+
                             }
                         });
             }
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 0309f6ff9..796fb1c2b 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -74,7 +74,7 @@
             <TextView
                 android:gravity="center_vertical"
                 android:id="@+id/displayedName"
-                android:textColor="@color/dark_text"
+                android:textColor="?attr/textColor"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
@@ -92,7 +92,7 @@
         </LinearLayout>
         <TextView
             android:id="@+id/username"
-            android:textColor="@color/dark_text"
+            android:textColor="?attr/textColor"
             android:layout_width="wrap_content"
             android:textSize="12sp"
             android:maxLines="1"