拆分至lib

zhangxutong · zhangxutong · commit eb6b2e279d40 · 2016-10-31T16:10:49.000+08:00
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,7 +9,6 @@ android {
         targetSdkVersion 23
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -21,10 +20,9 @@ android {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     compile 'com.android.support:appcompat-v7:23.4.0'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:recyclerview-v7:23.4.0'
+    compile project (':swipemenulib')
+
 }
diff --git a/app/src/main/java/mcxtzhang/swipedelmenu/FullDemo/FullDelDemoActivity.java b/app/src/main/java/mcxtzhang/swipedelmenu/FullDemo/FullDelDemoActivity.java
@@ -8,12 +8,13 @@
 import android.view.View;
 import android.widget.Toast;
 
+import com.mcxtzhang.swipemenulib.SwipeMenuLayout;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import mcxtzhang.listswipemenudemo.R;
 import mcxtzhang.swipedelmenu.SwipeBean;
-import mcxtzhang.swipedelmenu.view.CstSwipeDelMenu;
 
 /**
  * 介绍：完整的删除Demo
@@ -70,7 +71,7 @@ public void onTop(int pos) {
             @Override
             public boolean onTouch(View v, MotionEvent event) {
                 if (event.getAction() == MotionEvent.ACTION_UP) {
-                    CstSwipeDelMenu viewCache = CstSwipeDelMenu.getViewCache();
+                    SwipeMenuLayout viewCache = SwipeMenuLayout.getViewCache();
                     if (null != viewCache) {
                         viewCache.smoothClose();
                     }
diff --git a/app/src/main/java/mcxtzhang/swipedelmenu/FullDemo/FullDelDemoAdapter.java b/app/src/main/java/mcxtzhang/swipedelmenu/FullDemo/FullDelDemoAdapter.java
@@ -10,11 +10,12 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.mcxtzhang.swipemenulib.SwipeMenuLayout;
+
 import java.util.List;
 
 import mcxtzhang.listswipemenudemo.R;
 import mcxtzhang.swipedelmenu.SwipeBean;
-import mcxtzhang.swipedelmenu.view.CstSwipeDelMenu;
 
 /**
  * 介绍：
@@ -41,7 +42,7 @@ public FullDelDemoVH onCreateViewHolder(ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(final FullDelDemoVH holder, final int position) {
-        ((CstSwipeDelMenu) holder.itemView).setIos(false).setLeftSwipe(position % 2 == 0 ? true : false);//这句话关掉IOS阻塞式交互效果 并依次打开左滑右滑
+        ((SwipeMenuLayout) holder.itemView).setIos(false).setLeftSwipe(position % 2 == 0 ? true : false);//这句话关掉IOS阻塞式交互效果 并依次打开左滑右滑
 
         holder.content.setText(mDatas.get(position).name + (position % 2 == 0 ? "我右白虎" : "我左青龙"));
 
diff --git a/app/src/main/java/mcxtzhang/swipedelmenu/ListViewDelDemoActivity.java b/app/src/main/java/mcxtzhang/swipedelmenu/ListViewDelDemoActivity.java
@@ -6,13 +6,14 @@
 import android.widget.ListView;
 import android.widget.Toast;
 
+import com.mcxtzhang.swipemenulib.SwipeMenuLayout;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import mcxtzhang.listswipemenudemo.R;
 import mcxtzhang.swipedelmenu.utils.CommonAdapter;
 import mcxtzhang.swipedelmenu.utils.ViewHolder;
-import mcxtzhang.swipedelmenu.view.CstSwipeDelMenu;
 
 public class ListViewDelDemoActivity extends AppCompatActivity {
     private static final String TAG = "zxt";
@@ -43,7 +44,7 @@ public void onClick(View v) {
                     public void onClick(View v) {
                         Toast.makeText(ListViewDelDemoActivity.this, "删除:" + position, Toast.LENGTH_SHORT).show();
                         //在ListView里，点击侧滑菜单上的选项时，如果想让擦花菜单同时关闭，调用这句话
-                        ((CstSwipeDelMenu) holder.getConvertView()).quickClose();
+                        ((SwipeMenuLayout) holder.getConvertView()).quickClose();
                         mDatas.remove(position);
                         notifyDataSetChanged();
                     }
diff --git a/app/src/main/res/layout/activity_linear_layout_del_demo.xml b/app/src/main/res/layout/activity_linear_layout_del_demo.xml
@@ -8,10 +8,10 @@
     android:orientation="vertical"
     tools:context="mcxtzhang.swipedelmenu.LinearLayoutDelDemoActivity">
 
-    <mcxtzhang.swipedelmenu.view.CstSwipeDelMenu
+    <com.mcxtzhang.swipemenulib.SwipeMenuLayout
         android:layout_width="match_parent"
-        android:clickable="true"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:clickable="true">
 
         <LinearLayout
             android:id="@+id/llContent"
@@ -69,13 +69,13 @@
             android:text="删除"
             android:textColor="@android:color/white"/>
 
-    </mcxtzhang.swipedelmenu.view.CstSwipeDelMenu>
+    </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
 
 
-    <mcxtzhang.swipedelmenu.view.CstSwipeDelMenu
+    <com.mcxtzhang.swipemenulib.SwipeMenuLayout
         android:layout_width="match_parent"
-        android:clickable="true"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:clickable="true">
 
         <LinearLayout
             android:id="@+id/llContent2"
@@ -133,7 +133,7 @@
             android:text="删除"
             android:textColor="@android:color/white"/>
 
-    </mcxtzhang.swipedelmenu.view.CstSwipeDelMenu>
+    </com.mcxtzhang.swipemenulib.SwipeMenuLayout>
 
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_cst_swipe.xml b/app/src/main/res/layout/item_cst_swipe.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mcxtzhang.swipedelmenu.view.CstSwipeDelMenu
+<com.mcxtzhang.swipemenulib.SwipeMenuLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="100dp"
@@ -58,4 +58,4 @@
                 android:textColor="@android:color/white"/>
         </RelativeLayout>-->
 
-</mcxtzhang.swipedelmenu.view.CstSwipeDelMenu>
+</com.mcxtzhang.swipemenulib.SwipeMenuLayout>
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app'
+include ':app', ':swipemenulib'
diff --git a/swipemenulib/.gitignore b/swipemenulib/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/swipemenulib/build.gradle b/swipemenulib/build.gradle
@@ -0,0 +1,25 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 24
+    buildToolsVersion "24.0.3"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 24
+        versionCode 1
+        versionName "1.0"
+
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile 'com.android.support:appcompat-v7:24.2.1'
+}
diff --git a/swipemenulib/proguard-rules.pro b/swipemenulib/proguard-rules.pro
@@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in C:\Users\admin\AppData\Local\Android\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 *;
+#}
diff --git a/swipemenulib/src/main/AndroidManifest.xml b/swipemenulib/src/main/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.mcxtzhang.swipemenulib">
+
+    <application android:allowBackup="true"
+                 android:label="@string/app_name"
+                 android:supportsRtl="true"
+    >
+
+    </application>
+
+</manifest>
diff --git a/swipemenulib/src/main/java/com/mcxtzhang/swipemenulib/SwipeMenuLayout.java b/swipemenulib/src/main/java/com/mcxtzhang/swipemenulib/SwipeMenuLayout.java
@@ -1,4 +1,4 @@
-package mcxtzhang.swipedelmenu.view;
+package com.mcxtzhang.swipemenulib;
 
 import android.animation.ValueAnimator;
 import android.content.Context;
@@ -37,7 +37,7 @@
  * Created by zhangxutong .
  * Date: 16/04/24
  */
-public class CstSwipeDelMenu extends ViewGroup {
+public class SwipeMenuLayout extends ViewGroup {
     private static final String TAG = "zxt";
     private boolean isSwipeEnable = true;//右滑删除功能的开关,默认开
 
@@ -63,7 +63,7 @@ public class CstSwipeDelMenu extends ViewGroup {
     private boolean isUnMoved = true;
 
     //存储的是当前正在展开的View
-    private static CstSwipeDelMenu mViewCache;
+    private static SwipeMenuLayout mViewCache;
 
     //防止多只手指一起滑我的flag 在每次down里判断， touch事件结束清空
     private static boolean isTouching;
@@ -78,15 +78,15 @@ public class CstSwipeDelMenu extends ViewGroup {
     //20160929add 左滑右滑的开关
     private boolean isLeftSwipe = true;
 
-    public CstSwipeDelMenu(Context context) {
+    public SwipeMenuLayout(Context context) {
         this(context, null);
     }
 
-    public CstSwipeDelMenu(Context context, AttributeSet attrs) {
+    public SwipeMenuLayout(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
     }
 
-    public CstSwipeDelMenu(Context context, AttributeSet attrs, int defStyleAttr) {
+    public SwipeMenuLayout(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         init(context);
     }
@@ -114,7 +114,7 @@ public boolean isIos() {
      *
      * @param ios
      */
-    public CstSwipeDelMenu setIos(boolean ios) {
+    public SwipeMenuLayout setIos(boolean ios) {
         isIos = ios;
         return this;
     }
@@ -129,7 +129,7 @@ public boolean isLeftSwipe() {
      * @param leftSwipe
      * @return
      */
-    public CstSwipeDelMenu setLeftSwipe(boolean leftSwipe) {
+    public SwipeMenuLayout setLeftSwipe(boolean leftSwipe) {
         isLeftSwipe = leftSwipe;
         return this;
     }
@@ -139,7 +139,7 @@ public CstSwipeDelMenu setLeftSwipe(boolean leftSwipe) {
      *
      * @return
      */
-    public static CstSwipeDelMenu getViewCache() {
+    public static SwipeMenuLayout getViewCache() {
         return mViewCache;
     }
 
@@ -470,8 +470,8 @@ private void acquireVelocityTracker(final MotionEvent event) {
     /**
      * * 释放VelocityTracker
      *
-     * @see android.view.VelocityTracker#clear()
-     * @see android.view.VelocityTracker#recycle()
+     * @see VelocityTracker#clear()
+     * @see VelocityTracker#recycle()
      */
     private void releaseVelocityTracker() {
         if (null != mVelocityTracker) {
diff --git a/swipemenulib/src/main/res/values/strings.xml b/swipemenulib/src/main/res/values/strings.xml
@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">SwipeMenuLib</string>
+</resources>

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ buildscript {`
`5`	`5`	`jcenter()`
`6`	`6`	`}`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:2.2.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:2.2.2'`
`9`	`9`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-include ':app'`
	`1`	`+include ':app', ':swipemenulib'`