From fb5042846be80f06d3b2b36e54e49c9825a53c26 Mon Sep 17 00:00:00 2001 From: liruqi Date: Tue, 19 Mar 2013 00:31:10 +0800 Subject: [PATCH 01/26] Enable menu toggle when sliding is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit mEnabled is used to check if mContent receives dragging events, shoud not be used to stop actions.  if mEnabled is checked in scrollTo(int,int) method, side menu can still be called out by SlidingMenu.showMenu(), but the menu would be blank. --- library/src/com/slidingmenu/lib/CustomViewAbove.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/library/src/com/slidingmenu/lib/CustomViewAbove.java b/library/src/com/slidingmenu/lib/CustomViewAbove.java index 1412f1b47..b62f780d8 100644 --- a/library/src/com/slidingmenu/lib/CustomViewAbove.java +++ b/library/src/com/slidingmenu/lib/CustomViewAbove.java @@ -803,8 +803,7 @@ private void determineDrag(MotionEvent ev) { public void scrollTo(int x, int y) { super.scrollTo(x, y); mScrollX = x; - if (mEnabled) - mViewBehind.scrollBehindTo(mContent, x, y); + mViewBehind.scrollBehindTo(mContent, x, y); ((SlidingMenu)getParent()).manageLayers(getPercentOpen()); } From 9b3d8c15c1b0fbd6b3e21b487d8d4f549cfc59f9 Mon Sep 17 00:00:00 2001 From: Jeremy Feinstein Date: Mon, 29 Apr 2013 11:36:31 -0300 Subject: [PATCH 02/26] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 95595c7c2..7849c8777 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,7 @@ to use it all you want in your Android apps provided that you cite this project SlidingMenu is currently used in some awesome Android apps. Here's a list of some of them: * [Foursquare][15] * [Rdio][8] +* [Evernote Food][18] * [Plume][4] * [VLC for Android][5] * [ESPN ScoreCenter][14] @@ -178,3 +179,4 @@ License [15]: https://play.google.com/store/apps/details?id=com.joelapenna.foursquared [16]: https://play.google.com/store/apps/details?id=com.mlssoccer [17]: https://play.google.com/store/apps/details?id=com.ninegag.android.app +[18]: https://play.google.com/store/apps/details?id=com.evernote.food From 37680e41a48239e1dfa6abf5e88c219f32d4ade8 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 6 May 2013 10:47:44 -0700 Subject: [PATCH 03/26] Reorganizing file structure, package names and import statements to new package name. --- README.md | 2 +- example/AndroidManifest.xml | 2 +- example/proguard/mapping.txt | 4 ++-- example/src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes .../slidingmenu/example/AttachExample.java | 0 .../slidingmenu/example/BaseActivity.java | 0 .../example/ExampleListActivity.java | 0 .../example/LeftAndRightActivity.java | 0 .../example/PropertiesActivity.java | 0 .../example/SampleListFragment.java | 0 .../slidingmenu/example/SlidingContent.java | 0 .../slidingmenu/example/SlidingTitleBar.java | 0 .../slidingmenu/example/Util.java | 0 .../example/ViewPagerActivity.java | 0 .../example/anim/CustomAnimation.java | 0 .../example/anim/CustomScaleAnimation.java | 0 .../example/anim/CustomSlideAnimation.java | 0 .../example/anim/CustomZoomAnimation.java | 0 .../example/fragments/BirdActivity.java | 0 .../example/fragments/BirdGridFragment.java | 0 .../example/fragments/BirdMenuFragment.java | 0 .../example/fragments/ColorFragment.java | 0 .../example/fragments/ColorMenuFragment.java | 0 .../fragments/FragmentChangeActivity.java | 0 .../fragments/ResponsiveUIActivity.java | 0 library-maps-support/pom.xml | 4 ++-- library-maps-support/src/main/.DS_Store | Bin 0 -> 6148 bytes .../main/java/com/jeremyfeinstein/.DS_Store | Bin 0 -> 6148 bytes .../lib/app/SlidingMapActivity.java | 22 +++++++++--------- library/AndroidManifest.xml | 2 +- library/pom.xml | 2 +- library/res/layout/slidingmenumain.xml | 2 +- library/src/main/java/com/.DS_Store | Bin 0 -> 6148 bytes .../lib/CanvasTransformerBuilder.java | 4 ++-- .../slidingmenu/lib/CustomViewAbove.java | 10 ++++---- .../slidingmenu/lib/CustomViewBehind.java | 4 ++-- .../slidingmenu/lib/MenuInterface.java | 2 +- .../slidingmenu/lib/SlidingMenu.java | 4 ++-- .../slidingmenu/lib/app/SlidingActivity.java | 22 +++++++++--------- .../lib/app/SlidingActivityBase.java | 4 ++-- .../lib/app/SlidingActivityHelper.java | 6 ++--- .../lib/app/SlidingFragmentActivity.java | 22 +++++++++--------- .../lib/app/SlidingListActivity.java | 22 +++++++++--------- .../lib/app/SlidingPreferenceActivity.java | 22 +++++++++--------- pom.xml | 2 +- 45 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 example/src/main/java/com/.DS_Store rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/AttachExample.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/BaseActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/ExampleListActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/LeftAndRightActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/PropertiesActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/SampleListFragment.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/SlidingContent.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/SlidingTitleBar.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/Util.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/ViewPagerActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/anim/CustomAnimation.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/anim/CustomScaleAnimation.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/anim/CustomSlideAnimation.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/anim/CustomZoomAnimation.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/BirdActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/BirdGridFragment.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/BirdMenuFragment.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/ColorFragment.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/ColorMenuFragment.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/FragmentChangeActivity.java (100%) rename example/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/example/fragments/ResponsiveUIActivity.java (100%) create mode 100644 library-maps-support/src/main/.DS_Store create mode 100644 library-maps-support/src/main/java/com/jeremyfeinstein/.DS_Store rename library-maps-support/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingMapActivity.java (76%) create mode 100644 library/src/main/java/com/.DS_Store rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/CanvasTransformerBuilder.java (96%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/CustomViewAbove.java (99%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/CustomViewBehind.java (99%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/MenuInterface.java (96%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/SlidingMenu.java (99%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingActivity.java (79%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingActivityBase.java (96%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingActivityHelper.java (98%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingFragmentActivity.java (77%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingListActivity.java (79%) rename library/src/{com => main/java/com/jeremyfeinstein}/slidingmenu/lib/app/SlidingPreferenceActivity.java (79%) diff --git a/README.md b/README.md index 7849c8777..b80b6a5bc 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ XML Usage ----- If you decide to use SlidingMenu as a view, you can define it in your xml layouts like this: ```xml - diff --git a/example/proguard/mapping.txt b/example/proguard/mapping.txt index 8709ab8f0..0e8fa09c5 100644 --- a/example/proguard/mapping.txt +++ b/example/proguard/mapping.txt @@ -5469,13 +5469,13 @@ com.crittercism.app.CrittercismNDK -> com.crittercism.app.CrittercismNDK: boolean checkLibraryVersion(int) -> checkLibraryVersion void installNdkLib(android.content.Context,java.lang.String) -> installNdkLib boolean installLib(android.content.Context) -> installLib -com.slidingmenu.example.BaseActivity -> com.slidingmenu.example.BaseActivity: +com.jeremyfeinstein.slidingmenu.example.BaseActivity -> com.jeremyfeinstein.slidingmenu.example.BaseActivity: int mTitleRes -> b android.support.v4.app.ListFragment mFrag -> a void onCreate(android.os.Bundle) -> onCreate boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem) -> onOptionsItemSelected boolean onCreateOptionsMenu(com.actionbarsherlock.view.Menu) -> onCreateOptionsMenu -com.slidingmenu.example.ExampleListActivity -> com.slidingmenu.example.ExampleListActivity: +com.jeremyfeinstein.slidingmenu.example.ExampleListActivity -> com.jeremyfeinstein.slidingmenu.example.ExampleListActivity: void onCreate(android.os.Bundle) -> onCreate boolean onPreferenceTreeClick(android.preference.PreferenceScreen,android.preference.Preference) -> onPreferenceTreeClick boolean onOptionsItemSelected(com.actionbarsherlock.view.MenuItem) -> onOptionsItemSelected diff --git a/example/src/main/java/com/.DS_Store b/example/src/main/java/com/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0jar - com.slidingmenu + com.jeremyfeinstein.slidingmenu parent 1.3-SNAPSHOT ../pom.xml @@ -16,7 +16,7 @@ - com.slidingmenu + com.jeremyfeinstein.slidingmenu slidingmenu true diff --git a/library-maps-support/src/main/.DS_Store b/library-maps-support/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 diff --git a/library/pom.xml b/library/pom.xml index f45f7e009..9b531c805 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -8,7 +8,7 @@ apklib - com.slidingmenu + com.jeremyfeinstein.slidingmenu parent 1.3-SNAPSHOT ../pom.xml diff --git a/library/res/layout/slidingmenumain.xml b/library/res/layout/slidingmenumain.xml index babd82b8e..5cdbbf538 100644 --- a/library/res/layout/slidingmenumain.xml +++ b/library/res/layout/slidingmenumain.xml @@ -1,5 +1,5 @@ - \ No newline at end of file diff --git a/library/src/main/java/com/.DS_Store b/library/src/main/java/com/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 4.0.0 - com.slidingmenu + com.jeremyfeinstein.slidingmenu parent 1.3-SNAPSHOT pom From f499edc05c6e18ca8f9a5e12727301f7df6f9f77 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 6 May 2013 10:48:47 -0700 Subject: [PATCH 04/26] Removing old DS_Store --- example/src/main/java/com/.DS_Store | Bin 6148 -> 0 bytes library-maps-support/src/main/.DS_Store | Bin 6148 -> 0 bytes .../src/main/java/com/jeremyfeinstein/.DS_Store | Bin 6148 -> 0 bytes library/src/main/java/com/.DS_Store | Bin 6148 -> 0 bytes 4 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 example/src/main/java/com/.DS_Store delete mode 100644 library-maps-support/src/main/.DS_Store delete mode 100644 library-maps-support/src/main/java/com/jeremyfeinstein/.DS_Store delete mode 100644 library/src/main/java/com/.DS_Store diff --git a/example/src/main/java/com/.DS_Store b/example/src/main/java/com/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Mon, 6 May 2013 10:49:18 -0700 Subject: [PATCH 05/26] Adding .DS_Store to ignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a53b9a471..51fe2c854 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ gen .metadata/ .metadata *.project +.DS_Store \ No newline at end of file From 6989cdbfb08f50be6dace745038c40fa812465e4 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 6 May 2013 11:12:53 -0700 Subject: [PATCH 06/26] Updating import statements in the example project --- example/res/layout/menu.xml | 2 +- .../slidingmenu/example/AttachExample.java | 4 ++-- .../slidingmenu/example/BaseActivity.java | 6 +++--- .../example/ExampleListActivity.java | 12 ++++++------ .../example/LeftAndRightActivity.java | 10 +++++----- .../example/PropertiesActivity.java | 4 ++-- .../example/SampleListFragment.java | 2 +- .../slidingmenu/example/SlidingContent.java | 2 +- .../slidingmenu/example/SlidingTitleBar.java | 2 +- .../slidingmenu/example/Util.java | 2 +- .../slidingmenu/example/ViewPagerActivity.java | 6 +++--- .../example/anim/CustomAnimation.java | 18 +++++++++--------- .../example/anim/CustomScaleAnimation.java | 8 ++++---- .../example/anim/CustomSlideAnimation.java | 8 ++++---- .../example/anim/CustomZoomAnimation.java | 8 ++++---- .../example/fragments/BirdActivity.java | 4 ++-- .../example/fragments/BirdGridFragment.java | 4 ++-- .../example/fragments/BirdMenuFragment.java | 4 ++-- .../example/fragments/ColorFragment.java | 4 ++-- .../example/fragments/ColorMenuFragment.java | 4 ++-- .../fragments/FragmentChangeActivity.java | 8 ++++---- .../fragments/ResponsiveUIActivity.java | 8 ++++---- pom.xml | 2 +- 23 files changed, 66 insertions(+), 66 deletions(-) diff --git a/example/res/layout/menu.xml b/example/res/layout/menu.xml index 2cee36a8e..58d1c2959 100644 --- a/example/res/layout/menu.xml +++ b/example/res/layout/menu.xml @@ -1,6 +1,6 @@ diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java index 6bb62464c..a95ebd191 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java @@ -1,9 +1,9 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.os.Bundle; import android.support.v4.app.FragmentActivity; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class AttachExample extends FragmentActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java index 4e1f7c47a..cdc07a887 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import java.util.ArrayList; import java.util.List; @@ -13,8 +13,8 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; -import com.slidingmenu.lib.SlidingMenu; -import com.slidingmenu.lib.app.SlidingFragmentActivity; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.app.SlidingFragmentActivity; public class BaseActivity extends SlidingFragmentActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java index 46e962bbb..f5eeb147a 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import java.net.URLEncoder; @@ -22,11 +22,11 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; import com.crittercism.app.Crittercism; -import com.slidingmenu.example.anim.CustomScaleAnimation; -import com.slidingmenu.example.anim.CustomSlideAnimation; -import com.slidingmenu.example.anim.CustomZoomAnimation; -import com.slidingmenu.example.fragments.FragmentChangeActivity; -import com.slidingmenu.example.fragments.ResponsiveUIActivity; +import com.jeremyfeinstein.slidingmenu.example.anim.CustomScaleAnimation; +import com.jeremyfeinstein.slidingmenu.example.anim.CustomSlideAnimation; +import com.jeremyfeinstein.slidingmenu.example.anim.CustomZoomAnimation; +import com.jeremyfeinstein.slidingmenu.example.fragments.FragmentChangeActivity; +import com.jeremyfeinstein.slidingmenu.example.fragments.ResponsiveUIActivity; public class ExampleListActivity extends SherlockPreferenceActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java index 740d17f0b..41f1d4b93 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java @@ -1,14 +1,14 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.os.Bundle; import android.view.KeyEvent; import android.view.View; import android.view.ViewGroup; -import com.slidingmenu.example.fragments.ColorFragment; -import com.slidingmenu.lib.SlidingMenu; -import com.slidingmenu.lib.SlidingMenu.OnClosedListener; -import com.slidingmenu.lib.SlidingMenu.OnOpenedListener; +import com.jeremyfeinstein.slidingmenu.example.fragments.ColorFragment; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnClosedListener; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnOpenedListener; public class LeftAndRightActivity extends BaseActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java index 2e59dfaeb..2437962f5 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.os.Bundle; import android.view.View; @@ -11,7 +11,7 @@ import android.widget.SeekBar; import android.widget.SeekBar.OnSeekBarChangeListener; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class PropertiesActivity extends BaseActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java index 06ee67121..afa0bb26d 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.content.Context; import android.os.Bundle; diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java index 7593860c5..d2e8f955a 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.os.Bundle; diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java index 46a4908f2..0f1281a90 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.os.Bundle; import android.support.v4.view.ViewPager; diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java index 40b37816f..f94327d46 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import android.content.Context; import android.content.Intent; diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java index 0efd864ce..a54126226 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example; +package com.jeremyfeinstein.slidingmenu.example; import java.util.ArrayList; @@ -9,8 +9,8 @@ import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager.OnPageChangeListener; -import com.slidingmenu.example.fragments.ColorFragment; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.example.fragments.ColorFragment; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class ViewPagerActivity extends BaseActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java index 267a8362e..d6cc00e58 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java @@ -1,16 +1,16 @@ -package com.slidingmenu.example.anim; +package com.jeremyfeinstein.slidingmenu.example.anim; import android.os.Bundle; import android.view.Menu; -import com.slidingmenu.example.BaseActivity; -import com.slidingmenu.example.R; -import com.slidingmenu.example.SampleListFragment; -import com.slidingmenu.example.R.id; -import com.slidingmenu.example.R.layout; -import com.slidingmenu.example.R.menu; -import com.slidingmenu.lib.SlidingMenu; -import com.slidingmenu.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.example.BaseActivity; +import com.jeremyfeinstein.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.SampleListFragment; +import com.jeremyfeinstein.slidingmenu.example.R.id; +import com.jeremyfeinstein.slidingmenu.example.R.layout; +import com.jeremyfeinstein.slidingmenu.example.R.menu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public abstract class CustomAnimation extends BaseActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java index 7eaba9071..0ec4f866e 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java @@ -1,10 +1,10 @@ -package com.slidingmenu.example.anim; +package com.jeremyfeinstein.slidingmenu.example.anim; import android.graphics.Canvas; -import com.slidingmenu.example.R; -import com.slidingmenu.example.R.string; -import com.slidingmenu.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R.string; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public class CustomScaleAnimation extends CustomAnimation { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java index 5ae9bacf3..6a99d0d07 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java @@ -1,11 +1,11 @@ -package com.slidingmenu.example.anim; +package com.jeremyfeinstein.slidingmenu.example.anim; import android.graphics.Canvas; import android.view.animation.Interpolator; -import com.slidingmenu.example.R; -import com.slidingmenu.example.R.string; -import com.slidingmenu.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R.string; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public class CustomSlideAnimation extends CustomAnimation { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java index d1374ad39..acb8f4aeb 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java @@ -1,10 +1,10 @@ -package com.slidingmenu.example.anim; +package com.jeremyfeinstein.slidingmenu.example.anim; import android.graphics.Canvas; -import com.slidingmenu.example.R; -import com.slidingmenu.example.R.string; -import com.slidingmenu.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R.string; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public class CustomZoomAnimation extends CustomAnimation { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java index fcb261bfa..42c50004c 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; import android.app.Activity; import android.content.Intent; @@ -15,7 +15,7 @@ import com.actionbarsherlock.app.SherlockActivity; import com.actionbarsherlock.view.MenuItem; -import com.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R; public class BirdActivity extends SherlockActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java index fb2ed5335..5bae2897f 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; import android.content.res.TypedArray; import android.os.Bundle; @@ -12,7 +12,7 @@ import android.widget.GridView; import android.widget.ImageView; -import com.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R; public class BirdGridFragment extends Fragment { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java index 9dfe54217..c06db6196 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -9,7 +9,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; -import com.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R; public class BirdMenuFragment extends ListFragment { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java index d3207001a..6040ca86c 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java @@ -1,6 +1,6 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; -import com.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R; import android.os.Bundle; import android.support.v4.app.Fragment; diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java index 7e884637a..731218b49 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -9,7 +9,7 @@ import android.widget.ArrayAdapter; import android.widget.ListView; -import com.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.example.R; public class ColorMenuFragment extends ListFragment { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java index cafedf4b3..4947cbdea 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java @@ -1,11 +1,11 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; import android.os.Bundle; import android.support.v4.app.Fragment; -import com.slidingmenu.example.BaseActivity; -import com.slidingmenu.example.R; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.example.BaseActivity; +import com.jeremyfeinstein.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class FragmentChangeActivity extends BaseActivity { diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java index b89f94207..8e622c41c 100644 --- a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java +++ b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.example.fragments; +package com.jeremyfeinstein.slidingmenu.example.fragments; import android.app.AlertDialog; import android.content.Intent; @@ -8,9 +8,9 @@ import android.view.View; import com.actionbarsherlock.view.MenuItem; -import com.slidingmenu.example.R; -import com.slidingmenu.lib.SlidingMenu; -import com.slidingmenu.lib.app.SlidingFragmentActivity; +import com.jeremyfeinstein.slidingmenu.example.R; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.app.SlidingFragmentActivity; /** * This activity is an example of a responsive Android UI. diff --git a/pom.xml b/pom.xml index 4326adcb0..2c7e43dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - com.slidingmenu + com.jeremyfeinstein.slidingmenu slidingmenu ${project.version} jar From 76f0e35f64951d5790c170bb383213e066fcb211 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 6 May 2013 11:18:59 -0700 Subject: [PATCH 07/26] Moving to a proper maven source directory --- library/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/library/pom.xml b/library/pom.xml index 9b531c805..687383765 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -26,7 +26,6 @@ - src From 56576af37d73e3e4bee14f3a5f33a8cb5b184f96 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 6 May 2013 11:21:19 -0700 Subject: [PATCH 08/26] Fixing erroneous imports --- .../lib/CanvasTransformerBuilder.java | 4 ++-- .../slidingmenu/lib/CustomViewAbove.java | 10 ++++----- .../slidingmenu/lib/SlidingMenu.java | 2 +- .../slidingmenu/lib/app/SlidingActivity.java | 22 +++++++++---------- .../lib/app/SlidingActivityBase.java | 4 ++-- .../lib/app/SlidingActivityHelper.java | 6 ++--- .../lib/app/SlidingListActivity.java | 22 +++++++++---------- .../lib/app/SlidingPreferenceActivity.java | 22 +++++++++---------- 8 files changed, 46 insertions(+), 46 deletions(-) diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java index 64b9d6cef..e17ca04a2 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java @@ -1,9 +1,9 @@ -package com.jeremyfeinstein.lib; +package com.jeremyfeinstein.slidingmenu.lib; import android.graphics.Canvas; import android.view.animation.Interpolator; -import com.jeremyfeinstein.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public class CanvasTransformerBuilder { diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java index 61ba217a5..42b2973d2 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java @@ -1,4 +1,4 @@ -package com.jeremyfeinstein.lib; +package com.jeremyfeinstein.slidingmenu.lib; import java.util.ArrayList; import java.util.List; @@ -26,10 +26,10 @@ import android.view.animation.Interpolator; import android.widget.Scroller; -import com.jeremyfeinstein.lib.SlidingMenu.OnClosedListener; -import com.jeremyfeinstein.lib.SlidingMenu.OnOpenedListener; -//import com.jeremyfeinstein.lib.SlidingMenu.OnCloseListener; -//import com.jeremyfeinstein.lib.SlidingMenu.OnOpenListener; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnClosedListener; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnOpenedListener; +//import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnCloseListener; +//import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.OnOpenListener; public class CustomViewAbove extends ViewGroup { diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index 440c616fe..b1b3322d7 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java @@ -1,4 +1,4 @@ -package com.jeremyfeinstein.lib; +package com.jeremyfeinstein.slidingmenu.lib; import java.lang.reflect.Method; diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java index 9d31c1235..a47114d6f 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java @@ -1,4 +1,4 @@ -package com.jeremyfeinstein.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.app.Activity; import android.os.Bundle; @@ -6,7 +6,7 @@ import android.view.View; import android.view.ViewGroup.LayoutParams; -import com.jeremyfeinstein.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class SlidingActivity extends Activity implements SlidingActivityBase { @@ -77,63 +77,63 @@ public void setContentView(View v, LayoutParams params) { } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(int) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) */ public void setBehindContentView(int id) { setBehindContentView(getLayoutInflater().inflate(id, null)); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) */ public void setBehindContentView(View v) { setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) */ public void setBehindContentView(View v, LayoutParams params) { mHelper.setBehindContentView(v, params); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showBehind() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showBehind() */ public void showMenu() { mHelper.showMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) */ public void setSlidingActionBarEnabled(boolean b) { mHelper.setSlidingActionBarEnabled(b); diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java index 1c65d9fbb..7bff1f2a2 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java @@ -1,9 +1,9 @@ -package com.jeremyfeinstein.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.view.View; import android.view.ViewGroup.LayoutParams; -import com.jeremyfeinstein.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public interface SlidingActivityBase { diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java index 24f8088ab..0cf954bce 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java @@ -1,4 +1,4 @@ -package com.jeremyfeinstein.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.app.Activity; import android.os.Bundle; @@ -8,8 +8,8 @@ import android.view.View; import android.view.ViewGroup.LayoutParams; -import com.jeremyfeinstein.lib.R; -import com.jeremyfeinstein.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.R; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class SlidingActivityHelper { diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java index 94381e284..d28128db2 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java @@ -1,4 +1,4 @@ -package com.jeremyfeinstein.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.app.ListActivity; import android.os.Bundle; @@ -7,7 +7,7 @@ import android.view.ViewGroup.LayoutParams; import android.widget.ListView; -import com.jeremyfeinstein.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class SlidingListActivity extends ListActivity implements SlidingActivityBase { @@ -81,49 +81,49 @@ public void setContentView(View v, LayoutParams params) { } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(int) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) */ public void setBehindContentView(int id) { setBehindContentView(getLayoutInflater().inflate(id, null)); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) */ public void setBehindContentView(View v) { setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) */ public void setBehindContentView(View v, LayoutParams params) { mHelper.setBehindContentView(v, params); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showBehind() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showBehind() */ public void showMenu() { mHelper.showMenu(); @@ -131,14 +131,14 @@ public void showMenu() { /* * (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) */ public void setSlidingActionBarEnabled(boolean b) { mHelper.setSlidingActionBarEnabled(b); diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java index 67eb2c0f7..2f5b375ad 100644 --- a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java +++ b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java @@ -1,6 +1,6 @@ -package com.jeremyfeinstein.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; -import com.jeremyfeinstein.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; import android.os.Bundle; import android.preference.PreferenceActivity; @@ -77,63 +77,63 @@ public void setContentView(View v, LayoutParams params) { } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(int) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int) */ public void setBehindContentView(int id) { setBehindContentView(getLayoutInflater().inflate(id, null)); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View) */ public void setBehindContentView(View v) { setBehindContentView(v, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT)); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(android.view.View, android.view.ViewGroup.LayoutParams) */ public void setBehindContentView(View v, LayoutParams params) { mHelper.setBehindContentView(v, params); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showBehind() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showBehind() */ public void showMenu() { mHelper.showMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean) */ public void setSlidingActionBarEnabled(boolean b) { mHelper.setSlidingActionBarEnabled(b); From ca7b84bb460455bae44763871ae0bf386500f828 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 6 May 2013 11:26:24 -0700 Subject: [PATCH 09/26] Do not commit target directory --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 51fe2c854..0230c3e37 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,5 @@ gen .metadata/ .metadata *.project -.DS_Store \ No newline at end of file +.DS_Store +target/ \ No newline at end of file From c6cc3cfede1e9eb459a550b5f387d7e7362cca59 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Tue, 7 May 2013 13:44:13 -0700 Subject: [PATCH 10/26] Reverting maven standard directory layout --- .../jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java | 0 library/pom.xml | 1 + .../slidingmenu/lib/CanvasTransformerBuilder.java | 0 .../com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java | 0 .../com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java | 0 .../com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java | 0 .../com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java | 0 .../com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java | 0 .../jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java | 0 .../slidingmenu/lib/app/SlidingActivityHelper.java | 0 .../slidingmenu/lib/app/SlidingFragmentActivity.java | 0 .../jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java | 0 .../slidingmenu/lib/app/SlidingPreferenceActivity.java | 0 13 files changed, 1 insertion(+) rename library-maps-support/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java (100%) rename library/src/{main/java => }/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java (100%) diff --git a/library-maps-support/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java b/library-maps-support/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java similarity index 100% rename from library-maps-support/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java rename to library-maps-support/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java diff --git a/library/pom.xml b/library/pom.xml index 687383765..081bbc74b 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -26,6 +26,7 @@ + src diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java diff --git a/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java similarity index 100% rename from library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java From ee8a1d06462aee9f742c34d5b3d8f189c4c16cf7 Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 13 May 2013 11:19:03 -0700 Subject: [PATCH 11/26] Including reguired POM attributes for project for Maven Central push. --- pom.xml | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2c7e43dd8..34d5ce3ec 100644 --- a/pom.xml +++ b/pom.xml @@ -3,16 +3,48 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0%20http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 + com.jeremyfeinstein.slidingmenu parent - 1.3-SNAPSHOT pom + 1.3-SNAPSHOT + + SlidingMenu (Parent) + SlidingMenu is an Open Source Android library that allows developers to easily create applications with sliding menus like those made popular in the Google+, YouTube, and Facebook apps. + https://github.com/jfeinstein10/SlidingMenu + 2012 library library-maps-support + + https://github.com/jfeinstein10/SlidingMenu + scm:git:git://github.com/jfeinstein10/SlidingMenu.git + + + + + Jeremy Feinstein + jfeinstein10@gmail.com + jfeinstein10 + http://jeremyfeinstein.com + -5 + + developer + + + + + + + Apache License Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + From f328bc98a54d3457db369e631d8c6e1374ef863e Mon Sep 17 00:00:00 2001 From: Donn Felker Date: Mon, 13 May 2013 11:36:40 -0700 Subject: [PATCH 12/26] Adding parent and additional DeveloperConnection to fufill requirements for Maven Central deployment through sonatype OSS --- pom.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 34d5ce3ec..77d753fbc 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,13 @@ - - + 4.0.0 + + org.sonatype.oss + oss-parent + 7 + + com.jeremyfeinstein.slidingmenu parent pom @@ -22,6 +26,7 @@ https://github.com/jfeinstein10/SlidingMenu scm:git:git://github.com/jfeinstein10/SlidingMenu.git + scm:git:git@github.com:jfeinstein10/SlidingMenu.git From cfe65fbe5ee231e454c1d50b4fb1c6b4013dedba Mon Sep 17 00:00:00 2001 From: michaelcspeed Date: Wed, 15 May 2013 12:06:41 +0200 Subject: [PATCH 13/26] Update README.md Spelling error. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b80b6a5bc..fc127626e 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ customize the SlidingMenu to your liking. * If you want to use another library such as ActionBarSherlock, you can just change the SlidingActivities to extend the SherlockActivities instead of the regular Activities. -__3.__ You can use the SlidingMenu view directly in your xml layouts or programmatically in you Java code. +__3.__ You can use the SlidingMenu view directly in your xml layouts or programmatically in your Java code. * This way, you can treat SlidingMenu as you would any other view type and put it in crazy awesome places like in the rows of a ListView. * So. Many. Possibilities. From fe85a1844b26266c055bddcb7a1214d3564b0cce Mon Sep 17 00:00:00 2001 From: Jeremy Feinstein Date: Tue, 21 May 2013 18:00:38 -0400 Subject: [PATCH 14/26] IDEA files. Moving example package back to root like the library --- .idea/.name | 1 + .idea/compiler.xml | 23 ++ .idea/copyright/profiles_settings.xml | 5 + .idea/encodings.xml | 5 + .idea/misc.xml | 40 ++ .idea/modules.xml | 10 + .idea/scopes/scope_settings.xml | 5 + .idea/vcs.xml | 7 + .idea/workspace.xml | 342 ++++++++++++++++++ example/example.iml | 18 + .../slidingmenu/example/AttachExample.java | 0 .../slidingmenu/example/BaseActivity.java | 0 .../example/ExampleListActivity.java | 0 .../example/LeftAndRightActivity.java | 0 .../example/PropertiesActivity.java | 0 .../example/SampleListFragment.java | 0 .../slidingmenu/example/SlidingContent.java | 0 .../slidingmenu/example/SlidingTitleBar.java | 0 .../slidingmenu/example/Util.java | 0 .../example/ViewPagerActivity.java | 0 .../example/anim/CustomAnimation.java | 0 .../example/anim/CustomScaleAnimation.java | 0 .../example/anim/CustomSlideAnimation.java | 0 .../example/anim/CustomZoomAnimation.java | 0 .../example/fragments/BirdActivity.java | 0 .../example/fragments/BirdGridFragment.java | 0 .../example/fragments/BirdMenuFragment.java | 0 .../example/fragments/ColorFragment.java | 0 .../example/fragments/ColorMenuFragment.java | 0 .../fragments/FragmentChangeActivity.java | 0 .../fragments/ResponsiveUIActivity.java | 0 library/library.iml | 19 + 32 files changed, 475 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scopes/scope_settings.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 example/example.iml rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/AttachExample.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/Util.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java (100%) rename example/src/{main/java => }/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java (100%) create mode 100644 library/library.iml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 000000000..9e11ee12a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +SM \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 000000000..217af471a --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000..3572571ad --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..e206d70d8 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..612ec5998 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + 1.6 + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..f302608f9 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 000000000..922003b84 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..def6a6a18 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 000000000..1227bb141 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,342 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + localhost + 5050 + + + + + + + 1369173446296 + 1369173446296 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/example.iml b/example/example.iml new file mode 100644 index 000000000..24b793878 --- /dev/null +++ b/example/example.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java b/example/src/com/jeremyfeinstein/slidingmenu/example/AttachExample.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/AttachExample.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java b/example/src/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java b/example/src/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java b/example/src/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java b/example/src/com/jeremyfeinstein/slidingmenu/example/Util.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/Util.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java b/example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java b/example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java b/example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java b/example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java diff --git a/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java b/example/src/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java similarity index 100% rename from example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java rename to example/src/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java diff --git a/library/library.iml b/library/library.iml new file mode 100644 index 000000000..a6e3c8f47 --- /dev/null +++ b/library/library.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + From b0556d1fb4a12a3a7d324f1f01b1ca21e8047949 Mon Sep 17 00:00:00 2001 From: Jeremy Feinstein Date: Tue, 21 May 2013 18:03:15 -0400 Subject: [PATCH 15/26] Remove idea folder --- .gitignore | 4 +- .idea/.name | 1 - .idea/compiler.xml | 23 -- .idea/copyright/profiles_settings.xml | 5 - .idea/encodings.xml | 5 - .idea/misc.xml | 40 --- .idea/modules.xml | 10 - .idea/scopes/scope_settings.xml | 5 - .idea/vcs.xml | 7 - .idea/workspace.xml | 342 -------------------------- 10 files changed, 3 insertions(+), 439 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/scopes/scope_settings.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore index 0230c3e37..ba1f202bc 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,8 @@ release gen .metadata/ .metadata +.idea/ +.idea *.project .DS_Store -target/ \ No newline at end of file +target/ diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 9e11ee12a..000000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SM \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af471a..000000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 3572571ad..000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70d8..000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 612ec5998..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - 1.6 - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f302608f9..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b84..000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index def6a6a18..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 1227bb141..000000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,342 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - - - - - - 1369173446296 - 1369173446296 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From dd1f2de5685718b8326f4562ae94da3c953db073 Mon Sep 17 00:00:00 2001 From: John Weyrauch Date: Wed, 26 Jun 2013 16:29:16 -0700 Subject: [PATCH 16/26] Add a build.gradle for gradle module --- library/build.gradle | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 library/build.gradle diff --git a/library/build.gradle b/library/build.gradle new file mode 100644 index 000000000..24ee8e33c --- /dev/null +++ b/library/build.gradle @@ -0,0 +1,37 @@ +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.4' + } +} +apply plugin: 'android-library' + +dependencies { + compile 'com.android.support:support-v4:13.0.0' +} + +android { + compileSdkVersion 17 + buildToolsVersion "17.0.0" + + defaultConfig { + minSdkVersion 7 + targetSdkVersion 16 + } + + sourceSets { + main { + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + + manifest.srcFile 'AndroidManifest.xml' + } + } + +} From bd701c6e3fbf26a9d5fbd4619301cc05e0d09caf Mon Sep 17 00:00:00 2001 From: John Weyrauch Date: Wed, 26 Jun 2013 19:11:51 -0700 Subject: [PATCH 17/26] Use auto updatable android gradle Declares dependency as: com.android.tools.build:gradle:0.4.+ https://plus.google.com/u/0/108967384991768947849/posts/ZWoLfsto98s --- library/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 24ee8e33c..e2a5bf978 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.4' + classpath 'com.android.tools.build:gradle:0.4.+' } } apply plugin: 'android-library' From 9402c1ac96200c2602253f9dfe6b390bda1aeab8 Mon Sep 17 00:00:00 2001 From: Maruti Borker Date: Fri, 19 Jul 2013 00:06:42 +0530 Subject: [PATCH 18/26] Adding OnOpenListner for Secondary Menu --- .../slidingmenu/lib/SlidingMenu.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index b1b3322d7..849f2d66b 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java @@ -69,6 +69,8 @@ public class SlidingMenu extends RelativeLayout { private CustomViewBehind mViewBehind; private OnOpenListener mOpenListener; + + private OnOpenListener mSecondaryOpenListner; private OnCloseListener mCloseListener; @@ -212,6 +214,7 @@ public SlidingMenu(Context context, AttributeSet attrs, int defStyle) { mViewAbove.setOnPageChangeListener(new OnPageChangeListener() { public static final int POSITION_OPEN = 0; public static final int POSITION_CLOSE = 1; + public static final int POSITION_SECONDARY_OPEN = 2; public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { } @@ -221,6 +224,8 @@ public void onPageSelected(int position) { mOpenListener.onOpen(); } else if (position == POSITION_CLOSE && mCloseListener != null) { mCloseListener.onClose(); + } else if (position == POSITION_SECONDARY_OPEN && mSecondaryOpenListner != null ) { + mSecondaryOpenListner.onOpen(); } } }); @@ -878,8 +883,19 @@ public void setOnOpenListener(OnOpenListener listener) { mOpenListener = listener; } + + /** + * Sets the OnOpenListner for secondary menu {@link OnOpenListener#onOpen() OnOpenListener.onOpen()} will be called when the secondary SlidingMenu is opened + * + * @param listener the new OnOpenListener + */ + + public void setSecondaryOnOpenListner(OnOpenListener listener) { + mSecondaryOpenListner = listener; + } + /** - * Sets the OnCloseListener. {@link OnCloseListener#onClose() OnCloseListener.onClose()} will be called when the SlidingMenu is closed + * Sets the OnCloseListener. {@link OnCloseListener#onClose() OnCloseListener.onClose()} will be called when nay one of the SlidingMenu is closed * * @param listener the new setOnCloseListener */ @@ -1005,4 +1021,4 @@ public void run() { } } -} \ No newline at end of file +} From eefb9ed8dbf6b030ea788366051166f0b6482a4f Mon Sep 17 00:00:00 2001 From: Maruti Borker Date: Fri, 19 Jul 2013 00:08:38 +0530 Subject: [PATCH 19/26] Fixing Spelling mistake --- .../src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index 849f2d66b..b4483635f 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java @@ -895,7 +895,7 @@ public void setSecondaryOnOpenListner(OnOpenListener listener) { } /** - * Sets the OnCloseListener. {@link OnCloseListener#onClose() OnCloseListener.onClose()} will be called when nay one of the SlidingMenu is closed + * Sets the OnCloseListener. {@link OnCloseListener#onClose() OnCloseListener.onClose()} will be called when any one of the SlidingMenu is closed * * @param listener the new setOnCloseListener */ From e688477bba4cc945076d3f7438d64883f3148002 Mon Sep 17 00:00:00 2001 From: David Carver Date: Sat, 20 Jul 2013 10:33:06 -0400 Subject: [PATCH 20/26] Update to android-maven-plugin 3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 77d753fbc..8b0df6036 100644 --- a/pom.xml +++ b/pom.xml @@ -82,7 +82,7 @@ com.jayway.maven.plugins.android.generation2 android-maven-plugin - 3.5.0 + 3.6.0 From 7ebe3277241734748d305f30f82eedd14e949b1a Mon Sep 17 00:00:00 2001 From: Jeremy Feinstein Date: Thu, 25 Jul 2013 10:35:27 -0400 Subject: [PATCH 21/26] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index fc127626e..b44c8a3c0 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ to use it all you want in your Android apps provided that you cite this project SlidingMenu is currently used in some awesome Android apps. Here's a list of some of them: * [Foursquare][15] +* [LinkedIn][19] +* [Zappos][20] * [Rdio][8] * [Evernote Food][18] * [Plume][4] @@ -180,3 +182,5 @@ License [16]: https://play.google.com/store/apps/details?id=com.mlssoccer [17]: https://play.google.com/store/apps/details?id=com.ninegag.android.app [18]: https://play.google.com/store/apps/details?id=com.evernote.food +[19]: https://play.google.com/store/apps/details?id=com.linkedin.android +[20]: https://play.google.com/store/apps/details?id=com.zappos.android From b38aca508775323a042ea25044853fd2fce61628 Mon Sep 17 00:00:00 2001 From: Constantine Antonakos Date: Wed, 28 Aug 2013 10:32:26 -0400 Subject: [PATCH 22/26] Remove hardcoded string on TAG variable --- .../src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index b4483635f..0fa47f138 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java @@ -31,7 +31,7 @@ public class SlidingMenu extends RelativeLayout { - private static final String TAG = "SlidingMenu"; + private static final String TAG = getClass().getSimpleName(); public static final int SLIDING_WINDOW = 0; public static final int SLIDING_CONTENT = 1; From 4eeff1b809c68c6ec91449e33a77f58a7d050633 Mon Sep 17 00:00:00 2001 From: huahang Date: Thu, 12 Sep 2013 16:27:42 +0800 Subject: [PATCH 23/26] ignore idea's .iml files --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index ba1f202bc..9eed7dbf6 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ gen *.project .DS_Store target/ + +*.iml From d929476bee721e295f7e73d7395e29ca090c122b Mon Sep 17 00:00:00 2001 From: Jeremy Feinstein Date: Mon, 9 Dec 2013 16:33:26 -0500 Subject: [PATCH 24/26] Invalid pointer fix and getClass fix --- .../jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java | 5 +---- .../com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java index 42b2973d2..fa73ef05b 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java @@ -732,9 +732,6 @@ public boolean onTouchEvent(MotionEvent ev) { int initialVelocity = (int) VelocityTrackerCompat.getXVelocity( velocityTracker, mActivePointerId); final int scrollX = getScrollX(); - // final int widthWithMargin = getWidth(); - // final float pageOffset = (float) (scrollX % widthWithMargin) / widthWithMargin; - // TODO test this. should get better flinging behavior final float pageOffset = (float) (scrollX - getDestScrollX(mCurItem)) / getBehindWidth(); final int activePointerIndex = getPointerIndex(ev, mActivePointerId); if (mActivePointerId != INVALID_POINTER) { @@ -780,7 +777,7 @@ public boolean onTouchEvent(MotionEvent ev) { private void determineDrag(MotionEvent ev) { final int activePointerId = mActivePointerId; final int pointerIndex = getPointerIndex(ev, activePointerId); - if (activePointerId == INVALID_POINTER) + if (activePointerId == INVALID_POINTER || pointerIndex == INVALID_POINTER) return; final float x = MotionEventCompat.getX(ev, pointerIndex); final float dx = x - mLastMotionX; diff --git a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index 0fa47f138..8b88708b9 100644 --- a/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java @@ -31,7 +31,7 @@ public class SlidingMenu extends RelativeLayout { - private static final String TAG = getClass().getSimpleName(); + private static final String TAG = SlidingMenu.class.getSimpleName(); public static final int SLIDING_WINDOW = 0; public static final int SLIDING_CONTENT = 1; @@ -997,8 +997,6 @@ protected boolean fitSystemWindows(Rect insets) { } return true; } - - private Handler mHandler = new Handler(); @TargetApi(Build.VERSION_CODES.HONEYCOMB) public void manageLayers(float percentOpen) { @@ -1008,7 +1006,7 @@ public void manageLayers(float percentOpen) { final int layerType = layer ? View.LAYER_TYPE_HARDWARE : View.LAYER_TYPE_NONE; if (layerType != getContent().getLayerType()) { - mHandler.post(new Runnable() { + getHandler().post(new Runnable() { public void run() { Log.v(TAG, "changing layerType. hardware? " + (layerType == View.LAYER_TYPE_HARDWARE)); getContent().setLayerType(layerType, null); From 08ff04755ab2eb81472d6c25cd58b57cee2407dc Mon Sep 17 00:00:00 2001 From: lbhonrade Date: Wed, 26 Feb 2014 16:18:09 +0800 Subject: [PATCH 25/26] -updated touchModeAbove/touchModeBehind xml attribute options. --- library/res/values/attrs.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/res/values/attrs.xml b/library/res/values/attrs.xml index d5ee00f32..8de759b2f 100644 --- a/library/res/values/attrs.xml +++ b/library/res/values/attrs.xml @@ -29,10 +29,12 @@ + + From d188a033e8ca3b78ff91bf3a3b8453725ae53b8d Mon Sep 17 00:00:00 2001 From: Joshua Goldberg Date: Fri, 7 Mar 2014 23:01:20 -0800 Subject: [PATCH 26/26] Fix Copyright Year Fix outdated copyright year (update to 2014) The copyright year was out of date. Copyright notices must reflect the current year. This commit updates the listed year to 2014. see: http://www.copyright.gov/circs/circ01.pdf for more info --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b44c8a3c0..a27fbebc5 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ Developed By License ------- - Copyright 2012 Jeremy Feinstein + Copyright 2012-2014 Jeremy Feinstein Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.