From 5519242cd068bf3de33c3c4be5e8c39adf8e50fb Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 1 Jul 2017 15:24:28 +0200
Subject: [PATCH] Improves night mode

---
 app/build.gradle                              |   1 +
 .../mastodon/activities/MediaActivity.java    |   8 +++
 .../mastodon/activities/TootActivity.java     |  21 +++++++
 .../mastodon/drawers/StatusListAdapter.java   |  31 +++++++++-
 .../gouv/etalab/mastodon/helper/Helper.java   |  54 ++++++++++++++----
 .../webview/MastalabWebViewClient.java        |   3 -
 .../drawable-hdpi/ic_action_globe_menu.png    | Bin 0 -> 926 bytes
 .../drawable-ldpi/ic_action_globe_menu.png    | Bin 0 -> 456 bytes
 .../drawable-mdpi/ic_action_globe_menu.png    | Bin 0 -> 600 bytes
 .../drawable-xhdpi/ic_action_globe_menu.png   | Bin 0 -> 1352 bytes
 .../drawable-xxhdpi/ic_action_globe_menu.png  | Bin 0 -> 2138 bytes
 .../drawable-xxxhdpi/ic_action_globe_menu.png | Bin 0 -> 5245 bytes
 app/src/main/res/layout/activity_media.xml    |   4 +-
 .../main/res/menu/activity_main_drawer.xml    |  17 +++++-
 app/src/main/res/values/strings.xml           |   3 +-
 15 files changed, 120 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_globe_menu.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_action_globe_menu.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_globe_menu.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_globe_menu.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_globe_menu.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_globe_menu.png

diff --git a/app/build.gradle b/app/build.gradle
index f77cfdfe3..2e31b866a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,4 +33,5 @@ dependencies {
     compile 'com.evernote:android-job:1.1.11'
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
 
+
 }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
