From 8e0d526f6f319b9d1d6579a3d783a0f1fcd1b174 Mon Sep 17 00:00:00 2001 From: CodingCodersCode <1973800846@qq.com> Date: Thu, 18 Jan 2018 15:07:11 +0800 Subject: [PATCH 1/7] Update README.md --- README.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/README.md b/README.md index 562ba85..5ec6ce4 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,41 @@ 该项目由[@jeasonlzy/VerticalSlideView](https://github.com/jeasonlzy/VerticalSlideView)项目修改而来,只是对[@jeasonlzy/VerticalSlideView](https://github.com/jeasonlzy/VerticalSlideView)项目的[@VerticalSlide.java](https://github.com/jeasonlzy/VerticalSlideView/blob/master/verticalslide/src/main/java/com/lzy/widget/VerticalSlide.java)进行了修改,使得其支持多页拖拽功能,具体使用方法与[@jeasonlzy/VerticalSlideView](https://github.com/jeasonlzy/VerticalSlideView)的使用方式完全一致。 +使用方式 +--- +(1)maven + + Step 1. Add the JitPack repository to your build file + + + jitpack.io + https://jitpack.io + + + + Step 2. Add the dependency + + com.github.CodingCodersCode + CCVerticalDragToSlideLayout + V1.0 + + +(2)gradle + + - project root `build.gradle`: + allprojects { + repositories { + ...... + maven { url 'https://jitpack.io' } + maven { url 'https://maven.google.com' } + } + } + + - app `build.gradle`: + dependencies { + compile 'com.github.CodingCodersCode:CCVerticalDragToSlideLayout:V1.0' + } + 效果图 --- ![image](https://github.com/CodingCodersCode/CCVerticalDragToSlideLayout/blob/master/screenshot/screenshot.gif) From 72d46c6b0a3b76f84c9233092c6a340c8d1adabf Mon Sep 17 00:00:00 2001 From: CodingCodersCode <1973800846@qq.com> Date: Thu, 18 Jan 2018 15:11:00 +0800 Subject: [PATCH 2/7] Update README.md --- README.md | 49 ++++++++++++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 5ec6ce4..fb65d61 100644 --- a/README.md +++ b/README.md @@ -6,25 +6,33 @@ 使用方式 --- (1)maven - - Step 1. Add the JitPack repository to your build file - - - jitpack.io - https://jitpack.io - - - - Step 2. Add the dependency - - com.github.CodingCodersCode - CCVerticalDragToSlideLayout - V1.0 - - + + - Step 1. Add the JitPack repository to your build file + + ` + + + jitpack.io + https://jitpack.io + + + ` + + - Step 2. Add the dependency + + ` + + com.github.CodingCodersCode + CCVerticalDragToSlideLayout + V1.0 + + ` + (2)gradle - - project root `build.gradle`: + - project root `build.gradle`: + + ` allprojects { repositories { ...... @@ -32,12 +40,15 @@ maven { url 'https://maven.google.com' } } } + ` - - app `build.gradle`: + - app `build.gradle`: + + ` dependencies { compile 'com.github.CodingCodersCode:CCVerticalDragToSlideLayout:V1.0' } - + ` 效果图 --- ![image](https://github.com/CodingCodersCode/CCVerticalDragToSlideLayout/blob/master/screenshot/screenshot.gif) From c018752c3426027aca4bfacef3b965bf7bc54e94 Mon Sep 17 00:00:00 2001 From: CodingCodersCode <1973800846@qq.com> Date: Thu, 18 Jan 2018 15:15:57 +0800 Subject: [PATCH 3/7] Update README.md --- README.md | 45 ++++++++++++++++++++------------------------- 1 file changed, 20 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index fb65d61..ce188b1 100644 --- a/README.md +++ b/README.md @@ -8,47 +8,42 @@ (1)maven - Step 1. Add the JitPack repository to your build file - - ` - - - jitpack.io - https://jitpack.io - - - ` + + + + jitpack.io + https://jitpack.io + + + - Step 2. Add the dependency - - ` - - com.github.CodingCodersCode - CCVerticalDragToSlideLayout - V1.0 - - ` + + + com.github.CodingCodersCode + CCVerticalDragToSlideLayout + V1.0 + + (2)gradle - project root `build.gradle`: - - ` - allprojects { + + allprojects { repositories { ...... maven { url 'https://jitpack.io' } maven { url 'https://maven.google.com' } } } - ` - app `build.gradle`: - - ` - dependencies { + + dependencies { compile 'com.github.CodingCodersCode:CCVerticalDragToSlideLayout:V1.0' } - ` + 效果图 --- ![image](https://github.com/CodingCodersCode/CCVerticalDragToSlideLayout/blob/master/screenshot/screenshot.gif) From 53f729da5c52e6af81747a80b201747dc3f1766b Mon Sep 17 00:00:00 2001 From: ghc Date: Thu, 18 Jan 2018 15:26:30 +0800 Subject: [PATCH 4/7] =?UTF-8?q?1.=E4=B8=AA=E5=88=AB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .idea/vcs.xml | 6 ++++++ .../vertical/dragtoslide/fragment/BaseFragment.java | 10 +--------- 3 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 .idea/vcs.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index f26e5a4..3b32059 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -59,7 +59,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/ccc/demo/layout/vertical/dragtoslide/fragment/BaseFragment.java b/app/src/main/java/com/ccc/demo/layout/vertical/dragtoslide/fragment/BaseFragment.java index 1f3ba85..ad04968 100644 --- a/app/src/main/java/com/ccc/demo/layout/vertical/dragtoslide/fragment/BaseFragment.java +++ b/app/src/main/java/com/ccc/demo/layout/vertical/dragtoslide/fragment/BaseFragment.java @@ -2,15 +2,7 @@ import android.support.v4.app.Fragment; -/** - * ================================================ - * 作 者:jeasonlzy(廖子尧)Github地址:https://github.com/jeasonlzy0216 - * 版 本:1.0 - * 创建日期:16/9/2 - * 描 述: - * 修订历史: - * ================================================ - */ + public abstract class BaseFragment extends Fragment { public abstract void goTop(); From f7e59d190c9e7a3b7172fb67c458480038d87827 Mon Sep 17 00:00:00 2001 From: ghc Date: Tue, 15 May 2018 15:38:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1.=E5=8F=AF=E5=BF=BD=E7=95=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../vertical/dragtoslide/CCVerticalDragToSlideLayout.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 3b32059..f26e5a4 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -59,7 +59,7 @@ - + diff --git a/CCVerticalDragToSlideLayoutLib/src/main/java/com/ccc/lib/layout/vertical/dragtoslide/CCVerticalDragToSlideLayout.java b/CCVerticalDragToSlideLayoutLib/src/main/java/com/ccc/lib/layout/vertical/dragtoslide/CCVerticalDragToSlideLayout.java index 26e6d8d..608278d 100644 --- a/CCVerticalDragToSlideLayoutLib/src/main/java/com/ccc/lib/layout/vertical/dragtoslide/CCVerticalDragToSlideLayout.java +++ b/CCVerticalDragToSlideLayoutLib/src/main/java/com/ccc/lib/layout/vertical/dragtoslide/CCVerticalDragToSlideLayout.java @@ -98,9 +98,9 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) { childView = getChildAt(childIndex); - if (childView.getVisibility() == View.GONE) { + /*if (childView.getVisibility() == View.GONE) { continue; - } + }*/ childView.layout(0, 0, r - l, b - t); From 7f0328b9e8d142a85162c0d05fd44acbdcd1fdd5 Mon Sep 17 00:00:00 2001 From: ghc Date: Tue, 15 May 2018 15:48:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?1.=E5=8F=AF=E5=BF=BD=E7=95=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 0 -> 605 bytes .idea/codeStyles/Project.xml | 29 ++++++++ .idea/compiler.xml | 22 ------ .idea/copyright/profiles_settings.xml | 3 - .idea/misc.xml | 73 ++------------------ CCVerticalDragToSlideLayoutLib/build.gradle | 4 +- app/build.gradle | 4 +- 7 files changed, 38 insertions(+), 97 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..ac6432078a7922740e47ae20a35e2a6df4611b43 GIT binary patch literal 605 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7KNES3cm-(o6SqIEOnjxD%YQ7uSf}lKu&&gVh$*@3Q~(oGE<97;fj}^ zSN@uCgmdlM;1`)02N-ip7*zB_i&Kk=_0uzw^`U0#BZ3>lfGe^+H~SejvAk^Hobl#| zQ(XyzwzG2>$Qq!PE=7syA^E{Mz&P_stjsSh@ySfm$L{J7u_ft;cFb|Oz?^+3@}q!6 z34 + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index f26e5a4..dc34569 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,18 +1,16 @@ - - - @@ -27,71 +25,10 @@ - - - - - - - - - GeneralJava - - - Java - - - - - GeneralJava - - - - - - - - - - - - - - - - + - - $USER_HOME$/.subversion - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CCVerticalDragToSlideLayoutLib/build.gradle b/CCVerticalDragToSlideLayoutLib/build.gradle index 200bffe..8560a51 100644 --- a/CCVerticalDragToSlideLayoutLib/build.gradle +++ b/CCVerticalDragToSlideLayoutLib/build.gradle @@ -25,7 +25,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:+' + compile 'com.android.support:appcompat-v7:27.+' - compile 'com.android.support:recyclerview-v7:+' + compile 'com.android.support:recyclerview-v7:27.+' } diff --git a/app/build.gradle b/app/build.gradle index d7d6665..c2aac1a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,9 +24,9 @@ dependencies { 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:+' + compile 'com.android.support:appcompat-v7:27.+' compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.android.support:design:+' + compile 'com.android.support:design:27.+' testCompile 'junit:junit:4.12' compile project(':CCVerticalDragToSlideLayoutLib') } From 0cb00b938db36759a7d85fa834cd1eb18f6496e6 Mon Sep 17 00:00:00 2001 From: CodingCodersCode <1973800846@qq.com> Date: Tue, 15 May 2018 15:51:55 +0800 Subject: [PATCH 7/7] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index ce188b1..9338fa3 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ com.github.CodingCodersCode CCVerticalDragToSlideLayout - V1.0 + V1.0.2 @@ -41,7 +41,7 @@ - app `build.gradle`: dependencies { - compile 'com.github.CodingCodersCode:CCVerticalDragToSlideLayout:V1.0' + compile 'com.github.CodingCodersCode:CCVerticalDragToSlideLayout:V1.0.2' } 效果图