Reindex after views are modified

Author: Jawnnypoo

.travis.yml

@@ -7,8 +7,7 @@ android:
   components:
     - platform-tools
     - tools
-    - build-tools-25.0.2
-    - android-25
-    - extra-android-m2repository
+    - build-tools-26.0.1
+    - android-26
 
 script: "./gradlew build"

adapterflowlayout/build.gradle

@@ -22,9 +22,9 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.wefika:flowlayout:0.4.1'
-    provided project(':adapterlayout')
+    api fileTree(dir: 'libs', include: ['*.jar'])
+    compileOnly 'com.wefika:flowlayout:0.4.1'
+    compileOnly project(':adapterlayout')
 }
 
 apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'

adapterflowlayout/src/main/java/com/commit451/adapterflowlayout/AdapterFlowLayout.java

@@ -13,7 +13,7 @@
  */
 public class AdapterFlowLayout extends FlowLayout {
 
-    private AdapterLayoutDelegate mAdapterLayoutDelegate;
+    private AdapterLayoutDelegate adapterLayoutDelegate;
 
     public AdapterFlowLayout(Context context) {
         super(context);
@@ -28,24 +28,24 @@ public AdapterFlowLayout(Context context, AttributeSet attrs, int defStyleAttr)
     }
 
     public void setAdapter(RecyclerView.Adapter adapter) {
-        if (mAdapterLayoutDelegate == null) {
-            mAdapterLayoutDelegate = new AdapterLayoutDelegate(this);
+        if (adapterLayoutDelegate == null) {
+            adapterLayoutDelegate = new AdapterLayoutDelegate(this);
         }
-        mAdapterLayoutDelegate.setAdapter(adapter);
+        adapterLayoutDelegate.setAdapter(adapter);
     }
 
     @Nullable
     public RecyclerView.Adapter getAdapter() {
-        if (mAdapterLayoutDelegate != null) {
-            return mAdapterLayoutDelegate.getAdapter();
+        if (adapterLayoutDelegate != null) {
+            return adapterLayoutDelegate.getAdapter();
         }
         return null;
     }
 
     @Nullable
     public RecyclerView.ViewHolder getViewHolderAt(int index) {
-        if (mAdapterLayoutDelegate != null) {
-            return mAdapterLayoutDelegate.getViewHolderAt(index);
+        if (adapterLayoutDelegate != null) {
+            return adapterLayoutDelegate.getViewHolderAt(index);
         }
         return null;
     }

adapterlayout-kotlin/build.gradle

@@ -20,16 +20,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
-    }
     lintOptions {
         abortOnError false
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    provided project(':adapterlayout')
+    api fileTree(dir: 'libs', include: ['*.jar'])
+
+    api "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlinVersion"
+
+    compileOnly project(':adapterlayout')
 }

adapterlayout/build.gradle

@@ -22,8 +22,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    compile "com.android.support:recyclerview-v7:$supportLibVersion"
+    api fileTree(include: ['*.jar'], dir: 'libs')
+    api "com.android.support:recyclerview-v7:$supportLibVersion"
 }
 
 apply from: 'https://raw.githubusercontent.com/Commit451/gradle-android-javadocs/1.0.0/gradle-android-javadocs.gradle'

adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLayoutDelegate.java

@@ -12,8 +12,8 @@
  */
 public class AdapterLayoutDelegate {
 
-    private RecyclerView.Adapter mAdapter;
-    private ViewGroup mViewGroup;
+    private RecyclerView.Adapter adapter;
+    private ViewGroup viewGroup;
 
     /**
      * Checks for if the data changes and changes the views accordingly
@@ -24,37 +24,43 @@ public void onChanged() {
             super.onChanged();
             //too general, we just have to completely recreate
             recreateViews();
+            reindex();
         }
 
         @Override
         public void onItemRangeChanged(int positionStart, int itemCount) {
             super.onItemRangeChanged(positionStart, itemCount);
             updateViews(positionStart, itemCount, null);
+            reindex();
         }
 
         @Override
         public void onItemRangeChanged(int positionStart, int itemCount, Object payload) {
             super.onItemRangeChanged(positionStart, itemCount, payload);
             updateViews(positionStart, itemCount, payload);
+            reindex();
         }
 
         @Override
         public void onItemRangeInserted(int positionStart, int itemCount) {
             super.onItemRangeInserted(positionStart, itemCount);
             addViews(positionStart, itemCount);
+            reindex();
         }
 
         @Override
         public void onItemRangeRemoved(int positionStart, int itemCount) {
             super.onItemRangeRemoved(positionStart, itemCount);
             removeViews(positionStart, itemCount);
+            reindex();
         }
 
         @Override
         public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
             super.onItemRangeMoved(fromPosition, toPosition, itemCount);
             //TODO this should probably be smarter and just move relevant views
             recreateViews();
+            reindex();
         }
     };
 
@@ -64,7 +70,7 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
      * @param viewGroup the ViewGroup which will have views added and removed from
      */
     public AdapterLayoutDelegate(ViewGroup viewGroup) {
-        mViewGroup = viewGroup;
+        this.viewGroup = viewGroup;
     }
 
     /**
@@ -73,16 +79,16 @@ public AdapterLayoutDelegate(ViewGroup viewGroup) {
      * @param adapter the adapter
      */
     public void setAdapter(@Nullable RecyclerView.Adapter adapter) {
-        if (mAdapter != null) {
+        if (this.adapter != null) {
             try {
-                mAdapter.unregisterAdapterDataObserver(mObserver);
+                this.adapter.unregisterAdapterDataObserver(mObserver);
             } catch (Exception ignored) {
             }
         }
 
-        mAdapter = adapter;
-        if (mAdapter != null) {
-            mAdapter.registerAdapterDataObserver(mObserver);
+        this.adapter = adapter;
+        if (this.adapter != null) {
+            this.adapter.registerAdapterDataObserver(mObserver);
         }
         recreateViews();
     }
@@ -93,7 +99,7 @@ public void setAdapter(@Nullable RecyclerView.Adapter adapter) {
      * @return the adapter
      */
     public RecyclerView.Adapter getAdapter() {
-        return mAdapter;
+        return adapter;
     }
 
     /**
@@ -104,7 +110,7 @@ public RecyclerView.Adapter getAdapter() {
      */
     @Nullable
     public RecyclerView.ViewHolder getViewHolderAt(int index) {
-        View view = mViewGroup.getChildAt(index);
+        View view = viewGroup.getChildAt(index);
         if (view == null) {
             return null;
         }
@@ -119,56 +125,56 @@ private void addViews(int positionStart, int itemCount) {
     }
 
     private void addViewAt(int index) {
-        addViewAt(mAdapter.getItemViewType(index), index);
+        addViewAt(adapter.getItemViewType(index), index);
     }
 
     private void addViewAt(int viewType, int index) {
-        RecyclerView.ViewHolder viewHolder = mAdapter.onCreateViewHolder(mViewGroup, viewType);
+        RecyclerView.ViewHolder viewHolder = adapter.onCreateViewHolder(viewGroup, viewType);
         //setting the lib to min 4.0 to avoid leaks from doing this
         viewHolder.itemView.setTag(R.id.adapter_layout_list_holder, viewHolder);
         viewHolder.itemView.setTag(R.id.adapter_layout_list_view_type, viewType);
         viewHolder.itemView.setTag(R.id.adapter_layout_list_position, index);
-        mViewGroup.addView(viewHolder.itemView);
-        mAdapter.onBindViewHolder(viewHolder, index);
+        viewGroup.addView(viewHolder.itemView);
+        adapter.onBindViewHolder(viewHolder, index);
     }
 
     private void updateViews(int positionStart, int itemCount, @Nullable Object payload) {
         final int end = positionStart + itemCount;
         for (int i = positionStart; i < end; i++) {
             RecyclerView.ViewHolder viewHolder = getViewHolderAt(i);
-            mAdapter.onBindViewHolder(viewHolder, i);
+            adapter.onBindViewHolder(viewHolder, i);
         }
     }
 
     private void removeViews(int positionStart, int itemCount) {
-        mViewGroup.removeViews(positionStart, itemCount);
+        viewGroup.removeViews(positionStart, itemCount);
     }
 
     /**
      * Updates all the views to match the dataset changing. Its kinda a last resort since we would
      * prefer to just adjust the views that were changed or removed
      */
     private void recreateViews() {
-        if (mAdapter == null) {
-            mViewGroup.removeAllViews();
+        if (adapter == null) {
+            viewGroup.removeAllViews();
             return;
         }
         int i;
-        for (i = 0; i < mAdapter.getItemCount(); i++) {
-            int viewType = mAdapter.getItemViewType(i);
+        for (i = 0; i < adapter.getItemCount(); i++) {
+            int viewType = adapter.getItemViewType(i);
             //This means the view could already exist
-            if (i < mViewGroup.getChildCount()) {
-                View child = mViewGroup.getChildAt(i);
+            if (i < viewGroup.getChildCount()) {
+                View child = viewGroup.getChildAt(i);
                 Integer savedViewType = (Integer) child.getTag(R.id.adapter_layout_list_view_type);
                 RecyclerView.ViewHolder savedViewHolder = (RecyclerView.ViewHolder) child.getTag(R.id.adapter_layout_list_holder);
 
                 if (savedViewType != null && savedViewType == viewType && savedViewHolder != null) {
                     //perfect, it exists and is the right type, so just bind it
-                    mAdapter.onBindViewHolder(savedViewHolder, i);
+                    adapter.onBindViewHolder(savedViewHolder, i);
                 } else {
                     //it already existed, but something was wrong. So remove it and recreate it
                     addViewAt(viewType, i);
-                    mViewGroup.removeView(child);
+                    viewGroup.removeView(child);
                 }
             } else {
                 //Creating a brand new view
@@ -177,8 +183,15 @@ private void recreateViews() {
         }
 
         //Outside the bounds of the dataset, so remove it
-        if (i < mViewGroup.getChildCount()) {
-            mViewGroup.removeViews(i, mViewGroup.getChildCount() - i);
+        if (i < viewGroup.getChildCount()) {
+            viewGroup.removeViews(i, viewGroup.getChildCount() - i);
+        }
+    }
+
+    private void reindex() {
+        for (int i = 0; i < adapter.getItemCount(); i++) {
+            View child = viewGroup.getChildAt(i);
+            child.setTag(R.id.adapter_layout_list_position, i);
         }
     }
 }

adapterlayout/src/main/java/com/commit451/adapterlayout/AdapterLinearLayout.java

@@ -16,7 +16,7 @@
  */
 public class AdapterLinearLayout extends LinearLayout {
 
-    private AdapterLayoutDelegate mAdapterLayoutDelegate;
+    private AdapterLayoutDelegate adapterLayoutDelegate;
 
     public AdapterLinearLayout(Context context) {
         super(context);
@@ -37,23 +37,23 @@ public AdapterLinearLayout(Context context, AttributeSet attrs, int defStyleAttr
     }
 
     public void setAdapter(RecyclerView.Adapter adapter) {
-        if (mAdapterLayoutDelegate == null) {
-            mAdapterLayoutDelegate = new AdapterLayoutDelegate(this);
+        if (adapterLayoutDelegate == null) {
+            adapterLayoutDelegate = new AdapterLayoutDelegate(this);
         }
-        mAdapterLayoutDelegate.setAdapter(adapter);
+        adapterLayoutDelegate.setAdapter(adapter);
     }
 
     public RecyclerView.Adapter getAdapter() {
-        if (mAdapterLayoutDelegate != null) {
-            return mAdapterLayoutDelegate.getAdapter();
+        if (adapterLayoutDelegate != null) {
+            return adapterLayoutDelegate.getAdapter();
         }
         return null;
     }
 
     @Nullable
     public RecyclerView.ViewHolder getViewHolderAt(int index) {
-        if (mAdapterLayoutDelegate != null) {
-            return mAdapterLayoutDelegate.getViewHolderAt(index);
+        if (adapterLayoutDelegate != null) {
+            return adapterLayoutDelegate.getViewHolderAt(index);
         }
         return null;
     }

app/build.gradle

@@ -23,13 +23,21 @@ android {
     }
 }
 
+ext {
+    butterknifeVersion = '8.8.1'
+}
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    testCompile 'junit:junit:4.12'
-    compile "com.android.support:appcompat-v7:$supportLibVersion"
-    compile "com.android.support:design:$supportLibVersion"
-    compile 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
-    compile project(':adapterlayout')
-    compile project(':adapterflowlayout')
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation "com.android.support:appcompat-v7:$supportLibVersion"
+    implementation "com.android.support:design:$supportLibVersion"
+
+    implementation "com.jakewharton:butterknife:$butterknifeVersion"
+    annotationProcessor "com.jakewharton:butterknife-compiler:$butterknifeVersion"
+
+    implementation 'com.wefika:flowlayout:0.4.1'
+
+    implementation project(':adapterlayout')
+
+    implementation project(':adapterflowlayout')
 }

build.gradle

@@ -4,6 +4,7 @@ buildscript {
     ext.kotlinVersion = '1.1.51'
     repositories {
         jcenter()
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0-beta6'
@@ -19,6 +20,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
@@ -28,8 +30,8 @@ task clean(type: Delete) {
 
 ext {
     minSdkVersion = 15
-    compileSdkVersion = 25
+    compileSdkVersion = 26
     targetSdkVersion = compileSdkVersion
-    buildToolsVersion = '25.0.2'
-    supportLibVersion = '25.3.1'
+    buildToolsVersion = '26.0.1'
+    supportLibVersion = '26.1.0'
 }