index 518d6954e..baafc4519 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
@@ -117,6 +117,14 @@ public class MediaActivity extends AppCompatActivity  {
             finish();
         if( getSupportActionBar() != null)
             getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+        RelativeLayout main_container_media = (RelativeLayout) findViewById(R.id.main_container_media);
+        if( theme == Helper.THEME_LIGHT){
+            main_container_media.setBackgroundResource(R.color.background_image);
+        }else {
+            main_container_media.setBackgroundResource(R.color.colorPrimaryD);
+        }
+
         loader = (RelativeLayout) findViewById(R.id.loader);
         imageView = (PhotoView) findViewById(R.id.media_picture);
         videoView = (VideoView) findViewById(R.id.media_video);
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index a162d472c..5255f584a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -80,6 +80,8 @@ import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
 import fr.gouv.etalab.mastodon.sqlite.Sqlite;
 import mastodon.etalab.gouv.fr.mastodon.R;
 
+import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
+
 
 /**
  * Created by Thomas on 01/05/2017.
@@ -143,6 +145,25 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
         toot_lv_accounts = (ListView) findViewById(R.id.toot_lv_accounts);
         toot_sensitive = (CheckBox) findViewById(R.id.toot_sensitive);
 
+
+        if( theme == Helper.THEME_DARK){
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe,R.color.dark_text);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open,R.color.dark_text);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed,R.color.dark_text);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_local_post_office,R.color.dark_text);
+
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe,R.color.dark_text);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_camera,R.color.dark_text);
+        }else {
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe,R.color.black);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_open,R.color.black);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_lock_closed,R.color.black);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_local_post_office,R.color.black);
+
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_globe,R.color.black);
+            changeDrawableColor(TootActivity.this, R.drawable.ic_action_camera,R.color.black);
+        }
+
         final LinearLayout drawer_layout = (LinearLayout) findViewById(R.id.drawer_layout);
 
         /*drawer_layout.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 381132990..b1d2f9dc0 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -62,6 +62,7 @@ import fr.gouv.etalab.mastodon.client.Entities.Attachment;
 import fr.gouv.etalab.mastodon.client.Entities.Status;
 import fr.gouv.etalab.mastodon.interfaces.OnPostActionInterface;
 
+import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
 
 
 /**
@@ -185,6 +186,32 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
         if( type == RetrieveFeedsAsyncTask.Type.USER){
             holder.status_action_container.setVisibility(View.GONE);
         }
+        //Manages theme for icon colors
+        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_LIGHT);
+        if( theme == Helper.THEME_DARK){
+            changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_local_post_office,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_retweet_black,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_fav_black,R.color.dark_text);
+            changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text);
+        }else {
+            changeDrawableColor(context, R.drawable.ic_reply,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_action_more,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_action_globe,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_local_post_office,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_retweet_black,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_fav_black,R.color.black);
+            changeDrawableColor(context, R.drawable.ic_photo,R.color.black);
+        }
+
+
         final float scale = context.getResources().getDisplayMetrics().density;
         if( !status.getIn_reply_to_account_id().equals("null") || !status.getIn_reply_to_id().equals("null") ){
             Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_reply);
@@ -197,7 +224,8 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
         }else{
             holder.status_account_displayname.setCompoundDrawables( null, null, null, null);
         }
-        final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+
+
         //Click on a conversation
         if( type != RetrieveFeedsAsyncTask.Type.CONTEXT ){
             holder.status_content.setOnClickListener(new View.OnClickListener() {
@@ -211,7 +239,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
                 }
             });
         }else {
-            int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_LIGHT);
             if( theme == Helper.THEME_LIGHT){
                 if( position == ShowConversationActivity.position){
                     holder.main_container.setBackgroundResource(R.color.blue_light);
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 71028330b..e2dce425b 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
@@ -31,7 +31,9 @@ import android.database.sqlite.SQLiteDatabase;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.media.RingtoneManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
@@ -44,6 +46,7 @@ import android.support.annotation.ColorInt;
 import android.support.design.widget.NavigationView;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.NotificationManagerCompat;
+import android.support.v4.content.ContextCompat;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -54,6 +57,7 @@ import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.TypedValue;
 import android.view.MenuItem;
+import android.view.SubMenu;
 import android.view.View;
 import android.view.WindowManager;
 import android.webkit.CookieManager;
@@ -691,20 +695,35 @@ public class Helper {
         if( currrentUserId == null)
             return;
 
+        MenuItem menu_account = navigationView.getMenu().findItem(R.id.nav_account_list);
+        MenuItem nav_main_com = navigationView.getMenu().findItem(R.id.nav_main_com);
+        MenuItem nav_main_opt= navigationView.getMenu().findItem(R.id.nav_main_opt);
+        final SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
+        int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_LIGHT);
+        if( theme == Helper.THEME_DARK){
+            changeDrawableColor(activity, R.drawable.ic_person_add,R.color.dark_text);
+            changeDrawableColor(activity, R.drawable.ic_person,R.color.dark_text);
+            changeDrawableColor(activity, R.drawable.ic_cancel,R.color.dark_text);
+        }else {
+            changeDrawableColor(activity, R.drawable.ic_person_add,R.color.black);
+            changeDrawableColor(activity, R.drawable.ic_person,R.color.black);
+            changeDrawableColor(activity, R.drawable.ic_cancel,R.color.black);
+        }
+
         if( !menuAccountsOpened ){
 
             arrow.setImageResource(R.drawable.ic_arrow_drop_up);
 
-            navigationView.getMenu().clear();
-            navigationView.inflateMenu(R.menu.menu_accounts);
-
             SQLiteDatabase db = Sqlite.getInstance(activity, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
-
+            menu_account.setVisible(true);
+            nav_main_com.setVisible(false);
+            nav_main_opt.setVisible(false);
             final List<Account> accounts = new AccountDAO(activity, db).getAllAccount();
-            navigationView.setItemIconTintList(null);
+            SubMenu navigationViewSub = navigationView.getMenu().findItem(R.id.nav_account_list).getSubMenu();
+            navigationViewSub.clear();
             for(final Account account: accounts) {
                 if( !currrentUserId.equals(account.getId()) ) {
-                    final MenuItem item = navigationView.getMenu().add("@" + account.getAcct() + "@" + account.getInstance());
+                    final MenuItem item = navigationViewSub.add("@" + account.getAcct() + "@" + account.getInstance());
                     ImageLoader imageLoader;
                     DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
                             .cacheOnDisk(true).resetViewBeforeLoading(true).build();
@@ -723,6 +742,7 @@ public class Helper {
                         @Override
                         public void onLoadingComplete(String s, View view, Bitmap bitmap) {
                             item.setIcon(new BitmapDrawable(activity.getResources(), bitmap));
+                            item.getIcon().setColorFilter(0xFFFFFFFF, PorterDuff.Mode.MULTIPLY);
                         }
 
                         @Override
@@ -770,7 +790,7 @@ public class Helper {
 
                 }
             }
-            MenuItem addItem = navigationView.getMenu().add(R.string.add_account);
+            MenuItem addItem = navigationViewSub.add(R.string.add_account);
             addItem.setIcon(R.drawable.ic_person_add);
             addItem.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                 @Override
@@ -782,13 +802,14 @@ public class Helper {
                 }
             });
         }else{
+            menu_account.setVisible(false);
+            nav_main_com.setVisible(true);
+            nav_main_opt.setVisible(true);
             arrow.setImageResource(R.drawable.ic_arrow_drop_down);
-            navigationView.getMenu().clear();
-            navigationView.inflateMenu(R.menu.activity_main_drawer);
-            final SharedPreferences sharedpreferences = activity.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
             SQLiteDatabase db = Sqlite.getInstance(activity, Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
             String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
             Account account = new AccountDAO(activity, db).getAccountByID(userId);
+
             if( account != null) {
                 if (account.isLocked()) {
                     navigationView.getMenu().findItem(R.id.nav_follow_request).setVisible(true);
@@ -1059,6 +1080,7 @@ public class Helper {
             CookieManager cookieManager = CookieManager.getInstance();
             cookieManager.setAcceptThirdPartyCookies(webView, cookies);
         }
+        webView.setBackgroundColor(Color.TRANSPARENT);
         webView.getSettings().setAppCacheEnabled(true);
         webView.getSettings().setDatabaseEnabled(true);
         webView.getSettings().setCacheMode(WebSettings.LOAD_DEFAULT);
@@ -1092,5 +1114,15 @@ public class Helper {
         return "";
     }
 
-
+    /**
+     * change color of a drawable
+     * @param drawable int the drawable
+     * @param hexaColor example 0xffff00
+     */
+    public static Drawable changeDrawableColor(Context context, int drawable, int hexaColor){
+        int color = Color.parseColor(context.getString(hexaColor));
+        Drawable mDrawable = ContextCompat.getDrawable(context, drawable);
+        mDrawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        return mDrawable;
+    }
 }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java b/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java
