update

zhy206517 · Jun 8, 2016 · a8a7b5f · a8a7b5f
1 parent a2dda41
commit a8a7b5f
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 24 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "me.tangke.slidemenusample"
         minSdkVersion 8
         targetSdkVersion 23
-        versionCode 10
-        versionName "1.2.0"
+        versionCode 11
+        versionName "1.2.1"
     }
     buildTypes {
         release {

diff --git a/slidemenu/build.gradle b/slidemenu/build.gradle
@@ -15,7 +15,7 @@ ext {
     siteUrl = 'http://github.com/TangKe/SlideMenu'
     gitUrl = 'http://github.com/TangKe/SlideMenu.git'
 
-    libraryVersion = '1.2.0'
+    libraryVersion = '1.2.1'
 
     developerId = 'tangke'
     developerName = 'Tang Ke'

diff --git a/slidemenu/src/main/java/me/tangke/slidemenu/SlideMenu.java b/slidemenu/src/main/java/me/tangke/slidemenu/SlideMenu.java
@@ -69,7 +69,7 @@ public class SlideMenu extends ViewGroup {
     private final static int POSITION_MIDDLE = 0;
     private final static int POSITION_RIGHT = 1;
     private int mCurrentContentPosition;
-    private int mCurrentState;
+    private int mCurrentState = STATE_CLOSE;
 
     private View mContent;
     private View mPrimaryMenu;
@@ -868,13 +868,8 @@ private void setCurrentOffset(int currentOffset) {
         final int slideDirectionFlag = mSlideDirectionFlag;
         final int currentContentOffset = mCurrentContentOffset = Math
                 .min((slideDirectionFlag & FLAG_DIRECTION_RIGHT) == FLAG_DIRECTION_RIGHT ?
-                                mContentBoundsRight
-                                : 0,
-                        Math.max(
-                                currentOffset,
-                                (slideDirectionFlag & FLAG_DIRECTION_LEFT) == FLAG_DIRECTION_LEFT
-                                        ? mContentBoundsLeft
-                                        : 0));
+                        mContentBoundsRight : 0, Math.max(currentOffset, (slideDirectionFlag &
+                        FLAG_DIRECTION_LEFT) == FLAG_DIRECTION_LEFT ? mContentBoundsLeft : 0));
         if (null != mSlideStateChangeListener) {
             float slideOffsetPercent = 0;
             if (0 < currentContentOffset) {