[markww-foursquared] 10 new revisions pushed by markww on 2010-10-11 15:53 GMT

3 views
Skip to first unread message

markww-fo...@googlecode.com

unread,
Oct 11, 2010, 11:53:36 AM10/11/10
to foursqu...@googlegroups.com
10 new revisions:

Revision: 22b9b4941f
Author: mar...@gmail.com
Date: Wed Oct 6 09:06:43 2010
Log: Moved checkin people count for venue into strings xml.
http://code.google.com/r/markww-foursquared/source/detail?r=22b9b4941f

Revision: 03072da26a
Author: mar...@gmail.com
Date: Wed Oct 6 09:07:17 2010
Log: Using count string from res file.
http://code.google.com/r/markww-foursquared/source/detail?r=03072da26a

Revision: 7f30e3a7a1
Author: mar...@gmail.com
Date: Wed Oct 6 09:07:51 2010
Log: Removing progress bar titles for consistency.
http://code.google.com/r/markww-foursquared/source/detail?r=7f30e3a7a1

Revision: 3b28f17b49
Author: mar...@gmail.com
Date: Wed Oct 6 10:43:36 2010
Log: Added url matching for /feed and /places. These just go to the main
ac...
http://code.google.com/r/markww-foursquared/source/detail?r=3b28f17b49

Revision: 4be16fa182
Author: mar...@gmail.com
Date: Wed Oct 6 10:45:15 2010
Log: Support for intent to main activity tabs.
http://code.google.com/r/markww-foursquared/source/detail?r=4be16fa182

Revision: 4ac060e643
Author: mar...@gmail.com
Date: Thu Oct 7 11:05:27 2010
Log: Removed unused imports.
http://code.google.com/r/markww-foursquared/source/detail?r=4ac060e643

Revision: 02a9ba9d22
Author: mar...@gmail.com
Date: Thu Oct 7 11:43:30 2010
Log: Updates to fix incorrect json response from v1 api, and inconsistent
o...
http://code.google.com/r/markww-foursquared/source/detail?r=02a9ba9d22

Revision: adf254154c
Author: mar...@gmail.com
Date: Mon Oct 11 08:20:45 2010
Log: Redesigned login screen a bit, adding experimental checkins content
pr...
http://code.google.com/r/markww-foursquared/source/detail?r=adf254154c

Revision: 50be08d789
Author: mar...@gmail.com
Date: Mon Oct 11 08:52:11 2010
Log: Finally updated checkin dialog post to twitter/facebook. If the
logged...
http://code.google.com/r/markww-foursquared/source/detail?r=50be08d789

Revision: 63e3283f5d
Author: mar...@gmail.com
Date: Mon Oct 11 08:52:50 2010
Log: Adding hires login image.
http://code.google.com/r/markww-foursquared/source/detail?r=63e3283f5d

==============================================================================
Revision: 22b9b4941f
Author: mar...@gmail.com
Date: Wed Oct 6 09:06:43 2010
Log: Moved checkin people count for venue into strings xml.
http://code.google.com/r/markww-foursquared/source/detail?r=22b9b4941f

Modified:
/main/res/values/strings.xml

=======================================
--- /main/res/values/strings.xml Wed Sep 29 15:27:00 2010
+++ /main/res/values/strings.xml Wed Oct 6 09:06:43 2010
@@ -78,6 +78,7 @@
<string name="nearby_menu_add_venue">Add Venue</string>
<string name="nearby_venues_no_location">Your location could not be
found! Make sure network or GPS location services are turned on, then try
refreshing the venues list again!</string>
<string name="nearby_venues_label_nearby">Nearby</string>
+ <string name="nearby_venues_checkin_count">%s people</string>
<string name="need_an_account">Need an account?</string>
<string name="no_checkins_be_the_first">No recent checkins here!</string>
<string name="no_friend_checkins">No recent friend checkins!</string>

==============================================================================
Revision: 03072da26a
Author: mar...@gmail.com
Date: Wed Oct 6 09:07:17 2010
Log: Using count string from res file.
http://code.google.com/r/markww-foursquared/source/detail?r=03072da26a

Modified:
/main/src/com/joelapenna/foursquared/widget/VenueListAdapter.java

=======================================
--- /main/src/com/joelapenna/foursquared/widget/VenueListAdapter.java Wed
Sep 22 13:42:23 2010
+++ /main/src/com/joelapenna/foursquared/widget/VenueListAdapter.java Wed
Oct 6 09:07:17 2010
@@ -39,6 +39,7 @@
private static final String TAG = "VenueListAdapter";
private static final boolean DEBUG = FoursquaredSettings.DEBUG;

