From a205d072cad9caac954fb8ed9be3ceaf8ded6c31 Mon Sep 17 00:00:00 2001
From: stom79 <tschneider.ac@gmail.com>
Date: Fri, 8 Feb 2019 07:43:06 +0100
Subject: [PATCH] Some improvements

---
 .../drawers/AccountSearchDevAdapter.java      |  36 ++++++++++++------
 .../res/drawable-hdpi/ic_opencollective.png   | Bin 0 -> 1287 bytes
 .../res/drawable-ldpi/ic_opencollective.png   | Bin 0 -> 548 bytes
 .../res/drawable-mdpi/ic_opencollective.png   | Bin 0 -> 902 bytes
 .../res/drawable-xhdpi/ic_opencollective.png  | Bin 0 -> 2138 bytes
 .../res/drawable-xxhdpi/ic_opencollective.png | Bin 0 -> 2679 bytes
 .../drawable-xxxhdpi/ic_opencollective.png    | Bin 0 -> 4294 bytes
 .../main/res/menu/activity_main_drawer.xml    |   2 +-
 8 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_opencollective.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_opencollective.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_opencollective.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_opencollective.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_opencollective.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_opencollective.png

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java
index fd6c40e41..edadd93e3 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountSearchDevAdapter.java
@@ -102,7 +102,7 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
         }
         //Redraws icon for locked accounts
         final float scale = context.getResources().getDisplayMetrics().density;
-        if( account != null && account.isLocked()){
+        if( account.isLocked()){
             Drawable img = ContextCompat.getDrawable(context, R.drawable.ic_lock_outline);
             assert img != null;
             img.setBounds(0,0,(int) (20 * scale + 0.5f),(int) (20 * scale + 0.5f));
@@ -110,31 +110,38 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
         }else{
             holder.account_dn.setCompoundDrawables( null, null, null, null);
         }
-        if( account.isFollowing()){
-            holder.account_follow.hide();
-        }else{
-            holder.account_follow.show();
-        }
+
 
         if( !account.getSocial().contains("OPENCOLLECTIVE")) {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                assert account != null;
                 holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(), true));
                 holder.account_un.setText(String.format("@%s", account.getAcct()));
             } else {
-                assert account != null;
                 holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(), true));
                 holder.account_un.setText(String.format("@%s", account.getAcct()));
             }
+            if( account.isFollowing()){
+                holder.account_follow.hide();
+            }else{
+                holder.account_follow.show();
+            }
         }else{
+            holder.account_dn.setText(Helper.shortnameToUnicode(account.getDisplay_name(), true));
             holder.account_un.setText(account.getAcct());
             holder.account_follow.hide();
         }
         Helper.changeDrawableColor(context, R.drawable.ic_lock_outline,R.color.mastodonC4);
         //Profile picture
-        Glide.with(holder.account_pp.getContext())
-                .load(account.getAvatar())
-                .into(holder.account_pp);
+
+        if( account.getAvatar().startsWith("http")) {
+            Glide.with(holder.account_pp.getContext())
+                    .load(account.getAvatar())
+                    .into(holder.account_pp);
+        }else if(account.getSocial().contains("OPENCOLLECTIVE")){
+            Glide.with(holder.account_pp.getContext())
+                    .load(R.drawable.missing)
+                    .into(holder.account_pp);
+        }
 
 
         if( !account.getSocial().contains("OPENCOLLECTIVE")) {
@@ -156,6 +163,13 @@ public class AccountSearchDevAdapter extends BaseAdapter implements OnPostAction
                     context.startActivity(intent);
                 }
             });
+        }else{
+            holder.acccount_container.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                   Helper.openBrowser(context, account.getUrl());
+                }
+            });
         }
 
         return convertView;
