Merge pull request #142 from Omega-R/develop

anton-knyazev · web-flow · commit 37a4377cc414 · 2019-08-23T17:21:08.000+03:00
Fix issues
diff --git a/README.md b/README.md
@@ -33,7 +33,7 @@ dependencies {
 # Usage
 Example of usage in xml layout
 ```
-com.omega_r.libs.omegarecyclerview.OmegaRecyclerView
+<com.omega_r.libs.omegarecyclerview.OmegaRecyclerView
         android:id="@+id/custom_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -306,7 +306,7 @@ Adding OmegaExpandableRecyclerView to layout:
 
 Create adapter like following:
 ```
-public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, String> {
+public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, Quote> {
 
     @Override
     protected ExGroupViewHolder provideGroupViewHolder(@NonNull ViewGroup viewGroup) {
@@ -353,18 +353,19 @@ public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<Quote
         }
 
         @Override
-        protected void onBind(String item) {
-            textView.setText(item);
+        protected void onBind(Quote item) {
+            textView.setText(item.getQuote());
         }
     }
 }
 ```
 
 Use one of the following methods to set items for adapter or use adapter constructors:
 ```
-void setItems(@NonNull List<ExpandableViewData<G, CH>> expandableViewData)
-void setItems(ExpandableViewData<G, CH>... expandableViewData)
-void setItems(GroupProvider<G, CH>... groupProviders)
+public final void setItems(@NonNull List<ExpandableViewData<G, CH>> expandableViewData)
+public final void setItems(ExpandableViewData<G, CH>... expandableViewData)
+public final void setItemsAsGroupProviders(GroupProvider<G, CH>... groupProviders)
+public final void setItemsAsGroupProviders(@NonNull List<GroupProvider<G, CH>> groupProviders)
 ```
 
 Your view data (group and childs) should be wrapped with ```ExpandableViewData``` using one of the following ways:
@@ -387,6 +388,12 @@ public interface GroupProvider<G, CH> {
 }
 ```
 
+It is available to update only child item using 
+```
+// Adapter
+public void notifyChildChanged(CH child)
+```
+
 You can set expandMode and childAnimation both with xml attr and programmatically
 
 *Available expandModes are single and multiple*
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/ListAdapterExample/ListAdapter.java
@@ -3,6 +3,7 @@
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
 import com.omega_r.libs.omegarecyclerview.BaseListAdapter;
 import com.omega_r.omegarecyclerview.R;
 
@@ -13,8 +14,9 @@ public ListAdapter(BaseListAdapter.OnItemClickListener<String> clickListener,
         super(clickListener, longClickListener);
     }
 
+    @NonNull
     @Override
-    protected ViewHolder provideViewHolder(ViewGroup parent) {
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         return new SampleViewHolder(parent);
     }
 
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableActivity.java
@@ -3,15 +3,22 @@
 import android.os.Bundle;
 import androidx.annotation.LayoutRes;
 import androidx.appcompat.app.AppCompatActivity;
+
+import android.view.View;
+import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.RadioButton;
 
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.ExpandableItemAnimator;
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations.DropDownItemAnimator;
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.animation.standard_animations.FadeItemAnimator;
+import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.data.GroupProvider;
 import com.omega_r.omegarecyclerview.R;
 
+import java.util.Arrays;
+import java.util.List;
+
 import omega.com.annotations.OmegaActivity;
 
 @OmegaActivity
@@ -27,6 +34,8 @@ protected OmegaExpandableRecyclerView.Adapter provideAdapter() {
         return new ExpandableAdapter();
     }
 
+    private List<? extends GroupProvider<QuoteGlobalInfo, Quote>> items;
+
     @LayoutRes
     protected int provideContentLayoutRes() {
         return R.layout.activity_expandable;
@@ -37,9 +46,46 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(provideContentLayoutRes());
 
+        createItems();
+
         setupRecyclerView();
         setupRadioButtons();
         fillAdapter();
+
+        findViewById(R.id.button_test_update_child).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Quote quote = items.get(3).provideChilds().get(1);
+                quote.setQuote("UPDATED QUOTE");
+                mAdapter.notifyChildChanged(quote);
+            }
+        });
+    }
+
+    private void createItems() {
+        items = Arrays.asList(
+                SimpleData.from(
+                        new QuoteGlobalInfo(getString(R.string.group_text_1), 1500),
+                        new Quote(getString(R.string.child_text_1))
+                ),
+                SimpleData.from(
+                        new QuoteGlobalInfo(getString(R.string.group_text_2), 1500),
+                        new Quote(getString(R.string.child_text_2))
+                ),
+                SimpleData.from(
+                        new QuoteGlobalInfo(getString(R.string.group_text_3), 1914),
+                        new Quote(getString(R.string.child_text_3)),
+                        new Quote(getString(R.string.child_text_5))
+                ),
+                SimpleData.from(
+                        new QuoteGlobalInfo(getString(R.string.group_text_5), 1914),
+                        new Quote(getString(R.string.child_text_1)),
+                        new Quote(getString(R.string.child_text_2)),
+                        new Quote(getString(R.string.child_text_3)),
+                        new Quote(getString(R.string.child_text_4)),
+                        new Quote(getString(R.string.child_text_5))
+                )
+        );
     }
 
     protected void setupRecyclerView() {
@@ -48,19 +94,7 @@ protected void setupRecyclerView() {
     }
 
     protected void fillAdapter() {
-        mAdapter.setItems(
-                SimpleData.from(new QuoteGlobalInfo(getString(R.string.group_text_1), 1500), getString(R.string.child_text_1)),
-                SimpleData.from(new QuoteGlobalInfo(getString(R.string.group_text_2), 1500), getString(R.string.child_text_2)),
-                SimpleData.from(new QuoteGlobalInfo(getString(R.string.group_text_3), 1914),
-                        getString(R.string.child_text_3),
-                        getString(R.string.child_text_5)),
-                SimpleData.from(new QuoteGlobalInfo(getString(R.string.group_text_5), 1914),
-                        getString(R.string.child_text_1),
-                        getString(R.string.child_text_2),
-                        getString(R.string.child_text_3),
-                        getString(R.string.child_text_4),
-                        getString(R.string.child_text_5))
-        );
+        mAdapter.setItemsAsGroupProviders(items);
     }
 
     protected void setupRadioButtons() {
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/ExpandableAdapter.java
@@ -7,7 +7,7 @@
 import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;
 import com.omega_r.omegarecyclerview.R;
 
-public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, String> {
+public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, Quote> {
 
     @Override
     protected ExGroupViewHolder provideGroupViewHolder(@NonNull ViewGroup viewGroup) {
@@ -54,8 +54,8 @@ class ExChildViewHolder extends ChildViewHolder {
         }
 
         @Override
-        protected void onBind(String item) {
-            textView.setText(item);
+        protected void onBind(Quote item) {
+            textView.setText(item.getQuote());
         }
     }
 }
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/Quote.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/Quote.java
@@ -0,0 +1,30 @@
+package com.omega_r.omegarecyclerview.expandable_example.core;
+
+public class Quote {
+    private String mQuote;
+
+    public Quote(String quote) {
+        mQuote = quote;
+    }
+
+    public String getQuote() {
+        return mQuote;
+    }
+
+    public void setQuote(String quote) {
+        mQuote = quote;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Quote quote = (Quote) o;
+        return mQuote.equals(quote.mQuote);
+    }
+
+    @Override
+    public int hashCode() {
+        return mQuote.hashCode();
+    }
+}
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/core/SimpleData.java
@@ -7,16 +7,16 @@
 import java.util.Arrays;
 import java.util.List;
 
-public class SimpleData implements GroupProvider<QuoteGlobalInfo, String> {
+public class SimpleData implements GroupProvider<QuoteGlobalInfo, Quote> {
 
     private QuoteGlobalInfo mQuoteGlobalInfo;
-    private List<String> mQuotes;
+    private List<Quote> mQuotes;
 
-    public static SimpleData from(QuoteGlobalInfo title, String... quotes) {
+    public static SimpleData from(QuoteGlobalInfo title, Quote... quotes) {
         return new SimpleData(title, Arrays.asList(quotes));
     }
 
-    public SimpleData(QuoteGlobalInfo quoteGlobalInfo, List<String> quotes) {
+    public SimpleData(QuoteGlobalInfo quoteGlobalInfo, List<Quote> quotes) {
         mQuoteGlobalInfo = quoteGlobalInfo;
         mQuotes = quotes;
     }
@@ -29,11 +29,11 @@ public void setQuoteGlobalInfo(QuoteGlobalInfo quoteGlobalInfo) {
         mQuoteGlobalInfo = quoteGlobalInfo;
     }
 
-    public List<String> getQuotes() {
+    public List<Quote> getQuotes() {
         return mQuotes;
     }
 
-    public void setQuotes(List<String> quotes) {
+    public void setQuotes(List<Quote> quotes) {
         mQuotes = quotes;
     }
 
@@ -43,7 +43,7 @@ public QuoteGlobalInfo provideGroup() {
     }
 
     @Override
-    public List<String> provideChilds() {
+    public List<Quote> provideChilds() {
         return mQuotes;
     }
 
diff --git a/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java b/app/src/main/java/com/omega_r/omegarecyclerview/expandable_example/support_sticky/DefaultStickyAdapter.java
@@ -11,9 +11,10 @@
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.StickyAdapter;
 import com.omega_r.libs.omegarecyclerview.sticky_decoration.HeaderStickyDecoration;
 import com.omega_r.omegarecyclerview.R;
+import com.omega_r.omegarecyclerview.expandable_example.core.Quote;
 import com.omega_r.omegarecyclerview.expandable_example.core.QuoteGlobalInfo;
 
-public class DefaultStickyAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, String> implements StickyAdapter<DefaultStickyAdapter.StickyViewHolder> {
+public class DefaultStickyAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, Quote> implements StickyAdapter<DefaultStickyAdapter.StickyViewHolder> {
 
     @Override
     protected ExGroupViewHolder provideGroupViewHolder(@NonNull ViewGroup viewGroup) {
@@ -27,7 +28,7 @@ protected ExChildViewHolder provideChildViewHolder(@NonNull ViewGroup viewGroup)
 
     @Override
     public long getStickyId(int position) {
-        ExpandableViewData<QuoteGlobalInfo, String> item = getItem(position);
+        ExpandableViewData<QuoteGlobalInfo, Quote> item = getItem(position);
         if (item == null) return HeaderStickyDecoration.NO_STICKY_ID;
         Integer providedId = item.getStickyId();
         return providedId == null ? HeaderStickyDecoration.NO_STICKY_ID : providedId;
@@ -78,8 +79,8 @@ class ExChildViewHolder extends ChildViewHolder {
         }
 
         @Override
-        protected void onBind(String item) {
-            textView.setText(item);
+        protected void onBind(Quote item) {
+            textView.setText(item.getQuote());
         }
     }
 
diff --git a/app/src/main/res/layout/activity_expandable.xml b/app/src/main/res/layout/activity_expandable.xml
@@ -29,6 +29,12 @@
             android:text="@string/button_use_dropdown"
             android:textColor="@color/white"/>
 
+        <Button
+            android:id="@+id/button_test_update_child"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/test_update_child" />
+
     </RadioGroup>
 
     <RadioGroup
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -32,4 +32,5 @@
     <string name="button_core">Core</string>
     <string name="button_support_sticky">Sticky header support</string>
     <string name="button_group_sticky">Group as sticky header</string>
+    <string name="test_update_child">Test update child</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.5.0'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Mar 06 12:09:01 MSK 2019
+#Fri Aug 23 11:22:57 MSK 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/omegarecyclerviewlibs/build.gradle b/omegarecyclerviewlibs/build.gradle
@@ -25,7 +25,6 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
-    implementation 'com.google.android.material:material:1.1.0-alpha02'
-
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
+    implementation 'com.google.android.material:material:1.1.0-alpha09'
 }
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/BaseListAdapter.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/OmegaRecyclerView.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/OmegaExpandableRecyclerView.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/animation/ExpandableItemAnimator.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/expandable_recycler_view/layout_manager/ExpandableLayoutManager.java
diff --git a/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java b/omegarecyclerviewlibs/src/main/java/com/omega_r/libs/omegarecyclerview/sticky_decoration/StickyDecoration.java

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import android.view.ViewGroup;`
`4`	`4`	`import android.widget.TextView;`
`5`	`5`
	`6`	`+import androidx.annotation.NonNull;`
`6`	`7`	`import com.omega_r.libs.omegarecyclerview.BaseListAdapter;`
`7`	`8`	`import com.omega_r.omegarecyclerview.R;`
`8`	`9`
`@@ -13,8 +14,9 @@ public ListAdapter(BaseListAdapter.OnItemClickListener<String> clickListener,`
`13`	`14`	`super(clickListener, longClickListener);`
`14`	`15`	`}`
`15`	`16`
	`17`	`+ @NonNull`
`16`	`18`	`@Override`
`17`		`- protected ViewHolder provideViewHolder(ViewGroup parent) {`
	`19`	`+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {`
`18`	`20`	`return new SampleViewHolder(parent);`
`19`	`21`	`}`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`import com.omega_r.libs.omegarecyclerview.expandable_recycler_view.OmegaExpandableRecyclerView;`
`8`	`8`	`import com.omega_r.omegarecyclerview.R;`
`9`	`9`
`10`		`-public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, String> {`
	`10`	`+public class ExpandableAdapter extends OmegaExpandableRecyclerView.Adapter<QuoteGlobalInfo, Quote> {`
`11`	`11`
`12`	`12`	`@Override`
`13`	`13`	`protected ExGroupViewHolder provideGroupViewHolder(@NonNull ViewGroup viewGroup) {`
`@@ -54,8 +54,8 @@ class ExChildViewHolder extends ChildViewHolder {`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@Override`
`57`		`- protected void onBind(String item) {`
`58`		`- textView.setText(item);`
	`57`	`+ protected void onBind(Quote item) {`
	`58`	`+ textView.setText(item.getQuote());`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,16 +7,16 @@`
`7`	`7`	`import java.util.Arrays;`
`8`	`8`	`import java.util.List;`
`9`	`9`
`10`		`-public class SimpleData implements GroupProvider<QuoteGlobalInfo, String> {`
	`10`	`+public class SimpleData implements GroupProvider<QuoteGlobalInfo, Quote> {`
`11`	`11`
`12`	`12`	`private QuoteGlobalInfo mQuoteGlobalInfo;`
`13`		`- private List<String> mQuotes;`
	`13`	`+ private List<Quote> mQuotes;`
`14`	`14`
`15`		`- public static SimpleData from(QuoteGlobalInfo title, String... quotes) {`
	`15`	`+ public static SimpleData from(QuoteGlobalInfo title, Quote... quotes) {`
`16`	`16`	`return new SimpleData(title, Arrays.asList(quotes));`
`17`	`17`	`}`
`18`	`18`
`19`		`- public SimpleData(QuoteGlobalInfo quoteGlobalInfo, List<String> quotes) {`
	`19`	`+ public SimpleData(QuoteGlobalInfo quoteGlobalInfo, List<Quote> quotes) {`
`20`	`20`	`mQuoteGlobalInfo = quoteGlobalInfo;`
`21`	`21`	`mQuotes = quotes;`
`22`	`22`	`}`
`@@ -29,11 +29,11 @@ public void setQuoteGlobalInfo(QuoteGlobalInfo quoteGlobalInfo) {`
`29`	`29`	`mQuoteGlobalInfo = quoteGlobalInfo;`
`30`	`30`	`}`
`31`	`31`
`32`		`- public List<String> getQuotes() {`
	`32`	`+ public List<Quote> getQuotes() {`
`33`	`33`	`return mQuotes;`
`34`	`34`	`}`
`35`	`35`
`36`		`- public void setQuotes(List<String> quotes) {`
	`36`	`+ public void setQuotes(List<Quote> quotes) {`
`37`	`37`	`mQuotes = quotes;`
`38`	`38`	`}`
`39`	`39`
`@@ -43,7 +43,7 @@ public QuoteGlobalInfo provideGroup() {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`@Override`
`46`		`- public List<String> provideChilds() {`
	`46`	`+ public List<Quote> provideChilds() {`
`47`	`47`	`return mQuotes;`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`google()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:3.3.2'`
	`10`	`+ classpath 'com.android.tools.build:gradle:3.5.0'`
`11`	`11`	`classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'`
`12`	`12`
`13`	`13`	`// NOTE: Do not place your application dependencies here; they belong`