+ private Context mContext;
private LayoutInflater mInflater;
private RemoteResourceManager mRrm;
private Handler mHandler;
@@ -46,6 +47,7 @@

public VenueListAdapter(Context context, RemoteResourceManager rrm) {
super(context);
+ mContext = context;
mInflater = LayoutInflater.from(context);
mHandler = new Handler();
mRrm = rrm;
@@ -145,7 +147,8 @@
!stats.getHereNow().equals("2")) {
holder.iconTrending.setVisibility(View.VISIBLE);
holder.venueCheckinCount.setVisibility(View.VISIBLE);
- holder.venueCheckinCount.setText(stats.getHereNow() + " people
here");
+
holder.venueCheckinCount.setText(mContext.getResources().getString(
+ R.string.nearby_venues_checkin_count,
stats.getHereNow()));
} else {
holder.iconTrending.setVisibility(View.GONE);
holder.venueCheckinCount.setVisibility(View.GONE);

==============================================================================
Revision: 7f30e3a7a1
Author: mar...@gmail.com
Date: Wed Oct 6 09:07:51 2010
Log: Removing progress bar titles for consistency.
http://code.google.com/r/markww-foursquared/source/detail?r=7f30e3a7a1

Modified:
/main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java

=======================================
--- /main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
Tue Oct 5 11:31:09 2010
+++ /main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
Wed Oct 6 09:07:51 2010
@@ -219,16 +219,14 @@
super.onResume();

if (mStateHolder.getIsRunningTaskFindFriends()) {
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
-
getResources().getString(R.string.add_friends_progress_bar_message_find));
+ startProgressBar(null,
+
getResources().getString(R.string.add_friends_progress_bar_message_find));
} else if (mStateHolder.getIsRunningTaskSendFriendRequest()) {
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
- getResources()
- .getString(R.string.add_friends_progress_bar_message_send_request));
+ startProgressBar(null,
+
getResources().getString(R.string.add_friends_progress_bar_message_send_request));
} else if (mStateHolder.getIsRunningTaskSendInvite()) {
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
- getResources()
- .getString(R.string.add_friends_progress_bar_message_send_invite));
+ startProgressBar(null,
+
getResources().getString(R.string.add_friends_progress_bar_message_send_invite));
}
}

@@ -257,7 +255,7 @@
}

private void userAdd(User user) {
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
+ startProgressBar(null,

getResources().getString(R.string.add_friends_progress_bar_message_send_request));

mStateHolder.startTaskSendFriendRequest(AddFriendsByUserInputActivity.this,
user.getId());
}
@@ -269,13 +267,13 @@
}

private void userInvite(ContactSimple contact) {
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
+ startProgressBar(null,

getResources().getString(R.string.add_friends_progress_bar_message_send_invite));

mStateHolder.startTaskSendInvite(AddFriendsByUserInputActivity.this,
contact.mEmail, false);
}

