Merge pull request #376 from HKMOpen/dev

dev up

UltimateRecyclerView/app/build.gradle

@@ -34,15 +34,17 @@ dependencies {
     compile supportDependencies.annotation
     compile supportDependencies.cv
 
+    debugCompile supportDependencies.leakcanary
+    releaseCompile supportDependencies.leakcanarynoop
+    testCompile supportDependencies.leakcanarynoop
 
-    compile project(':ultimaterecyclerview')
-  //  compile 'com.marshalchen.ultimaterecyclerview:library:0.4.0'
+    //  compile 'com.marshalchen.ultimaterecyclerview:library:0.4.0'
     compile 'com.google.android.gms:play-services:7.3.0'
     debugCompile 'me.drakeet.library:crashwoodpecker:0.9.7'
     releaseCompile 'me.drakeet.library:crashwoodpecker-do-nothing:0.9.7'
 
     compile 'com.hkm.loyalslider:library:1.6.2'
-
+    compile project(':ultimaterecyclerview')
     //used in the gridlayout
     // compile 'com.hkm.loyalslider:library:1.4.5' exclude group: 'android.support.v13'
 

UltimateRecyclerView/app/proguard-rules.pro

@@ -1,17 +1,7 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Volumes/MAC3/adt/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
 
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
+#-dontwarn com.squareup.haha.guava.**
+#-dontwarn com.squareup.haha.perflib.**
+#-dontwarn com.squareup.haha.trove.**
+-dontwarn com.squareup.leakcanary.**
+#-keep class com.squareup.haha.** { *; }
+-keep class com.squareup.leakcanary.** { *; }

UltimateRecyclerView/app/src/main/AndroidManifest.xml

@@ -18,7 +18,7 @@
         android:theme="@style/AppTheme"
         tools:replace="android:icon,android:theme">
         <activity
-            android:name=".MainActivity"
+            android:name=".MainList"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -33,6 +33,9 @@
         <activity
             android:name=".griddemo.GridLayoutRVTest"
             android:label="GridLayoutRVTest" />
+        <activity
+            android:name=".griddemo.GridTestOnlyOnePage"
+            android:label="GridLayoutRVTest" />
         <activity
             android:name=".loadmoredemo.PullToRefreshActivity"
             android:label="CustomSwipeToRefreshRefreshActivity" />