From 54cad86d312dc2b65e2f570cdf1135d75dd30e4f Mon Sep 17 00:00:00 2001 From: amcereijo Date: Sun, 2 Dec 2012 23:44:58 +0100 Subject: [PATCH] Add icons, text and layouts Add restaurant search in map view Change way to view list of restaurant search --- AndroidManifest.xml | 9 +- res/drawable-ldpi/android_maps.png | Bin 4567 -> 4495 bytes res/drawable-xhdpi/android_maps.png | Bin 0 -> 12344 bytes .../select_restaurant_border_selected.xml | 13 ++ res/layout/restaurant_data.xml | 26 +++- res/layout/restaurant_data_list_view.xml | 51 +++++++ res/layout/restaurants.xml | 5 +- res/layout/restaurants_list.xml | 17 +++ res/layout/restaurants_maps_layout.xml | 24 ++- ...ctivity_trcard_manager_restaurant_maps.xml | 6 - res/values-es/resources.xml | 2 +- res/values-es/strings.xml | 9 ++ res/values/strings.xml | 12 +- .../about/TRCardManagerAboutActivity.java | 5 + .../action/RestaurantInfoAction.java | 67 +++++---- .../action/SearchRestaurantsAction.java | 137 ++++++++++-------- .../adapter/RestaurantListViewAdapter.java | 42 ++---- .../application/TRCardManagerApplication.java | 18 ++- src/com/trcardmanager/dao/RestaurantDao.java | 11 +- .../dao/RestaurantSearchDao.java | 26 ++++ .../http/TRCardManagerHttpAction.java | 13 +- .../login/TRCardManagerLoginActivity.java | 6 + .../restaurant/RestaurantItemOverlay.java | 7 +- .../TRCardManagerRestaurantMapsActivity.java | 97 +++++++++---- .../TRCardManagerRestaurantsActivity.java | 54 ++++++- .../TRCardManagerRestaurantsListActivity.java | 18 +++ .../TRCardManagerUpdateCardActivity.java | 4 + .../TRCardManagerUpdatePasswordActivity.java | 4 + .../views/TRCardManagerListView.java | 1 - 29 files changed, 482 insertions(+), 202 deletions(-) create mode 100644 res/drawable-xhdpi/android_maps.png create mode 100644 res/drawable/select_restaurant_border_selected.xml create mode 100644 res/layout/restaurant_data_list_view.xml delete mode 100644 res/menu/activity_trcard_manager_restaurant_maps.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3e36ca1..2548ff6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,13 +57,14 @@ android:configChanges="keyboardHidden|orientation" > - - + android:name=".restaurant.TRCardManagerRestaurantMapsActivity"> + + + + \ No newline at end of file diff --git a/res/drawable-ldpi/android_maps.png b/res/drawable-ldpi/android_maps.png index e3dcbf66f812084b98a613dc5d9572082e0c35b0..eba8b654d7d2c57591ed3cfe38603256bd7a9661 100644 GIT binary patch delta 4454 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 delta 4539 zcmV;s5k&5fBiAF4Ba>hX6@Lm(X+uL$P-t&-Z*ypGa3D!TLm+T+Z)Rz1WdHzp+MQEp zR8#2|J@?-9LQ9B%luK_?6$l_wLW_VDktQl32@pz%A)(n7QNa;KMFbnjpojyGj)066 zQ7jCK3fKqaA)=0hqlk*i`{8?|Yu3E?=FR@K*FNX0^PRKL2fzpnmVZbyQ8j=JsX`tR z;Dg7+#^K~HK!FM*Z~zbpvt%K2{UZSY_f59&gh zTmgWD0l;*TI7e|ZE3OddDgXd@nX){&BsoQaTL>+22Uk}v z9w^R97b_GtVFF>AKrX_0nHe&HG!NkO%m4tOkrff(gY*4(&VLTB&dxTDwhmt{>c0m6 zB4T3W{^ifBa6kY6;dFk{{wy!E8h|?nfNlPwCGG@hUJIag_lst-4?wj5py}FI^Kkfn zJUm6Akh$5}<>chpO2k52Vaiv1{%68pz*qfj`F=e7_x0eu;v|7GU4cgg_~63K^h~83 z&yop*V%+ABM}Pdc3;+Bb(;~!4V!2o<6ys46agIcqjPo+3B8fthDa9qy|77CdEc*jK z-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S1Au6Q;m>#f??3%Vpd|o+W=WE9 z003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG3xE7zHiSYX#KJ-lLJDMn9CBbO ztb#%)hRv`YDqt_vKpix|QD}yfa1JiQRk#j4a1Z)n2%fLC6RbVIkUx0b+_+ zBaR3cnT7Zv!AJxWizFb)h!jyGOOZ85F;a?DAXP{m@;!0_Ifqlp|(=5QHQ7#Gr)$3XMd?XsE4X&sBct1q<&fbi3VB2Ov6t@q*0); zU*o*SAPZv|vv@2aYYnT0b%8a+Cb7-ge0D0knEf5Qi#@8Tp*ce{N;6lpQuCB%KL_KO zarm5cP6_8IrP_yNQcbz0DW*G2J50yT%*~?B)|oY% zJu%lZ=bPu7*PGwBU|M)uEVih&xMfMQuC{HqePL%}7iYJ{uEXw=y_0>qeSeMpJqHbk z*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR=4N)wtYw9={>5&Kw=W)*2gz%* zkgNq+Eef_mrsz~!DAy_nvS(#iX1~pe$~l&+o-57m%(KedkbgIv@1Ote62cPUlD4IW zOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGAUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}TincS4LsjI}f zWY1>OX6feMEq|U{4wkBy=9dm`4cXeX4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u` z%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i&_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx) ziK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01)YTo*JycSU)_*JOM-ImyzW$x>cP$Mz4ONYt z#^NJzM0w=t_X*$k9t}F$c8q(h;Rn+nb{%IOFKR-X@|s4QQ=0o*Vq3aT%s$c9>fU<% zN829{oHRUHc}nwC$!Xf@g42^{^3RN&m7RTlF8SPG+oHC6=VQ*_Y7cMkx)5~X(nbG^ z=R3SR&VO9;xODQe+vO8ixL2C5I$v$-bm~0*lhaSfyPUh4uDM)mx$b(swR>jw=^LIm z&fWCAdGQwi*43UlJ>9+YdT;l|_x0Zv-F|W>{m#p~*>@-It-MdXU-UrjLD@syht)q@ z{@mE_+<$7occAmp+(-8Yg@e!jk@b%cLj{kSkAKUC4TkHUI6gT!;y-fz>HMcd&t%Ug zo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P`?ZJ24 zcOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy001CkNK#Dz0D2_=0Dyx4 z044eV004mL004C`008P>0026e000+nl3&F}000L5Nklmb0uz`ZAqI>YRZL)jke~>}LsbVrAE{_a6OuS~NgUg8eEqo3^FDhq zxQ>%FTo`5mTRMZYwfEWI`quZYwT}`J9_P?J=JD78*blyl$SX-4pIiT6>1GrL+qPG1 zm+H-KyWQ#T>}+?hUHEN(_w2&7?Re?f$3Femn6^w6m5g<_U#hoT=MNcrldt~#7q0IY zyN4zwdN!u7OxiD%N(0AnLeKRQ*K|D-rio=>GZ`1ZdApp*ijT&;s;6NZr&CYjgWy;ECX{u^4E`QbXa`Tha|Odr1mc87`C zSBc{(1eZJ?5cDDno;zF&${6G3d5+fFAE|-ujoYM241i_XD5dG|ZL+cQE{H)5X#xbL z4L2_>u)aKp)(YrrJv{XYfG8M{rRf0^0C|=mBH*}CD50ET zR7we!ZCJg0lC`DdD5Zfu@HSfSArF%a2#7|+9xcMDxsw1SX@(3nL2cp~GmD?4)r&}q z%f@m#6vsA31JGI{Xu|F$ z%a`7uapWwjTqP+ivXDB=mR(xyj9bj`Td?c{a~|22&ll?xD18et8KBTs&Y)8!&2oyf0bnSWFH`V+w3Pr3BGzaC zD;NKS(iYmXAZA z$%giS!vKn6&l3Ib@-c!nUG!S}DCl)-X3qX8HrOdLByZs5kn*AWp^ z5|J!lVk~}-algo!kIr&!Gv?&k7pYGkr&t+(=gjk8> z`#Baqag9PLK#UL}_f087c9SvZ6eU&thF?mY;@Ns6Jd~T>Ok)b$$ zwFae8+5&{@7hYp$eHjo6<5>U##8k6o*xZh(A{Hq^EM(v zo+nff9cB9DxuGD%-1i!wltzqV<>K#&!|wur!5DxBNpu<`8kG5v#qvky9@2nY@ToK> zP)ebc#^f25#thT*&#>Em9WnU>wOyfqv||40zvC3{ASkqT3Z(?UoTJQs6T5%c!0`%< zRqLY}IDB*-zchwYiX;k1;t(XKRGnb*iI1bSMkEJOAc_-+KWSVc^Z5kseSmo$zr zCZ}9I%ty|Bi4#vRF>!PQBZe$KOl$pXn5=@*8F4Tm34??0m8x~hwFXM-eXHlA8R)ln zX}2~pc@A11AnxwANKup8sb=)*0TmrrF#2CRtKOTj@|2_sc$65+CIM z-jgQ@e29UE3z1e2S?yr6v2cr*(fSHt0aIxGJ(`n?I3D}GV}Fks_7SgtRKbW~jKLT~ zp63*+b;|YTXa;~K;IAlk+p?@q!S&j?uiLJ-)E+ZSZIc)FKy1tUP6H-ujz@iBcCNO0 zYo#h8HIRnuxpuQQ6*R`jgRx2_v^AmYIKjm9kV|2O=f2k@@}05djm Z=;j9;S^xk507*qoM6N;xV1hI?HZx}klOX^A diff --git a/res/drawable-xhdpi/android_maps.png b/res/drawable-xhdpi/android_maps.png new file mode 100644 index 0000000000000000000000000000000000000000..37cb116d66468c0dc7ef075e2d2f7b9e37da45ea GIT binary patch literal 12344 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 literal 0 HcmV?d00001 diff --git a/res/drawable/select_restaurant_border_selected.xml b/res/drawable/select_restaurant_border_selected.xml new file mode 100644 index 0000000..eeb3952 --- /dev/null +++ b/res/drawable/select_restaurant_border_selected.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/restaurant_data.xml b/res/layout/restaurant_data.xml index 9c35d61..824a9e6 100644 --- a/res/layout/restaurant_data.xml +++ b/res/layout/restaurant_data.xml @@ -4,7 +4,8 @@ android:layout_height="wrap_content" android:padding="0sp" android:layout_margin="0sp" - android:background="#FFFFFF"> + android:background="@android:color/white" + > @@ -69,9 +70,9 @@ android:layout_alignParentTop="true" android:paddingBottom="2sp" android:paddingLeft="2sp" - android:paddingRight="4sp" - android:paddingTop="0sp" - android:text="X" + android:paddingRight="8sp" + android:paddingTop="4sp" + android:background="@android:drawable/btn_dialog" android:textColor="#2A4678" android:textStyle="bold" android:clickable="true"/> @@ -84,7 +85,7 @@ android:layout_below="@id/restaurant_data_info_layout" android:gravity="center"> - + android:typeface="sans" /--> + + + + + + + + + + \ No newline at end of file diff --git a/res/layout/restaurants.xml b/res/layout/restaurants.xml index 815842d..16b8c69 100644 --- a/res/layout/restaurants.xml +++ b/res/layout/restaurants.xml @@ -61,7 +61,8 @@ android:layout_marginLeft="40dip" android:layout_marginRight="40dip" android:clickable="true" - android:onClick="findInLocation"> + android:onClick="findInLocation" + > - + + \ No newline at end of file diff --git a/res/layout/restaurants_maps_layout.xml b/res/layout/restaurants_maps_layout.xml index ae55834..6883ed2 100644 --- a/res/layout/restaurants_maps_layout.xml +++ b/res/layout/restaurants_maps_layout.xml @@ -1,8 +1,11 @@ - + android:layout_height="match_parent" + android:background="@android:color/white"> + + + - + + diff --git a/res/menu/activity_trcard_manager_restaurant_maps.xml b/res/menu/activity_trcard_manager_restaurant_maps.xml deleted file mode 100644 index cfc10fd..0000000 --- a/res/menu/activity_trcard_manager_restaurant_maps.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/res/values-es/resources.xml b/res/values-es/resources.xml index 99a6051..0d1efd1 100644 --- a/res/values-es/resources.xml +++ b/res/values-es/resources.xml @@ -2,5 +2,5 @@ a14fe7418ac35e6 - 353918050624655 + 003bb6b6e00c957f \ No newline at end of file diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 3b09717..e503754 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -129,6 +129,7 @@ Calle, CP, Ciudad,… Nombre de Restaurante Buscar + Debes introducir una dirección GPS El GPS parece estar deshabilitado, ¿deseas habilitarlo? Si @@ -149,9 +150,17 @@ No se han encontrado restaurantes i ¿Quieres que te lleve con Waze? + Quieres llegar con Google Maps? + Ver más información Ver más restaurantes + + Toca para ver en Mapa + + + Toca para ver en modo lista + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 0c1a69f..9cf9e3f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -125,6 +125,7 @@ Street,CP,City,… Restaurant Name Search + You must type a direction GPS Your GPS seems to be disabled, do you want to enable it? Yes @@ -145,11 +146,16 @@ No restaurants found i Do you want go with Waze? + Do you want go with Google Maps? + View More Info Show more restaurants - Hello world! - Settings - TRCardManagerRestaurantMaps + + + Touch to view in map + + + Touch to view in list mode \ No newline at end of file diff --git a/src/com/trcardmanager/about/TRCardManagerAboutActivity.java b/src/com/trcardmanager/about/TRCardManagerAboutActivity.java index 0383da5..c964e07 100644 --- a/src/com/trcardmanager/about/TRCardManagerAboutActivity.java +++ b/src/com/trcardmanager/about/TRCardManagerAboutActivity.java @@ -5,15 +5,18 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.util.Log; import android.view.View; +import android.widget.Button; import android.widget.TextView; import android.widget.Toast; import com.trcardmanager.R; import com.trcardmanager.application.TRCardManagerApplication; +import com.trcardmanager.listener.TouchElementsListener; /** * @@ -34,6 +37,8 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.about_layout); loadAppVersion(); TRCardManagerApplication.setActualActivity(this); + Button b = (Button)findViewById(R.id.about_button_opinon); + b.setOnTouchListener(new TouchElementsListener