From c4b23551fbf20ee399a0d7554134ad4dc1092832 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 8 Aug 2017 18:15:37 +0200
Subject: [PATCH 1/4] Cleans some code to prepare changes

---
 .../mastodon/activities/TootActivity.java       |  8 ++------
 .../mastodon/fragments/SettingsFragment.java    | 17 +----------------
 .../fr/gouv/etalab/mastodon/helper/Helper.java  |  1 -
 .../res/layout-sw600dp/fragment_settings.xml    |  6 ------
 app/src/main/res/layout/fragment_settings.xml   |  6 ------
 5 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 1f4e858a2..d5b7c6283 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -1078,12 +1078,8 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
         else
             setTitle(R.string.toot_title_reply);
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
-        boolean show_reply = sharedpreferences.getBoolean(Helper.SET_SHOW_REPLY, false);
-        if( show_reply ){
-            toot_reply_content_container.setVisibility(View.VISIBLE);
-        }else {
-            toot_reply_content_container.setVisibility(View.GONE);
-        }
+
+
         String content = tootReply.getContent();
         if(tootReply.getReblog() != null)
             content = tootReply.getReblog().getContent();
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
index 0804bdc89..26810de9d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java
@@ -45,7 +45,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import fr.gouv.etalab.mastodon.activities.MainActivity;
-import fr.gouv.etalab.mastodon.activities.TootActivity;
 import fr.gouv.etalab.mastodon.client.Entities.Account;
 import fr.gouv.etalab.mastodon.helper.Helper;
 import fr.gouv.etalab.mastodon.sqlite.AccountDAO;
@@ -56,8 +55,6 @@ import static android.app.Activity.RESULT_OK;
 import static fr.gouv.etalab.mastodon.helper.Helper.CHANGE_THEME_INTENT;
 import static fr.gouv.etalab.mastodon.helper.Helper.INTENT_ACTION;
 import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
