Merge remote-tracking branch 'original/master'

Conflicts: library-maps-support/src/com/jeremyfeinstein/slidingmenu/lib/app/SlidingMapActivity.java library/project.properties
androirc · May 9, 2013 · 4a05f6b · 4a05f6b
2 parents 7a141e9 + ad6054b
commit 4a05f6b
Show file tree

Hide file tree

Showing 44 changed files with 453 additions and 188 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,5 @@ gen
 .metadata/
 .metadata
 *.project
+.DS_Store
+target/
diff --git 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
-<com.slidingmenu.lib.SlidingMenu
+<com.jeremyfeinstein.slidingmenu.lib.SlidingMenu
     xmlns:sliding="http://schemas.android.com/apk/res-auto"
     android:id="@+id/slidingmenulayout"
     android:layout_width="fill_parent"
@@ -174,3 +177,6 @@ License
 [13]: http://bit.ly/xs1sMN
 [14]: https://play.google.com/store/apps/details?id=com.espn.score_center
 [15]: https://play.google.com/store/apps/details?id=com.joelapenna.foursquared
+[16]: https://play.google.com/store/apps/details?id=com.mlssoccer
+[17]: https://play.google.com/store/apps/details?id=com.ninegag.android.app
+[18]: https://play.google.com/store/apps/details?id=com.evernote.food
diff --git a/example/AndroidManifest.xml b/example/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.slidingmenu.example"
+    package="com.jeremyfeinstein.slidingmenu.example"
     android:versionCode="3"
     android:versionName="1.2" >
 

diff --git 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
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    android:name="com.slidingmenu.example.SampleListFragment"
+    android:name="com.jeremyfeinstein.slidingmenu.example.SampleListFragment"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 

diff --git a/...om/slidingmenu/example/AttachExample.java → ...in/slidingmenu/example/AttachExample.java b/...om/slidingmenu/example/AttachExample.java → ...in/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/...com/slidingmenu/example/BaseActivity.java → ...ein/slidingmenu/example/BaseActivity.java b/...com/slidingmenu/example/BaseActivity.java → ...ein/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<Fragment> mFragments = new ArrayList<Fragment>();
-		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/...dingmenu/example/ExampleListActivity.java → ...dingmenu/example/ExampleListActivity.java b/...dingmenu/example/ExampleListActivity.java → ...dingmenu/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/...ingmenu/example/LeftAndRightActivity.java → ...ingmenu/example/LeftAndRightActivity.java b/...ingmenu/example/LeftAndRightActivity.java → ...ingmenu/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/...idingmenu/example/PropertiesActivity.java → ...idingmenu/example/PropertiesActivity.java b/...idingmenu/example/PropertiesActivity.java → ...idingmenu/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/...idingmenu/example/SampleListFragment.java → ...idingmenu/example/SampleListFragment.java b/...idingmenu/example/SampleListFragment.java → ...idingmenu/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/...m/slidingmenu/example/SlidingContent.java → ...n/slidingmenu/example/SlidingContent.java b/...m/slidingmenu/example/SlidingContent.java → ...n/slidingmenu/example/SlidingContent.java
@@ -1,4 +1,4 @@
-package com.slidingmenu.example;
+package com.jeremyfeinstein.slidingmenu.example;
 
 import android.os.Bundle;
 

diff --git a/.../slidingmenu/example/SlidingTitleBar.java → .../slidingmenu/example/SlidingTitleBar.java b/.../slidingmenu/example/SlidingTitleBar.java → .../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/...ple/src/com/slidingmenu/example/Util.java → ...myfeinstein/slidingmenu/example/Util.java b/...ple/src/com/slidingmenu/example/Util.java → ...myfeinstein/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/...lidingmenu/example/ViewPagerActivity.java → ...lidingmenu/example/ViewPagerActivity.java b/...lidingmenu/example/ViewPagerActivity.java → ...lidingmenu/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/...ingmenu/example/anim/CustomAnimation.java → ...ingmenu/example/anim/CustomAnimation.java b/...ingmenu/example/anim/CustomAnimation.java → ...ingmenu/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/...nu/example/anim/CustomScaleAnimation.java → ...nu/example/anim/CustomScaleAnimation.java b/...nu/example/anim/CustomScaleAnimation.java → ...nu/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/...nu/example/anim/CustomSlideAnimation.java → ...nu/example/anim/CustomSlideAnimation.java b/...nu/example/anim/CustomSlideAnimation.java → ...nu/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/...enu/example/anim/CustomZoomAnimation.java → ...enu/example/anim/CustomZoomAnimation.java b/...enu/example/anim/CustomZoomAnimation.java → ...enu/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/...gmenu/example/fragments/BirdActivity.java → ...gmenu/example/fragments/BirdActivity.java b/...gmenu/example/fragments/BirdActivity.java → ...gmenu/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/...u/example/fragments/BirdGridFragment.java → ...u/example/fragments/BirdGridFragment.java b/...u/example/fragments/BirdGridFragment.java → ...u/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/...u/example/fragments/BirdMenuFragment.java → ...u/example/fragments/BirdMenuFragment.java b/...u/example/fragments/BirdMenuFragment.java → ...u/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/...menu/example/fragments/ColorFragment.java → ...menu/example/fragments/ColorFragment.java b/...menu/example/fragments/ColorFragment.java → ...menu/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/fragments/ColorMenuFragment.java → .../example/fragments/ColorMenuFragment.java b/.../example/fragments/ColorMenuFragment.java → .../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 {