From 63d2f44e9ab3cbf3928bd1d23556521364ceca92 Mon Sep 17 00:00:00 2001 From: barry Date: Wed, 29 Jul 2015 10:33:25 +0100 Subject: [PATCH] A couple of changes Included corrected Cyprus flag asset Made a new option to not show the dialing code in the dialog (default is shown). --- .../countrypicker/CountryListAdapter.java | 10 ++++++---- .../countrypicker/CountryPickerDialog.java | 14 ++++++++++++-- src/main/res/mipmap-hdpi/cy_flag.png | Bin 786 -> 1948 bytes src/main/res/mipmap-mdpi/cy_flag.png | Bin 522 -> 1258 bytes src/main/res/mipmap-xhdpi/cy_flag.png | Bin 1057 -> 2631 bytes src/main/res/mipmap-xxhdpi/cy_flag.png | Bin 1629 -> 4225 bytes src/main/res/mipmap-xxxhdpi/cy_flag.png | Bin 2437 -> 5913 bytes 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/heetch/countrypicker/CountryListAdapter.java b/src/main/java/com/heetch/countrypicker/CountryListAdapter.java index 9b76fc0..cc93e17 100644 --- a/src/main/java/com/heetch/countrypicker/CountryListAdapter.java +++ b/src/main/java/com/heetch/countrypicker/CountryListAdapter.java @@ -20,10 +20,12 @@ public class CountryListAdapter extends BaseAdapter { private static final String TAG = CountryListAdapter.class.getSimpleName(); private LayoutInflater inflater; private List countries; + private boolean showDialingCode; - public CountryListAdapter(Context context, List countries) { + public CountryListAdapter(Context context, List countries, boolean showDialingCode) { mContext = context; this.countries = countries; + this.showDialingCode = showDialingCode; inflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } @@ -50,7 +52,7 @@ public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { item = new Item(); - itemView = inflater.inflate(R.layout.item_country, null); + itemView = inflater.inflate(R.layout.item_country, parent, false); item.setIcon((ImageView) itemView.findViewById(R.id.icon)); item.setName((TextView) itemView.findViewById(R.id.name)); itemView.setTag(item); @@ -59,8 +61,8 @@ public View getView(int position, View convertView, ViewGroup parent) { } item.getName().setText(new Locale(mContext.getResources().getConfiguration().locale.getLanguage(), - country.getIsoCode()).getDisplayCountry() + - " (+" + country.getDialingCode() + ")"); + country.getIsoCode()).getDisplayCountry() + (showDialingCode ? + " (+" + country.getDialingCode() + ")" : "")); // Load drawable dynamically from country code String drawableName = country.getIsoCode().toLowerCase(Locale.ENGLISH) + "_flag"; diff --git a/src/main/java/com/heetch/countrypicker/CountryPickerDialog.java b/src/main/java/com/heetch/countrypicker/CountryPickerDialog.java index 228f11e..7664fa1 100644 --- a/src/main/java/com/heetch/countrypicker/CountryPickerDialog.java +++ b/src/main/java/com/heetch/countrypicker/CountryPickerDialog.java @@ -25,6 +25,15 @@ public class CountryPickerDialog extends AppCompatDialog { private CountryPickerCallbacks callbacks; private ListView listview; private String headingCountryCode; + private boolean showDialingCode; + + public CountryPickerDialog(Context context, CountryPickerCallbacks callbacks) { + this(context, callbacks, null, true); + } + + public CountryPickerDialog(Context context, CountryPickerCallbacks callbacks, @Nullable String headingCountryCode) { + this(context, callbacks, headingCountryCode, true); + } /** * You can set the heading country in headingCountryCode to show @@ -34,10 +43,11 @@ public class CountryPickerDialog extends AppCompatDialog { * @param headingCountryCode */ public CountryPickerDialog(Context context, CountryPickerCallbacks callbacks, - @Nullable String headingCountryCode) { + @Nullable String headingCountryCode, boolean showDialingCode) { super(context); this.callbacks = callbacks; this.headingCountryCode = headingCountryCode; + this.showDialingCode = showDialingCode; countries = Utils.parseCountries(Utils.getCountriesJSON(this.getContext())); Collections.sort(countries, new Comparator() { @Override @@ -57,7 +67,7 @@ protected void onCreate(Bundle savedInstanceState) { ViewCompat.setElevation(getWindow().getDecorView(), 3); listview = (ListView) findViewById(R.id.country_picker_listview); - CountryListAdapter adapter = new CountryListAdapter(this.getContext(), countries); + CountryListAdapter adapter = new CountryListAdapter(this.getContext(), countries, showDialingCode); listview.setAdapter(adapter); listview.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override diff --git a/src/main/res/mipmap-hdpi/cy_flag.png b/src/main/res/mipmap-hdpi/cy_flag.png index 825ef601beb323f73768f5e9e7103e5c91ed127e..df688b25d167c32ba168b9f7b4508a231fd9f73e 100644 GIT binary patch delta 1935 zcmV;A2XOe32AmI&BYyw{XF*Lt006O%3;baP0000WV@Og>004R>004l5008;`004mK z004C`008P>0026e000+ooVrmw00006VoOIv00000008+zyMF)x010qNS#tmY3labT z3lag+-G2N400#g`L_t(|+U=TqY+KbGfWLF@y^ifTP8KIklYg`cfwuHTpU|vgYd2tQ zQ(M@W22%^u9%6rN(^Pd63{7a$1QRRT7?s$B`e3wlf0QK93bwVZYo`vDhHhPG+9Yif zTB6cN95-=dC-(KdXMec#L5y4yKZR_Z)+RgM)*EgM)*EgM))Z zt`Q$@P)a=l)PLtYu{?252(kXkhE#%DfZOt&X`Xmn2(jeK2ASfZ-h5}7N5=GBjwj0h z6ON!XID*pP2ugz^C=HIFG&q9N;0Q{CBPb0y7Nm0C!QsPOFoSL5K3~sevUYrk!2^#| zwD@84lDV0W9~&YO?jd$^FVT+IF)wt3ZBp^jo==7#>3{MQZr;Ga{tZ-r{}8Uq#S@Mh z4<2LW_-@Q#Go#&qW#m*C%?+-qDU>Y#1-|*;olyLo3IcFVzL98q5AQ#JD~0p#q4+aT zp!=$jou04czkde>m6=(wnXn*bn_$Ng zdf`>=iGP9fXucwZ?z!9+>Lk|NgE1K}Vfa70h<5Bk^AzE#T!K+H8)1~9`2rYavjKrU ze1=G86K3B#C@X@BMNx?`c3ffhfpmkr#)b4&QhN7uc&4w&=mnjypy7XSV5DaUlO8yD zsqOrZRYcq0z$pC`h4X(v@zQk&!^>dvudrjF`G0kA33L}I)5MAl5jnCKW$i^-Aaszf zix9RVW%WnbM!!PGm^{S{Eq}o% z1M|XJf;%54+P)dRq>kwEeHZ~9)a7+LVHgM_IT9|R6iOwM-wO#sOMcb_)=(U42!sKX z9)D=SGyQ8Bmy%IIT5%1^g!ea11Eq+a2~se{00bz7UIg)TCyDi*L@$vbC8#vhy$}dt zjA=`RO^iSlfqQ?AyS5&^czRalWJHjV1xPO>LVX~>2pAV{cajp64O*cAAC#zcay|+x zfl4R>tG42Q5)nrjMSR{u^77>Pq z*{_IpY|oXOWd9}_z&&LdzD1wK45^GxB0>u6n28lO!L~rtkZwWf&p*ZtwSRI1A$7{` zZ9=-ij+iMnlExuNgT!zg>C$lDFb^wYV-3VnrXq4|h_f%u8-Fd!xgbEg%kbB)A%7kO zl`ug}%#syNAf(2m)d!gT?N&;^^d!|Jn5Lew;W%OCB z`^fmy-GBN+oB89h zSFZjM!;Npjay&C`#yj)lJv(h}-^owk{B2f-%e9cv8l+InEUn|vxuZ07y}|8Oi>UAh z5W1I&hxVhCjU5|A78IwA)jM>S_E0w$Mh00}J`1HLJULzmf|SCex$(OS+1%Dh!-?HI zJooE-erj^@N(hO#201NfkALu|&es?i4O8o{!sjX^VJC2DM%r_)Ye7;-s(q8#*!D6H z&RWHSid*=@;caw;dRSaBmqn9iq07`iIS?D-onR+j1Mkrn4Y6*~ci7ka77Zu%aL-M5 zltvgWn5cwIg=-u*-_eTub?8oo~&}?qb-rkQG4!!TmG7%%+vk5{mY7G}O(; z*6rL1h#=B4&s^bMcKQ&7a2NFP!NDhtc`(Y`0C^;c0}K9e8LUrnvQI^SL{ zk+m9>ian>^q@%x!PggDEm(9P&2A)~|D4n5q@fsfPs>$tQSbqw})S#RS`hcVTU7Q|1 zhb}dIhLM+(aM#v#C*z%=FrrUA)sI5;>sI5;>sI82oP0qfmZ Vpwd!O%K!iX00>D%PDHLkV1o0*l|cXi delta 763 zcmV50VCuBYy(fNklZCwN1q?u|G>q=;CTfkNs=T=NAOX z6OcBmwTKSKT@DO<6Ch7Oi;IdXXMKGqXJ?%P|87Hd`?>Gaqnx z_=f=LEhgqF8ymZn`fXAQXz}AWJ^dd0`@ag1-XbH**?-XRf^&0D0n)ps)YN+R^?eZ_ zy+uS^Vr^|ZXJ+OF$lI)zLSEZb!k?9u{8d%ux0wQHJ@QzG?fe8Q#{j=hX&@`k(}BZ$ zjZnYCC=V2aTsB}UM_@4wM@gUn_thN30lvW+Lt&Hz+KiKIL_9|ofKdu)70xmn`}q#5 zm4Q(PXnzZ``4Ai3S7T8Q$55bPoMAq8^8004R>004l5008;`004mK z004C`008P>0026e000+ooVrmw00006VoOIv00000008+zyMF)x010qNS#tmY3labT z3lag+-G2N400d4+L_t(&-tCxQY*SSn$3N%Z-rJUTYrCy%9e;m@fsvroG`c0|(8SH~ zpdk>&e=ib@#`tCoPrevpVq#2uGC>T+1pmYbQ8Wl@R3HS1It1sY4(8Zk>`yngu3Ou+ zxAz_&wlVn0cfdvAZgd%oXu?)lwwE|e)#rc9atGa`K;rTh@s0ZakW?EjVt z5^w9$*x;Rs6Re6xnnr&dYJu){Uqg7eTU6uo71Er>D z2CUd9U@qw%$>HA#AAgN_-#0nu*m91%3GvI{5kBz-E1x}vR<$9g9BG-vFC8Yh%`l@DJo;z;80o7GUw5yk)_Zq3V?`0fo9z+i`qkp;s2+cj;!#`t;U&KmHV@CRz z?$}4PD~9d|Z`+G_+ulOaeR;K;mx1YycW~YHG>UT-k+W|S?fwDJmY1-vZ6nt6Ia>8x zeG8x1hfw#SR)V^s2E|nimO*mlB32yC7$ir)(^|)xR}bLa@Cb_2Ur@*8WnkvQeiDP{ z&{j4w{(t3O01{V^WAnMO5;NF*8UUIdkS5ZwNQK9dcT z84$V~p@FU129`it5~0`-jfW3Y*?&c?%y&?e%#7&k@LSV)X5KyyiFOG&FHlIec`zPWT4;95g z-euJL@Vl7PF(PM=pt?+i9aJX>n}(GzkQPW2Fq!M|>kxSUZ7N#!P|>mnGZseC-B`)V zqJJ33-q0KZ9?vz=>O4s3!hWpi2xe>$GnPcrL1<1?rw^g|01bC=7ZuH~6h&+nUkD+d zSa3y3c}V6+C^;*w^ob?q&<9QO^6SWC=nt8i9+H+3TQqMVGL&l*HzV`>74#;)GTF<4 zfivv7`zh)j9s=7wArTuy^EWLTKb4%}qkliYCg7@JZABo@)^1Eei@9}`tLPl-;r$CA zbL!eT4F5gY8y;OWwqvxLqnA%|wErY4S5y~OJQO$rUV8;EH0|X3E2lX>_7_njj?-r6 zq17#!N!2mhMStWP@l=AI$$oY=ZspGE^+h*O&~BKx2`+^PsMK9Nv+*&i9p0iFSkh{A`}%g)Rn~KMxRc)S0He|C1pS*h zJ#?PFi9R;gG_s}sUbZ&07F~Fng3IWC`E|65;h7K}p)P{{P1HKPw61QsRk|}}v}pT* zmf9w$h5PG+R5?7TLcLYu7f>_3`gNKB$c3B<*zAP9k0#F9ZWNQ8(W zDKr#{n=Pd(G()Xo=nyA^LxNyHBv6X~f`gPoOAVANB85u9A&_EJM8u(i{4%dz@vds? zy*Ky3dEnXK=R3mzBoc{4BDp3U{=j_xj8^A{ga|#J_gr1wVt=hx6Ei?nQ6db5(#+*f z#SGANyQ55}zq4Aci5Z~1#?a6*v)L0d12kQ(8KzPjtW?g$4A2Y&Qrz1+7B@h(rDdAQ zS z)3dZ1I;xYfAQP=UN1oYt4B0$MT7 zc|0`y>V^ai;0b@gW!iAv0^0DJ33!=@V*2=d1t^yWF>1nXwAN+#y#m~L#U*s}piWo+ z?*IjFID%pRgtP9$|2d!oFS&v)9$IAhodX&!uO3E_zu>Uc@H+)`VvHa0z>>pn4H(5B nf1}yb<8OHZi9{liNW|g-R#(t+W@*##00000NkvXXu0mjf?Pu^b diff --git a/src/main/res/mipmap-xhdpi/cy_flag.png b/src/main/res/mipmap-xhdpi/cy_flag.png index f8fd2da04bce14fe1f1d8c993c9369b0eb4b424c..d97871b99e5e236a0da946e31b7cda076e882ebb 100644 GIT binary patch delta 2623 zcmZvec{J3G8pnUKjjY*6CTmTl$(Eh6W{tO^cW5z@<;BPrBK>SdB1^Ix3YC2w)J%*K zGh`S_ma&G&K8$yaEZ2L_xqsYq?{m&`zUO?u|9#JMp7VJPA&I6afB=Vw(G?>As7>bG zy~_yzfUK*}XFmudU7DZ3CHrXJPZJ`lgBzk2 zuQKBk3QHW$X1qrHEf@a+9oJvm(D+RkiH+I1n%(GC?&;mHE8nQw(Pm^*iSkmCJ$vl6 zzG9XkImV|hmvnJ;hLMbVD=M6nJAOQSlcg{+yKFGe{Qa1jXTS^z78gDG#Q60er~gax zR^l;I#p(CiVxquin$hE4I@^|Ue71+zG9_}j>$zB$h=lQW-?zf8fUEVis|99^_ip#O zAfkI_$xdDozs&j%PP5;-44qQz1~RX5H7BYO+|t?37xDQ)-6FsICyKPQWE7#1XwuH7 zNj8tjuOqP|c+!eWiaY$-4lGs)?471@CLKQya^GuBc5TjIIBlePIc zztMlC_mnXI8cGvyg7?*f$@qM(;GT{lH1k3m*5wi_UhiF8jZ`O)k3atz)j9t-=Ig`6 zG3&K8fN?X}zPw$mL&JDS=&H3{>6pFf!FuQ7S}aya_|@-5Q1!dPGwRzT6Z+ zoy-Z-eZ2XOdgY99yqt%Zq@TL%9UOnX>WgJ+5GaN$oDS!BGGpR#sx{)e7WXDO+-)&$fmeIsDez$cg^ zlZWKftIHgY3y<=k#uR$E#juA3^Mw5kNzsJB>Pr(suS5)mzZEbBoQ8aa!83dMAb~A)h540{NlUREN?#k^^f)rp zVuT_Z>zg^t28W8Q;G7AksS6YSdAlVn{V8^X@}+`-x*D1SfSiU5j7?$-t%M%0i$Wu{ z(KGTFEZ_7KwSqW0tS1N{`2;4o|N4DHiZ_{~;nSW9)QuPL9Ql}#fncI$qr}&b2-kmj z`bUS9JZ%UyJL~$?*z+P)pKIV3`U_m>DL37p;jx2nJGfKDQ~Zi>G-{k}|E^B@qY#Ol zCIUajPVOX^XLd)Zbzz`0Cq-GgZMEVZnlwolja+{?UECZ-jlqDN0~czEat#1ve3Rz~ z^O#(UDleQ(M*`77&bRUF*5Z!cPAOvoq$6x$Z*8|J9zwdI)_jIb;;qNKN~?eFw+#9F zEDOZ#vRY+5zQfK~YC*55vp-_p7L5ITed<@(IUHClhHLNCdh|I`ROXs}0yXdpbypTm zTG>rGC8=YQwg#RyEB*{9cv}p8?+ey5pdJybt~7Rn`NjqO+`jgbA@r#Il&jgt#@wn? z3tB36K|*ECBjbi)3Cd#mN5@V2o6getx`|#Ib`v}$l5CJ?Fx6T;o7mt0o6_ksDxTvX zUwj|BZy6ySq3Bj^N69s5+l}+LAz0F#6gdVOYjO~~Mcp7>oL`|o3z(LraNNK>X^>+q zwj)y&N|Q>ebxZ0t39(C5c9iBQ#NbIi!Cxg;QK!DOZ^{h^eH0-Eb#)gyc>iUaFzk3Q zUyC2kM$Z|#o*htN`B0`(Stk}^ghF;D=DCU%<&^er*Mu}+EI^oJN zVY2Ze_sw;ul=7o7SL4&gE%^U3a%W*V;K~nfw%f(vtf}y0)svR(9~~`dmqY7#FsRXz8r8V_OCP-cwn@$&$A|fx6`YsSRO+z4bUmAM?Ts$*&pnjuVlc<4)ZFeO%tPd6{=t2BCUEE>aPP-<_K19i=hHEvd-&#w3o^|q;=8rdhN!wFI?)pXA z68-o^X_9-;s-NGv9M{TQnm(sW+FbTUbbFr1ojojV?tAG_h%=MXk|b&TuCbD>VAXAv z3YA9d^?sGX8$Ko3WxxqdBAt>fNqSw&C!>kh zO`Z?f;5ccBrkVOXX7TyHWgc3!ZBSRAcdfx$)_K|dTGICcCY(pdjF6|7nX&p@-F*Lg{` zpYAF@C*5uvbj$nzwN-0&PFzw7&lRNS(|NPBT*RIEVD27!zbzDhock?R#Ad+WD?e7v zd8YUOV+fG>ivm>B+VcMmF(E|pLL7|c7>$V4b{%=w>FAfnCK>z>% delta 1037 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 diff --git a/src/main/res/mipmap-xxxhdpi/cy_flag.png b/src/main/res/mipmap-xxxhdpi/cy_flag.png index ac332ef6496a5df402d7ea963d4b90407aed6d36..bb3033db5671bf55d1d6ea8efb18b02f866ad6a1 100644 GIT binary patch literal 5913 zcmcgw_cz?#xBlp&CR!3Tc@exLMDI~Ugi)g=dha#DFpM6eBuJtKiQrX&K_bd1(R&%9 zMJGlbGs+BR%-4JGe{k& z?3+z!jGx(lQ;VF+IHR;C#fY*<{o3%IQM!!EyPQdy$_iEk8295`Ctu&{0ReBoW{RNh})a7!l{wX1(OR%16kPK$g?|S7WC@I$>3Egll zl}l@Rx3crFpg}PWcLo$>ww2UnO}D1b>x>rlDKxScU}N<^WLl*?`h3b$^`0|>W~sBP z@*dnz&|HtjC7P9t1c;Z|J%gBVkv`ldLw)Iv#y#NLagW#z8SeGO_KpgTqg(YqyfB%4 z3+=`s5?L#S;6Wm;iyRpze4kj#3qe$ahUKBhucl!AqB5Ms~xs?oL{oTK<4mXd*Ja^O<`v`e5{J zzq-HBoKJXp*gvYmK*6%_?O~m+ZO(zWl)jXAMZs)o|qihwDj zir=0$ok7b-`<@hruf{W(Vn%Mi<_wH*TlGo4;iRbZpE{poS!Imx-BKaQo0CVKv8AX{ zMJFRMC%GwQp%1ie&#uj6xzB0^AJwC5O>|0N)3xkEw>3Rvtv~aCnwgdAm|MQy285`y zi?*V9B~7UKHfzecXvg{CUIp+Y)LbOiD>?cBs%6H5QnGKg-vt-*&G8)s8|w z*Hn6EZGO2JUdb+xlu-#dlI0Tj z^VpmvLSGL%nfvnq*4zRe%<+XHLLaMU1_^eOlc!#)yFm#OKbWe+7@F6SlD1KiJR=Vj zzYTB6df$HitomN8+vC=(s0SOM|GaG(PGKas3#rHnAL85flSYukna?KJsawq-nh z@9uN1%+Br`{GBc6g1`7k)||j|&`dTw|kQ>|kJEa{LdfZwkX5BbEaAsWetMQW0 zoIW&Jx~kL%f6fg8m`=uQwHIqW95pw7XZ!tlh| z)2$@mxmS&k(LZ|&#Wa-mynw}pCgXRkK7_Q`xfLUMqHD67>Qwx07PL+bFdt$HR+SHU zgzeyrfR^%}e0xFfHVJnSynI-=-3U^{t%y**OSyjLF7kG#WFz$l>~Onr?Y`c}ffS#p zftW zYe3*`whH#%#HGq~$inAMi2f>UlpUU_pTax(ai8|M-3hrrJ?m&w6=Q9WEZmxNYh2mW z>*=%1a1@pkM9cdpDBA~EMn|RZwz;Y7g!kI*bp~KIteVT+?B2KWG>pH{Fct#SGAa0u%&6m zVK8-9dW~CyzoyrBQ4_gKN^*@c&T8}TOJ%aHaf)rX5QNk+Ln3c1Wt49eO7aX$#1m^KXYW0XD&)NWIH`uki?~ zoa!Bc>PV(^ax0#2-K(y9Sl0fD&0Vpewt&}dX7ZE2$9m$_Y^1(%AZAQhep4x@x^!Wv z!U-6mg&lBjCPL2lGG2Rdnpc9CW^c!pExp_JtkW>3>YzOpkU!Mevn&N|mvVEJs4thkkbKb?rQI-iv5p~;CZ%~@4%Uy#+#pMGf%412ltm<^SiP)a5BZ*((2 znP^wg%r^~}w0VLnj`b1AS}fRpQm6fkN{yMlY|N)A^vjm8^kQtXrXxBpM@-Pm*#?ky zDcaMwm;ieyHZ#x9D8Kpd_&X2qEUhjjmS5?D6`1hS@x0hKRbPvJMhvBF^v$mdxhE8^ z(er6C$0X+kiW01H)85uh{5bCGRt*zGP6vlu-2`AOMS8+bdvdeJ@hM4>2`285;<+)+ zkB%N642@JiY*aIR9NX8vph}AC z+=}Tjx<|E&fyeo<(%J=mWh#V78)_>H3cV4n&iWt^ob`?nL7Sza;JU+|

cZ3Q_YO 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 literal 2437 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