Merge branch 'develop'

.github/FUNDING.yml

@@ -0,0 +1,5 @@
+# These are supported funding model platforms
+
+ko_fi: nisrulz
+liberapay: nisrulz
+custom: https://www.paypal.me/nisrulz/5usd

README.md

@@ -95,7 +95,7 @@ where `{latest version}` corresponds to published version in [ ![Download](https
 
 Usage Example:
 ```gradle
-def recyclerViewVersion="1.0.0"
+def recyclerViewVersion="1.1.0"
 // Required
 implementation "androidx.recyclerview:recyclerview:${recyclerViewVersion}"
 

app/build.gradle

@@ -15,53 +15,28 @@
  */
 
 apply plugin: 'com.android.application'
-apply from: '../dependencies.gradle'
 
-android {
-    compileSdkVersion versions.compileSdk
+// Configs
+apply from: "$rootProject.projectDir/configs/common.gradle"
 
+android {
     defaultConfig {
-        minSdkVersion versions.minSdk
-        targetSdkVersion versions.targetSdk
         applicationId "github.nisrulz.projectrecyclerviewhelper"
-        versionCode versions.appVersionCode
-        versionName versions.appVersionName
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
 
-    lintOptions {
-        textOutput "stdout"
-        textReport true
-        checkAllWarnings true
-        warningsAsErrors true
-        showAll true
-        explainIssues true
-        abortOnError false
-        lintConfig file("$projectDir/lint.xml")
+        versionCode Versions.appCode
+        versionName Versions.appName
     }
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
-
-    // Testing
-    testImplementation unitTestLibs
-    androidTestImplementation androidTestsLibs
+    // Appcompat
+    implementation Dependencies.appCompat
 
     // Card View
-    implementation supportDeps.cardView
-
-    // Support Appcompat
-    implementation "androidx.appcompat:appcompat:$versions.supportAppCompat"
+    implementation Dependencies.cardview
 
     // Required
-    implementation "androidx.recyclerview:recyclerview:$versions.supportRecyclerView"
+    implementation Dependencies.recyclerView
 
     // ---------- RecyclerViewHelper ----------
     // From Maven Repo

app/src/main/AndroidManifest.xml

@@ -15,14 +15,14 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="github.nisrulz.projectrecyclerviewhelper">
+        package="github.nisrulz.projectrecyclerviewhelper">
 
     <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+            android:allowBackup="true"
+            android:icon="@mipmap/ic_launcher"
+            android:label="@string/app_name"
+            android:supportsRtl="true"
+            android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/github/nisrulz/projectrecyclerviewhelper/MainActivity.java

@@ -17,17 +17,20 @@
 package github.nisrulz.projectrecyclerviewhelper;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.ArrayList;
+
 import github.nisrulz.recyclerviewhelper.RVHItemClickListener;
 import github.nisrulz.recyclerviewhelper.RVHItemDividerDecoration;
 import github.nisrulz.recyclerviewhelper.RVHItemTouchHelperCallback;
-import java.util.ArrayList;
 
 public class MainActivity extends AppCompatActivity {
 

app/src/main/java/github/nisrulz/projectrecyclerviewhelper/MyAdapter.java

@@ -16,39 +16,22 @@
 
 package github.nisrulz.projectrecyclerviewhelper;
 
-import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import github.nisrulz.recyclerviewhelper.RVHAdapter;
-import github.nisrulz.recyclerviewhelper.RVHViewHolder;
+
+import androidx.recyclerview.widget.RecyclerView;
+
 import java.util.Collections;
 import java.util.List;
 
+import github.nisrulz.recyclerviewhelper.RVHAdapter;
+import github.nisrulz.recyclerviewhelper.RVHViewHolder;
+
 public class MyAdapter extends RecyclerView.Adapter<MyAdapter.ItemViewHolder>
         implements RVHAdapter {
 
-    public class ItemViewHolder extends RecyclerView.ViewHolder implements RVHViewHolder {
-
-        final TextView txt;
-
-        public ItemViewHolder(View itemView) {
-            super(itemView);
-            txt = itemView.findViewById(R.id.txt);
-        }
-
-        @Override
-        public void onItemClear() {
-            System.out.println("Item is unselected");
-        }
-
-        @Override
-        public void onItemSelected(int actionstate) {
-            System.out.println("Item is selected");
-        }
-    }
-
     private final List<String> dataList;
 
     public MyAdapter(List<String> dataList) {
@@ -94,4 +77,24 @@ private void swap(int firstPosition, int secondPosition) {
         Collections.swap(dataList, firstPosition, secondPosition);
         notifyItemMoved(firstPosition, secondPosition);
     }
+
+    public class ItemViewHolder extends RecyclerView.ViewHolder implements RVHViewHolder {
+
+        final TextView txt;
+
+        public ItemViewHolder(View itemView) {
+            super(itemView);
+            txt = itemView.findViewById(R.id.txt);
+        }
+
+        @Override
+        public void onItemClear() {
+            System.out.println("Item is unselected");
+        }
+
+        @Override
+        public void onItemSelected(int actionstate) {
+            System.out.println("Item is selected");
+        }
+    }
 }

app/src/main/res/layout/activity_main.xml

@@ -15,13 +15,13 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".MainActivity">
 
     <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rv_fruits"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+            android:id="@+id/rv_fruits"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
 </RelativeLayout>

app/src/main/res/layout/rv_list_item.xml

@@ -15,35 +15,35 @@
   -->
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:weightSum="3">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:weightSum="3">
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:padding="10dp"
-            android:src="@drawable/ic_reorder_grey_600_24dp"
-            android:contentDescription="Reorder Handle" />
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:contentDescription="Reorder Handle"
+                android:padding="10dp"
+                android:src="@drawable/ic_reorder_grey_600_24dp" />
 
         <TextView
-            android:id="@+id/txt"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="3"
-            android:padding="20dp"
-            android:textColor="@color/colorAccent" />
+                android:id="@+id/txt"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="3"
+                android:padding="20dp"
+                android:textColor="@color/colorAccent" />
 
         <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:padding="10dp"
-            android:src="@drawable/ic_compare_arrows_indigo_a400_24dp"
-            android:contentDescription="Swipe Direction icon" />
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:contentDescription="Swipe Direction icon"
+                android:padding="10dp"
+                android:src="@drawable/ic_compare_arrows_indigo_a400_24dp" />
     </LinearLayout>
 
 </androidx.cardview.widget.CardView>

app/src/test/java/github/nisrulz/projectrecyclerviewhelper/ExampleUnitTest.java

@@ -16,9 +16,9 @@
 
 package github.nisrulz.projectrecyclerviewhelper;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
 
-import org.junit.*;
+import static org.junit.Assert.assertEquals;
 
 /**
  * To work on unit tests, switch the Test Artifact in the Build Variants view.

build.gradle

@@ -17,17 +17,24 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    // Gradle will not find vars defined in an external file when referring to them
-    // in the buildscript block, unless you link it from the buildscript block, too.
-    apply from: 'dependencies.gradle'
 
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
-        // See dependencies.gradle for declaration of plugins.
-        classpath gradlePlugins
+        classpath Plugins.android
+
+        // Publish to Jcenter/Bintray
+        classpath Plugins.bintray
+        classpath Plugins.androidMaven
+
+        // Kotlin Plugin
+        classpath Plugins.kotlin
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
     }
 }
 
@@ -36,8 +43,4 @@ allprojects {
         google()
         jcenter()
     }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
+}

buildSrc/.gitignore

@@ -0,0 +1,5 @@
+*.iml
+.gradle
+/.idea
+/build
+gradle.properties

buildSrc/build.gradle.kts

@@ -0,0 +1,7 @@
+repositories {
+    jcenter()
+}
+
+plugins {
+    `kotlin-dsl`
+}

buildSrc/src/main/java/Config.kt

@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2016 Nishant Srivastava
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+object Config {
+    const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+}