Skip to content

Commit f45cf60

Browse files
author
anzewei
committed
压缩了包,删除掉无用资源
1 parent 55e29ab commit f45cf60

File tree

18 files changed

+152
-122
lines changed

18 files changed

+152
-122
lines changed

README_ZH.md

+37-3
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,51 @@ public class DetailActivity extends AppCompatActivity {
3030
}
3131
```
3232
- 这样DetailActivity就可以滑动返回了
33-
3433
#高级用法
35-
##控制返回
34+
##annotation高级配置
35+
36+
``` java
37+
@ParallaxBack(edge = ParallaxBack.Edge.RIGHT,layout = ParallaxBack.Layout.PARALLAX)
38+
````
39+
40+
注意:**其中edge控制滑动方向,layout设置滑动效果**
41+
42+
###滑动效果默认有3种方式
43+
- PARALLAX 视差返回,类似微信的滑动返回效果
44+
- COVER 上级activity不会滑动,只滑动当前activity,有点像抽屉
45+
- SLIDE 跟随滑动,上一级会紧贴着当前activity滑动
46+
###自定义滑动效果
47+
- 首先实现滑动效果
48+
``` java
49+
public class MyTransform implements ITransform {
50+
@Override
51+
public void transform(Canvas canvas, ParallaxBackLayout parallaxBackLayout, View child) {
52+
//这里对canvas做变换就可以了,可以看一下 CoverTransform ParallaxTransform SlideTransform
53+
}
54+
}
55+
56+
```
57+
- 设置自定义效果
58+
``` java
59+
ParallaxBackLayout layout = ParallaxHelper.getParallaxBackLayout(activity, true);
60+
layout.setLayoutType(LAYOUT_CUSTOM,new MyTransform());
61+
```
62+
##全屏滑动和边缘滑动
63+
64+
``` java
65+
ParallaxBackLayout layout = ParallaxHelper.getParallaxBackLayout(activity, true);
66+
layout.setEdgeMode(EDGE_MODE_FULL);//全屏滑动
67+
layout.setEdgeMode(EDGE_MODE_DEFAULT);//边缘滑动
68+
```
69+
##禁用返回
3670
如果需要对DetailActivity进行滑动返回的控制,如某些情况不希望滑动,那可以使用以下代码
3771

3872

3973
``` java
4074
@ParallaxBack
4175
public class DetailActivity extends AppCompatActivity {
4276
private void disableBack(){
43-
ParallaxHelper.getInstance().getParallaxBackLayout(this).setEnableGesture(false);
77+
ParallaxHelper.getInstance().disableParallaxBack(this);
4478
}
4579
}
4680
```

parallaxbacklayout/build.gradle

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ext {
1313
siteUrl = 'https://github.com/anzewei/ParallaxBackLayout'
1414
gitUrl = 'https://github.com/anzewei/ParallaxBackLayout.git'
1515

16-
libraryVersion = '1.1.3'
16+
libraryVersion = '1.1.6'
1717

1818
developerId = 'anzewei'
1919
developerName = 'An Zewei'
@@ -26,13 +26,13 @@ ext {
2626

2727

2828
android {
29-
compileSdkVersion 24
29+
compileSdkVersion 22
3030
buildToolsVersion '25.0.0'
3131

3232
defaultConfig {
3333
minSdkVersion 14
3434
targetSdkVersion 22
35-
versionCode 3
35+
versionCode 6
3636
versionName libraryVersion
3737
}
3838
buildTypes {
@@ -45,7 +45,7 @@ android {
4545

4646
dependencies {
4747
compile fileTree(include: ['*.jar'], dir: 'libs')
48-
compile 'com.android.support:appcompat-v7:24.1.1'
48+
compile 'com.android.support:support-v4:22.1.0'
4949
}
5050
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
5151
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'

parallaxbacklayout/src/androidTest/java/com/github/anzewei/parallaxbacklayout/ApplicationTest.java

-13
This file was deleted.

parallaxbacklayout/src/main/java/com/github/anzewei/parallaxbacklayout/LinkedStack.java

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.anzewei.parallaxbacklayout;
22

3-
import java.util.HashMap;
43
import java.util.LinkedHashMap;
54
import java.util.LinkedList;
65

parallaxbacklayout/src/main/java/com/github/anzewei/parallaxbacklayout/ParallaxBack.java

+36-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ public enum Edge {
2525
private Edge(int value) {
2626
this.value = value;
2727
}
28-
public int getValue() {
28+
29+
public
30+
@ParallaxBackLayout.Edge
31+
int getValue() {
2932
return value;
3033
}
3134
}
@@ -34,13 +37,35 @@ public int getValue() {
3437
* The enum Layout.
3538
*/
3639
public enum Layout {
37-
PARALLAX(ParallaxBackLayout.LAYOUT_PARALLAX), FULL(ParallaxBackLayout.LAYOUT_COVER);
40+
PARALLAX(ParallaxBackLayout.LAYOUT_PARALLAX), COVER(ParallaxBackLayout.LAYOUT_COVER), SLIDE(ParallaxBackLayout.LAYOUT_SLIDE);
3841
private final int value;
3942

4043
private Layout(int value) {
4144
this.value = value;
4245
}
43-
public int getValue() {
46+
47+
public
48+
@ParallaxBackLayout.LayoutType
49+
int getValue() {
50+
return value;
51+
}
52+
53+
}
54+
55+
/**
56+
* Slide mode.
57+
*/
58+
public enum EdgeMode {
59+
FULLSCREEN(ParallaxBackLayout.EDGE_MODE_FULL),
60+
EDGE(ParallaxBackLayout.EDGE_MODE_DEFAULT);
61+
private final int value;
62+
63+
private EdgeMode(int value) {
64+
this.value = value;
65+
}
66+
67+
public @ParallaxBackLayout.EdgeMode
68+
int getValue() {
4469
return value;
4570
}
4671

@@ -54,10 +79,17 @@ public int getValue() {
5479
Edge edge() default Edge.LEFT;
5580

5681
/**
57-
* Back layout type.
82+
* The slide Transform.
5883
*
5984
* @return the layout type ,default parallax
6085
*/
6186
Layout layout() default Layout.PARALLAX;
6287

88+
/**
89+
* The slide distance
90+
*
91+
* @return default edge
92+
*/
93+
EdgeMode edgeMode() default EdgeMode.EDGE;
94+
6395
}

parallaxbacklayout/src/main/java/com/github/anzewei/parallaxbacklayout/ParallaxHelper.java

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public void onActivityCreated(final Activity activity, Bundle savedInstanceState
4242
if (mLinkedStack.size() > 0 && parallaxBack != null) {
4343
ParallaxBackLayout layout = enableParallaxBack(activity);
4444
layout.setEdgeFlag(parallaxBack.edge().getValue());
45+
layout.setEdgeMode(parallaxBack.edgeMode().getValue());
4546
layout.setLayoutType(parallaxBack.layout().getValue(),null);
4647
}
4748
}

0 commit comments

Comments
 (0)