From b09146fb5411d49164c3fced3dc50569ee67be53 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 08:45:37 +0200 Subject: [PATCH 01/19] Prepares missing menu in show accounts --- .../main/res/layout/activity_show_account.xml | 19 +++++++++++++++---- app/src/main/res/menu/main_showaccount.xml | 8 ++++---- app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 23 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml index 38b8ad494..f7fb51f01 100644 --- a/app/src/main/res/layout/activity_show_account.xml +++ b/app/src/main/res/layout/activity_show_account.xml @@ -55,7 +55,18 @@ android:layout_marginEnd="10dp" android:layout_width="40dp" android:layout_height="40dp" + android:layout_marginBottom="5dp" /> + + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b0e124653..5fef7c9d2 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -426,4 +426,5 @@ Danke an: Erlauben Interaktionen zwischen den accounts? + Im Browser öffnen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d6c748493..c8dfa30bb 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -433,4 +433,5 @@ Le pouet a été épinglé ! Le pouet a été désépinglé ! Epinglés %d + Ouvrir dans le navigateur \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index f825f0a68..13d059d4e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -432,4 +432,5 @@ Agradecimentos a: + Open in browser diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1042c28fb..c59acdb76 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -66,6 +66,7 @@ Boosts Show boosts Show replies + Open in browser Home Local timeline From f868f2a425ae06034f2ea85631c94b61fce813d3 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 09:22:56 +0200 Subject: [PATCH 02/19] Adds filter by long click on the tab --- .../activities/ShowAccountActivity.java | 222 +++++++++++++----- .../res/menu/option_filter_toots_account.xml | 18 ++ 2 files changed, 178 insertions(+), 62 deletions(-) create mode 100644 app/src/main/res/menu/option_filter_toots_account.xml diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 56f55fba8..0081a39e5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -40,11 +40,15 @@ import android.support.v4.content.ContextCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.PopupMenu; import android.text.SpannableString; import android.text.method.LinkMovementMethod; +import android.util.Log; import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageButton; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -119,6 +123,8 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi private String accountUrl; private int maxScrollSize; private boolean avatarShown = true; + private DisplayStatusFragment displayStatusFragment; + public enum action{ FOLLOW, UNFOLLOW, @@ -226,7 +232,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi Fragment fragment = (Fragment) mPager.getAdapter().instantiateItem(mPager, tab.getPosition()); switch (tab.getPosition()){ case 0: - DisplayStatusFragment displayStatusFragment = ((DisplayStatusFragment) fragment); if( displayStatusFragment != null ) displayStatusFragment.scrollToTop(); break; @@ -268,6 +273,67 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi startActivity(intent); } }); + + + + + + final ImageButton account_menu = (ImageButton) findViewById(R.id.account_menu); + account_menu.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + PopupMenu popup = new PopupMenu(ShowAccountActivity.this, account_menu); + popup.getMenuInflater() + .inflate(R.menu.main_showaccount, popup.getMenu()); + if( !Helper.canPin || !accountId.equals(userId)) { + popup.getMenu().findItem(R.id.action_show_pinned).setVisible(false); + } + popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { + public boolean onMenuItemClick(MenuItem item) { + switch (item.getItemId()) { + case R.id.action_show_pinned: + showPinned = !showPinned; + if( showPinned ) + item.setIcon(R.drawable.ic_clear_all); + else + item.setIcon(R.drawable.ic_action_pin); + if( tabLayout.getTabAt(0) != null) + //noinspection ConstantConditions + tabLayout.getTabAt(0).select(); + PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); + mPager.setAdapter(mPagerAdapter); + return true; + case R.id.action_show_media: + showMediaOnly = !showMediaOnly; + if( showMediaOnly ) + item.setIcon(R.drawable.ic_clear_all); + else + item.setIcon(R.drawable.ic_perm_media); + if( tabLayout.getTabAt(0) != null) + //noinspection ConstantConditions + tabLayout.getTabAt(0).select(); + mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); + mPager.setAdapter(mPagerAdapter); + return true; + case R.id.action_open_browser: + if( accountUrl != null) { + Intent intent = new Intent(getApplicationContext(), WebviewActivity.class); + Bundle b = new Bundle(); + if( !accountUrl.startsWith("http://") && ! accountUrl.startsWith("https://")) + accountUrl = "http://" + accountUrl; + b.putString("url", accountUrl); + intent.putExtras(b); + startActivity(intent); + } + return true; + default: + return true; + } + } + }); + popup.show(); + } + }); } @@ -284,67 +350,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi new RetrieveRelationshipAsyncTask(getApplicationContext(), accountId,ShowAccountActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } - @Override - public boolean onCreateOptionsMenu(Menu menu) { - // Inflate the menu; this adds items to the action bar if it is present. - getMenuInflater().inflate(R.menu.main_showaccount, menu); - //TODO: if one day pinned toots from another account can be displayed, we need to remove the condition !accountId.equals(userId) - if( !Helper.canPin || !accountId.equals(userId)) { - menu.findItem(R.id.action_show_pinned).setVisible(false); - } - return true; - } - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - case R.id.action_show_pinned: - showPinned = !showPinned; - if( showPinned ) - item.setIcon(R.drawable.ic_clear_all); - else - item.setIcon(R.drawable.ic_action_pin); - if( tabLayout.getTabAt(0) != null) - //noinspection ConstantConditions - tabLayout.getTabAt(0).select(); - PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); - mPager.setAdapter(mPagerAdapter); - return true; - case R.id.action_show_media: - showMediaOnly = !showMediaOnly; - if( showMediaOnly ) - item.setIcon(R.drawable.ic_clear_all); - else - item.setIcon(R.drawable.ic_perm_media); - if( tabLayout.getTabAt(0) != null) - //noinspection ConstantConditions - tabLayout.getTabAt(0).select(); - mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); - mPager.setAdapter(mPagerAdapter); - return true; - case R.id.action_open_browser: - if( accountUrl != null) { - Intent intent = new Intent(getApplicationContext(), WebviewActivity.class); - Bundle b = new Bundle(); - if( !accountUrl.startsWith("http://") && ! accountUrl.startsWith("https://")) - accountUrl = "http://" + accountUrl; - b.putString("url", accountUrl); - intent.putExtras(b); - startActivity(intent); - } - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - public void onDestroy(){ - super.onDestroy(); - } @Override public void onRetrieveAccount(Account account, Error error) { @@ -488,9 +494,89 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi //noinspection ConstantConditions tabLayout.getTabAt(2).setText(getString(R.string.followers_cnt, account.getFollowers_count())); + //Allows to filter by long click + final LinearLayout tabStrip = (LinearLayout) tabLayout.getChildAt(0); + tabStrip.getChildAt(0).setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + PopupMenu popup = new PopupMenu(ShowAccountActivity.this, tabStrip.getChildAt(0)); + popup.getMenuInflater() + .inflate(R.menu.option_filter_toots_account, popup.getMenu()); + Menu menu = popup.getMenu(); + + if( !Helper.canPin || !accountId.equals(userId)) { + popup.getMenu().findItem(R.id.action_show_pinned).setVisible(false); + } + final MenuItem itemShowPined = menu.findItem(R.id.action_show_pinned); + final MenuItem itemShowMedia = menu.findItem(R.id.action_show_media); + + itemShowMedia.setChecked(showMediaOnly); + itemShowPined.setChecked(showPinned); + popup.setOnDismissListener(new PopupMenu.OnDismissListener() { + @Override + public void onDismiss(PopupMenu menu) { + if( displayStatusFragment != null) + displayStatusFragment.refreshFilter(); + } + }); + popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { + public boolean onMenuItemClick(MenuItem item) { + item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW); + item.setActionView(new View(getApplicationContext())); + item.setOnActionExpandListener(new MenuItem.OnActionExpandListener() { + @Override + public boolean onMenuItemActionExpand(MenuItem item) { + return false; + } + + @Override + public boolean onMenuItemActionCollapse(MenuItem item) { + return false; + } + }); + switch (item.getItemId()) { + case R.id.action_show_pinned: + showPinned = !showPinned; + if( showPinned ) + item.setIcon(R.drawable.ic_clear_all); + else + item.setIcon(R.drawable.ic_action_pin); + if( tabLayout.getTabAt(0) != null) + //noinspection ConstantConditions + tabLayout.getTabAt(0).select(); + PagerAdapter mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); + mPager.setAdapter(mPagerAdapter); + break; + case R.id.action_show_media: + showMediaOnly = !showMediaOnly; + if( showMediaOnly ) + item.setIcon(R.drawable.ic_clear_all); + else + item.setIcon(R.drawable.ic_perm_media); + if( tabLayout.getTabAt(0) != null) + //noinspection ConstantConditions + tabLayout.getTabAt(0).select(); + mPagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager()); + mPager.setAdapter(mPagerAdapter); + break; + } + itemShowMedia.setChecked(showMediaOnly); + itemShowPined.setChecked(showPinned); + return false; + } + }); + popup.show(); + return true; + } + }); + + } imageLoader.displayImage(account.getAvatar(), account_pp, options); + + + } } @@ -594,7 +680,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi Bundle bundle = new Bundle(); switch (position){ case 0: - DisplayStatusFragment displayStatusFragment = new DisplayStatusFragment(); + displayStatusFragment = new DisplayStatusFragment(); bundle.putSerializable("type", RetrieveFeedsAsyncTask.Type.USER); bundle.putString("targetedId", accountId); bundle.putBoolean("hideHeader",true); @@ -623,6 +709,18 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi return null; } + @Override + public Object instantiateItem(ViewGroup container, int position) { + Fragment createdFragment = (Fragment) super.instantiateItem(container, position); + // save the appropriate reference depending on position + switch (position) { + case 0: + displayStatusFragment = (DisplayStatusFragment) createdFragment; + break; + } + return createdFragment; + } + @Override public int getCount() { return NUM_PAGES; diff --git a/app/src/main/res/menu/option_filter_toots_account.xml b/app/src/main/res/menu/option_filter_toots_account.xml new file mode 100644 index 000000000..f67839b4c --- /dev/null +++ b/app/src/main/res/menu/option_filter_toots_account.xml @@ -0,0 +1,18 @@ + + + + + From c68b7cf1cb7aecedb4e9dc90e0e8435e27b9a17e Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 09:24:22 +0200 Subject: [PATCH 03/19] Applies changes to tabs --- .../layout-sw600dp/activity_show_account.xml | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index baa568bc7..d570c56ef 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -56,7 +56,18 @@ android:layout_marginEnd="10dp" android:layout_width="40dp" android:layout_height="40dp" + android:layout_marginBottom="5dp" /> + Date: Sun, 15 Oct 2017 09:29:59 +0200 Subject: [PATCH 04/19] Changes police --- app/src/main/assets/fonts/DroidSans-Regular.ttf | Bin 0 -> 40664 bytes .../drawers/NotificationsListAdapter.java | 2 +- .../mastodon/drawers/StatusListAdapter.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100755 app/src/main/assets/fonts/DroidSans-Regular.ttf diff --git a/app/src/main/assets/fonts/DroidSans-Regular.ttf b/app/src/main/assets/fonts/DroidSans-Regular.ttf new file mode 100755 index 0000000000000000000000000000000000000000..d5009891834ff8c46eb14ec35eedc2a2e20dbc36 GIT binary patch literal 40664 zcmbrm34ByVwm)8Vm)@7#`<703r_<>qourfQtYqn%y-7m$gd~up10n1L3<`=!5D@_t zP&N^janMm@pizv-@D$w8nQ?mz^WHqi5oUCJ&bTl$>L`-V|J3aSka@rV`~5%vhMRkD z)m^Giopb7(?>Ti5MhI!)4}+XFHSIH6qQT!HwDlB}Ce&6{*FX&o=l==k&f4atwxeGx zFM{*$;HJ~HZ5Bu>E6d}J4A4GdDR&A%J&&4Bv+1yG=Tjokw0gK(a_VCl-$OGnzzAw)@_*$qpE=MKEIbB^OoQF zdzTI&CG?m291&V!RAK$9ab~}|s zL)3#%=0OiqSCAgc=D_wWY!TSVH73|Lz_tRm9@rLx7%JYy+32yHgOKFCy{G`eo$3iBx5%!E)M6GcbpR%#?hE%#zKgu?fB0dMpooMTOf(bO zuKz(xX@(VvB~qDOp;W0kjaH{O7)@r2)s|pSbU0l}?qpAjH#IHYmywy}&&~-1bMx{G z3X7%{mz0);`0|QMm@#U@)9dORW;8Z6x3spkcXZC|>h75}ySJ}DGJx*hw0Y};dmsJj z;|HI7;%84kbLjBTj~n+x8vz z@7j%a?tkRrS6+R61wyagCOn3(?(XVnZ)Lm9KK-G_~(%$vUwb8vvL4Ru-0}^A?zq4B9Qtux$-rcZ$isbu zNM#L-)RrwZZfDJw$d-W<6Qgt7PR_mMm_o5-c{NZNHFrfZl%L#ci`LxR9pxem@U+R! z*0k0~buF{HqLin`xnKag5C21MSE0?Nfer`+se$|d=V}Cm0CE6LT`tn`ttWUi2Tr1+ zEnV?*Cz@k>7V&;xca(~dn$uG?h7M9QI#qM^_J|usv%alsOO)|UA9Pm(jkgX&N9O=P zEh0nV=Ax=^Z7%l~t;Sj8hc?2sPH6P>!G+E!n-Ud~yRN?hxRBhk1^&PwsJ@NwzOcay zQZ!m;ksBUEo>T3vj!gc)Wq}#q=*-NBhJEp&Z|{ooRX`1XV3IAWk7fJej)4da(Lyqk zEnQK+dwEpvu88vu6p&_BFKp`)Zi$yxNA;CaFdQfEiu$YJUSRg>Erhp76UejNEnP37 z;KYSvxlY@2L6nQStDrb)tOUMFsov5xI23h6Y=aG zfY-qfx)r4=+q>%9-1RLzT`;PyZlQ)$kjF8e>Kh*8?y|)n11uMncqGm)%0_p?g&Y(( zYv90LQ38LXVvhti4hSxk5>~A!adu%Fnz|aA5lwSe&#Riej-3DKp>RTbD#KGx6OmJR zPG#8U0-+XunHdyRJ11WZw@V07!=#Q>(HpTgXVbCm)EQ<v$MY`3_l4{mX{ zb(IKLg9ce^yN$eCi|TQGdqrjjD6@)VZhTM6F&^L3*3odyz+IRH$Wy0^xk_35Wk4Nw*)dFs6j7Ob zUPV;yt{~+hQXYzzi%7ZHT@l4boSAXk7OvX;jX4uR-#F=a^n_#EKOg%iweBA{@^^e< z;=g&{Ulm-1c{R$pF{ncse%9z=a{Q{1>F!};@V&XJk z_<~wj^XW0{IO;zdI!ZSk?LRtvl;)2@>ERZ$!?C}AKXu_@O#Aj>$3DD$-+_J9$i5Bx zDE7p}UwF$tsl4Xso|pGfv~M?d?8cAnKDwK_eK!_rH|~a7{{x{1njWC}2NdcW{|@}v z4!r4ZvxC3A`F4utRytQ^ucWD!`0p#RY#2`r1BA& zGF-n5i>%n(VbM)E#LR?41bq+9$By~_`Jwp}^BI1qdFa4UbchMf!|HiQ=TYo|!3%>F zO*+{$D3a9-^!pr<{#r+WbCTnqv+(D$aQm#gW>M2;;o@2N`yTvN4_@4Z>w9o<4;JZy z+71>-#{}sP2aVNqh(1cw>Y0w2{+Tp+=5w7|L(Pea3(s|m<*+~fT)S|7nqS&3lGn60 z`y8R>rsn=;`f?b56~>#wcwQKHhVis8zFdpHs>PdXad9mcCDhggaJ3 zfsfodLN0`JI2HB?{$d~UjjY5YXdp$^KnbBRV2Z64!~pmJCT=k|s&}qz9zGmo>|+^1J0R z#caiX#c!3#$~%=Olvh;ws=HJN)n@e~^=q7#yPf+|)1}#``A=-A>(`x-a!A zeL&x=U!cF=Kp6%Nhm11g0^_eu2TXr7>&+2!)ci|JiRCuSYt|I&J=S+@WwxER-zH=w z{NBFI{-22{iKB@J9mvrR|MokP^A?xNb*Jmuq$NpFcaQtEWOH&&a-%2Flka)J^G-@) z%FdLNUdCJDz1{nY_i}1Q>I12#QvaByO}i)UK-!74_tO45ok~wle<1zI^q10qoBpLw z;&b{6ea*f_zIS|o_Qf)c8Ce-M8Ig=PGQ*jX%+;COGY@6HlBLLcD(iICZ?iu4Q+}&I z;Qyol+iX>Ka`v?B*6c;ucV_R)KAuyR)01;k&OJE?a!%y@d!Q=tQsB3N&x2GjAs7hm z4Mu~%%tg7)xqEYu=f0PFB`-B^cHW76ef}N!ujGGQkWo-quoJw|2Pgi7cYu`AAg9w_ zM0ny7uaoJ+oMqIq-EzRf(5ig|-y$kmCYFU6EPYr<(J18q<{j+!1^wK`KyOaA54-6g zom)l)1BsMDucF*ZSrl%*HTcmbeNvXq>QB<^ll)d&R+1h+%9t;|n3CsGt6h01p1dTE zOUfg>LZOZHlhm_9Tg0e(r7QDIr;*9iDqaKMTu!>M=oAj~lAF|*laa3n|=sa~&DtK^LCn5>z@9H&r7n`Ky*fWu0xJfe^=3J2nj zXercaJeiwF$mitR^i9Zo1>YQRM7Av!sC98pI)C5>n2#ZmTi3N|R#sH+s|ohbifJ{e6*=8)_@$bg+6xqa{!ps5Y7TQQs|G)t zSkbYpu5!37PkKDcraN|6(nPTyM@8G>u&W?5MH}0ynnV3GxyYZQ!7I3K!sjd+n)qB4 zWPgRE$d0_I80g;nYzbF(0%R{(QdUxys!u!~c;0{{xS^(QdHrNfgLeX5 zIsYh~!B9^;f$MPir%x<7d`l>F%i$$U4&7W{_rGG{}Y8&?rB{Yc|y}(=(=rWwrU`wH3|^oL`Y&VP}g=Y5|h0MHyTMCCSK0 za)xoZ!ye|6oJmwtd3lburO7DVtFA36W|^Gn26b}|@?Q*r)WQD{;Uz*c?u}kJ>g&Cz zfpS4;xr^LIjUbVPzkp@RfTyxRt%-C2U@feo4N&SKY!>IXDa9woWpqJMMT@c9tD*%p z_$24bO)l;%OtAPX(mMw?O`FpmcE;A`HWwtgDPrRF>E9#<&b zQJ6ogJo!@NZG)ZZ$unloEvjDyhGyHUdVXndQ*!KHdr4KJzhZb!M_TNI!Ilt(BA6wBs_rbhHMwp@7HcFOoM1 z`oK*FjPeE(Y08vbzoPL_^`da{_WKSuuBeAM+0_&g&m_c7M(|Kn>i&G zNe|IqA?!pEFv)084L=vr&%yL|kxUr90b!QKFbx1x!qlK~)%yj4*GCFMcWiU1*O1yL}H?_m7G4@FUB0GcF}$X z@_#|z;|qQf=q01;F#!t$4GZuhwaV)cTDGX|HlyTAQ~qtYuPH3OYr|S$&W16^?^6|E zani`ZODUFz*P|CP$QV41dk2O)&t+)Em+<>fJteeFus6_U;E_DuHfq>zIAEYP1}xis z8oh_8TvUYy(MrJUp^0N)Zy@$zwa_+SZ|@hRVFi<#Ys$!Y@J9P$_(szLgQtP0PX+!? z1P7g{St*z>9AY8B2bPQm2MYuK!eCA|QF_#;;}@QzTlEIQ zIE>P`G^`(Xf-&G8QHw1jtOb;Ci1b-dzJv!U6$a_YR9>#O41;#SS{67y2-+jANK_Of z39fi{-7QB)ih{$(?pPIFIc;2*Sh0AlzXqj6%4B}tre#3-hcR)Vh* zx)=yu1e*wmB+U0;fMw*r2vkqQd7v~W)vMTBMqksVU<6&dvK;r--_n+m6za_Df2evW zb@rlL$|DaiDbDL%UmyFFI<_CLZMl1NeM50i$T_2ARdOiHmOpRDtd4!VcDKaN3mzcw z>BQ&sm(bQC)XU3V*{*D@by(^hCVa-H>P=yUq{Yr++@!@?k#po37rxbn&N!_&QIV)ae-ejiC{VZmsBJ)bjvXn+Fq6njq?t&T; z3|GO*2J0&b1%AQya%c{oh0 z&d2EgxRQ+r3)kE{l%&te$>PQj06RgOHozEt3p|_-tu&`thgq1{u{Sw6b%7gqyRqAS zNsZNHz_eg&s_hV_GI&=eiwq;2Y;tIb4?xUCFt4GNz}R330f*u1yb{4g6h=db@%I|!MU?q0h69HH@)fh&aCKDwos_Z&{IG?JN~)XxsYC8u;jqP zo5t>_l<5-nhfT?5rKj06(bH_lMlhV zxK5#vDRqS*Z}$CfY}93e8SU=!^=uxjOxM#2eNjVyasR$0#bqlG4h}>phZ}vK>C31U3*USB;H}jZD`p>7D141eHtcLp4rN-4Z+c?UO=Ih-8V~$E_F`Jw zx|ub@jp_dSNOtAMMU}$1LB<3lf^ice-!TzL)Foa6-N&qilVFOaR?=~eBTQu=E?{aA zWeY9_%ncY@sNlGYK0JP&<(}Me`2(QJBA^=red|TjP#xHRZHex{GPNu97{b9 zOv%gM&!Jk+z6P^)>DhCxX!zcWnj#B5wH6*J*V> zR$-hZ5=8_9 z6lRFTBEv8WabT1!Q*chFlXB+XY_o~eM?7NgX0dgOID`{}!i*L-s~Ey@Q!1?hM4g;p z^(8=>NYAHq9K%epVpaxW#Z5dGL!f80fV^d)|32wyx9+ZlTa=r@E+sU`BE_@ z<>BHt5dHy-*u`K%eB@C9*FtioHE5Q~b z5Ch@*$sbH0?+~AbC@R>7=>4Q6bo;Jdv7y}nx!%xsR_Hsp3M_*$jfO?*L{v8M9H{@j z?=a2&sP8%{={z2yE{r?LYwRRP8mt7tp^ z7k;s*y%mA%DxV>-sH3oLcTK3})IcxjCR=`Uer`pI>K8Y%5PsBCG`o35dRk?5Q(ksc zks~*0M|yEEvUO(V!k%`2W@V@%LmPYlM$4V(t)&xnqV+Jh%tQ;&FdynNMZ69ZUgyOo zZ%vKYL^tL*VH6hei*PaDh#NB$v$SIEV1iof(7vpNi6;SzwF%k;KEI9TtEU4jcP4a3 zaPj+k`+B)E05zQvOq(+>->x_V{=Xj}JE-8!2)0~Yh;HbG7-&!2n~_3OGv{6~e+KPKnm*JVgxy(=w;$xT~JQ+j&31i&3E0jFO@gN-A`qvGx2_r$c| zahgT4u$U8zjcTLA=r?XNK4$#LC=$~EE`!CuQ2i>WOchqKdOb@sNDIDpsK~D^@_{@S z2K$J&Q0VJj0iX;B3Jf8!Md447m=Xl?#X%{ivuHqF;E|34;~zbKin1J{tg-n!MH;PE zBGzg(q8<44STTF*auu}*Kc&qrDR($3N`o2@DbONkK}l@_UNfO2$OE0jm&p@*SP}k2 z^o@x6EfM47^jXU_qZ&#xKWAOewj7Gf!RF*1(_psT9l6zvY;zkX;{-_G8c!N2tQkhRWA!BJd7zM=E zCZpzbdX9Q9JIg$j>_Yu^Mk(vp>4-*w|DbEal14?bgU(Kun%j3PQ+Y^jK%)>RO|t~=b`V8^uJzl$BCQYdK{QoL4EdO?6Y6= zv17BJk9|G%!1*neKWxUyaoPc|&@aLJ<*0&B(MzyIf*CYlDU$WzL4~xxNrcs+qaq5R zZW-H8(XxIVZw}C?k4!Oy9k@ReTNo&oh6PZE06Q-FrEw|s&+%6&)A(mpDLZyBR`U4x zcfxp0y;F*o^BQ=en#L0}9;LU#j4DL9`9d&hXj-n8`{mo@N9BxIgrGe#X}_AZCnOpc zO^6tYh_~9qBAzpZ0n;L_Bf=IUeChLDZJZ!*FsLh_SbztF))`!Q{mH53LF2}+9E{V0 z@Y3G}U#Eai^!XHNJ$h<>CYOmFvlK%azJACQxAtq89N}dG5nyNpNFRpBrMbo| zL~jyi0q(hGRTcnsRQTh9<+t2f|H$8;?Cc-I@@IyB-4#x5>*~$A?bN!8g4HkGoiV+v zz#2PGGvh&Rf=;&ZRctzP7#m+*n34XtCefrK%ys8~?(bwJauy#aazNz%yfBufyjzNU z&^+a7C4O0nok}cWde}h)-LED?ERl(5Hm;e10$w~R)r7x5oB=}tWR4(onjmxjZCz)1H(@;1Dy6_|HWc-KrmMXvNIsWr-nmCq=DP%`aG>{Avi>y@-ai7AO( z*27Y7fq#Bt;ya#GauBTnb4kjGXj(?va3%o%35etCJrnrbnLt0WSyl*eN`VH zL5USgS`6a`a5;Gk3H8AXal9S&`S6l)D*!P84fHKhNA!nG4uGjSn1Z2CvU~C zy+8gPb@Hb16EG;Ar@;B#Fv$agJhRBn>lpD-0U4!x(4Ytal72#OAOpOLyeKCdpaqcF zvnPpwUcU5XoQFhy=$i#?<#qWMVsM&N5`{Wk1bS7|12MAi_yjn$AX12wN`;i0XKS)y zrwyxZSRyAESfMIKj^&i3M>=RVW6VjlVXTtV8U;{b3{Dghf&Bu$07O0^P$u*~&I_OderQ&S)sVzvv3!x<52D)Hy3F%dE7M@EJwsHFm`$UYpB1 z6Jc&hJDrAKPQ%O7us^LojndDO4W+vK)r_T|jq9WM*b*YfXNvz7y=7Ol9QfklpMLd7 zL&Kw&e){lV548O7e(vHYZo27-#eu-0gE!su40^d1DF8U#3Hcu;I1Ei(ilZ z^_k5dJk-+i&)??CjBM6Z>t~Duh+MSvKy1FVc16qmBrgQ$8Ji=}(~fc=qL7pd z^bDR3;+KPXIRs~e{Xr^mmVPLZ*>7Ro{j6FiMScM&y@93xwoS%k|1XG}(|>=jZ*$MB z^M4-Hq-p;*GH>|f^LM56Z7aEd`Wx#g>i?GB2Y}vcSRHUD-zimF)YSI?FG}Rpj$sr?f^A={2)8_&iga(>@Cxeub^f>>aLz&9UkQEFm4zv z06g_An3IEGqj(8`s_8-V^Ip!I$fF{8IFyIed!)9ZTunOb?N4?xs)&>b13=tCXc}p6 zfM|SZHVF`rsG3_){eaKs6SSU)rvQrxRvkdv0`8Sa({ELeo){TEQ=T+4G88!QkbU}X zz18CdmFU1j+bUANtxSToW-Yx8VB-Zb#gq5^l)vz)`MUcEfOxiaK&w=KA< zy=zNCPC_#)ta7YdU^jMfi$z%?b zsEblMS#-sNnd#XI`9#(Ahc#L8? zQHfM|IYeepL+=C^1qM{bsZ<%m8S64AXGV4grOv<-MsXjzul*sU(IwK5A5fqJ8qtt# zlHwJKRai_s(#aY+?e$O8c8gBLC^((`&9ku`r(!CrTp^dsWfs-nPsQ$d{Ue25qXJl4 zZ&E@A-cyCk7xty3^vs=~L*E1w@S)%me?e}rz`s2I3V3-}Hf7D7Gb_b2XUTBRBu_+u z)^fC-w@YQ5Ooj@;ijWinP)-4~h46AT3i*b#5be?v*b^)*rCLca#dS&s7T5qKo`bcF zf-BB3sTB4CbPpL&P&8@p3eGmrB|t)@*Sv88T7lIC{9=Z3Vst?eRZ4tuu(=}VVvj;! z!RPLI12^EtmtwQ1HRBtpE7ZyH_bLB)17YVlPZvP@C1`}Vd<8*OUaAO7o)P1{V$6%N zO^ktO07AIL`^91wk5aga!Zyep=O_v>J*(JF>>ieGn#A?QY(6{_Gg@(+tF=W!#GW|e z&~y-PFy4ec91(Ywv=p>21U+rI{mod#FJcwHqRvr&y0T&XEaivgfVB7)@Z*xeVZRP(`uDc-KcC#ZHMX@45^YHwOKLsL$Y8G;+N_fia0$1kS{z<76!r z2)rM1Ilx#B77~kA2lD+E<$QMh!c^oNqhRb5eoJUeGOwr6Kk(loqUB(CNYOXq@9A$~ zrD)v2{%!9?(h^fpjd z4&=okHd361e>H?({z>d;?5C86;GNV*<1X-1uEb8!jT6KW(vCsy6oyn%A-O=fmqd{0 z#w$l?$UG5}bup|V{T;0pxsVbWc^MK(M%AbvOc;Q7t-r?pw}D=ebK=c|ybu$uUF~k2 z5#m1Jd|BBB=64BgT`e|4QcFt%nLgpBKA1oEGkt)M1W-G#;c!~5yCYYfJDf|2vcn4N ziHZ04M5QKd<$zzURz+vfVr;gjw{o1FOKzsbMr0uI(~AIOL0Bmuu!GOXT?CE*pM@B_ z-mA!Beh6S#A;Aa&!*TpoLxsN8+kzjD)IJc4UA0`3ZYLOK#h?3chY^ zaA?;+cFbS8puxAT=eFt2fxVgK>3VO=n)ZWHiMYD5r@)+@v^ljft$WLyac*78jGLS0 ziWz57OK^5)yq`y4J_|wKivv)v!sj!??97~;6B8$RlWe+y^VDkFvvo*oNN-lljLv2o z=#Ef;*a#%$hV;W1pV}s&EHb-!-D2Vf>qTM_iC3Dg`tV>kq)?Cc?OR$>vUFcxab!lZ zN#WTzM!`>Fnl>Y1XfQfcmSHzlQ}xJxoD zdx8u0FP!(t;)4JB^?UC?CoqY%(!(%T4#;6L+m)_<*E$!)xv(+Jb~<$}GS1S1jFbFI zyf^{ZXRn5@Cb0%EVPH}wuob3S=SAkxUJuyyC68EJ9dS;_s-kySNwTT@8E`YPb^3EKGAp!ZC zjU4A}#v*8vU~k1~ImH*At85XEI+=(sguxfmxCu`bOmYfgi*|{zct)h8ci*y-l4bjP zfutoy@Zc$C?7`R@4GYU1)Fe3{Oe)Q?UZrTpG-r~-TEOAs-+#U#tM9(Pv^X{2e;fFo z(DEYCG7+K+m3*o@Y~g06T}Z>jX*fv(^i0(>+md`qlsXBEl9Kd}W*MiSqOO2%O}Zk) zb|f+EYh+HO?AR60h#=4)4QUWA;Cd>uY-~fgV)f7F&3$xP@puFK(4OGTmIiO?jFy>^ zn>Nbv=eD9Qeck>4zUiLd?rN-E|NOEQXU1eYyY_Kif>uI*uzy$8islS~4?uLOOCks4 z_b%rf-?e{ary}-I`*!;QJL9m2>`ivsW?RR-%uyU?rD_2xR306 z9f6r;>o+gF@=9jM?Ty8Ay?)2^)YNGyx^L(+S3>le`l`s{``Xr zoWF2z?jojch0VRRx?z1^9;Rg$XR6ue(u(}eOG~@%9mq{@UQt^zt0G;lYt1X|PS=K7 zBEjx^=j6(zKTsY%%QmtkYnn^JWz3)>Bg=+k=-CUGw=Ao)kBv!W zmg?5o*)P0Ey?W=JxkEc6<7Yt+2DbY`>H3%deLNV~HwQog-VEOopdn+{!|OSnQ%5OK zErZ*&;x;ubM2gQt{!av#j)b?txq)>3{CJp81a2K392YtK|r+U;tD>4#WZ!C#FR*0}V_s zB9$%Kb#tnN zGpUVnt^>9s`CF4PYLz;wCBje=Gpkd!1TsVEGJn@CO3ui0{ z*~WHSW#)>e?yS|1rAVyPXGQ`?j}bQY&)U>A{`fV9W$JbkcJ1o(S7jO}nRZfcppRyh z%_pE*a|a}$MXaM%S`ZtHnrYU<5Zxd)q}@QR>zW(9+PbSk1I_vup_y!h@b-9KRwle# z2i8J1Z?}fgOc(EZ&vn5?t6f;656e28_GUF_YG$vQ3F3hkA&u zc_gN1LeM5?5z6Niv%%EHiPEsZw$EQK9isJ$6xCs_Fy#za9r&Tb$N+zwc_17B>dSZGBhC<9I%HQcO&9qIK z5cCIGefRcHnhnGV1G+*VDCh$h?}N|DdTNse!$%c1cIG78lGILlvyIC@&>K(`Bz$aKQqwe4Yf^1uIYigY+2&^RsF~I%YgO$g zwOVP=lE_8q%w%5z1UrGi8K{hFMu4E<39nL{?P04qq1YN)P@guo(*n z-kG10)~w55lQ^j=&b5IM%*e#)_!hFq3GYIB3pD9^6fd5Z`hSG+LerM+i!9w=>}Y83 z&M2Q%WYy=*4u?mYeFcN}b`Ja`94g;jJ2b~s*jE!?(VUJmn^(7_x|5zHK%OzJIN1@% z2{;@jbpw?(OY2h7lODADD$CrtS$=zBNqvOqIoHJJ)Hb#TR>3qMvj`g74~d;D>j*iT z9F)mct9NMqTKG5&2gWiN=G z{`t!0@eKoW1im;3HoXK^ty+n`!lqhlM*^1+Nf=F_VG?Y&nU!ko^&Ve5EDmD%BQNhN z=toR>`es{PQO(*i+dsBwSeWr2^o7#&S#$O-q~0Dcg(-jD&ImQ_2k?9ez2HZmhc;-? z(idTg=6Adr@+CA#0)LTIiq#xUde3PMVY25FfLVcVobF}aySlG*bh8etb$(rwjuuk@ zzybJ&Yo%BUkayfVASg-U88SNn`xg3qX9VaEf=Qro<3JX0FTuF*s@UdJXXS~B7DmjP z6BFfUPsKJfb>ok?7A%QaERiJ(T-01>vVhgHe}eY<(W@^aKeSf?E%hUb6x!>Bcug#%3q%y;8GT>ZLWAS(AMwdma{HgtNG; ztQ==fb`GV^ft()=>7r4S=>Wn=HEOR#WEryDVxcXFgNauFtU?61nne2IeV)Skd=OK; z2Js0;Kn0RqlHzs$2;7U)gur~0)S)ju#V8c8`b8~*kJnh_htI`6eR+dSuT?>ctj1uJ zJ@?vSsmZ8?Fs@Q-kZ(R2`=J1r~Y6_X90YWGk*y$_-$w zh#{y8cnKOWZ{#Z~z=ja5ucajfCD#O({c?iq??LSm@3yeBzwAqQoG$xdHu58Y2uo-xF zc1^BFT?E7aaB5dqtJ~5!&__hb+p@kVM=sjIicJ}O+5sZ|LjC}q2Yr$P{x6sAf%E{0 zR2hyZSZP2 }}t`{nE8^j;V}kg?~X8a`169e)8j9s(8+kW{T$5f(E|teWEBh>|p6 z5Q~ctnS~983f5%86h<834Bvq*g3 zi+J8+W!Zl^y?=A-)ZcOt5q7J;`5gx;s-Jk?Y1VHn-?86_;z%Yy2116EzxU6<;NJp& z^n=bMYh@ti9pb-WkmfA2A zEu>JWhgcz^>=)2x`LY|ux-#SqIA0(M}F;LmpN7U|=;Ie?W?d!g@X zr0>e)l#2>FsuGXRP0RWtp&0zk{{17FF^$?(db~sN&$MV1)xxOqR6%d9v@| z9TnsexQE2pU_mQ%860E-#MemlNSp_mniokwr~2C_-O+jqGSiF+CB=o7 z!JYO%L8aeQ;7=6_%yV~<0%|K~RI)l(hUM`ktkRBAP@sy+}C@D;hdJlMq|=pdQ|%rEAm-Bl8%%ycZ{i zkt|!r%ifbQBAIPOtyQ~5Sc(-?jzX;st64Qmb7Gi@Lc~P#$JaX(EGf=h+#4h-3~ZU4 z>||hdcU~MRxw@Pg6w6hZlD=hG!{(V==H%uLZ0+0}z9%aWfXZUaBvARAMC#3Vl=U0W zZocnV_tYy7AEaF-0k8b!Z~pyNkNGD=pHu;U;bz}Lspw{2qtpz$)oO>D5PwiWDq@tqmzWVIe5*J<_ zyT{}W+NjU3xH6{aCBE@S@xlk#w=&(^?LJ#^Uq$S9o6nVX^FHp$ee$%bfy(onan;Pt z{Q=;iHP}vn&TIuhTmAwe(9cz-)Bte+yX?k#|zDgg`&Oagi)5}U+ck|L4f6?+S^aDjl2#f^26 z4tLV+SU+c-e@RKn;;i*^?{s+Fu62?1S&IPx&RiE+=WuWFl+O$VyDL&sD!PM#ndKhp zT=8Q6`Z?>J$;r<3a4Ep=lb0qt;f~BDC2&T~-Bz=rm&|)z6B5JW(q>bokq+6%nrlug= z^Byro9Xd*_Q|qu?YrsP6S>OpU27o>URTZFBA`cLJB`f^{MZF|6A0!D*pnTwJ@UKYZ zPB81iuot5Bd9FMtp@O*Q<=DEfV&`yX?A){Q-CtrGPm`z~IOLCRj$Otg*g=Xi(Jj}_ z0b*3ddyo`o!%BkX(oreE_=jM10Vn3gqvF$IRxBntQlj`=K)6^yg2C+|DICN*otzcO zyl~~~nB~epi0-;|;#;~8FzIUew(PBZJ=-a1sd1$=)RfeurEwE3e83fTQLfpiXXBS= z|s*y;90G{AUla(u%Ad-b(g8YYx$B^i$BFgrv=;iOm)gl?WJ?7JgLsD3Etu&TULhOo>1O6P?p+gm1DFRYLMh<~TJ=X)4 zuv|FRJ8habwGgi=Ox3xq+_aR`LUtrSJ0~wM5Xj5VR#;MOa71wYLHO1~l`v0~qYhZ7 zP|3b-RjZS%@Gqs|Rg{ZQ=i=O%6|bhq-ZG%K9BPBZ;5V!@Y%@G&fFXBqj)-HqW7NSy zxg)do&El3fGs#*GKj3%3eq;>;3^#@`{{v(d3uPc69H2qhvarcSEM(SBF4Ynu6F9!E zkb#jWYaEyxl?=V6w2yb$OZzKL`9*~mb534~duZ>xVE)2~219ohm*oyzc`1Kj%g;_P zSaAAhTL$v4KVCZT=wCK&{L9gKQ+vjq(YCt2adoRttk6g|$h9hQ#chY?&->ZxN|$|| zH6ixW4G-BoCogZ#W_bAZPl2ZiV+-Hl<){kwEX1cWVa1U@6RR&EI|nF;U+s7JoBZqi zNBwN_1-Z!-fi#G$%#YP-EB1bjM5lEhTmJymv;O|Ii$yTW0)7U%nIyJy5W^-BSquy= zOq)V(f|UT5;aZUw(OW>{oaX&R_Y( z7b|1Gq|)%Cjj@BVgN^uM+qFYb^+V*l1@P4=7BpotbqIrQ#Jd^1mBF_%xRb&43@&7_ z7QPb%PAKzp_BkN8;QA5Y4%E^g2x|)3nxS@G`JT3qe}>n?N-6|j-<|xHfK~)D3RBNj z*^$6VPeYC96@KkO<8k9_M*6tvH4|kr;#Pyoq%yv4Q0WZ@l}d^%uUnJ-@4Aa&H9)X#7>Ce zEQcr#YqeQzDg2wcy1F-0h}@A(%edUFAfzOVQAlL}difKQgrJnnVnv%cABWCtVtw3e z7-pA0!fTb-Mjm|N{lt<7^d@@jz(DOlf#Kn}^b zI@D+y@8aOYe-a6NutS0I_22AJ{#ztI62aD8x5yN)|iB?cS#vGQ| z<)3K(VE+VvC@?8m<0pKa%Qv}<9Nt|(R`^|0Xz{>+8oQ{ao%mj=Zu!S$9hJpN<$NHeFT30onpG6&?3h*X2(-^Z6;TVIec7;jwS-3C z+lmq|LSXBnD9|6+7N7#8pZNp+VXK+%KEJzSy_qIs!ef!lJN)aCu;deLK4J9 zP+Y{jjyIh&oGecS0fWU}Ks<2!uQyPx3KD!%0VHZFb4K`f1l8D5-PM)ac1LH;nxfEM zd2_lJN9N3#-L7~0ZN&q@YI|u_Lq_$&8aMN4<07+ZQDezqZK}nwF)5{OdR^s;Cf?~! zRHb<$CXZE}RMG}Ka6?`ZteP2BEBfJUDkQH6GMPwT5ul?%m}kXqyxHjYr$bs%Xhw_s zR_1GaLrY7N!Pe5%mH>|ex{+9q7BCz;d=(&xL?t_5o_9{o^m==3LVKdsMnjN9Zb*;< z@C1>C`04{8(nF@Hc5dt|xg0C=@=pV#`i-ud5RVIu*Xp?1cpC4WXA2p%y*cje) z4N!ittvxF}CDq-L9y=`}`En~_SC}EdL3Ge27xNHe2@ulE0${}|@k7YK888COk5WRm zC=2OSu=s@VH^^ap)Syj5`h!Mr`2{1>#SE=}_tw&m{)d;Al&^YnkP61Gh;IFU6CKnB zZ#jMMgRid!3yILx|nlMMgD8ua_>dZSo!&-otrV zf|7n268IVW1uFOt#B8b!^+WjEiDfZpd3yLVWAm0>50i(4J}u%VZ0dCRQArhDR#p;W z$}lZxq4Jh+27ys}0QwWHe_Fm5b5RU)!vf)!l8E)su!}l#gNS#sA3 zi)F=KOEz!WviVkQ6^isMh3@m1TlZP!u(}l-?eA2Q4j(xvP|rx&A>$ke9NnPsK<&}t zhFeNujSk)(IF zFXBzSX_0eHtoN4m5<3hJVRLOvqn$8~>Fgt^hB1?t{Ybieg9J3usHt)zZZq4~K&6VE|&K(>Kqh9gP}i;@_|Ec}>> z$eGwi#uaiNdPGdnN&u}Ns^3NWHo4RHoRU7-4q9c7bXh7v`ZkvE`VwBkhi&|Tjo*!S z!p7@uJkQ3>7&RMe`D&z7{D}m+(+d7nI5*1`n0q5%^9si_kFR-9Sh=Abo=cT5+&<$l z8e*%b2Sui*!{gjYF6XEqG?c^?q5;SDLl?+ z&&v+wR=@a{mcrF(m_*+<92>6Ert<6}hJV)xKgf0? ze5fM`TS%ozJ>jw5(1KT}fRpHtumoTFuHm?A(Jz`v&pD=X(~kpv9-nhf`q>lVyICT_ zM>;}eDPElh%ir)!5CYCA%@q-a7PR`$8c;D1YJ2s zmRN#2kwuVhx5yAJ*a>0#UJcwGp(%yJH#|!ds?)FJCe&S3=%G-a5?UC#G*pIrLRc^l z<-zz*RtK<-a21w+zjT<@fuYSBx!D-ftgF*;gYHG06kvowJIv7a*qex~^eL6KLj1;by+D z#2ZMrLZ4(oNl&-y&x$NS3P^Z(uvrQ3BMY;^#5R!!v`}b|<~d*XjpI50Jdi)@{XXFb zUAOw=q5G;lm=OMuPxuj+!5y9oN%GBs$g>0CH)|;mN_x6oA(QgJ{PTeJ%8EKhzTrmn zZ>t@%Vq)~BRRJA|=0qMfeWl)LbQ*7iIjR>c==%+=t z&^EVXz-J||XsGdI)JC%fLJLD<2HgYdJb9CcyIsqZQ=y5%=Z+-JW@gsCich)Q!F;bO zKscB4dgn3WU@oUh50h{CG2v$}?Pwt%bEp0(XBOSEq{YrYyv8_sa@W+@MgK_h{93}Gt$m(X50nRT_D|&2LuJe^`avW4;&#} zi=AqMIIpMGRGkj{9h*U!nK4aBjx$d(WePS>!(L+1umHXV)6-;52R)D`Ud8@-%KquJ ziFzO}4&;%6TpI{w?0x5(UA&yn?R1{z_I1uToFg65kGZ|e`6i#;;XLg;vyPWL&vl?V z!6W%1p?LSH-5U;?Y5Rl}Y9Abs4+Lw5}i_Gd@d|o74=?vmjMq zOoS@8IXKYm#)p|<+R{{58KRkngRt@ddYm?bgqHeUT4WG=mADrnFt&(v?^B{SVmS*V zt=W<~tZCIvXZvEvGmON=*USActyUN`wuDoIGn@=vV>Z9LS z>-^OT;s08-ZPCMRJnIeN0-Ke#?ee7^A1#u<8)t_1>;0U6^YYT^@onN-r# zEo2xnDRJuHIgiRwV(`c$(u6-%vB*Q2$ipDZcc%%>E?*mH(Bdo!MT0<4WiJcz{WZdT zw#<G1{qQKu0~*JsZz%KdWo#++;c$k zAG7TX?b-VD%9$lA$`ec4cQ>{^P!uz#x;C|Babc7xySl{QSQL>tyLxtJV%ZW~{))Nj z$L+W5YiiotQ>Gf5dE! zoqfivc{y3LGegN-|Eoo+W1YJjQ`2e(gnS8~Ax$FW1uLs24V(8UCPaoMn~Ai?&xU8( zf|IGUZW2KIGpm_czqi1p3Y(WMTg>Jf=Sp+qu~=io{F`B6 z!a_;AaG@!&tlpYa7=hgc>LYPT7=((Z*u?+nl(DXisr=Q7vlY$kEBlKe2stQVz17dr zDncy2`Z=c1uwGdRC{|`#gc}yN_7mRg}jgRVS;M{2kcFAS)3 z-q2JoE>sPv(I@sB|xZHY}k-TU)jRkZAk2FLY;&`#!I9)79VAY(KBj^MH>JZSL8h@hBaEsCes74N4|Hzof(QXd*_SWs_cW$b*&r94oJ9lrHj>koY82loO4_0 zuWLr;_15LQmQ=Z6;SK966BDb}*TT-d{J~%Bt(&{;mCc(^-Z`hVOf`6B@wfVROfQbP z-CUh>|1F#5?0fZ>$4YK)D6p*9(OA26W&ZbRj0K*-ubgE{YBweA~+x=5uTUJlMY8k=?^cH*U3_bT!Ps_VX&A1V?U-!KLXVOA`%zJ1COv!@&{@O zJr;T<^utiC78`dR;j}78J03u0tYS$8`>|lo43jf7p-O8LeoHH!ZdU1&EfRJ@ymES4 zLS|HCmU-GVb5>+jX2LZ8?^w`y%=!CdYkWvZyfrz|nxNMwSfx+=9-yirXZ@~Wl~wgH zbl()L>NYt_(-ShF`=(Y$Mn!~c18@pt2wQG-SUuYvYD{dZf(|Z=&wcw+B zmhP}gyG+y0f3$z?mD^3mA0x|GBKj^s?{?Md9eEm&JHV^mY(NU&DxmfMUro^DPEkHuO?K^%*X&8ZJJL?qT@ zXHKCcdcBJa+}?2xE-B&X#M`jeg)M8^g|+53uGO^8szXKI>badB%>tXPjq5^nAi&fEQ1 z&e!Y`YXJ^NZrBc*5vhaEJl4>6HR)*9_`rm^30Kmwtjq z1OwqqKk@81q*zZV3$t3W-l+Ig%lXOWOY;jFO3midhJw7Mvy(U3^RdHYNxohEJ=@}v zxVVx!o2?Gl;=013va%w;T^1jye~pn*i6hw%X~nWX!&WbnHZVfHNAG}rs@?%RZoNKq z4_3-BYKK`Jt&3#C(-IBb2ej^rrD3w;z;Om7K{Vlv13DyUMqO>CIX6$=sZK1av1Bc- zogbHLF?7*4)hEf>D9y4p^HYcQ)1RmH9b@R^`Sv_Wo~IQIbWY5(T;wBGk3<+HpVW5Zy`LS(a^V-KiiZLjvU_B^c7 zg7@;^eb^7pj@7VB5DRL&v46fee%0Fu;#Gdux(+d!_J3Y2-AjzMeo%I!%(rFw}`!R&hQVpmQOCr z=-_>!RFuL93=4deaR?F$Rk(6_iZ#)5!w>ov@RgIk-zF8eZ^{3abTb@U))KZc>{!^D zun(1V8}!ZkUhLy@Uav+L6b@|@Jh~vVpbgdR3n5k&knx(5Z0g88>GrTK(R0Hm@lQg{ znSz_Xj1_xTOaCp-6p3bcIu?HzdolLQSouKgaO_*LGKyX@$L7U4;QCBvGn!COPADH5 zD*uP{7xiD_bO~ff^2x|~et~Pi39&(}&KOm#Pe@UaGYEBnY3R1Big=7M~XGPIlLE^cjv>u2zP~RvEJRR>(%YY62t}F7dnmZ zLkKsma|Oe?oF%|*$_OuGv^MA9H9 zVOhE-SCox9qMEyiNIqA$5tl>adv3~7)iut`GB{f%l7H9}cz(%KXKv0lm_)Pl?3AQg{ zV^Q}W4VSWMM_QU3pe_=I^ohzj6}0;RB#}#dw(fD>$G7a>>im-|L-~sed|cL@Inyi6 zyYhpPthM<;saY9@FOePm#qik>0OhX`7v-KKjfL)e2^R03Ff#h9`R?bmfl`b6o_u%v z-1i!0!ikIu9WAWezU96TK)+9ZTl5#irn9fy_rc7eVNEIzeLY*M+ELNf(KXO@TYHp)lU21`X>Z&#anN$ZCGhW3t4J*|EDmb|>u{5jYO zPW(i_R+z2645Y;139@9*l^fSg!52iEu0c7b|7;@>3V z80c&_&)L|z78my~Ic86;3oLoQv_&XOZ(oPCN1@Sgtz9s0{-P!Ga}g5LlwGU?7yxc# z?KpnP47B2VEAG}}b!;Qs0->c)op@?yhkybYedWQ8A_wFk`H-NluM2aX?#D@-~ zP~nM1&|D85)Qa3t+WSRFGxF)p#{j~Se9Zx!R-{MyHu)WrMt@!x2wqQ>ZZ9p1$ZH4k z*fS{|{diK#7C;*3qmf>M|8pVzBtQ7WK$-qr>&Qm*8h;qeZ`FZR+8Yclmbt)G|V1mz{4;L zvp_jWh6PE>gU}X0YzwhVzzkH#63j2oLd7Y=IWMy@lyjiK<|6SGNO&cxYBjP_gH@ec zb_23ghxz!$s4PohgVl(lTh3On8{wt0iZ!v-*mtNIJy$DEPkx%+&33Zaaq{rLvwPTs z>;d)!nt=mcV)w&+X9s(P{gM4A+l@1o?`0$GSL_e$+w3s=Gy4-8XHT&s>|NL*9EGT_ z#c9ZG?0qou9rhkO&pu#3U_WI4fztaiyj(uQLVO2&T^?pXV?V)($(`(X>~nS>>jpz^ zMuq8tI6Mh9-2xGy>bwaeJP5)4Ely6p4FYyMPHDb_on+s^na6ix;r1>z295O;8)ZLd zzr>ly-^2Rtadv{eg%g=y#%lU5_69qR6OC2cO&hxM^5#?o_70-GMGM^?ysmdsU;n0! z?R{OneZ*J^{F5;Lmjy@h-}jxzF3=BWhir6V??l#(i{2R%A>bnY(SFH{{Rsc7#5YB2 z(1EWxjQ6w-Y=AV-FEp<}A^FYiee_HTM{h~^hD|aVH~n6OT!)hR8NZi5$Ug;sE7eQg z(lGoII^~1%r>Yv&0o89{wpoc?`i8WR20R#Olsoyox+HuufLXd0-JtFc@%=&FUOanG zcM+fQpp2l|{NA9JASXU8!Hsdi;sS(zR&Yf)j*pUAA?0uqZsJ( zpf1CBtNXLv_>kwLd(e2${W)gJLfStyRhz0&3MsCm_&*bJ+W@(3faI=&>}EoG8z8@# ztkN~Ys(@;s#x;sl+(y_^U^#xf5mu?Q^0AwcNXBNb+@CYrr}u@PyiGH#jYV%g7nSA zbr#|+!}UHqe-!uz@EGt-U@tHPJdUvYfG2=&1N#x43o6k}jrVmx8cs#e0t$dapxCt& zaf~635yUa-j$;gQj3JIO#4(0A#t_FC;uu35V~Ar6af~63F%ieRp!)%!VL5nG49o;d zfihq}K-RsPXrVIELS-Tiqe#Oj(lClNjG{HkM2nD#yp1B>QN%lnct;WMDB>MOyrZb= znW)#9Xw3{rsR>8{T_wH|5#KC)SK=IH<+$Gt;OsYWZw%ZU1NX+jy)kfagguDs9^fJ1 zVPHREh(H?4k;Zb7Mgz*u1SBEO6#P09GBFD%13c;7j^{goyMdj+J-{x2V%U#x?}F9` zfMFu{{-u8(;-0FcJvsJ$dvdw`E#*a=9|GrxuEY7G;QYux$oU~~erQUrjDj+8h2-k5 zab@(HTrq;*HgLiwYBiOgN3P02aq1d+3#3Vry{RPT?@8OWC5GzO82UXm>b?#jnK1%h zx!HMDot}X=iXj^nsCSh>6;KV-;Jtd(p~XN0zAwRbDXxvUF2i*Nt~Y{9D}hx&6R;ZC zj^B0wcLO_tdw^ZQy)G(&soRRD5awy%0PqZO5O@}N4mboH2A&6A0FD4JA^u@pUj~i? zCxDZ{Dd1K7_8Ray@CI-i@ty_V#{Kt^uXj;4ABZwCfM+Iv>h9F_a}+v;Z<%__bL6VF zqXO|vZqG+hj-x0?rCncwE4A&7xGn=$0Ne3>2XHsA6SxQ11>B3gT(3?&g)mP82Y_dQ zgTS-ERPFvth-<30|5g0<8t^*s2H+_p%K17-(>h4gQIyqD(fate8x?q?5~u>Iff|%& zJ+K&P!1pD%F2%JGS0&eDkQOTQsamX~qP|Sk7CnXco(2v8&j1I3XMyK{L%?C+dEf=$ z2=Ef(8picy;5cvsI0>8rUd3nA;sw>*AxPm6q;LpQI0Pvif)oz9YwpxN;Zq3n zG;jcT1~>>j3p@uL0uBSu11|tafR_;0Fs?5H$AJ?7%o~vNA@E`Zychv5M!*YbBuLv? zQ6fr>#Y_}ZOrs2?XY}-FffG`CBib@WUkZah69#>T`aOlC>Ish4h^I;^6U`ApQ_%=K zr7wxnAt?=>pk9G*B->8`PXh;lXMlsivw&|*N*laf#H6I2;#Zz7@Oetqm6)lfkOWU9 zsh*S(9VPz?9i>+f5VA&gj6i7T|gs!?iT} zP{icbH}a5r8W&KTay?2@wKWZ*H3>u-N!JTTix7gcx?1P+_7=IWH&`CRd&W76?nky- znPM#A01f|MWC0}hZ|O-qt$}Zk(gJ$_A9@wcdbswAo&|?)x$iyzr_j#2dhxs$ZQdsn zy#a;BDdRx=L_2K2HxrQL8b%*Hjy`xCeegJDp~6sl<7k=3(f5vHM6W>$KaPHJ9R1=r z`o(edi{t1Q$I)t!qfZ=1pE!;_aU6Z(IQqnK^eN@+J=bnAa{B?UAA;A~t77);3221) zzn^iKdMxwLnQeeCJe4r!foP_Xqir=|-YEsMe;UXm^@ut61c~{-V9fp%VJ5K{n)o#I zS(TVQtj7Fa9A@_xVeYUVH6RIdd&@C@cq96-47MHfUKY%%eI0X#kFvdZZwO=Hd19V! r0cOZfBJ?R}2&2zwWC=o9p)zEubRKY4~+c}u`xND literal 0 HcmV?d00001 diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 4dffc681d..2536de502 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -295,7 +295,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio SpannableString spannableString = Helper.clickableElements(context, content, status.getReblog() != null?status.getReblog().getMentions():status.getMentions(), true); - Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/WorkSans-Regular.ttf"); + Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/DroidSans-Regular.ttf"); holder.notification_status_content.setTypeface(tf); holder.notification_status_content.setText(spannableString, TextView.BufferType.SPANNABLE); holder.notification_status_content.setMovementMethod(null); 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 d5542c97e..7985de54d 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 @@ -569,7 +569,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf } } - Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/WorkSans-Regular.ttf"); + Typeface tf = Typeface.createFromAsset(context.getAssets(), "fonts/DroidSans-Regular.ttf"); holder.status_content.setTypeface(tf); //Toot was translated and user asked to see it From 4cabc66d7b24f61b23633a7777a5a87835f4e541 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 10:24:38 +0200 Subject: [PATCH 05/19] Changes some colors --- .../activities/MainActivity.java | 22 ++++---- .../drawers/NotificationsListAdapter.java | 38 ++++++++------ .../mastodon/drawers/StatusListAdapter.java | 52 ++++++++++++------- app/src/main/res/values/colors.xml | 4 +- .../activities/MainActivity.java | 22 ++++---- 5 files changed, 78 insertions(+), 60 deletions(-) diff --git a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java index cdaf7fd14..2a96e9172 100644 --- a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -972,17 +972,17 @@ public class MainActivity extends AppCompatActivity SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_DARK){ - changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_icon); }else { changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black); changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 9b3d49c59..59d20ff0d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -255,17 +255,17 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio //Manages theme for icon colors 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_mail_outline,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_delete,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_delete,R.color.dark_icon); }else { changeDrawableColor(context, R.drawable.ic_reply,R.color.black); changeDrawableColor(context, R.drawable.ic_action_more,R.color.black); @@ -338,22 +338,22 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio Drawable imgFav, imgReblog; if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) { - changeDrawableColor(context, R.drawable.ic_favorite,R.color.yellowicon); + changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon); imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite); }else { if( theme == THEME_DARK) - changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon); else changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black); imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite_border); } if( status.isReblogged()|| (status.getReblog() != null && status.getReblog().isReblogged())) { - changeDrawableColor(context, R.drawable.ic_boost,R.color.yellowicon); + changeDrawableColor(context, R.drawable.ic_boost,R.color.marked_icon); imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost); }else { if( theme == THEME_DARK) - changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon); else changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black); imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost_border); @@ -363,7 +363,13 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio imgReblog.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f)); holder.status_favorite_count.setCompoundDrawables(imgFav, null, null, null); holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null); - + if( theme == THEME_DARK){ + holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + }else { + holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black)); + holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black)); + } if( status.getReblog() == null) { if (status.getMedia_attachments().size() < 1) { 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 c5e7a0260..12172d2c4 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 @@ -349,19 +349,19 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf //Manages theme for icon colors int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); 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_mail_outline,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text); - changeDrawableColor(context, R.drawable.ic_translate,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_reply,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_more,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_lock_open,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_lock_closed,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_translate,R.color.dark_icon); }else { changeDrawableColor(context, R.drawable.ic_reply,R.color.black); changeDrawableColor(context, R.drawable.ic_action_more,R.color.black); @@ -392,7 +392,13 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_account_displayname.setCompoundDrawables( null, null, null, null); } - + if( theme == THEME_DARK){ + holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + }else { + holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black)); + holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black)); + } String content; final String displayName; @@ -614,31 +620,37 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf Drawable imgFav, imgReblog, imgPinned; if( status.isFavourited() || (status.getReblog() != null && status.getReblog().isFavourited())) { - changeDrawableColor(context, R.drawable.ic_favorite,R.color.yellowicon); + changeDrawableColor(context, R.drawable.ic_favorite,R.color.marked_icon); imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite); }else { if( theme == THEME_DARK) - changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon); else changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.black); imgFav = ContextCompat.getDrawable(context, R.drawable.ic_favorite_border); } if( status.isReblogged()|| (status.getReblog() != null && status.getReblog().isReblogged())) { - changeDrawableColor(context, R.drawable.ic_boost,R.color.yellowicon); + changeDrawableColor(context, R.drawable.ic_boost,R.color.marked_icon); imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost); }else { if( theme == THEME_DARK) - changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_boost_border,R.color.dark_icon); else changeDrawableColor(context, R.drawable.ic_boost_border,R.color.black); imgReblog = ContextCompat.getDrawable(context, R.drawable.ic_boost_border); } - if( status.isPinned()|| (status.getReblog() != null && status.getReblog().isPinned())) + if( status.isPinned()|| (status.getReblog() != null && status.getReblog().isPinned())) { + changeDrawableColor(context, R.drawable.ic_action_pin_yellow,R.color.marked_icon); imgPinned = ContextCompat.getDrawable(context, R.drawable.ic_action_pin_yellow); - else + }else { + if( theme == THEME_DARK) + changeDrawableColor(context, R.drawable.ic_action_pin_dark,R.color.dark_icon); + else + changeDrawableColor(context, R.drawable.ic_action_pin_dark,R.color.black); imgPinned = ContextCompat.getDrawable(context, R.drawable.ic_action_pin_dark); + } imgFav.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f)); imgReblog.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (20 * iconSizePercent/100 * scale + 0.5f)); diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index eb81bf4bf..cad9b437c 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -20,6 +20,8 @@ #607D8B #f3f3f3 + #66708a + #ca8f04 #00000000 @@ -29,8 +31,6 @@ #FFF #C5CAE9 #E0E0E0 - #424242 - #FDD835 #282c37 diff --git a/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java index 5f518cfff..fffd6d309 100644 --- a/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -980,17 +980,17 @@ public class MainActivity extends AppCompatActivity SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_DARK){ - changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text); - changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_globe,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_open,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_action_lock_closed,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_icon); }else { changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black); changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black); From 8397d3fae310cbb94deadcbb4650d9183c5cfffd Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 10:47:41 +0200 Subject: [PATCH 06/19] Change position of some elements in toots --- .../mastodon/drawers/StatusListAdapter.java | 35 ++++++------- app/src/main/res/layout/drawer_status.xml | 51 +++++++++---------- 2 files changed, 40 insertions(+), 46 deletions(-) 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 12172d2c4..7a6f98062 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 @@ -15,6 +15,7 @@ package fr.gouv.etalab.mastodon.drawers; * see . */ import android.graphics.Bitmap; +import android.graphics.Color; import android.graphics.Typeface; import android.os.Handler; import android.support.design.widget.FloatingActionButton; @@ -35,8 +36,10 @@ import android.support.v4.content.ContextCompat; import android.support.v7.widget.CardView; import android.support.v7.widget.PopupMenu; import android.text.Html; +import android.text.Spannable; import android.text.SpannableString; import android.text.method.LinkMovementMethod; +import android.text.style.ForegroundColorSpan; import android.util.Log; import android.util.Patterns; import android.util.TypedValue; @@ -218,7 +221,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_toot_date = (TextView) convertView.findViewById(R.id.status_toot_date); holder.status_show_more = (Button) convertView.findViewById(R.id.status_show_more); holder.status_more = (ImageView) convertView.findViewById(R.id.status_more); - holder.status_reblog_user = (TextView) convertView.findViewById(R.id.status_reblog_user); holder.status_prev1 = (ImageView) convertView.findViewById(R.id.status_prev1); holder.status_prev2 = (ImageView) convertView.findViewById(R.id.status_prev2); holder.status_prev3 = (ImageView) convertView.findViewById(R.id.status_prev3); @@ -316,7 +318,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_content.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100); holder.status_account_displayname.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100); holder.status_account_username.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12*textSizePercent/100); - holder.status_reblog_user.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100); holder.status_toot_date.setTextSize(TypedValue.COMPLEX_UNIT_SP, 12*textSizePercent/100); holder.status_spoiler.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100); holder.status_content_translated.setTextSize(TypedValue.COMPLEX_UNIT_SP, 14*textSizePercent/100); @@ -361,7 +362,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_icon); changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon); changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon); - changeDrawableColor(context, R.drawable.ic_translate,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_translate,R.color.dark_text); }else { changeDrawableColor(context, R.drawable.ic_reply,R.color.black); changeDrawableColor(context, R.drawable.ic_action_more,R.color.black); @@ -380,48 +381,45 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf //Redraws top icons (boost/reply) final float scale = context.getResources().getDisplayMetrics().density; - if( (status.getIn_reply_to_account_id()!= null && !status.getIn_reply_to_account_id().equals("null")) || (status.getIn_reply_to_id() != null && !status.getIn_reply_to_id().equals("null")) ){ - Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_reply); - img.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (15 * iconSizePercent/100 * scale + 0.5f)); - holder.status_account_displayname.setCompoundDrawables( img, null, null, null); - }else if( status.getReblog() != null){ + if( status.getReblog() != null){ Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_boost_header); img.setBounds(0,0,(int) (20 * iconSizePercent/100 * scale + 0.5f),(int) (15 * iconSizePercent/100 * scale + 0.5f)); holder.status_account_displayname.setCompoundDrawables( img, null, null, null); + holder.status_account_displayname.setVisibility(View.VISIBLE); }else{ - holder.status_account_displayname.setCompoundDrawables( null, null, null, null); + holder.status_account_displayname.setVisibility(View.GONE); } if( theme == THEME_DARK){ holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); }else { holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black)); holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black)); + holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.black)); } String content; final String displayName; - final String username; final String ppurl; if( status.getReblog() != null){ content = status.getReblog().getContent(); displayName = Helper.shortnameToUnicode(status.getReblog().getAccount().getDisplay_name(), true); - username = status.getReblog().getAccount().getUsername(); - holder.status_reblog_user.setText(displayName + " " +String.format("@%s",username)); ppurl = status.getReblog().getAccount().getAvatar(); - holder.status_reblog_user.setVisibility(View.VISIBLE); holder.status_account_displayname.setText(context.getResources().getString(R.string.reblog_by, status.getAccount().getUsername())); - holder.status_account_username.setText( ""); }else { ppurl = status.getAccount().getAvatar(); content = status.getContent(); displayName = Helper.shortnameToUnicode(status.getAccount().getDisplay_name(), true); - username = status.getAccount().getUsername(); - holder.status_reblog_user.setVisibility(View.GONE); - holder.status_account_displayname.setText(displayName); - holder.status_account_username.setText(String.format("@%s",username)); } + String name = String.format("%s @%s",displayName,status.getAccount().getAcct()); + Spannable wordtoSpan = new SpannableString(name); + if( theme == THEME_DARK) { + wordtoSpan.setSpan(new ForegroundColorSpan(Color.BLUE), 15, 30, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 5, 10, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + } + holder.status_account_username.setText(wordtoSpan); if( status.getContent_translated() != null && status.getContent_translated().length() > 0){ @@ -1410,7 +1408,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf TextView status_favorite_count; TextView status_reblog_count; TextView status_toot_date; - TextView status_reblog_user; Button status_show_more; ImageView status_more; LinearLayout status_document_container; diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 89b5b21c7..500ecbe44 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -98,45 +98,42 @@ android:layout_weight="1" android:layout_height="wrap_content" android:orientation="vertical"> + - + - - + Date: Sun, 15 Oct 2017 11:16:43 +0200 Subject: [PATCH 07/19] Some other color improvements --- .../mastodon/drawers/StatusListAdapter.java | 30 +++++++++++++++---- app/src/main/res/layout/drawer_status.xml | 8 ++--- 2 files changed, 29 insertions(+), 9 deletions(-) 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 7a6f98062..76bcc09f4 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 @@ -38,7 +38,10 @@ import android.support.v7.widget.PopupMenu; import android.text.Html; import android.text.Spannable; import android.text.SpannableString; +import android.text.Spanned; +import android.text.TextPaint; import android.text.method.LinkMovementMethod; +import android.text.style.ClickableSpan; import android.text.style.ForegroundColorSpan; import android.util.Log; import android.util.Patterns; @@ -78,7 +81,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.regex.Matcher; +import java.util.regex.Pattern; +import fr.gouv.etalab.mastodon.activities.HashTagActivity; import fr.gouv.etalab.mastodon.activities.MediaActivity; import fr.gouv.etalab.mastodon.activities.ShowAccountActivity; import fr.gouv.etalab.mastodon.activities.ShowConversationActivity; @@ -360,8 +365,8 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf changeDrawableColor(context, R.drawable.ic_boost_header,R.color.dark_icon); changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon); changeDrawableColor(context, R.drawable.ic_action_pin_dark, R.color.dark_icon); - changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon); - changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text); changeDrawableColor(context, R.drawable.ic_translate,R.color.dark_text); }else { changeDrawableColor(context, R.drawable.ic_reply,R.color.black); @@ -394,30 +399,45 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); + holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.dark_icon)); }else { holder.status_favorite_count.setTextColor(ContextCompat.getColor(context, R.color.black)); holder.status_reblog_count.setTextColor(ContextCompat.getColor(context, R.color.black)); holder.status_toot_date.setTextColor(ContextCompat.getColor(context, R.color.black)); + holder.status_account_displayname.setTextColor(ContextCompat.getColor(context, R.color.black)); } String content; final String displayName; final String ppurl; + String name; if( status.getReblog() != null){ content = status.getReblog().getContent(); displayName = Helper.shortnameToUnicode(status.getReblog().getAccount().getDisplay_name(), true); ppurl = status.getReblog().getAccount().getAvatar(); holder.status_account_displayname.setText(context.getResources().getString(R.string.reblog_by, status.getAccount().getUsername())); + name = String.format("%s @%s",displayName,status.getReblog().getAccount().getAcct()); }else { ppurl = status.getAccount().getAvatar(); content = status.getContent(); displayName = Helper.shortnameToUnicode(status.getAccount().getDisplay_name(), true); + name = String.format("%s @%s",displayName,status.getAccount().getAcct()); } - String name = String.format("%s @%s",displayName,status.getAccount().getAcct()); + Spannable wordtoSpan = new SpannableString(name); if( theme == THEME_DARK) { - wordtoSpan.setSpan(new ForegroundColorSpan(Color.BLUE), 15, 30, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - wordtoSpan.setSpan(new ForegroundColorSpan(Color.RED), 5, 10, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + Pattern hashAcct; + if( status.getReblog() != null) + hashAcct = Pattern.compile("\\s(@"+status.getReblog().getAccount().getAcct()+")"); + else + hashAcct = Pattern.compile("\\s(@"+status.getAccount().getAcct()+")"); + Matcher matcherAcct = hashAcct.matcher(wordtoSpan); + while (matcherAcct.find()){ + int matchStart = matcherAcct.start(1); + int matchEnd = matcherAcct.end(); + if( wordtoSpan.length() >= matchEnd && matchStart < matchEnd) + wordtoSpan.setSpan(new ForegroundColorSpan(ContextCompat.getColor(context, R.color.dark_icon)), matchStart, matchEnd, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + } } holder.status_account_username.setText(wordtoSpan); diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 500ecbe44..e6a6f88b0 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -101,8 +101,6 @@ From ac334ba3a45c0ef419108e582103b592a45d5416 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 11:35:36 +0200 Subject: [PATCH 08/19] Some icon changes --- .../activities/ShowAccountActivity.java | 16 ---------------- .../drawable-hdpi/ic_action_decrease_menu.png | Bin 129 -> 0 bytes .../drawable-hdpi/ic_action_volume_mute.png | Bin 806 -> 128 bytes .../main/res/drawable-hdpi/ic_clear_all.png | Bin 131 -> 0 bytes app/src/main/res/drawable-hdpi/ic_message.png | Bin 172 -> 0 bytes .../main/res/drawable-hdpi/ic_mute_white.png | Bin 785 -> 300 bytes .../main/res/drawable-hdpi/ic_unlock_alt.png | Bin 855 -> 324 bytes .../drawable-ldpi/ic_action_decrease_menu.png | Bin 98 -> 0 bytes .../drawable-ldpi/ic_action_volume_mute.png | Bin 442 -> 188 bytes .../main/res/drawable-ldpi/ic_clear_all.png | Bin 231 -> 0 bytes app/src/main/res/drawable-ldpi/ic_message.png | Bin 276 -> 0 bytes .../main/res/drawable-ldpi/ic_mute_white.png | Bin 422 -> 296 bytes .../main/res/drawable-ldpi/ic_unlock_alt.png | Bin 451 -> 345 bytes .../drawable-mdpi/ic_action_decrease_menu.png | Bin 111 -> 0 bytes .../drawable-mdpi/ic_action_volume_mute.png | Bin 476 -> 100 bytes .../main/res/drawable-mdpi/ic_clear_all.png | Bin 95 -> 0 bytes app/src/main/res/drawable-mdpi/ic_message.png | Bin 130 -> 0 bytes .../main/res/drawable-mdpi/ic_mute_white.png | Bin 449 -> 209 bytes .../main/res/drawable-mdpi/ic_unlock_alt.png | Bin 606 -> 231 bytes .../drawable-xhdpi/ic_action_decrease_menu.png | Bin 163 -> 0 bytes .../drawable-xhdpi/ic_action_volume_mute.png | Bin 718 -> 130 bytes .../main/res/drawable-xhdpi/ic_clear_all.png | Bin 108 -> 0 bytes app/src/main/res/drawable-xhdpi/ic_message.png | Bin 208 -> 0 bytes .../main/res/drawable-xhdpi/ic_mute_white.png | Bin 681 -> 377 bytes .../main/res/drawable-xhdpi/ic_unlock_alt.png | Bin 1072 -> 328 bytes .../ic_action_decrease_menu.png | Bin 215 -> 0 bytes .../drawable-xxhdpi/ic_action_volume_mute.png | Bin 1154 -> 156 bytes .../main/res/drawable-xxhdpi/ic_clear_all.png | Bin 133 -> 0 bytes .../main/res/drawable-xxhdpi/ic_message.png | Bin 293 -> 0 bytes .../main/res/drawable-xxhdpi/ic_mute_white.png | Bin 1133 -> 527 bytes .../main/res/drawable-xxhdpi/ic_unlock_alt.png | Bin 1639 -> 505 bytes .../ic_action_decrease_menu.png | Bin 268 -> 0 bytes .../drawable-xxxhdpi/ic_action_volume_mute.png | Bin 2855 -> 181 bytes .../main/res/drawable-xxxhdpi/ic_clear_all.png | Bin 130 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_message.png | Bin 383 -> 0 bytes .../res/drawable-xxxhdpi/ic_mute_white.png | Bin 3195 -> 705 bytes .../main/res/drawable-xxxhdpi/ic_repeat.png | Bin 249 -> 0 bytes .../res/drawable-xxxhdpi/ic_unlock_alt.png | Bin 1881 -> 552 bytes 38 files changed, 16 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/ic_action_decrease_menu.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_clear_all.png delete mode 100644 app/src/main/res/drawable-hdpi/ic_message.png delete mode 100644 app/src/main/res/drawable-ldpi/ic_action_decrease_menu.png delete mode 100644 app/src/main/res/drawable-ldpi/ic_clear_all.png delete mode 100644 app/src/main/res/drawable-ldpi/ic_message.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_action_decrease_menu.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_clear_all.png delete mode 100644 app/src/main/res/drawable-mdpi/ic_message.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_action_decrease_menu.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_clear_all.png delete mode 100644 app/src/main/res/drawable-xhdpi/ic_message.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_decrease_menu.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_clear_all.png delete mode 100644 app/src/main/res/drawable-xxhdpi/ic_message.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_decrease_menu.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_clear_all.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_message.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_repeat.png diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 0081a39e5..c14fcdf5e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -293,10 +293,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi switch (item.getItemId()) { case R.id.action_show_pinned: showPinned = !showPinned; - if( showPinned ) - item.setIcon(R.drawable.ic_clear_all); - else - item.setIcon(R.drawable.ic_action_pin); if( tabLayout.getTabAt(0) != null) //noinspection ConstantConditions tabLayout.getTabAt(0).select(); @@ -305,10 +301,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi return true; case R.id.action_show_media: showMediaOnly = !showMediaOnly; - if( showMediaOnly ) - item.setIcon(R.drawable.ic_clear_all); - else - item.setIcon(R.drawable.ic_perm_media); if( tabLayout.getTabAt(0) != null) //noinspection ConstantConditions tabLayout.getTabAt(0).select(); @@ -537,10 +529,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi switch (item.getItemId()) { case R.id.action_show_pinned: showPinned = !showPinned; - if( showPinned ) - item.setIcon(R.drawable.ic_clear_all); - else - item.setIcon(R.drawable.ic_action_pin); if( tabLayout.getTabAt(0) != null) //noinspection ConstantConditions tabLayout.getTabAt(0).select(); @@ -549,10 +537,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi break; case R.id.action_show_media: showMediaOnly = !showMediaOnly; - if( showMediaOnly ) - item.setIcon(R.drawable.ic_clear_all); - else - item.setIcon(R.drawable.ic_perm_media); if( tabLayout.getTabAt(0) != null) //noinspection ConstantConditions tabLayout.getTabAt(0).select(); diff --git a/app/src/main/res/drawable-hdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-hdpi/ic_action_decrease_menu.png deleted file mode 100644 index 751443c367dd2b317d31e5da0d343566af0f6090..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC4^J1zkcwMxFCXM&FyLV}e7}Fo zZWqnW2@lyW9L}6QpBtzI862oMaGG%qi-jSwAOpjJy?m{l=C03YESw0E@O1TaS?83{ F1OTG9ADaLG diff --git a/app/src/main/res/drawable-hdpi/ic_action_volume_mute.png b/app/src/main/res/drawable-hdpi/ic_action_volume_mute.png index 2becf00d9d9e911ce8699a0edfa313ae4233e96b..8b4ccd143b5f6e8b2d32478382096893361da2ef 100644 GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(D?w&4=Ar-fh6C`drG}`#`pSb*G zzK!qylVHjvV=|*w+X4Rq-~XK(AKQyrEZRCza#G4M>7y%K-k5ln@hMpEpE!4SyB-6> YQtsrn`F{*zfJQQSy85}Sb4q9e0Pg)P@c;k- literal 806 zcmV+>1KIqEP)#n zl?M{#fwq()g_a@~i?-Ng8Q)XCsb9a&Idf*_-khm9_3h66ozw4pKXYczoH-MOVHo6D zK><(z6aY0!90V(%y4(SvY=vG!>dz~vF*g7xN60wW)m#A3nV(_Cf6(tVRPq`CWeqeX z&ip!Pn2ry73xKj1dLzt_QC%nff8;a3bf#3jmbe7V}CIqJ6(E z&PKA=vEMmRpECeTJ#-uTDD*1^U`*ucVQ$vV-{%%5%~cAnr_?bW7yvW_1f$ zd-Aq|3O_g&^{Lk8^CY|^OsqkHWpv*VxHBREheoOuJpr0Y^*HgpEMA@n{5;HhCvHKXaH5@%jO ze31{sG|TCZm=)2j2rTm67*fF)(g$Cm{C~3+Mb};sBiDYH!T3|tlc?^o%ao( z0eWWu*uvUfqS#&^w^h2tc4DOctj!aOt@m|f>$C>o0@W>o{y@LgE2OUgYP!860LIyd zuR0jEPYWjRe$Gv&jUT=Xu>$X{H`K6}XA2>EZUv(S3dHTfE3|*noxK``$ kWW`s?0-yjW0RFH30XXi3P?QnQQvd(}07*qoM6N<$g3K^;Y5)KL diff --git a/app/src/main/res/drawable-hdpi/ic_clear_all.png b/app/src/main/res/drawable-hdpi/ic_clear_all.png deleted file mode 100644 index 9d2751edb9967f8009c95e26929557ce88b1736e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i0wmS%+S~(DUY;(FAr-fh6C_xhIsc^pT;Cwx zm2iF82YLGlhtS+7mXqc@*zj{dgZ`F->vS6%_6x1Zl(zgQq$tp&b7QNn!UKKQRawgC eCoWD{z`&qjrxL}v_nIHjR0dC1KbLh*2~7YiNh~n{ diff --git a/app/src/main/res/drawable-hdpi/ic_message.png b/app/src/main/res/drawable-hdpi/ic_message.png deleted file mode 100644 index 4dc32aa28ad14cf9ee14147e4606c683a311d1bd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8v8Rh;NX4z>1c`SK?0^67{D1$y zx@Zl{t0ZUBj7RlF2VFv%?@i9VP#w~&!QgyCVNp_LhLp?R19=Ked>0KCO}p+U{3PJa zU*=SSt6jJ3vLwFztCz1TZJFYzv07neGS8g_Y^PS|ypmuxThVCM+ricr*uc%eQ0Uur U+uBFu572rBPgg&ebxsLQ0FhWfL;wH) diff --git a/app/src/main/res/drawable-hdpi/ic_mute_white.png b/app/src/main/res/drawable-hdpi/ic_mute_white.png index 23316319f8792266117067bb063cb99050629475..57d6261db479e2af1c165fc8e811f65a30faa884 100644 GIT binary patch literal 300 zcmV+{0n`48P)MKzW-)0*pK4-v#Jx_8#M~<5JIxxX+ys;Zn^jsuwnqxqRp1EX> z2D9mzN;cA97Cj5ehMK)4>A6bYFh9vY9eHYLvwJI`hamN}D0^*}w5e2eJ!#=C^+YoP yc`gswAZ$KwC3nGNM6}brLq+>zh`svpFXI7nvys#7@U*x90000gA_>z2`NDlp)PgM%svnCi3bHi1d-?%cFRLhmkwc( zLWe{WIw*n=C_#k=MQU0hq=e@9hTg*CHM2Xrt27Jy;E$hghBxoGGdufsHX(#aL|KU# zAO?s5_AU5vP(~C1E`dIZzxDxC7$txX@vl9O3V^)w+a&Q{_;(YOXFEV8Xq{d8)1VRj zeamKme9$6Geg@mB@&75C0iG(>{Q$PfU1$S+hiwE%3bkD$eO{yQylnuLc!R3!0_it| zzNAe62SM{fZzZJf0Q&CR1TgH9{0=CS^zB0bge?G9g}W`Y{;e9nGn0*m;~oGt`vJ%X zy#y^W{q_KuVR4$t%%rj8$I+iONd7s-=`jWHy3#ruV{vLpTMqFzVDiEPf+jC*1yo=H zFdPs-&QKYNQ$^Z}*cj~|5IlLg3{RTQz^DjrlVrJ+5`U>;oSPa5Rq_>n?ty6$&YW2| z%IYK4SZxgAHcMXKdnf$vLZ3ncTp{IzV>K@0wGs%yk}nUkjc$en7$mWrdg!vx(&Q(* zpL_wVhXm*)v7D{9&SktT+_t%;f&#n`2~ba-Cyt#nOn!|mr&JJtHz5IzVVol3J7tjk zS6ntNCJ=4_BO#K1NaB+0% zCjKUa5B)zTTM;1tr#O^kUWK0q~8PdUAOUArG_0RI(CEf znML0jTMxGS6ae?IEf@3$w1uybRszWF_7wwIAP2qzYkR8?cjfu$I|d=Q&pG_vC?asY zE)TQ5X^vSkL_|JtoCST?9P~!!6O$~XAK`2~+3)XU@mI z(Cr5S1uAP}{y+WykN>#A_y1G>Ghu3r`cD{yV`{4h3Sao|fD>K-%GYCRYXAx#z~jdQ zK=}rmX;b+h4NPbxYIFVn3&{WZ--$GBo1tO1ku+_Kq1qObrcLSpO(6d|QtBWwNErW1 z0x`WJfJkk%K;Z{K30&|2P`(CJn=QeF{O`XNw)__Qe;YV&V~5-R2a}Rb8Hg<>iGTol W!DCcXqCfBe0000ppC6iCDxL6XU2ER)G}=W@AG&+~4B1@IO80KdVC!Lqrx1U`YA z=nSKqk`1Bmg7YSV$P@~NI|Q@{etBz`p8(aub+8*dO?4$f@GUqUAc$#`-LN9kZy>P` zoAG)DzmedN;P{pFyq`I3Yp}D4xd+ji4JsvkJk(0t&b}Vpqo&XQ zl{K6m*27&xGTP8Nu96F|H;=C&tE-@_;c!fK>T{;eX&i^0we)e#MW-9xY{34pgs;o^ zOjz4(6`%q&0ar>9XR7wI8rfH}<} z?8ea@QpxyQvR334V`-ZNc3||0>DQG6-ZIt~#*s*)d%$$0N&-sK1ID&n*%J(bK8!x~ z5l}bEh0T;H%^qyL^u740gl;gFvbh2xFkzE`WN>h>P5S~iCe5qK4A-a&r@Qtrr>{{H zc*$EoQOSNJmXkHDgq9HYGhSoJGO^qxrmeLQNSa>~8bMYFB}Yh||1yDTN5Bzq1RMcJ zz!7i+905nb5pV?lTLPgDG_wstKp+0@)q14VN4SgTj~VNEs4tn1erNPUL#=Ar-fhfBgS%&#Y^Bcm?ZX vv7RV{9$f`-9yx9|<;p8ff!uDo4u=?Y?_90Vnfc@_P!ofvtDnm{r-UW|vHl#e diff --git a/app/src/main/res/drawable-ldpi/ic_action_volume_mute.png b/app/src/main/res/drawable-ldpi/ic_action_volume_mute.png index f74fb60b27e316cdaf0fb54f9d980b568ef7624a..beae906a3eaa4a5cf9bcd30cf930cb3f12ec1499 100644 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2^Wo-U3d6}OTT7BD8XBrReT7C6nc z(L`XgfYD6euBnX`b^^;84aMzvlN@9?jx2Q8BhWFQu~1K-_|YYnq9$VjdzMGv9sV$P z*fSRLDf+Gp;QhZqVp(Um#B4i(Y~d6Bj~rxJjwCwl;dr&&re@X!XMffXafU)GyXT4B j>Xu25Iv`Kq7+$K zOetld5M_KPztNpHubJXajZ&hqL&D zld}s+jjLe_!k%^F(3mA4dObUKNkNVBR^d?Nc6fu$jD#40PZ;zH7V`**~0Ki(-6m kBCxLVbo}3Ma!Crl08RG@Oc;3$Hvj+t07*qoM6N<$g2j5pqW}N^ diff --git a/app/src/main/res/drawable-ldpi/ic_clear_all.png b/app/src/main/res/drawable-ldpi/ic_clear_all.png deleted file mode 100644 index 159af45a2cda331e4fbb1d946d20746ec22d89c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 231 zcmeAS@N?(olHy`uVBq!ia0vp@Ak4uAB#T}@sR2^!JY5_^DsCkwNC+q>DIMZCvZlg7 zxveex`Z~^iRbNlBinE>SUYv31!i5AzFNwduzvr6@tY?2z>LGC?o^#6ffB*m6D{s<0 zy^LR6Ae1{b7|yrd@}Y@VDJ@eZkwQO#xq6ykklQO dqx^Rn82+T)tTR6K+8*d~22WQ%mvv4FO#r>tRoegn diff --git a/app/src/main/res/drawable-ldpi/ic_message.png b/app/src/main/res/drawable-ldpi/ic_message.png deleted file mode 100644 index ddedaae514cd940408c28fb160c3b173b89fb4ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmV+v0qg#WP)H1d`~mwY60R`du0u2FZccAgRY{&|e_F z0rdAaAl`xlZv&};s>SP~ZlJB&K--nDVUQe14P9MCl`x`OtWhl;fxvf4QZ~$>w?OuM zAZ{Wuuf?O}HK1Sv(2xf}iF%-fxQK`d7m=79CHDgjDgqi(1~f#3qGIIW!Gj7wLwFbl a0{{SF^{}Qjy7HO;0000_irT-hX6J5 zqG$w~&IrV8KtXn(q$W_&T%d;fz`#IdAYBCHpMq-SfNKJBB!Q9vKpX{>oDIa!fVct3 zHv`fdK)Mh}uLja`U=9EO|7QdW_yF-EApQWv-+}luND~nE0u?p@Z3JmN3glaY)Wb9d zKsCSsNK+jU_W|)5sFM!@u_v-7Vr)7B#FprO3IyV4pu#ywelkb$(@MCX2!x&rQs@PN u;tO9qsUgMFav%-{YT&^c!DOWfVgLY#fHnwqu(S{W0000Ng>qm0&GFFn1BUupz1QA`GEn=l3!4DMY!T%Apr}XLDgjg@q082@}MsN1&tp@ zY!}tbM$(sq6fADg3^@~K39`0_(jlX>NENiz`%r9$x^`(x!Nti*gbYHvC^+OI zauJEoD@SQ-OyJ@D{@(MG#BoxdBuQL2l{#6EF~$kQa6O8mP8`QG^vUXt>guPN@(k=U zIAN&a`+f;+l0Q@5Q~%E{uIsMS+<_AeCJ2HeS|xvkCjG*~ZmcN7KC4~`;uhLM&(SyN z5!W^MYobu1F@{&-d$@yJOPBf!42jG0rZUBmF3m9vY{ItHE&Fn0sw|sSY%{dMF^-4_ z=rOt8=w+6vqt)$QKBYFl`p=}}U3;FVm8;}6sm literal 451 zcmV;!0X+VRP)X zUBAH*LfB1mq8361esa#7fBt{Y>@LKznnVx;Nss}DpahEG0BnGS)owVB)1S-b)_mW; z1|{$Ts)~0|1XplY;r1Dc+qT_J;SvH5Dp&!}o`#B7^z0t)A~i9S?kCW>^}phk^${Y= zsaF6#?&iDun*(a9tQu0GT(h0~G`<8n3w=SClTmfF!UZdj44MQ7~O z5e625DL69DbFj;PNb)8Ir%?tvCb@A6&N#orvTr&f6NB%Y$a%xg>kOvq48|JH)$r@> zMQ{$`yuRbd>`6PeLBylFk2A+DL<{TUoh}G t1|5TcZt!;>n*K%E1l6GZD1-G{%};ft!hO1>7;XRn002ovPDHLkV1lHV%`gA} diff --git a/app/src/main/res/drawable-mdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-mdpi/ic_action_decrease_menu.png deleted file mode 100644 index 88b3982fdd856807f108ccdb0e07ddc12c0f95ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzGfx-CkcwMxFKy&xFc4sJ_#S_& zXM&o4g~h>hkGL+I*-Hb}071j)2ch4XY9O41J?t;7B__W1nd}Y{@O1TaS?83{1OOnP BA7TIi diff --git a/app/src/main/res/drawable-mdpi/ic_action_volume_mute.png b/app/src/main/res/drawable-mdpi/ic_action_volume_mute.png index 4d38610bff89ea20d381739156d65b42d23613e8..65f8e2a5d2852907f8b3b4fb386f959e5101228d 100644 GIT binary patch literal 100 zcmeAS@N?(olHy`uVBq!ia0vp^LLkh+0wn(&ce?|mv^`xMLn>}1CrF4aXp~U>-x>I6 xzJ#iU=wJ87W@o`bK6OQo4jvz+#jR-!4EO(O-@Nfue;-gAgQu&X%Q~loCIH$L9V-9; literal 476 zcmV<20VDp2P)cU9niqj)lrC#^-={1RQW5i20DzUj*W7NPG(*{s^@w9!WeNDh86X!0G@X z5F}tZ3~xiyvm1z?pqXO{#GjxRCP49DsF)?rGyp2qh;#r5OF{K41sRMbB&~q>Gt}b0 zP_`A`LjF?4;K_j01xSvt1!c7X zsSS}FQ9WSo0i^ieK42{(s3Z7*`0{|X36WDV5T6;4Rxz4Gd}1CrJEy@W16hyTJpN tA`!uDrx?05+5bsTSeH@oGh2X(VR?Mf-+60_E&_Ehc)I$ztaD0e0sz5D9!dZJ diff --git a/app/src/main/res/drawable-mdpi/ic_message.png b/app/src/main/res/drawable-mdpi/ic_message.png deleted file mode 100644 index 30bdd6987bad3740983e555dd7df6ee5ba9b5331..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Pfr)ekcwN$2@AM?$p85NwBG5# z)%yAtwnL{JAE-JpPi!dSwfO5{%DdQaQRn0pYag;^O2z&8?t1-#Lk*jfuVsWYb7th0 c#zX-|1|hk>)g7sOK{haWy85}Sb4q9e07l;|LjV8( diff --git a/app/src/main/res/drawable-mdpi/ic_mute_white.png b/app/src/main/res/drawable-mdpi/ic_mute_white.png index 0ea44b99627309fa9e597983d8fe872639171f31..e011ed3647966d8ccee2d4196459cf83b4351cf4 100644 GIT binary patch literal 209 zcmV;?051QDP)dU@&B9uH~#ZsRRU84VF7$55yYubbtsD-}#RU`sn2V79c(Zwe&3z zM?yp36%e!1!vU>GzV3yJ^+EY2w03|q5dTGTfIn2+4$6QlO2-9Y>V%^XW0 z{sgr!0gC@Z#Vqlq0geB}11YGUrBH*>&9VaG&rpm1LfKY?5}_3d4)B2LnF_>za3r`+ zB=w!dHh!uf7gHe|91a(16exQ70vkn_&+_WHLy^jVWkQNv{{IC+C;Ws3uZaKug8%dW^AU0rQ4YtW=;42C;2x?Xwg1%^ hfmsa<4!m)P0s$7I=002ovPDHLkV1mI!X&V3l literal 606 zcmV-k0-^nhP)vF?kTTmohuaVSC#{Nc{I=lswAzL`kGr`2k;N$?(Qf-0zh4e%C> zM#8X6CUeg;%~9L7KRS-{8ytgk=gKZs`w09bW(kZC-$`C;g$=`y;&I5HLH-3?IPNB5 zcEMv2Asm5==kxiyjAjb5uMI_Hw7+a+(pIyg+a6tG@WcYoKrWXXfMmOY*upo@=!Th{ zw1D;qzD4>Z~h<3To_ z!3a#X$;AFb_6mQZNlq^@bHpB~oC`SC5zyy*{ULe;fn6U8LEp`1<_{ zkj*ziep&IH@cjXQuZP?uvCHI~soXydCX4@$9|0YZOlty;_+G%D@Q~Z1He^|yjN(lR zc;it(jDkaQQouXfGb}-m-z5kvpe_P*%WTML3UUNn640{!R{?Sam4K%W0$#T&!1Y~_ z*GukyuHZBUpUV+a0uJRA&_8GdG;;3?_q8JGkB_`!6#Jx}UEL1t;I|k0wldT1B8K;r>Bc!NX4zUR}XSB7;vySdiy`m zW^X*8=CR|my}s@0N&h$Nuyr3y+8_a@_!P~AH7>f(i;2L|h{7aWT*$juF8vP+Z!j zOGzDy*lNK+X+bn7f{6uveh)72^KtL;-sMI5?tVY`4!wJK*YBtA-T!*N?|UxGV*m_* z0WbgtzyKJ)|7+0m%1|BJf!3f&X8<5>L0!lv`V1Yn9suHQz&O=os{tS?&>szeFHpux z0En~DPlf3!^o;y`**XA-0<^0zFFL>j&=~YdroFTZ0Ad7M33=rg$aB57U=JF%3BYa5 zH(w#oT_x$$RsfJ=eOCjZM4mlG(jTNAfauMkb&YwUY~WM*F4Lde0N`OC^WPL@Udy~U zsRn?!&}Y0C+EA2hl8!KwN&tu=^tF$9p{AnjBFQhO4gg{lYDF+FR9BR*lKd-a1h5d% zywH6``Rh?e0y(ti4Sv59(6xa8AfCi9snblzTA`O;3u*t6%zqyTf;9h8mc3&H0C6rM z^Frqp^-q!fr;7afKpl}F1kCp|YXYE_Ab`1$1ye8oMMNW72q9%Qp`#`MmJa4 zr?bJO7>1M(H0E=rpTOG$0SGk$^`9hpt1;M1&07*qoM6N<$f{<`M A0{{R3 diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_all.png b/app/src/main/res/drawable-xhdpi/ic_clear_all.png deleted file mode 100644 index 7f671c475120d474e95b45ba5d13a9e571e5993f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 108 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;v8Rh;NX4z>1PRu~2}c_K^Zl3Z zXyN<8oAtwACu6~6$19(1Wz_T@yAC9Jen_z{Zb)Ka(DOSyVYmF#^FZwkp00i_>zopr E02i$zOaK4? diff --git a/app/src/main/res/drawable-xhdpi/ic_message.png b/app/src/main/res/drawable-xhdpi/ic_message.png deleted file mode 100644 index f48f7c9093e1c4409694ae20f81734d0e17eebbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D>7Fi*Ar-gYUXSK;Fc4`;Tz$|; z*W=M90~gz*j*bc6mKH8kwcOnB-+PPPER|jSypmZx6}vfgi^A<(`B(DtF{!Ftzu}Tk)i;BOP@QI=M z)Wq!#PXB%$JZsP3_K&ULllXyC^BMH(8P5FSEBL&t<2FMh>$~UScPG9DI+4NC)z4*} HQ$iB}-#|_Z diff --git a/app/src/main/res/drawable-xhdpi/ic_mute_white.png b/app/src/main/res/drawable-xhdpi/ic_mute_white.png index 533955c733d9919ec323827677612b6b0f116f31..af5f8c0a223bd968542c7e3dbaf6334f67fffa3c 100644 GIT binary patch literal 377 zcmV-<0fzpGP)fir-l8r$a z1QyZxe*x;QbP|n0H3%rm`F}H5`1gM+l8iw&2q?q$e?M5_=6`k)jKMSrC@c2=HCU>E z1Y?i_d;NbwI6ECI_2@q{(Z(Pd^dA_|JWw|4|7T!H7i@_Q2S8CX6VB@e^ZUp(=+A#? zD9;1TKSHiS|No~!c`{($3-S%>frkavn(9zkn9z>O-r6X zW!0bigkU;PkO{1TUil2-^a=Zk(51~XZ5tOY$I50zgAoZK!1WoJ&#dj$|p5`a-zgu*XwbvKAjUJOqn@An-Tz8q{tZ7=0kL7p+%AuS2gHa06~j1 zIj&~Vr^B3}bfP3zzXJf}Q)Tg{#~vQFNtUK``Tr;aKmZ5;0U!VbKx2Ia{XZ#Efi6oR P00000NkvXXu0mjf6~-U7 diff --git a/app/src/main/res/drawable-xhdpi/ic_unlock_alt.png b/app/src/main/res/drawable-xhdpi/ic_unlock_alt.png index c730ebe046adb6711022e3a4bdb182e2f6b3a88a..b3dfeaec0fab0a01458831c0efe2d8130eacbe18 100644 GIT binary patch literal 328 zcmV-O0k{5%P)j1}^-Q2fexa8O5$ zJ=>11muy4|vT4~2hF>u-r}juJ;!ufm?;+L8;!v9w)C2Vf)jP7s zAIvI2y>Emfu;4-@)@-KEhb+j1#fMxe$mK(q5ZSH3%%6rbXt7MILd9zz+QL+Wrv71% z)u7{D&sKsaJ~UE;Otw4c*r1?#YAG~XCjW2ttD*I)`jK3R?DHXAxM#bJ(Zhd5LjE6p a208&>W)w*bFK{gY0000tW}#fwFye1R#6c> zG=rcAV_6ianU3$bY2NAg(Fr7G?p(dsJ9qMY@Q1wjobUUe|9O4)oW|#K$-?1q1~>|8 z!F|vI`aln826w?Fa0n#%65RrUKw5Ee@v2}jcq9}GJv0pC2N(ilU;_LC(+X4S*(ewU z->Fki-2?boiLcazYCNO^LY_vvqcH~ z${v%vfO>wZ8_6HYlo3VQQ`Bj-AcFWUipzQc(Oi1#j#`+anIt$(kSwKq#w>g<#`kXO zHpdWPjB?i~pB0bZ-v)us7(M@na+@HSG>4rfjmDMZ<4X(?+9+G->L?(X^iYjTYt4x5 zqVXwn-Cn7?2p{`n2rc=+Nts%14*z8Y{c1vL6yoP8m+e5TJYwBY-wF|@nIuREkmFYG z%kW%J;O=Oxhfo{D3!Ta{WY@rLmr1-1*-6|IU=aZis;{<4Ho^N_l*@K-#K|alp%&Fh z){97Gk#?8)5FisW)heNhHYZOzIVV-j8k0n6i1&vnm+qDT7fi_X^M0S42RInhkIxe( z36h9jE!@1Y1N8EKJLOUwjG2zlN|R~lx&W7B2vFv*0Frme2UlB^m_59&bZZKT0JUxk zpccYx8hKHP&_4s6Jijg97H%d%t_v_jgd+U!0ee9Oe{Ypt!tE?DE&}|`3uJ+vfn=YX z7HRJioN6F?dca@9RRoypgrocYU9n4Ea$#Q`~veiW&* zxdKwob2RK3_^57t%??9bDfdarx(JEa3?9Mt44hXxb^KL`)7R<%WXj_8*K`~q9Eafj z#I^_skfjzpt5;TDvOz?!cUny4d<1AQ64T@o^&V|lYDa(oPP!6Q068vikcHc>0HFjH z;FT6Y3!nwi0%!rW09pVofEGXtpaswZXaTeUS^zD87C;N21<(R$0Tz$|jdlgdkMZB) zy=-zZ^1$xJh+K_bHOzk);Z++B27^_$Zi?k{6ahBk?7i{lesDSg8ZJNF9HH?Ia+PoU qhFE^e4*cLc=ni||+QAj8?fVTQ3f&(qdE}n}0000~)y~xPPz`(=g_3)w7&sUh7>N*k@Cs-)1dynm;QbP0l+XkK#dIJ` diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_volume_mute.png b/app/src/main/res/drawable-xxhdpi/ic_action_volume_mute.png index afbeedd34e898c0a88e7e64131e03ed56111e5e4..4bf644f6a2243e100b64854c15ea37f58049f9ca 100644 GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH(+WKS2zkcwMxuWuA=b`W4W$R9gX zpYz0og;^_-+8Ay<{(f%ds$ZAfgC<{5G4=FCqP~jf*w-fl!TWQg8`5|#6JulRD8TV_gt_hyTimE{C7(8A5T-G@yGywqg;5t_T literal 1154 zcmV-|1bzF7P)`q+f4jZc`qt%SJkQHO ze1Zu8000mG000C40003106+i$01yBu8k@;XBkd-2lfIIUlBxh8dE?7She&@&o}^c# zN&raC{3`#6_d=8-l>mTy^GEwnxM!eM0N~dAA*2U}<_p~e0C(mOBAtm~eqQqdzzu-? z8l!KJCXsGSe?J8P@y)N-m@j%l6AHSeg*~HQQYiq~o4=6MrvdO#DwC7$F9rZR^GA^0 z8NBEBO67J*_getK4nVu%hjzA9u13258~~!5zt+(FUU|Sp*KpEr=^If20Osb8C4Djk za7R(c6De*c0GRjpyCU@STNU*jk>b_^fEj?shy$(dih4FkaR&iFZ@w5veTxWSxuUKG zQrtBF2seKysmCJKP#uynEsT2!0O0_RTbSRc8s+*xy<+SMahSi!!hE5(ntDGMV^1h; z^JkHMS^{{asr#7}Uk3pH8dOPoV`;w7bxr-bV(bZ}Wqye;FoyZsR5M*CrTD86+E+&^ zcl)?usi2zWKNOdYcjf;6K&f4vaO` zPEC8ZNbxTsnD4oQAeo=nwj=;7Nzr_vjS&-iA0nC`8-l|8yc%5tXiXWwYE64qO7Y)A zV#`B}vVx#7U#QI)05Kqnkim4Np0L3cT}uPXl*Ta37=l4v?aD!9j1;oRptg`UEeeRw z#xza~!Jv+g&=@KK?#l~(3AuMMiurK>oMr~_UXkpR|;nJ8E4Tr z*ZL(U^rbcp3y9n7IHjP{WgGM30C>s_KxkyZ;82cfP9U!n^j#=RH60BA`~dI@VtxhT zBh35}MmLnX8;XG#^FR!#2OXkUrwL8eRysIIxKy!U-H%#tT3^$**x}A1?$kulobXR`Nnvqd2A>2e+mOp&3UP z^Fui1YRL)!*Z~l~nsGCN`FC-Ay?Y4RfIPoSD*zxF2;;<$Gw5c^l#lhdjXnxTEC;&0p?;+jyXTb0?RuBLH00aO400961KmY&$5C8xG1OP>&zhMCq Ui+HSi0000007*qoM6N<$f{wiacK`qY diff --git a/app/src/main/res/drawable-xxhdpi/ic_clear_all.png b/app/src/main/res/drawable-xxhdpi/ic_clear_all.png deleted file mode 100644 index 46e51bcba6b8831b06ef7258f32d8ae3d6eb0c24..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL0wmRZ7KH&RA5Ry@kcwMxuWsaJP~c#2bT1Hb zPbe`zeCyJLgyQE6@ePSQ3_ldp-CmxZ9+BePvGur>c+0KyxTT(Jx8Klv`#|is!0Q-+ gJE?}{k_>w6JySkzQVo9K05q4u)78&qol`;+01>4vKmY&$ diff --git a/app/src/main/res/drawable-xxhdpi/ic_message.png b/app/src/main/res/drawable-xxhdpi/ic_message.png deleted file mode 100644 index 19fab47360ea47ed7d90cddc33da988cc0f60966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 293 zcmV+=0owkFP)aKedy6u3ta19riF;tJDn*#-NK zI0p6q{bm6ekir(Kw4wm%_W=?T@D%kLQ8G+uUTovdfV)AHHk1m>JZZ;?gsanp$_Eoq zU06YyaACN$pz^~qo;gt>xmeeNDhw08MKUGPs{vIECcL|3JJ*0RfmMt0$i#@R2^l0RsXCwUN|i9@wn3w2RkcdBKM4dyPrd8dN`TfrJYj zH7un+A*uVEi#nogSI;Kfm4%J?5iOE7PS#c3N6Z7dm8=LIF`ar3&m%M|8N+0ZaJK~> z+>&vGyWt6vEymr-Es^O1J-kioJU&aR!xGx>4MY1KvebT?3>F=T8s76YYPd$GR_x$i zLN#y=gNLFNj1jUtF8y)LO^WYUY0m(E0lz)B1#wK;aW!!#h9sYJ`Q$`-#TOq?wBZnk R8jAn`002ovPDHLkV1iIK>EHkW literal 1133 zcmV-z1d{uSP)D1U5)_wR5PgdQ9YshMsoy*);!(4v>0P0#V8T>xZfNMC_AEu4S1Ax57QGJ#Ka5tokXN=!$0FdwRcPaGq zTSCe?&iHKt068@%4zzZKlvB_69RUEbyn)nrMF1;9%38$u-2i}SRZ{h6q#7niWK4th z3IL*YN+bCF5u@Bn&S*Ig0DNsBdiG9G?w2(7gp&TiIaI$i0X!Cz-OKoI1c1TvrVZZ` zeY+_rzmUeBP*NY1^#d5kM5*R8jQ@3o`g#8?6^6gF*9L8{4PZ1?Bh`L^+DUvnCaB9{ z#{a40cPQT1VGx2B{BFP8Mq2=~5|ia7ZI7Tn+Zq3t3c)7^Aq0b8w4F8pEF;Ov0 zh!zRx0$AY?KvzheW^#O|8+wKCAc*d{NHxUPIG~=mHC|S98pm&*!A3L)LF9W$Cirmx z>~;)b2d7SxIDR#Tdomq{I(fRDTLWIo#4j-@SM1}QJldcYfTpN zI=ptFoFtr%1^~wZ@CtJL3PL07xDiG-)NwZy12M+~F{C0Kry`JybDWGrI@)nM8WS>( zCuA@s>3B*Klk$!y<*_WK1eT>>VV2{CSy-CrcxfUQ=a#_YTr5w=1`TY`z!oKJ(!(Y_ zY*WQX?Lmf(+LGF;2mnVFSWu?|036m~L1U>tNdmxeHI`H>2>=H+S=4Ds2spCLlDsGR zjRXK3+GkPTyzWl{032IsS?dV@nEK#59tXEtR+Her07n-mppyodtN?(9yoIi}6@q^+ zZNV>f02zN>Pp>3^RRCZ|kv*00000NkvXXu0mjfO@-o^ diff --git a/app/src/main/res/drawable-xxhdpi/ic_unlock_alt.png b/app/src/main/res/drawable-xxhdpi/ic_unlock_alt.png index 4f36168929c5a81baf6629f0fd07afebec99c78a..f6da58dfdc1b94a19a90a1451002ae6947244ee9 100644 GIT binary patch literal 505 zcmVM21Nv1pXVI0x3F#)Wt&(6bTV@ zi6T#R3X8A~=C>j3rR`45Ix_^Z-|ubT+xOXJW*_s`;jr}~__2fp4ww^IgbxlYwvrq| z2H$mtpn6yvlHh3@Eh=GMILA-QphFeRh2x6CkJv$+c^6L=SC3Gy2DU*Z^K4Tz({&G) z@k+5Z6|f#E_<(>RI?Ud*q!)C{!@k~Y!Zbcf@u)oPvRrD9n~^GKT*$(_^xPqC&NSt; z%E5-H5PwB_DaS7d>ticXave9PiC|;u+7-`kf{oj-KZAJ?Ll#BUq9SgwS<%#ffq8HW zS)G{S%wRF7(7G5bs|0o<2K!vAG=0!koTjxCf(dtVQ%C838)n0F!#c5wedaLdtf&y? z!#&0CFsKve!gW=bxI%+ISjf+|An`Q!Nw0ols`){zkl5^v;80=69EF}gTWj#+;1&oMJF*Edcqc-I* vWo15V#~dOx9ls-(g;(D&sO5j74deP9q~*6rQ)ojHO6e3 zjg!@JiJ=RUVTre~+>4}~V|46<)BE4szwh(;JkRs_{`t)d^v6I|;i>=tK(XE)L0>=O zzulqyb*FF9kN}`;h4nxMCrg(YgqSeTz1<}U+^;1FQ<*Tf>|k=d77vk|sactf+ODzR zXf<2YFb%KnnLeZ%L=eta?x^8fvubrL*%6*55_lkw{t%H_C}cl7sLR7H{h-sj_^Eg| z^puiw`JKjh(IVJp1B@zuktTAS2ot|}&0^&eoEU<`tK5CEtKq2DK^hmPk2yc2Cg0Yg z%XjY^%rvrdizAWBCS6Vg zzr8@COtAAjSi>%NI>`mW`6Y1jh#m5b8=NerQ>hO$RM;?eBJ~rdx2ovTTZ@3ki=k;2 zMYWGn#g$CT2vcx!K)8V2XHtAQ=BE_Xp4RF?1~Je0W2fy{*i~4ce+7TGE&D*JPIOP@ zv^{e2xE|%n(@zacmWoRUg!jJJ^7Cfhr*h@0T^(<)5zhB4Uucz@`{iT_*%~(hRIMD9h(eZYqm{0Uy zH|d_cvU0}t9ZrwJ>Dntc*BSO>R1?JJs9jh>pZ#LfTDppnjx+8xu{hpb0@-a=N81(C zUPEt%snkswyc&-SS6jbHSql2enOtvhklt5t`+VIi>5*~w09!B-3s#$J5L6YlpwY+f zAZbo$cZZpg(3ke(jW1VW;Q^KIhMzc-ZWYJPe@h*U;&T3@h&XhDx5z`J$d96{FCrxy zKo*a6Z6eh&8+xtX(U9-cw`Vpz2Xi`&E+;ezjGhDcEM_lRg1AZ_zTcQz4_Ves{HuK= z>bGN4_k9a3-ver=b{;Mf`b$RN?L2IoLYzwSj(*_oqu96?RhmJ!tiV%sOQy`^mv7XM~p^G1Didk87i-|1VKvHq6D$S4{S@{ zhtY2qhDtl@MpKZ>sd6m^urv~>Jb+f0evoTRciW|3dV?xnT*h!G%E{t{Cn>t;lEvw= z=;*E=U5L6@YqMpscdP!MN%?XgS%)Ng*3>u8uug5o+gz|(HtW=Hj~Q|dU0FAAhFpn& zQRZ)%1Jd!=zclvh783zGS^v0$8qJfv2C(PJp4kmB%%H8*^rI9*&LLT zcUe7Wdqe-XZr_OhKkx*|&_7ZJKa3d!620rY(-=cy@Fq;RrFqi|F}KAm$cj*O(0J{J z8gkSUp{H)(i)(L@%BHpNM?Ba*x<+JXc#ydjr?4~HfGWCd4vkc9MLm+B21_dND_O~8 z0&{lA&~5(m54y|PU$_&lKAe{)W9&&7GfCEI%%GQ0b51X5Q`sxv#-1Z|DjWD3tf#++ Iz&#@KUmuV6w*UYD diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_action_decrease_menu.png deleted file mode 100644 index 4a0b46bc04756a11b6899f785cf05ba5cbacfdca..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSmpxq^Ln>~)y|Iz=uz>(;0J~8W zTY>WX_-cX1J3GGf8D3;HZByBMwE6@4g`dq!XR86V-~FVdQ&MBb@07Oqve*gdg diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_volume_mute.png b/app/src/main/res/drawable-xxxhdpi/ic_action_volume_mute.png index cedee07199a52d756022429dd0764c4be6c5fa30..e920eb89fe6d1f9ef601f5565583790f024a8ea1 100644 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawYCK&WLn>~)y|IzE!9n220o}Rh ze0`i6T2fm6^7{PP9vvDQdbjk31#Y;$sp1P0E0>5yzygOxroZei^; zbT|5q&oQ22Tx7i2_s1@l(dXa;1;g;FxiZajEe@J-+he zP~#Vjk8`UZ58$xz4&%wn2g<$jk>!8V_(%@p`%tjX_$A{ZdX(kF!NzwPALNS8+V;m% zc7gj?74+$GmJ8F3Z!z9!+?iqg-NyCgaKb5`G=7L-L_$$XfSCOT;|k+YfbpRLe9U;E z@s9~7*k-)Zc!G9;asVpcOO4+)J{=J2HyAH49^oQ2a8cstMyM6M)kz^NMXf*2_+=(= zqZ!8EYkVjc<0o^aKafZmpD~`xup$&V<3HSZUZC+oD1bNd=X^8hFzy~t#gang5X+5& z5{8PM^u5#gu!|JFkTP$zi?sh)vDfisceW1$6= zz~78ZTr@W*bO;b)1}N5StHb!?G%6Cn1uk9R$9v3S9U8|J-)ttuE>t$N@TlgBiD1x-hk`8ez!uGDIDG4IRRv zMDmC}!CW~&`{7%>KTE92dWh!E2V8Ag7kS3ni7s&OlHQWT_``-SqjIUv6 zsTFph6Wrq_%FJ6?g4UA<;QObydFPnK_w0Di(#KWR&wpkSzw}8iI>ocKNyZ;%R{s;@ zi2)99BENSiQ9@!i;8htvpSGh6Fp-_zrro2D zWXl-OUe48YTOjXa0yf%2|U4Y?l)p#Cm&8leh6kGysH@#f*uS zjN}Q%xyVJM<72VcSRbGx;I&^ED_{4fl%tRG>qj)nAl~?2HU6W@d#>i+bY!dZkP5dx z9JAhB0OQAvhhG0-8QHj>5I&bbGnS|X-kae7Q&>gZ<*Iiq<2%7I4aVmw-1e`a@keST z!QXdLx3i`B0ABp{E*h@fRS*a8A>e90tgId2S;liH{=^+%TY!|@$2{XI?tmj1PO!Lv zoFE?a*SPBQ5eNf+aZ!_NUaNP2em zV@n=yLQYUE=BF9|&&JPES#5a^fYJ{gx9tUU0AI>sBIrG?`q_Vfv>g3_e&*!&Ib*)h_SbqNR9Ndwj!Q|rkI=2BR?JRs)dCbUnx4z{ePP%FQ+1P-u;O{cVbfF`r+ zw>HHAmeU}W2A)x#oB)QuGGOJeVzX(k>tGAGpC#7at~o;-tt3L!Z`d-OoU&41ks@X9 zVneCX%cDZK^id|BJ8DSkBQ*XphNg}Vt4yVWc7F*RU@y1$Gg6v6FwhA!PSOFcW1iFK zDhtgCvcxSIe`yhn?~|vC+{8;3ip;GPeEL(W8T9cVPdEUyeOw%MQj_%bWKNK0(fDou z;&#Zpp_op|@m~e$0*0IuI6FnztI#k>2S8qPGs8x+P73>+;Br64u7eXl zX%2w$Wn&49?;YTyDaszI0?Z9Omf`?EGQQC@_o%qP0m z2v7)65~w6lWuVGH2|*HqBn3+fRx?P=pelc$+QE&*{8G1rH4xHR%rE^wh(^L1kNKq@ z2?I0~+E~ml^-!pfpBfAA;jwTX4C(QMAvzk?<441EIJCzPhx#N+$HRN{c({KEx*(#5 zFNpABimr(1(JNx&C7~{f>d{N0;ty2U#P#SkagFR8x+t=7S-ub#Mb-;l72D&`WzmAJ zix>2P5rWf4#wZ_f`p~GJhdwq=_2Z=q+yFv2d*J`CRRLQXJ+0J@R6P0<>qps ztO9@nxF|zB5;_PN@$JmiLqdT+7l=WLS+Uo_zhi7Fez^r+4>JG@U2XYTC_pGc>p1kH zh0W9h{2@>O8W5SDiiHz@9DLBJ1zcz#mg6ACGH%&fPJpjt&cNRd;Jc0wxQVj|&#+`v z`BwtKh{qYf;r2byQSE+!3tXh{4=~O@?e-nt4jlp&3IMcnU+toS&aAVEDD^OMhR)xG z%pu|vK^<07%CuI z!?T?fzn*jkPeBj_K@bE%5ClOG1VIo4K@bE%5QHwp{{V@(OeZP2*%$x-002ovPDHLk FV1gRQZ~OoN diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_all.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_all.png deleted file mode 100644 index 7104f04e43711e662755654254af3274a5b5735c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!o}Mm_Ar-gYUN;nEVBlch_{*GE zY}X-Gp}IyjpezH!f%xJU2PRIH2@Xt*4QHR;7xYkQWD(+EC^*L|1Y&O530Br{j;XEt V$TiCon?Qy#c)I$ztaD0e0ssx-BX|G+ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_message.png b/app/src/main/res/drawable-xxxhdpi/ic_message.png deleted file mode 100644 index 672e3e7530c02f373021672f7389175d5ea8a20a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 383 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7!06`b;uunK>+NlCzrzL+M?Su} zwR^!TnTgs8a*i@=7R=pBeFya(KFr+a;rE6ka_;&+$9J!JCjN7whu?KUCl1A#FM{^o zGktYMa=F;vZ?8Tn|F2l>u4<|JGBGQZ^Tw;lzRHt=MGe(Em#t@vnc+L{zHnwdTg++8 z^3(&XO&_e~`LThGC-s2Bdl5!upo16~GB{sI@iWW^F%x(<*q>mSBlV&59m8)|9*_{j zKb9YTbrTpFE=UN}2{JPjylaqWV7SHfhTjM%$-=I}z#wMi!Y;FjIWLKMQrSkv?WW@K zwT%9^j<7Cy`8NNRUj6UfIqjJ*-@RIYU;p{4pX_H(ZRAS`ua`Zr;h$7P>ffq{%)e0$ zxqq!13jazql>Rk3u&0hQA--NxV8K5j1(&~-4ikPAHyC{V+~DxFxFO){^Sa}#V0Zmz ZEnwkjnZ3HdS2zMB;OXk;vd$@?2>>vZnYsV~ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mute_white.png b/app/src/main/res/drawable-xxxhdpi/ic_mute_white.png index 41fd6b67b4e6df6bdfcbd5632aace5911b4ffbf0..f027da9154d281144f5af25d802961ca7c378470 100644 GIT binary patch literal 705 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 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_unlock_alt.png b/app/src/main/res/drawable-xxxhdpi/ic_unlock_alt.png index 98052c59e7b0961b6f5522a91b1199bee8faa545..50d79b4d75476b60e5e0a5cda26b4cc7bb4ac0db 100644 GIT binary patch literal 552 zcmV+@0@wYCP)(M}Q{KtkvNB7>eGXqTJzA^3qB6+tgh)>9R;L-bIIQQPejE2FnNr5zqXrY4%W@1dl)j9T&f}ub3znVuAA8?Cz zoFEr9s4VV>SG=MW9VmfI1c{c&i~y9tHG;;KI!PV0e0RPuLR*ZHxN^n?HK^>E@DUYk zS)Xp>5YLW`5+x`vmGT@7B$skhV)cDX<(;DgH6_l$%Djq1YEXgF(!S$8&8f66rD#A! zsdkb+_!nFD9u25vo1)^IePqi%qXBiS31+sHwR!=}t^7M0(BBFh1|3QluB|vKt1<2W=c(xYwAh#C9qqU$1 z)zw-HdeA_vwV(%?YOTcvg8HtYZhWAcE2tVDC?obAXAI+9_J-I7#|};*?xQ0k_MM(6 zj{o)1E;LVi1GE2Cd!Wm_8|}s}8D>f~x8ux7H%880tLqTy8DG;}mosoG)67 q@JiXYMWKAP5b@u27{s781^obAGAJm2yRnV{0000AtfWHps1{(rmmr>rDtel zY+`C=ZfRv>XYb_V?&;<2o;#bdh+b`+xH(ofBpXR_h0i_=fr_| zv&GZJF{I+w+uPp$!j3WwA8zXAJ{8Pd8KCVZ$2IjsfRt(PF_%uxV;r4FT)sSb&0X;^ zy5d_(P_N+BBNBNB9G@;=;S6|^8t4)tr=%N@k?HLnzE@&Sq}An{vOE4f-}Zm*+do#; z=kJC&)p%}tcJpne+UIpCI#OTH{}y-JBY&hgFt2s5A!uvkH*v8;vs?NR5!u0A} z?=H5K>vKIyJ-4h@R}@OfTCp^>bAR1x4(2OnGbD<1xBnAhKCvhA#Ejw>u0aeB9+(;z z-)m4mG3)AqSs(8#<@t8%RMC0X61JGKjkA zcHrt=mlv_Or*ZdH#BZFsG=hZo|-t!dZU&(#$g|W?~{D*7;-@b9w{+avb;l!-Ch8hNL zmg>l~hUpaxy2Jw-?l<}^6a7C+oLl77oQ9x1v-vmsHpNyX=&LW_u>N;o$5T$7L`L@a zx(E99u6f;1H#aMR-;QGg)4mtX2FbYwBI&Gu4!JYgG3*nZn;zG7bi=VphuIIPPjvlu zG+{#R&B<=OOFlBFE#p3LfWKqIbfwonf4qo4WTx_((^p!!uccR_Ib%2D{p05Ht=8LQ z8=~y;s?tj8ZLcnJ=TW%%XvLPle~V7tN{>IK=_0_eaHr+5bj^%*VdT78CbMAI--)NS zbJ9|d-79YiGo7-yMci%wMy6F#n_Frk|9_tUMfSz~l7CHsKDp_#^EnL|V!l3lSAI5Q z#x0KCUZvD0}Xsh;;i7J0h*xvXuS{ From 393d817f9ddd5f2580a3b68a32ce002175fbdafb Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 11:37:36 +0200 Subject: [PATCH 09/19] Changes some colors --- .../fr.gouv.etalab.mastodon/activities/MainActivity.java | 6 +++--- .../fr.gouv.etalab.mastodon/activities/MainActivity.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java index 2a96e9172..96701ed99 100644 --- a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -980,9 +980,9 @@ public class MainActivity extends AppCompatActivity changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon); changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon); changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text); }else { changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black); changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black); diff --git a/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java index fffd6d309..2c09122fa 100644 --- a/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java +++ b/app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java @@ -988,9 +988,9 @@ public class MainActivity extends AppCompatActivity changeDrawableColor(getApplicationContext(), R.drawable.ic_mail_outline,R.color.dark_icon); changeDrawableColor(getApplicationContext(), R.drawable.ic_retweet,R.color.dark_icon); changeDrawableColor(getApplicationContext(), R.drawable.ic_favorite_border,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_icon); - changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_icon); + changeDrawableColor(getApplicationContext(), R.drawable.ic_photo,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_remove_red_eye,R.color.dark_text); + changeDrawableColor(getApplicationContext(), R.drawable.ic_translate,R.color.dark_text); }else { changeDrawableColor(getApplicationContext(), R.drawable.ic_reply,R.color.black); changeDrawableColor(getApplicationContext(), R.drawable.ic_action_more,R.color.black); From 5d54bb3667192e62bcee56eabec657b0456e816e Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 11:41:05 +0200 Subject: [PATCH 10/19] Small fix for color --- .../fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java | 5 ----- 1 file changed, 5 deletions(-) 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 76bcc09f4..d29486af8 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 @@ -678,11 +678,6 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf holder.status_reblog_count.setCompoundDrawables(imgReblog, null, null, null); holder.status_pin.setImageDrawable(imgPinned); - if( theme == Helper.THEME_LIGHT) { - holder.status_show_more.setTextColor(ContextCompat.getColor(context, R.color.white)); - holder.status_spoiler_button.setTextColor(ContextCompat.getColor(context, R.color.white)); - } - boolean isOwner = status.getAccount().getId().equals(userId); // Pinning toots is only available on Mastodon 1._6_.0 instances. From 39c5a2b9e29554d667ba0a2b2302e2f0f49ef320 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 11:57:03 +0200 Subject: [PATCH 11/19] Removes some useless due to bad layout --- .../drawers/NotificationsListAdapter.java | 6 +- .../mastodon/drawers/StatusListAdapter.java | 2 +- app/src/main/res/layout/drawer_status.xml | 76 ++++++++++--------- 3 files changed, 45 insertions(+), 39 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 59d20ff0d..549f51d73 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -263,9 +263,9 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio changeDrawableColor(context, R.drawable.ic_mail_outline,R.color.dark_icon); changeDrawableColor(context, R.drawable.ic_retweet,R.color.dark_icon); changeDrawableColor(context, R.drawable.ic_favorite_border,R.color.dark_icon); - changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_icon); - changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_icon); - changeDrawableColor(context, R.drawable.ic_delete,R.color.dark_icon); + changeDrawableColor(context, R.drawable.ic_photo,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_remove_red_eye,R.color.dark_text); + changeDrawableColor(context, R.drawable.ic_delete,R.color.dark_text); }else { changeDrawableColor(context, R.drawable.ic_reply,R.color.black); changeDrawableColor(context, R.drawable.ic_action_more,R.color.black); 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 d29486af8..a59ba3300 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 @@ -310,7 +310,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf if( status.isNew()) holder.new_element.setVisibility(View.VISIBLE); else - holder.new_element.setVisibility(View.INVISIBLE); + holder.new_element.setVisibility(View.GONE); int iconSizePercent = sharedpreferences.getInt(Helper.SET_ICON_SIZE, 130); int textSizePercent = sharedpreferences.getInt(Helper.SET_TEXT_SIZE, 110); boolean trans_forced = sharedpreferences.getBoolean(Helper.SET_TRANS_FORCED, false); diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index e6a6f88b0..96239912f 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -38,59 +38,65 @@ android:layout_marginRight="5dp" android:orientation="horizontal" android:baselineAligned="false"> - + + + + + + - - - - + Date: Sun, 15 Oct 2017 12:00:00 +0200 Subject: [PATCH 12/19] Replaces the boost icon --- app/src/main/res/drawable-hdpi/ic_boost.png | Bin 744 -> 209 bytes .../main/res/drawable-hdpi/ic_boost_border.png | Bin 744 -> 209 bytes .../main/res/drawable-hdpi/ic_boost_header.png | Bin 744 -> 209 bytes .../drawable-hdpi/ic_boost_header_notif.png | Bin 744 -> 209 bytes app/src/main/res/drawable-ldpi/ic_boost.png | Bin 373 -> 243 bytes .../main/res/drawable-ldpi/ic_boost_border.png | Bin 373 -> 243 bytes .../main/res/drawable-ldpi/ic_boost_header.png | Bin 373 -> 243 bytes .../drawable-ldpi/ic_boost_header_notif.png | Bin 373 -> 243 bytes app/src/main/res/drawable-mdpi/ic_boost.png | Bin 461 -> 154 bytes .../main/res/drawable-mdpi/ic_boost_border.png | Bin 461 -> 154 bytes .../main/res/drawable-mdpi/ic_boost_header.png | Bin 461 -> 154 bytes .../drawable-mdpi/ic_boost_header_notif.png | Bin 461 -> 154 bytes app/src/main/res/drawable-xhdpi/ic_boost.png | Bin 933 -> 201 bytes .../res/drawable-xhdpi/ic_boost_border.png | Bin 933 -> 201 bytes .../res/drawable-xhdpi/ic_boost_header.png | Bin 933 -> 201 bytes .../drawable-xhdpi/ic_boost_header_notif.png | Bin 933 -> 201 bytes app/src/main/res/drawable-xxhdpi/ic_boost.png | Bin 1554 -> 268 bytes .../res/drawable-xxhdpi/ic_boost_border.png | Bin 1554 -> 268 bytes .../res/drawable-xxhdpi/ic_boost_header.png | Bin 1554 -> 268 bytes .../drawable-xxhdpi/ic_boost_header_notif.png | Bin 1554 -> 268 bytes app/src/main/res/drawable-xxxhdpi/ic_boost.png | Bin 1386 -> 249 bytes .../res/drawable-xxxhdpi/ic_boost_border.png | Bin 1386 -> 249 bytes .../res/drawable-xxxhdpi/ic_boost_header.png | Bin 1386 -> 249 bytes .../drawable-xxxhdpi/ic_boost_header_notif.png | Bin 1386 -> 249 bytes 24 files changed, 0 insertions(+), 0 deletions(-) diff --git a/app/src/main/res/drawable-hdpi/ic_boost.png b/app/src/main/res/drawable-hdpi/ic_boost.png index 51b10c9c1cab75781b07a0d804b60d031e3a4f3b..aabe84ac99a40e8e3592453514c5c752baf60c2b 100644 GIT binary patch delta 192 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 y@}m>mdM@G>wJVU7sY2E3o0L_oVil|CilG zta|u;2*PrWRcEl3Dh#$!2)0uI_NH#f&XhXJxk9Py5;lB{nKxtT$)b1W z?Ln-+M$ByuBKq>LpRDt){-!OR6CzMzo;s##%~ks7>o7Moo>a zK2)s~+CmGoT;lJ;In89lWs$R_m@~;gb2yyy&HU&4X3ot2TYsC)Dps+IRsJu<;c%1y zKd1x&V0Sv5>zh<*X=zD39*;IPHN63blF8(ojg5_4LAl4{ajZ*HE|<&J*49>*PN!eb zWHO`FGt^g7snqx26$p1gZi9HRXq}MIu-onPwS*4!s^Rr|OFBC{%OLYAq%MLv0i()85{`YUFac&5+sN($dlo zkx?+GVMY=Dg3x><5{caAcDr4xC1i(Bu%V$L!>B!g@z-eRJ?dWSK1R9U479ek_F=OR zn*(43%+`H+Q>%S1P@uD9>Tk+0rjDLQE(Z9erm;_Vc8u!h_yv=-4 zIyrSc0l5L9r)EW~CWP#aNDUr(3S+0hxJ+ox@GRHUGJ<9TyGFerF^$|5#E#e1)om$w zzOn4uiQ{@++>e3t1|fwh6(*;-9s)#Qknoz-pdxJN_+pGvW99H_*l|V|egMF?tgmXFRf%l0Ipx^jYq;El143h_v$X8J!sSx^EU@ z^yT4vVtjEdViqxrm_^JYW)ZW9S;Q=27Jo6>1b62VJ4636%MycqMjkd!&vHcIZ1gDq zD%CX+B@2|SF)=v=@1b8;HDael>tC`jB3akg)^6r}b6n10qVaL4`yH~k3kxA6hdvQ{ zXdul2Z;PC2*NPZzRpYU*l>TBIf=_V2s*n@3lM&d)3kM)|P>$hp92fBhLLs~-$A9vp zN{KznvpZHTGZ#imB!R~afk{o1ar*h9c(P!9-skfLbGcjv#UG7EH)7yk41Fs4ho&)J zh1@%#P^eP8U99AXBDF(ATczL6pPsq?fq_k~XiCUwI!Fc6s3kBzXnNJZB`jzrJw^&j@k-J_bOn)1iy+KIn zoF^sxBvDc@DT7!z91f|Go6s_fixInKq>)r@CMH#?N>Wy*AoQ}NvScACIQ$k;V)5F? zkorRjlZ%DoA@B(}XeMayL)t&U^==5=kB8Ex>FQ_R4w(m`l*8C&h}-q*|K6~VAdj0;1B|QEVG2@9%6qG>?LHP y@}m>mdM@G>wJVU7sY2E3o0L_oVil|CilG zta|u;2*PrWRcEl3Dh#$!2)0uI_NH#f&XhXJxk9Py5;lB{nKxtT$)b1W z?Ln-+M$ByuBKq>LpRDt){-!OR6CzMzo;s##%~ks7>o7Moo>a zK2)s~+CmGoT;lJ;In89lWs$R_m@~;gb2yyy&HU&4X3ot2TYsC)Dps+IRsJu<;c%1y zKd1x&V0Sv5>zh<*X=zD39*;IPHN63blF8(ojg5_4LAl4{ajZ*HE|<&J*49>*PN!eb zWHO`FGt^g7snqx26$p1gZi9HRXq}MIu-onPwS*4!s^Rr|OFBC{%OLYAq%MLv0i()85{`YUFac&5+sN($dlo zkx?+GVMY=Dg3x><5{caAcDr4xC1i(Bu%V$L!>B!g@z-eRJ?dWSK1R9U479ek_F=OR zn*(43%+`H+Q>%S1P@uD9>Tk+0rjDLQE(Z9erm;_Vc8u!h_yv=-4 zIyrSc0l5L9r)EW~CWP#aNDUr(3S+0hxJ+ox@GRHUGJ<9TyGFerF^$|5#E#e1)om$w zzOn4uiQ{@++>e3t1|fwh6(*;-9s)#Qknoz-pdxJN_+pGvW99H_*l|V|egMF?tgmXFRf%l0Ipx^jYq;El143h_v$X8J!sSx^EU@ z^yT4vVtjEdViqxrm_^JYW)ZW9S;Q=27Jo6>1b62VJ4636%MycqMjkd!&vHcIZ1gDq zD%CX+B@2|SF)=v=@1b8;HDael>tC`jB3akg)^6r}b6n10qVaL4`yH~k3kxA6hdvQ{ zXdul2Z;PC2*NPZzRpYU*l>TBIf=_V2s*n@3lM&d)3kM)|P>$hp92fBhLLs~-$A9vp zN{KznvpZHTGZ#imB!R~afk{o1ar*h9c(P!9-skfLbGcjv#UG7EH)7yk41Fs4ho&)J zh1@%#P^eP8U99AXBDF(ATczL6pPsq?fq_k~XiCUwI!Fc6s3kBzXnNJZB`jzrJw^&j@k-J_bOn)1iy+KIn zoF^sxBvDc@DT7!z91f|Go6s_fixInKq>)r@CMH#?N>Wy*AoQ}NvScACIQ$k;V)5F? zkorRjlZ%DoA@B(}XeMayL)t&U^==5=kB8Ex>FQ_R4w(m`l*8C&h}-q*|K6~VAdj0;1B|QEVG2@9%6qG>?LHP y@}m>mdM@G>wJVU7sY2E3o0L_oVil|CilG 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 Date: Sun, 15 Oct 2017 12:05:26 +0200 Subject: [PATCH 13/19] Changes some buttons --- .../mastodon/fragments/SettingsNotificationsFragment.java | 4 ---- app/src/main/res/layout-sw600dp/fragment_settings.xml | 1 + app/src/main/res/layout/fragment_settings.xml | 1 + app/src/main/res/layout/fragment_settings_notifications.xml | 2 ++ 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java index d4f3abd05..dff2dfd6a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java @@ -309,10 +309,6 @@ public class SettingsNotificationsFragment extends Fragment { } } - if( theme == Helper.THEME_LIGHT) { - settings_time_from.setTextColor(ContextCompat.getColor(context, R.color.white)); - settings_time_to.setTextColor(ContextCompat.getColor(context, R.color.white)); - } return rootView; } diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml index eccb06557..89ec78d3e 100644 --- a/app/src/main/res/layout-sw600dp/fragment_settings.xml +++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml @@ -267,6 +267,7 @@ android:padding="5dp" android:layout_width="40dp" android:layout_height="40dp" + style="@style/Base.Widget.AppCompat.Button.Colored" android:src="@drawable/ic_action_globe" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 5ff1b545c..2b463b89d 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -267,6 +267,7 @@ android:padding="5dp" android:layout_width="40dp" android:layout_height="40dp" + style="@style/Base.Widget.AppCompat.Button.Colored" android:src="@drawable/ic_action_globe" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/fragment_settings_notifications.xml b/app/src/main/res/layout/fragment_settings_notifications.xml index 2363efabd..ea2cc4ec1 100644 --- a/app/src/main/res/layout/fragment_settings_notifications.xml +++ b/app/src/main/res/layout/fragment_settings_notifications.xml @@ -135,6 +135,7 @@ android:layout_marginLeft="10dp" android:focusableInTouchMode="false" android:id="@+id/settings_time_from" + style="@style/Base.Widget.AppCompat.Button.Borderless.Colored" android:layout_width="wrap_content" android:layout_height="wrap_content" /> From f43a7ac0ac2734100d0c6575af5b1270fc9dc8b0 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 15:09:09 +0200 Subject: [PATCH 14/19] For tablets and with some improvements --- .../activities/ShowAccountActivity.java | 20 +- .../layout-sw600dp/activity_show_account.xml | 338 +++++++++--------- .../main/res/layout/activity_show_account.xml | 338 +++++++++--------- app/src/main/res/values-sw360dp/dimens.xml | 2 +- app/src/main/res/values-sw600dp/dimens.xml | 2 +- app/src/main/res/values/dimens.xml | 2 +- 6 files changed, 369 insertions(+), 333 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index c14fcdf5e..745992ee7 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -33,14 +33,17 @@ import android.support.annotation.RequiresApi; import android.support.design.widget.AppBarLayout; import android.support.design.widget.FloatingActionButton; import android.support.design.widget.TabLayout; +import android.support.transition.Visibility; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; import android.support.v4.content.ContextCompat; import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; +import android.support.v7.app.ActionBar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.PopupMenu; +import android.support.v7.widget.Toolbar; import android.text.SpannableString; import android.text.method.LinkMovementMethod; import android.util.Log; @@ -117,7 +120,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi private Relationship relationship; private boolean showMediaOnly, showPinned; private ImageView pp_actionBar; - private LinearLayout small_info; private ImageView header_edit_profile; private List pins; private String accountUrl; @@ -152,7 +154,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi Bundle b = getIntent().getExtras(); account_follow = (FloatingActionButton) findViewById(R.id.account_follow); account_follow_request = (TextView) findViewById(R.id.account_follow_request); - small_info = (LinearLayout) findViewById(R.id.small_info); header_edit_profile = (ImageView) findViewById(R.id.header_edit_profile); account_follow.setEnabled(false); if(b != null){ @@ -440,12 +441,15 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() { @Override public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) { - if (Math.abs(verticalOffset)-appBar.getTotalScrollRange() == 0) { - if( small_info.getVisibility() == View.GONE) - small_info.setVisibility(View.VISIBLE); - }else { - if( small_info.getVisibility() == View.VISIBLE) - small_info.setVisibility(View.GONE); + LinearLayout toolbarContent = findViewById(R.id.toolbar_content); + if( toolbarContent != null) { + if (Math.abs(verticalOffset) - appBar.getTotalScrollRange() == 0) { + if (toolbarContent.getVisibility() == View.GONE) + toolbarContent.setVisibility(View.VISIBLE); + } else { + if (toolbarContent.getVisibility() == View.VISIBLE) + toolbarContent.setVisibility(View.GONE); + } } if (maxScrollSize == 0) maxScrollSize = appBarLayout.getTotalScrollRange(); diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index d570c56ef..35be2a6b3 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -33,180 +33,197 @@ android:layout_width="500dp" android:layout_gravity="center_horizontal" android:id="@+id/collapsingToolbarLayout" - android:layout_height="@dimen/layout_height_header" + android:layout_height="wrap_content" android:fitsSystemWindows="true" app:expandedTitleMarginStart="48dp" app:expandedTitleMarginEnd="64dp" app:layout_scrollFlags="scroll|snap"> - - - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + - + > - - - - - - - - - - - - - + android:orientation="horizontal"> + + - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml index f7fb51f01..a3dd5b960 100644 --- a/app/src/main/res/layout/activity_show_account.xml +++ b/app/src/main/res/layout/activity_show_account.xml @@ -32,180 +32,197 @@ - - - + android:layout_height="wrap_content"> + + + + + + + + + + + + + + + + + + + + + + + + + + - + > - - - - - - - - - - - - - + android:orientation="horizontal"> + + - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml index 0361dec29..1a4bcd8cd 100644 --- a/app/src/main/res/values-sw360dp/dimens.xml +++ b/app/src/main/res/values-sw360dp/dimens.xml @@ -1,4 +1,4 @@ - 200dp + 180dp \ No newline at end of file diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml index 5f66420e5..6c1ad0603 100644 --- a/app/src/main/res/values-sw600dp/dimens.xml +++ b/app/src/main/res/values-sw600dp/dimens.xml @@ -6,5 +6,5 @@ 30dp 16dp true - 250dp + 220dp \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 022544fc1..756bd56f1 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -9,5 +9,5 @@ 2dp 20dp false - 200dp + 180dp From 2cba689990aa21a28f3787474c0b41b8b32446cb Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 15:39:43 +0200 Subject: [PATCH 15/19] Some improvements with show account activity --- .../etalab/mastodon/activities/ShowAccountActivity.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 745992ee7..457aaa19a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -456,15 +456,15 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi int percentage = (Math.abs(verticalOffset)) * 100 / maxScrollSize; - if (percentage >= 20 && avatarShown) { + if (percentage >= 40 && avatarShown) { avatarShown = false; account_pp.animate() .scaleY(0).scaleX(0) - .setDuration(200) + .setDuration(400) .start(); } - if (percentage <= 20 && !avatarShown) { + if (percentage <= 40 && !avatarShown) { avatarShown = true; account_pp.animate() .scaleY(1).scaleX(1) From b1370143a72ebead1339a8f46bd25b13e30dc849 Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 15:40:19 +0200 Subject: [PATCH 16/19] Some improvements with show account activity --- .../fragments/DisplayStatusFragment.java | 28 +------------------ app/src/main/res/layout/drawer_status.xml | 12 ++++---- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index 215db5a59..d7554fde4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -17,15 +17,11 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.os.AsyncTask; -import android.os.Build; import android.os.Bundle; -import android.os.Handler; import android.os.Parcelable; import android.support.v4.app.Fragment; -import android.support.v4.content.LocalBroadcastManager; import android.support.v4.view.ViewCompat; import android.support.v4.widget.SwipeRefreshLayout; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -34,10 +30,7 @@ import android.widget.ListView; import android.widget.RelativeLayout; import android.widget.Toast; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; import java.util.List; -import java.util.concurrent.TimeUnit; import fr.gouv.etalab.mastodon.activities.MainActivity; import fr.gouv.etalab.mastodon.asynctasks.RetrieveMissingFeedsAsyncTask; @@ -139,7 +132,7 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn if( !comesFromSearch){ //Hide account header when scrolling for ShowAccountActivity - if (hideHeader && Build.VERSION.SDK_INT >= 21) + if (hideHeader ) ViewCompat.setNestedScrollingEnabled(lv_status, true); lv_status.setOnScrollListener(new AbsListView.OnScrollListener() { @@ -149,25 +142,6 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn } public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) { - if (hideHeader && Build.VERSION.SDK_INT < 21) { - if(firstVisibleItem == 0 && Helper.listIsAtTop(lv_status)){ - Intent intent = new Intent(Helper.HEADER_ACCOUNT+instanceValue); - intent.putExtra("hide", false); - LocalBroadcastManager.getInstance(context).sendBroadcast(intent); - }else if (view.getId() == lv_status.getId() && totalItemCount > visibleItemCount) { - final int currentFirstVisibleItem = lv_status.getFirstVisiblePosition(); - if (currentFirstVisibleItem > lastFirstVisibleItem) { - Intent intent = new Intent(Helper.HEADER_ACCOUNT + instanceValue); - intent.putExtra("hide", true); - LocalBroadcastManager.getInstance(context).sendBroadcast(intent); - } else if (currentFirstVisibleItem < lastFirstVisibleItem) { - Intent intent = new Intent(Helper.HEADER_ACCOUNT + instanceValue); - intent.putExtra("hide", false); - LocalBroadcastManager.getInstance(context).sendBroadcast(intent); - } - lastFirstVisibleItem = currentFirstVisibleItem; - } - } if(firstVisibleItem + visibleItemCount == totalItemCount ) { if(!flag_loading ) { flag_loading = true; diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml index 96239912f..e6bbbded8 100644 --- a/app/src/main/res/layout/drawer_status.xml +++ b/app/src/main/res/layout/drawer_status.xml @@ -116,21 +116,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> Date: Sun, 15 Oct 2017 16:20:37 +0200 Subject: [PATCH 17/19] color changes --- app/src/main/res/layout/drawer_account_main_search.xml | 1 - app/src/main/res/layout/drawer_tag.xml | 1 - app/src/main/res/layout/nav_header_main.xml | 2 ++ 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/drawer_account_main_search.xml b/app/src/main/res/layout/drawer_account_main_search.xml index bb81baf1a..dfaa912cf 100644 --- a/app/src/main/res/layout/drawer_account_main_search.xml +++ b/app/src/main/res/layout/drawer_account_main_search.xml @@ -43,7 +43,6 @@ android:layout_gravity="center" android:gravity="center" android:text="@string/accounts" - android:textColor="?attr/colorPrimary" android:layout_width="match_parent" android:layout_height="wrap_content"/> Date: Sun, 15 Oct 2017 16:24:18 +0200 Subject: [PATCH 18/19] Fixes some actionbar text color --- app/src/main/res/layout/picture_actionbar.xml | 1 + app/src/main/res/layout/webview_actionbar.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/res/layout/picture_actionbar.xml b/app/src/main/res/layout/picture_actionbar.xml index 9e8a01d38..ee5f68ef5 100644 --- a/app/src/main/res/layout/picture_actionbar.xml +++ b/app/src/main/res/layout/picture_actionbar.xml @@ -24,6 +24,7 @@ android:layout_gravity="center_vertical" android:id="@+id/picture_actionbar" android:maxLines="1" + android:textColor="?attr/actionBarTextColor" android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="14sp" /> diff --git a/app/src/main/res/layout/webview_actionbar.xml b/app/src/main/res/layout/webview_actionbar.xml index b649d9196..49bcf9338 100644 --- a/app/src/main/res/layout/webview_actionbar.xml +++ b/app/src/main/res/layout/webview_actionbar.xml @@ -33,6 +33,7 @@ android:layout_gravity="center_vertical" android:id="@+id/webview_title" android:maxLines="1" + android:textColor="?attr/actionBarTextColor" android:layout_width="0dp" android:layout_height="wrap_content" android:textSize="12sp" From bd5f2c9fa7b0c0b9330fa03262b9c7cd927e5b8d Mon Sep 17 00:00:00 2001 From: tom79 Date: Sun, 15 Oct 2017 16:48:54 +0200 Subject: [PATCH 19/19] Prepares release 1.5.2 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 60ca554de..4b823804a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 26 - versionCode 61 - versionName "1.5.1" + versionCode 62 + versionName "1.5.2" } buildTypes { release {