From 79569d36b0c442d0a2e3d52e086a3bded2aa7970 Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Mon, 5 Jan 2015 19:08:31 +0100
Subject: [PATCH] [iitcm] tweaks to fullscreen menu item

Use other icon for returning from fullscreen if shown as action. If shown in the action overflow, provide a chechbox to show current state.
---
 .../ic_action_return_from_full_screen.png        | Bin 0 -> 663 bytes
 .../ic_action_return_from_full_screen.png        | Bin 0 -> 477 bytes
 .../ic_action_return_from_full_screen.png        | Bin 0 -> 761 bytes
 .../ic_action_return_from_full_screen.png        | Bin 0 -> 1098 bytes
 mobile/res/menu/main.xml                         |   1 +
 mobile/res/values/strings.xml                    |   2 +-
 .../src/com/cradle/iitc_mobile/IITC_Mobile.java  |   7 +++++++
 .../src/com/cradle/iitc_mobile/IITC_WebView.java |   1 +
 8 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 mobile/res/drawable-hdpi/ic_action_return_from_full_screen.png
 create mode 100644 mobile/res/drawable-mdpi/ic_action_return_from_full_screen.png
 create mode 100644 mobile/res/drawable-xhdpi/ic_action_return_from_full_screen.png
 create mode 100644 mobile/res/drawable-xxhdpi/ic_action_return_from_full_screen.png

