Merge branch 'master' of https://github.com/davideas/Slidr into david…

…eas-master Cherry picked changes from pull request and revised changes to meet my spec
reynlu · Jan 11, 2016 · fa0a102 · fa0a102
1 parent f873ead
commit fa0a102
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 109 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,28 +1,4 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-ext {
-	//App
-	libraryCode = 10
-	libraryVersion = '2.1.0'
-
-	//Support and Build tools version
-	minSdk = 14
-	targetSdk = 23
-	buildTools = '23.0.2'
-	supportLibrary = '23.1.1'
-
-	//Support Libraries dependencies
-	supportDependencies = [
-			design       : "com.android.support:design:${supportLibrary}",
-			recyclerview : "com.android.support:recyclerview-v7:${supportLibrary}",
-			cardview     : "com.android.support:cardview-v7:${supportLibrary}",
-			appcompat    : "com.android.support:appcompat-v7:${supportLibrary}",
-			customtabs   : "com.android.support:customtabs:${supportLibrary}",
-			support      : "com.android.support:support-v13:${supportLibrary}",
-			annotations  : "com.android.support:support-annotations:${supportLibrary}",
-			palette      : "com.android.support:palette-v7:${supportLibrary}"
-	]
-
-}
 buildscript {
     repositories {
         jcenter()
@@ -38,3 +14,25 @@ allprojects {
 		maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }
+
+ext {
+	//App
+	libraryCode = 10
+	libraryVersion = '2.1.0'
+
+	//Support and Build tools version
+    targetSdk = 23
+	buildTools = '23.0.2'
+	supportLibrary = '23.1.1'
+    ftKit = '0.4.1'
+
+	//Support Libraries dependencies
+	supportDependencies = [
+			support       : "com.android.support:support-v4:${supportLibrary}",
+            appCompat     : "com.android.support:appcompat-v7:${supportLibrary}",
+            recycler      : "com.android.support:recyclerview-v7:${supportLibrary}",
+            cardView      : "com.android.support:cardview-v7:${supportLibrary}",
+            kitCore       : "com.52inc:52Kit-core:${ftKit}"
+	]
+
+}
diff --git a/example/build.gradle b/example/build.gradle
@@ -1,16 +1,15 @@
 apply plugin: 'com.android.application'
 
-repositories {
-    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-}
-
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion targetSdk
+    buildToolsVersion buildTools
 
     defaultConfig {
         applicationId "com.r0adkll.slidr.example"
-        minSdkVersion minSdk
+        minSdkVersion 16
+        targetSdkVersion targetSdk
+        versionCode libraryCode
+        versionName libraryVersion
     }
 
 	buildTypes {
@@ -26,21 +25,15 @@ android {
 
 }
 
-ext{
-    supportLibraryVersion = '23.1.1'
-    kitVersion = '0.4.1'
-
-}
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
 
-    compile "com.android.support:appcompat-v7:${supportLibraryVersion}"
-    compile "com.android.support:recyclerview-v7:${supportLibraryVersion}"
-    compile "com.android.support:cardview-v7:${supportLibraryVersion}"
+    compile supportDependencies.appCompat
+    compile supportDependencies.recycler
+    compile supportDependencies.cardView
 
-    compile 'com.52inc:52Kit-core:0.4.1'
+    compile supportDependencies.kitCore
 
     compile 'com.jakewharton:butterknife:6.1.0'
     compile 'com.github.bumptech.glide:glide:3.6.0'

diff --git a/example/example.iml b/example/example.iml
@@ -36,13 +36,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -65,14 +65,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.52inc/52Kit-core/0.4.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton.timber/timber/4.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.reactivex/rxandroid/1.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />

diff --git a/library/build.gradle b/library/build.gradle
@@ -2,12 +2,11 @@ apply plugin: 'com.android.library'
 apply plugin: 'maven'
 
 android {
-    compileSdkVersion targetSdk
+    compileSdkVersion 23
     buildToolsVersion buildTools
 
     defaultConfig {
-        minSdkVersion minSdk
-        targetSdkVersion targetSdk
+        minSdkVersion 14
 		versionCode libraryCode
 		versionName libraryVersion
     }

diff --git a/library/library.iml b/library/library.iml
@@ -37,13 +37,13 @@
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -67,17 +67,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/ivy.xml" />
       <excludeFolder url="file://$MODULE_DIR$/build/libs" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
@@ -86,7 +89,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="support-annotations-23.1.1" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-23.1.1" level="project" />
   </component>
 </module>
diff --git a/library/src/main/java/com/r0adkll/slidr/Slidr.java b/library/src/main/java/com/r0adkll/slidr/Slidr.java
@@ -185,61 +185,4 @@ public void unlock() {
 		return slidrInterface;
 	}
 
-    /**
-     * Replace a viewgroup with the sliding mechanism
-     *
-     * @param view
-     * @param config
-     * @return
-     */
-    public static SlidrInterface replace(final ViewGroup view, final SlidrConfig config){
-
-        ViewGroup parent = (ViewGroup)view.getParent();
-        ViewGroup.LayoutParams params = view.getLayoutParams();
-        parent.removeView(view);
-
-        // Setup the slider panel and attach it to the decor
-        final SliderPanel panel = new SliderPanel(view.getContext(), view, config);
-        panel.setId(view.getId());
-        view.setId(R.id.slidable_panel);
-        panel.addView(view);
-        parent.addView(panel, params);
-
-        // Set the panel slide listener for when it becomes closed or opened
-        panel.setOnPanelSlideListener(new SliderPanel.OnPanelSlideListener() {
-
-            @Override
-            public void onStateChanged(int state) {
-                if(config.getListener() != null){
-                    config.getListener().onSlideStateChanged(state);
-                }
-            }
-
-            @Override
-            public void onClosed() {
-                if(config.getListener() != null){
-                    config.getListener().onSlideClosed();
-                }
-            }
-
-            @Override
-            public void onOpened() {
-                if(config.getListener() != null){
-                    config.getListener().onSlideOpened();
-                }
-            }
-
-            @TargetApi(Build.VERSION_CODES.LOLLIPOP)
-            @Override
-            public void onSlideChange(float percent) {
-                if(config.getListener() != null){
-                    config.getListener().onSlideChange(percent);
-                }
-            }
-        });
-
-		// Return the lock interface
-		return initInterface(panel);
-    }
-
 }