index 9ff1d9348..c844119fd 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/webview/MastalabWebViewClient.java
@@ -17,14 +17,11 @@ import android.app.Activity;
 import android.graphics.Bitmap;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.TextView;
-
-import fr.gouv.etalab.mastodon.helper.Helper;
 import mastodon.etalab.gouv.fr.mastodon.R;
 
 /**
diff --git a/app/src/main/res/drawable-hdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-hdpi/ic_action_globe_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..f76e15a6a858c1c87213866301642d53f8851fc4
GIT binary patch
literal 926
zcmV;P17ZA$P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000AJNkl<Zc-rlm
zU5HF!7{|xT%+jpvE{bh$+#r$&H7RT^lu4p-LrckLw)SG=!cb#3)^dSbX_Q2hj|-dT
zf)p;WC55(0A!Q|2NhIuI9sj5PN2j-Q&YYw7%<OLG)UQ1s@5l3h=Xsy^dEbo~h7lRb
zL_z_ffKWgvAQUic1mKE;6v%=cD3BcA$+!5h6M!p8LkECSf&rFIR$KtC1h_}TdO<t5
z3yy--U@q7K`W?hb-9$wM;L3nM;3s%W!+(PvO1X*PtIIDUZDh(O09Op;!4OBf4QvEU
zz-_w7G%yA%1J`YgJ`S3|UhtT0Nt>~92*}fjO<*zT0&l@FP^7!mf+sBZ0(4u97tzzf
zRxkymL9;0$Pyuusxj6(jvr{p2JUDAH^1aQdi^xx44_FUQf+|bf`&lj%hyYGl@z+aq
zj~Lx&9>3S~7jW|RD>6U8PH+I!DD6v|H`zxb2mul?UV>_Cr~JE;uJy=8z$-AjL?4sE
zJLyZS0LFQ_X}0+`3A8X84LKMu@2}F;R?zpO4t=FrC#h3_EIiM_SmphE@X*8J^_t~7
z_<RBE0vj9#M8a-CivXqv5*qg@@1x+32jfj-(ry={Df$N(1UEpP(smd7jO!4Pq5%m$
zPX#l;MIXlZD08O<%mK5k6V@z)YYpqAbO^|Dw4zKEzJV_eq0)}e;`1I|wTa<)73*eo
z2#`#&hxdKpnU9edPWxPIY8i>-A*VxtnPn~l3&C1O9IpaeeG1sdwZQN)k-Z9#n_u8O
z^P6jQt8*@))1=LZ@#^3dbh(h#pzq*_8K)Vg(k=odBrfnMpivo+oUTc1XV`KjLv3*p
z(a+dlWZGTt(AQz5URGxqwbE;*5jOtY=V4wn+SFZY<Blnv3z^~Nr)9W3<#%FpeyLl}
zxXx6<+V~sEYh22AmJpD$sdHH=QwSoNv(o8MwwhZ@HvuPX>YY)_B!ft&RYMLsxLm0@
z(5}?k&AjN}W<SUcjn$B%Ql>%KnK^M^sn@M+@)JRCDNQ~qNm_@;)me;eV4a!Dw@kS<
z^#)hX34CA0;}x$dh9qq3lx=9foX0Bi@PQ*Z4m|Lg<P9p%<vCWdIoOhjbIYgkl{?sS
zIa>T5DtELvDh_u?&GCBpADU1=C?FIN3K+5c1u$|M3*t}&3;+NC07*qoM6N<$f|c8-
Ar2qf`

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-ldpi/ic_action_globe_menu.png b/app/src/main/res/drawable-ldpi/ic_action_globe_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..bcf0316409322e8efa4ef7fd26c87333d166cad1
GIT binary patch
literal 456
zcmV;(0XP1MP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0004xNkl<Zc-rli
z&nrbi6vy99QA!s6fSbibHWsp$ELd9Dv*0CV$wDa>%ErQv9ib$zh?2Zs?n}x-if5-J
z3)!J03t6~6r_QZudc*ZRHcWl$%$b?<oqO(?nM4?diJv6#cLZo2Bo(hD0vfa*(r^pM
z@BojH(=o3o0h$k+unT+8uKr07;|*?LU*>*EK!cyc5UfH5rqp+>0<!y7=!OfIh$}4{
z&;TP)18W*IVhILhj;?8eokHm<Bp^E*H~PcyWC;vv&?;lzn5>N>AV058?FlPzL=P;$
z5%lWZS_nQA(DVe*1uKr=+fgcL<xrt^2OQdIvIV5Z*C7S>4uLjDVRY(v@-qQ3&R|BX
zC~FC%3Is2Md>jE!50P~8>Z^ohL*NBYVA@#M2(P-<i}RDkShW0o)|XrvV{_`u#Vu1Y
zo}tO`&sqX^##lN!d~pw2pbIkUtA|TVKvGo=&DsxQ9W>*rkbItNf8J41qi~>e{bDXV
yx#+eW!9!!`{&%nIoKan2Nv`W(d2s$8ec>H|sk^G{717WD0000<MNUMnLSTZH4#vCy

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-mdpi/ic_action_globe_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ddcc81022c35e9d90d35ad472c29fdc8dd29c13
GIT binary patch
literal 600
zcmV-e0;m0nP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80006XNkl<Zc-rlk
zO(;ZB6vy9$F{_ys&4R{8Y^G?e>@21zM9PLFWi(8)u`-s}$jZ(_$%2|lN)nT7)Z}AI
zNtDEfQj#Hy3FCk2ygI$!yw`g(6N|a^>%F=6+;ji;ymLQB$!4?4U!s%*lmyu7q$o}h
z03n9nokbOZ;s9ZA3ZB6`I0tWl3^E|aHjaV{K=FYDcmlg%QJpbLCkv2}t*;;gP<p`)
z7y|QPgd^YuQLqQTc;E#P1e@TV`sO8oXZ{EVz%`fvhdkI3Khxj?9D{bYb%8eUVipOr
zZ@v$@Ksi5M90_g6FE}zmnT#l-{5c$U1W+=qY3lko559E-RDoJhrs;D)zU&B~3~vy>
zW8g<;_QW{Y0cT(pw2FSiv^p#a;B|h<@6{asOpd{cLAGrK5ikuZDH_1TdE&GpfHsyD
z&T`7|SA)Tq4Wd{BCc!QFv?3tHOQ{<y84OPJn5?82+l8zOpqDE!22Q{n=Y>{4#9;7x
zk+31FpFkae97MU^E7rftCx@9fp(c%=4q+FtnuIdx{G!bbX80`7Mq^6YQ4&6gbHZtL
z8K#8eW}Wu9j({!EUMK2Pb~hr`0p);OGdsP6+!i)|Q6ILu6(@v~S<%*?LqJj|g7&sz
zaTul9QJm{M20LPw6SYMgRK7wS$K+@ORDgApeId!GV><8SSm#1=XEJ!<FC;owvQ&<9
mp?Fuae{m@-{Vym9C>Fnh7W!htApGe70000<MNUMnLSTYp`UQFb

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_globe_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f263b822c973b379673123c1160998dd7afdd74
GIT binary patch
literal 1352
zcmV-O1-JT%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000FKNkl<Zc-rln
zU1%Le6vuCqCK^qvv8_>v27_WMih}4%EYiGaR0Oqou(T9R8%2F7)Dp3_5vf?P7A-+;
z#m^Xh@S#YQNMp4n{YasfwqUU$m1v9gyWg$Wdi@{y4-CW1-rc*Iy*G9iek6By=IqXY
zXU;h@JGnxkkUO8r1p$HpL4Y7Y5FiK;1PB5I0es&mm#YEopc||Jc`!)i|6X2`GBy7T
z0dUlVPA~wDfI>`;u#VKNpKt=;r~^Gk8hsZ00RE04hS;jBcmZ%!gD!ATYrqJ21S|(1
zgU7+OQkHeD2Cv8H6$fd%x*`R@(Ex^xhaTqm{sVjlE^^dem0);?&4!8+07onMh7Y(G
z{0^Q4v%pI53$J}`j%gfIwd*#-?rzJu)`}1S$82q^ZvxHWUN9eQ<Nx=A<6u;Ic#88T
z&x-*67>zs$ZU<EyS~I~b;3v&D%r2_{eDkXDukzd-;02D^{on!c70YaAnY`A})8Ia>
zVFe2EFqi~B0GEIn;5~2|Sg(oDS{4B~=2f>BCw4Jdr@hGzun2r-yjf|)xroT{7kFFz
z1;gku=?RvcVzV|J8Zs4tT~awb>DIM;*b$!lQY+h*z`-2=Yv@D1056O4bUeeA;IQTx
ztFsiKi#PsN!kBSwu^zM8jn~9zy!4!9panb!ZU*;6Wrg%VDv#*OL;xl^D$dWbT%W|h
zEsXvBU_;Cva1<;^k_zK^M#~fGvJjw$H{7in>nK-ChbZIy+n56U44O(9j$^Ff<5d8T
zbLI6Pj3_6bdWaz|?)cwDe=!BjrKguD(-Gsjp3<U1y-xu;d80k9w{L{KB)q28SLb#x
zvfNoj@Jqo7*6H*qzyNRZSj3cftc1oFm@cmdZ-KSU6^`-RVZL2SneTSoyN_iDya>R?
zsqR11kr#YkV&hdrxz4b88`J0K!A5XMvP#GEwQ0kk#)kmyDofMONwP8zJfwN!QaB^2
zvCGL7d9JJY_d+I7@}u2{0NpgcUh@YhwHUrPg#b^c$VfkBb~z2~qrGk)0`$`OV*VaY
z(O{k5(kyo1XcWJ|p`vW|`Vc@(U>5TCAoKCQlmhG+hZ*Sw%psJ`ybl2eX?%=R(<&k!
z`_B{tEKk|^M&=y4%|V|66zFW$a>gf_*j6o+?Mo=Yx)hDS-ZI<tCP3cNfId!pcY>QZ
zEnW(iSQa^K$a=svDc2xPn|Ys3(8ea^9F010CqXi&pAIIoQH=?nYoo<pug@^(VwI&%
z74w8x&X7*^d-@bfr>7QqrW+i#x_u@>HY8<jiKzP`IF-;hh|S3nHm7JSQYP)bQ(=>x
zG3sBzMa|O*M3@_4@9BsSDK)+)LnV81E`X*Ek<0*Xbq2DS4%=38X2i6yG=Ts^B?!=&
z)q;q1K3}AMb3$LRC&Jc;j_zNd)smQPQS*r+b#F=N2;YrJeQhDOC+kH~8}lRT-kMN=
zH*C{iE}z*xp4Mf(EN<fyN1e;T`w0a&V6oHW7)D*?`Y=*d046MFOPnmV8Ma<>d@-&r
z=ch3<x1W|G^qH(Q?z!KRMmJQ#$5DlJ&sw8ge+mKmnf2WTwphG=c|MLhK9B#mBgDA=
zPK<3ZQT)iQG`5ge-p}KX4HCjf;70K1I4zqMDt3cJ#1@%zT<;t2##i1JnIfB{#*50{
zBvryTxg>iAC&o6puu(E>l?|Jvg8)H*AV3fx2oMAa0t5jj4F3WQ_-}BigJ<Ue0000<
KMNUMnLSTZ;&3K>y

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_globe_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..a51cef2021b48e2509342b9983a977509739df10
GIT binary patch
literal 2138
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
Qr2qf`07*qoM6N<$f_PHi;{X5v

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_globe_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_action_globe_menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..332518dcbae8439afea568e9bb72281b794c7110
GIT binary patch
literal 5245
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml
index e41911a99..22948ce35 100644
--- a/app/src/main/res/layout/activity_media.xml
+++ b/app/src/main/res/layout/activity_media.xml
@@ -19,7 +19,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_image"
+    android:id="@+id/main_container_media"
     >
     <ImageView
         android:visibility="gone"
@@ -75,7 +75,7 @@
             android:textSize="12sp"
             android:visibility="gone"
             android:layout_marginTop="10dp"
-            android:textColor="@color/colorAccent"
+            android:textColor="?attr/colorAccent"
             android:layout_below="@+id/pbar_inf"
             android:layout_width="50dp"
             android:gravity="center"
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 1836bedd6..90a685571 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -2,7 +2,16 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <group android:checkableBehavior="single">
-        <item android:title="@string/communication_menu_title">
+        <item android:id="@+id/nav_account_list"
+            android:visible="false"
+            android:title="@string/account_list_menu">
+            <menu /></item>
+    </group>
+    <group android:checkableBehavior="single">
+        <item
+            android:title="@string/communication_menu_title"
+            android:id="@+id/nav_main_com"
+            >
             <menu>
                 <group android:checkableBehavior="single">
                     <item
@@ -15,7 +24,7 @@
                         android:title="@string/local_menu" />
                     <item
                         android:id="@+id/nav_global"
-                        android:icon="@drawable/ic_action_globe"
+                        android:icon="@drawable/ic_action_globe_menu"
                         android:title="@string/global_menu" />
                     <item
                         android:id="@+id/nav_notification"
@@ -28,7 +37,9 @@
                 </group>
             </menu>
         </item>
-        <item android:title="@string/neutral_menu_title">
+        <item
+            android:title="@string/neutral_menu_title"
+            android:id="@+id/nav_main_opt">
             <menu>
                 <group android:checkableBehavior="single">
                     <item
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed66decd0..3f465f7b9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,6 +54,7 @@
     <string name="communication_menu_title">Communication</string>
     <string name="muted_menu">Utilisateurs muets</string>
     <string name="blocked_menu">Utilisateurs bloqués</string>
+    <string name="account_list_menu">Comptes</string>
     <string name="notifications">Notifications</string>
     <string name="follow_request">Demandes d\'abonnements</string>
     <string name="optimization">Optimisation</string>
@@ -65,7 +66,7 @@
     <string name="send_email">Envoyer un email</string>
     <string name="choose_file">Veuillez sélectionner un fichier</string>
     <string name="choose_file_error">Aucun explorateur de fichiers trouvé !</string>
-    <string name="click_to_change">Cliquez sur le chemin pour changer</string>
+    <string name="click_to_change">Cliquer sur le chemin pour changer</string>
     <!-- Status -->
     <string name="no_status">Aucun pouet à afficher !</string>
     <string name="fav_added">Pouet ajouté aux favoris !</string>