From aab1616df0a597fa5fe1b4c11b9b0e9939fcbb6f Mon Sep 17 00:00:00 2001
From: Philipp Schaefer <trashzopf@gmail.com>
Date: Sat, 7 Dec 2013 13:36:39 +0100
Subject: [PATCH] show portal title in share activity

---
 mobile/res/drawable-hdpi/ic_action_place.png      | Bin 0 -> 555 bytes
 mobile/res/drawable-mdpi/ic_action_place.png      | Bin 0 -> 393 bytes
 mobile/res/drawable-xhdpi/ic_action_place.png     | Bin 0 -> 712 bytes
 mobile/res/drawable-xxhdpi/ic_action_place.png    | Bin 0 -> 958 bytes
 mobile/res/values/strings.xml                     |   4 ++--
 .../cradle/iitc_mobile/share/ShareActivity.java   |   5 ++++-
 6 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 mobile/res/drawable-hdpi/ic_action_place.png
 create mode 100644 mobile/res/drawable-mdpi/ic_action_place.png
 create mode 100644 mobile/res/drawable-xhdpi/ic_action_place.png
 create mode 100644 mobile/res/drawable-xxhdpi/ic_action_place.png

diff --git a/mobile/res/drawable-hdpi/ic_action_place.png b/mobile/res/drawable-hdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba994d8a7f0b5a8d113467b2ccabe2c1338e34b
GIT binary patch
literal 555
zcmV+`0@VG9P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz%}GQ-RCwC#Sj$nvFc7sEj<|qOfGHpa
z5bh**8b|@a9k}D%aRc1r++zxG11^9RkOItVW??+Rk!0<9t%Kgoj%NIk_U%tAB}qg?
zL_`DuihIJgZBrQLAlb>Q2BcO>9fKqQieJO92Dt@E4WI5n3Lx?w3;|Gn3B#jB@h-F%
zHbA1BoB%5S;`#d<m4qTHzkuPLXaf=nMNHQ1fUq%z)5<rwF9-`iSd`ZaRVXIqQk+ZN
z1KRDgGp}{YeEzL8=&g^Q()vdhzP%Ik04S6hl-J0+WfH?9H+cc(oJ)q#jnS=2)h^FY
zkVz7lIc#cuNuOA9K{Sa?Sob`88e^eL&;M-Ua1R#0!nWavRc2xN=O9*vFdX*G#$5UI
zM_wU>Ri$B6{@~l(QF5SUB;Y+4g}@ghft@%3ba};~d`&qUP|N5i0|C+;Bm%g*HpJwu
zCL_RL!6K9+Woc_K&RBm*U7M?wD5kJJ_pQVbFR)mjyO}Gbt<UO#0bXFU{uu4_tEBbW
z3E;j^TXx+tSON|fF1QzCCxBk)YtAZ%b8#?7$|CuH7ql5;p-~86ciC+**lwdmq01`B
t-r+_<{7~<TymJJNh=_=Y2oFC33;;1}iv&d@xGMkv002ovPDHLkV1lf0?aTlG

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-mdpi/ic_action_place.png b/mobile/res/drawable-mdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce055ca6e97199a2def7f8d25075aea5d2c9439b
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzD@jB_RCwBAU>F6XV1NN5sT%(O|8ESW
ze1X^=h<TBu4gm3TMn=Z7G;;vZ@-!foMnD<J5xvBk$wXz#K_C*UmU<xoG*AjiZ6YzY
zqJSZBi&`Oo%|{@^qkuRa%EoX2HA7%Ckdj0b_5=Fx8J-aO43u}IRtQL95&MjT4FkMX
zO@vrLG0^8QONwb)4gf7$2Bg$*NPouR+vmV2@TFD=;455k1@!@HM!{w>LU%LO901MF
zq!h8Yh$#a|O@v!WP`jK~b-`vFS(4<$M{YKpMI|*9Rmb>3fh6CPTM*5nmhZ_50X(5V
zvhOJ=iW{(q^^#){Sq^|UyO7I;vp}%}4D<w`Dj0~*K(QLR=CF`mivimLK#M^I4ll8#
n9xXzF7pY1f1*3p001#jR{6uGv{?qhX00000NkvXXu0mjf%Q=`4

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xhdpi/ic_action_place.png b/mobile/res/drawable-xhdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..49adf81316cd965213c1b71435370a7f05b3d0dc
GIT binary patch
literal 712
zcmV;(0yq7MP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!YDq*vRCwC#o6&K?FbswX$7=?l1F!%C
zlmXfSSb)B>09hcsHv^ObV1O_H1JnbM0n+zWKJ<{w<$_!+St-_?FLyv3`O|M%HZYw$
zxlJR02p|H803v`0AOeU0p4Dbj4{Dkwh06-s65G7<kqX*3v@^6aNs?N^uS96zYiud;
zHaqx(ZQLLd=D{!ElJ`WLYE~5)K)8%92f*Op;qvvs;3s(RC-yZS0O;_}W0yNF2va86
zZy9{uVc+T%kU1nfSIbocK$$Kkd^Yzz6@1qL8;51CfM&D%57q@+qH^prj_Ls5{G1a9
z{{c&zX}xxZ`%B`gVO6k#`%7(8U`71gzBBk+L2@g2sB?U&F$a*Gf`J|f-lIl!p%H*D
ztH%mpNz4^5ciy8U!c-#w>ZWC=NLr8iJit(sB}6*wiT=g`fbr$@%rgLLc7B5azjo>X
zmrc`ED*zWu9hT0nT{KRCQgG^?)d9dlMgoF?XI(Waz-wd%?C7&I-vCO7<?yd|QVRg5
z0jCO1z7I(`O5tKG@@D~n35w$s*KnK;b8Ut=RB+H<3b$2YBUO3qvKrb(YuyeP$`!>6
z03%jujy|^nd_|6PRpABTK?SVQmr%f?5iGc!V+Vi{G#aBXr2uQW#^{Ryz`DStiZc??
zmsEgjL~|*p!~mcQC|lVJ=PyD+DuAkjT+$&?0Ju{u?(Fx?zXj0R)%6`})Y8!p0sv2R
z_I+Taej6BC0e!`hEqaO&zJ&aCxGncAloPX154KBP(=>KjoJ%fyY5=rUkcM<1C;&`)
ubx0rL{{<p|2p|H803v`0;Cby=fB^u`2CKR^(6k!>0000<MNUMnLSTYF0xH7*

literal 0
HcmV?d00001

diff --git a/mobile/res/drawable-xxhdpi/ic_action_place.png b/mobile/res/drawable-xxhdpi/ic_action_place.png
new file mode 100644
index 0000000000000000000000000000000000000000..25623c77978465aeb0d75674a88bd721f2aa3bbb
GIT binary patch
literal 958
zcmV;v13~<WP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#U`a$lRCwC#oI!HhFcgMmrdtjG2S^Xl
z3*-PLdoBR`ru)!+I6%B_*%$BY9)Jt@0O0`co=P*1X(tISwrss$(*MnPvLP6~|NT!-
zlED~42qA<JLI@#*5JCtcWORxcKIG|in%X}f<hqe-`o>ES_G;v+i=t>LfM4KUz!&!V
z*z+xFd+n?c2MW+V@GHsqA#je^A_`G}1%4`lUygJO=ZG&zrKtc4{@ng~l=?m<M|<5{
z5gH2cC-^StPZuWEF>nr8BZyFB7<?!Z3gzItpnq2gK8y$xWdl4a2H(iNH<Ac>31A1k
z9I(yw;YK>Id`ggXJYSWw|0Q>}6g}tSfE8Hq9iOsrfYjR`o^MmhqN<UJ)RnSZk1Y!|
z7ib9JYX7}Q*Yf$&mcjrnt=l)+re1;;9{;=k*M5$)lWP&G54TCr0aAYYZZ%Zb^y~7P
zUC(>W#6`(Ez^CmjyOa{8&j>F--|T9;OpdbK*>`pOo&vn4PcZw=1GAI`m<B8ha}xm*
z6A5xk)@7wV3+&Rg1u)(AYkc;0eo=r6Wyogs;)?9|ImCB7r!0W)q4<Lh@ajLS><7<#
z1U)Z)7g&Jf5T!`6yf&}*f`;f|nv?|?>ah?P=q31P#4ACvm^vC<+R)DqX-vX3umHgy
z+?wPt$PWBWUI1(HI&`Oj>`tw9Km{25O5>45Edln-enkP~(4+wh{!vP!$;APV9gqNO
zj+`i49%VAFvJ*fiJcP-((s&>X!2u{`NVOqQ6+kji(*+0ZuPse7&p>qtstX_)sF8(g
zttXlT9Azf=#1ufm1upyd6hN;RFHr`K_B~;jm9qfZzd#u?+EWo_PT3FVfB-Il%6>!#
zI5xRtKcoO7c0@3p54r=!%G45ZppXKL-~!0(M|Qx_8M{FpB&-19f*}@X2jpMOLVr5C
z1anee0t|3oP$OqQ<U;I?g_+M!+T3X#H>Oa6&S%Gc4o-IH!H+_Kb1+S}r>a}@+8>nw
z;)1ec_O}#ZSP}MDF3#MdtBhq_F?~tz+Lm$~(}1E9;EKiB0pXxMWe1#H(58_6Q3@cf
z<?h17+e9}W6DcoF&RSV?wRAu@Hh-6;7=s@@)&)=Y`o>7;2`~@+6JvxBLI@#*5JCtc
ggb+gd@LPZZ00z4O$j^F$r~m)}07*qoM6N<$f)f{~B>(^b

literal 0
HcmV?d00001

diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml
index e6e934f0..8d1ed63c 100644
--- a/mobile/res/values/strings.xml
+++ b/mobile/res/values/strings.xml
@@ -150,9 +150,9 @@
     <string name="msg_copied">Copied to clipboard…</string>
     <string name="notice_do_not_show_again">Do not show again</string>
 
-    <string name="tab_map">Map</string>
+    <string name="tab_map">Locate</string>
     <string name="tab_share">Share</string>
-    <string name="tab_browser">Browser</string>
+    <string name="tab_browser">Intel</string>
 
     <string name="label_highlighter">Highlighter</string>
     <string name="label_base_layer">Base Layer</string>
diff --git a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
index 24523eeb..b09e57f9 100644
--- a/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
+++ b/mobile/src/com/cradle/iitc_mobile/share/ShareActivity.java
@@ -81,7 +81,7 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
         String geoUri = "geo:" + mLl;
         Intent geoIntent = new Intent(android.content.Intent.ACTION_VIEW, Uri.parse(geoUri));
         intents.add(geoIntent);
-        addTab(intents, R.string.tab_map, R.drawable.ic_action_map);
+        addTab(intents, R.string.tab_map, R.drawable.ic_action_place);
 
         Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(getUrl()));
         addTab(intent, R.string.tab_browser, R.drawable.ic_action_web_site);
@@ -122,6 +122,9 @@ public class ShareActivity extends FragmentActivity implements ActionBar.TabList
             setupShareIntent(intent.getStringExtra("shareString"));
         }
 
+        // show portal name as action bar title, if available
+        if (mTitle != getString(R.string.app_name)) actionBar.setTitle(mTitle);
+
         mViewPager = (ViewPager) findViewById(R.id.pager);
         mViewPager.setAdapter(mFragmentAdapter);