diff --git a/app/src/main/res/drawable-hdpi/ic_opencollective.png b/app/src/main/res/drawable-hdpi/ic_opencollective.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a50d5d39cd9cc211b6bd77012d093874eba5c95
GIT binary patch
literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq000^Q000^Y1^@s6sY*=F000EeNkl<Zc-o~_
zdrVVj6u;=8E%rfy43Ni`iOdCE+>-sb%&@h{qfqX>mPakUE#)B<jkgap8Ws0U=0b;t
z@)!=4CA390jmFHBQY_n?%eG{RG0U<I!XQ49Wm;T#Sjf(I+tOPYgLXGL>Fxa<zwey$
zJHPW`*cuN>9nK}SMha{Y*U&%X6#XZmp&t?y{S&D*pHnoL3rLN5D;DX);qWklC{dIz
z*A$kj4tQ|Na39wg9s|H^8FlDsnflNIP9dY8!q^O<G5&?C4U;9xrjdMHn+I$8>jIIL
zYO_oB?*E{??#L9J+6Nmi!lsMpcZI?C;20dnr>HwJ@m86(K90lVtqKws$3>oG%PJbb
zfe=lzH^&1Tg3Tk(0yZB8MA6`-;qDtHs+?F3H)d6k{6b|;QANWoe@MbX2(8g8t85%s
z)EM2eD*Zrl)rmoc&gdzs+&2ZG`y0(6DdQcfTqofR6Q4nQZW0JEzCaZ28F(TtQR-V^
z!4uXA84naX^Z0I3XGlrQ$f#Cp#0laTMG1)`qH48C4BwuY;F|a3$^$=?mNo7Wijo+R
z)Xf<ikGHmEw|x9*eM)+!U<pV{P$cB!9vfs&jp+%TesDLgdKC^5kLJb4#|Ks<FTF!P
z;=z(R9RGjVc;m^_J-a&XLqDFs`t8Jt*51M(P7JW?>tNyoKyv_c2>`O<R*Uz)Je!0<
z?3lGX*9suk{vlt7-Q{cRyFSVcR_KmyCn&>1c24%xG>_%Uw6DNPV<IUH$Vt+N=RP0p
zun+sJwxPxLe&-^9J~-=e?!d@e)4?Fin51e=j|<2;J$S>5v<CS?5$Dv|&+57dZ$3gm
z$N<#aGkCKBBPgR2g(~PxF|aEoEi)a9@_AwFOPf#keDN!QECj&jIvlR+07T!zq1ppL
z^FZNY#I8`{*Z-h3y4reid;g6a?Y5zLCUiE)mBTfTp+aNjXBJ4{NDwCpqxI<7)R%>p
z3)e0JzzhNkfX%D~Qto#oBt{FA3_!O4=yqQS2!+ozjS(8dBp%W<2%X9O|3Y^Zh0bYZ
zht4+i3j+Fb85t&!3PewaZ5cp@u@LKAvz?bl>;PocgBW^)^hUadB!?eRg9z)0`}Uc>
zgFtU@5UA7Pe)P$euLum+nYM$(KUh|<<4~|WqbS%!OYdc8*MNIISg;*7*HpJ{G>4fW
zS2c|;m!RS*y&cwNMj}B1Q0$K^XSQ_>xJH@!0SU64zcvyQRlHhOUUzsZTvW}|Ky{l$
zzISI(CD;V<zb7M6<*`LIEj?qyNlWi*T@JUW_v-E6PPO&zVz&tq(E5D<m|oT<<^XW4
zfUIo-f}}HT0;rG7-zL7xk`m3wppAbY)+W+2H?+Ld`CN;oSCN{Y6*^rkwD8xVg%?%q
z^8~tRSmQ(b2W%Vz)o{Uq`jM6EOvA;M$0vb2Ob-K6-H{MlDUgT(<MV|mXPg!BjrCtj
zwiH!1ctB*m>uKdUyOpcy1pvGICSH@XCW+#>Tr5vfu|=lRzYC3Ua?Q&LYYfeWHGfF)
z8vTD>PS{}JnNWgL`EusEMK4{q;M4$&Hl~pWKJ<<7kKG66dZcnyfj}e{L{;e|Mdz05
xn&ARzxC{;QcXXFy?sM=C`MJW3!JM`B`3I|O+Y%x%X@dX&002ovPDHLkV1mIJWA*?5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-ldpi/ic_opencollective.png b/app/src/main/res/drawable-ldpi/ic_opencollective.png
new file mode 100644
index 0000000000000000000000000000000000000000..8912f10946c0f2394f64c848d07d182a4adb6be7
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000dD000dL1^@s6a_i)L0005&Nkl<Zc-muN
zKmwr&r3OKX#q$E=iyj5V7kvlf+rfz?69bcq^g}~KnUU2p@bU}ExCSOJ2udh=5g1?i
z1*qwBP(tx1Ap0{Ae+o<}y5#B~XCWji!2#Fg8kn#MXyPXz{_GQ(b=)U1bAoSVcA<Af
z#?+vs;@v>`Y*j4-@rIr`rmI%1VrB?VE;0n!0Mg(Vlr#}&t1KHkCpQpt@CXR<SOf-(
zs^}RC)b-3up1ErOg*j^u8ZrPCF9tcuH!ABWNCN{J5R#N+D48)!WY+pa+orGF`+3Id
z0}B}f6AE8}G<ip4_JM3*zyc&><+*$2ZRni7a^L4^EB8ES0BZOT^0ZG>c0N!OJ2p)`
zd;;tf7j8?Rx%$AzX)AXB0oeo$u_B;NSrc&DBnh->&iZbU^MLpvLr`MLLXh)(BD0TS
z^OLZ!6hlebERor3k8S~K_%v(vfvF6kslW(LD0&{8RPxy)B&7!wXVB1N=j9XTad1o!
zRn;)&Z|GYXIdk>F^E1{R)`!MZ{Cr?2egtXs0fwSaL`JV~WNr>Ha3%&NmhN&5O2`7n
zlUViSrG^dv|1-f-gtTi=(p->@pi~e9!r&B9^aacZrU+-h7)v1$3Cw^3MRagN@mye<
mdjeGa7pUnehz}A+PJ00Su+u9|{q4;F0000<MNUMnLSTZfaOkQ4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_opencollective.png b/app/src/main/res/drawable-mdpi/ic_opencollective.png
new file mode 100644
index 0000000000000000000000000000000000000000..da944c6b5d621832a2c8c99c9a538a70ba985c65
GIT binary patch
literal 902
zcmV;119|+3P)<h;3K|Lk000e1NJLTq000sI000sQ1^@s6R?d!B0009`Nkl<Zc-muN
zKn08-A~dnoJ~**-W?+2LwZOQ-&p`=AAA%A}&W0tG_5>%DnLyPsGGGI|{6bu=A<6bW
z(K&0vQp#TiCzgBz8uU9bzVHtiClvh(PAd5tno|D4J0f$Ti*KAV8#@Ohh9NEi@zKGF
z#g{{p%YFb|@DHfzC(wXTKm(ot4SWh@e+f=1{R!lM1<G%62}m>%5|v=*;p1n5d&e_4
z(J3gg_$m<p0ph<vjc-DeN;msNWp(&OWoP(AW@Y<CX7+|8m#+&<EL!do9A~AXWx(6e
zKi8mn@(vXShW`+k`9|ez2uUja0X68ZPefLOyJxf_FP|Vc8#^aE5OeVG3-LGwB}=)7
zq-d&W8**3o&NH39a_`#y`I{Dl!z(nU#3?kj;uXj{LGgued?GU%fL;}0W8=UGN1%a>
zLZXta6}|IRr>)$#aK@^ApXYBn{%ZQFy-o~4i6skxVe=gnCZQ>%8=XQU6xcX87;pg&
z9v+6+mUfX@>kqG(z3$MDS!)h{2jaO5z`(l?jhRp0ky-6L{DRyJ1b~Q?G*{pJO-(?r
zy$9moKo{L+fEoe{;3vR9O$UVuA%l2$`PnBd*qi_~<l(fHd;Uycx#tJMAYe3uVu&b%
z_ypJ|EZUX`G6;x)2JQU{^4eXP*MKhS1jY_QuZc;^aQDpJ*g9?H-VZ=;{hqOU-xY?S
zgyQ+Izz$9>-(>5bsKCn3iPI1+US5WR36n+VY&y1L&icbYX01K=ZSID{6M^}v#0iuo
zAkkm++B+h<9u)o93}Xc*31Kk_)|RP@lxD9zIBVwW10UyaJoaMdntkTb1ev`iB&iIV
zAWLooW3LY6GLSc+36h<gPmssbGfK)WI9^jt$B?UO;sX6yYYr^wo40WeECVyT2E^L~
zy?6=e#oxgo!{Q5H1M}QQpNPyhpUCV~5C&${uAro{wZJf4?i!L{rK)YfQ`f&ht8U^F
z1$apS&b0pVk-!{(5oo}7M5ZnJ2#kcsV4P6+37l!;ftfbGaEnV|93<27@?(|&?tuw*
zz<jp~YcT?3gT#Qv$Sa?S>?KY?Nh&}uGvSI9aDf$=SO_WD5{hpCUGf8r<BM*B!~zlu
c9IzE^0CQo4{&h37+W-In07*qoM6N<$f`mMmPXGV_

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_opencollective.png b/app/src/main/res/drawable-xhdpi/ic_opencollective.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce38fd844be105a1681120baa6a9279086616797
GIT binary patch
literal 2138
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
QR{#J207*qoM6N<$f~=q&Qvd(}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_opencollective.png b/app/src/main/res/drawable-xxhdpi/ic_opencollective.png
new file mode 100644
index 0000000000000000000000000000000000000000..eed27595734a4b470e6b15b3951dd3268ef5f1f9
GIT binary patch
literal 2679
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_opencollective.png b/app/src/main/res/drawable-xxxhdpi/ic_opencollective.png
new file mode 100644
index 0000000000000000000000000000000000000000..7010bbbf581b2bf266fe8316ca837168eeb9fad8
GIT binary patch
literal 4294
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index a1cd9c140..6aa28846b 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -161,7 +161,7 @@
                 <group android:checkableBehavior="single">
                     <item
                         android:id="@+id/nav_opencollective"
-                        android:icon="@drawable/ic_attach_money"
+                        android:icon="@drawable/ic_opencollective"
                         android:title="Open Collective" />
                     <item
                         android:id="@+id/nav_how_to"