private void inviteAll() {
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
+ startProgressBar(null,

getResources().getString(R.string.add_friends_progress_bar_message_send_invite));
mStateHolder.startTaskSendInvite(
AddFriendsByUserInputActivity.this,
mStateHolder.getUsersNotOnFoursquareAsCommaSepString(), true);
@@ -287,7 +285,7 @@

mEditInput.setEnabled(false);
mBtnSearch.setEnabled(false);
-
startProgressBar(getResources().getString(R.string.add_friends_activity_label),
+ startProgressBar(null,

getResources().getString(R.string.add_friends_progress_bar_message_find));

mStateHolder.startTaskFindFriends(AddFriendsByUserInputActivity.this,
input);
}
@@ -521,8 +519,8 @@

@Override
protected void onPreExecute() {
- mActivity.startProgressBar(mActivity.getResources().getString(
- R.string.add_friends_activity_label),
mActivity.getResources().getString(
+ mActivity.startProgressBar(
+ null, mActivity.getResources().getString(
R.string.add_friends_progress_bar_message_find));
}

@@ -663,8 +661,8 @@

@Override
protected void onPreExecute() {
- mActivity.startProgressBar(mActivity.getResources().getString(
- R.string.add_friends_activity_label),
mActivity.getResources().getString(
+ mActivity.startProgressBar(
+ null, mActivity.getResources().getString(

R.string.add_friends_progress_bar_message_send_request));
}

@@ -718,8 +716,8 @@

@Override
protected void onPreExecute() {
- mActivity.startProgressBar(mActivity.getResources().getString(
- R.string.add_friends_activity_label),
mActivity.getResources().getString(
+ mActivity.startProgressBar(
+ null, mActivity.getResources().getString(

R.string.add_friends_progress_bar_message_send_invite));
}


==============================================================================
Revision: 3b28f17b49
Author: mar...@gmail.com
Date: Wed Oct 6 10:43:36 2010
Log: Added url matching for /feed and /places. These just go to the main
activity tabs. They don't resolve to a mobile url yet.
http://code.google.com/r/markww-foursquared/source/detail?r=3b28f17b49

Modified:
/main/src/com/joelapenna/foursquared/BrowsableActivity.java

=======================================
--- /main/src/com/joelapenna/foursquared/BrowsableActivity.java Thu Sep 30
11:43:33 2010
+++ /main/src/com/joelapenna/foursquared/BrowsableActivity.java Wed Oct 6
10:43:36 2010
@@ -25,12 +25,14 @@
private static final String TAG = "BrowsableActivity";
private static final boolean DEBUG = FoursquaredSettings.DEBUG;

- private static final int URI_PATH_CHECKIN = 1;
- private static final int URI_PATH_CHECKINS = 2;
- private static final int URI_PATH_SEARCH = 3;
- private static final int URI_PATH_SHOUT = 4;
- private static final int URI_PATH_USER = 5;
- private static final int URI_PATH_VENUE = 6;
+ private static final int URI_PATH_CHECKIN = 1;
+ private static final int URI_PATH_CHECKINS = 2;
+ private static final int URI_PATH_SEARCH = 3;
+ private static final int URI_PATH_SHOUT = 4;
+ private static final int URI_PATH_USER = 5;
+ private static final int URI_PATH_VENUE = 6;
+ private static final int URI_PATH_MAIN_FRIENDS = 7;
+ private static final int URI_PATH_MAIN_PLACES = 8;

public static String PARAM_SHOUT_TEXT = "shout";
public static String PARAM_SEARCH_QUERY = "q";
@@ -46,6 +48,8 @@
sUriMatcher.addURI("m.foursquare.com", "shout", URI_PATH_SHOUT);
sUriMatcher.addURI("m.foursquare.com", "user", URI_PATH_USER);
sUriMatcher.addURI("m.foursquare.com", "venue/#", URI_PATH_VENUE);
+ sUriMatcher.addURI("m.foursquare.com", "feed",
URI_PATH_MAIN_FRIENDS);
+ sUriMatcher.addURI("m.foursquare.com", "places",
URI_PATH_MAIN_PLACES);
}

private BroadcastReceiver mLoggedOutReceiver = new BroadcastReceiver()
{
@@ -118,6 +122,16 @@
intent.putExtra(VenueActivity.INTENT_EXTRA_VENUE_ID,
uri.getLastPathSegment());
startActivity(intent);
break;
+ case URI_PATH_MAIN_FRIENDS:
+ intent = new Intent(this, MainActivity.class);
+
intent.putExtra(MainActivity.INTENT_EXTRA_STARTUP_TAB_FRIENDS, true);
+ startActivity(intent);
+ break;
+ case URI_PATH_MAIN_PLACES:
+ intent = new Intent(this, MainActivity.class);
+
intent.putExtra(MainActivity.INTENT_EXTRA_STARTUP_TAB_PLACES, true);
+ startActivity(intent);
+ break;
default:
if (DEBUG) Log.d(TAG, "Matched: None");
}

==============================================================================
Revision: 4be16fa182
Author: mar...@gmail.com
Date: Wed Oct 6 10:45:15 2010
Log: Support for intent to main activity tabs.
http://code.google.com/r/markww-foursquared/source/detail?r=4be16fa182

Modified:
/main/AndroidManifest.xml
/main/src/com/joelapenna/foursquared/MainActivity.java

=======================================
--- /main/AndroidManifest.xml Thu Sep 30 12:01:25 2010
+++ /main/AndroidManifest.xml Wed Oct 6 10:45:15 2010
@@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.joelapenna.foursquared"
android:installLocation="auto"
- android:versionName="2010-09-30" android:versionCode="2010093000" >
+ android:versionName="2010-10-05" android:versionCode="2010100500" >

<uses-permission
android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -120,7 +120,14 @@
android:scheme="http"
android:host="m.foursquare.com"
android:pathPrefix="/venue/" />
-
+ <data
+ android:scheme="http"
+ android:host="m.foursquare.com"
+ android:pathPrefix="/feed" />
+ <data
+ android:scheme="http"
+ android:host="m.foursquare.com"
+ android:pathPrefix="/places" />
</intent-filter>
</activity>

=======================================
--- /main/src/com/joelapenna/foursquared/MainActivity.java Mon Sep 27
10:19:14 2010
+++ /main/src/com/joelapenna/foursquared/MainActivity.java Wed Oct 6
10:45:15 2010
@@ -29,6 +29,17 @@
public class MainActivity extends TabActivity {
public static final String TAG = "MainActivity";
public static final boolean DEBUG = FoursquaredSettings.DEBUG;
+
+ public static final String INTENT_EXTRA_STARTUP_TAB_FRIENDS =
Foursquared.PACKAGE_NAME
+ + ".MainActivity.INTENT_EXTRA_STARTUP_TAB_FRIENDS";
+ public static final String INTENT_EXTRA_STARTUP_TAB_PLACES =
Foursquared.PACKAGE_NAME
+ + ".MainActivity.INTENT_EXTRA_STARTUP_TAB_PLACES";
+ public static final String INTENT_EXTRA_STARTUP_TAB_TIPS =
Foursquared.PACKAGE_NAME
+ + ".MainActivity.INTENT_EXTRA_STARTUP_TAB_TIPS";
+ public static final String INTENT_EXTRA_STARTUP_TAB_TODOS =
Foursquared.PACKAGE_NAME
+ + ".MainActivity.INTENT_EXTRA_STARTUP_TAB_TODOS";
+ public static final String INTENT_EXTRA_STARTUP_TAB_ME =
Foursquared.PACKAGE_NAME
+ + ".MainActivity.INTENT_EXTRA_STARTUP_TAB_ME";

private TabHost mTabHost;

@@ -119,6 +130,19 @@
FrameLayout flTabContent =
(FrameLayout)findViewById(android.R.id.tabcontent);
flTabContent.setPadding(0, 0, 0, 0);
}
+
+ // Overrides from intent extra.
+ if (getIntent().getBooleanExtra(INTENT_EXTRA_STARTUP_TAB_FRIENDS,
false)) {
+
mTabHost.setCurrentTab(startupTab.equals(startupTabValues[0]) ? 0 : 1);
+ } else if
(getIntent().getBooleanExtra(INTENT_EXTRA_STARTUP_TAB_PLACES, false)) {
+
mTabHost.setCurrentTab(startupTab.equals(startupTabValues[0]) ? 1 : 0);
+ } else if
(getIntent().getBooleanExtra(INTENT_EXTRA_STARTUP_TAB_TIPS, false)) {
+ mTabHost.setCurrentTab(2);
+ } else if
(getIntent().getBooleanExtra(INTENT_EXTRA_STARTUP_TAB_TODOS, false)) {
+ mTabHost.setCurrentTab(3);
+ } else if
(getIntent().getBooleanExtra(INTENT_EXTRA_STARTUP_TAB_ME, false)) {
+ mTabHost.setCurrentTab(4);
+ }
}

private void redirectToLoginActivity() {

==============================================================================
Revision: 4ac060e643
Author: mar...@gmail.com
Date: Thu Oct 7 11:05:27 2010
Log: Removed unused imports.
http://code.google.com/r/markww-foursquared/source/detail?r=4ac060e643

Modified:
/main/src/com/joelapenna/foursquare/parsers/json/UserParser.java
/main/src/com/joelapenna/foursquare/util/JSONUtils.java
/main/src/com/joelapenna/foursquared/AddVenueActivity.java

=======================================
--- /main/src/com/joelapenna/foursquare/parsers/json/UserParser.java Mon
Sep 27 12:49:27 2010
+++ /main/src/com/joelapenna/foursquare/parsers/json/UserParser.java Thu
Oct 7 11:05:27 2010
@@ -3,15 +3,11 @@
*/
package com.joelapenna.foursquare.parsers.json;

-import com.joelapenna.foursquare.Foursquare;
import com.joelapenna.foursquare.types.User;

import org.json.JSONException;
import org.json.JSONObject;

-import java.util.logging.Level;
-import java.util.logging.Logger;
-

/**
* @date July 13, 2010
=======================================
--- /main/src/com/joelapenna/foursquare/util/JSONUtils.java Mon Sep 27
12:49:27 2010
+++ /main/src/com/joelapenna/foursquare/util/JSONUtils.java Thu Oct 7
11:05:27 2010
@@ -16,9 +16,10 @@
import org.json.JSONException;
import org.json.JSONObject;

+import android.util.Log;
+
import java.io.IOException;
import java.util.Iterator;
-import java.util.logging.Level;
import java.util.logging.Logger;


@@ -35,9 +36,10 @@
public static FoursquareType consume(Parser<? extends FoursquareType>
parser, String content)
throws FoursquareCredentialsException, FoursquareParseException,
FoursquareException, IOException {

- if (DEBUG) {
- LOG.log(Level.FINE, "http response: " + content);
- }
+ //if (DEBUG) {
+ // LOG.log(Level.FINE, "http response: " + content);
+ //}
+ Log.e("@@@", content);

try {
// The v1 API returns the response raw with no wrapper.
Depending on the
=======================================
--- /main/src/com/joelapenna/foursquared/AddVenueActivity.java Mon Sep 27
12:49:27 2010
+++ /main/src/com/joelapenna/foursquared/AddVenueActivity.java Thu Oct 7
11:05:27 2010
@@ -8,7 +8,6 @@
import com.joelapenna.foursquare.error.FoursquareException;
import com.joelapenna.foursquare.types.Category;
import com.joelapenna.foursquare.types.Group;
-import com.joelapenna.foursquare.types.Response;
import com.joelapenna.foursquare.types.Venue;
import com.joelapenna.foursquared.location.LocationUtils;
import com.joelapenna.foursquared.util.NotificationsUtil;
@@ -463,23 +462,24 @@
mParams[7], // category id

LocationUtils.createFoursquareLocation(location));
} else {
- Response response =
- foursquare.proposeedit(
- mVenueIdIfEditing,
- mParams[0], // name
- mParams[1], // address
- mParams[2], // cross street
- mParams[3], // city
- mParams[4], // state,
- mParams[5], // zip
- mParams[6], // phone
- mParams[7], // category id
-
LocationUtils.createFoursquareLocation(location));
- if (response != null &&
response.getValue().equals("ok")) {
- // TODO: Come up with a better method than
returning an empty venue on success.
+ try {
+ //Response response =
+ foursquare.proposeedit(
+ mVenueIdIfEditing,
+ mParams[0], // name
+ mParams[1], // address
+ mParams[2], // cross street
+ mParams[3], // city
+ mParams[4], // state,
+ mParams[5], // zip
+ mParams[6], // phone
+ mParams[7], // category id
+
LocationUtils.createFoursquareLocation(location));
+ } catch (Exception ex) {
+ // Unforunately v1 API is not returning a real
response object here, so we'll
+ // just consume and assume it went ok. Will be
fixed with api v2. The response
+ // looks like: { "response":"ok"} when it should
really be: "{ response: {"response":..}.
return new Venue();
- } else {
- throw new Exception(mErrorMsgForEditVenue);
}
}
} catch (Exception e) {

==============================================================================
Revision: 02a9ba9d22
Author: mar...@gmail.com
Date: Thu Oct 7 11:43:30 2010
Log: Updates to fix incorrect json response from v1 api, and inconsistent
object vs array returns depending on return count.
http://code.google.com/r/markww-foursquared/source/detail?r=02a9ba9d22

Modified:

/main/src/com/joelapenna/foursquare/parsers/json/FriendInvitesResultParser.java
/main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java

=======================================
---
/main/src/com/joelapenna/foursquare/parsers/json/FriendInvitesResultParser.java
Fri Oct 1 09:56:39 2010
+++
/main/src/com/joelapenna/foursquare/parsers/json/FriendInvitesResultParser.java
Thu Oct 7 11:43:30 2010
@@ -42,9 +42,14 @@
}
if (json.has("invited")) {
Emails emails = new Emails();
- JSONArray array = json.getJSONArray("invited");
- for (int i = 0; i < array.length(); i++) {
- emails.add(array.getString(i));
+ if (json.optJSONObject("invited") != null) {
+ JSONObject invitedAsObject = json.getJSONObject("invited");
+ emails.add(invitedAsObject.getString("email"));
+ } else if (json.optJSONArray("invited") != null) {
+ JSONArray array = json.getJSONArray("invited");
+ for (int i = 0; i < array.length(); i++) {
+ emails.add(array.getString(i));
+ }
}
obj.setContactEmailsOnNotOnFoursquareAlreadyInvited(emails);
}
=======================================
--- /main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
Wed Oct 6 09:07:51 2010
+++ /main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
Thu Oct 7 11:43:30 2010
@@ -728,6 +728,10 @@
Foursquare foursquare = foursquared.getFoursquare();

foursquare.inviteByEmail(params[0]);
+ return params[0];
+ } catch (ClassCastException ex) {
+ // Problem with api v1 returning invalid response object,
will be fixed
+ // in api v2.
return params[0];
} catch (Exception e) {
Log.e(TAG, "SendInviteTask: Exception sending invite.", e);

==============================================================================
Revision: adf254154c
Author: mar...@gmail.com
Date: Mon Oct 11 08:20:45 2010
Log: Redesigned login screen a bit, adding experimental checkins content
provider.
http://code.google.com/r/markww-foursquared/source/detail?r=adf254154c

Added:
/main/res/drawable/login_round_rect.xml
Modified:
/main/AndroidManifest.xml
/main/assets/changelog-en.html
/main/res/layout/login_activity.xml
/main/src/com/joelapenna/foursquare/util/JSONUtils.java
/main/src/com/joelapenna/foursquared/AddVenueActivity.java

=======================================
--- /dev/null
+++ /main/res/drawable/login_round_rect.xml Mon Oct 11 08:20:45 2010
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+ <!-- Copyright (c) Mark Wyszomierski, 2010. -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+ <corners android:radius="7dip" />
+ <solid android:color="#ffe6e6e6" />
+</shape>
+
=======================================
--- /main/AndroidManifest.xml Wed Oct 6 10:45:15 2010
+++ /main/AndroidManifest.xml Mon Oct 11 08:20:45 2010
@@ -4,7 +4,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
package="com.joelapenna.foursquared"
android:installLocation="auto"
- android:versionName="2010-10-05" android:versionCode="2010100500" >
+ android:versionName="2010-10-11" android:versionCode="2010101100" >

<uses-permission
android:name="android.permission.ACCESS_COARSE_LOCATION" />
@@ -48,6 +48,11 @@

<provider android:name=".providers.GlobalSearchProvider"
android:authorities="com.joelapenna.foursquared" />
+
+ <provider
+ android:name=".providers.FoursquareBridgeProvider"
+
android:authorities="com.joelapenna.foursquared.providers.foursquarebridgeprovider"
+ android:multiprocess="true" />

<uses-library
android:name="com.google.android.maps" />
=======================================
--- /main/assets/changelog-en.html Tue Oct 5 10:56:41 2010
+++ /main/assets/changelog-en.html Mon Oct 11 08:20:45 2010
@@ -38,7 +38,14 @@

<body>

- <h4><span>What's new in v2010-10-05?</span></h4>
+ <h4><span>What's new in v2010-10-11?</span></h4>
+ <ul>
+ <li>Updated login screen.</li>
+ <li>Fix for flag venue info. Submissions were being received, but
shown as an error in the app.</li>
+ <li>Fix for email invites. Invitations were being sent, but shown as
an error in the app.</li>
+ </ul>
+
+ <h4><span>What's new in v2010-10-05</span></h4>
<ul>
<li>Badge description now being shown with badge-unlock in
post-checkin dialog.</li>
<li>Post-checkin scores were not being displayed. Scores were still
being recorded
=======================================
--- /main/res/layout/login_activity.xml Thu Dec 17 00:16:51 2009
+++ /main/res/layout/login_activity.xml Mon Oct 11 08:20:45 2010
@@ -1,86 +1,83 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!-- Copyright 2009 Joe LaPenna -->
+
<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:gravity="center"
+ android:isScrollContainer="true"
+ android:background="#fff1f1f1">
+
+ <ImageView
+ android:layout_width="226dip"
+ android:layout_height="61dip"
+ android:src="@drawable/splash_logo"
+ android:layout_marginBottom="20dip" />
+
+ <LinearLayout
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:gravity="center"
- android:isScrollContainer="true"
- android:background="@drawable/foursquare_gradient"
->
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center_horizontal"
+ android:layout_marginLeft="15dip"
+ android:layout_marginRight="15dip"
+ android:padding="10dip"
+ android:background="@drawable/login_round_rect" >
+
+ <EditText
+ android:id="@+id/phoneEditText"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textEmailAddress"
+ android:layout_marginTop="10dip"
+ android:textAppearance="@android:style/TextAppearance.Large"
+ android:hint="@string/phone_number_or_email"
+ android:textSize="18dip"
+ android:layout_marginBottom="2dip"
+ android:fadingEdgeLength="0dip" />
+
+ <EditText
+ android:id="@+id/passwordEditText"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textPassword"
+ android:imeOptions="actionDone"
+ android:textSize="18dip"
+ android:hint="@string/password"
+ android:layout_marginBottom="7dip" />
+
+ <Button
+ android:id="@+id/button"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:enabled="false"
+ android:textSize="18dip"
+ android:text="@string/login_label"
+ android:layout_marginBottom="7dip" />
+
<ImageView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:scaleType="centerInside"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
- android:layout_weight="1"
- android:src="@drawable/main_logo" />
- <LinearLayout
- android:orientation="vertical"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:layout_marginTop="5dip"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
- android:layout_marginBottom="15dip"
- android:padding="10dip"
- android:background="@drawable/purple_plate"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingBottom="2dip"
- android:textAppearance="@android:style/TextAppearance.Large"
- android:textColor="#FFF"
- android:text="@string/login_get_started" />
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:paddingBottom="2dip"
- android:textColor="#FFF"
- android:text="@string/login_get_started_more" />
- <EditText
- android:id="@+id/phoneEditText"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:inputType="textEmailAddress"
- android:textAppearance="@android:style/TextAppearance.Large"
- android:hint="@string/phone_number_or_email" />
- <EditText
- android:id="@+id/passwordEditText"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:inputType="textPassword"
- android:imeOptions="actionDone"
- android:textAppearance="@android:style/TextAppearance.Large"
- android:hint="@string/password" />
- <Button
- android:id="@+id/button"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:enabled="false"
- android:textAppearance="@android:style/TextAppearance.Large"
- android:text="@string/login_label" />
- <ImageView
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:padding="3dip"
- android:src="@drawable/line" />
- <TextView
- android:id="@+id/newAccountTextView"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:gravity="right"
- android:paddingBottom="2dip"
- android:textAppearance="@android:style/TextAppearance.Large"
- android:textColor="#FFF"
- android:text="@string/need_an_account" />
- </LinearLayout>
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:padding="3dip"
+ android:src="@drawable/line"
+ android:layout_marginBottom="7dip" />
+
+ <TextView
+ android:id="@+id/newAccountTextView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:gravity="right"
+ android:paddingBottom="2dip"
+ android:textSize="18dip"
+ android:textColor="#333"
+ android:text="@string/need_an_account"
+ android:focusable="true"
+ android:clickable="true" />
+
+ </LinearLayout>
</LinearLayout>
=======================================
--- /main/src/com/joelapenna/foursquare/util/JSONUtils.java Thu Oct 7
11:05:27 2010
+++ /main/src/com/joelapenna/foursquare/util/JSONUtils.java Mon Oct 11
08:20:45 2010
@@ -16,10 +16,9 @@
import org.json.JSONException;
import org.json.JSONObject;

-import android.util.Log;
-
import java.io.IOException;
import java.util.Iterator;
+import java.util.logging.Level;
import java.util.logging.Logger;


@@ -36,10 +35,9 @@
public static FoursquareType consume(Parser<? extends FoursquareType>
parser, String content)
throws FoursquareCredentialsException, FoursquareParseException,
FoursquareException, IOException {

- //if (DEBUG) {
- // LOG.log(Level.FINE, "http response: " + content);
- //}
- Log.e("@@@", content);
+ if (DEBUG) {
+ LOG.log(Level.FINE, "http response: " + content);
+ }

try {
// The v1 API returns the response raw with no wrapper.
Depending on the
=======================================
--- /main/src/com/joelapenna/foursquared/AddVenueActivity.java Thu Oct 7
11:05:27 2010
+++ /main/src/com/joelapenna/foursquared/AddVenueActivity.java Mon Oct 11
08:20:45 2010
@@ -422,7 +422,7 @@
private String mVenueIdIfEditing;
private Exception mReason;
private Foursquared mFoursquared;
- private String mErrorMsgForEditVenue;
+ //private String mErrorMsgForEditVenue;

public AddOrEditVenueTask(AddVenueActivity activity,
String[] params,
@@ -431,8 +431,8 @@
mParams = params;
mVenueIdIfEditing = venueIdIfEditing;
mFoursquared = (Foursquared) activity.getApplication();
- mErrorMsgForEditVenue = activity.getResources().getString(
- R.string.add_venue_activity_edit_venue_fail);
+ //mErrorMsgForEditVenue = activity.getResources().getString(
+ // R.string.add_venue_activity_edit_venue_fail);
}

public void setActivity(AddVenueActivity activity) {

==============================================================================
Revision: 50be08d789
Author: mar...@gmail.com
Date: Mon Oct 11 08:52:11 2010
Log: Finally updated checkin dialog post to twitter/facebook. If the
logged-in user's twitter/facebook handles are empty, we don't show those
checkboxes at all.
http://code.google.com/r/markww-foursquared/source/detail?r=50be08d789

Added:
/main/res/drawable/splash_logo.png
Modified:
/main/assets/changelog-en.html
/main/src/com/joelapenna/foursquared/CheckinOrShoutGatherInfoActivity.java

=======================================
--- /dev/null
+++ /main/res/drawable/splash_logo.png Mon Oct 11 08:52:11 2010
Binary file, no diff available.
=======================================
--- /main/assets/changelog-en.html Mon Oct 11 08:20:45 2010
+++ /main/assets/changelog-en.html Mon Oct 11 08:52:11 2010
@@ -40,6 +40,8 @@

<h4><span>What's new in v2010-10-11?</span></h4>
<ul>
+ <li>Hiding Twitter/Facebook checkboxes in checkin dialog if the user
has not linked their
+ Foursquare account with Twitter/Facebook through the Foursquare
website settings page.</li>
<li>Updated login screen.</li>
<li>Fix for flag venue info. Submissions were being received, but
shown as an error in the app.</li>
<li>Fix for email invites. Invitations were being sent, but shown as
an error in the app.</li>
=======================================
---
/main/src/com/joelapenna/foursquared/CheckinOrShoutGatherInfoActivity.java
Fri Aug 6 17:27:23 2010
+++
/main/src/com/joelapenna/foursquared/CheckinOrShoutGatherInfoActivity.java
Mon Oct 11 08:52:11 2010
@@ -167,15 +167,21 @@
}

CheckBox cbTellTwitter =
(CheckBox)findViewById(R.id.checkboxTellTwitter);
- if (settings.getBoolean(Preferences.PREFERENCE_TWITTER_CHECKIN,
false) &&
- !TextUtils.isEmpty(settings.getString(Preferences.PREFERENCE_TWITTER_HANDLE, "")))
{
- cbTellTwitter.setChecked(true);
- }
-
+ if
(!TextUtils.isEmpty(settings.getString(Preferences.PREFERENCE_TWITTER_HANDLE, "")))
{
+ cbTellTwitter.setVisibility(View.VISIBLE);
+
cbTellTwitter.setChecked(settings.getBoolean(Preferences.PREFERENCE_TWITTER_CHECKIN,
false));
+ } else {
+ cbTellTwitter.setVisibility(View.GONE);
+ cbTellTwitter.setChecked(false);
+ }
+
CheckBox cbTellFacebook =
(CheckBox)findViewById(R.id.checkboxTellFacebook);
- if (settings.getBoolean(Preferences.PREFERENCE_FACEBOOK_CHECKIN,
false) &&
- !TextUtils.isEmpty(settings.getString(Preferences.PREFERENCE_FACEBOOK_HANDLE, "")))
{
- cbTellFacebook.setChecked(true);
+ if
(!TextUtils.isEmpty(settings.getString(Preferences.PREFERENCE_FACEBOOK_HANDLE, "")))
{
+ cbTellFacebook.setVisibility(View.VISIBLE);
+
cbTellFacebook.setChecked(settings.getBoolean(Preferences.PREFERENCE_FACEBOOK_CHECKIN,
false));
+ } else {
+ cbTellFacebook.setVisibility(View.GONE);
+ cbTellFacebook.setChecked(false);
}

Button btnCheckin = (Button)findViewById(R.id.btnCheckin);

==============================================================================
Revision: 63e3283f5d
Author: mar...@gmail.com
Date: Mon Oct 11 08:52:50 2010
Log: Adding hires login image.
http://code.google.com/r/markww-foursquared/source/detail?r=63e3283f5d

Added:
/main/res/drawable-hdpi/splash_logo.png

=======================================
--- /dev/null
+++ /main/res/drawable-hdpi/splash_logo.png Mon Oct 11 08:52:50 2010
Binary file, no diff available.

Reply all
Reply to author
Forward
0 new messages