Merge pull request #103 from luizgrp/develop

Merge version 1.2.0

.travis.yml

@@ -16,11 +16,14 @@ cache:
 android:
   components:
     - tools
-    - build-tools-25.0.3
-    - android-25
+    - build-tools-26.0.2
+    - android-27
     - platform-tools
     - extra-android-m2repository
     - extra-google-m2repository
 
 script:
   ./gradlew build
+
+before_install:
+- yes | sdkmanager "platforms;android-27"

CHANGELOG.md

@@ -1,14 +1,37 @@
 # Changelog
 
+## 1.2.0 - 10/03/2018
+
+### Section class
+- Remove all deprecated constructors.
+- Add methods `isItemViewWillBeProvided`, `isHeaderViewWillBeProvided`, `isFooterViewWillBeProvided`, `isLoadingViewWillBeProvided`, `isFailedViewWillBeProvided` and `isEmptyViewWillBeProvided`.
+- Add methods `getItemView`, `getHeaderView`, `getFooterView`, `getLoadingView`, `getFailedView` and `getEmptyView`.
+
+### SectionedRecyclerViewAdapter class
+- Remove method `getSectionsMap`.
+- Add method `getCopyOfSectionsMap`
+- Add method `removeSection(Section)`.
+
+### SectionParameters class
+- Add factory method for `Builder` class.
+
+### SectionParameters.Builder class
+- Deprecate constructor with itemResourceId as parameter.
+- Add method `itemResourceId`.
+- Add methods `itemViewWillBeProvided`, `headerViewWillBeProvided`, `footerViewWillBeProvided`, `loadingViewWillBeProvided`, `failedViewWillBeProvided` and `emptyViewWillBeProvided`.
+
+### StatelessSection class
+- Remove all deprecated constructors.
+
 ## 1.1.3 - 22/07/2017
 
 ### Section class
-- Add checks for resource ids in `setState` and throw exception if missing
+- Add checks for resource ids in `setState` and throw exception if missing.
 
 ### SectionedRecyclerViewAdapter class
 - Add methods `notifyNotLoadedStateChanged`, `notifyStateChangedToLoaded` and `notifyStateChangedFromLoaded`.
 - Add methods `notifyHeaderInsertedInSection`, `notifyFooterInsertedInSection`, `notifyHeaderRemovedFromSection` and `notifyFooterRemovedFromSection`.
-- Add methods `notifySectionChangedToVisible` and `notifySectionChangedToInvisible`
+- Add methods `notifySectionChangedToVisible` and `notifySectionChangedToInvisible`.
 
 ## 1.1.2 - 30/06/2017
 ### SectionParameters class

README.md

@@ -21,7 +21,7 @@ In addition, each Section can have its state(Loading/Loaded/Failed/Empty) contro
 Add this to the `dependencies` section in your project-level **build.gradle** file:
 
 ```groovy
-compile 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3'
+compile 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.2.0'
 ```
 
 ## Basic usage
@@ -34,7 +34,8 @@ class MySection extends StatelessSection {
 
     public MySection() {
         // call constructor with layout resources for this Section header and items
-        super(new SectionParameters.Builder(R.layout.section_item)
+        super(SectionParameters.builder()
+                .itemResourceId(R.layout.section_item)
                 .headerResourceId(R.layout.section_header)
                 .build());
     }

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "io.github.luizgrp.sectionedrecyclerviewadapter.demo"
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -22,9 +22,10 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
+    compile 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.android.support:design:27.1.0'
+    compile 'com.android.support:recyclerview-v7:27.1.0'
+    compile 'com.android.support:cardview-v7:27.1.0'
+
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
 }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.luizgrp.sectionedrecyclerviewadapter.demo">
+          package="io.github.luizgrp.sectionedrecyclerviewadapter.demo">
 
     <application
         android:allowBackup="true"
@@ -10,9 +10,9 @@
         android:theme="@style/AppTheme.NoActionBar">
         <activity android:name=".HomeActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>

app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example1Fragment.java

@@ -31,8 +31,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         sectionAdapter = new SectionedRecyclerViewAdapter();
 
-
-        for(char alphabet = 'A'; alphabet <= 'Z';alphabet++) {
+        for (char alphabet = 'A'; alphabet <= 'Z'; alphabet++) {
             List<String> contacts = getContactsWithLetter(alphabet);
 
             if (contacts.size() > 0) {
@@ -53,8 +52,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example1);
+            }
         }
     }
 
