Welcome aboard

Iain Connor · Iain Connor · commit 5be08b249f86 · 2015-12-21T15:16:16.000-06:00
diff --git a/app/src/main/java/com/tippingcanoe/divergence/app/DemoAdapter.java b/app/src/main/java/com/tippingcanoe/divergence/app/DemoAdapter.java
@@ -34,17 +34,17 @@ protected void onBindDataViewHolder(RecyclerView.ViewHolder holder, int position
     }
 
     @Override
-    protected int getDataViewType(int position) {
+    public int getDataViewType(int position) {
         return R.layout.list_cell;
     }
 
     @Override
-    protected int getDataId(int position) {
+    public long getDataId(int position) {
         return position;
     }
 
     @Override
-    protected int getDataCount() {
+    public int getDataCount() {
         return 10;
     }
 
diff --git a/app/src/main/java/com/tippingcanoe/divergence/app/MainActivity.java b/app/src/main/java/com/tippingcanoe/divergence/app/MainActivity.java
@@ -54,7 +54,7 @@ public void onClick(View v) {
                 String name = String.valueOf(MainActivity.this.name.getText());
 
                 DemoAdapter demoAdapter = new DemoAdapter(name);
-                divergenceAdapter.addSection(demoAdapter, name, number, Importance.MEDIUM);
+                divergenceAdapter.addSection(demoAdapter, name, number, Importance.HIGH);
             }
         });
 
diff --git a/library/src/main/java/com/tippingcanoe/divergence/DivergenceAdapter.java b/library/src/main/java/com/tippingcanoe/divergence/DivergenceAdapter.java
@@ -103,7 +103,7 @@ public void addSection(SectionAdapter section, String identifier, int position,
             }
 
             for (int i = 0; i < sections.size(); i++) {
-                if (sections.get(i).requestedPosition <= position || sections.get(i).importance.getRank() > importance.getRank()) {
+                if (sections.get(i).requestedPosition <= position && !(sections.get(i).requestedPosition == position && sections.get(i).importance.getRank() < importance.getRank())) {
                     insertionSectionPosition = i + 1;
                     insertionListPosition += sections.get(i).section.getItemCount();
                 } else {
diff --git a/library/src/main/java/com/tippingcanoe/divergence/SectionAdapter.java b/library/src/main/java/com/tippingcanoe/divergence/SectionAdapter.java
@@ -15,9 +15,9 @@ public abstract class SectionAdapter extends RecyclerView.Adapter<RecyclerView.V
 
     @Override
     final public void onBindViewHolder(RecyclerView.ViewHolder holder, int position, List<Object> payloads) {
-        if (getLoadingResultsLayout() != null && getItemViewType(position) == getLoadingResultsLayout()) {
+        if (isLoading && getLoadingResultsLayout() != null && getItemViewType(position) == getLoadingResultsLayout()) {
             onBindLoadingView(holder);
-        } else if (getErrorResultsLayout() != null && getItemViewType(position) == getErrorResultsLayout()) {
+        } else if (isError && getErrorResultsLayout() != null && getItemViewType(position) == getErrorResultsLayout()) {
             onBindErrorView(holder);
         } else if (getNoResultsLayout() != null && getItemViewType(position) == getNoResultsLayout()) {
             onBindNoResultsView(holder);
@@ -81,9 +81,9 @@ final public int getItemCount() {
 
     @Override
     final public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
-        if (getLoadingResultsLayout() != null && getItemViewType(position) == getLoadingResultsLayout()) {
+        if (isLoading && getLoadingResultsLayout() != null && getItemViewType(position) == getLoadingResultsLayout()) {
             onBindLoadingView(holder);
-        } else if (getErrorResultsLayout() != null && getItemViewType(position) == getErrorResultsLayout()) {
+        } else if (isError && getErrorResultsLayout() != null && getItemViewType(position) == getErrorResultsLayout()) {
             onBindErrorView(holder);
         } else if (getNoResultsLayout() != null && getItemViewType(position) == getNoResultsLayout()) {
             onBindNoResultsView(holder);

Original file line number	Diff line number	Diff line change
`@@ -34,17 +34,17 @@ protected void onBindDataViewHolder(RecyclerView.ViewHolder holder, int position`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- protected int getDataViewType(int position) {`
	`37`	`+ public int getDataViewType(int position) {`
`38`	`38`	`return R.layout.list_cell;`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`@Override`
`42`		`- protected int getDataId(int position) {`
	`42`	`+ public long getDataId(int position) {`
`43`	`43`	`return position;`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@Override`
`47`		`- protected int getDataCount() {`
	`47`	`+ public int getDataCount() {`
`48`	`48`	`return 10;`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public void onClick(View v) {`
`54`	`54`	`String name = String.valueOf(MainActivity.this.name.getText());`
`55`	`55`
`56`	`56`	`DemoAdapter demoAdapter = new DemoAdapter(name);`
`57`		`- divergenceAdapter.addSection(demoAdapter, name, number, Importance.MEDIUM);`
	`57`	`+ divergenceAdapter.addSection(demoAdapter, name, number, Importance.HIGH);`
`58`	`58`	`}`
`59`	`59`	`});`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ public void addSection(SectionAdapter section, String identifier, int position,`
`103`	`103`	`}`
`104`	`104`
`105`	`105`	`for (int i = 0; i < sections.size(); i++) {`
`106`		`- if (sections.get(i).requestedPosition <= position \|\| sections.get(i).importance.getRank() > importance.getRank()) {`
	`106`	`+ if (sections.get(i).requestedPosition <= position && !(sections.get(i).requestedPosition == position && sections.get(i).importance.getRank() < importance.getRank())) {`
`107`	`107`	`insertionSectionPosition = i + 1;`
`108`	`108`	`insertionListPosition += sections.get(i).section.getItemCount();`
`109`	`109`	`} else {`