Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some renamings to reduce unnecessary variable naming diversity #216

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ Left menu
```java
public class SampleActivity extends Activity {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;

@Override
protected void onCreate(Bundle state) {
super.onCreate(state);
mDrawer = MenuDrawer.attach(this);
mDrawer.setContentView(R.layout.activity_sample);
mDrawer.setMenuView(R.layout.menu_sample);
mMenuDrawer = MenuDrawer.attach(this);
mMenuDrawer.setContentView(R.layout.activity_sample);
mMenuDrawer.setMenuView(R.layout.menu_sample);
}
}
```
Expand All @@ -52,14 +52,14 @@ Right menu
```java
public class SampleActivity extends Activity {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;

@Override
protected void onCreate(Bundle state) {
super.onCreate(state);
mDrawer = MenuDrawer.attach(this, Position.RIGHT);
mDrawer.setContentView(R.layout.activity_sample);
mDrawer.setMenuView(R.layout.menu_sample);
mMenuDrawer = MenuDrawer.attach(this, Position.RIGHT);
mMenuDrawer.setContentView(R.layout.activity_sample);
mMenuDrawer.setMenuView(R.layout.menu_sample);
}
}
```
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,40 +13,40 @@ public class ActionBarSherlockSample extends SherlockActivity {

private static final String TAG = "ActionBarSherlockSample";

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void onCreate(Bundle inState) {
super.onCreate(inState);

getSupportActionBar();

mDrawer = MenuDrawer.attach(this);
mMenuDrawer = MenuDrawer.attach(this);

TextView menuView = new TextView(this);
menuView.setTextColor(0xFFFFFFFF);
menuView.setText("As the drawer opens, the drawer indicator icon becomes smaller.");
menuView.setGravity(Gravity.CENTER);
mDrawer.setMenuView(menuView);
mMenuDrawer.setMenuView(menuView);

TextView contentView = new TextView(this);
contentView.setText(
"This sample uses ActionBarSherlock to display an ActionBar on older platforms. The drawer indicator, "
+ "as per the design guidelines, is visible in the top left corner.");
contentView.setGravity(Gravity.CENTER);
mDrawer.setContentView(contentView);
mMenuDrawer.setContentView(contentView);

// The drawable that replaces the up indicator in the action bar
mDrawer.setSlideDrawable(R.drawable.ic_drawer);
mMenuDrawer.setSlideDrawable(R.drawable.ic_drawer);
// Whether the previous drawable should be shown
mDrawer.setDrawerIndicatorEnabled(true);
mMenuDrawer.setDrawerIndicatorEnabled(true);
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
mDrawer.toggleMenu();
mMenuDrawer.toggleMenu();
break;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

public class BottomOverlaySample extends Activity {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;

@Override
protected void onCreate(Bundle inState) {
super.onCreate(inState);
mDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, Position.BOTTOM);
mDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
mDrawer.setMenuView(R.layout.menu_bottom);
mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, Position.BOTTOM);
mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
mMenuDrawer.setMenuView(R.layout.menu_bottom);

TextView content = new TextView(this);
content.setText("This is a sample of an overlayed bottom drawer.");
content.setGravity(Gravity.CENTER);
mDrawer.setContentView(content);
mMenuDrawer.setContentView(content);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

public class LayoutSample extends Activity implements View.OnClickListener {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;
private TextView mContentTextView;

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
protected void onCreate(Bundle inState) {
super.onCreate(inState);
setContentView(R.layout.activity_layoutsample);
mDrawer = (MenuDrawer) findViewById(R.id.drawer);
mDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
mMenuDrawer = (MenuDrawer) findViewById(R.id.drawer);
mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);

mContentTextView = (TextView) findViewById(R.id.contentText);
findViewById(R.id.item1).setOnClickListener(this);
Expand All @@ -31,6 +31,6 @@ protected void onCreate(Bundle savedInstanceState) {
public void onClick(View v) {
String tag = (String) v.getTag();
mContentTextView.setText(String.format("%s clicked.", tag));
mDrawer.setActiveView(v);
mMenuDrawer.setActiveView(v);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

public class LeftOverlaySample extends Activity {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;
private MenuAdapter mAdapter;
private ListView mList;

@Override
protected void onCreate(Bundle inState) {
super.onCreate(inState);
mDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY);
mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY);

List<Object> items = new ArrayList<Object>();
items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
Expand All @@ -42,22 +42,22 @@ protected void onCreate(Bundle inState) {
mList = new ListView(this);
mAdapter = new MenuAdapter(this, items);
mList.setAdapter(mAdapter);
mDrawer.setMenuView(mList);
mMenuDrawer.setMenuView(mList);

TextView content = new TextView(this);
content.setText("This is a sample of an overlayed left drawer.");
content.setGravity(Gravity.CENTER);
mDrawer.setContentView(content);
mDrawer.setSlideDrawable(R.drawable.ic_drawer);
mDrawer.setDrawerIndicatorEnabled(true);
mDrawer.peekDrawer(1000, 0);
mMenuDrawer.setContentView(content);
mMenuDrawer.setSlideDrawable(R.drawable.ic_drawer);
mMenuDrawer.setDrawerIndicatorEnabled(true);
mMenuDrawer.peekDrawer(1000, 0);
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
mDrawer.toggleMenu();
mMenuDrawer.toggleMenu();
return true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ private int dpToPx(int dp) {
}

@Override
public void setContentView(int layoutResID) {
public void setContentView(int layoutResId) {
// This override is only needed when using MENU_DRAG_CONTENT.
mMenuDrawer.setContentView(layoutResID);
mMenuDrawer.setContentView(layoutResId);
onContentChanged();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@

public class RightOverlaySample extends Activity {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;
private MenuAdapter mAdapter;
private ListView mList;

@Override
protected void onCreate(Bundle inState) {
super.onCreate(inState);
mDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, Position.END);
mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, Position.END);

List<Object> items = new ArrayList<Object>();
items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark));
Expand All @@ -45,11 +45,11 @@ protected void onCreate(Bundle inState) {

mList.setAdapter(mAdapter);

mDrawer.setMenuView(mList);
mMenuDrawer.setMenuView(mList);

TextView content = new TextView(this);
content.setText("This is a sample of an overlayed right drawer.");
content.setGravity(Gravity.CENTER);
mDrawer.setContentView(content);
mMenuDrawer.setContentView(content);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class SamplesActivity extends ListActivity {
private SamplesAdapter mAdapter;

@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
public void onCreate(Bundle inState) {
super.onCreate(inState);
mAdapter = new SamplesAdapter();

mAdapter.addHeader("Sliding drawer");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,18 @@

public class TopOverlaySample extends Activity {

private MenuDrawer mDrawer;
private MenuDrawer mMenuDrawer;

@Override
protected void onCreate(Bundle inState) {
super.onCreate(inState);
mDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, Position.TOP);
mDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
mDrawer.setMenuView(R.layout.menu_top);
mMenuDrawer = MenuDrawer.attach(this, MenuDrawer.Type.OVERLAY, Position.TOP);
mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN);
mMenuDrawer.setMenuView(R.layout.menu_top);

TextView content = new TextView(this);
content.setText("This is a sample of an overlayed top drawer.");
content.setGravity(Gravity.CENTER);
mDrawer.setContentView(content);
mMenuDrawer.setContentView(content);
}
}