Skip to content

Commit 2f2277f

Browse files
mxn21mxn21
committed
fix drawer overflow
1 parent e6b6430 commit 2f2277f

8 files changed

Lines changed: 217 additions & 180 deletions

File tree

‎.gradle/2.2.1/taskArtifacts/cache.properties.lock‎

0 Bytes
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/fileHashes.bin‎

280 Bytes
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/fileSnapshots.bin‎

327 KB
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/taskArtifacts.bin‎

0 Bytes
Binary file not shown.

‎.idea/workspace.xml‎

Lines changed: 150 additions & 120 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build/intermediates/dex-cache/cache.xml‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -2,95 +2,81 @@
22
<items version="2" >
33

44
<item
5-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.2.1/jars/classes.jar"
5+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars/classes.jar"
66
jumboMode="false"
77
revision="22.0.1"
8-
sha1="e1fa5e1123997a55e3ed65b44892993ff4b58cfe">
9-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-1f95ffe643364ee8a074896fc090056175e7b513.jar" />
10-
</item>
11-
<item
12-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars/classes.jar"
13-
jumboMode="false"
14-
revision="23.0.0 rc2"
15-
sha1="4486e953d1f35f8ccab098b1dd67146366d5f731">
16-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-7ff8e28472a7c85d696a7f8a846fca54a5542afb.jar" />
8+
sha1="1821601ddbec5ff125653097812823388700af74">
9+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-73d6ff5090e4874e30026cbfd5a22de0f56f9ae2.jar" />
1710
</item>
1811
<item
1912
jar="/Users/cys/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.0/7ff0e000d1e27e356567f56c92af3b8ab912636f/picasso-2.5.0.jar"
2013
jumboMode="false"
21-
revision="22.0.1"
14+
revision="23.0.0 rc2"
2215
sha1="7ff0e000d1e27e356567f56c92af3b8ab912636f">
2316
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/picasso-2.5.0-ed5e0e6ef9e4022aca0fd7a399dfbfa085a4f0ab.jar" />
2417
</item>
2518
<item
26-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.mxn.soul/flowingdrawer-core/1.0.0/jars/libs/nineoldandroids-2.4.0.jar"
19+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.2.1/jars/classes.jar"
2720
jumboMode="false"
2821
revision="22.0.1"
29-
sha1="59f19e43354d32de831379c23ce03bb259a4c2b7">
30-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-cc336e91956270c748dd3dd7e042b7f635292e2b.jar" />
31-
</item>
32-
<item
33-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/libs/internal_impl-22.2.1.jar"
34-
jumboMode="false"
35-
revision="23.0.0 rc2"
36-
sha1="c471eaaba13ff64f6e0383d1c30a9cdc9a97efeb">
37-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/internal_impl-22.2.1-70103343af613170c1bd14dea6f11bc93d5a4f50.jar" />
22+
sha1="e1fa5e1123997a55e3ed65b44892993ff4b58cfe">
23+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-1f95ffe643364ee8a074896fc090056175e7b513.jar" />
3824
</item>
3925
<item
40-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.mxn.soul/flowingdrawer-core/1.0.0/jars/classes.jar"
26+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars/classes.jar"
4127
jumboMode="false"
4228
revision="22.0.1"
43-
sha1="003c745ab582f436cff61d6a0be2836ff90cea1e">
44-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-11fc01975e9c3eca415bb742075186d4bc491036.jar" />
29+
sha1="4486e953d1f35f8ccab098b1dd67146366d5f731">
30+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-7ff8e28472a7c85d696a7f8a846fca54a5542afb.jar" />
4531
</item>
4632
<item
47-
jar="/Users/cys/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.0/7ff0e000d1e27e356567f56c92af3b8ab912636f/picasso-2.5.0.jar"
33+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.2.1/jars/classes.jar"
4834
jumboMode="false"
4935
revision="23.0.0 rc2"
50-
sha1="7ff0e000d1e27e356567f56c92af3b8ab912636f">
51-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/picasso-2.5.0-ed5e0e6ef9e4022aca0fd7a399dfbfa085a4f0ab.jar" />
36+
sha1="e1fa5e1123997a55e3ed65b44892993ff4b58cfe">
37+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-1f95ffe643364ee8a074896fc090056175e7b513.jar" />
5238
</item>
5339
<item
5440
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.1/jars/classes.jar"
5541
jumboMode="false"
56-
revision="23.0.0 rc2"
42+
revision="22.0.1"
5743
sha1="3abb4b88f5a8a0584a9b01d3170d7165f12f8588">
5844
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-acab96953803076870e701b4bcf3cc151d2facda.jar" />
5945
</item>
6046
<item
61-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/libs/internal_impl-22.2.1.jar"
47+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/classes.jar"
6248
jumboMode="false"
6349
revision="22.0.1"
64-
sha1="c471eaaba13ff64f6e0383d1c30a9cdc9a97efeb">
65-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/internal_impl-22.2.1-70103343af613170c1bd14dea6f11bc93d5a4f50.jar" />
50+
sha1="f8efd0096475e0daf054267b61544e10dc776503">
51+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-cb9d85a9fcc9ddc7f26321b14e3584879058f34f.jar" />
6652
</item>
6753
<item
68-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/classes.jar"
54+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars/classes.jar"
6955
jumboMode="false"
7056
revision="23.0.0 rc2"
71-
sha1="f8efd0096475e0daf054267b61544e10dc776503">
72-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-cb9d85a9fcc9ddc7f26321b14e3584879058f34f.jar" />
57+
sha1="1821601ddbec5ff125653097812823388700af74">
58+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-73d6ff5090e4874e30026cbfd5a22de0f56f9ae2.jar" />
7359
</item>
7460
<item
75-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/classes.jar"
61+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.mxn.soul/flowingdrawer-core/1.0.0/jars/libs/nineoldandroids-2.4.0.jar"
7662
jumboMode="false"
7763
revision="22.0.1"
78-
sha1="f8efd0096475e0daf054267b61544e10dc776503">
79-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-cb9d85a9fcc9ddc7f26321b14e3584879058f34f.jar" />
64+
sha1="59f19e43354d32de831379c23ce03bb259a4c2b7">
65+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/nineoldandroids-2.4.0-cc336e91956270c748dd3dd7e042b7f635292e2b.jar" />
8066
</item>
8167
<item
82-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars/classes.jar"
68+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.mxn.soul/flowingdrawer-core/1.0.0/jars/classes.jar"
8369
jumboMode="false"
84-
revision="23.0.0 rc2"
85-
sha1="1821601ddbec5ff125653097812823388700af74">
86-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-73d6ff5090e4874e30026cbfd5a22de0f56f9ae2.jar" />
70+
revision="22.0.1"
71+
sha1="dfee50be1a82945db3e2bb6e13b9d02589055a8e">
72+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-11fc01975e9c3eca415bb742075186d4bc491036.jar" />
8773
</item>
8874
<item
89-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/cardview-v7/22.2.1/jars/classes.jar"
75+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.1/jars/classes.jar"
9076
jumboMode="false"
9177
revision="23.0.0 rc2"
92-
sha1="e1fa5e1123997a55e3ed65b44892993ff4b58cfe">
93-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-1f95ffe643364ee8a074896fc090056175e7b513.jar" />
78+
sha1="3abb4b88f5a8a0584a9b01d3170d7165f12f8588">
79+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-acab96953803076870e701b4bcf3cc151d2facda.jar" />
9480
</item>
9581
<item
9682
jar="/Users/cys/Public/androidADT/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar"
@@ -99,33 +85,47 @@
9985
sha1="61a0ff5c29295ec56d7e0bd3d25d95dbf71b4b2b">
10086
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/support-annotations-22.2.1-492dc43209f92cf8723dd153dc502657f31ddd50.jar" />
10187
</item>
88+
<item
89+
jar="/Users/cys/Public/androidADT/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar"
90+
jumboMode="false"
91+
revision="23.0.0 rc2"
92+
sha1="61a0ff5c29295ec56d7e0bd3d25d95dbf71b4b2b">
93+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/support-annotations-22.2.1-492dc43209f92cf8723dd153dc502657f31ddd50.jar" />
94+
</item>
10295
<item
10396
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.1/jars/classes.jar"
10497
jumboMode="false"
105-
revision="22.0.1"
98+
revision="23.0.0 rc2"
10699
sha1="4486e953d1f35f8ccab098b1dd67146366d5f731">
107100
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-7ff8e28472a7c85d696a7f8a846fca54a5542afb.jar" />
108101
</item>
109102
<item
110-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/design/22.2.1/jars/classes.jar"
103+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/libs/internal_impl-22.2.1.jar"
111104
jumboMode="false"
112-
revision="22.0.1"
113-
sha1="1821601ddbec5ff125653097812823388700af74">
114-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-73d6ff5090e4874e30026cbfd5a22de0f56f9ae2.jar" />
105+
revision="23.0.0 rc2"
106+
sha1="c471eaaba13ff64f6e0383d1c30a9cdc9a97efeb">
107+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/internal_impl-22.2.1-70103343af613170c1bd14dea6f11bc93d5a4f50.jar" />
115108
</item>
116109
<item
117-
jar="/Users/cys/Public/androidADT/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar"
110+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/classes.jar"
118111
jumboMode="false"
119112
revision="23.0.0 rc2"
120-
sha1="61a0ff5c29295ec56d7e0bd3d25d95dbf71b4b2b">
121-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/support-annotations-22.2.1-492dc43209f92cf8723dd153dc502657f31ddd50.jar" />
113+
sha1="f8efd0096475e0daf054267b61544e10dc776503">
114+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-cb9d85a9fcc9ddc7f26321b14e3584879058f34f.jar" />
122115
</item>
123116
<item
124-
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/22.2.1/jars/classes.jar"
117+
jar="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.1/jars/libs/internal_impl-22.2.1.jar"
125118
jumboMode="false"
126119
revision="22.0.1"
127-
sha1="3abb4b88f5a8a0584a9b01d3170d7165f12f8588">
128-
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/classes-acab96953803076870e701b4bcf3cc151d2facda.jar" />
120+
sha1="c471eaaba13ff64f6e0383d1c30a9cdc9a97efeb">
121+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/internal_impl-22.2.1-70103343af613170c1bd14dea6f11bc93d5a4f50.jar" />
122+
</item>
123+
<item
124+
jar="/Users/cys/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.0/7ff0e000d1e27e356567f56c92af3b8ab912636f/picasso-2.5.0.jar"
125+
jumboMode="false"
126+
revision="22.0.1"
127+
sha1="7ff0e000d1e27e356567f56c92af3b8ab912636f">
128+
<dex dex="/Users/cys/MyGithub/FlowingDrawer/app/build/intermediates/pre-dexed/debug/picasso-2.5.0-ed5e0e6ef9e4022aca0fd7a399dfbfa085a4f0ab.jar" />
129129
</item>
130130

