[markww-foursquared] 2 new revisions pushed by markww on 2010-09-29 20:07 GMT
2 views
Skip to first unread message
markww-fo...@googlecode.com
Sep 29, 2010, 4:08:40 PM9/29/10
to foursqu...@googlegroups.com
2 new revisions:
Revision: 0b1d06b7e0
Author: mar...@gmail.com
Date: Wed Sep 29 11:12:24 2010
Log: Cleaned up some unused drawables, added hi-res drawables for tabs.
Fix...
http://code.google.com/r/markww-foursquared/source/detail?r=0b1d06b7e0
Revision: 3a9b186b23
Author: mar...@gmail.com
Date: Wed Sep 29 12:59:38 2010
Log: More cleanup. Added venue name or username to titles of activities
whe...
http://code.google.com/r/markww-foursquared/source/detail?r=3a9b186b23
==============================================================================
Revision: 0b1d06b7e0
Author: mar...@gmail.com
Date: Wed Sep 29 11:12:24 2010
Log: Cleaned up some unused drawables, added hi-res drawables for tabs.
Fixed popularity call for tips. Fixed bug where _others_ count was being
used for _friends_ count for checkins at a venue. Dropping tab icons for
android 1.5. The tabs colors are inverted for 1.5, so our tab icons don't
really display well on them.
http://code.google.com/r/markww-foursquared/source/detail?r=0b1d06b7e0
Added:
/main/res/drawable-hdpi/tab_main_nav_friends_off.png
/main/res/drawable-hdpi/tab_main_nav_friends_on.png
/main/res/drawable-hdpi/tab_main_nav_me_boy_off.png
/main/res/drawable-hdpi/tab_main_nav_me_boy_on.png
/main/res/drawable-hdpi/tab_main_nav_me_girl_off.png
/main/res/drawable-hdpi/tab_main_nav_me_girl_on.png
/main/res/drawable-hdpi/tab_main_nav_nearby_off.png
/main/res/drawable-hdpi/tab_main_nav_nearby_on.png
/main/res/drawable-hdpi/tab_main_nav_tips_off.png
/main/res/drawable-hdpi/tab_main_nav_tips_on.png
/main/res/drawable-hdpi/tab_main_nav_todos_off.png
/main/res/drawable-hdpi/tab_main_nav_todos_on.png
/main/res/drawable-hdpi/tab_search_nav_venues_off.png
/main/res/drawable-hdpi/tab_search_nav_venues_on.png
Deleted:
/main/res/drawable-hdpi/me_tab_boy_selected.png
/main/res/drawable-hdpi/me_tab_boy_unselected.png
/main/res/drawable-hdpi/me_tab_girl_selected.png
/main/res/drawable-hdpi/me_tab_girl_unselected.png
/main/res/drawable-hdpi/tab_focus.9.png
/main/res/drawable-hdpi/tab_press.9.png
/main/res/drawable-hdpi/tab_selected.9.png
/main/res/drawable-hdpi/tab_unselected.9.png
/main/res/drawable/fake_native_tab.xml
/main/res/drawable/tips_tab_selected.png
/main/res/drawable/tips_tab_unselected.png
/main/res/layout/fake_native_tab.xml
Modified:
/main/res/layout/tips_activity_empty.xml
/main/res/layout/todos_activity_empty.xml
/main/res/values/strings.xml
/main/src/com/joelapenna/foursquare/Foursquare.java
/main/src/com/joelapenna/foursquare/FoursquareHttpApiV1.java
/main/src/com/joelapenna/foursquared/TipsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java
/main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java
/main/src/com/joelapenna/foursquared/util/TabsUtil.java
/main/src/com/joelapenna/foursquared/util/TabsUtil3.java
/main/src/com/joelapenna/foursquared/util/TabsUtil4.java
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_friends_off.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_friends_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_boy_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_boy_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_girl_off.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_girl_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_nearby_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_nearby_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_tips_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_tips_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_todos_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_todos_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_venues_off.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_venues_on.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/me_tab_boy_selected.png Fri Apr 23 09:11:15 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/me_tab_boy_unselected.png Fri Apr 23 09:11:15
2010
+++ /dev/null
@@ -1,28 +0,0 @@
-‰PNG
-
-
-IHDR 0 0 W ù‡ tEXtSoftware Adobe
ImageReadyqÉe< tIDATxÚÔZmHSQ ÞR¦ a Ì ¦› 1X, ` ‚ (‹ ( A0
- é‡ RÐ A0 ô+
-£ R$ý $ BA ¤ ’ : N¯ Ó Øóâ
-ïî½;ónóîÀÃaÞ÷¼çyÎ9ïùÔ|rrb*æTª×A2™ÔUÞb±\¬€ •Á 8YnMé V€ °
-Ì1$ôVlÖ3„Ðú· õ w Š,‹ ùIà#záWA €¸ ٠Б£
-¤Þx !Ky âµÈ† ž<Åä8 ̹ oFö ï|&
x s"Æ— ÉßG6[ ò”ìÀ4êìɉ 8zÎZÞZÀé fµÏ¨{H× ‚ƒÇÈF/x¢˜x“µ oaÃÆrÁ Ž Nˆ˜ ò6d
-4æE û D„Ec`Ø@äS
- ê ££# ký îÝn–••-fê — %Ÿâ¦Þ ‡‡‡4lþ X ¥«ååå«j=Ðmpò&ù6æL $
û^ƒ ZVWš ¯D )’ƒØ ˆX?s Ö":I ×4 ž" àN;RB@S hR `/" v¥i´¢ˆ Ø”z€¿ ¡
-bÞ`¤}@3wË‘& Æ /Ûl¶> ¯±XL_SÚl&Áz œ€˜’ ~«ê %P¨›=ÔÃs
-)
Xå < àã~®¥ 1 –‰ ƒ= zE è H —Jšæ¹rËJ –€8gäÏä8 ‰xa×K«ø9È·PYøh h¤ „•; æÒ TUUч ®‚.-§ Dà7ð ˜eBDÉû Vv ¾ü ôpeçÁ5®¸ ÆÇ1ÎÐ+IR›†Ó.ÀÂÙwg!@nÛz –$7¾·s¶cª'2|
œ Bœq` ¿DEÀºŒÄZ ‚òß
- àìbÀ8ÿýÌõzuuurooï-w€ö± Ä' ÇïÙ¦ª
-í ³˜T^³í ù_f¿Ó ¸ÐÐâ‡×»ššš¸æ¡>
- Ó–â/· Ðœ{½¶¶VRª öº¦Gø5©øµ²Ë
-ÔÆ-Jç ØG5 õ0 ™¨ ë6 ðcww×ZÈi ßFeS瀜¼ê½P]]Ý”, › o
- °³³3Â&‰”Ý$8 )Ù–j´@? £© íN( ú‚ü‰ÃáHäc%† ‹¿§ÜŸ)¾
-©•Q½ I
-–N~ß Dkà *Êù
-|R0LËÈSÜu‚KT\Æ Žíím
-¢Ÿü)ˆ Ô › Žõ ¯¯¯§:h
- ’]gÒÔz ßW´Ê ½ÐlmmÑÌDo ò71êÞW¦Ó§¡ó$?#î“ý ¶
-÷ ¢™
- ?1A -hô°÷LiÁ ¦€ €^
-ã*nhŒ·S<1òJÛvêÕ~ z€Îú•2 úX µi˜%Ø©.Á†X [ô´ŽôB9àt: ³ásîwâÍÍM NÃ
-ÝŸm¢½ý Ëåš8Oa³Þi Bn {Ȇ
-[´#M§ Ü_A|
QOýº lllȯ;ÜìDGW•—9 kíu~jnllÔU ®þW‚ f© 7 æbÿw›ÿ tà ‡féþ IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/me_tab_girl_selected.png Fri Apr 23 09:11:15
2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/me_tab_girl_unselected.png Fri Apr 23 09:11:15
2010
+++ /dev/null
@@ -1,22 +0,0 @@
-‰PNG
-
-
-IHDR 0 0 W ù‡ tEXtSoftware Adobe
ImageReadyqÉe< ºIDATxÚÔš]H Q €gve@ a! Œ`a`ÃØ(Œ•@1
-à Š" 6‚Â^zè¥ | Á^#)‚‚0| ¤^ ¢
\ì¥P „¥u—]6Zð)ö b;GÏÈõzçogv½sà#îìŒsÎ=?÷Ü;© FC
²tÔëõ` àÓßÑ€A" ôÒ¿ ô;ÎÒ:P 6€¯DÅë‹ÕZæåùsÀ8p èrù,*¿ Ì ŸÛm@ 0 ŒøäAôÆ#à»Û C.ï?
-¼ Ö|T^¡Ð[ (üZâ ~`Ñí š pƒ¼â› ® _Ú <J X nûeÀCšùÎ6VG BuÚ« w(Y K&h ›Ê
- vÈkÕ?à ðÉ G¨Òô*r &öIà·Ó š‘Hy#±ç„
-¨V«üµ Í~XÂÖg HÙy`BRå
-Ýö{ RÙ×OaØü’Ø ” Ô
-= ”\y
-_àÔr¹ÌŽ×¨Q“YrÀ1‘ º ¼ æѽ
-
-³¥
- ÐF uMó Ä d€.ò@ †P"@ Dø$Ö$k
-줇÷@”«ÿ¸P|“Lé8í
- J„“^g
-`å'pO2 æ ¤ó†a€næ" ÆIä
-3 ÈX‘â¢Rjæ Êë’(ß-˜ä(ŸÄ¼Œ:0 Êï¦Óc nËjLRÊæÞ A“¹ç .“˜ žØ(Àî™1éç
-* “ó _ >:í@Y „À€(zA@ 0lò 2 hÌ8iq/OÒfÌ¢ ×{pòÑ ºMé:C' ¼¤¹ñ¦Ë–ØjÌë`ÚR Q›ÌG÷½ üöŒâ0AÆ<vaÀ Š89S ¡6jÕÔ©Åbñ5íÄÌ ÏôOÑÑF;¥“6XV <iç c Á„ R|
ø
áB^Ø(¿ã Lâ @ ð†I˜~`ÁE’ze–Š„1^2Ññ–šÏçͬÃòºÂm3ß w[è
’ö>W,Î Û¢ ¬ wÿ*»g’ nmXiQë O–9åK¤Ã¶ÙC! W €! Í\‹ ?€q ìSÈà:°
- 2×rÀyîÝ Ps¹œ“ÙÁpZT ~VB÷N ïšœu,‘Ó‚F
-Û’kV3ï$„øpÂåþ©`9ÇïZ ”Ý W 믕 )ý
-ÈSuã•Ç5ç¢ åw ¶²Ùl3m-&Ú°Å= ÚÕUh ï¢EÏÊ8üBùÀAc·ß€f“ ÃiF0ƒne“Vñ÷Í<ìÅ CN 7)|
t ½Ð •å”——«™LÆïã vt¸ 9Î(\¢ÙNs¥Ù“t(þJ‰hÛ‰† ôÿnó_€ E4 [Énx° IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/tab_focus.9.png Tue May 11 16:33:42 2010
+++ /dev/null
@@ -1,10 +0,0 @@
-‰PNG
-
-
-IHDR
- d ] ºî tEXtSoftware Adobe
ImageReadyqÉe< ÒIDATxÚbüÿÿ? 6ÀÈÈ ”úψU ªI ˆÕ€Ø ˆ£þ¯Pûÿ &Ãÿ›M
ɵPq ¼ H= »¦ÿH˜hMdÙ4
- Ç€ÛidÙ J)C2ôFm :©üÿ0˹ƒÜ¦Ñ€ M{£Î 1Ɉ &P O²ó°¶
-G“ %)b4ôF+µáŸŒFSÄh»|4žFm¢g‚ 5V ù¸ #xÔ^
-Súå- -®†*Þx“‘ E 6€E ¬éÖ âý£ s
-°¡¸ŒXM@õQŒØ† ‘[›Ø ‘
-%ÀUåaÊQ IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/tab_press.9.png Tue May 11 16:33:42 2010
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-
-IHDR
- d ] ºî tEXtSoftware Adobe ImageReadyqÉe< ÒIDATxÚìXA
-ƒ@ LÊÞõ Ûoô =ø@
-ö%=ö¢/èµ/ˆ‰ZPšÂ® Ô:
ì$LŒAÇ°ˆ g̬ ° ŽI¥zT?©Wòˆ"w’æF ^ÇsÃK‹?Ð ó“dâÉI‹˜vX^Èe±IÙd÷þ‘‰¾³ {` e2a"¶ñ
-C÷Ö,Ï>ñÙå¹ê c´ã1ÂÃÅ Aæ€
Lø'\wó rË3±òã‹ î·n—ã'üj‡k ççç†Ã,À3 ë“ÚgúýÄwy* ëÔ$ ¯Ø[?NÕ¦'"; {©ÂêÚs-ó IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/tab_selected.9.png Tue May 11 16:33:42 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/tab_unselected.9.png Tue May 11 16:33:42 2010
+++ /dev/null
@@ -1,14 +0,0 @@
-‰PNG
-
-
-IHDR
- b ‹IYó tEXtSoftware Adobe ImageReadyqÉe< IDATxÚì˜]
-ƒ0 ÇÓY}Ö x#O° î8^BðÙ' üÊh!2X‚‹8t# ¼´ýõŸ¶¡
-
-¥ Ç5VU
-}ßC×uP×õÛ ÏAyžCš¦0Ï3«ÄBEQDh ºq Y–EÈ{¯‡‚ W‰T’$ù
-
-
- PA[¶ B BÄÕO
- ,¼ké¢áY Ù– ]8Ë-aÿ'<ÜsÃ:Û½ ð–e±Ü³’àwž »,-aíœNZSx-‚KŸ , W
-7MSt• jH4ŽãáJNT"5Ux¤¦Þ=©$ˆÅTÓ4È©ÑÏΫ•eé<Íü6›s
õE¨m[UÂR÷P0w©@DfâÕž ?Á/¾^ Fp IEND®B`‚
=======================================
--- /main/res/drawable/fake_native_tab.xml Tue May 11 15:45:03 2010
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
- <!-- Copyright (c) Mark Wyszomierski, 2010. -->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fake_native_tab_selector" >
-
- <!-- Non focused states -->
- <item android:state_focused="false" android:state_selected="false"
android:state_pressed="false" android:drawable="@drawable/tab_unselected" />
- <item android:state_focused="false" android:state_selected="true"
android:state_pressed="false" android:drawable="@drawable/tab_selected" />
-
- <!-- Focused states -->
- <item android:state_focused="true" android:state_selected="false"
android:state_pressed="false" android:drawable="@drawable/tab_focus" />
- <item android:state_focused="true" android:state_selected="true"
android:state_pressed="false" android:drawable="@drawable/tab_focus" />
-
- <!-- Pressed -->
- <item android:state_pressed="true"
android:drawable="@drawable/tab_press" />
-
-</selector>
=======================================
--- /main/res/drawable/tips_tab_selected.png Wed Mar 10 19:35:55 2010
+++ /dev/null
@@ -1,31 +0,0 @@
-‰PNG
-
-
-IHDR # #
-Ù³Y tEXtSoftware Adobe ImageReadyqÉe< ~IDATxÚÜXMh A žý›MÂ ¤
ôÔ^ Ï èU¡'A„–Þ¤¢´B lKJñ^ôÚ“ +ö’¶§Æä¢Ô‹·^,x A
-B!P Ùd³ÿ~oL«†lw·›–Ò YÂî›o¾÷½7oW
-à ]–!³K4Ô¬ &§&3=_«ÖâÁ`‘›˜J°â 7ÿ ¶ ûž˜ ¡ínK’”‡1a2 ¿Œ£ ²p&  ÐjW¯j
Ã˜Ê DQ SUÕ Ìµ •aäÉ= ¾ï—=Ï ƒ
-Å13 E
- `\ç [åýÓVX*-¥ 4 V>{¾gض=ÝétÞœ
- @F‰ Îùa
- š¦¥ ³ ÿ‡<ä#xnT‘•XÍà
-™éºî$ñnwìÄH(ÌŠª8Ä:ü+± ¦ TEe ÿ»ãÅ¥Åñ¶ÕÞu
-wø EÒ‡’‘oò[È X.ŸcšªÅƒ‘eY :
-ˆ-·,Kñ\ dWr1
-m" ñ
-ÿ ^Š@|
Ñ“Ø ‹¿^ßÃtßsOæbÑ ˆ–Ñf‚ €<_ÌT.bÁ¤©'Æ { -ìº. »‚™«s6ÍÎÍÞÆ®v ó<×8£l ¸'
- Ó Â´Œ áG ÎtPÖ ¤
-øÁ¨'yBˆ) laíŸB+ ÏzkKj0 o7¾a Ë*àso!Î"ਠ¹0 ‹b FÀÅv»ý
- Gpf¥ °ƒçV ¦—ƒ p
- ¢ Ç~Z s¬Í
-€»Õ7Š¡¤ ¦
-<”UÀ4‹MH /`N½ Ýr"`I ؈ °zŽš½ßm]EhȨO"vD¨$Vï
-uf0fÓŒd† B*rÿ‚
-Ž6â#þ{5pfšf“E
-¶¢uEöår9qj*if íà Ìé=4Õˆfè8æñyk÷o »¡`º¬S/- }ü €,bŠt Wô ºóÈÊó•ñ,¬Qˆ¨›C‹IÝÝ×B¡p ×
-j܈•Þ–µ 3 Ô” ˜¯Ã>•–K•F£á˜¦É
-ÇIƒå† ¯"ºÆ è}'ÀÌ Õ)×ûs4 ž ¦²S9šy8ó
-m‡Ò ´> ñ†Q±c [àãìÁ| Pw –º`öYËl áÇ‚¡±YÞü0ÿtþ
-”°³"Å›€hŽÆ’6ä”I:× ‘=Ïpý í‡`¤Õj
Ñ ^¦¥¬ŸD "_Kº/‚¢ù&0 šf³) bªú®:80WöûÌ¥ ó[€ kݶ{
-ó
- IEND®B`‚
=======================================
--- /main/res/drawable/tips_tab_unselected.png Wed Mar 10 19:35:55 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/layout/fake_native_tab.xml Tue Sep 14 12:06:25 2010
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
- <!-- Copyright 2010 Mark Wyszomierski -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fakeNativeTabLayout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/fake_native_tab"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/fakeNativeTabImageView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <TextView
- android:id="@+id/fakeNativeTabTextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14dip" />
-
-</LinearLayout>
=======================================
--- /main/res/layout/tips_activity_empty.xml Tue Sep 28 19:28:32 2010
+++ /main/res/layout/tips_activity_empty.xml Wed Sep 29 11:12:24 2010
@@ -15,7 +15,7 @@
android:id="@+id/todosActivityEmptyTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="No tips available"
+ android:text="@string/no_tips"
/>
</LinearLayout>
=======================================
--- /main/res/layout/todos_activity_empty.xml Tue Sep 28 19:28:32 2010
+++ /main/res/layout/todos_activity_empty.xml Wed Sep 29 11:12:24 2010
@@ -15,7 +15,7 @@
android:id="@+id/todosActivityEmptyTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="No to-do's available"
+ android:text="@string/no_todos"
/>
</LinearLayout>
=======================================
--- /main/res/values/strings.xml Tue Sep 28 11:53:21 2010
+++ /main/res/values/strings.xml Wed Sep 29 11:12:24 2010
@@ -413,6 +413,8 @@
<string name="user_details_pings_activity_description_off">You are not
getting pings from %s</string>
<string name="user_details_pings_activity_pings_on">Turn pings
on</string>
<string name="user_details_pings_activity_pings_off">Turn pings
off</string>
+ <string name="no_tips">There are no tips here</string>
+ <string name="no_todos">There are no To-Do\'s here</string>
<string name="venue_map_activity_title">Foursquare %s</string>
</resources>
=======================================
--- /main/src/com/joelapenna/foursquare/Foursquare.java Mon Sep 27 12:49:27
2010
+++ /main/src/com/joelapenna/foursquare/Foursquare.java Wed Sep 29 11:12:24
2010
@@ -170,10 +170,10 @@
}
@V1
- public Group<Tip> tips(Location location, String uid, String filter,
int limit) throws FoursquareException,
- FoursquareError, IOException {
+ public Group<Tip> tips(Location location, String uid, String filter,
String sort, int limit)
+ throws FoursquareException, FoursquareError, IOException {
return mFoursquareV1.tips(location.geolat, location.geolong,
location.geohacc,
- location.geovacc, location.geoalt, uid, filter, limit);
+ location.geovacc, location.geoalt, uid, filter, sort,
limit);
}
@V1
=======================================
--- /main/src/com/joelapenna/foursquare/FoursquareHttpApiV1.java Mon Sep 27
09:39:25 2010
+++ /main/src/com/joelapenna/foursquare/FoursquareHttpApiV1.java Wed Sep 29
11:12:24 2010
@@ -337,7 +337,7 @@
*/
@SuppressWarnings("unchecked")
Group<Tip> tips(String geolat, String geolong, String geohacc, String
geovacc,
- String geoalt, String uid, String filter, int limit) throws
FoursquareException,
+ String geoalt, String uid, String filter, String sort, int
limit) throws FoursquareException,
FoursquareError, IOException {
HttpGet httpGet = mHttpApi.createHttpGet(fullUrl(URL_API_TIPS), //
new BasicNameValuePair("geolat", geolat), //
@@ -347,6 +347,7 @@
new BasicNameValuePair("geoalt", geoalt), //
new BasicNameValuePair("uid", uid), //
new BasicNameValuePair("filter", filter), //
+ new BasicNameValuePair("sort", sort), //
new BasicNameValuePair("l", String.valueOf(limit)) //
);
return (Group<Tip>) mHttpApi.doHttpRequest(httpGet, new
GroupParser(
=======================================
--- /main/src/com/joelapenna/foursquared/TipsActivity.java Mon Sep 27
08:50:45 2010
+++ /main/src/com/joelapenna/foursquared/TipsActivity.java Wed Sep 29
11:12:24 2010
@@ -366,6 +366,7 @@
LocationUtils.createFoursquareLocation(loc),
null,
mFriendsOnly ? "friends" : "nearby",
+ null,
30);
} catch (Exception e) {
mReason = e;
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Mon
Sep 27 09:56:53 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Wed
Sep 29 11:12:24 2010
@@ -245,10 +245,10 @@
// of the target tip.
if (requestCode == ACTIVITY_TIP && resultCode ==
Activity.RESULT_OK) {
if (data.hasExtra(TipActivity.EXTRA_TIP_RETURNED)) {
- Log.d(TAG, "onActivityResult(), return tip intent extra
found, processing.");
+ Log.i(TAG, "onActivityResult(), return tip intent extra
found, processing.");
updateTip((Tip)data.getParcelableExtra(TipActivity.EXTRA_TIP_RETURNED));
} else {
- Log.d(TAG, "onActivityResult(), no return tip intent extra
found.");
+ Log.i(TAG, "onActivityResult(), no return tip intent extra
found.");
}
}
}
@@ -375,6 +375,7 @@
return foursquare.tips(
LocationUtils.createFoursquareLocation(loc),
mUserId,
+ null,
mRecentOnly ? "recent" : "popular",
30);
} catch (Exception e) {
=======================================
--- /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Tue Sep
28 10:56:27 2010
+++ /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Wed Sep
29 11:12:24 2010
@@ -104,7 +104,7 @@
mStateHolder.getCheckinsOthers().size() == 1 ?
R.string.venue_activity_checkins_count_friends_single :
R.string.venue_activity_checkins_count_friends_plural,
- mStateHolder.getCheckinsOthers().size());
+ mStateHolder.getCheckinsFriends().size());
CheckinListAdapter adapter = new CheckinListAdapter(this,
((Foursquared)
getApplication()).getRemoteResourceManager());
=======================================
--- /main/src/com/joelapenna/foursquared/util/TabsUtil.java Mon Sep 27
09:56:53 2010
+++ /main/src/com/joelapenna/foursquared/util/TabsUtil.java Wed Sep 29
11:12:24 2010
@@ -36,42 +36,6 @@
TabsUtil4.setTabIndicator(spec, view);
}
}
- /*
- private static TabHost.TabSpec addNativeLookingTab(Context context,
final TabHost tabHost, String specName,
- String label, int iconId) {
- View view =
LayoutInflater.from(context).inflate(R.layout.fake_native_tab, null);
- ImageView iv = (ImageView)
view.findViewById(R.id.fakeNativeTabImageView);
- iv.setImageResource(iconId);
- TextView tv = (TextView)
view.findViewById(R.id.fakeNativeTabTextView);
- tv.setText(label);
-
- int sdk = new Integer(Build.VERSION.SDK).intValue();
- if (sdk > 3) {
- TabsUtil4.addNativeLookingTab(context, tabHost, view);
- }
-
- TabHost.TabSpec spec = tabHost.newTabSpec(specName);
- TabsUtil.setTabIndicator(spec, label,
context.getResources().getDrawable(iconId), view);
- return spec;
- }
-
- public static void addNativeLookingTab(Context context, final TabHost
tabHost, String specName,
- String label, int iconId, int layout) {
- TabHost.TabSpec spec = addNativeLookingTab(context, tabHost,
specName, label, iconId);
-
- spec.setContent(layout);
- tabHost.addTab(spec);
- }
-
- public static void addNativeLookingTab(Context context, final TabHost
tabHost, String specName,
- String label, int iconId, Intent intent) {
- TabHost.TabSpec spec = addNativeLookingTab(context, tabHost,
specName, label, iconId);
-
- spec.setContent(intent);
- tabHost.addTab(spec);
- }
- */
-
public static void addTab(TabHost host, String title, int drawable,
int index, int layout) {
TabHost.TabSpec spec = host.newTabSpec("tab" + index);
=======================================
--- /main/src/com/joelapenna/foursquared/util/TabsUtil3.java Wed Mar 10
03:10:47 2010
+++ /main/src/com/joelapenna/foursquared/util/TabsUtil3.java Wed Sep 29
11:12:24 2010
@@ -22,10 +22,10 @@
}
public static void setTabIndicator(TabSpec spec, String title,
Drawable drawable) {
- if (drawable != null) {
- spec.setIndicator(title, drawable);
- } else {
+ // if (drawable != null) {
+ // spec.setIndicator(title, drawable);
+ // } else {
spec.setIndicator(title);
- }
+ // }
}
}
=======================================
--- /main/src/com/joelapenna/foursquared/util/TabsUtil4.java Tue May 11
15:45:03 2010
+++ /main/src/com/joelapenna/foursquared/util/TabsUtil4.java Wed Sep 29
11:12:24 2010
@@ -4,13 +4,8 @@
package com.joelapenna.foursquared.util;
-import com.joelapenna.foursquared.R;
-
-import android.content.Context;
import android.view.View;
import android.widget.TabHost;
-import android.widget.TextView;
-import android.widget.TabHost.OnTabChangeListener;
import android.widget.TabHost.TabSpec;
/**
@@ -34,32 +29,4 @@
public static int getTabCount(TabHost tabHost) {
return tabHost.getTabWidget().getTabCount();
}
-
- public static void addNativeLookingTab(Context context, final TabHost
tabHost, View tabView) {
-
- // Since we're using a custom view, we need to manually set the
colors of the focused
- // and non-focused tab textviews as the user selects different
tabs.
- int tabIndex = tabHost.getTabWidget().getTabCount();
- setNativeLookingTabTextColor(tabView, tabIndex, 0);
-
- tabHost.setOnTabChangedListener(new OnTabChangeListener() {
- @Override
- public void onTabChanged(String arg0) {
- int tabSelected = tabHost.getCurrentTab();
- for (int i = 0, m = TabsUtil4.getTabCount(tabHost); i < m;
i++) {
- View view = tabHost.getTabWidget().getChildAt(i);
- setNativeLookingTabTextColor(view, i, tabSelected);
- }
- }
- });
- }
-
- private static void setNativeLookingTabTextColor(View view, int
ourIndex, int selectedIndex) {
- TextView tv = (TextView)
view.findViewById(R.id.fakeNativeTabTextView);
- if (ourIndex == selectedIndex) {
-
tv.setTextColor(view.getContext().getResources().getColor(R.color.dgrey_start));
- } else {
-
tv.setTextColor(view.getContext().getResources().getColor(R.color.white));
- }
- }
-}
+}
==============================================================================
Revision: 3a9b186b23
Author: mar...@gmail.com
Date: Wed Sep 29 12:59:38 2010
Log: More cleanup. Added venue name or username to titles of activities
where appropriate to provide more context for the user.
http://code.google.com/r/markww-foursquared/source/detail?r=3a9b186b23
Added:
/main/res/drawable-hdpi/tab_search_nav_map_off.png
/main/res/drawable-hdpi/tab_search_nav_map_on.png
Modified:
/main/res/values/strings.xml
/main/src/com/joelapenna/foursquare/Foursquare.java
/main/src/com/joelapenna/foursquared/BadgesActivity.java
/main/src/com/joelapenna/foursquared/TodosActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsFollowersActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java
/main/src/com/joelapenna/foursquared/UserHistoryActivity.java
/main/src/com/joelapenna/foursquared/UserMayorshipsActivity.java
/main/src/com/joelapenna/foursquared/VenueActivity.java
/main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java
/main/src/com/joelapenna/foursquared/VenueTipsActivity.java
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_map_off.png Wed Sep 29 12:59:38
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_map_on.png Wed Sep 29 12:59:38
2010
Binary file, no diff available.
=======================================
--- /main/res/values/strings.xml Wed Sep 29 11:12:24 2010
+++ /main/res/values/strings.xml Wed Sep 29 12:59:38 2010
@@ -21,6 +21,7 @@
<string name="add_venue_activity_error_no_venue_state">Please supply a
venue state.</string>
<string name="address">Address</string>
<string name="app_name">Foursquare</string>
+ <string name="badges_activity_title">Foursquare Badges - %s</string>
<string name="badges_header">Badges</string>
<string name="checkin_action_label">Check-in!</string>
<string name="checkin_badges">You\'ve just unlocked</string>
@@ -32,8 +33,6 @@
<string name="checkin_title_checking_in">Checking in @%s</string>
<string name="checkin_totals">Total:</string>
<string name="checkin_title_result">Checked in!</string>
- <string name="checkins_activity_label">Foursquare Friends</string>
- <string name="checkins_label">Friends</string>
<string name="city">City</string>
<string name="cross_street">Cross Street</string>
<string name="feedback_error">Couldn\'t find configured email
client.</string>
@@ -158,13 +157,11 @@
<string name="title_search_finished_noquery">Nearby - Foursquare</string>
<string name="title_search_inprogress">Searching "%s" -
Foursquare</string>
<string name="title_search_inprogress_noquery">Searching Nearby -
Foursquare</string>
- <string name="venue_checkin_activity_label">Foursquare Venue
Check-In</string>
<string name="venue_checkins_tab">Checkins</string>
<string name="venue_info_activity_label">Foursquare Venue</string>
<string name="venue_info_tab">Tips</string>
<string name="venue_name">Venue Name</string>
<string name="venue_search_activity_label">Foursquare Venues</string>
- <string name="venue_tips_activity_label">Foursquare Tips</string>
<string name="venues_search_hint">Type a venue name or tag</string>
<string name="venues_search_label">Venue Search</string>
<string name="zip_code">Zip Code</string>
@@ -215,10 +212,9 @@
<string name="user_actions_activity_action_twitter">Twitter</string>
<string name="user_actions_activity_action_facebook">Facebook</string>
<string name="user_actions_activity_label_Last_seen_at">Last seen
at %s</string>
- <string name="user_history_activity_title">Foursquare Check-in
History</string>
+ <string name="user_history_activity_title">Foursquare History
- %s</string>
<string name="user_history_activity_no_info">No history
available.</string>
- <string name="user_friends_activity_title">Foursquare Friends</string>
- <string name="user_mayorships_activity_title">Foursquare
Mayorships</string>
+ <string name="user_mayorships_activity_title">Foursquare Mayorships
- %s</string>
<string name="user_details_activity_title_mayorships">MAYORSHIPS</string>
<string name="user_details_activity_title_badges">BADGES</string>
@@ -233,7 +229,6 @@
<string name="user_details_activity_set_photo_cancel">Set photo request
cancelled.</string>
<string name="user_details_activity_friend_add">ADD AS FRIEND</string>
<string name="user_details_activity_friend_confirm">CONFIRM AS
FRIEND</string>
-
<string name="user_details_activity_last_seen">Last seen:</string>
<string
name="user_details_activity_general_mayorships">MAYORSHIPS</string>
<string name="user_details_activity_general_badges">BADGES</string>
@@ -253,6 +248,8 @@
<string name="user_details_activity_add_friends">Add Friends</string>
<string
name="user_details_activity_friends_menu_contact">Contact</string>
<string name="user_details_activity_friends_menu_pings">Pings</string>
+
+ <string name="user_details_friends_activity_title">Foursquare Friends
- %s</string>
<string
name="checkin_execute_activity_progress_bar_message">Checking-in...</string>
<string name="shout_execute_activity_progress_bar_message">Posting
shout...</string>
@@ -266,8 +263,6 @@
<string name="venue_activity_checkin_button">Check In Here</string>
<string name="venue_activity_checkin_button_quick">QUICK CHECK-IN
HERE</string>
<string name="venue_activity_tip_add_result">Added Tip #%s %s</string>
- <string name="venue_checkins_activity_label_recent_checkins">Recent
Checkins</string>
- <string name="venue_checkins_activity_label_mayor">Mayor</string>
<string name="send_invite_button">Invite</string>
<string name="prelaunch_text"></string>
<string name="prelaunch_button"></string>
@@ -343,10 +338,9 @@
<string name="tip_activity_btn_tip_2">I\'VE DONE THIS</string>
<string name="tip_activity_btn_tip_3">UNDO THIS</string>
<string name="tip_activity_btn_tip_4">CONGRATS! YOU\'VE DONE
THIS</string>
- <string name="todos_activity_title">Foursquare To-Do List %s</string>
+ <string name="todos_activity_title">Foursquare To-Do List - %s</string>
<string name="todos_activity_btn_recent">RECENT</string>
<string name="todos_activity_btn_nearby">NEARBY</string>
- <string name="todos_activity_no_todos">No To-Dos Here!</string>
<string name="todo_added_date">"added %s"</string>
<string name="tab_main_nav_friends">Friends</string>
<string name="tab_main_nav_nearby">Places</string>
@@ -390,7 +384,7 @@
<string name="venue_activity_todo_added_ok">To-Do added!</string>
<string name="venue_activity_todo_here">You have a To-Do here!</string>
<string name="venue_share_activity_title">Share</string>
- <string name="venue_tips_activity_title">Foursquare Tips</string>
+ <string name="venue_tips_activity_title">Foursquare Tips - %s</string>
<string name="venue_tips_activity_section_all">Tips left here
(%d)</string>
<string name="venue_tips_activity_section_friends">Tips from friends
(%d)</string>
<string name="add_tip_activity_text_hint">For example: Try the sea salt
vanilla ice cream. Best dessert downtown!</string>
@@ -398,13 +392,13 @@
<string name="add_tip_todo_activity_progress_message">Adding...</string>
<string name="add_todo_activity_text_hint">Add a note (optional)</string>
<string name="add_todo_activity_text_button">Add to my to-do
list</string>
- <string name="user_details_tips_activity_title">Foursquare Tips</string>
+ <string name="user_details_tips_activity_title">Foursquare Tips
- %s</string>
<string name="user_details_tips_activity_btn_recent">RECENT</string>
<string name="user_details_tips_activity_btn_popular">POPULAR</string>
- <string name="user_details_friends_in_common_title">Foursquare
Friends</string>
+ <string name="user_details_friends_in_common_title">Foursquare Friends
- %s</string>
<string name="user_details_friends_in_common_common_friends">FRIENDS IN
COMMON</string>
<string name="user_details_friends_in_common_all_friends">ALL
FRIENDS</string>
- <string name="user_details_friends_followers_activity_title">Foursquare
Friends</string>
+ <string name="user_details_friends_followers_activity_title">Foursquare
Friends - %s</string>
<string
name="user_details_friends_followers_activity_followers">FOLLOWERS</string>
<string name="user_details_friends_followers_activity_friends">ALL
FRIENDS</string>
<string name="refresh">Refresh</string>
@@ -414,7 +408,7 @@
<string name="user_details_pings_activity_pings_on">Turn pings
on</string>
<string name="user_details_pings_activity_pings_off">Turn pings
off</string>
<string name="no_tips">There are no tips here</string>
- <string name="no_todos">There are no To-Do\'s here</string>
-
- <string name="venue_map_activity_title">Foursquare %s</string>
+ <string name="no_todos">There are no To-Do items here</string>
+ <string name="venue_map_activity_title">Foursquare - %s</string>
+ <string name="venue_checkins_activity_title">Foursquare Checkins
- %s</string>
</resources>
=======================================
--- /main/src/com/joelapenna/foursquare/Foursquare.java Wed Sep 29 11:12:24
2010
+++ /main/src/com/joelapenna/foursquare/Foursquare.java Wed Sep 29 12:59:38
2010
@@ -34,7 +34,7 @@
*/
public class Foursquare {
private static final Logger LOG =
Logger.getLogger("com.joelapenna.foursquare");
- public static final boolean DEBUG = false;
+ public static final boolean DEBUG = true;
public static final boolean PARSER_DEBUG = false;
public static final String FOURSQUARE_API_DOMAIN
= "api.foursquare.com";
=======================================
--- /main/src/com/joelapenna/foursquared/BadgesActivity.java Mon May 24
16:18:54 2010
+++ /main/src/com/joelapenna/foursquared/BadgesActivity.java Wed Sep 29
12:59:38 2010
@@ -43,6 +43,8 @@
public static final String EXTRA_BADGE_ARRAY_LIST_PARCEL =
Foursquared.PACKAGE_NAME
+ ".BadgesActivity.EXTRA_BADGE_ARRAY_LIST_PARCEL";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".BadgesActivity.EXTRA_USER_NAME";
private static final int DIALOG_ID_INFO = 1;
@@ -70,9 +72,9 @@
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
} else {
- mStateHolder = new StateHolder();
- if (getIntent().getExtras() != null &&
getIntent().getExtras().containsKey(
- EXTRA_BADGE_ARRAY_LIST_PARCEL)) {
+ if (getIntent().hasExtra(EXTRA_BADGE_ARRAY_LIST_PARCEL) &&
getIntent().hasExtra(EXTRA_USER_NAME)) {
+
+ mStateHolder = new
StateHolder(getIntent().getStringExtra(EXTRA_USER_NAME));
// Can't jump from ArrayList to Group, argh.
ArrayList<Badge> badges =
getIntent().getExtras().getParcelableArrayList(
@@ -120,6 +122,8 @@
showDialogInfo(badge.getName(), badge.getDescription(),
badge.getIcon());
}
});
+
+ setTitle(getString(R.string.badges_activity_title,
mStateHolder.getUsername()));
}
private void showDialogInfo(String title, String message, String
badgeIconUrl) {
@@ -156,22 +160,28 @@
}
private static class StateHolder {
+ private String mUsername;
private Group<Badge> mBadges;
private String mDlgInfoTitle;
private String mDlgInfoMessage;
private String mDlgInfoBadgeIconUrl;
- public StateHolder() {
+ public StateHolder(String username) {
+ mUsername = username;
mBadges = new Group<Badge>();
}
- public void setBadges(Group<Badge> badges) {
- mBadges = badges;
- }
-
+ public String getUsername() {
+ return mUsername;
+ }
+
public Group<Badge> getBadges() {
return mBadges;
}
+
+ public void setBadges(Group<Badge> badges) {
+ mBadges = badges;
+ }
public String getDlgInfoTitle() {
return mDlgInfoTitle;
=======================================
--- /main/src/com/joelapenna/foursquared/TodosActivity.java Mon Sep 27
08:50:45 2010
+++ /main/src/com/joelapenna/foursquared/TodosActivity.java Wed Sep 29
12:59:38 2010
@@ -57,6 +57,8 @@
public static final String INTENT_EXTRA_USER_ID =
Foursquared.PACKAGE_NAME
+ ".TodosActivity.INTENT_EXTRA_USER_ID";
+ public static final String INTENT_EXTRA_USER_NAME =
Foursquared.PACKAGE_NAME
+ + ".TodosActivity.INTENT_EXTRA_USER_NAME";
private static final int ACTIVITY_TIP = 500;
@@ -86,8 +88,11 @@
mStateHolder = (StateHolder) retained;
mStateHolder.setActivity(this);
} else {
- // Optional user id, if not present, will be null and default
to logged-in user.
- mStateHolder = new
StateHolder(getIntent().getStringExtra(INTENT_EXTRA_USER_ID));
+ // Optional user id and username, if not present, will be null
and default to
+ // logged-in user.
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(INTENT_EXTRA_USER_ID),
+ getIntent().getStringExtra(INTENT_EXTRA_USER_NAME));
mStateHolder.setRecentOnly(false);
}
@@ -130,7 +135,7 @@
private void ensureUi() {
LayoutInflater inflater = LayoutInflater.from(this);
- setTitle(getString(R.string.todos_activity_title, ""));
+ setTitle(getString(R.string.todos_activity_title,
mStateHolder.getUsername()));
mLayoutEmpty = inflater.inflate(
R.layout.todos_activity_empty, null);
@@ -423,9 +428,10 @@
private TaskTodos mTaskTodosRecent;
private TaskTodos mTaskTodosNearby;
private String mUserId;
+ private String mUsername;
- public StateHolder(String userId) {
+ public StateHolder(String userId, String username) {
mIsRunningTaskTodosRecent = false;
mIsRunningTaskTodosNearby = false;
mRanOnceTodosRecent = false;
@@ -434,6 +440,11 @@
mTodosNearby = new Group<Todo>();
mRecentOnly = false;
mUserId = userId;
+ mUsername = username;
+ }
+
+ public String getUsername() {
+ return mUsername;
}
public Group<Todo> getTodosRecent() {
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsActivity.java Tue Sep
28 10:20:10 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsActivity.java Wed Sep
29 12:59:38 2010
@@ -570,6 +570,8 @@
Intent intent = new Intent(UserDetailsActivity.this,
BadgesActivity.class);
intent.putParcelableArrayListExtra(BadgesActivity.EXTRA_BADGE_ARRAY_LIST_PARCEL,
mStateHolder.getUser().getBadges());
+ intent.putExtra(BadgesActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
startActivity(intent);
}
}
@@ -578,12 +580,16 @@
if (mStateHolder.getUser() != null) {
Intent intent = new Intent(UserDetailsActivity.this,
UserMayorshipsActivity.class);
intent.putExtra(UserMayorshipsActivity.EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserMayorshipsActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
startActivity(intent);
}
}
private void startCheckinsActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
UserHistoryActivity.class);
+ intent.putExtra(UserHistoryActivity.EXTRA_USER_NAME,
+ StringFormatters.getUserFullName(mStateHolder.getUser()));
startActivity(intent);
}
@@ -593,9 +599,13 @@
Intent intent = null;
if (user.getFollowerCount() > 0) {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsFollowersActivity.class);
+
intent.putExtra(UserDetailsFriendsFollowersActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
} else {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsActivity.class);
intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
}
startActivity(intent);
}
@@ -615,6 +625,8 @@
} else {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsActivity.class);
intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
}
startActivity(intent);
}
@@ -622,12 +634,16 @@
private void startTodosActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
TodosActivity.class);
intent.putExtra(TodosActivity.INTENT_EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(TodosActivity.INTENT_EXTRA_USER_NAME,
StringFormatters.getUserFullName(
+ mStateHolder.getUser()));
startActivity(intent);
}
private void startTipsActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
UserDetailsTipsActivity.class);
intent.putExtra(UserDetailsTipsActivity.INTENT_EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserDetailsTipsActivity.INTENT_EXTRA_USER_NAME,
StringFormatters.getUserFullName(
+ mStateHolder.getUser()));
startActivity(intent);
}
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsFriendsActivity.java
Sat Sep 25 22:10:34 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsFriendsActivity.java
Wed Sep 29 12:59:38 2010
@@ -36,6 +36,8 @@
public static final String EXTRA_USER_ID = Foursquared.PACKAGE_NAME
+ ".UserDetailsFriendsActivity.EXTRA_USER_ID";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserDetailsFriendsActivity.EXTRA_USER_NAME";
public static final String EXTRA_SHOW_ADD_FRIEND_OPTIONS =
Foursquared.PACKAGE_NAME
+ ".UserDetailsFriendsActivity.EXTRA_SHOW_ADD_FRIEND_OPTIONS";
@@ -56,23 +58,23 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_friends_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivityForTaskFriends(this);
} else {
-
- mStateHolder = new StateHolder();
- if (getIntent().getExtras().containsKey(EXTRA_USER_ID) ==
false) {
- Log.e(TAG, "UserFriendsActivity requires a userid in its
intent extras.");
+ if (getIntent().hasExtra(EXTRA_USER_ID) &&
getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(EXTRA_USER_ID),
+ getIntent().getStringExtra(EXTRA_USER_NAME));
+ } else {
+ Log.e(TAG, TAG + " requires a userid and username in its
intent extras.");
finish();
return;
}
-
mStateHolder.setUserId(getIntent().getExtras().getString(EXTRA_USER_ID));
- mStateHolder.startTaskFriends(this, mStateHolder.getUserId());
+ mStateHolder.startTaskFriends(this);
}
ensureUi();
@@ -124,6 +126,8 @@
} else if (mStateHolder.getFetchedFriendsOnce() &&
mStateHolder.getFriends().size() == 0) {
setEmptyView();
}
+
+ setTitle(getString(R.string.user_details_friends_activity_title,
mStateHolder.getUsername()));
}
private void onFriendsTaskComplete(Group<User> group, Exception ex) {
@@ -203,10 +207,8 @@
private static class StateHolder {
- /** User id. */
private String mUserId;
-
- /** Friends of the current user. */
+ private String mUsername;
private Group<User> mFriends;
private FriendsTask mTaskFriends;
@@ -214,18 +216,16 @@
private boolean mFetchedFriendsOnce;
- public StateHolder() {
+ public StateHolder(String userId, String username) {
+ mUserId = userId;
+ mUsername = username;
mIsRunningFriendsTask = false;
mFetchedFriendsOnce = false;
mFriends = new Group<User>();
}
- public String getUserId() {
- return mUserId;
- }
-
- public void setUserId(String userId) {
- mUserId = userId;
+ public String getUsername() {
+ return mUsername;
}
public Group<User> getFriends() {
@@ -236,11 +236,10 @@
mFriends = friends;
}
- public void startTaskFriends(UserDetailsFriendsActivity activity,
- String userId) {
+ public void startTaskFriends(UserDetailsFriendsActivity activity) {
mIsRunningFriendsTask = true;
mTaskFriends = new FriendsTask(activity);
- mTaskFriends.execute(userId);
+ mTaskFriends.execute(mUserId);
}
public void setActivityForTaskFriends(UserDetailsFriendsActivity
activity) {
=======================================
---
/main/src/com/joelapenna/foursquared/UserDetailsFriendsFollowersActivity.java
Tue Sep 28 19:28:32 2010
+++
/main/src/com/joelapenna/foursquared/UserDetailsFriendsFollowersActivity.java
Wed Sep 29 12:59:38 2010
@@ -47,8 +47,8 @@
static final String TAG = "UserDetailsFriendsFollowersActivity";
static final boolean DEBUG = FoursquaredSettings.DEBUG;
- public static final String INTENT_EXTRA_USER_ID =
Foursquared.PACKAGE_NAME
- + ".UserDetailsFriendsFollowersActivity.INTENT_EXTRA_USER_ID";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserDetailsFriendsFollowersActivity.EXTRA_USER_NAME";
private StateHolder mStateHolder;
private FriendActionableListAdapter mListAdapter;
@@ -69,15 +69,20 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
-
setTitle(getString(R.string.user_details_friends_followers_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivity(this);
} else {
- mStateHolder = new StateHolder();
- mStateHolder.setFollowersOnly(true);
+ if (getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new
StateHolder(getIntent().getStringExtra(EXTRA_USER_NAME));
+ mStateHolder.setFollowersOnly(true);
+ } else {
+ Log.e(TAG, TAG + " requires user name in intent extras.");
+ finish();
+ return;
+ }
}
ensureUi();
@@ -203,6 +208,9 @@
} else {
setProgressBarIndeterminateVisibility(false);
}
+
+
setTitle(getString(R.string.user_details_friends_followers_activity_title,
+ mStateHolder.getUsername()));
}
private FriendActionableListAdapter.ButtonRowClickHandler
mButtonRowClickHandler =
@@ -492,6 +500,7 @@
}
private static class StateHolder {
+ private String mUsername;
private Group<User> mFollowers;
private Group<User> mFriends;
@@ -506,7 +515,8 @@
private List<TaskUpdateFollower> mTasksUpdateFollowers;
- public StateHolder() {
+ public StateHolder(String username) {
+ mUsername = username;
mIsRunningTaskFollowers = false;
mIsRunningTaskFriends = false;
mRanOnceFriends = false;
@@ -516,6 +526,10 @@
mFollowersOnly = true;
mTasksUpdateFollowers = new ArrayList<TaskUpdateFollower>();
}
+
+ public String getUsername() {
+ return mUsername;
+ }
public Group<User> getFollowers() {
return mFollowers;
=======================================
---
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
Sat Sep 25 14:13:22 2010
+++
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
Wed Sep 29 12:59:38 2010
@@ -10,6 +10,7 @@
import
com.joelapenna.foursquared.app.LoadableListActivityWithViewAndHeader;
import com.joelapenna.foursquared.location.LocationUtils;
import com.joelapenna.foursquared.util.NotificationsUtil;
+import com.joelapenna.foursquared.util.StringFormatters;
import com.joelapenna.foursquared.widget.FriendListAdapter;
import com.joelapenna.foursquared.widget.SegmentedButton;
import
com.joelapenna.foursquared.widget.SegmentedButton.OnClickListenerSegmentedButton;
@@ -70,7 +71,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_details_friends_in_common_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
@@ -195,6 +195,9 @@
} else {
setProgressBarIndeterminateVisibility(false);
}
+
+ setTitle(getString(R.string.user_details_friends_in_common_title,
+ StringFormatters.getUserFullName(mStateHolder.getUser())));
}
@Override
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Wed
Sep 29 11:12:24 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Wed
Sep 29 12:59:38 2010
@@ -49,7 +49,9 @@
static final boolean DEBUG = FoursquaredSettings.DEBUG;
public static final String INTENT_EXTRA_USER_ID =
Foursquared.PACKAGE_NAME
- + ".TipsActivity.INTENT_EXTRA_USER_ID";
+ + ".UserDetailsTipsActivity.INTENT_EXTRA_USER_ID";
+ public static final String INTENT_EXTRA_USER_NAME =
Foursquared.PACKAGE_NAME
+ + ".UserDetailsTipsActivity.INTENT_EXTRA_USER_NAME";
private static final int ACTIVITY_TIP = 500;
@@ -73,18 +75,19 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_details_tips_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivity(this);
} else {
- if (getIntent().hasExtra(INTENT_EXTRA_USER_ID)) {
- mStateHolder = new
StateHolder(getIntent().getStringExtra(INTENT_EXTRA_USER_ID));
+ if (getIntent().hasExtra(INTENT_EXTRA_USER_ID) &&
getIntent().hasExtra(INTENT_EXTRA_USER_NAME)) {
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(INTENT_EXTRA_USER_ID),
+
getIntent().getStringExtra(INTENT_EXTRA_USER_NAME));
mStateHolder.setRecentOnly(true);
} else {
- Log.e(TAG, TAG + " requires user ID in intent extras.");
+ Log.e(TAG, TAG + " requires user ID and name in intent
extras.");
finish();
return;
}
@@ -215,6 +218,8 @@
} else {
setProgressBarIndeterminateVisibility(false);
}
+
+ setTitle(getString(R.string.user_details_tips_activity_title,
mStateHolder.getUsername()));
}
@Override
@@ -375,7 +380,7 @@
return foursquare.tips(
LocationUtils.createFoursquareLocation(loc),
mUserId,
- null,
+ "nearby",
mRecentOnly ? "recent" : "popular",
30);
} catch (Exception e) {
@@ -407,6 +412,7 @@
private static class StateHolder {
private String mUserId;
+ private String mUsername;
private Group<Tip> mTipsRecent;
private Group<Tip> mTipsPopular;
private TaskTips mTaskTipsRecent;
@@ -418,8 +424,9 @@
private boolean mRanOnceTipsPopular;
- public StateHolder(String userId) {
+ public StateHolder(String userId, String username) {
mUserId = userId;
+ mUsername = username;
mIsRunningTaskTipsRecent = false;
mIsRunningTaskTipsPopular = false;
mRanOnceTipsRecent = false;
@@ -428,6 +435,10 @@
mTipsPopular = new Group<Tip>();
mRecentOnly = true;
}
+
+ public String getUsername() {
+ return mUsername;
+ }
public Group<Tip> getTipsRecent() {
return mTipsRecent;
=======================================
--- /main/src/com/joelapenna/foursquared/UserHistoryActivity.java Sun Sep
26 16:56:17 2010
+++ /main/src/com/joelapenna/foursquared/UserHistoryActivity.java Wed Sep
29 12:59:38 2010
@@ -33,7 +33,9 @@
*/
public class UserHistoryActivity extends LoadableListActivity {
static final String TAG = "UserHistoryActivity";
- static final boolean DEBUG = FoursquaredSettings.DEBUG;
+
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserHistoryActivity.EXTRA_USER_NAME";
private StateHolder mStateHolder;
private HistoryListAdapter mListAdapter;
@@ -42,7 +44,6 @@
private BroadcastReceiver mLoggedOutReceiver = new BroadcastReceiver()
{
@Override
public void onReceive(Context context, Intent intent) {
- if (DEBUG) Log.d(TAG, "onReceive: " + intent);
finish();
}
};
@@ -51,15 +52,20 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_history_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivityForTaskFriends(this);
} else {
- mStateHolder = new StateHolder();
- mStateHolder.startTaskHistory(this);
+ if (getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new
StateHolder(getIntent().getStringExtra(EXTRA_USER_NAME));
+ mStateHolder.startTaskHistory(this);
+ } else {
+ Log.e(TAG, TAG + " requires username as intent extra.");
+ finish();
+ return;
+ }
}
ensureUi();
@@ -104,6 +110,8 @@
} else if (mStateHolder.getFetchedOnce() &&
mStateHolder.getHistory().size() == 0) {
setEmptyView();
}
+
+ setTitle(getString(R.string.user_history_activity_title,
mStateHolder.getUsername()));
}
@Override
@@ -136,7 +144,6 @@
}
private void startVenueActivity(Checkin checkin) {
- // TODO: Perform some action when user is clicking on a shout
history item.
if (checkin != null) {
if (checkin.getVenue() != null
&& !TextUtils.isEmpty(checkin.getVenue().getId())) {
Venue venue = checkin.getVenue();
@@ -210,19 +217,22 @@
private static class StateHolder {
-
- /** History of the logged in user. */
+ private String mUsername;
private Group<Checkin> mHistory;
-
private HistoryTask mTaskHistory;
private boolean mIsRunningHistoryTask;
private boolean mFetchedOnce;
- public StateHolder() {
+ public StateHolder(String username) {
+ mUsername = username;
mIsRunningHistoryTask = false;
mFetchedOnce = false;
mHistory = new Group<Checkin>();
}
+
+ public String getUsername() {
+ return mUsername;
+ }
public Group<Checkin> getHistory() {
return mHistory;
=======================================
--- /main/src/com/joelapenna/foursquared/UserMayorshipsActivity.java Fri
Sep 24 13:57:11 2010
+++ /main/src/com/joelapenna/foursquared/UserMayorshipsActivity.java Wed
Sep 29 12:59:38 2010
@@ -23,8 +23,8 @@
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
-import android.widget.ListView;
import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
import java.util.ArrayList;
@@ -42,6 +42,8 @@
public static final String EXTRA_USER_ID = Foursquared.PACKAGE_NAME
+ ".UserMayorshipsActivity.EXTRA_USER_ID";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserMayorshipsActivity.EXTRA_USER_NAME";
public static final String EXTRA_VENUE_LIST_PARCEL =
Foursquared.PACKAGE_NAME
+ ".UserMayorshipsActivity.EXTRA_VENUE_LIST_PARCEL";
@@ -62,7 +64,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_mayorships_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
@@ -70,13 +71,15 @@
mStateHolder.setActivityForTaskVenues(this);
} else {
- mStateHolder = new StateHolder();
- if (getIntent().getExtras().containsKey(EXTRA_USER_ID) ==
false) {
+ if (getIntent().hasExtra(EXTRA_USER_ID) &&
getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(EXTRA_USER_ID),
+ getIntent().getStringExtra(EXTRA_USER_NAME));
+ } else {
Log.e(TAG, "UserMayorships requires a userid in its intent
extras.");
finish();
return;
}
-
mStateHolder.setUserId(getIntent().getExtras().getString(EXTRA_USER_ID));
if
(getIntent().getExtras().containsKey(EXTRA_VENUE_LIST_PARCEL)) {
// Can't jump from ArrayList to Group, argh.
@@ -89,7 +92,7 @@
mStateHolder.setVenues(group);
} else {
- mStateHolder.startTaskVenues(this,
mStateHolder.getUserId());
+ mStateHolder.startTaskVenues(this);
}
}
@@ -145,6 +148,8 @@
} else if (mStateHolder.getFetchedVenuesOnce() &&
mStateHolder.getVenues().size() == 0) {
setEmptyView();
}
+
+ setTitle(getString(R.string.user_mayorships_activity_title,
mStateHolder.getUsername()));
}
private void onVenuesTaskComplete(User user, Exception ex) {
@@ -235,10 +240,8 @@
private static class StateHolder {
- /** User id. */
private String mUserId;
-
- /** Friends of the current user. */
+ private String mUsername;
private Group<Venue> mVenues;
private VenuesTask mTaskVenues;
@@ -246,18 +249,16 @@
private boolean mFetchedVenuesOnce;
- public StateHolder() {
+ public StateHolder(String userId, String username) {
+ mUserId = userId;
+ mUsername = username;
mIsRunningVenuesTask = false;
mFetchedVenuesOnce = false;
mVenues = new Group<Venue>();
}
-
- public String getUserId() {
- return mUserId;
- }
-
- public void setUserId(String userId) {
- mUserId = userId;
+
+ public String getUsername() {
+ return mUsername;
}
public Group<Venue> getVenues() {
@@ -268,11 +269,10 @@
mVenues = venues;
}
- public void startTaskVenues(UserMayorshipsActivity activity,
- String userId) {
+ public void startTaskVenues(UserMayorshipsActivity activity) {
mIsRunningVenuesTask = true;
mTaskVenues = new VenuesTask(activity);
- mTaskVenues.execute(userId);
+ mTaskVenues.execute(mUserId);
}
public void setActivityForTaskVenues(UserMayorshipsActivity
activity) {
=======================================
--- /main/src/com/joelapenna/foursquared/VenueActivity.java Tue Sep 28
11:53:21 2010
+++ /main/src/com/joelapenna/foursquared/VenueActivity.java Wed Sep 29
12:59:38 2010
@@ -555,7 +555,6 @@
}
break;
case RESULT_CODE_ACTIVITY_ADD_TIP:
- Log.e(TAG, "ActivityResult():
RESULT_CODE_ACTIVITY_ADD_TIP...");
if (resultCode == Activity.RESULT_OK) {
Tip tip =
data.getParcelableExtra(AddTipActivity.EXTRA_TIP_RETURNED);
VenueUtils.addTip(mStateHolder.getVenue(), tip);
@@ -566,7 +565,6 @@
}
break;
case RESULT_CODE_ACTIVITY_ADD_TODO:
- Log.e(TAG, "ActivityResult():
RESULT_CODE_ACTIVITY_ADD_TODO...");
if (resultCode == Activity.RESULT_OK) {
Todo todo =
data.getParcelableExtra(AddTodoActivity.EXTRA_TODO_RETURNED);
VenueUtils.addTodo(mStateHolder.getVenue(), todo.getTip(),
todo);
@@ -578,7 +576,6 @@
break;
case RESULT_CODE_ACTIVITY_TIP:
case RESULT_CODE_ACTIVITY_TODO:
- Log.e(TAG, "ActivityResult(): RESULT_CODE_ACTIVITY_TIP or
RESULT_CODE_ACTIVITY_TODO...");
if (resultCode == Activity.RESULT_OK &&
data.hasExtra(TipActivity.EXTRA_TIP_RETURNED)) {
Tip tip =
(Tip)data.getParcelableExtra(TipActivity.EXTRA_TIP_RETURNED);
Todo todo = data.hasExtra(TipActivity.EXTRA_TODO_RETURNED) ?
@@ -589,7 +586,6 @@
}
break;
case RESULT_CODE_ACTIVITY_TIPS:
- Log.e(TAG, "ActivityResult(): RESULT_CODE_ACTIVITY_TIPS...");
if (resultCode == Activity.RESULT_OK &&
data.hasExtra(VenueTipsActivity.INTENT_EXTRA_RETURN_VENUE)) {
Venue venue =
(Venue)data.getParcelableExtra(VenueTipsActivity.INTENT_EXTRA_RETURN_VENUE);
VenueUtils.replaceTipsAndTodos(mStateHolder.getVenue(), venue);
=======================================
--- /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Wed Sep
29 11:12:24 2010
+++ /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Wed Sep
29 12:59:38 2010
@@ -143,15 +143,19 @@
startActivity(intent);
}
});
+
+ setTitle(getString(R.string.venue_checkins_activity_title,
mStateHolder.getVenueName()));
}
private static class StateHolder {
+ private String mVenueName;
private Group<Checkin> mYou;
private Group<Checkin> mFriends;
private Group<Checkin> mOthers;
public StateHolder(Venue venue, String loggedInUserId) {
+ mVenueName = venue.getName();
mYou = new Group<Checkin>();
mFriends = new Group<Checkin>();
mOthers = new Group<Checkin>();
@@ -170,6 +174,10 @@
}
}
}
+
+ public String getVenueName() {
+ return mVenueName;
+ }
public Group<Checkin> getCheckinsYou() {
return mYou;
=======================================
--- /main/src/com/joelapenna/foursquared/VenueTipsActivity.java Sun Sep 26
10:33:26 2010
+++ /main/src/com/joelapenna/foursquared/VenueTipsActivity.java Wed Sep 29
12:59:38 2010
@@ -67,7 +67,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.venue_tips_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
@@ -156,6 +155,8 @@
startActivityForResult(intent, ACTIVITY_TIP);
}
});
+
+ setTitle(getString(R.string.venue_tips_activity_title,
mStateHolder.getVenue().getName()));
}
@Override
Revision: 0b1d06b7e0
Author: mar...@gmail.com
Date: Wed Sep 29 11:12:24 2010
Log: Cleaned up some unused drawables, added hi-res drawables for tabs.
Fix...
http://code.google.com/r/markww-foursquared/source/detail?r=0b1d06b7e0
Revision: 3a9b186b23
Author: mar...@gmail.com
Date: Wed Sep 29 12:59:38 2010
Log: More cleanup. Added venue name or username to titles of activities
whe...
http://code.google.com/r/markww-foursquared/source/detail?r=3a9b186b23
==============================================================================
Revision: 0b1d06b7e0
Author: mar...@gmail.com
Date: Wed Sep 29 11:12:24 2010
Log: Cleaned up some unused drawables, added hi-res drawables for tabs.
Fixed popularity call for tips. Fixed bug where _others_ count was being
used for _friends_ count for checkins at a venue. Dropping tab icons for
android 1.5. The tabs colors are inverted for 1.5, so our tab icons don't
really display well on them.
http://code.google.com/r/markww-foursquared/source/detail?r=0b1d06b7e0
Added:
/main/res/drawable-hdpi/tab_main_nav_friends_off.png
/main/res/drawable-hdpi/tab_main_nav_friends_on.png
/main/res/drawable-hdpi/tab_main_nav_me_boy_off.png
/main/res/drawable-hdpi/tab_main_nav_me_boy_on.png
/main/res/drawable-hdpi/tab_main_nav_me_girl_off.png
/main/res/drawable-hdpi/tab_main_nav_me_girl_on.png
/main/res/drawable-hdpi/tab_main_nav_nearby_off.png
/main/res/drawable-hdpi/tab_main_nav_nearby_on.png
/main/res/drawable-hdpi/tab_main_nav_tips_off.png
/main/res/drawable-hdpi/tab_main_nav_tips_on.png
/main/res/drawable-hdpi/tab_main_nav_todos_off.png
/main/res/drawable-hdpi/tab_main_nav_todos_on.png
/main/res/drawable-hdpi/tab_search_nav_venues_off.png
/main/res/drawable-hdpi/tab_search_nav_venues_on.png
Deleted:
/main/res/drawable-hdpi/me_tab_boy_selected.png
/main/res/drawable-hdpi/me_tab_boy_unselected.png
/main/res/drawable-hdpi/me_tab_girl_selected.png
/main/res/drawable-hdpi/me_tab_girl_unselected.png
/main/res/drawable-hdpi/tab_focus.9.png
/main/res/drawable-hdpi/tab_press.9.png
/main/res/drawable-hdpi/tab_selected.9.png
/main/res/drawable-hdpi/tab_unselected.9.png
/main/res/drawable/fake_native_tab.xml
/main/res/drawable/tips_tab_selected.png
/main/res/drawable/tips_tab_unselected.png
/main/res/layout/fake_native_tab.xml
Modified:
/main/res/layout/tips_activity_empty.xml
/main/res/layout/todos_activity_empty.xml
/main/res/values/strings.xml
/main/src/com/joelapenna/foursquare/Foursquare.java
/main/src/com/joelapenna/foursquare/FoursquareHttpApiV1.java
/main/src/com/joelapenna/foursquared/TipsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java
/main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java
/main/src/com/joelapenna/foursquared/util/TabsUtil.java
/main/src/com/joelapenna/foursquared/util/TabsUtil3.java
/main/src/com/joelapenna/foursquared/util/TabsUtil4.java
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_friends_off.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_friends_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_boy_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_boy_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_girl_off.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_me_girl_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_nearby_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_nearby_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_tips_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_tips_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_todos_off.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_main_nav_todos_on.png Wed Sep 29 11:12:24
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_venues_off.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_venues_on.png Wed Sep 29
11:12:24 2010
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/me_tab_boy_selected.png Fri Apr 23 09:11:15 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/me_tab_boy_unselected.png Fri Apr 23 09:11:15
2010
+++ /dev/null
@@ -1,28 +0,0 @@
-‰PNG
-
-
-IHDR 0 0 W ù‡ tEXtSoftware Adobe
ImageReadyqÉe< tIDATxÚÔZmHSQ ÞR¦ a Ì ¦› 1X, ` ‚ (‹ ( A0
- é‡ RÐ A0 ô+
-£ R$ý $ BA ¤ ’ : N¯ Ó Øóâ
-ïî½;ónóîÀÃaÞ÷¼çyÎ9ïùÔ|rrb*æTª×A2™ÔUÞb±\¬€ •Á 8YnMé V€ °
-Ì1$ôVlÖ3„Ðú· õ w Š,‹ ùIà#záWA €¸ ٠Б£
-¤Þx !Ky âµÈ† ž<Åä8 ̹ oFö ï|&
x s"Æ— ÉßG6[ ò”ìÀ4êìɉ 8zÎZÞZÀé fµÏ¨{H× ‚ƒÇÈF/x¢˜x“µ oaÃÆrÁ Ž Nˆ˜ ò6d
-4æE û D„Ec`Ø@äS
- ê ££# ký îÝn–••-fê — %Ÿâ¦Þ ‡‡‡4lþ X ¥«ååå«j=Ðmpò&ù6æL $
û^ƒ ZVWš ¯D )’ƒØ ˆX?s Ö":I ×4 ž" àN;RB@S hR `/" v¥i´¢ˆ Ø”z€¿ ¡
-bÞ`¤}@3wË‘& Æ /Ûl¶> ¯±XL_SÚl&Áz œ€˜’ ~«ê %P¨›=ÔÃs
-)
Xå < àã~®¥ 1 –‰ ƒ= zE è H —Jšæ¹rËJ –€8gäÏä8 ‰xa×K«ø9È·PYøh h¤ „•; æÒ TUUч ®‚.-§ Dà7ð ˜eBDÉû Vv ¾ü ôpeçÁ5®¸ ÆÇ1ÎÐ+IR›†Ó.ÀÂÙwg!@nÛz –$7¾·s¶cª'2|
œ Bœq` ¿DEÀºŒÄZ ‚òß
- àìbÀ8ÿýÌõzuuurooï-w€ö± Ä' ÇïÙ¦ª
-í ³˜T^³í ù_f¿Ó ¸ÐÐâ‡×»ššš¸æ¡>
- Ó–â/· Ðœ{½¶¶VRª öº¦Gø5©øµ²Ë
-ÔÆ-Jç ØG5 õ0 ™¨ ë6 ðcww×ZÈi ßFeS瀜¼ê½P]]Ý”, › o
- °³³3Â&‰”Ý$8 )Ù–j´@? £© íN( ú‚ü‰ÃáHäc%† ‹¿§ÜŸ)¾
-©•Q½ I
-–N~ß Dkà *Êù
-|R0LËÈSÜu‚KT\Æ Žíím
-¢Ÿü)ˆ Ô › Žõ ¯¯¯§:h
- ’]gÒÔz ßW´Ê ½ÐlmmÑÌDo ò71êÞW¦Ó§¡ó$?#î“ý ¶
-÷ ¢™
- ?1A -hô°÷LiÁ ¦€ €^
-ã*nhŒ·S<1òJÛvêÕ~ z€Îú•2 úX µi˜%Ø©.Á†X [ô´ŽôB9àt: ³ásîwâÍÍM NÃ
-ÝŸm¢½ý Ëåš8Oa³Þi Bn {Ȇ
-[´#M§ Ü_A|
QOýº lllȯ;ÜìDGW•—9 kíu~jnllÔU ®þW‚ f© 7 æbÿw›ÿ tà ‡féþ IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/me_tab_girl_selected.png Fri Apr 23 09:11:15
2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/me_tab_girl_unselected.png Fri Apr 23 09:11:15
2010
+++ /dev/null
@@ -1,22 +0,0 @@
-‰PNG
-
-
-IHDR 0 0 W ù‡ tEXtSoftware Adobe
ImageReadyqÉe< ºIDATxÚÔš]H Q €gve@ a! Œ`a`ÃØ(Œ•@1
-à Š" 6‚Â^zè¥ | Á^#)‚‚0| ¤^ ¢
\ì¥P „¥u—]6Zð)ö b;GÏÈõzçogv½sà#îìŒsÎ=?÷Ü;© FC
²tÔëõ` àÓßÑ€A" ôÒ¿ ô;ÎÒ:P 6€¯DÅë‹ÕZæåùsÀ8p èrù,*¿ Ì ŸÛm@ 0 ŒøäAôÆ#à»Û C.ï?
-¼ Ö|T^¡Ð[ (üZâ ~`Ñí š pƒ¼â› ® _Ú <J X nûeÀCšùÎ6VG BuÚ« w(Y K&h ›Ê
- vÈkÕ?à ðÉ G¨Òô*r &öIà·Ó š‘Hy#±ç„
-¨V«üµ Í~XÂÖg HÙy`BRå
-Ýö{ RÙ×OaØü’Ø ” Ô
-= ”\y
-_àÔr¹ÌŽ×¨Q“YrÀ1‘ º ¼ æѽ
-
-³¥
- ÐF uMó Ä d€.ò@ †P"@ Dø$Ö$k
-줇÷@”«ÿ¸P|“Lé8í
- J„“^g
-`å'pO2 æ ¤ó†a€næ" ÆIä
-3 ÈX‘â¢Rjæ Êë’(ß-˜ä(ŸÄ¼Œ:0 Êï¦Óc nËjLRÊæÞ A“¹ç .“˜ žØ(Àî™1éç
-* “ó _ >:í@Y „À€(zA@ 0lò 2 hÌ8iq/OÒfÌ¢ ×{pòÑ ºMé:C' ¼¤¹ñ¦Ë–ØjÌë`ÚR Q›ÌG÷½ üöŒâ0AÆ<vaÀ Š89S ¡6jÕÔ©Åbñ5íÄÌ ÏôOÑÑF;¥“6XV <iç c Á„ R|
ø
áB^Ø(¿ã Lâ @ ð†I˜~`ÁE’ze–Š„1^2Ññ–šÏçͬÃòºÂm3ß w[è
’ö>W,Î Û¢ ¬ wÿ*»g’ nmXiQë O–9åK¤Ã¶ÙC! W €! Í\‹ ?€q ìSÈà:°
- 2×rÀyîÝ Ps¹œ“ÙÁpZT ~VB÷N ïšœu,‘Ó‚F
-Û’kV3ï$„øpÂåþ©`9ÇïZ ”Ý W 믕 )ý
-ÈSuã•Ç5ç¢ åw ¶²Ùl3m-&Ú°Å= ÚÕUh ï¢EÏÊ8üBùÀAc·ß€f“ ÃiF0ƒne“Vñ÷Í<ìÅ CN 7)|
t ½Ð •å”——«™LÆïã vt¸ 9Î(\¢ÙNs¥Ù“t(þJ‰hÛ‰† ôÿnó_€ E4 [Énx° IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/tab_focus.9.png Tue May 11 16:33:42 2010
+++ /dev/null
@@ -1,10 +0,0 @@
-‰PNG
-
-
-IHDR
- d ] ºî tEXtSoftware Adobe
ImageReadyqÉe< ÒIDATxÚbüÿÿ? 6ÀÈÈ ”úψU ªI ˆÕ€Ø ˆ£þ¯Pûÿ &Ãÿ›M
ɵPq ¼ H= »¦ÿH˜hMdÙ4
- Ç€ÛidÙ J)C2ôFm :©üÿ0˹ƒÜ¦Ñ€ M{£Î 1Ɉ &P O²ó°¶
-G“ %)b4ôF+µáŸŒFSÄh»|4žFm¢g‚ 5V ù¸ #xÔ^
-Súå- -®†*Þx“‘ E 6€E ¬éÖ âý£ s
-°¡¸ŒXM@õQŒØ† ‘[›Ø ‘
-%ÀUåaÊQ IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/tab_press.9.png Tue May 11 16:33:42 2010
+++ /dev/null
@@ -1,8 +0,0 @@
-‰PNG
-
-
-IHDR
- d ] ºî tEXtSoftware Adobe ImageReadyqÉe< ÒIDATxÚìXA
-ƒ@ LÊÞõ Ûoô =ø@
-ö%=ö¢/èµ/ˆ‰ZPšÂ® Ô:
ì$LŒAÇ°ˆ g̬ ° ŽI¥zT?©Wòˆ"w’æF ^ÇsÃK‹?Ð ó“dâÉI‹˜vX^Èe±IÙd÷þ‘‰¾³ {` e2a"¶ñ
-C÷Ö,Ï>ñÙå¹ê c´ã1ÂÃÅ Aæ€
Lø'\wó rË3±òã‹ î·n—ã'üj‡k ççç†Ã,À3 ë“ÚgúýÄwy* ëÔ$ ¯Ø[?NÕ¦'"; {©ÂêÚs-ó IEND®B`‚
=======================================
--- /main/res/drawable-hdpi/tab_selected.9.png Tue May 11 16:33:42 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/drawable-hdpi/tab_unselected.9.png Tue May 11 16:33:42 2010
+++ /dev/null
@@ -1,14 +0,0 @@
-‰PNG
-
-
-IHDR
- b ‹IYó tEXtSoftware Adobe ImageReadyqÉe< IDATxÚì˜]
-ƒ0 ÇÓY}Ö x#O° î8^BðÙ' üÊh!2X‚‹8t# ¼´ýõŸ¶¡
-
-¥ Ç5VU
-}ßC×uP×õÛ ÏAyžCš¦0Ï3«ÄBEQDh ºq Y–EÈ{¯‡‚ W‰T’$ù
-
-
- PA[¶ B BÄÕO
- ,¼ké¢áY Ù– ]8Ë-aÿ'<ÜsÃ:Û½ ð–e±Ü³’àwž »,-aíœNZSx-‚KŸ , W
-7MSt• jH4ŽãáJNT"5Ux¤¦Þ=©$ˆÅTÓ4È©ÑÏΫ•eé<Íü6›s
õE¨m[UÂR÷P0w©@DfâÕž ?Á/¾^ Fp IEND®B`‚
=======================================
--- /main/res/drawable/fake_native_tab.xml Tue May 11 15:45:03 2010
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
- <!-- Copyright (c) Mark Wyszomierski, 2010. -->
-
-<selector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fake_native_tab_selector" >
-
- <!-- Non focused states -->
- <item android:state_focused="false" android:state_selected="false"
android:state_pressed="false" android:drawable="@drawable/tab_unselected" />
- <item android:state_focused="false" android:state_selected="true"
android:state_pressed="false" android:drawable="@drawable/tab_selected" />
-
- <!-- Focused states -->
- <item android:state_focused="true" android:state_selected="false"
android:state_pressed="false" android:drawable="@drawable/tab_focus" />
- <item android:state_focused="true" android:state_selected="true"
android:state_pressed="false" android:drawable="@drawable/tab_focus" />
-
- <!-- Pressed -->
- <item android:state_pressed="true"
android:drawable="@drawable/tab_press" />
-
-</selector>
=======================================
--- /main/res/drawable/tips_tab_selected.png Wed Mar 10 19:35:55 2010
+++ /dev/null
@@ -1,31 +0,0 @@
-‰PNG
-
-
-IHDR # #
-Ù³Y tEXtSoftware Adobe ImageReadyqÉe< ~IDATxÚÜXMh A žý›MÂ ¤
ôÔ^ Ï èU¡'A„–Þ¤¢´B lKJñ^ôÚ“ +ö’¶§Æä¢Ô‹·^,x A
-B!P Ùd³ÿ~oL«†lw·›–Ò YÂî›o¾÷½7oW
-à ]–!³K4Ô¬ &§&3=_«ÖâÁ`‘›˜J°â 7ÿ ¶ ûž˜ ¡ínK’”‡1a2 ¿Œ£ ²p&  ÐjW¯j
Ã˜Ê DQ SUÕ Ìµ •aäÉ= ¾ï—=Ï ƒ
-Å13 E
- `\ç [åýÓVX*-¥ 4 V>{¾gض=ÝétÞœ
- @F‰ Îùa
- š¦¥ ³ ÿ‡<ä#xnT‘•XÍà
-™éºî$ñnwìÄH(ÌŠª8Ä:ü+± ¦ TEe ÿ»ãÅ¥Åñ¶ÕÞu
-wø EÒ‡’‘oò[È X.ŸcšªÅƒ‘eY :
-ˆ-·,Kñ\ dWr1
-m" ñ
-ÿ ^Š@|
Ñ“Ø ‹¿^ßÃtßsOæbÑ ˆ–Ñf‚ €<_ÌT.bÁ¤©'Æ { -ìº. »‚™«s6ÍÎÍÞÆ®v ó<×8£l ¸'
- Ó Â´Œ áG ÎtPÖ ¤
-øÁ¨'yBˆ) laíŸB+ ÏzkKj0 o7¾a Ë*àso!Î"ਠ¹0 ‹b FÀÅv»ý
- Gpf¥ °ƒçV ¦—ƒ p
- ¢ Ç~Z s¬Í
-€»Õ7Š¡¤ ¦
-<”UÀ4‹MH /`N½ Ýr"`I ؈ °zŽš½ßm]EhȨO"vD¨$Vï
-uf0fÓŒd† B*rÿ‚
-Ž6â#þ{5pfšf“E
-¶¢uEöår9qj*if íà Ìé=4Õˆfè8æñyk÷o »¡`º¬S/- }ü €,bŠt Wô ºóÈÊó•ñ,¬Qˆ¨›C‹IÝÝ×B¡p ×
-j܈•Þ–µ 3 Ô” ˜¯Ã>•–K•F£á˜¦É
-ÇIƒå† ¯"ºÆ è}'ÀÌ Õ)×ûs4 ž ¦²S9šy8ó
-m‡Ò ´> ñ†Q±c [àãìÁ| Pw –º`öYËl áÇ‚¡±YÞü0ÿtþ
-”°³"Å›€hŽÆ’6ä”I:× ‘=Ïpý í‡`¤Õj
Ñ ^¦¥¬ŸD "_Kº/‚¢ù&0 šf³) bªú®:80WöûÌ¥ ó[€ kݶ{
-ó
- IEND®B`‚
=======================================
--- /main/res/drawable/tips_tab_unselected.png Wed Mar 10 19:35:55 2010
+++ /dev/null
Binary file, no diff available.
=======================================
--- /main/res/layout/fake_native_tab.xml Tue Sep 14 12:06:25 2010
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
- <!-- Copyright 2010 Mark Wyszomierski -->
-
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/fakeNativeTabLayout"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:background="@drawable/fake_native_tab"
- android:gravity="center_horizontal"
- android:orientation="vertical" >
-
- <ImageView
- android:id="@+id/fakeNativeTabImageView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"/>
-
- <TextView
- android:id="@+id/fakeNativeTabTextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14dip" />
-
-</LinearLayout>
=======================================
--- /main/res/layout/tips_activity_empty.xml Tue Sep 28 19:28:32 2010
+++ /main/res/layout/tips_activity_empty.xml Wed Sep 29 11:12:24 2010
@@ -15,7 +15,7 @@
android:id="@+id/todosActivityEmptyTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="No tips available"
+ android:text="@string/no_tips"
/>
</LinearLayout>
=======================================
--- /main/res/layout/todos_activity_empty.xml Tue Sep 28 19:28:32 2010
+++ /main/res/layout/todos_activity_empty.xml Wed Sep 29 11:12:24 2010
@@ -15,7 +15,7 @@
android:id="@+id/todosActivityEmptyTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="No to-do's available"
+ android:text="@string/no_todos"
/>
</LinearLayout>
=======================================
--- /main/res/values/strings.xml Tue Sep 28 11:53:21 2010
+++ /main/res/values/strings.xml Wed Sep 29 11:12:24 2010
@@ -413,6 +413,8 @@
<string name="user_details_pings_activity_description_off">You are not
getting pings from %s</string>
<string name="user_details_pings_activity_pings_on">Turn pings
on</string>
<string name="user_details_pings_activity_pings_off">Turn pings
off</string>
+ <string name="no_tips">There are no tips here</string>
+ <string name="no_todos">There are no To-Do\'s here</string>
<string name="venue_map_activity_title">Foursquare %s</string>
</resources>
=======================================
--- /main/src/com/joelapenna/foursquare/Foursquare.java Mon Sep 27 12:49:27
2010
+++ /main/src/com/joelapenna/foursquare/Foursquare.java Wed Sep 29 11:12:24
2010
@@ -170,10 +170,10 @@
}
@V1
- public Group<Tip> tips(Location location, String uid, String filter,
int limit) throws FoursquareException,
- FoursquareError, IOException {
+ public Group<Tip> tips(Location location, String uid, String filter,
String sort, int limit)
+ throws FoursquareException, FoursquareError, IOException {
return mFoursquareV1.tips(location.geolat, location.geolong,
location.geohacc,
- location.geovacc, location.geoalt, uid, filter, limit);
+ location.geovacc, location.geoalt, uid, filter, sort,
limit);
}
@V1
=======================================
--- /main/src/com/joelapenna/foursquare/FoursquareHttpApiV1.java Mon Sep 27
09:39:25 2010
+++ /main/src/com/joelapenna/foursquare/FoursquareHttpApiV1.java Wed Sep 29
11:12:24 2010
@@ -337,7 +337,7 @@
*/
@SuppressWarnings("unchecked")
Group<Tip> tips(String geolat, String geolong, String geohacc, String
geovacc,
- String geoalt, String uid, String filter, int limit) throws
FoursquareException,
+ String geoalt, String uid, String filter, String sort, int
limit) throws FoursquareException,
FoursquareError, IOException {
HttpGet httpGet = mHttpApi.createHttpGet(fullUrl(URL_API_TIPS), //
new BasicNameValuePair("geolat", geolat), //
@@ -347,6 +347,7 @@
new BasicNameValuePair("geoalt", geoalt), //
new BasicNameValuePair("uid", uid), //
new BasicNameValuePair("filter", filter), //
+ new BasicNameValuePair("sort", sort), //
new BasicNameValuePair("l", String.valueOf(limit)) //
);
return (Group<Tip>) mHttpApi.doHttpRequest(httpGet, new
GroupParser(
=======================================
--- /main/src/com/joelapenna/foursquared/TipsActivity.java Mon Sep 27
08:50:45 2010
+++ /main/src/com/joelapenna/foursquared/TipsActivity.java Wed Sep 29
11:12:24 2010
@@ -366,6 +366,7 @@
LocationUtils.createFoursquareLocation(loc),
null,
mFriendsOnly ? "friends" : "nearby",
+ null,
30);
} catch (Exception e) {
mReason = e;
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Mon
Sep 27 09:56:53 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Wed
Sep 29 11:12:24 2010
@@ -245,10 +245,10 @@
// of the target tip.
if (requestCode == ACTIVITY_TIP && resultCode ==
Activity.RESULT_OK) {
if (data.hasExtra(TipActivity.EXTRA_TIP_RETURNED)) {
- Log.d(TAG, "onActivityResult(), return tip intent extra
found, processing.");
+ Log.i(TAG, "onActivityResult(), return tip intent extra
found, processing.");
updateTip((Tip)data.getParcelableExtra(TipActivity.EXTRA_TIP_RETURNED));
} else {
- Log.d(TAG, "onActivityResult(), no return tip intent extra
found.");
+ Log.i(TAG, "onActivityResult(), no return tip intent extra
found.");
}
}
}
@@ -375,6 +375,7 @@
return foursquare.tips(
LocationUtils.createFoursquareLocation(loc),
mUserId,
+ null,
mRecentOnly ? "recent" : "popular",
30);
} catch (Exception e) {
=======================================
--- /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Tue Sep
28 10:56:27 2010
+++ /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Wed Sep
29 11:12:24 2010
@@ -104,7 +104,7 @@
mStateHolder.getCheckinsOthers().size() == 1 ?
R.string.venue_activity_checkins_count_friends_single :
R.string.venue_activity_checkins_count_friends_plural,
- mStateHolder.getCheckinsOthers().size());
+ mStateHolder.getCheckinsFriends().size());
CheckinListAdapter adapter = new CheckinListAdapter(this,
((Foursquared)
getApplication()).getRemoteResourceManager());
=======================================
--- /main/src/com/joelapenna/foursquared/util/TabsUtil.java Mon Sep 27
09:56:53 2010
+++ /main/src/com/joelapenna/foursquared/util/TabsUtil.java Wed Sep 29
11:12:24 2010
@@ -36,42 +36,6 @@
TabsUtil4.setTabIndicator(spec, view);
}
}
- /*
- private static TabHost.TabSpec addNativeLookingTab(Context context,
final TabHost tabHost, String specName,
- String label, int iconId) {
- View view =
LayoutInflater.from(context).inflate(R.layout.fake_native_tab, null);
- ImageView iv = (ImageView)
view.findViewById(R.id.fakeNativeTabImageView);
- iv.setImageResource(iconId);
- TextView tv = (TextView)
view.findViewById(R.id.fakeNativeTabTextView);
- tv.setText(label);
-
- int sdk = new Integer(Build.VERSION.SDK).intValue();
- if (sdk > 3) {
- TabsUtil4.addNativeLookingTab(context, tabHost, view);
- }
-
- TabHost.TabSpec spec = tabHost.newTabSpec(specName);
- TabsUtil.setTabIndicator(spec, label,
context.getResources().getDrawable(iconId), view);
- return spec;
- }
-
- public static void addNativeLookingTab(Context context, final TabHost
tabHost, String specName,
- String label, int iconId, int layout) {
- TabHost.TabSpec spec = addNativeLookingTab(context, tabHost,
specName, label, iconId);
-
- spec.setContent(layout);
- tabHost.addTab(spec);
- }
-
- public static void addNativeLookingTab(Context context, final TabHost
tabHost, String specName,
- String label, int iconId, Intent intent) {
- TabHost.TabSpec spec = addNativeLookingTab(context, tabHost,
specName, label, iconId);
-
- spec.setContent(intent);
- tabHost.addTab(spec);
- }
- */
-
public static void addTab(TabHost host, String title, int drawable,
int index, int layout) {
TabHost.TabSpec spec = host.newTabSpec("tab" + index);
=======================================
--- /main/src/com/joelapenna/foursquared/util/TabsUtil3.java Wed Mar 10
03:10:47 2010
+++ /main/src/com/joelapenna/foursquared/util/TabsUtil3.java Wed Sep 29
11:12:24 2010
@@ -22,10 +22,10 @@
}
public static void setTabIndicator(TabSpec spec, String title,
Drawable drawable) {
- if (drawable != null) {
- spec.setIndicator(title, drawable);
- } else {
+ // if (drawable != null) {
+ // spec.setIndicator(title, drawable);
+ // } else {
spec.setIndicator(title);
- }
+ // }
}
}
=======================================
--- /main/src/com/joelapenna/foursquared/util/TabsUtil4.java Tue May 11
15:45:03 2010
+++ /main/src/com/joelapenna/foursquared/util/TabsUtil4.java Wed Sep 29
11:12:24 2010
@@ -4,13 +4,8 @@
package com.joelapenna.foursquared.util;
-import com.joelapenna.foursquared.R;
-
-import android.content.Context;
import android.view.View;
import android.widget.TabHost;
-import android.widget.TextView;
-import android.widget.TabHost.OnTabChangeListener;
import android.widget.TabHost.TabSpec;
/**
@@ -34,32 +29,4 @@
public static int getTabCount(TabHost tabHost) {
return tabHost.getTabWidget().getTabCount();
}
-
- public static void addNativeLookingTab(Context context, final TabHost
tabHost, View tabView) {
-
- // Since we're using a custom view, we need to manually set the
colors of the focused
- // and non-focused tab textviews as the user selects different
tabs.
- int tabIndex = tabHost.getTabWidget().getTabCount();
- setNativeLookingTabTextColor(tabView, tabIndex, 0);
-
- tabHost.setOnTabChangedListener(new OnTabChangeListener() {
- @Override
- public void onTabChanged(String arg0) {
- int tabSelected = tabHost.getCurrentTab();
- for (int i = 0, m = TabsUtil4.getTabCount(tabHost); i < m;
i++) {
- View view = tabHost.getTabWidget().getChildAt(i);
- setNativeLookingTabTextColor(view, i, tabSelected);
- }
- }
- });
- }
-
- private static void setNativeLookingTabTextColor(View view, int
ourIndex, int selectedIndex) {
- TextView tv = (TextView)
view.findViewById(R.id.fakeNativeTabTextView);
- if (ourIndex == selectedIndex) {
-
tv.setTextColor(view.getContext().getResources().getColor(R.color.dgrey_start));
- } else {
-
tv.setTextColor(view.getContext().getResources().getColor(R.color.white));
- }
- }
-}
+}
==============================================================================
Revision: 3a9b186b23
Author: mar...@gmail.com
Date: Wed Sep 29 12:59:38 2010
Log: More cleanup. Added venue name or username to titles of activities
where appropriate to provide more context for the user.
http://code.google.com/r/markww-foursquared/source/detail?r=3a9b186b23
Added:
/main/res/drawable-hdpi/tab_search_nav_map_off.png
/main/res/drawable-hdpi/tab_search_nav_map_on.png
Modified:
/main/res/values/strings.xml
/main/src/com/joelapenna/foursquare/Foursquare.java
/main/src/com/joelapenna/foursquared/BadgesActivity.java
/main/src/com/joelapenna/foursquared/TodosActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsFollowersActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java
/main/src/com/joelapenna/foursquared/UserHistoryActivity.java
/main/src/com/joelapenna/foursquared/UserMayorshipsActivity.java
/main/src/com/joelapenna/foursquared/VenueActivity.java
/main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java
/main/src/com/joelapenna/foursquared/VenueTipsActivity.java
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_map_off.png Wed Sep 29 12:59:38
2010
Binary file, no diff available.
=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/tab_search_nav_map_on.png Wed Sep 29 12:59:38
2010
Binary file, no diff available.
=======================================
--- /main/res/values/strings.xml Wed Sep 29 11:12:24 2010
+++ /main/res/values/strings.xml Wed Sep 29 12:59:38 2010
@@ -21,6 +21,7 @@
<string name="add_venue_activity_error_no_venue_state">Please supply a
venue state.</string>
<string name="address">Address</string>
<string name="app_name">Foursquare</string>
+ <string name="badges_activity_title">Foursquare Badges - %s</string>
<string name="badges_header">Badges</string>
<string name="checkin_action_label">Check-in!</string>
<string name="checkin_badges">You\'ve just unlocked</string>
@@ -32,8 +33,6 @@
<string name="checkin_title_checking_in">Checking in @%s</string>
<string name="checkin_totals">Total:</string>
<string name="checkin_title_result">Checked in!</string>
- <string name="checkins_activity_label">Foursquare Friends</string>
- <string name="checkins_label">Friends</string>
<string name="city">City</string>
<string name="cross_street">Cross Street</string>
<string name="feedback_error">Couldn\'t find configured email
client.</string>
@@ -158,13 +157,11 @@
<string name="title_search_finished_noquery">Nearby - Foursquare</string>
<string name="title_search_inprogress">Searching "%s" -
Foursquare</string>
<string name="title_search_inprogress_noquery">Searching Nearby -
Foursquare</string>
- <string name="venue_checkin_activity_label">Foursquare Venue
Check-In</string>
<string name="venue_checkins_tab">Checkins</string>
<string name="venue_info_activity_label">Foursquare Venue</string>
<string name="venue_info_tab">Tips</string>
<string name="venue_name">Venue Name</string>
<string name="venue_search_activity_label">Foursquare Venues</string>
- <string name="venue_tips_activity_label">Foursquare Tips</string>
<string name="venues_search_hint">Type a venue name or tag</string>
<string name="venues_search_label">Venue Search</string>
<string name="zip_code">Zip Code</string>
@@ -215,10 +212,9 @@
<string name="user_actions_activity_action_twitter">Twitter</string>
<string name="user_actions_activity_action_facebook">Facebook</string>
<string name="user_actions_activity_label_Last_seen_at">Last seen
at %s</string>
- <string name="user_history_activity_title">Foursquare Check-in
History</string>
+ <string name="user_history_activity_title">Foursquare History
- %s</string>
<string name="user_history_activity_no_info">No history
available.</string>
- <string name="user_friends_activity_title">Foursquare Friends</string>
- <string name="user_mayorships_activity_title">Foursquare
Mayorships</string>
+ <string name="user_mayorships_activity_title">Foursquare Mayorships
- %s</string>
<string name="user_details_activity_title_mayorships">MAYORSHIPS</string>
<string name="user_details_activity_title_badges">BADGES</string>
@@ -233,7 +229,6 @@
<string name="user_details_activity_set_photo_cancel">Set photo request
cancelled.</string>
<string name="user_details_activity_friend_add">ADD AS FRIEND</string>
<string name="user_details_activity_friend_confirm">CONFIRM AS
FRIEND</string>
-
<string name="user_details_activity_last_seen">Last seen:</string>
<string
name="user_details_activity_general_mayorships">MAYORSHIPS</string>
<string name="user_details_activity_general_badges">BADGES</string>
@@ -253,6 +248,8 @@
<string name="user_details_activity_add_friends">Add Friends</string>
<string
name="user_details_activity_friends_menu_contact">Contact</string>
<string name="user_details_activity_friends_menu_pings">Pings</string>
+
+ <string name="user_details_friends_activity_title">Foursquare Friends
- %s</string>
<string
name="checkin_execute_activity_progress_bar_message">Checking-in...</string>
<string name="shout_execute_activity_progress_bar_message">Posting
shout...</string>
@@ -266,8 +263,6 @@
<string name="venue_activity_checkin_button">Check In Here</string>
<string name="venue_activity_checkin_button_quick">QUICK CHECK-IN
HERE</string>
<string name="venue_activity_tip_add_result">Added Tip #%s %s</string>
- <string name="venue_checkins_activity_label_recent_checkins">Recent
Checkins</string>
- <string name="venue_checkins_activity_label_mayor">Mayor</string>
<string name="send_invite_button">Invite</string>
<string name="prelaunch_text"></string>
<string name="prelaunch_button"></string>
@@ -343,10 +338,9 @@
<string name="tip_activity_btn_tip_2">I\'VE DONE THIS</string>
<string name="tip_activity_btn_tip_3">UNDO THIS</string>
<string name="tip_activity_btn_tip_4">CONGRATS! YOU\'VE DONE
THIS</string>
- <string name="todos_activity_title">Foursquare To-Do List %s</string>
+ <string name="todos_activity_title">Foursquare To-Do List - %s</string>
<string name="todos_activity_btn_recent">RECENT</string>
<string name="todos_activity_btn_nearby">NEARBY</string>
- <string name="todos_activity_no_todos">No To-Dos Here!</string>
<string name="todo_added_date">"added %s"</string>
<string name="tab_main_nav_friends">Friends</string>
<string name="tab_main_nav_nearby">Places</string>
@@ -390,7 +384,7 @@
<string name="venue_activity_todo_added_ok">To-Do added!</string>
<string name="venue_activity_todo_here">You have a To-Do here!</string>
<string name="venue_share_activity_title">Share</string>
- <string name="venue_tips_activity_title">Foursquare Tips</string>
+ <string name="venue_tips_activity_title">Foursquare Tips - %s</string>
<string name="venue_tips_activity_section_all">Tips left here
(%d)</string>
<string name="venue_tips_activity_section_friends">Tips from friends
(%d)</string>
<string name="add_tip_activity_text_hint">For example: Try the sea salt
vanilla ice cream. Best dessert downtown!</string>
@@ -398,13 +392,13 @@
<string name="add_tip_todo_activity_progress_message">Adding...</string>
<string name="add_todo_activity_text_hint">Add a note (optional)</string>
<string name="add_todo_activity_text_button">Add to my to-do
list</string>
- <string name="user_details_tips_activity_title">Foursquare Tips</string>
+ <string name="user_details_tips_activity_title">Foursquare Tips
- %s</string>
<string name="user_details_tips_activity_btn_recent">RECENT</string>
<string name="user_details_tips_activity_btn_popular">POPULAR</string>
- <string name="user_details_friends_in_common_title">Foursquare
Friends</string>
+ <string name="user_details_friends_in_common_title">Foursquare Friends
- %s</string>
<string name="user_details_friends_in_common_common_friends">FRIENDS IN
COMMON</string>
<string name="user_details_friends_in_common_all_friends">ALL
FRIENDS</string>
- <string name="user_details_friends_followers_activity_title">Foursquare
Friends</string>
+ <string name="user_details_friends_followers_activity_title">Foursquare
Friends - %s</string>
<string
name="user_details_friends_followers_activity_followers">FOLLOWERS</string>
<string name="user_details_friends_followers_activity_friends">ALL
FRIENDS</string>
<string name="refresh">Refresh</string>
@@ -414,7 +408,7 @@
<string name="user_details_pings_activity_pings_on">Turn pings
on</string>
<string name="user_details_pings_activity_pings_off">Turn pings
off</string>
<string name="no_tips">There are no tips here</string>
- <string name="no_todos">There are no To-Do\'s here</string>
-
- <string name="venue_map_activity_title">Foursquare %s</string>
+ <string name="no_todos">There are no To-Do items here</string>
+ <string name="venue_map_activity_title">Foursquare - %s</string>
+ <string name="venue_checkins_activity_title">Foursquare Checkins
- %s</string>
</resources>
=======================================
--- /main/src/com/joelapenna/foursquare/Foursquare.java Wed Sep 29 11:12:24
2010
+++ /main/src/com/joelapenna/foursquare/Foursquare.java Wed Sep 29 12:59:38
2010
@@ -34,7 +34,7 @@
*/
public class Foursquare {
private static final Logger LOG =
Logger.getLogger("com.joelapenna.foursquare");
- public static final boolean DEBUG = false;
+ public static final boolean DEBUG = true;
public static final boolean PARSER_DEBUG = false;
public static final String FOURSQUARE_API_DOMAIN
= "api.foursquare.com";
=======================================
--- /main/src/com/joelapenna/foursquared/BadgesActivity.java Mon May 24
16:18:54 2010
+++ /main/src/com/joelapenna/foursquared/BadgesActivity.java Wed Sep 29
12:59:38 2010
@@ -43,6 +43,8 @@
public static final String EXTRA_BADGE_ARRAY_LIST_PARCEL =
Foursquared.PACKAGE_NAME
+ ".BadgesActivity.EXTRA_BADGE_ARRAY_LIST_PARCEL";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".BadgesActivity.EXTRA_USER_NAME";
private static final int DIALOG_ID_INFO = 1;
@@ -70,9 +72,9 @@
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
} else {
- mStateHolder = new StateHolder();
- if (getIntent().getExtras() != null &&
getIntent().getExtras().containsKey(
- EXTRA_BADGE_ARRAY_LIST_PARCEL)) {
+ if (getIntent().hasExtra(EXTRA_BADGE_ARRAY_LIST_PARCEL) &&
getIntent().hasExtra(EXTRA_USER_NAME)) {
+
+ mStateHolder = new
StateHolder(getIntent().getStringExtra(EXTRA_USER_NAME));
// Can't jump from ArrayList to Group, argh.
ArrayList<Badge> badges =
getIntent().getExtras().getParcelableArrayList(
@@ -120,6 +122,8 @@
showDialogInfo(badge.getName(), badge.getDescription(),
badge.getIcon());
}
});
+
+ setTitle(getString(R.string.badges_activity_title,
mStateHolder.getUsername()));
}
private void showDialogInfo(String title, String message, String
badgeIconUrl) {
@@ -156,22 +160,28 @@
}
private static class StateHolder {
+ private String mUsername;
private Group<Badge> mBadges;
private String mDlgInfoTitle;
private String mDlgInfoMessage;
private String mDlgInfoBadgeIconUrl;
- public StateHolder() {
+ public StateHolder(String username) {
+ mUsername = username;
mBadges = new Group<Badge>();
}
- public void setBadges(Group<Badge> badges) {
- mBadges = badges;
- }
-
+ public String getUsername() {
+ return mUsername;
+ }
+
public Group<Badge> getBadges() {
return mBadges;
}
+
+ public void setBadges(Group<Badge> badges) {
+ mBadges = badges;
+ }
public String getDlgInfoTitle() {
return mDlgInfoTitle;
=======================================
--- /main/src/com/joelapenna/foursquared/TodosActivity.java Mon Sep 27
08:50:45 2010
+++ /main/src/com/joelapenna/foursquared/TodosActivity.java Wed Sep 29
12:59:38 2010
@@ -57,6 +57,8 @@
public static final String INTENT_EXTRA_USER_ID =
Foursquared.PACKAGE_NAME
+ ".TodosActivity.INTENT_EXTRA_USER_ID";
+ public static final String INTENT_EXTRA_USER_NAME =
Foursquared.PACKAGE_NAME
+ + ".TodosActivity.INTENT_EXTRA_USER_NAME";
private static final int ACTIVITY_TIP = 500;
@@ -86,8 +88,11 @@
mStateHolder = (StateHolder) retained;
mStateHolder.setActivity(this);
} else {
- // Optional user id, if not present, will be null and default
to logged-in user.
- mStateHolder = new
StateHolder(getIntent().getStringExtra(INTENT_EXTRA_USER_ID));
+ // Optional user id and username, if not present, will be null
and default to
+ // logged-in user.
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(INTENT_EXTRA_USER_ID),
+ getIntent().getStringExtra(INTENT_EXTRA_USER_NAME));
mStateHolder.setRecentOnly(false);
}
@@ -130,7 +135,7 @@
private void ensureUi() {
LayoutInflater inflater = LayoutInflater.from(this);
- setTitle(getString(R.string.todos_activity_title, ""));
+ setTitle(getString(R.string.todos_activity_title,
mStateHolder.getUsername()));
mLayoutEmpty = inflater.inflate(
R.layout.todos_activity_empty, null);
@@ -423,9 +428,10 @@
private TaskTodos mTaskTodosRecent;
private TaskTodos mTaskTodosNearby;
private String mUserId;
+ private String mUsername;
- public StateHolder(String userId) {
+ public StateHolder(String userId, String username) {
mIsRunningTaskTodosRecent = false;
mIsRunningTaskTodosNearby = false;
mRanOnceTodosRecent = false;
@@ -434,6 +440,11 @@
mTodosNearby = new Group<Todo>();
mRecentOnly = false;
mUserId = userId;
+ mUsername = username;
+ }
+
+ public String getUsername() {
+ return mUsername;
}
public Group<Todo> getTodosRecent() {
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsActivity.java Tue Sep
28 10:20:10 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsActivity.java Wed Sep
29 12:59:38 2010
@@ -570,6 +570,8 @@
Intent intent = new Intent(UserDetailsActivity.this,
BadgesActivity.class);
intent.putParcelableArrayListExtra(BadgesActivity.EXTRA_BADGE_ARRAY_LIST_PARCEL,
mStateHolder.getUser().getBadges());
+ intent.putExtra(BadgesActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
startActivity(intent);
}
}
@@ -578,12 +580,16 @@
if (mStateHolder.getUser() != null) {
Intent intent = new Intent(UserDetailsActivity.this,
UserMayorshipsActivity.class);
intent.putExtra(UserMayorshipsActivity.EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserMayorshipsActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
startActivity(intent);
}
}
private void startCheckinsActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
UserHistoryActivity.class);
+ intent.putExtra(UserHistoryActivity.EXTRA_USER_NAME,
+ StringFormatters.getUserFullName(mStateHolder.getUser()));
startActivity(intent);
}
@@ -593,9 +599,13 @@
Intent intent = null;
if (user.getFollowerCount() > 0) {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsFollowersActivity.class);
+
intent.putExtra(UserDetailsFriendsFollowersActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
} else {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsActivity.class);
intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
}
startActivity(intent);
}
@@ -615,6 +625,8 @@
} else {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsActivity.class);
intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_NAME,
+
StringFormatters.getUserFullName(mStateHolder.getUser()));
}
startActivity(intent);
}
@@ -622,12 +634,16 @@
private void startTodosActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
TodosActivity.class);
intent.putExtra(TodosActivity.INTENT_EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(TodosActivity.INTENT_EXTRA_USER_NAME,
StringFormatters.getUserFullName(
+ mStateHolder.getUser()));
startActivity(intent);
}
private void startTipsActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
UserDetailsTipsActivity.class);
intent.putExtra(UserDetailsTipsActivity.INTENT_EXTRA_USER_ID,
mStateHolder.getUser().getId());
+ intent.putExtra(UserDetailsTipsActivity.INTENT_EXTRA_USER_NAME,
StringFormatters.getUserFullName(
+ mStateHolder.getUser()));
startActivity(intent);
}
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsFriendsActivity.java
Sat Sep 25 22:10:34 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsFriendsActivity.java
Wed Sep 29 12:59:38 2010
@@ -36,6 +36,8 @@
public static final String EXTRA_USER_ID = Foursquared.PACKAGE_NAME
+ ".UserDetailsFriendsActivity.EXTRA_USER_ID";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserDetailsFriendsActivity.EXTRA_USER_NAME";
public static final String EXTRA_SHOW_ADD_FRIEND_OPTIONS =
Foursquared.PACKAGE_NAME
+ ".UserDetailsFriendsActivity.EXTRA_SHOW_ADD_FRIEND_OPTIONS";
@@ -56,23 +58,23 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_friends_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivityForTaskFriends(this);
} else {
-
- mStateHolder = new StateHolder();
- if (getIntent().getExtras().containsKey(EXTRA_USER_ID) ==
false) {
- Log.e(TAG, "UserFriendsActivity requires a userid in its
intent extras.");
+ if (getIntent().hasExtra(EXTRA_USER_ID) &&
getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(EXTRA_USER_ID),
+ getIntent().getStringExtra(EXTRA_USER_NAME));
+ } else {
+ Log.e(TAG, TAG + " requires a userid and username in its
intent extras.");
finish();
return;
}
-
mStateHolder.setUserId(getIntent().getExtras().getString(EXTRA_USER_ID));
- mStateHolder.startTaskFriends(this, mStateHolder.getUserId());
+ mStateHolder.startTaskFriends(this);
}
ensureUi();
@@ -124,6 +126,8 @@
} else if (mStateHolder.getFetchedFriendsOnce() &&
mStateHolder.getFriends().size() == 0) {
setEmptyView();
}
+
+ setTitle(getString(R.string.user_details_friends_activity_title,
mStateHolder.getUsername()));
}
private void onFriendsTaskComplete(Group<User> group, Exception ex) {
@@ -203,10 +207,8 @@
private static class StateHolder {
- /** User id. */
private String mUserId;
-
- /** Friends of the current user. */
+ private String mUsername;
private Group<User> mFriends;
private FriendsTask mTaskFriends;
@@ -214,18 +216,16 @@
private boolean mFetchedFriendsOnce;
- public StateHolder() {
+ public StateHolder(String userId, String username) {
+ mUserId = userId;
+ mUsername = username;
mIsRunningFriendsTask = false;
mFetchedFriendsOnce = false;
mFriends = new Group<User>();
}
- public String getUserId() {
- return mUserId;
- }
-
- public void setUserId(String userId) {
- mUserId = userId;
+ public String getUsername() {
+ return mUsername;
}
public Group<User> getFriends() {
@@ -236,11 +236,10 @@
mFriends = friends;
}
- public void startTaskFriends(UserDetailsFriendsActivity activity,
- String userId) {
+ public void startTaskFriends(UserDetailsFriendsActivity activity) {
mIsRunningFriendsTask = true;
mTaskFriends = new FriendsTask(activity);
- mTaskFriends.execute(userId);
+ mTaskFriends.execute(mUserId);
}
public void setActivityForTaskFriends(UserDetailsFriendsActivity
activity) {
=======================================
---
/main/src/com/joelapenna/foursquared/UserDetailsFriendsFollowersActivity.java
Tue Sep 28 19:28:32 2010
+++
/main/src/com/joelapenna/foursquared/UserDetailsFriendsFollowersActivity.java
Wed Sep 29 12:59:38 2010
@@ -47,8 +47,8 @@
static final String TAG = "UserDetailsFriendsFollowersActivity";
static final boolean DEBUG = FoursquaredSettings.DEBUG;
- public static final String INTENT_EXTRA_USER_ID =
Foursquared.PACKAGE_NAME
- + ".UserDetailsFriendsFollowersActivity.INTENT_EXTRA_USER_ID";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserDetailsFriendsFollowersActivity.EXTRA_USER_NAME";
private StateHolder mStateHolder;
private FriendActionableListAdapter mListAdapter;
@@ -69,15 +69,20 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
-
setTitle(getString(R.string.user_details_friends_followers_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivity(this);
} else {
- mStateHolder = new StateHolder();
- mStateHolder.setFollowersOnly(true);
+ if (getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new
StateHolder(getIntent().getStringExtra(EXTRA_USER_NAME));
+ mStateHolder.setFollowersOnly(true);
+ } else {
+ Log.e(TAG, TAG + " requires user name in intent extras.");
+ finish();
+ return;
+ }
}
ensureUi();
@@ -203,6 +208,9 @@
} else {
setProgressBarIndeterminateVisibility(false);
}
+
+
setTitle(getString(R.string.user_details_friends_followers_activity_title,
+ mStateHolder.getUsername()));
}
private FriendActionableListAdapter.ButtonRowClickHandler
mButtonRowClickHandler =
@@ -492,6 +500,7 @@
}
private static class StateHolder {
+ private String mUsername;
private Group<User> mFollowers;
private Group<User> mFriends;
@@ -506,7 +515,8 @@
private List<TaskUpdateFollower> mTasksUpdateFollowers;
- public StateHolder() {
+ public StateHolder(String username) {
+ mUsername = username;
mIsRunningTaskFollowers = false;
mIsRunningTaskFriends = false;
mRanOnceFriends = false;
@@ -516,6 +526,10 @@
mFollowersOnly = true;
mTasksUpdateFollowers = new ArrayList<TaskUpdateFollower>();
}
+
+ public String getUsername() {
+ return mUsername;
+ }
public Group<User> getFollowers() {
return mFollowers;
=======================================
---
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
Sat Sep 25 14:13:22 2010
+++
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
Wed Sep 29 12:59:38 2010
@@ -10,6 +10,7 @@
import
com.joelapenna.foursquared.app.LoadableListActivityWithViewAndHeader;
import com.joelapenna.foursquared.location.LocationUtils;
import com.joelapenna.foursquared.util.NotificationsUtil;
+import com.joelapenna.foursquared.util.StringFormatters;
import com.joelapenna.foursquared.widget.FriendListAdapter;
import com.joelapenna.foursquared.widget.SegmentedButton;
import
com.joelapenna.foursquared.widget.SegmentedButton.OnClickListenerSegmentedButton;
@@ -70,7 +71,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_details_friends_in_common_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
@@ -195,6 +195,9 @@
} else {
setProgressBarIndeterminateVisibility(false);
}
+
+ setTitle(getString(R.string.user_details_friends_in_common_title,
+ StringFormatters.getUserFullName(mStateHolder.getUser())));
}
@Override
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Wed
Sep 29 11:12:24 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsTipsActivity.java Wed
Sep 29 12:59:38 2010
@@ -49,7 +49,9 @@
static final boolean DEBUG = FoursquaredSettings.DEBUG;
public static final String INTENT_EXTRA_USER_ID =
Foursquared.PACKAGE_NAME
- + ".TipsActivity.INTENT_EXTRA_USER_ID";
+ + ".UserDetailsTipsActivity.INTENT_EXTRA_USER_ID";
+ public static final String INTENT_EXTRA_USER_NAME =
Foursquared.PACKAGE_NAME
+ + ".UserDetailsTipsActivity.INTENT_EXTRA_USER_NAME";
private static final int ACTIVITY_TIP = 500;
@@ -73,18 +75,19 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_details_tips_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivity(this);
} else {
- if (getIntent().hasExtra(INTENT_EXTRA_USER_ID)) {
- mStateHolder = new
StateHolder(getIntent().getStringExtra(INTENT_EXTRA_USER_ID));
+ if (getIntent().hasExtra(INTENT_EXTRA_USER_ID) &&
getIntent().hasExtra(INTENT_EXTRA_USER_NAME)) {
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(INTENT_EXTRA_USER_ID),
+
getIntent().getStringExtra(INTENT_EXTRA_USER_NAME));
mStateHolder.setRecentOnly(true);
} else {
- Log.e(TAG, TAG + " requires user ID in intent extras.");
+ Log.e(TAG, TAG + " requires user ID and name in intent
extras.");
finish();
return;
}
@@ -215,6 +218,8 @@
} else {
setProgressBarIndeterminateVisibility(false);
}
+
+ setTitle(getString(R.string.user_details_tips_activity_title,
mStateHolder.getUsername()));
}
@Override
@@ -375,7 +380,7 @@
return foursquare.tips(
LocationUtils.createFoursquareLocation(loc),
mUserId,
- null,
+ "nearby",
mRecentOnly ? "recent" : "popular",
30);
} catch (Exception e) {
@@ -407,6 +412,7 @@
private static class StateHolder {
private String mUserId;
+ private String mUsername;
private Group<Tip> mTipsRecent;
private Group<Tip> mTipsPopular;
private TaskTips mTaskTipsRecent;
@@ -418,8 +424,9 @@
private boolean mRanOnceTipsPopular;
- public StateHolder(String userId) {
+ public StateHolder(String userId, String username) {
mUserId = userId;
+ mUsername = username;
mIsRunningTaskTipsRecent = false;
mIsRunningTaskTipsPopular = false;
mRanOnceTipsRecent = false;
@@ -428,6 +435,10 @@
mTipsPopular = new Group<Tip>();
mRecentOnly = true;
}
+
+ public String getUsername() {
+ return mUsername;
+ }
public Group<Tip> getTipsRecent() {
return mTipsRecent;
=======================================
--- /main/src/com/joelapenna/foursquared/UserHistoryActivity.java Sun Sep
26 16:56:17 2010
+++ /main/src/com/joelapenna/foursquared/UserHistoryActivity.java Wed Sep
29 12:59:38 2010
@@ -33,7 +33,9 @@
*/
public class UserHistoryActivity extends LoadableListActivity {
static final String TAG = "UserHistoryActivity";
- static final boolean DEBUG = FoursquaredSettings.DEBUG;
+
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserHistoryActivity.EXTRA_USER_NAME";
private StateHolder mStateHolder;
private HistoryListAdapter mListAdapter;
@@ -42,7 +44,6 @@
private BroadcastReceiver mLoggedOutReceiver = new BroadcastReceiver()
{
@Override
public void onReceive(Context context, Intent intent) {
- if (DEBUG) Log.d(TAG, "onReceive: " + intent);
finish();
}
};
@@ -51,15 +52,20 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_history_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
mStateHolder = (StateHolder) retained;
mStateHolder.setActivityForTaskFriends(this);
} else {
- mStateHolder = new StateHolder();
- mStateHolder.startTaskHistory(this);
+ if (getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new
StateHolder(getIntent().getStringExtra(EXTRA_USER_NAME));
+ mStateHolder.startTaskHistory(this);
+ } else {
+ Log.e(TAG, TAG + " requires username as intent extra.");
+ finish();
+ return;
+ }
}
ensureUi();
@@ -104,6 +110,8 @@
} else if (mStateHolder.getFetchedOnce() &&
mStateHolder.getHistory().size() == 0) {
setEmptyView();
}
+
+ setTitle(getString(R.string.user_history_activity_title,
mStateHolder.getUsername()));
}
@Override
@@ -136,7 +144,6 @@
}
private void startVenueActivity(Checkin checkin) {
- // TODO: Perform some action when user is clicking on a shout
history item.
if (checkin != null) {
if (checkin.getVenue() != null
&& !TextUtils.isEmpty(checkin.getVenue().getId())) {
Venue venue = checkin.getVenue();
@@ -210,19 +217,22 @@
private static class StateHolder {
-
- /** History of the logged in user. */
+ private String mUsername;
private Group<Checkin> mHistory;
-
private HistoryTask mTaskHistory;
private boolean mIsRunningHistoryTask;
private boolean mFetchedOnce;
- public StateHolder() {
+ public StateHolder(String username) {
+ mUsername = username;
mIsRunningHistoryTask = false;
mFetchedOnce = false;
mHistory = new Group<Checkin>();
}
+
+ public String getUsername() {
+ return mUsername;
+ }
public Group<Checkin> getHistory() {
return mHistory;
=======================================
--- /main/src/com/joelapenna/foursquared/UserMayorshipsActivity.java Fri
Sep 24 13:57:11 2010
+++ /main/src/com/joelapenna/foursquared/UserMayorshipsActivity.java Wed
Sep 29 12:59:38 2010
@@ -23,8 +23,8 @@
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
-import android.widget.ListView;
import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ListView;
import java.util.ArrayList;
@@ -42,6 +42,8 @@
public static final String EXTRA_USER_ID = Foursquared.PACKAGE_NAME
+ ".UserMayorshipsActivity.EXTRA_USER_ID";
+ public static final String EXTRA_USER_NAME = Foursquared.PACKAGE_NAME
+ + ".UserMayorshipsActivity.EXTRA_USER_NAME";
public static final String EXTRA_VENUE_LIST_PARCEL =
Foursquared.PACKAGE_NAME
+ ".UserMayorshipsActivity.EXTRA_VENUE_LIST_PARCEL";
@@ -62,7 +64,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.user_mayorships_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
@@ -70,13 +71,15 @@
mStateHolder.setActivityForTaskVenues(this);
} else {
- mStateHolder = new StateHolder();
- if (getIntent().getExtras().containsKey(EXTRA_USER_ID) ==
false) {
+ if (getIntent().hasExtra(EXTRA_USER_ID) &&
getIntent().hasExtra(EXTRA_USER_NAME)) {
+ mStateHolder = new StateHolder(
+ getIntent().getStringExtra(EXTRA_USER_ID),
+ getIntent().getStringExtra(EXTRA_USER_NAME));
+ } else {
Log.e(TAG, "UserMayorships requires a userid in its intent
extras.");
finish();
return;
}
-
mStateHolder.setUserId(getIntent().getExtras().getString(EXTRA_USER_ID));
if
(getIntent().getExtras().containsKey(EXTRA_VENUE_LIST_PARCEL)) {
// Can't jump from ArrayList to Group, argh.
@@ -89,7 +92,7 @@
mStateHolder.setVenues(group);
} else {
- mStateHolder.startTaskVenues(this,
mStateHolder.getUserId());
+ mStateHolder.startTaskVenues(this);
}
}
@@ -145,6 +148,8 @@
} else if (mStateHolder.getFetchedVenuesOnce() &&
mStateHolder.getVenues().size() == 0) {
setEmptyView();
}
+
+ setTitle(getString(R.string.user_mayorships_activity_title,
mStateHolder.getUsername()));
}
private void onVenuesTaskComplete(User user, Exception ex) {
@@ -235,10 +240,8 @@
private static class StateHolder {
- /** User id. */
private String mUserId;
-
- /** Friends of the current user. */
+ private String mUsername;
private Group<Venue> mVenues;
private VenuesTask mTaskVenues;
@@ -246,18 +249,16 @@
private boolean mFetchedVenuesOnce;
- public StateHolder() {
+ public StateHolder(String userId, String username) {
+ mUserId = userId;
+ mUsername = username;
mIsRunningVenuesTask = false;
mFetchedVenuesOnce = false;
mVenues = new Group<Venue>();
}
-
- public String getUserId() {
- return mUserId;
- }
-
- public void setUserId(String userId) {
- mUserId = userId;
+
+ public String getUsername() {
+ return mUsername;
}
public Group<Venue> getVenues() {
@@ -268,11 +269,10 @@
mVenues = venues;
}
- public void startTaskVenues(UserMayorshipsActivity activity,
- String userId) {
+ public void startTaskVenues(UserMayorshipsActivity activity) {
mIsRunningVenuesTask = true;
mTaskVenues = new VenuesTask(activity);
- mTaskVenues.execute(userId);
+ mTaskVenues.execute(mUserId);
}
public void setActivityForTaskVenues(UserMayorshipsActivity
activity) {
=======================================
--- /main/src/com/joelapenna/foursquared/VenueActivity.java Tue Sep 28
11:53:21 2010
+++ /main/src/com/joelapenna/foursquared/VenueActivity.java Wed Sep 29
12:59:38 2010
@@ -555,7 +555,6 @@
}
break;
case RESULT_CODE_ACTIVITY_ADD_TIP:
- Log.e(TAG, "ActivityResult():
RESULT_CODE_ACTIVITY_ADD_TIP...");
if (resultCode == Activity.RESULT_OK) {
Tip tip =
data.getParcelableExtra(AddTipActivity.EXTRA_TIP_RETURNED);
VenueUtils.addTip(mStateHolder.getVenue(), tip);
@@ -566,7 +565,6 @@
}
break;
case RESULT_CODE_ACTIVITY_ADD_TODO:
- Log.e(TAG, "ActivityResult():
RESULT_CODE_ACTIVITY_ADD_TODO...");
if (resultCode == Activity.RESULT_OK) {
Todo todo =
data.getParcelableExtra(AddTodoActivity.EXTRA_TODO_RETURNED);
VenueUtils.addTodo(mStateHolder.getVenue(), todo.getTip(),
todo);
@@ -578,7 +576,6 @@
break;
case RESULT_CODE_ACTIVITY_TIP:
case RESULT_CODE_ACTIVITY_TODO:
- Log.e(TAG, "ActivityResult(): RESULT_CODE_ACTIVITY_TIP or
RESULT_CODE_ACTIVITY_TODO...");
if (resultCode == Activity.RESULT_OK &&
data.hasExtra(TipActivity.EXTRA_TIP_RETURNED)) {
Tip tip =
(Tip)data.getParcelableExtra(TipActivity.EXTRA_TIP_RETURNED);
Todo todo = data.hasExtra(TipActivity.EXTRA_TODO_RETURNED) ?
@@ -589,7 +586,6 @@
}
break;
case RESULT_CODE_ACTIVITY_TIPS:
- Log.e(TAG, "ActivityResult(): RESULT_CODE_ACTIVITY_TIPS...");
if (resultCode == Activity.RESULT_OK &&
data.hasExtra(VenueTipsActivity.INTENT_EXTRA_RETURN_VENUE)) {
Venue venue =
(Venue)data.getParcelableExtra(VenueTipsActivity.INTENT_EXTRA_RETURN_VENUE);
VenueUtils.replaceTipsAndTodos(mStateHolder.getVenue(), venue);
=======================================
--- /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Wed Sep
29 11:12:24 2010
+++ /main/src/com/joelapenna/foursquared/VenueCheckinsActivity.java Wed Sep
29 12:59:38 2010
@@ -143,15 +143,19 @@
startActivity(intent);
}
});
+
+ setTitle(getString(R.string.venue_checkins_activity_title,
mStateHolder.getVenueName()));
}
private static class StateHolder {
+ private String mVenueName;
private Group<Checkin> mYou;
private Group<Checkin> mFriends;
private Group<Checkin> mOthers;
public StateHolder(Venue venue, String loggedInUserId) {
+ mVenueName = venue.getName();
mYou = new Group<Checkin>();
mFriends = new Group<Checkin>();
mOthers = new Group<Checkin>();
@@ -170,6 +174,10 @@
}
}
}
+
+ public String getVenueName() {
+ return mVenueName;
+ }
public Group<Checkin> getCheckinsYou() {
return mYou;
=======================================
--- /main/src/com/joelapenna/foursquared/VenueTipsActivity.java Sun Sep 26
10:33:26 2010
+++ /main/src/com/joelapenna/foursquared/VenueTipsActivity.java Wed Sep 29
12:59:38 2010
@@ -67,7 +67,6 @@
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
registerReceiver(mLoggedOutReceiver, new
IntentFilter(Foursquared.INTENT_ACTION_LOGGED_OUT));
- setTitle(getString(R.string.venue_tips_activity_title));
Object retained = getLastNonConfigurationInstance();
if (retained != null && retained instanceof StateHolder) {
@@ -156,6 +155,8 @@
startActivityForResult(intent, ACTIVITY_TIP);
}
});
+
+ setTitle(getString(R.string.venue_tips_activity_title,
mStateHolder.getVenue().getName()));
}
@Override
Reply all
Reply to author
Forward
0 new messages