Skip to content

Commit 8c097e8

Browse files
Richie97Richie97
committed
1.1.9
1 parent 6079c81 commit 8c097e8

16 files changed

+2516
-1549
lines changed

‎library/pom.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.slidingmenu</groupId>
55
<artifactId>slidingmenu-lib</artifactId>
6-
<version>1.1.8</version>
6+
<version>1.1.9</version>
77
<name>Sliding Menu</name>
88
<packaging>apklib</packaging>
99

@@ -14,15 +14,15 @@
1414
</parent>
1515

1616
<properties>
17-
<android.platform.sdk>16</android.platform.sdk>
18-
<android.platform.version>4.1.1.4</android.platform.version>
17+
<android.platform.sdk>17</android.platform.sdk>
18+
<android.platform.version>4.2_r1</android.platform.version>
1919
</properties>
2020

2121
<dependencies>
2222
<dependency>
2323
<groupId>com.google.android</groupId>
2424
<artifactId>android</artifactId>
25-
<version>4.1.1.4</version>
25+
<version>4.2_r1</version>
2626
<scope>provided</scope>
2727
</dependency>
2828

@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>com.google.android</groupId>
4343
<artifactId>support-v4</artifactId>
44-
<version>r7</version>
44+
<version>11</version>
4545
</dependency>
4646

4747
<dependency>
@@ -51,13 +51,13 @@
5151
<type>apklib</type>
5252
</dependency>
5353

54-
<dependency>
55-
<groupId>com.actionbarsherlock</groupId>
56-
<artifactId>actionbarsherlock</artifactId>
57-
<version>4.2.0</version>
58-
<type>jar</type>
59-
<scope>provided</scope>
60-
</dependency>
54+
<!--<dependency>-->
55+
<!--<groupId>com.actionbarsherlock</groupId>-->
56+
<!--<artifactId>actionbarsherlock</artifactId>-->
57+
<!--<version>4.2.0</version>-->
58+
<!--<type>jar</type>-->
59+
<!--<scope>provided</scope>-->
60+
<!--</dependency>-->
6161

6262
</dependencies>
6363

‎library/project.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@
99

1010
android.library=true
1111
# Project target.
12-
target=android-16
12+
target=android-17
1313
android.library.reference.1=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0

‎library/res/values/attrs.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,16 @@
1717
<resources>
1818

1919
<declare-styleable name="SlidingMenu">
20+
<attr name="mode">
21+
<enum name="left" value="0" />
22+
<enum name="right" value="1" />
23+
</attr>
2024
<attr name="viewAbove" format="reference" />
2125
<attr name="viewBehind" format="reference" />
2226
<attr name="behindOffset" format="dimension" />
2327
<attr name="behindWidth" format="dimension" />
2428
<attr name="behindScrollScale" format="float" />
25-
<attr name="aboveTouchMode">
26-
<enum name="margin" value="0" />
27-
<enum name="fullscreen" value="1" />
28-
</attr>
29-
<attr name="behindTouchMode">
29+
<attr name="touchModeAbove">
3030
<enum name="margin" value="0" />
3131
<enum name="fullscreen" value="1" />
3232
</attr>

‎library/src/com/slidingmenu/lib/CanvasTranformerBuilder.java‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎library/src/com/slidingmenu/lib/CanvasTransformerBuilder.java‎

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
package com.slidingmenu.lib;
2+
3+
import android.graphics.Canvas;
4+
import android.view.animation.Interpolator;
5+
import com.slidingmenu.lib.SlidingMenu.CanvasTransformer;
6+
7+
public class CanvasTransformerBuilder {
8+
9+
private CanvasTransformer mTrans;
10+
11+
private static Interpolator lin = new Interpolator() {
12+
public float getInterpolation(float t) {
13+
return t;
14+
}
15+
};
16+
17+
private void initTransformer() {
18+
if (mTrans == null)
19+
mTrans = new CanvasTransformer() {
20+
public void transformCanvas(Canvas canvas, float percentOpen) { }
21+
};
22+
}
23+
24+
public CanvasTransformer zoom(final int openedX, final int closedX,
25+
final int openedY, final int closedY,
26+
final int px, final int py) {
27+
return zoom(openedX, closedX, openedY, closedY, px, py, lin);
28+
}
29+
30+
public CanvasTransformer zoom(final int openedX, final int closedX,
31+
final int openedY, final int closedY,
32+
final int px, final int py, final Interpolator interp) {
33+
initTransformer();
34+
mTrans = new CanvasTransformer() {
35+
public void transformCanvas(Canvas canvas, float percentOpen) {
36+
mTrans.transformCanvas(canvas, percentOpen);
37+
float f = interp.getInterpolation(percentOpen);
38+
canvas.scale((openedX - closedX) * f + closedX,
39+
(openedY - closedY) * f + closedY, px, py);
40+
}
41+
};
42+
return mTrans;
43+
}
44+
45+
public CanvasTransformer rotate(final int openedDeg, final int closedDeg,
46+
final int px, final int py) {
47+
return rotate(openedDeg, closedDeg, px, py, lin);
48+
}
49+
50+
public CanvasTransformer rotate(final int openedDeg, final int closedDeg,
51+
final int px, final int py, final Interpolator interp) {
52+
initTransformer();
53+
mTrans = new CanvasTransformer() {
54+
public void transformCanvas(Canvas canvas, float percentOpen) {
55+
mTrans.transformCanvas(canvas, percentOpen);
56+
float f = interp.getInterpolation(percentOpen);
57+
canvas.rotate((openedDeg - closedDeg) * f + closedDeg,
58+
px, py);
59+
}
60+
};
61+
return mTrans;
62+
}
63+
64+
public CanvasTransformer translate(final int openedX, final int closedX,
65+
final int openedY, final int closedY) {
66+
return translate(openedX, closedX, openedY, closedY, lin);
67+
}
68+
69+
public CanvasTransformer translate(final int openedX, final int closedX,
70+
final int openedY, final int closedY, final Interpolator interp) {
71+
initTransformer();
72+
mTrans = new CanvasTransformer() {
73+
public void transformCanvas(Canvas canvas, float percentOpen) {
74+
mTrans.transformCanvas(canvas, percentOpen);
75+
float f = interp.getInterpolation(percentOpen);
76+
canvas.translate((openedX - closedX) * f + closedX,
77+
(openedY - closedY) * f + closedY);
78+
}
79+
};
80+
return mTrans;
81+
}
82+
83+
public CanvasTransformer concatTransformer(final CanvasTransformer t) {
84+
initTransformer();
85+
mTrans = new CanvasTransformer() {
86+
public void transformCanvas(Canvas canvas, float percentOpen) {
87+
mTrans.transformCanvas(canvas, percentOpen);
88+
t.transformCanvas(canvas, percentOpen);
89+
}
90+
};
91+
return mTrans;
92+
}
93+
94+
}

0 commit comments

Comments
 (0)
⚡