@@ -76,7 +76,8 @@ private class ContactsSection extends StatelessSection {
         List<String> list;
 
         ContactsSection(String title, List<String> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex1_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex1_item)
                     .headerResourceId(R.layout.section_ex1_header)
                     .build());
 
@@ -106,7 +107,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }

app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example2Fragment.java

@@ -50,8 +50,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example2);
+            }
         }
     }
 
@@ -69,7 +70,8 @@ private class NewsSection extends StatelessSection {
         int imgPlaceholderResId;
 
         NewsSection(int topic) {
-            super(new SectionParameters.Builder(R.layout.section_ex2_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex2_item)
                     .headerResourceId(R.layout.section_ex2_header)
                     .footerResourceId(R.layout.section_ex2_footer)
                     .build());
@@ -98,7 +100,6 @@ private class NewsSection extends StatelessSection {
                     this.imgPlaceholderResId = R.drawable.ic_directions_run_black_48dp;
                     break;
             }
-
         }
 
         private List<String> getNews(int arrayResource) {
@@ -128,7 +129,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }

app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example3Fragment.java

@@ -65,8 +65,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example3);
+            }
         }
     }
 
@@ -91,8 +92,7 @@ public void run() {
 
                 if (failed == 1) {
                     section.setState(Section.State.FAILED);
-                }
-                else {
+                } else {
                     int arrayResource;
                     switch (section.getTopic()) {
                         case NewsSection.WORLD:
@@ -138,7 +138,8 @@ private class NewsSection extends Section {
         int imgPlaceholderResId;
 
         NewsSection(int topic) {
-            super(new SectionParameters.Builder(R.layout.section_ex3_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex3_item)
                     .headerResourceId(R.layout.section_ex3_header)
                     .footerResourceId(R.layout.section_ex3_footer)
                     .failedResourceId(R.layout.section_ex3_failed)
@@ -166,7 +167,6 @@ private class NewsSection extends Section {
                     this.imgPlaceholderResId = R.drawable.ic_directions_run_black_48dp;
                     break;
             }
-
         }
 
         int getTopic() {
@@ -200,7 +200,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }

app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example4Fragment.java

@@ -31,8 +31,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         sectionAdapter = new SectionedRecyclerViewAdapter();
 
-
-        for(char alphabet = 'A'; alphabet <= 'Z';alphabet++) {
+        for (char alphabet = 'A'; alphabet <= 'Z'; alphabet++) {
             List<String> contacts = getContactsWithLetter(alphabet);
 
             if (contacts.size() > 0) {
@@ -53,8 +52,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example4);
+            }
         }
     }
 
@@ -77,7 +77,8 @@ private class ExpandableContactsSection extends StatelessSection {
         boolean expanded = true;
 
         ExpandableContactsSection(String title, List<String> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex4_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex4_item)
                     .headerResourceId(R.layout.section_ex4_header)
                     .build());
 
@@ -87,7 +88,7 @@ private class ExpandableContactsSection extends StatelessSection {
 
         @Override
         public int getContentItemsTotal() {
-            return expanded? list.size() : 0;
+            return expanded ? list.size() : 0;
         }
 
         @Override
@@ -107,7 +108,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }

app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example5Fragment.java

@@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         glm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                switch(sectionAdapter.getSectionItemViewType(position)) {
+                switch (sectionAdapter.getSectionItemViewType(position)) {
                     case SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER:
                         return 2;
                     default:
@@ -61,8 +61,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example5);
+            }
         }
     }
 
@@ -100,7 +101,8 @@ private class MovieSection extends StatelessSection {
         List<Movie> list;
 
         MovieSection(String title, List<Movie> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex5_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex5_item)
                     .headerResourceId(R.layout.section_ex5_header)
                     .build());
 

app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example6Fragment.java

@@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         glm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                switch(sectionAdapter.getSectionItemViewType(position)) {
+                switch (sectionAdapter.getSectionItemViewType(position)) {
                     case SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER:
                         return 2;
                     default:
@@ -61,8 +61,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example6);
+            }
         }
     }
 
@@ -101,7 +102,8 @@ private class ExpandableMovieSection extends StatelessSection {
         boolean expanded = true;
 
         ExpandableMovieSection(String title, List<Movie> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex6_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex6_item)
                     .headerResourceId(R.layout.section_ex6_header)
                     .build());
 
@@ -111,7 +113,7 @@ private class ExpandableMovieSection extends StatelessSection {
 
         @Override
         public int getContentItemsTotal() {
-            return expanded? list.size() : 0;
+            return expanded ? list.size() : 0;
         }
 
         @Override