131131
</items>

‎flowingdrawer-core/src/main/java/com/mxn/soul/flowingdrawer_core/FlowingView.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,18 @@ public boolean isStartAuto(float x) {
171171
}
172172

173173

174-
public void autoUpping(float x) {
174+
public void autoUpping(float x,int dx) {
175175
mStatus = Status.STATUS_SMOOTH_UP;
176176
isupping = true;
177177
final int w = getWidth();
178178
double per = (2 * x - w) / w;
179-
autoUppingX = (int) (0.25 * w * per + 0.75 * w);
180-
currentPointX = (int) (100 * per + w);
179+
if(dx>=0) {
180+
autoUppingX = (int) (0.25 * w * per + 0.75 * w);
181+
currentPointX = (int) (100 * per + w);
182+
}else{
183+
autoUppingX = w ;
184+
currentPointX = w + 100;
185+
}
181186
if(per > 0.8){
182187
if (showContent) {
183188
showContent = false;

‎flowingdrawer-core/src/main/java/com/mxn/soul/flowingdrawer_core/LeftDrawerLayout.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import android.support.v4.view.ViewCompat;
1010
import android.support.v4.widget.ViewDragHelper;
1111
import android.util.AttributeSet;
12+
import android.util.Log;
1213
import android.view.MotionEvent;
1314
import android.view.View;
1415
import android.view.ViewGroup;
@@ -111,7 +112,8 @@ public void onViewPositionChanged(View changedView, int left, int top, int dx, i
111112
changedView.setVisibility(offset == 0 ? View.INVISIBLE : View.VISIBLE);
112113
rightX = left + childWidth ;
113114
if (mFlowingView.isStartAuto(rightX)) {
114-
mFlowingView.autoUpping( rightX);
115+
Log.e("====",dx+"") ;
116+
mFlowingView.autoUpping( rightX,dx);
115117
if(rightX == 0 ) {
116118
mFlowingView.resetStatus() ;
117119
releasing = false;
@@ -283,7 +285,7 @@ protected LayoutParams generateLayoutParams(LayoutParams p) {
283285
protected void showShadow(float per ) {
284286
if(mBg == null){
285287
mBg = new ImageView(mContentView.getContext());
286-
mBg.setBackgroundColor(Color.argb(150, 25, 25, 25));
288+
mBg.setBackgroundColor(Color.argb(150, 20, 20, 20));
287289
ViewGroup.LayoutParams lp =
288290
new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
289291
mContentView.addView(mBg, lp);

0 commit comments

Comments
 (0)