diff --git a/mobile/res/drawable-hdpi/ic_action_return_from_full_screen.png b/mobile/res/drawable-hdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9436e5248883f7ac916854d836fabea9cb64040
GIT binary patch
literal 663
zcmV;I0%-k-P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!IY~r8RCwC#SkZ06AP`Ng{4zj2fEREF
z$N*{A@Bqnw7f1%k0__6%Zw6=<@Br=r9v}tj5nYfC2Zq#DISDx?`0hQpI}VD)AD1E%
z$OJNhOdu0@7=i2cTB()_Oj7+)@mjV|v?>vJZ~X;R`HOt)WfN$}m?WU<7^1)6%)ETO
z8Qp_M<huab(TPxFEa0vBLsy`atsm&WGXh`=$i|{;gKvZdeB2;jE|;x*G!7CqfK+H>
zqW`Dg41rg+8rZhu3-nVL>E{t0Ukp=h@Lp-uu@WZGn$tHGy!SrfL84^#O#&aZ6T`sH
zG3<%iM`h;=K8OG^$ks8eV)jwlnkhC#DIrL<iS0raO|hv~poXu0Cs=_VZS4bS<>~)t
z`8XS?wFI~leqQ6hQjYKRZ=$Bf=GbB)Iyvq#s}dI_g)rXB6t-3=l*$?H2j2S>w(^N=
z#D&TM7ZS5`A(RI?cxgZ@c_nV6{(qO_)$fZAULDXO8(0tl)cPBM6plFP=<W^hIu)CG
z7lhOYvRx7vI+IhAO<HE3S!xKZP?{J(Hfb1Ox{-~_MY=IFSc+m!88`&2fNN$CzTiWP
zxe5n-n|w3-sO&>73W@;moKsoH>~mfeL?hsNq`YwYVvr~zfHwoXcT}9WfaTnF#JCr7
zg2(J?60IY+TjQHaB&L)ScV}3VVo#QDPBc~eTog>YRvB1@pab}C>AxA7<K=FMky%}@
x`yMIVMM8PVwaULZ&}0IcKqin0u;oX90RXhua^33mKY{=N002ovPDHLkV1ibyAbbD-

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-mdpi/ic_action_return_from_full_screen.png b/mobile/res/drawable-mdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5c80f00e7e0ccacf6bde2ae68b47603a5b27ce9
GIT binary patch
literal 477
zcmV<30V4j1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUze@R3^RCwC#R?CgTKnzVHt|=fC;08hg
zG>`_i0Jtv|Yyrz13ZRXo0BC>$pnw#R^&k(jtnqx3J#d&OS+U~y6Wil)QDkI%GNx$)
zq<Wz~EK%-}E^~rl`n@lRN>j$i3CTEq@jM8ZLH<tY*Q5{80U(}47VjXCIx;R{<ehM?
z*?Xh(q_8GKAPhAx#j@Op@2|v;!ucI(kKd0e87N3$PX;U+=CF0~DbBqCh#*|)TPr-z
zme+YO0K%64xhoqU`8H&{3LPbU>=ZF5JjZuv4y*ztFg5I0o$av%Q5M4wRCB{WQ1_Nc
zc?`;g(b`hCH?{<r=3kN>=>45&j4i<`q6y_xvlv7Zw!G_6*Y?JNdTG`iFp5V-%#CV)
zd-gexodbh1h@J{BPsXA-VDAIhpm``fA4I3nRbC}tMk6cF&BbfCXzD(oIXCyh4-Z7h
zjqFSG2gGDT+h(pry<_3<EhIH<QcnGUU8#H}q#*jGdm+r7aufs<85y69KLG{+CT|$U
T7s`1_00000NkvXXu0mjfTN}l!

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xhdpi/ic_action_return_from_full_screen.png b/mobile/res/drawable-xhdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..a773b342089106c0f5b0f7c9bcafd19a1ea0a41a
GIT binary patch
literal 761
zcmV<V0tWqwP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!n@L1LRCwC#THTGpFbqyBUKs!eC<F8s
zxB*z>cxM5`0=&ZlH$d;51=<1V0A&CM;8Mvwg^;$f^HUD_ldRJ<C9c0Zw(CR)27|$1
zFc=I5gMr2UeqT$;Cf2{6Qh6!mJOv4g{xUiVn)2u*81$1#NGQtXpPgaoCS{W(Ngdkw
z9{nx$Qh$M&FZHN=F6G$g3GH>8w=@)2M)bGXVLc&5zJLq7X@MaD{y$2wSteP}9An0J
zUU&&c0J!%CLxN)b96^9ShpqAGC72M`p=#9710AGnmHTe;0Y69PKCAaj`Ihn(!gw+P
z2og+Q^f5ATiF_2N;G0qjuv`u%19Qq)2;-dya3Enx91D_mod_V3upo{FsX3epP)Imf
z-kuT1R2+O2TwVx(fVhpg1h&3P@6?m=m~7y~0|u+kXarDGq5R#_=2{FATs>d~g-Rvm
zium2aApi={)$06#XCPzd82pMJuULXRFTpT9zvp0peoaRO5x)j$E6K{|*JUCiK@!t_
z3$#+}hCmUNfuUD9-UtSR!3d0)L9ojRHbJl*zr}d2SpY+GrTf!$ck~o@>PdrN$~;1;
zFB%}G@!fQtIU2iG49yS~VP$zOH|P`!DHWv5Vk!@~h{u)}rjj##;$kYvZaHlxD}||D
zAybh<aP5EF5UGh{Z_^NIMhtuVhDePJj&Iixxe~|TrXkW0$6l);;;=DNQN}`%kOnsX
zqy;vcAgABI7laMjU<4qHZ};j?T8gxZ+_jeK3W3~^4MqUc_`*;p*b?xN=PA3=p*&!P
zG2T!t*%I(n<RC~uHA#IQkue${;A?Zp3xn(bBf-}pB`OJUFspo(lVZ`&>S-iQdRA~6
r<--2p6@$TGFc=I5gTZ*huK)u81gQRI%bw>700000NkvXXu0mjf1bavy

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xxhdpi/ic_action_return_from_full_screen.png b/mobile/res/drawable-xxhdpi/ic_action_return_from_full_screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..cda85087b25abedbe97624baf8b3e180d4808929
GIT binary patch
literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#>`6pHRCwC#oXv6DFc5`Fj;|_!EI<t?
z1vqy(1-Jp1A^DyL)Id@|e0K_v8c+dZ0W3fPGN4V%1OWoO;KK918IJq|g3x<h{46CD
z1poj5000000000000000$d~K&x>v_T=I!6--1wt89x`t~n+YXD!&mC%r#dz_|9URV
z@=q?}tC#J~pI=n__o59j;vdwpwiFR>f<=5b6Uv0*i#Nd`K8p!eV(~S*Ib(vUJEmQf
z;%l~)V?sq#kFWT%Oz4eOuT6mXjX8HkC_cFfR0jMGIA_v?o2aS->aWeYlO_a+-*XaU
zfa%kpsZ1E@(l!Bg_vctmh!CG_9HWW=G7~K0Nys=bJm-@M62vDpfWm}{!F(N1=U5&8
zO^_l!%R<cDUHXpR1)SPi`uk43@$WO+@M?*iE-<24rq30J0TGc<dvqruT~KUYY-<-5
z10qeZ-O(G4vP+83Y5;=?4O7`gSM96@5Svglm0dJt!fpVe32UaZi;17i03s7obwNp!
zg~<#s{54ZesS(hcHWpvbfWacGj;N!dDB~DA4lx;6kp|36SH}*nu><frr3qC=;%hcU
zWyF|JWhB1uDwayLBqmfDiSIkOQeThNgpxbNOj@8R-XD-O5h6L0auZ27-&xQ_9p}Mo
ztFC#;)&R$Br8a%`%9yftiKoQ)=BW4Rae4hTt1|+hjj^XCbhul}0CQJeijhZqQ&FS;
zXA|ot377nC{_^OkaXjB$5obaH000000MJuRk7;O=(|alfiafRe>;I;CaxBCS=GPAk
zF#YpVt6iz7h_Muea}hO_iZIdf>ZsyF3c{?!7h55h3*XIi;ZDXSkD5D1@%!(JQKpB_
zo@GMQ5q&h?58lVwbbB3#PMn{N(+z&|6phk=miT&X;<FmSWP*<nmt4eWH-N!}6Hyrv
z;wLeH*o2lSN<@gCd>U#7=3k++AlK8d!F7%i20x|}KUo9}xR02Eo|(!HsfRP5FJ(Z)
zw`M{H*O-BLmvV25DiiTjML=>Bs!YV6JHMw`3nVe2%0&E>T~JaJ%1p%fo&gcegvQA0
zOL`IFcZ75Mj<9=Ti-by$_%G`CVHrR}231=<j|Jhj3Ze{%5nu1YGqGZ(FyL*4OTD*+
z2m@lpccd+1yP!|$1t}&}lEj}dAtb?evWYLr1gZ$wP>F9bA!Oie3y;KFgb5^{L8aU?
zPK&vv5dWs$RcLZ-&bc$Am~7uT>Rl6kOkmmmF=1Cq+J26GL#Ip-E54@*a<{GYFhRWd
z4imCz|C<RZw*KWbA?NlFO~|wH?<Qp1egFUf000000000000000p!g@i0MAE`psveT
Q;s5{u07*qoM6N<$g2n6P&Hw-a

literal 0
HcmV?d00001

diff --git a/mobile/res/menu/main.xml b/mobile/res/menu/main.xml
index 28edf143..2a98c18f 100644
--- a/mobile/res/menu/main.xml
+++ b/mobile/res/menu/main.xml
@@ -22,6 +22,7 @@
         android:title="@string/menu_layer_chooser"/>
     <item
         android:id="@+id/toggle_fullscreen"
+        android:checkable="true"
         android:icon="@drawable/ic_action_full_screen"
         android:orderInCategory="110"
         android:showAsAction="ifRoom"
diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index a644d466..b89ee6af 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -205,7 +205,7 @@
     </string-array>
 
     <string name="menu_reload">Reload IITC</string>
-    <string name="menu_toggle_fullscreen">Toggle fullscreen</string>
+    <string name="menu_toggle_fullscreen">Fullscreen</string>
     <string name="menu_layer_chooser">Layer Chooser</string>
     <string name="menu_locate">Get Location</string>
     <string name="menu_clear_cookies">Clear Cookies</string>
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
index 9653dbc5..447f0fda 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_Mobile.java
@@ -535,6 +535,13 @@ public class IITC_Mobile extends Activity
                     item.setVisible(true);
                     break;
 
+                case R.id.toggle_fullscreen:
+                    item.setChecked(mIitcWebView.isInFullscreen());
+                    item.setIcon(mIitcWebView.isInFullscreen()
+                            ? R.drawable.ic_action_return_from_full_screen
+                            : R.drawable.ic_action_full_screen);
+                    break;
+
                 case R.id.locate:
                     item.setVisible(enabled && visible);
                     item.setEnabled(!mIsLoading);
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
index 95615f3c..e64b4ad6 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_WebView.java
@@ -221,6 +221,7 @@ public class IITC_WebView extends WebView {
             loadUrl("javascript: $('#updatestatus').show();");
         }
         mIitc.getWindow().setAttributes(attrs);
+        mIitc.invalidateOptionsMenu();
     }
 
     void updateFullscreenStatus() {