diff --git a/.gitignore b/.gitignore index a53b9a471..0230c3e37 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,5 @@ gen .metadata/ .metadata *.project +.DS_Store +target/ \ No newline at end of file diff --git a/README.md b/README.md index f1820a241..b80b6a5bc 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,12 @@ 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] +* [MLS MatchDay][16] +* [9GAG][17] * [Wunderlist 2][13] * [The Verge][6] * [MTG Familiar][9] @@ -89,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/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/com/slidingmenu/example/AttachExample.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java similarity index 91% rename from example/src/com/slidingmenu/example/AttachExample.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/AttachExample.java index 6bb62464c..a95ebd191 100644 --- a/example/src/com/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/com/slidingmenu/example/BaseActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java similarity index 64% rename from example/src/com/slidingmenu/example/BaseActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java index 98462512d..cdc07a887 100644 --- a/example/src/com/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 { @@ -33,10 +33,14 @@ public void onCreate(Bundle savedInstanceState) { // set the Behind View setBehindContentView(R.layout.menu_frame); - FragmentTransaction t = this.getSupportFragmentManager().beginTransaction(); - mFrag = new SampleListFragment(); - t.replace(R.id.menu_frame, mFrag); - t.commit(); + if (savedInstanceState == null) { + FragmentTransaction t = this.getSupportFragmentManager().beginTransaction(); + mFrag = new SampleListFragment(); + t.replace(R.id.menu_frame, mFrag); + t.commit(); + } else { + mFrag = (ListFragment)this.getSupportFragmentManager().findFragmentById(R.id.menu_frame); + } // customize the SlidingMenu SlidingMenu sm = getSlidingMenu(); @@ -67,33 +71,4 @@ public boolean onCreateOptionsMenu(Menu menu) { getSupportMenuInflater().inflate(R.menu.main, menu); return true; } - - public class BasePagerAdapter extends FragmentPagerAdapter { - private List mFragments = new ArrayList(); - private ViewPager mPager; - - public BasePagerAdapter(FragmentManager fm, ViewPager vp) { - super(fm); - mPager = vp; - mPager.setAdapter(this); - for (int i = 0; i < 3; i++) { - addTab(new SampleListFragment()); - } - } - - public void addTab(Fragment frag) { - mFragments.add(frag); - } - - @Override - public Fragment getItem(int position) { - return mFragments.get(position); - } - - @Override - public int getCount() { - return mFragments.size(); - } - } - } diff --git a/example/src/com/slidingmenu/example/ExampleListActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java similarity index 88% rename from example/src/com/slidingmenu/example/ExampleListActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ExampleListActivity.java index 46e962bbb..f5eeb147a 100644 --- a/example/src/com/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/com/slidingmenu/example/LeftAndRightActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java similarity index 73% rename from example/src/com/slidingmenu/example/LeftAndRightActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/LeftAndRightActivity.java index 740d17f0b..41f1d4b93 100644 --- a/example/src/com/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/com/slidingmenu/example/PropertiesActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java similarity index 98% rename from example/src/com/slidingmenu/example/PropertiesActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/PropertiesActivity.java index 2e59dfaeb..2437962f5 100644 --- a/example/src/com/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/com/slidingmenu/example/SampleListFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java similarity index 97% rename from example/src/com/slidingmenu/example/SampleListFragment.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SampleListFragment.java index 06ee67121..afa0bb26d 100644 --- a/example/src/com/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/com/slidingmenu/example/SlidingContent.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java similarity index 90% rename from example/src/com/slidingmenu/example/SlidingContent.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingContent.java index 7593860c5..d2e8f955a 100644 --- a/example/src/com/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/com/slidingmenu/example/SlidingTitleBar.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java similarity index 91% rename from example/src/com/slidingmenu/example/SlidingTitleBar.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/SlidingTitleBar.java index 46a4908f2..0f1281a90 100644 --- a/example/src/com/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/com/slidingmenu/example/Util.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java similarity index 87% rename from example/src/com/slidingmenu/example/Util.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/Util.java index 40b37816f..f94327d46 100644 --- a/example/src/com/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/com/slidingmenu/example/ViewPagerActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java similarity index 91% rename from example/src/com/slidingmenu/example/ViewPagerActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/ViewPagerActivity.java index 0efd864ce..a54126226 100644 --- a/example/src/com/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/com/slidingmenu/example/anim/CustomAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java similarity index 58% rename from example/src/com/slidingmenu/example/anim/CustomAnimation.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomAnimation.java index 267a8362e..d6cc00e58 100644 --- a/example/src/com/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/com/slidingmenu/example/anim/CustomScaleAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java similarity index 57% rename from example/src/com/slidingmenu/example/anim/CustomScaleAnimation.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomScaleAnimation.java index 7eaba9071..0ec4f866e 100644 --- a/example/src/com/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/com/slidingmenu/example/anim/CustomSlideAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java similarity index 74% rename from example/src/com/slidingmenu/example/anim/CustomSlideAnimation.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomSlideAnimation.java index 5ae9bacf3..6a99d0d07 100644 --- a/example/src/com/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/com/slidingmenu/example/anim/CustomZoomAnimation.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java similarity index 68% rename from example/src/com/slidingmenu/example/anim/CustomZoomAnimation.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/anim/CustomZoomAnimation.java index d1374ad39..acb8f4aeb 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/BirdActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java similarity index 95% rename from example/src/com/slidingmenu/example/fragments/BirdActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdActivity.java index fcb261bfa..42c50004c 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/BirdGridFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java similarity index 95% rename from example/src/com/slidingmenu/example/fragments/BirdGridFragment.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdGridFragment.java index fb2ed5335..5bae2897f 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/BirdMenuFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java similarity index 92% rename from example/src/com/slidingmenu/example/fragments/BirdMenuFragment.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/BirdMenuFragment.java index 9dfe54217..c06db6196 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/ColorFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java similarity index 89% rename from example/src/com/slidingmenu/example/fragments/ColorFragment.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorFragment.java index d3207001a..6040ca86c 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/ColorMenuFragment.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java similarity index 94% rename from example/src/com/slidingmenu/example/fragments/ColorMenuFragment.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ColorMenuFragment.java index 7e884637a..731218b49 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/FragmentChangeActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java similarity index 86% rename from example/src/com/slidingmenu/example/fragments/FragmentChangeActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/FragmentChangeActivity.java index cafedf4b3..4947cbdea 100644 --- a/example/src/com/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/com/slidingmenu/example/fragments/ResponsiveUIActivity.java b/example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java similarity index 93% rename from example/src/com/slidingmenu/example/fragments/ResponsiveUIActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/fragments/ResponsiveUIActivity.java index b89f94207..8e622c41c 100644 --- a/example/src/com/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/library-maps-support/LICENSE.txt b/library-maps-support/LICENSE.txt new file mode 100644 index 000000000..7a4a3ea24 --- /dev/null +++ b/library-maps-support/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/library-maps-support/pom.xml b/library-maps-support/pom.xml new file mode 100644 index 000000000..571a6cb23 --- /dev/null +++ b/library-maps-support/pom.xml @@ -0,0 +1,43 @@ + + + + 4.0.0 + + slidingmenu-maps-support + SlidingMenu Maps Support + jar + + + com.jeremyfeinstein.slidingmenu + parent + 1.3-SNAPSHOT + ../pom.xml + + + + + com.jeremyfeinstein.slidingmenu + slidingmenu + true + + + com.google.android.maps + maps + + + + + src + + + + com.jayway.maven.plugins.android.generation2 + android-maven-plugin + true + + ignored + + + + + diff --git a/library/AndroidManifest.xml b/library/AndroidManifest.xml index a551abf42..2d9e88a9e 100644 --- a/library/AndroidManifest.xml +++ b/library/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/library/pom.xml b/library/pom.xml index 55779c395..081bbc74b 100644 --- a/library/pom.xml +++ b/library/pom.xml @@ -8,9 +8,9 @@ apklib - com.slidingmenu + com.jeremyfeinstein.slidingmenu parent - 1.2 + 1.3-SNAPSHOT ../pom.xml @@ -19,23 +19,14 @@ com.google.android android - - com.google.android.maps - maps - com.google.android support-v4 - - com.actionbarsherlock - actionbarsherlock - apklib - - src + src @@ -46,6 +37,28 @@ ignored + + + org.codehaus.mojo + build-helper-maven-plugin + 1.7 + + + package + + attach-artifact + + + + + jar + ${project.build.directory}/${project.build.finalName}.jar + + + + + + diff --git a/library/project.properties b/library/project.properties index 0e58ae1c0..32ee306e4 100644 --- a/library/project.properties +++ b/library/project.properties @@ -9,4 +9,4 @@ android.library=true # Project target. -target=android-17 +target=android-17 \ No newline at end of file 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/com/slidingmenu/lib/CanvasTransformerBuilder.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java similarity index 95% rename from library/src/com/slidingmenu/lib/CanvasTransformerBuilder.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java index 22dbc2a33..e17ca04a2 100644 --- a/library/src/com/slidingmenu/lib/CanvasTransformerBuilder.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java @@ -1,9 +1,9 @@ -package com.slidingmenu.lib; +package com.jeremyfeinstein.slidingmenu.lib; import android.graphics.Canvas; import android.view.animation.Interpolator; -import com.slidingmenu.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public class CanvasTransformerBuilder { diff --git a/library/src/com/slidingmenu/lib/CustomViewAbove.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java similarity index 98% rename from library/src/com/slidingmenu/lib/CustomViewAbove.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java index 13c7eecf5..796015ca8 100644 --- a/library/src/com/slidingmenu/lib/CustomViewAbove.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java @@ -1,4 +1,4 @@ -package com.slidingmenu.lib; +package com.jeremyfeinstein.slidingmenu.lib; import java.util.ArrayList; import java.util.List; @@ -27,10 +27,10 @@ import android.view.animation.Interpolator; import android.widget.Scroller; -import com.slidingmenu.lib.SlidingMenu.OnClosedListener; -import com.slidingmenu.lib.SlidingMenu.OnOpenedListener; -//import com.slidingmenu.lib.SlidingMenu.OnCloseListener; -//import com.slidingmenu.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 { @@ -804,8 +804,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()); } diff --git a/library/src/com/slidingmenu/lib/CustomViewBehind.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java similarity index 97% rename from library/src/com/slidingmenu/lib/CustomViewBehind.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java index f5f7b123e..72ea75053 100644 --- a/library/src/com/slidingmenu/lib/CustomViewBehind.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java @@ -1,4 +1,4 @@ -package com.slidingmenu.lib; +package com.jeremyfeinstein.slidingmenu.lib; import android.content.Context; import android.graphics.Bitmap; @@ -13,7 +13,7 @@ import android.view.View; import android.view.ViewGroup; -import com.slidingmenu.lib.SlidingMenu.CanvasTransformer; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu.CanvasTransformer; public class CustomViewBehind extends ViewGroup { @@ -58,6 +58,14 @@ public void setWidthOffset(int i) { mWidthOffset = i; requestLayout(); } + + public void setMarginThreshold(int marginThreshold) { + mMarginThreshold = marginThreshold; + } + + public int getMarginThreshold() { + return mMarginThreshold; + } public int getBehindWidth() { return mContent.getWidth(); diff --git a/library/src/com/slidingmenu/lib/MenuInterface.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java similarity index 96% rename from library/src/com/slidingmenu/lib/MenuInterface.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java index 8a7985317..73e64bda2 100644 --- a/library/src/com/slidingmenu/lib/MenuInterface.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java @@ -1,4 +1,4 @@ -package com.slidingmenu.lib; +package com.jeremyfeinstein.slidingmenu.lib; import android.graphics.Canvas; import android.graphics.drawable.Drawable; diff --git a/library/src/com/slidingmenu/lib/SlidingMenu.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java similarity index 98% rename from library/src/com/slidingmenu/lib/SlidingMenu.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index 91f903d3a..9911cfa63 100644 --- a/library/src/com/slidingmenu/lib/SlidingMenu.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java @@ -1,4 +1,4 @@ -package com.slidingmenu.lib; +package com.jeremyfeinstein.slidingmenu.lib; import java.lang.reflect.Method; @@ -27,7 +27,7 @@ import android.widget.FrameLayout; import android.widget.RelativeLayout; -import com.slidingmenu.lib.CustomViewAbove.OnPageChangeListener; +import com.jeremyfeinstein.slidingmenu.lib.CustomViewAbove.OnPageChangeListener; public class SlidingMenu extends RelativeLayout { @@ -670,6 +670,22 @@ public void setBehindWidthRes(int res) { public float getBehindScrollScale() { return mViewBehind.getScrollScale(); } + + /** + * Gets the touch mode margin threshold + * @return the touch mode margin threshold + */ + public int getTouchmodeMarginThreshold() { + return mViewBehind.getMarginThreshold(); + } + + /** + * Set the touch mode margin threshold + * @param touchmodeMarginThreshold + */ + public void setTouchmodeMarginThreshold(int touchmodeMarginThreshold) { + mViewBehind.setMarginThreshold(touchmodeMarginThreshold); + } /** * Sets the behind scroll scale. diff --git a/library/src/com/slidingmenu/lib/app/SlidingActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java similarity index 76% rename from library/src/com/slidingmenu/lib/app/SlidingActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java index f2b570c50..a47114d6f 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingActivity.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showBehind() */ public void showMenu() { mHelper.showMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.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/com/slidingmenu/lib/app/SlidingActivityBase.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java similarity index 95% rename from library/src/com/slidingmenu/lib/app/SlidingActivityBase.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java index 5028cfe7b..7bff1f2a2 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingActivityBase.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java @@ -1,9 +1,9 @@ -package com.slidingmenu.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.view.View; import android.view.ViewGroup.LayoutParams; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public interface SlidingActivityBase { diff --git a/library/src/com/slidingmenu/lib/app/SlidingActivityHelper.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java similarity index 97% rename from library/src/com/slidingmenu/lib/app/SlidingActivityHelper.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java index 2128df8b9..0cf954bce 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingActivityHelper.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java @@ -1,4 +1,4 @@ -package com.slidingmenu.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.slidingmenu.lib.R; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.R; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class SlidingActivityHelper { diff --git a/library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java similarity index 77% rename from library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java index a5eddae74..65b53006c 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.os.Bundle; import android.support.v4.app.FragmentActivity; @@ -6,7 +6,7 @@ import android.view.View; import android.view.ViewGroup.LayoutParams; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public class SlidingFragmentActivity extends FragmentActivity implements SlidingActivityBase { @@ -77,63 +77,63 @@ public void setContentView(View v, LayoutParams params) { } /* (non-Javadoc) - * @see com.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showBehind() */ public void showMenu() { mHelper.showMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.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/com/slidingmenu/lib/app/SlidingListActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java similarity index 77% rename from library/src/com/slidingmenu/lib/app/SlidingListActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java index cd12806f9..d28128db2 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingListActivity.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.slidingmenu.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.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.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/com/slidingmenu/lib/app/SlidingPreferenceActivity.java b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java similarity index 76% rename from library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java rename to library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java index 403ab0cb3..2f5b375ad 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java +++ b/library/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java @@ -1,6 +1,6 @@ -package com.slidingmenu.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; -import com.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.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.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#getSlidingMenu() */ public SlidingMenu getSlidingMenu() { return mHelper.getSlidingMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#toggle() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#toggle() */ public void toggle() { mHelper.toggle(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showAbove() */ public void showContent() { mHelper.showContent(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showBehind() */ public void showMenu() { mHelper.showMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() + * @see com.jeremyfeinstein.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu() */ public void showSecondaryMenu() { mHelper.showSecondaryMenu(); } /* (non-Javadoc) - * @see com.slidingmenu.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/pom.xml b/pom.xml index 3861b087b..2c7e43dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,17 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - com.slidingmenu + com.jeremyfeinstein.slidingmenu parent - 1.2 + 1.3-SNAPSHOT pom library + library-maps-support + + com.jeremyfeinstein.slidingmenu + slidingmenu + ${project.version} + jar + com.google.android android @@ -29,12 +36,6 @@ support-v4 r7 - - com.actionbarsherlock - actionbarsherlock - 4.2.0 - apklib -