public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed incorrect user image in activities adapter.

Browse source
This commit is contained in:
RyanBateman 2012-10-04 11:36:28 -04:00
parent b5820303e1
commit e27bb0fd4c
4 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/android/NewsBlur/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.newsblur"
android:versionCode="15"
android:versionName="0.9.55" >
android:versionCode="16"
android:versionName="0.9.57" >
<uses-sdk
android:minSdkVersion="8"

2
media/android/NewsBlur/src/com/newsblur/activity/Profile.java
View file

@ -103,7 +103,7 @@ public class Profile extends SherlockFragmentActivity {
protected void onPostExecute(Void result) {
if (user != null && detailsFragment != null && activitiesFragment != null) {
detailsFragment.setUser(user, TextUtils.isEmpty(userId));
activitiesFragment.setActivities(activities);
activitiesFragment.setActivitiesAndUser(activities, user);
}
}
}

5
media/android/NewsBlur/src/com/newsblur/fragment/ProfileActivityFragment.java
View file

@ -8,6 +8,7 @@ import android.view.ViewGroup;
import android.widget.ListView;
import com.newsblur.R;
import com.newsblur.domain.UserDetails;
import com.newsblur.network.domain.ActivitiesResponse;
import com.newsblur.view.ActivitiesAdapter;
@ -31,9 +32,9 @@ public class ProfileActivityFragment extends Fragment {
return v;
}
public void setActivities(final ActivitiesResponse[] activities ) {
public void setActivitiesAndUser(final ActivitiesResponse[] activities, UserDetails user ) {
// Set the activities, create the adapter
adapter = new ActivitiesAdapter(getActivity(), activities);
adapter = new ActivitiesAdapter(getActivity(), activities, user);
displayActivities();
}

14
media/android/NewsBlur/src/com/newsblur/view/ActivitiesAdapter.java
View file

@ -22,19 +22,18 @@ import com.newsblur.activity.Profile;
import com.newsblur.domain.UserDetails;
import com.newsblur.network.domain.ActivitiesResponse;
import com.newsblur.util.ImageLoader;
import com.newsblur.util.PrefsUtils;
public class ActivitiesAdapter extends ArrayAdapter<ActivitiesResponse> {
private LayoutInflater inflater;
private ImageLoader imageLoader;
private final String startedFollowing, ago, repliedTo, sharedStory, withComment, likedComment;
private ForegroundColorSpan midgray, highlight, darkgray;
private ForegroundColorSpan highlight, darkgray;
private String TAG = "ActivitiesAdapter";
private Context context;
private UserDetails userDetails;
private UserDetails currentUserDetails;
public ActivitiesAdapter(final Context context, final ActivitiesResponse[] activities) {
public ActivitiesAdapter(final Context context, final ActivitiesResponse[] activities, UserDetails user) {
super(context, R.id.row_activity_text);
inflater = LayoutInflater.from(context);
imageLoader = ((NewsBlurApplication) context.getApplicationContext()).getImageLoader();
@ -44,7 +43,7 @@ public class ActivitiesAdapter extends ArrayAdapter<ActivitiesResponse> {
add(response);
}
userDetails = PrefsUtils.getUserDetails(context);
currentUserDetails = user;
Resources resources = context.getResources();
startedFollowing = resources.getString(R.string.profile_started_following);
@ -55,7 +54,6 @@ public class ActivitiesAdapter extends ArrayAdapter<ActivitiesResponse> {
ago = resources.getString(R.string.profile_ago);
highlight = new ForegroundColorSpan(resources.getColor(R.color.linkblue));
midgray = new ForegroundColorSpan(resources.getColor(R.color.midgray));
darkgray = new ForegroundColorSpan(resources.getColor(R.color.darkgray));
}
@ -86,6 +84,8 @@ public class ActivitiesAdapter extends ArrayAdapter<ActivitiesResponse> {
activityTime.setText(activity.timeSince.toUpperCase() + " " + ago);
if (activity.user != null) {
imageLoader.displayImage(activity.user.photoUrl, imageView);
} else if (TextUtils.equals(activity.category, "sharedstory")) {
imageLoader.displayImage(currentUserDetails.photoUrl, imageView, 10f);
} else {
imageView.setImageResource(R.drawable.logo);
}
@ -137,8 +137,6 @@ public class ActivitiesAdapter extends ArrayAdapter<ActivitiesResponse> {
if (!TextUtils.isEmpty(activity.content)) {
stringBuilder.setSpan(darkgray, sharedStory.length() + 4 + activity.title.length() + withComment.length(), stringBuilder.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
}
imageLoader.displayImage(userDetails.photoUrl, imageView);
}
activityText.setText(stringBuilder);