Skip to content

Commit

Permalink
Reorganizing file structure, package names and import statements to n…
Browse files Browse the repository at this point in the history
…ew package name.
  • Loading branch information
donnfelker committed May 6, 2013
1 parent 9b3d8c1 commit 37680e4
Show file tree
Hide file tree
Showing 45 changed files with 82 additions and 82 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
<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"
Expand Down
2 changes: 1 addition & 1 deletion example/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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" >

Expand Down
4 changes: 2 additions & 2 deletions example/proguard/mapping.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added example/src/main/java/com/.DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions library-maps-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@
<packaging>jar</packaging>

<parent>
<groupId>com.slidingmenu</groupId>
<groupId>com.jeremyfeinstein.slidingmenu</groupId>
<artifactId>parent</artifactId>
<version>1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

<dependencies>
<dependency>
<groupId>com.slidingmenu</groupId>
<groupId>com.jeremyfeinstein.slidingmenu</groupId>
<artifactId>slidingmenu</artifactId>
<optional>true</optional>
</dependency>
Expand Down
Binary file added library-maps-support/src/main/.DS_Store
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.slidingmenu.lib.app;
package com.jeremyfeinstein.slidingmenu.lib.app;

import android.os.Bundle;
import android.view.KeyEvent;
import android.view.View;
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 {

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion library/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.slidingmenu.lib"
package="com.jeremyfeinstein.slidingmenu.lib"
android:versionCode="1"
android:versionName="1.0" >

Expand Down
2 changes: 1 addition & 1 deletion library/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<packaging>apklib</packaging>

<parent>
<groupId>com.slidingmenu</groupId>
<groupId>com.jeremyfeinstein.slidingmenu</groupId>
<artifactId>parent</artifactId>
<version>1.3-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
Expand Down
2 changes: 1 addition & 1 deletion library/res/layout/slidingmenumain.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<com.slidingmenu.lib.SlidingMenu xmlns:android="http://schemas.android.com/apk/res/android"
<com.jeremyfeinstein.slidingmenu.lib.SlidingMenu xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/slidingmenumain"
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
Binary file added library/src/main/java/com/.DS_Store
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.slidingmenu.lib;
package com.jeremyfeinstein.lib;

import android.graphics.Canvas;
import android.view.animation.Interpolator;

import com.slidingmenu.lib.SlidingMenu.CanvasTransformer;
import com.jeremyfeinstein.lib.SlidingMenu.CanvasTransformer;

public class CanvasTransformerBuilder {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.slidingmenu.lib;
package com.jeremyfeinstein.lib;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -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.lib.SlidingMenu.OnClosedListener;
import com.jeremyfeinstein.lib.SlidingMenu.OnOpenedListener;
//import com.jeremyfeinstein.lib.SlidingMenu.OnCloseListener;
//import com.jeremyfeinstein.lib.SlidingMenu.OnOpenListener;

public class CustomViewAbove extends ViewGroup {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.slidingmenu.lib;
package com.jeremyfeinstein.slidingmenu.lib;

import android.content.Context;
import android.graphics.Bitmap;
Expand All @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.slidingmenu.lib;
package com.jeremyfeinstein.slidingmenu.lib;

import android.graphics.Canvas;
import android.graphics.drawable.Drawable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.slidingmenu.lib;
package com.jeremyfeinstein.lib;

import java.lang.reflect.Method;

Expand Down Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.slidingmenu.lib.app;
package com.jeremyfeinstein.lib.app;

import android.app.Activity;
import android.os.Bundle;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup.LayoutParams;

import com.slidingmenu.lib.SlidingMenu;
import com.jeremyfeinstein.lib.SlidingMenu;

public class SlidingActivity extends Activity implements SlidingActivityBase {

Expand Down Expand Up @@ -77,63 +77,63 @@ public void setContentView(View v, LayoutParams params) {
}

/* (non-Javadoc)
* @see com.slidingmenu.lib.app.SlidingActivityBase#setBehindContentView(int)
* @see com.jeremyfeinstein.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.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.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.lib.app.SlidingActivityBase#getSlidingMenu()
*/
public SlidingMenu getSlidingMenu() {
return mHelper.getSlidingMenu();
}

/* (non-Javadoc)
* @see com.slidingmenu.lib.app.SlidingActivityBase#toggle()
* @see com.jeremyfeinstein.lib.app.SlidingActivityBase#toggle()
*/
public void toggle() {
mHelper.toggle();
}

/* (non-Javadoc)
* @see com.slidingmenu.lib.app.SlidingActivityBase#showAbove()
* @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showAbove()
*/
public void showContent() {
mHelper.showContent();
}

/* (non-Javadoc)
* @see com.slidingmenu.lib.app.SlidingActivityBase#showBehind()
* @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showBehind()
*/
public void showMenu() {
mHelper.showMenu();
}

/* (non-Javadoc)
* @see com.slidingmenu.lib.app.SlidingActivityBase#showSecondaryMenu()
* @see com.jeremyfeinstein.lib.app.SlidingActivityBase#showSecondaryMenu()
*/
public void showSecondaryMenu() {
mHelper.showSecondaryMenu();
}

/* (non-Javadoc)
* @see com.slidingmenu.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean)
* @see com.jeremyfeinstein.lib.app.SlidingActivityBase#setSlidingActionBarEnabled(boolean)
*/
public void setSlidingActionBarEnabled(boolean b) {
mHelper.setSlidingActionBarEnabled(b);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.slidingmenu.lib.app;
package com.jeremyfeinstein.lib.app;

import android.view.View;
import android.view.ViewGroup.LayoutParams;

import com.slidingmenu.lib.SlidingMenu;
import com.jeremyfeinstein.lib.SlidingMenu;

public interface SlidingActivityBase {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.slidingmenu.lib.app;
package com.jeremyfeinstein.lib.app;

import android.app.Activity;
import android.os.Bundle;
Expand All @@ -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.lib.R;
import com.jeremyfeinstein.lib.SlidingMenu;

public class SlidingActivityHelper {

Expand Down
Loading

0 comments on commit 37680e4

Please sign in to comment.