From 8efd14ea2754ea49e0554e0016f41205139aebc5 Mon Sep 17 00:00:00 2001 From: Mark Anderson Date: Sun, 24 May 2015 22:30:23 +0100 Subject: [PATCH] Rename ActivitiesResponse to ActivityDetails and move to com.newsblur.domain package. --- .../NewsBlur/src/com/newsblur/activity/Profile.java | 4 ++-- .../ActivityDetails.java} | 4 ++-- .../com/newsblur/fragment/ProfileActivityFragment.java | 4 ++-- .../com/newsblur/network/domain/ProfileResponse.java | 3 ++- .../src/com/newsblur/view/ActivitiesAdapter.java | 10 +++++----- 5 files changed, 13 insertions(+), 12 deletions(-) rename clients/android/NewsBlur/src/com/newsblur/{network/domain/ActivitiesResponse.java => domain/ActivityDetails.java} (85%) diff --git a/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java b/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java index 3b692320b..54d997f04 100644 --- a/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java +++ b/clients/android/NewsBlur/src/com/newsblur/activity/Profile.java @@ -12,7 +12,7 @@ import com.newsblur.domain.UserDetails; import com.newsblur.fragment.ProfileActivityFragment; import com.newsblur.fragment.ProfileDetailsFragment; import com.newsblur.network.APIManager; -import com.newsblur.network.domain.ActivitiesResponse; +import com.newsblur.domain.ActivityDetails; import com.newsblur.network.domain.ProfileResponse; import com.newsblur.util.PrefsUtils; @@ -72,7 +72,7 @@ public class Profile extends NbActivity { private class LoadUserTask extends AsyncTask { private UserDetails user; - private ActivitiesResponse[] activities; + private ActivityDetails[] activities; @Override protected void onPreExecute() { diff --git a/clients/android/NewsBlur/src/com/newsblur/network/domain/ActivitiesResponse.java b/clients/android/NewsBlur/src/com/newsblur/domain/ActivityDetails.java similarity index 85% rename from clients/android/NewsBlur/src/com/newsblur/network/domain/ActivitiesResponse.java rename to clients/android/NewsBlur/src/com/newsblur/domain/ActivityDetails.java index d71ff8e7d..b10ea1a0c 100644 --- a/clients/android/NewsBlur/src/com/newsblur/network/domain/ActivitiesResponse.java +++ b/clients/android/NewsBlur/src/com/newsblur/domain/ActivityDetails.java @@ -1,8 +1,8 @@ -package com.newsblur.network.domain; +package com.newsblur.domain; import com.google.gson.annotations.SerializedName; -public class ActivitiesResponse { +public class ActivityDetails { public String category; public String content; diff --git a/clients/android/NewsBlur/src/com/newsblur/fragment/ProfileActivityFragment.java b/clients/android/NewsBlur/src/com/newsblur/fragment/ProfileActivityFragment.java index b50b695f4..4e358aba5 100644 --- a/clients/android/NewsBlur/src/com/newsblur/fragment/ProfileActivityFragment.java +++ b/clients/android/NewsBlur/src/com/newsblur/fragment/ProfileActivityFragment.java @@ -10,7 +10,7 @@ import android.widget.ListView; import com.newsblur.R; import com.newsblur.domain.UserDetails; -import com.newsblur.network.domain.ActivitiesResponse; +import com.newsblur.domain.ActivityDetails; import com.newsblur.view.ActivitiesAdapter; public class ProfileActivityFragment extends Fragment { @@ -33,7 +33,7 @@ public class ProfileActivityFragment extends Fragment { return v; } - public void setActivitiesAndUser(Context context, final ActivitiesResponse[] activities, UserDetails user ) { + public void setActivitiesAndUser(Context context, final ActivityDetails[] activities, UserDetails user ) { // Set the activities, create the adapter adapter = new ActivitiesAdapter(context, activities, user); displayActivities(); diff --git a/clients/android/NewsBlur/src/com/newsblur/network/domain/ProfileResponse.java b/clients/android/NewsBlur/src/com/newsblur/network/domain/ProfileResponse.java index 45a7ff39b..193e32ecb 100644 --- a/clients/android/NewsBlur/src/com/newsblur/network/domain/ProfileResponse.java +++ b/clients/android/NewsBlur/src/com/newsblur/network/domain/ProfileResponse.java @@ -1,6 +1,7 @@ package com.newsblur.network.domain; import com.google.gson.annotations.SerializedName; +import com.newsblur.domain.ActivityDetails; import com.newsblur.domain.UserDetails; public class ProfileResponse extends NewsBlurResponse { @@ -9,6 +10,6 @@ public class ProfileResponse extends NewsBlurResponse { public UserDetails user; @SerializedName("activities") - public ActivitiesResponse[] activities; + public ActivityDetails[] activities; } diff --git a/clients/android/NewsBlur/src/com/newsblur/view/ActivitiesAdapter.java b/clients/android/NewsBlur/src/com/newsblur/view/ActivitiesAdapter.java index d05e6dee1..2225d1ecc 100644 --- a/clients/android/NewsBlur/src/com/newsblur/view/ActivitiesAdapter.java +++ b/clients/android/NewsBlur/src/com/newsblur/view/ActivitiesAdapter.java @@ -20,11 +20,11 @@ import com.newsblur.R; import com.newsblur.activity.NewsBlurApplication; import com.newsblur.activity.Profile; import com.newsblur.domain.UserDetails; -import com.newsblur.network.domain.ActivitiesResponse; +import com.newsblur.domain.ActivityDetails; import com.newsblur.util.ImageLoader; import com.newsblur.util.PrefsUtils; -public class ActivitiesAdapter extends ArrayAdapter { +public class ActivitiesAdapter extends ArrayAdapter { private LayoutInflater inflater; private ImageLoader imageLoader; @@ -34,13 +34,13 @@ public class ActivitiesAdapter extends ArrayAdapter { private Context context; private UserDetails currentUserDetails; - public ActivitiesAdapter(final Context context, final ActivitiesResponse[] activities, UserDetails user) { + public ActivitiesAdapter(final Context context, final ActivityDetails[] activities, UserDetails user) { super(context, R.id.row_activity_text); inflater = LayoutInflater.from(context); imageLoader = ((NewsBlurApplication) context.getApplicationContext()).getImageLoader(); this.context = context; - for (ActivitiesResponse response : activities) { + for (ActivityDetails response : activities) { add(response); } @@ -71,7 +71,7 @@ public class ActivitiesAdapter extends ArrayAdapter { } else { view = convertView; } - final ActivitiesResponse activity = getItem(position); + final ActivityDetails activity = getItem(position); SpannableStringBuilder stringBuilder = new SpannableStringBuilder(); ClickableSpan usernameClick = new ClickableSpan() {