[markww-foursquared] 6 new revisions pushed by markww on 2010-10-05 18:39 GMT
markww-fo...@googlecode.com
Revision: b04e1da337
Author: mar...@gmail.com
Date: Tue Oct 5 10:35:46 2010
Log: Including badge text now post-checkin.
http://code.google.com/r/markww-foursquared/source/detail?r=b04e1da337
Revision: 0eaa6a2948
Author: mar...@gmail.com
Date: Tue Oct 5 10:35:57 2010
Log: Including badge text now post-checkin.
http://code.google.com/r/markww-foursquared/source/detail?r=0eaa6a2948
Revision: 12bd14f3f8
Author: mar...@gmail.com
Date: Tue Oct 5 10:36:37 2010
Log: Including badge text now post-checkin.
http://code.google.com/r/markww-foursquared/source/detail?r=12bd14f3f8
Revision: 816f6c2afa
Author: mar...@gmail.com
Date: Tue Oct 5 10:56:41 2010
Log: Updated changelog.
http://code.google.com/r/markww-foursquared/source/detail?r=816f6c2afa
Revision: 10c789d8d7
Author: mar...@gmail.com
Date: Tue Oct 5 11:30:45 2010
Log: Testing facebook connect work.
http://code.google.com/r/markww-foursquared/source/detail?r=10c789d8d7
Revision: dcfd4e9f9a
Author: mar...@gmail.com
Date: Tue Oct 5 11:31:09 2010
Log: Testing facebook connect work.
http://code.google.com/r/markww-foursquared/source/detail?r=dcfd4e9f9a
==============================================================================
Revision: b04e1da337
Author: mar...@gmail.com
Date: Tue Oct 5 10:35:46 2010
Log: Including badge text now post-checkin.
http://code.google.com/r/markww-foursquared/source/detail?r=b04e1da337
Modified:
/main/res/layout/badge_list_item.xml
=======================================
--- /main/res/layout/badge_list_item.xml Mon Dec 21 20:20:35 2009
+++ /main/res/layout/badge_list_item.xml Tue Oct 5 10:35:46 2010
@@ -1,25 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
- <!-- Copyright 2009 Joe LaPenna -->
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
+
+ <!-- Copyright 2009 Joe LaPenna -->
+
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="5dip"
+ android:background="#FFF">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="36dip"
+ android:layout_height="36dip"
+ android:layout_margin="5dip"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentTop="true"
+ android:src="@drawable/default_off" />
+
+ <TextView
+ android:id="@+id/name"
android:layout_width="fill_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
- android:orientation="horizontal"
->
- <ImageView
- android:id="@+id/icon"
- android:layout_width="36dip"
- android:layout_height="36dip"
- android:layout_margin="5dip"
- android:gravity="center_vertical"
- android:src="@drawable/default_off" />
- <TextView
- android:id="@+id/name"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textColor="@color/black_end"
- android:textStyle="bold"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:layout_gravity="center_vertical" />
-</LinearLayout>
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dip"
+ android:layout_marginLeft="5dip"
+ android:textColor="@color/black_end"
+ android:textStyle="bold"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:layout_alignParentTop="true"
+ android:layout_toRightOf="@id/icon"
+ android:text="Badge Title" />
+
+ <TextView
+ android:id="@+id/description"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="5dip"
+ android:textColor="@color/black_end"
+ android:layout_below="@id/name"
+ android:layout_toRightOf="@id/icon" />
+
+</RelativeLayout>
==============================================================================
Revision: 0eaa6a2948
Author: mar...@gmail.com
Date: Tue Oct 5 10:35:57 2010
Log: Including badge text now post-checkin.
http://code.google.com/r/markww-foursquared/source/detail?r=0eaa6a2948
Modified:
/main/res/layout/score_list_item.xml
=======================================
--- /main/res/layout/score_list_item.xml Thu Mar 11 15:48:53 2010
+++ /main/res/layout/score_list_item.xml Tue Oct 5 10:35:57 2010
@@ -16,28 +16,28 @@
android:scaleType="center"
android:layout_gravity="center_vertical" />
- <TextView
- android:id="@+id/scoreDesc"
- android:layout_marginLeft="10dip"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:textAppearance="@android:style/TextAppearance.Small"
- android:textColor="@color/black_end"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:layout_weight="1"
- android:layout_gravity="center_vertical" />
-
- <TextView
- android:id="@+id/scoreNum"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:gravity="center"
- android:textSize="20sp"
- android:textStyle="bold"
- android:paddingLeft="10dip"
- android:paddingRight="10dip"
- android:textColor="@color/black_end"
- />
+ <TextView
+ android:id="@+id/scoreDesc"
+ android:layout_marginLeft="5dip"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:textAppearance="@android:style/TextAppearance.Small"
+ android:textColor="@color/black_end"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:layout_weight="1"
+ android:layout_gravity="center_vertical" />
+
+ <TextView
+ android:id="@+id/scoreNum"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:gravity="center"
+ android:textSize="20sp"
+ android:textStyle="bold"
+ android:paddingLeft="10dip"
+ android:paddingRight="10dip"
+ android:textColor="@color/black_end"
+ />
</LinearLayout>
==============================================================================
Revision: 12bd14f3f8
Author: mar...@gmail.com
Date: Tue Oct 5 10:36:37 2010
Log: Including badge text now post-checkin.
http://code.google.com/r/markww-foursquared/source/detail?r=12bd14f3f8
Modified:
/main/src/com/joelapenna/foursquared/widget/BadgeListAdapter.java
=======================================
--- /main/src/com/joelapenna/foursquared/widget/BadgeListAdapter.java Fri
Mar 19 14:47:54 2010
+++ /main/src/com/joelapenna/foursquared/widget/BadgeListAdapter.java Tue
Oct 5 10:36:37 2010
@@ -8,6 +8,7 @@
import com.joelapenna.foursquared.R;
import android.content.Context;
+import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -52,6 +53,7 @@
holder = new ViewHolder();
holder.icon = (ImageView)convertView.findViewById(R.id.icon);
holder.name = (TextView)convertView.findViewById(R.id.name);
+ holder.description =
(TextView)convertView.findViewById(R.id.description);
convertView.setTag(holder);
} else {
@@ -62,6 +64,13 @@
Badge badge = (Badge)getItem(position);
holder.name.setText(badge.getName());
+ if (holder.description != null) {
+ if (!TextUtils.isEmpty(badge.getDescription())) {
+ holder.description.setText(badge.getDescription());
+ } else {
+ holder.description.setText("");
+ }
+ }
return convertView;
}
@@ -69,5 +78,6 @@
static class ViewHolder {
ImageView icon;
TextView name;
+ TextView description;
}
}
==============================================================================
Revision: 816f6c2afa
Author: mar...@gmail.com
Date: Tue Oct 5 10:56:41 2010
Log: Updated changelog.
http://code.google.com/r/markww-foursquared/source/detail?r=816f6c2afa
Modified:
/main/assets/changelog-en.html
=======================================
--- /main/assets/changelog-en.html Mon Oct 4 08:06:36 2010
+++ /main/assets/changelog-en.html Tue Oct 5 10:56:41 2010
@@ -38,12 +38,12 @@
<body>
- <h4><span>What's new in v2010-10-04?</span></h4>
+ <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
for users on the foursquare servers, just not being shown in the
results dialog.</li>
<li>Venue shortcut-creation bug fixed.</li>
- <li>Friend invite through address book bug fixed.</li>
<li>URLs now being linked in tip/to-do details screen.</li>
</ul>
==============================================================================
Revision: 10c789d8d7
Author: mar...@gmail.com
Date: Tue Oct 5 11:30:45 2010
Log: Testing facebook connect work.
http://code.google.com/r/markww-foursquared/source/detail?r=10c789d8d7
Modified:
/main/src/com/facebook/android/FacebookUtil.java
=======================================
--- /main/src/com/facebook/android/FacebookUtil.java Mon Oct 4 11:33:29
2010
+++ /main/src/com/facebook/android/FacebookUtil.java Tue Oct 5 11:30:45
2010
@@ -21,7 +21,6 @@
import org.json.JSONObject;
import android.os.Bundle;
-import android.util.Log;
import java.io.BufferedReader;
import java.io.FileNotFoundException;
@@ -109,7 +108,7 @@
if (method.equals("GET")) {
url = url + "?" + encodeUrl(params);
}
- Log.d("Facebook-Util", method + " URL: " + url);
+
HttpURLConnection conn =
(HttpURLConnection) new URL(url).openConnection();
conn.setRequestProperty("User-Agent", System.getProperties().
@@ -122,6 +121,7 @@
conn.getOutputStream().write(
encodeUrl(params).getBytes("UTF-8"));
}
+
String response = "";
try {
response = read(conn.getInputStream());
@@ -129,6 +129,7 @@
// Error Stream contains JSON that we can parse to a FB error
response = read(conn.getErrorStream());
}
+
return response;
}
==============================================================================
Revision: dcfd4e9f9a
Author: mar...@gmail.com
Date: Tue Oct 5 11:31:09 2010
Log: Testing facebook connect work.
http://code.google.com/r/markww-foursquared/source/detail?r=dcfd4e9f9a
Modified:
/main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
=======================================
--- /main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
Mon Oct 4 11:33:29 2010
+++ /main/src/com/joelapenna/foursquared/AddFriendsByUserInputActivity.java
Tue Oct 5 11:31:09 2010
@@ -545,13 +545,12 @@
break;
case INPUT_TYPE_FACEBOOK:
// For facebook, we need to first get all friend
uids, then use that with the foursquare api.
- //Log.e(TAG, "Umm yeah so we got da id back [" +
params[0] + "]..");
-
String facebookFriendIds =
getFacebookFriendIds(params[0]);
- if (TextUtils.isEmpty(facebookFriendIds)) {
+ if (!TextUtils.isEmpty(facebookFriendIds)) {
+
result.setUsersOnFoursquare(foursquare.findFriendsByFacebook(facebookFriendIds));
+ } else {
result.setUsersOnFoursquare(new Group<User>());
}
-
result.setUsersOnFoursquare(foursquare.findFriendsByFacebook(facebookFriendIds));
break;
default:
// Combine searches for name/phone, results
returned in one list.