diff --git a/app/build.gradle b/app/build.gradle index b7f2286..1d98a67 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 27 + defaultConfig { applicationId "com.an.paginglibrary.sample" minSdkVersion 14 @@ -52,6 +53,7 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.4.0' implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' + implementation 'de.hdodenhof:circleimageview:2.2.0' implementation 'com.squareup.picasso:picasso:2.71828' } diff --git a/app/src/main/java/com/an/paginglibrary/sample/adapters/FeedListAdapter.java b/app/src/main/java/com/an/paginglibrary/sample/adapters/FeedListAdapter.java index ad3f92f..f8501fa 100644 --- a/app/src/main/java/com/an/paginglibrary/sample/adapters/FeedListAdapter.java +++ b/app/src/main/java/com/an/paginglibrary/sample/adapters/FeedListAdapter.java @@ -13,8 +13,8 @@ import android.view.ViewGroup; import com.an.paginglibrary.sample.R; -import com.an.paginglibrary.sample.databinding.FeedItemBinding; -import com.an.paginglibrary.sample.databinding.NetworkItemBinding; +import com.an.paginglibrary.sample.databinding.ItemNetworkStateBinding; +import com.an.paginglibrary.sample.databinding.ItemFeedBinding; import com.an.paginglibrary.sample.model.Article; import com.an.paginglibrary.sample.utils.AppUtils; import com.an.paginglibrary.sample.utils.NetworkState; @@ -37,12 +37,12 @@ public FeedListAdapter(Context context) { public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { LayoutInflater layoutInflater = LayoutInflater.from(parent.getContext()); if(viewType == TYPE_PROGRESS) { - NetworkItemBinding headerBinding = NetworkItemBinding.inflate(layoutInflater, parent, false); + ItemNetworkStateBinding headerBinding = ItemNetworkStateBinding.inflate(layoutInflater, parent, false); NetworkStateItemViewHolder viewHolder = new NetworkStateItemViewHolder(headerBinding); return viewHolder; } else { - FeedItemBinding itemBinding = FeedItemBinding.inflate(layoutInflater, parent, false); + ItemFeedBinding itemBinding = ItemFeedBinding.inflate(layoutInflater, parent, false); ArticleItemViewHolder viewHolder = new ArticleItemViewHolder(itemBinding); return viewHolder; } @@ -94,8 +94,8 @@ public void setNetworkState(NetworkState newNetworkState) { public class ArticleItemViewHolder extends RecyclerView.ViewHolder { - private FeedItemBinding binding; - public ArticleItemViewHolder(FeedItemBinding binding) { + private ItemFeedBinding binding; + public ArticleItemViewHolder(ItemFeedBinding binding) { super(binding.getRoot()); this.binding = binding; } @@ -119,8 +119,8 @@ public void bindTo(Article article) { public class NetworkStateItemViewHolder extends RecyclerView.ViewHolder { - private NetworkItemBinding binding; - public NetworkStateItemViewHolder(NetworkItemBinding binding) { + private ItemNetworkStateBinding binding; + public NetworkStateItemViewHolder(ItemNetworkStateBinding binding) { super(binding.getRoot()); this.binding = binding; } diff --git a/app/src/main/res/drawable-v24/ic_placeholder.png b/app/src/main/res/drawable-v24/ic_placeholder.png deleted file mode 100644 index 1da3e8d..0000000 Binary files a/app/src/main/res/drawable-v24/ic_placeholder.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/ic_reaction.png b/app/src/main/res/drawable-v24/ic_reaction.png deleted file mode 100644 index 4025f13..0000000 Binary files a/app/src/main/res/drawable-v24/ic_reaction.png and /dev/null differ diff --git a/app/src/main/res/layout/item_feed.xml b/app/src/main/res/layout/item_feed.xml index 35f49a1..102f8f0 100644 --- a/app/src/main/res/layout/item_feed.xml +++ b/app/src/main/res/layout/item_feed.xml @@ -1,8 +1,6 @@ - - + android:src="@mipmap/ic_placeholder" /> + android:scaleType="fitXY" + android:src="@mipmap/ic_reaction" /> - -