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 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/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 91% rename from example/src/com/slidingmenu/example/BaseActivity.java rename to example/src/main/java/com/jeremyfeinstein/slidingmenu/example/BaseActivity.java index 4e1f7c47a..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 { 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/pom.xml b/library-maps-support/pom.xml index f370316f9..571a6cb23 100644 --- a/library-maps-support/pom.xml +++ b/library-maps-support/pom.xml @@ -8,7 +8,7 @@ jar - 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/com/slidingmenu/lib/app/SlidingMapActivity.java b/library-maps-support/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java similarity index 76% rename from library-maps-support/src/com/slidingmenu/lib/app/SlidingMapActivity.java rename to library-maps-support/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java index f70133f95..229629278 100644 --- a/library-maps-support/src/com/slidingmenu/lib/app/SlidingMapActivity.java +++ b/library-maps-support/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java @@ -1,4 +1,4 @@ -package com.slidingmenu.lib.app; +package com.jeremyfeinstein.slidingmenu.lib.app; import android.os.Bundle; import android.view.KeyEvent; @@ -6,7 +6,7 @@ import android.view.ViewGroup.LayoutParams; import com.google.android.maps.MapActivity; -import com.slidingmenu.lib.SlidingMenu; +import com.jeremyfeinstein.slidingmenu.lib.SlidingMenu; public abstract class SlidingMapActivity extends MapActivity 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/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 f45f7e009..687383765 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 @@ -26,7 +26,6 @@ - src 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/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java similarity index 95% rename from library/src/com/slidingmenu/lib/CanvasTransformerBuilder.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CanvasTransformerBuilder.java index 22dbc2a33..e17ca04a2 100644 --- a/library/src/com/slidingmenu/lib/CanvasTransformerBuilder.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java similarity index 98% rename from library/src/com/slidingmenu/lib/CustomViewAbove.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewAbove.java index b62f780d8..42b2973d2 100644 --- a/library/src/com/slidingmenu/lib/CustomViewAbove.java +++ b/library/src/main/java/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; @@ -26,10 +26,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 { diff --git a/library/src/com/slidingmenu/lib/CustomViewBehind.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java similarity index 99% rename from library/src/com/slidingmenu/lib/CustomViewBehind.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/CustomViewBehind.java index 2f67d5685..fa0544d5b 100644 --- a/library/src/com/slidingmenu/lib/CustomViewBehind.java +++ b/library/src/main/java/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 { diff --git a/library/src/com/slidingmenu/lib/MenuInterface.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java similarity index 96% rename from library/src/com/slidingmenu/lib/MenuInterface.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/MenuInterface.java index 8a7985317..73e64bda2 100644 --- a/library/src/com/slidingmenu/lib/MenuInterface.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java similarity index 99% rename from library/src/com/slidingmenu/lib/SlidingMenu.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/SlidingMenu.java index 8e95d1e49..b1b3322d7 100644 --- a/library/src/com/slidingmenu/lib/SlidingMenu.java +++ b/library/src/main/java/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 { diff --git a/library/src/com/slidingmenu/lib/app/SlidingActivity.java b/library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java similarity index 76% rename from library/src/com/slidingmenu/lib/app/SlidingActivity.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivity.java index f2b570c50..a47114d6f 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingActivity.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java similarity index 95% rename from library/src/com/slidingmenu/lib/app/SlidingActivityBase.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityBase.java index 5028cfe7b..7bff1f2a2 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingActivityBase.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java similarity index 97% rename from library/src/com/slidingmenu/lib/app/SlidingActivityHelper.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingActivityHelper.java index 2128df8b9..0cf954bce 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingActivityHelper.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java similarity index 77% rename from library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingFragmentActivity.java index a5eddae74..65b53006c 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingFragmentActivity.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java similarity index 77% rename from library/src/com/slidingmenu/lib/app/SlidingListActivity.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingListActivity.java index cd12806f9..d28128db2 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingListActivity.java +++ b/library/src/main/java/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/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java similarity index 76% rename from library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java rename to library/src/main/java/com/jeremyfeinstein/slidingmenu/lib/app/SlidingPreferenceActivity.java index 403ab0cb3..2f5b375ad 100644 --- a/library/src/com/slidingmenu/lib/app/SlidingPreferenceActivity.java +++ b/library/src/main/java/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 a4beb2ef1..2c7e43dd8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 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.3-SNAPSHOT pom @@ -16,7 +16,7 @@ - com.slidingmenu + com.jeremyfeinstein.slidingmenu slidingmenu ${project.version} jar