From 7f06abba9da5dab26237d5e141c9e70c64aeed39 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Sun, 24 Apr 2016 14:48:29 -0500 Subject: [PATCH 1/4] create new recycler view adapter class --- .idea/misc.xml | 2 +- .../Controllers/MainRecyclerViewAdapter.java | 24 +++++++++++++++++++ .../Controllers/RecyclerViewHolder.java | 16 +++++++++++++ 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java new file mode 100644 index 0000000..2c8350e --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java @@ -0,0 +1,24 @@ +package edu.grinnell.grinnell_publications_android.Controllers; + +import android.support.v7.widget.RecyclerView; +import android.view.ViewGroup; + +/** + * Created by prabir on 4/24/16, AppDev Grinnell. + */ +public class MainRecyclerViewAdapter extends RecyclerView.Adapter { + @Override + public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + return null; + } + + @Override + public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { + + } + + @Override + public int getItemCount() { + return 0; + } +} diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java new file mode 100644 index 0000000..5abaa36 --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java @@ -0,0 +1,16 @@ +package edu.grinnell.grinnell_publications_android.Controllers; + +import android.support.v7.widget.RecyclerView; +import android.view.View; + +/** + * Created by prabir on 4/24/16, AppDev Grinnell. + */ +public class RecyclerViewHolder extends RecyclerView.ViewHolder{ + + + + public RecyclerViewHolder(int type, View itemView) { + super(itemView); + } +} From c1fb43ab15270419c44bbc7e68fbf0f22a98def4 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Fri, 29 Apr 2016 02:37:45 -0500 Subject: [PATCH 2/4] Create abstraction for view types in RecyclerView This is a work in progress. --- .idea/misc.xml | 2 +- app/build.gradle | 1 - .../Controllers/MainRecyclerViewAdapter.java | 40 ++++++++++++++++--- .../Controllers/RecyclerItem.java | 32 +++++++++++++++ .../Controllers/RecyclerViewHolder.java | 25 ++++++++++-- 5 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..fbb6828 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index d3ae3a4..7ec9dae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,7 +28,6 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' - testCompile 'junit:junit:4.12' testCompile "org.mockito:mockito-core:1.9.5" compile 'com.android.support:appcompat-v7:23.3.0' diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java index 2c8350e..01daea1 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java @@ -1,24 +1,54 @@ package edu.grinnell.grinnell_publications_android.Controllers; +import android.app.Activity; import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; import android.view.ViewGroup; +import java.util.ArrayList; +import java.util.List; + /** - * Created by prabir on 4/24/16, AppDev Grinnell. + * */ -public class MainRecyclerViewAdapter extends RecyclerView.Adapter { +public class MainRecyclerViewAdapter extends RecyclerView.Adapter { + + private List data; + private Activity activity; + + public MainRecyclerViewAdapter(Activity activity) { + this.data = new ArrayList<>(); + } + + /** + * Update the data for the recycler view + * + * @param data a list of recycler items that will populate the recycler view + */ + public void setData(List data) { + this.data = data; + notifyDataSetChanged(); + } + + @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + public RecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + LayoutInflater li = activity.getLayoutInflater(); return null; } @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { - + public void onBindViewHolder(RecyclerViewHolder holder, int position) { + holder.bindView(data.get(position)); } @Override public int getItemCount() { return 0; } + + @Override + public int getItemViewType(int position) { + return data.get(position).getViewType(); + } } diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java new file mode 100644 index 0000000..02fb7a9 --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java @@ -0,0 +1,32 @@ +package edu.grinnell.grinnell_publications_android.Controllers; + +/** + * + */ +public abstract class RecyclerItem { + + private int viewType; + private int layoutId; + + /** + * Constructor + * + * @param layoutId the integer identifier for the view type. + * Use the resource id of the layout as the view type. + */ + public RecyclerItem(int layoutId) { + this.viewType = this.layoutId = layoutId; + + } + + public int getViewType() { + return viewType; + } + + public int getLayoutId() { + return layoutId; + } + + + +} diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java index 5abaa36..f75cfbe 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java @@ -3,14 +3,31 @@ import android.support.v7.widget.RecyclerView; import android.view.View; + /** - * Created by prabir on 4/24/16, AppDev Grinnell. + * */ -public class RecyclerViewHolder extends RecyclerView.ViewHolder{ - +public abstract class RecyclerViewHolder extends RecyclerView.ViewHolder{ - public RecyclerViewHolder(int type, View itemView) { + public RecyclerViewHolder(View itemView) { super(itemView); } + + /** + * Getter for the itemView from the super class + * @return the itemView for the recycler item + */ + public View getItemView() { + return super.itemView; + } + + /** + * + * @param recyclerItem + */ + public abstract void bindView(RecyclerItem recyclerItem); + + + } From 374b078319cd73f3d1b9b84592a8919ed7366685 Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Fri, 29 Apr 2016 15:18:39 -0500 Subject: [PATCH 3/4] Add example small and large exmaple article card implementations --- .idea/misc.xml | 2 +- app/build.gradle | 4 ++- .../Controllers/Cards/ArticleCard.java | 19 ++++++++++ .../Controllers/Cards/LargeArticleHolder.java | 33 +++++++++++++++++ .../Controllers/Cards/SmallArticleHolder.java | 29 +++++++++++++++ .../Controllers/MainRecyclerViewAdapter.java | 3 +- .../Controllers/RecyclerViewHolder.java | 4 ++- .../main/res/layout/card_article_large.xml | 32 +++++++++++++++++ .../main/res/layout/card_article_small.xml | 36 +++++++++++++++++++ app/src/main/res/values-w820dp/dimens.xml | 6 ---- app/src/main/res/values/dimens.xml | 3 ++ app/src/main/res/values/styles.xml | 7 ++++ 12 files changed, 168 insertions(+), 10 deletions(-) create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java create mode 100644 app/src/main/res/layout/card_article_large.xml create mode 100644 app/src/main/res/layout/card_article_small.xml delete mode 100644 app/src/main/res/values-w820dp/dimens.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/app/build.gradle b/app/build.gradle index 7ec9dae..9661a3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,9 +31,11 @@ dependencies { testCompile "org.mockito:mockito-core:1.9.5" compile 'com.android.support:appcompat-v7:23.3.0' + compile 'com.android.support:recyclerview-v7:23.3.0' + compile 'com.android.support:cardview-v7:23.3.0' compile 'com.android.support:design:23.3.0' + compile 'com.android.support:support-v4:23.3.0' compile 'com.jakewharton:butterknife:7.0.1' compile 'com.jakewharton.timber:timber:4.1.2' compile 'io.realm:realm-android:0.84.1' - compile 'com.android.support:support-v4:23.3.0' } diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java new file mode 100644 index 0000000..80cb45f --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java @@ -0,0 +1,19 @@ +package edu.grinnell.grinnell_publications_android.Controllers.Cards; + +import edu.grinnell.grinnell_publications_android.Controllers.RecyclerItem; +import edu.grinnell.grinnell_publications_android.R; + +/** + * Created by prabir on 4/29/16, AppDev Grinnell. + */ +public class ArticleCard extends RecyclerItem { + + String title; + + public ArticleCard() { + super(R.layout.card_article_large); + title = "This is a Large Article"; + } + + +} diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java new file mode 100644 index 0000000..01a94b3 --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java @@ -0,0 +1,33 @@ +package edu.grinnell.grinnell_publications_android.Controllers.Cards; + +import android.app.Activity; +import android.view.View; +import android.widget.TextView; + +import butterknife.Bind; +import butterknife.ButterKnife; +import edu.grinnell.grinnell_publications_android.Controllers.RecyclerViewHolder; +import edu.grinnell.grinnell_publications_android.R; + +/** + */ +public class LargeArticleHolder extends RecyclerViewHolder { + + @Bind(R.id.tv_article_title) + TextView title; + + public LargeArticleHolder(View itemView) { + super(itemView); + } + + public static LargeArticleHolder(){ + + } + + @Override + public void bindView(ArticleCard articleCard, Activity activity) { + ButterKnife.bind(activity); + + title.setText(articleCard.title); + } +} diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java new file mode 100644 index 0000000..4d20d07 --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java @@ -0,0 +1,29 @@ +package edu.grinnell.grinnell_publications_android.Controllers.Cards; + +import android.app.Activity; +import android.view.View; +import android.widget.TextView; + +import butterknife.Bind; +import butterknife.ButterKnife; +import edu.grinnell.grinnell_publications_android.Controllers.RecyclerViewHolder; +import edu.grinnell.grinnell_publications_android.R; + +/** + * + */ +public class SmallArticleHolder extends RecyclerViewHolder { + @Bind(R.id.tv_article_title) + TextView title; + + public SmallArticleHolder(View itemView) { + super(itemView); + } + + @Override + public void bindView(ArticleCard articleCard, Activity activity) { + ButterKnife.bind(activity); + + title.setText(articleCard.title); + } +} diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java index 01daea1..11a0563 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java @@ -18,6 +18,7 @@ public class MainRecyclerViewAdapter extends RecyclerView.Adapter(); + this.activity = activity; } /** @@ -39,7 +40,7 @@ public RecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { @Override public void onBindViewHolder(RecyclerViewHolder holder, int position) { - holder.bindView(data.get(position)); + holder.bindView(data.get(position), activity); } @Override diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java index f75cfbe..9e5f2ff 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java @@ -1,5 +1,6 @@ package edu.grinnell.grinnell_publications_android.Controllers; +import android.app.Activity; import android.support.v7.widget.RecyclerView; import android.view.View; @@ -25,8 +26,9 @@ public View getItemView() { /** * * @param recyclerItem + * @param activity */ - public abstract void bindView(RecyclerItem recyclerItem); + public abstract void bindView(RecyclerItem recyclerItem, Activity activity); diff --git a/app/src/main/res/layout/card_article_large.xml b/app/src/main/res/layout/card_article_large.xml new file mode 100644 index 0000000..0611c7d --- /dev/null +++ b/app/src/main/res/layout/card_article_large.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/card_article_small.xml b/app/src/main/res/layout/card_article_small.xml new file mode 100644 index 0000000..d8014b3 --- /dev/null +++ b/app/src/main/res/layout/card_article_small.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-w820dp/dimens.xml b/app/src/main/res/values-w820dp/dimens.xml deleted file mode 100644 index 63fc816..0000000 --- a/app/src/main/res/values-w820dp/dimens.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 64dp - diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index eb10e23..fd659ee 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,4 +5,7 @@ 76dp 76dp + 12dp + 16sp + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 379ac96..f90ecdc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -12,5 +12,12 @@ + + + From 1f066df3c7caebb880c4d4a08aab0edad50ed63e Mon Sep 17 00:00:00 2001 From: Prabir Pradhan Date: Fri, 29 Apr 2016 15:50:35 -0500 Subject: [PATCH 4/4] add small and large example cards to recyclerview adapter --- ...ArticleCard.java => LargeArticleCard.java} | 10 ++++++---- .../Controllers/Cards/LargeArticleHolder.java | 9 +++------ .../Controllers/Cards/SmallArticleCard.java | 19 +++++++++++++++++++ .../Controllers/Cards/SmallArticleHolder.java | 6 +++--- .../Controllers/MainRecyclerViewAdapter.java | 18 +++++++++++++++++- .../Controllers/RecyclerItem.java | 9 +-------- .../Controllers/RecyclerViewHolder.java | 6 ++---- 7 files changed, 51 insertions(+), 26 deletions(-) rename app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/{ArticleCard.java => LargeArticleCard.java} (59%) create mode 100644 app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleCard.java diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleCard.java similarity index 59% rename from app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java rename to app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleCard.java index 80cb45f..18253cd 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/ArticleCard.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleCard.java @@ -4,14 +4,16 @@ import edu.grinnell.grinnell_publications_android.R; /** - * Created by prabir on 4/29/16, AppDev Grinnell. + * */ -public class ArticleCard extends RecyclerItem { +public class LargeArticleCard extends RecyclerItem { + + public static final int LARGE_ARTICLE = R.layout.card_article_large; String title; - public ArticleCard() { - super(R.layout.card_article_large); + public LargeArticleCard() { + super(LARGE_ARTICLE); title = "This is a Large Article"; } diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java index 01a94b3..a35e659 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/LargeArticleHolder.java @@ -11,7 +11,7 @@ /** */ -public class LargeArticleHolder extends RecyclerViewHolder { +public class LargeArticleHolder extends RecyclerViewHolder { @Bind(R.id.tv_article_title) TextView title; @@ -20,14 +20,11 @@ public LargeArticleHolder(View itemView) { super(itemView); } - public static LargeArticleHolder(){ - - } @Override - public void bindView(ArticleCard articleCard, Activity activity) { + public void bindView(LargeArticleCard largeArticleCard, Activity activity) { ButterKnife.bind(activity); - title.setText(articleCard.title); + title.setText(largeArticleCard.title); } } diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleCard.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleCard.java new file mode 100644 index 0000000..cc4c7a6 --- /dev/null +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleCard.java @@ -0,0 +1,19 @@ +package edu.grinnell.grinnell_publications_android.Controllers.Cards; + +import edu.grinnell.grinnell_publications_android.Controllers.RecyclerItem; +import edu.grinnell.grinnell_publications_android.R; + +/** + * + */ +public class SmallArticleCard extends RecyclerItem { + + public static final int SMALL_ARTICLE = R.layout.card_article_small; + String title; + + public SmallArticleCard() { + super(SMALL_ARTICLE); + title = "This is a Small Article"; + } + +} diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java index 4d20d07..42c8de5 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/Cards/SmallArticleHolder.java @@ -12,7 +12,7 @@ /** * */ -public class SmallArticleHolder extends RecyclerViewHolder { +public class SmallArticleHolder extends RecyclerViewHolder { @Bind(R.id.tv_article_title) TextView title; @@ -21,9 +21,9 @@ public SmallArticleHolder(View itemView) { } @Override - public void bindView(ArticleCard articleCard, Activity activity) { + public void bindView(SmallArticleCard smallArticleCard, Activity activity) { ButterKnife.bind(activity); - title.setText(articleCard.title); + title.setText(smallArticleCard.title); } } diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java index 11a0563..0ef15a4 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/MainRecyclerViewAdapter.java @@ -8,6 +8,11 @@ import java.util.ArrayList; import java.util.List; +import edu.grinnell.grinnell_publications_android.Controllers.Cards.LargeArticleCard; +import edu.grinnell.grinnell_publications_android.Controllers.Cards.LargeArticleHolder; +import edu.grinnell.grinnell_publications_android.Controllers.Cards.SmallArticleCard; +import edu.grinnell.grinnell_publications_android.Controllers.Cards.SmallArticleHolder; + /** * */ @@ -35,7 +40,18 @@ public void setData(List data) { @Override public RecyclerViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { LayoutInflater li = activity.getLayoutInflater(); - return null; + RecyclerViewHolder holder; + switch (viewType) { + case SmallArticleCard.SMALL_ARTICLE: + holder = new SmallArticleHolder(li.inflate(SmallArticleCard.SMALL_ARTICLE, parent)); + break; + case LargeArticleCard.LARGE_ARTICLE: + holder = new LargeArticleHolder(li.inflate(LargeArticleCard.LARGE_ARTICLE, parent)); + break; + default: + holder = null; + } + return holder; } @Override diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java index 02fb7a9..5c05dc0 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerItem.java @@ -6,7 +6,6 @@ public abstract class RecyclerItem { private int viewType; - private int layoutId; /** * Constructor @@ -15,7 +14,7 @@ public abstract class RecyclerItem { * Use the resource id of the layout as the view type. */ public RecyclerItem(int layoutId) { - this.viewType = this.layoutId = layoutId; + this.viewType = layoutId; } @@ -23,10 +22,4 @@ public int getViewType() { return viewType; } - public int getLayoutId() { - return layoutId; - } - - - } diff --git a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java index 9e5f2ff..ad32814 100644 --- a/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java +++ b/app/src/main/java/edu/grinnell/grinnell_publications_android/Controllers/RecyclerViewHolder.java @@ -8,7 +8,7 @@ /** * */ -public abstract class RecyclerViewHolder extends RecyclerView.ViewHolder{ +public abstract class RecyclerViewHolder extends RecyclerView.ViewHolder{ public RecyclerViewHolder(View itemView) { @@ -28,8 +28,6 @@ public View getItemView() { * @param recyclerItem * @param activity */ - public abstract void bindView(RecyclerItem recyclerItem, Activity activity); - - + public abstract void bindView(T recyclerItem, Activity activity); }