-import static fr.gouv.etalab.mastodon.helper.Helper.loadPPInActionBar;
-import static fr.gouv.etalab.mastodon.helper.Helper.updateHeaderAccountInfo;
 
 
 /**
@@ -79,21 +76,9 @@ public class SettingsFragment extends Fragment {
         final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
 
 
-        boolean show_reply = sharedpreferences.getBoolean(Helper.SET_SHOW_REPLY, false);
+
         boolean auto_store = sharedpreferences.getBoolean(Helper.SET_AUTO_STORE, true);
 
-        final CheckBox set_show_reply = (CheckBox) rootView.findViewById(R.id.set_show_reply);
-        set_show_reply.setChecked(show_reply);
-
-        set_show_reply.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                SharedPreferences.Editor editor = sharedpreferences.edit();
-                editor.putBoolean(Helper.SET_SHOW_REPLY, set_show_reply.isChecked());
-                editor.apply();
-            }
-        });
-
         final CheckBox set_auto_store = (CheckBox) rootView.findViewById(R.id.set_auto_store);
         set_auto_store.setChecked(auto_store);
         set_auto_store.setOnClickListener(new View.OnClickListener() {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index a3d15e609..3f34dfcb2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -199,7 +199,6 @@ public class Helper {
     public static final String SET_WIFI_ONLY = "set_wifi_only";
     public static final String SET_NOTIF_HOMETIMELINE = "set_notif_hometimeline";
     public static final String SET_NOTIF_SILENT = "set_notif_silent";
-    public static final String SET_SHOW_REPLY = "set_show_reply";
     public static final String SET_SHOW_ERROR_MESSAGES = "set_show_error_messages";
     public static final String SET_EMBEDDED_BROWSER = "set_embedded_browser";
     public static final String SET_JAVASCRIPT = "set_javascript";
diff --git a/app/src/main/res/layout-sw600dp/fragment_settings.xml b/app/src/main/res/layout-sw600dp/fragment_settings.xml
index ed1e601d7..49ff79910 100644
--- a/app/src/main/res/layout-sw600dp/fragment_settings.xml
+++ b/app/src/main/res/layout-sw600dp/fragment_settings.xml
@@ -46,12 +46,6 @@
             android:text="@string/set_show_error_messages"
             android:layout_height="wrap_content" />
 
-        <CheckBox
-            android:layout_marginTop="10dp"
-            android:id="@+id/set_show_reply"
-            android:layout_width="wrap_content"
-            android:text="@string/set_display_reply"
-            android:layout_height="wrap_content" />
 
         <CheckBox
             android:layout_marginTop="10dp"
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index 750291ad7..0073b7015 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -46,12 +46,6 @@
             android:text="@string/set_show_error_messages"
             android:layout_height="wrap_content" />
 
-        <CheckBox
-            android:layout_marginTop="10dp"
-            android:id="@+id/set_show_reply"
-            android:layout_width="wrap_content"
-            android:text="@string/set_display_reply"
-            android:layout_height="wrap_content" />
 
         <CheckBox
             android:layout_marginTop="10dp"

From 9caedd55bfacbd15e052982152a51ce6ab6c57bb Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 8 Aug 2017 18:24:18 +0200
Subject: [PATCH 2/4] New layouts for replies

---
 .../mastodon/activities/TootActivity.java     |  10 +++---
 .../res/drawable-hdpi/ic_action_eye_open.png  | Bin 0 -> 741 bytes
 .../res/drawable-ldpi/ic_action_eye_open.png  | Bin 0 -> 383 bytes
 .../res/drawable-mdpi/ic_action_eye_open.png  | Bin 0 -> 491 bytes
 .../res/drawable-xhdpi/ic_action_eye_open.png | Bin 0 -> 811 bytes
 .../drawable-xxhdpi/ic_action_eye_open.png    | Bin 0 -> 1483 bytes
 .../drawable-xxxhdpi/ic_action_eye_open.png   | Bin 0 -> 4218 bytes
 .../main/res/layout-sw600dp/activity_toot.xml |  30 ++++++------------
 app/src/main/res/layout/activity_toot.xml     |  28 +++++-----------
 9 files changed, 22 insertions(+), 46 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_action_eye_open.png
 create mode 100644 app/src/main/res/drawable-ldpi/ic_action_eye_open.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_action_eye_open.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_eye_open.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_eye_open.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_eye_open.png

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index d5b7c6283..38c1a5f41 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -134,8 +134,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
     private Button toot_it;
     private AutoCompleteTextView toot_content;
     private EditText toot_cw_content;
-    private TextView toot_reply_content;
-    private RelativeLayout toot_reply_content_container;
+    private LinearLayout toot_reply_content_container;
     private BroadcastReceiver search_validate;
     private Status tootReply = null;
     private String sharedContent, sharedSubject;
@@ -209,8 +208,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
         toot_picture_container = (LinearLayout) findViewById(R.id.toot_picture_container);
         toot_content = (AutoCompleteTextView) findViewById(R.id.toot_content);
         toot_cw_content = (EditText) findViewById(R.id.toot_cw_content);
-        toot_reply_content = (TextView) findViewById(R.id.toot_reply_content);
-        toot_reply_content_container = (RelativeLayout) findViewById(R.id.toot_reply_content_container);
+        toot_reply_content_container = (LinearLayout) findViewById(R.id.toot_reply_content_container);
         picture_scrollview = (HorizontalScrollView) findViewById(R.id.picture_scrollview);
         toot_sensitive = (CheckBox) findViewById(R.id.toot_sensitive);
         //search_small_container = (LinearLayout) findViewById(R.id.search_small_container);
@@ -1083,11 +1081,13 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
         String content = tootReply.getContent();
         if(tootReply.getReblog() != null)
             content = tootReply.getReblog().getContent();
+        //TODO: fill the content here
+        /*
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
             toot_reply_content.setText(Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY));
         else
             //noinspection deprecation
-            toot_reply_content.setText(Html.fromHtml(content));
+            toot_reply_content.setText(Html.fromHtml(content));*/
         switch (tootReply.getVisibility()){
             case "public":
                 visibility = "public";
diff --git a/app/src/main/res/drawable-hdpi/ic_action_eye_open.png b/app/src/main/res/drawable-hdpi/ic_action_eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..5822f5f978c1b3ea05a15bdb66e575fa9ed3164a
GIT binary patch
literal 741
zcmV<B0vi2^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00084Nkl<Zc-rll
zOGs8h6vw|FSQaQQ0$sQ<g#tmSY!jlOlqChyV-X}41ihfZ*Q!DgC0hiF1riZ_1yNY5
zaM6nbg@PW^CVEg(K@kPD2(!oSf8Yq0!<l>M>gS_41HZ+0XYS1W@0{0ssUQea|1v2P
zU;<2l2`~XBzyz286JP>}Vo(qEf#cvbI1f&OX0QuXfhBWAKrYw|E`oP~e;WtGpbJ#Y
zhJXUl4Za4MY4`c$=1;eP63`FE92@!VvDv6G&%hp#m1zNG;EH4MZ{RZ6$+j*Vol+XS
z;NPD>EjR`qIfRfoHi5;N5O9QTR<@g96IjIK%E3=%OxR&t`1xSySs`cxAC)y8b6}X1
z0CLc)%A~g)j(1KOyIG7OF<-cEh3H!fTKR<J32sj+U^RFpCVI&s&^6IhMZh{SW&s%G
zzDCD9B&0(z*It)z$Oq+$lah_+L~MQ@_@M|$i*fa#zU~;)s0JUzeAjs`r+^&s<w?i^
z&uB2>aL6If6=@-Iw`aJ%Bj#(063`$9_aq2sXA{Q$QqOtG$v=nQd&{P%3ZUb;k<ff5
zSQ(KYWV`0M`5F<O{($vyK9J82D;;>1$AZlsn<u+o7BdfJ<aWi8kNQR-3ZVny<uQ&9
zaf>%blo+?zB%<D@NOw;OrCTSH$POz>>^tZKMKN}Jh%3=SF50$e5hV1*w}A(WXv)^h
zr;>@+f;Y;<zrZC=({e$j!hXeMC)$}%rk_$RlnoAo*N%mrfK&XH^J4NvDWA?jC@afi
zkLs>9(@~8s<f3gP#!;!jd(O5@CiD=zS865cWBpw5&d7ykBe<J^y8t=p2~JwGa-}Tc
zOnbreRyNMrxf5*Q+GkE(>hrkLtOPqatk$tj7bd-|*uN4czyz286JP>NfC(@G|G9v_
Xm*h(IowtGj00000NkvXXu0mjfm6%O4

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-ldpi/ic_action_eye_open.png b/app/src/main/res/drawable-ldpi/ic_action_eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..e441b78546f9422c82e05ec0de246e4204b523d8
GIT binary patch
literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003-Nkl<Zc-rmM
zPbdUo7{~D;O4<v#C@I@go0F1@1Gl{?IZ4{$=zx+?E=rVg*mc;0k|?!WwR_PfM=1xz
z3FX4oL5chy->Ki$+uLN3-P25cYJ1;#_V?^F?~dcTu2V`*5D)~EJfI1En87BFu!{u@
zqW!M{ok-)uEq)!NAC*4|XvTpGKXHf=+-fa@VO(My8+g*5x7PbzKn!<y#wyyhK4f$o
z*4iAl^tlcbYT_N!egQF!;|d*C7jYvXg&v$^-@30JS>3l}2P|qMfhw!87WY20pYoac
z0N!wd3NxS@+bZ-<O4KTxv>td?HI6Z+HSL}1^!YyIF}&yjXLOnhdl7ZmWvn$~1rPf2
zb<`9)rY%U~QAO9tVHu;C#}3Z$s%E@j)cxB(S_5XWhYQWNaNQuU?xX+ps_<ssics*f
d3j)d;@CB9z5}}=uR@MLj002ovPDHLkV1iKXthfLG

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_action_eye_open.png b/app/src/main/res/drawable-mdpi/ic_action_eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..53a32c4973bb236884a2a9f559cfa6305abcffd1
GIT binary patch
literal 491
zcmV<H0Tlj;P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800059Nkl<Zc-rlj
z%`1dK9LLwYvNxh#2T?A2@&`Cj9B^4}4k8D|Nw%cq#KFal$mXRKM|T&8wPnjYxyVTo
zDY8+U*F3&c->qNM?33MAQZx1GX=c8^dA>Wp-^{Zf$8kJ=iN_kS2CM;VAj?2MXaxg&
z`hVL%6IcX0AmNx>g7Zq(oC^bapcCwBFZxPjKp)=+A&{Sqfgm^+i`{?)&;bs_cod9q
z?3DBK;96)dK-W(V6oXk2d<6zU5$F5F+&w7acsY2XR`m-(Ke!b7h|n7iRD(T=Kf#0{
zAflN|ZEqQP0;`%{86O89j5z`|CIiLHnQFH#MKq`7c?GnC4fdDQ#5Ibvs8p5e1_I!n
zf*F^>2|4bq$EBdB#qKtkQZOVI+5%N+7K)~Md5rUVOa<5!x>2_x42pAp#|rmq8ZS>o
zlDZ`Ox=z)_FjK19v*|RLwyPE#3dfIN3RG%3Rq1tn>c4mrJcu<^-s>~D2MRzp15@n{
zoPc#O#xoz_Q}x%tF?ba*XQ0<$GNY@w4QxA^wHQxFPCrII&;r6>3B-9r#@P>Z-e><0
hSOeC8HSn(td;_18ku-!p-7f$D002ovPDHLkV1lWE(XIdh

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_eye_open.png b/app/src/main/res/drawable-xhdpi/ic_action_eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..97dcfee5ffed72b6ab244e674b11aceafb762aa1
GIT binary patch
literal 811
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVEW|g;uunK>+MW$k5EU6<M{&L
zE}SsZUf3Gp_~2M9x45Gtr>@bGMeKS<d`~Mh9r8`+R@!)IldETvYisucF~J=iTt2r%
zF1q$ia#++JG40#CAM!t14nI6IXJ+v^+t`=(A8y~VHoiae{@l-JA3w7>fBNtFCmIb*
zxKL2KZ3dgWqxud$wgbh94tB4nSe?C;c8)88JL+Jl!Ly_K$(P($e~G-pbn1y?`<_En
z6*~jNe3)Jxa5Z?D8m^|Ac6YzX2EIEi^}6!ErXOagxBgPCow=_dcY{z#<9tE>Z_Ia?
z*&P=<9x$okn0M-ct>mA$neWOEm~-#En^3xt^$mk?8~abLUkCIyxZKiVJ3Q;xcE{HB
z|D!(m?5k!zRa>jkY5QQZ;=lCHxw{&EKG>r8VM|TC<fX9d@3!*jytz8-?@|5Mn)OSz
zxId9Gb@sj_w1Lg$63Z{XbFMzNch}cnyYQ^>N@e<r%}jHcf@l4k-!N+llhgrr--ft}
z$yxi)OgM9k_wBo1uR`6AM5w;6j|g0U`rHntz6`m4+!hIzd$&n0d%0j)?<v{G`>LvS
zl1-&PUFHmD<ehbJHOtn6iU)H#Puy!~`s%IH`OAB<vyExATz1miZK46J_u5Mq2whS-
z&J&%tvF|>6`@up>aTf2b$v&zdd(v80Y!no@_9LpP_t<F`>wW#4kLK~eeD8J5SV8@L
z{GCgp%5je*C#3NO=rHIf@%#(zarW1;R5%-&Fs*lA?mFL}%x0FyJW543++`23^g0pE
zQ^#_}`parF7jdqQ{2Oj^`gPu2I*os~z?>;BWpx%WaNcaow^(G$$=$IV<}P>}>5%$5
zxo`Q#rwOYA9{%WFo%%U9ES+)s<poyLzMWq1Y-vUI;$OFT@=h39f4-bB=Ql&?oV`5X
zte<iHFWTcj?f%82o%|j}%2W97{Mpv<*2(+9F^l&bl2YoFk61h2<N93B_|N#re>P1V
d$?Tbt@v9_Xsg#iLJYXhZ@O1TaS?83{1ORxxaby4h

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_eye_open.png b/app/src/main/res/drawable-xxhdpi/ic_action_eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..333a693772c173640a1facfd8c8095187b9a03cf
GIT binary patch
literal 1483
zcmV;+1vL7JP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h000G&Nkl<Zc-rlo
zYlu}<6vuT&ORxq)93Q2HC732!lht4uJ&;n%B0nUdRv0;se$aHL=1W*e^g^i*X;G5Q
zhp3=z%CaP*@L42D4<!sEdyF&Sq+<`AarfWM3NDv>&sqDNz3)9U^WX5}GI!2iXP^DQ
zckR8_+IN64W&kN4oCFF$0SE=40E7Zi073yM0HFXBfKUJmKqvqOAQXTC5DGv62nC=3
zgaS|iLIEfMp#T(s^kV^rf^nc0%#zn}@;(Ld#6++ZYy|IuUEnb2G|{b7uG=O3Hj15z
z6reZ*!4+T`cncgeVcIdVzfA5ous;h>3Fd;gLAxnWYnS`amGSfo0mgte;Hb$~`xQI^
z#`Z-4D!?4j0=i7LTQ~Rs+*!(RMMyWZ82oH{XZr;#0fTy@0C#}zQcggpr-@8!=Mb3J
zTLicce4gTAe+18g8^9({0$7)F4Ok1lO<`v*xG}2&jFBCMYdZ_}fhI61$KKrzi)S6U
z5>$g*!TJJgO<j)d%fKV@LFrB?=%rZ_U=iqWe2DEbDWeP68?D@$ZUYw-8B-1TBj?(`
zz=Q(V4F?a%2BF*0tu6HxOC;?$0&H=d_z%S$MA`jV8B|rr*qM{p=W8%H;`&JvsGW6q
zo=@c4UvdHLqSWR%&{~Dv8l}C*mE+u<*Kf9>&lK>E!?SgW7buAU72;#HZHFwVTKi8a
z?ao%(doi!yCWo<HC9X-^UW@sLr50eQgUi_oZb~qiFO~LdmG;&Y*xS2~$-2ysl;ip|
zVqHolz$oyQVgRQ=eTv1YRr#RxN_#B@BHg5c)qUW&Vr&OpcS&&<j8#Un*58g#;S0}k
zSO7m$erWzI(D$MgW4usyUvaHXGOnow7zTcbx!J$qF%P+uO2@6>Loq4t_looz>0#?w
zr--nRYLk0WK7Ws5J2>5AQ1ZKj09}&7%y%glOPo=xkFO-#WN<{`j)o-_U~P<X8`fXq
zIV|6qFt5K&b|H41IvsKCVb9~Omg-wndo_swLyGv%+`LFtfV@ak;0)&r0mgi;1enFz
z>A0Y=*gw9AG5TPDhnWyqfDp;FyJFUZgAzYE3orwmiFu%B<BTWZ<v^3aCBWo2Dt2!7
zq}c`CuXwN)%|hcqRe&N+yX3BXjqyD2y5hc#KH`8z#f^S*NDpY3=~;k#J&x^qS<K_w
zI-iknlQKwp1)T5cK{t4s{5L!<w$CVIm31!J0PO(ggMSn^|49lXKF$lR0DmW(cwYgc
z<yvJmtxM_z!Lp&#js6^uO<+y+@bH&AB<XT<|C2r3d%V;LH0=bqtrYbDThiO_P;zYc
z5U>rBwdjzdfc~gSf0DtbD_&CU0{?H{yX1a+6l4ZV8sLnBJ6P|ddSrUec`g7A;AweX
zVEml_v;otTMt_pRt_ROc;98cN@H9oTF5gGmB-yM0@k5%m<`(c~Od6xmS~nvLMfoA}
zDR4bua71=jBg-`LwjjUS^c;n8Z5t#O$ke%@DKR;bsI<mbnT)GVxFdlTQggOPQr;K0
z=-PHD4i%LBWZccl>RD8g+eX(br7oLPkV@&lQruogiZOiyZV&Zs4CPnnD<ekDLT5{r
z2jp}`v$(tlDatg+-_7#>19E-0hkM(U$imR;RY*T;%Z!Utek01!Y#i~hM8AFJ_W?DM
z={%XyN$-?Y%Cu5%2ui*Cu(_fo4#8aLwqI(zRi;c^;d1W5ZS=U@^c?JME763v$^Dk6
ziC+7P0Qn2IJ)c=GK~bxx32zm9^<qCWKhDdV0L9MsOqKe8O*gEPD%@r%#P5^W&GP;#
zxo)QP8<pW_<1ghY0HFXBfKUJmKmj-j6o3K{3P1q}1)u<g0#E=#0Vn{W02F{w017}T
l00kfvfC3N-KmkYy{sU(kHuBefqFn$0002ovPDHLkV1g;wvfBUv

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_eye_open.png b/app/src/main/res/drawable-xxxhdpi/ic_action_eye_open.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc6087386fe09b9fcd7796f7ad114089d97e45ed
GIT binary patch
literal 4218
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
BKZyVU

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index d29c9a5b2..935e84315 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -40,41 +40,29 @@
             android:hint="@string/toot_cw_placeholder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-        <RelativeLayout
+        <LinearLayout
             android:id="@+id/toot_reply_content_container"
             android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
             >
             <TextView
                 android:id="@+id/toot_reply_content_title"
                 android:text="@string/toot_reply_content_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <TextView
-                android:layout_below="@+id/toot_reply_content_title"
-                android:id="@+id/toot_reply_content"
-                android:layout_marginTop="10dp"
-                android:gravity="top|start"
-                android:textStyle="italic"
-                android:autoLink="web"
-                android:textSize="12sp"
-                android:layout_marginEnd="40dp"
-                android:layout_marginRight="40dp"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
+                android:layout_gravity="center_vertical"
                 android:layout_height="wrap_content" />
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/toot_close_reply"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
+                android:layout_marginStart="30dp"
+                android:layout_marginLeft="30dp"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:layout_gravity="center"
+                android:layout_gravity="center_vertical|end"
                 app:fabSize="mini"
-                android:layout_margin="5dp"
-                app:srcCompat="@drawable/ic_close" />
-        </RelativeLayout>
+                app:srcCompat="@drawable/ic_action_eye_open" />
+        </LinearLayout>
         <AutoCompleteTextView
             android:layout_marginTop="10dp"
             android:id="@+id/toot_content"
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 013882f1b..cf6bffbf1 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -40,41 +40,29 @@
             android:hint="@string/toot_cw_placeholder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-        <RelativeLayout
+        <LinearLayout
             android:id="@+id/toot_reply_content_container"
             android:visibility="gone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:orientation="horizontal"
             >
             <TextView
                 android:id="@+id/toot_reply_content_title"
                 android:text="@string/toot_reply_content_title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-            <TextView
-                android:layout_below="@+id/toot_reply_content_title"
-                android:id="@+id/toot_reply_content"
-                android:layout_marginTop="10dp"
-                android:gravity="top|start"
-                android:textStyle="italic"
-                android:autoLink="web"
-                android:textSize="12sp"
-                android:layout_marginEnd="40dp"
-                android:layout_marginRight="40dp"
-                android:layout_width="match_parent"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_gravity="center_vertical"
                 android:layout_height="wrap_content" />
             <android.support.design.widget.FloatingActionButton
                 android:id="@+id/toot_close_reply"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentRight="true"
-                android:layout_alignParentEnd="true"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
-                android:layout_gravity="center"
+                android:layout_gravity="center_vertical|end"
                 app:fabSize="mini"
                 android:layout_margin="5dp"
-                app:srcCompat="@drawable/ic_close" />
-        </RelativeLayout>
+                app:srcCompat="@drawable/ic_action_eye_open" />
+        </LinearLayout>
         <AutoCompleteTextView
             android:layout_marginTop="10dp"
             android:id="@+id/toot_content"

From a2607eec602f72d525bc8443bbc38e8c9fe15783 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 8 Aug 2017 18:43:59 +0200
Subject: [PATCH 3/4] Adds some codes to display the alert dialog

---
 .../mastodon/activities/TootActivity.java     | 55 ++++++++++---------
 .../main/res/layout-sw600dp/activity_toot.xml |  2 +-
 app/src/main/res/layout/activity_toot.xml     |  2 +-
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 38c1a5f41..372a1cdb1 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -314,21 +314,6 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
 
         boolean isAccountPrivate = account.isLocked();
 
-        FloatingActionButton ic_close = (FloatingActionButton) findViewById(R.id.toot_close_reply);
-
-        /*toot_close_accounts.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                manageShowUsers(searchAction.CLOSE, true);
-            }
-        });
-*/
-        ic_close.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                toot_reply_content_container.setVisibility(View.GONE);
-            }
-        });
 
         if(isAccountPrivate){
             visibility = "private";
@@ -1078,16 +1063,36 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
         String userId = sharedpreferences.getString(Helper.PREF_KEY_ID, null);
 
 
-        String content = tootReply.getContent();
-        if(tootReply.getReblog() != null)
-            content = tootReply.getReblog().getContent();
-        //TODO: fill the content here
-        /*
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
-            toot_reply_content.setText(Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY));
-        else
-            //noinspection deprecation
-            toot_reply_content.setText(Html.fromHtml(content));*/
+        FloatingActionButton ic_show = (FloatingActionButton) findViewById(R.id.toot_show_reply);
+
+        ic_show.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+
+                AlertDialog.Builder alert = new AlertDialog.Builder(TootActivity.this);
+                alert.setTitle(R.string.toot_reply_content_title);
+                final TextView input = new TextView(TootActivity.this);
+                //Set the padding
+                input.setPadding(30, 30, 30, 30);
+                alert.setView(input);
+                String content = tootReply.getContent();
+                if(tootReply.getReblog() != null)
+                    content = tootReply.getReblog().getContent();
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+                    input.setText(Html.fromHtml(content, Html.FROM_HTML_MODE_LEGACY));
+                else
+                    //noinspection deprecation
+                    input.setText(Html.fromHtml(content));
+                alert.setPositiveButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int whichButton) {
+                        dialog.dismiss();
+                    }
+                });
+                alert.show();
+            }
+        });
+        toot_reply_content_container.setVisibility(View.VISIBLE);
         switch (tootReply.getVisibility()){
             case "public":
                 visibility = "public";
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 935e84315..2b7ce2ddf 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -54,7 +54,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_height="wrap_content" />
             <android.support.design.widget.FloatingActionButton
-                android:id="@+id/toot_close_reply"
+                android:id="@+id/toot_show_reply"
                 android:layout_marginStart="30dp"
                 android:layout_marginLeft="30dp"
                 android:layout_width="30dp"
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index cf6bffbf1..9039872f1 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -55,7 +55,7 @@
                 android:layout_gravity="center_vertical"
                 android:layout_height="wrap_content" />
             <android.support.design.widget.FloatingActionButton
-                android:id="@+id/toot_close_reply"
+                android:id="@+id/toot_show_reply"
                 android:layout_width="30dp"
                 android:layout_height="30dp"
                 android:layout_gravity="center_vertical|end"

From 1666c7ba1362d3540986902d23fc3481bb97b54b Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Tue, 8 Aug 2017 18:48:33 +0200
Subject: [PATCH 4/4] Adds some translations

---
 .../java/fr/gouv/etalab/mastodon/activities/TootActivity.java   | 2 +-
 app/src/main/res/layout-sw600dp/activity_toot.xml               | 2 +-
 app/src/main/res/layout/activity_toot.xml                       | 2 +-
 app/src/main/res/values-fr/strings.xml                          | 1 +
 app/src/main/res/values/strings.xml                             | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 372a1cdb1..e60ebd8f1 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -1084,7 +1084,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
                 else
                     //noinspection deprecation
                     input.setText(Html.fromHtml(content));
-                alert.setPositiveButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                alert.setPositiveButton(R.string.close, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
                         dialog.dismiss();
                     }
diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 2b7ce2ddf..c80316f7f 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -49,7 +49,7 @@
             >
             <TextView
                 android:id="@+id/toot_reply_content_title"
-                android:text="@string/toot_reply_content_title"
+                android:text="@string/show_reply"
                 android:layout_width="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:layout_height="wrap_content" />
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 9039872f1..097999d84 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -49,7 +49,7 @@
             >
             <TextView
                 android:id="@+id/toot_reply_content_title"
-                android:text="@string/toot_reply_content_title"
+                android:text="@string/show_reply"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index e20faefeb..6d6e09830 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -170,6 +170,7 @@
     <string name="no_draft">Aucun brouillon !</string>
     <string name="choose_toot">Choisissez un pouet</string>
     <string name="remove_draft">Supprimer le brouillon ?</string>
+    <string name="show_reply">Cliquer sur le boutton pour afficher le pouet d\'origine</string>
     <!-- Instance -->
     <string name="instance_no_description">Aucune description !</string>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 345349bf2..4bfe30937 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -174,6 +174,7 @@
     <string name="no_draft">No draft!</string>
     <string name="choose_toot">Choose a toot</string>
     <string name="remove_draft">Remove draft?</string>
+    <string name="show_reply">Click on the button to display the original toot</string>
     <!-- Instance -->
     <string name="instance_no_description">No description available!</string>