From 683368ac57df4cbf37237e2ac702ef090086de02 Mon Sep 17 00:00:00 2001 From: Ercan PINAR Date: Tue, 13 Dec 2016 14:17:29 +0300 Subject: [PATCH 1/2] Reformat Code in app --- .../boommenusample/ActionBarActivity.java | 2 +- .../ButtonPlaceAlignmentActivity.java | 8 +-- .../boommenusample/ListViewActivity.java | 12 ++--- .../boommenusample/OrderExampleActivity.java | 3 +- .../boommenusample/ShareActivity.java | 14 ++--- .../main/res/layout/activity_boom_example.xml | 5 +- .../activity_button_place_alignment.xml | 29 ++++------- app/src/main/res/layout/activity_control.xml | 11 ++-- app/src/main/res/layout/activity_ease.xml | 27 ++++------ app/src/main/res/layout/activity_fragment.xml | 2 +- .../main/res/layout/activity_ham_button.xml | 5 +- .../main/res/layout/activity_list_view.xml | 5 +- app/src/main/res/layout/activity_listener.xml | 7 ++- app/src/main/res/layout/activity_main.xml | 51 +++++++------------ .../res/layout/activity_order_example.xml | 5 +- .../res/layout/activity_recycler_view.xml | 2 +- app/src/main/res/layout/activity_share.xml | 33 ++++-------- .../layout/activity_simple_circle_button.xml | 5 +- .../activity_text_inside_circle_button.xml | 5 +- .../activity_text_outside_circle_button.xml | 5 +- app/src/main/res/layout/custom_actionbar.xml | 7 ++- app/src/main/res/layout/fragment_bmb.xml | 8 ++- app/src/main/res/layout/item.xml | 9 ++-- 23 files changed, 101 insertions(+), 159 deletions(-) diff --git a/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java b/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java index b4bbb83..b0590bd 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ActionBarActivity.java @@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) { mTitleTextView.setText(R.string.app_name); mActionBar.setCustomView(actionBar); mActionBar.setDisplayShowCustomEnabled(true); - ((Toolbar) actionBar.getParent()).setContentInsetsAbsolute(0,0); + ((Toolbar) actionBar.getParent()).setContentInsetsAbsolute(0, 0); BoomMenuButton leftBmb = (BoomMenuButton) actionBar.findViewById(R.id.action_bar_left_bmb); BoomMenuButton rightBmb = (BoomMenuButton) actionBar.findViewById(R.id.action_bar_right_bmb); diff --git a/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java b/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java index cf0548b..88621a9 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ButtonPlaceAlignmentActivity.java @@ -79,7 +79,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - topMarginSeekText = (TextView)findViewById(R.id.top_margin_text); + topMarginSeekText = (TextView) findViewById(R.id.top_margin_text); topMarginSeekText.setText("Top margin = " + topMarginSeekBar.getProgress() + " pixel(s)"); } @@ -105,7 +105,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - bottomMarginSeekText = (TextView)findViewById(R.id.bottom_margin_text); + bottomMarginSeekText = (TextView) findViewById(R.id.bottom_margin_text); bottomMarginSeekText.setText("Bottom margin = " + bottomMarginSeekBar.getProgress() + " pixel(s)"); } @@ -131,7 +131,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - leftMarginSeekText = (TextView)findViewById(R.id.left_margin_text); + leftMarginSeekText = (TextView) findViewById(R.id.left_margin_text); leftMarginSeekText.setText("Left margin = " + leftMarginSeekBar.getProgress() + " pixel(s)"); } @@ -157,7 +157,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - rightMarginSeekText = (TextView)findViewById(R.id.right_margin_text); + rightMarginSeekText = (TextView) findViewById(R.id.right_margin_text); rightMarginSeekText.setText("Right margin = " + rightMarginSeekBar.getProgress() + " pixel(s)"); } diff --git a/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java b/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java index 00aede7..bb88981 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ListViewActivity.java @@ -24,12 +24,12 @@ protected void onCreate(Bundle savedInstanceState) { listView.setAdapter(new MyAdapter()); listView.setOnItemClickListener( new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - BoomMenuButton bmb = (BoomMenuButton)view.findViewById(R.id.bmb1); - bmb.boom(); - } - }); + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + BoomMenuButton bmb = (BoomMenuButton) view.findViewById(R.id.bmb1); + bmb.boom(); + } + }); } static class MyAdapter extends BaseAdapter { diff --git a/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java b/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java index 1d782b5..c50c337 100644 --- a/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/OrderExampleActivity.java @@ -46,7 +46,8 @@ public void onItemClick(AdapterView parent, View view, int position, long id) private List getData() { List data = new ArrayList<>(); - for (int i = 0; i < OrderEnum.values().length - 1; i++) data.add(OrderEnum.values()[i] + ""); + for (int i = 0; i < OrderEnum.values().length - 1; i++) + data.add(OrderEnum.values()[i] + ""); return data; } } diff --git a/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java b/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java index c7e8b64..b50f04d 100644 --- a/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java +++ b/app/src/main/java/com/nightonke/boommenusample/ShareActivity.java @@ -24,9 +24,9 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_share); - initBmb(bmb1 = (BoomMenuButton)findViewById(R.id.bmb1)); - initBmb(bmb2 = (BoomMenuButton)findViewById(R.id.bmb2)); - initBmb(bmb3 = (BoomMenuButton)findViewById(R.id.bmb3)); + initBmb(bmb1 = (BoomMenuButton) findViewById(R.id.bmb1)); + initBmb(bmb2 = (BoomMenuButton) findViewById(R.id.bmb2)); + initBmb(bmb3 = (BoomMenuButton) findViewById(R.id.bmb3)); bmb1.setShareLineLength(45); bmb1.setShareLineWidth(5); @@ -72,7 +72,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - showDelaySeekText = (TextView)findViewById(R.id.show_delay_text); + showDelaySeekText = (TextView) findViewById(R.id.show_delay_text); showDelaySeekText.setText("Show delay = " + showDelaySeekBar.getProgress() + " ms"); } @@ -100,7 +100,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - showDurationSeekText = (TextView)findViewById(R.id.show_duration_text); + showDurationSeekText = (TextView) findViewById(R.id.show_duration_text); showDurationSeekText.setText("Show duration = " + showDurationSeekBar.getProgress() + " ms"); } @@ -128,7 +128,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - hideDelaySeekText = (TextView)findViewById(R.id.hide_delay_text); + hideDelaySeekText = (TextView) findViewById(R.id.hide_delay_text); hideDelaySeekText.setText("Hide delay = " + hideDelaySeekBar.getProgress() + " ms"); } @@ -156,7 +156,7 @@ public void onStopTrackingTouch(SeekBar seekBar) { } }); - hideDurationSeekText = (TextView)findViewById(R.id.hide_duration_text); + hideDurationSeekText = (TextView) findViewById(R.id.hide_duration_text); hideDurationSeekText.setText("Hide duration = " + hideDurationSeekBar.getProgress() + " ms"); } } diff --git a/app/src/main/res/layout/activity_boom_example.xml b/app/src/main/res/layout/activity_boom_example.xml index f3d453b..2e64ddf 100644 --- a/app/src/main/res/layout/activity_boom_example.xml +++ b/app/src/main/res/layout/activity_boom_example.xml @@ -13,7 +13,7 @@ + android:layout_height="match_parent" /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/activity_button_place_alignment.xml b/app/src/main/res/layout/activity_button_place_alignment.xml index 539ac0e..ecadaca 100644 --- a/app/src/main/res/layout/activity_button_place_alignment.xml +++ b/app/src/main/res/layout/activity_button_place_alignment.xml @@ -19,63 +19,55 @@ android:id="@+id/top_margin_seek" android:layout_width="match_parent" android:layout_height="wrap_content" - android:progress="0" - /> + android:progress="0" /> + android:gravity="center_vertical|end" /> + android:progress="0" /> + android:gravity="center_vertical|end" /> + android:progress="0" /> + android:gravity="center_vertical|end" /> + android:progress="0" /> + android:gravity="center_vertical|end" /> + android:layout_weight="1" /> @@ -86,7 +78,6 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - /> + android:layout_alignParentEnd="true" /> diff --git a/app/src/main/res/layout/activity_control.xml b/app/src/main/res/layout/activity_control.xml index 9648f81..9fec63c 100644 --- a/app/src/main/res/layout/activity_control.xml +++ b/app/src/main/res/layout/activity_control.xml @@ -16,25 +16,25 @@ android:id="@+id/boom" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="BOOM!"/> + android:text="BOOM!" />