From ad05b3eb463dbadbf58030c9ff209dcd90d5921f Mon Sep 17 00:00:00 2001 From: Miltos Allamanis Date: Mon, 10 Feb 2014 17:28:35 +0000 Subject: [PATCH 1/3] Renamed layoutResID to layoutResId to make it consistent with MenuDrawer.java naming convention. --- .../net/simonvt/menudrawer/samples/ListActivitySample.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java index 0aec27a..9f1b185 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/ListActivitySample.java @@ -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(); } From f712e7266f303d4d9e91dca2cba1154557dfab21 Mon Sep 17 00:00:00 2001 From: Miltos Allamanis Date: Mon, 10 Feb 2014 17:40:47 +0000 Subject: [PATCH 2/3] Renamed MenuDrawer instances in samples. The mMenuDrawer was used in 9 positions in the sample, while mDrawer was used 5 times. This commit makes the naming more consistent throught the samples. --- README.md | 16 ++++++++-------- .../samples/ActionBarSherlockSample.java | 14 +++++++------- .../menudrawer/samples/BottomOverlaySample.java | 10 +++++----- .../simonvt/menudrawer/samples/LayoutSample.java | 8 ++++---- .../menudrawer/samples/LeftOverlaySample.java | 16 ++++++++-------- .../menudrawer/samples/RightOverlaySample.java | 8 ++++---- .../menudrawer/samples/TopOverlaySample.java | 10 +++++----- 7 files changed, 41 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 1a04895..a0bd5f6 100644 --- a/README.md +++ b/README.md @@ -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); } } ``` @@ -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); } } ``` diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java index 96c0d15..eef994f 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java @@ -13,7 +13,7 @@ public class ActionBarSherlockSample extends SherlockActivity { private static final String TAG = "ActionBarSherlockSample"; - private MenuDrawer mDrawer; + private MenuDrawer mMenuDrawer; @Override protected void onCreate(Bundle savedInstanceState) { @@ -21,32 +21,32 @@ protected void onCreate(Bundle savedInstanceState) { 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; } diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/BottomOverlaySample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/BottomOverlaySample.java index 898f558..4dde6dd 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/BottomOverlaySample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/BottomOverlaySample.java @@ -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); } } diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java index bb21996..45fca16 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java @@ -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); 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); @@ -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); } } diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/LeftOverlaySample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/LeftOverlaySample.java index 7d063de..8ff8bbc 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/LeftOverlaySample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/LeftOverlaySample.java @@ -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 items = new ArrayList(); items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark)); @@ -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; } diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/RightOverlaySample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/RightOverlaySample.java index 416736f..3b46d39 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/RightOverlaySample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/RightOverlaySample.java @@ -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 items = new ArrayList(); items.add(new Item("Item 1", R.drawable.ic_action_refresh_dark)); @@ -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); } } diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/TopOverlaySample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/TopOverlaySample.java index 3bf6934..de76321 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/TopOverlaySample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/TopOverlaySample.java @@ -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); } } From 9b5d9a931976143dce3de0cf70ca4669f6cbb738 Mon Sep 17 00:00:00 2001 From: Miltos Allamanis Date: Mon, 10 Feb 2014 17:46:58 +0000 Subject: [PATCH 3/3] Renamed onCreate's Bundle argument to inState. inState was previously used 14 times in the code, while savedInstanceState only 3. --- .../simonvt/menudrawer/samples/ActionBarSherlockSample.java | 4 ++-- .../src/net/simonvt/menudrawer/samples/LayoutSample.java | 4 ++-- .../src/net/simonvt/menudrawer/samples/SamplesActivity.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java index eef994f..dda6d8e 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/ActionBarSherlockSample.java @@ -16,8 +16,8 @@ public class ActionBarSherlockSample extends SherlockActivity { private MenuDrawer mMenuDrawer; @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + protected void onCreate(Bundle inState) { + super.onCreate(inState); getSupportActionBar(); diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java index 45fca16..6fb7a47 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/LayoutSample.java @@ -13,8 +13,8 @@ public class LayoutSample extends Activity implements View.OnClickListener { 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); mMenuDrawer = (MenuDrawer) findViewById(R.id.drawer); mMenuDrawer.setTouchMode(MenuDrawer.TOUCH_MODE_FULLSCREEN); diff --git a/menudrawer-samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java b/menudrawer-samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java index 3b0c156..7a493cd 100644 --- a/menudrawer-samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java +++ b/menudrawer-samples/src/net/simonvt/menudrawer/samples/SamplesActivity.java @@ -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");