Modified:
/main/src/com/joelapenna/foursquared/UserDetailsActivity.java
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
=======================================
--- /main/src/com/joelapenna/foursquared/UserDetailsActivity.java Wed Sep
29 12:59:38 2010
+++ /main/src/com/joelapenna/foursquared/UserDetailsActivity.java Wed Sep
29 13:32:30 2010
@@ -570,8 +570,7 @@
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()));
+ intent.putExtra(BadgesActivity.EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
startActivity(intent);
}
}
@@ -580,16 +579,14 @@
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()));
+ intent.putExtra(UserMayorshipsActivity.EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
startActivity(intent);
}
}
private void startCheckinsActivity() {
Intent intent = new Intent(UserDetailsActivity.this,
UserHistoryActivity.class);
- intent.putExtra(UserHistoryActivity.EXTRA_USER_NAME,
- StringFormatters.getUserFullName(mStateHolder.getUser()));
+ intent.putExtra(UserHistoryActivity.EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
startActivity(intent);
}
@@ -599,13 +596,11 @@
Intent intent = null;
if (user.getFollowerCount() > 0) {
intent = new Intent(UserDetailsActivity.this,
UserDetailsFriendsFollowersActivity.class);
-
intent.putExtra(UserDetailsFriendsFollowersActivity.EXTRA_USER_NAME,
-
StringFormatters.getUserFullName(mStateHolder.getUser()));
+
intent.putExtra(UserDetailsFriendsFollowersActivity.EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
} 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()));
+ intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
}
startActivity(intent);
}
@@ -625,8 +620,7 @@
} 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()));
+ intent.putExtra(UserDetailsFriendsActivity.EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
}
startActivity(intent);
}
@@ -634,16 +628,14 @@
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()));
+ intent.putExtra(TodosActivity.INTENT_EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
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()));
+ intent.putExtra(UserDetailsTipsActivity.INTENT_EXTRA_USER_NAME,
mStateHolder.getUser().getFirstname());
startActivity(intent);
}
=======================================
---
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
Wed Sep 29 12:59:38 2010
+++
/main/src/com/joelapenna/foursquared/UserDetailsFriendsInCommonActivity.java
Wed Sep 29 13:32:30 2010
@@ -10,7 +10,6 @@
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;
@@ -196,8 +195,7 @@
setProgressBarIndeterminateVisibility(false);
}
- setTitle(getString(R.string.user_details_friends_in_common_title,
- StringFormatters.getUserFullName(mStateHolder.getUser())));
+ setTitle(getString(R.string.user_details_friends_in_common_title,
mStateHolder.getUser().getFirstname()));
}
@Override