From c25872407418849caed0259b559adc9a9fca6337 Mon Sep 17 00:00:00 2001 From: MRSa Date: Fri, 10 Aug 2018 00:26:36 +0900 Subject: [PATCH 1/1] =?utf8?q?Effect=E3=81=AE=E3=83=9C=E3=82=BF=E3=83=B3?= =?utf8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../liveview/LiveViewControlPanelClickListener.java | 16 ++++++++++++++++ .../gokigen/gr2control/liveview/LiveViewFragment.java | 1 + .../res/drawable/ic_add_circle_outline_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_arrow_back_black_24dp.xml | 9 +++++++++ .../main/res/drawable/ic_arrow_downward_black_24dp.xml | 9 +++++++++ .../main/res/drawable/ic_arrow_forward_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_check_box_black_24dp.xml | 9 +++++++++ .../drawable/ic_check_box_outline_blank_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_check_circle_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_chevron_left_black_24dp.xml | 9 +++++++++ .../main/res/drawable/ic_chevron_right_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_photo_filter_black_24dp.xml | 9 +++++++++ .../res/drawable/ic_play_circle_filled_black_24dp.xml | 9 +++++++++ .../res/drawable/ic_play_circle_outline_black_24dp.xml | 9 +++++++++ .../res/drawable/ic_radio_button_checked_black_24dp.xml | 9 +++++++++ .../drawable/ic_radio_button_unchecked_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_redo_black_24dp.xml | 9 +++++++++ .../res/drawable/ic_remove_circle_outline_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_replay_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_slideshow_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_timer_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_undo_black_24dp.xml | 9 +++++++++ .../res/drawable/ic_vertical_align_top_black_24dp.xml | 9 +++++++++ app/src/main/res/drawable/ic_wifi_black_24dp.xml | 9 +++++++++ app/src/main/res/layout-land/fragment_live_view.xml | 10 ++++++++++ 26 files changed, 234 insertions(+) create mode 100644 app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_arrow_back_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_check_box_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_check_circle_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_chevron_left_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_chevron_right_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_photo_filter_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_play_circle_filled_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_play_circle_outline_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_redo_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_replay_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_slideshow_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_timer_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_undo_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_vertical_align_top_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_wifi_black_24dp.xml diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java index 8f3907b..d4ca399 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewControlPanelClickListener.java @@ -70,6 +70,10 @@ class LiveViewControlPanelClickListener implements View.OnClickListener selectWhiteBalance(statusList); break; + case R.id.setEffectImageView: + selectEffect(statusList); + break; + default: Log.v(TAG, "onClick() : " + id); break; @@ -163,6 +167,18 @@ class LiveViewControlPanelClickListener implements View.OnClickListener } } + private void selectEffect(@NonNull ICameraStatus statusList) + { + Log.v(TAG,"selectWhiteBalance()"); + try + { + choiceStatusList(statusList, ICameraStatus.EFFECT); + } + catch (Exception e) + { + e.printStackTrace(); + } + } /** * diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java index 4bb8e1c..b2ed88c 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java @@ -169,6 +169,7 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo setPanelClickListener(view, R.id.exposureCompensationTextView); setPanelClickListener(view, R.id.aeModeTextView); setPanelClickListener(view, R.id.whiteBalanceImageView); + setPanelClickListener(view, R.id.setEffectImageView); /* view.findViewById(R.id.show_preference_button).setOnClickListener(onClickTouchListener); diff --git a/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml new file mode 100644 index 0000000..900f227 --- /dev/null +++ b/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml new file mode 100644 index 0000000..beafea3 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml new file mode 100644 index 0000000..23277e2 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_downward_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml new file mode 100644 index 0000000..cf9e208 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_forward_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml new file mode 100644 index 0000000..c64ae35 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_upward_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_box_black_24dp.xml b/app/src/main/res/drawable/ic_check_box_black_24dp.xml new file mode 100644 index 0000000..9948171 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_box_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml new file mode 100644 index 0000000..cf8bfa2 --- /dev/null +++ b/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_check_circle_black_24dp.xml b/app/src/main/res/drawable/ic_check_circle_black_24dp.xml new file mode 100644 index 0000000..1241eda --- /dev/null +++ b/app/src/main/res/drawable/ic_check_circle_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_chevron_left_black_24dp.xml b/app/src/main/res/drawable/ic_chevron_left_black_24dp.xml new file mode 100644 index 0000000..e6bb3ca --- /dev/null +++ b/app/src/main/res/drawable/ic_chevron_left_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml b/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml new file mode 100644 index 0000000..2483512 --- /dev/null +++ b/app/src/main/res/drawable/ic_chevron_right_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_photo_filter_black_24dp.xml b/app/src/main/res/drawable/ic_photo_filter_black_24dp.xml new file mode 100644 index 0000000..c96ab1a --- /dev/null +++ b/app/src/main/res/drawable/ic_photo_filter_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_circle_filled_black_24dp.xml b/app/src/main/res/drawable/ic_play_circle_filled_black_24dp.xml new file mode 100644 index 0000000..85ee3ba --- /dev/null +++ b/app/src/main/res/drawable/ic_play_circle_filled_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_play_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_play_circle_outline_black_24dp.xml new file mode 100644 index 0000000..f7a497a --- /dev/null +++ b/app/src/main/res/drawable/ic_play_circle_outline_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml b/app/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml new file mode 100644 index 0000000..a5025ae --- /dev/null +++ b/app/src/main/res/drawable/ic_radio_button_checked_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml b/app/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml new file mode 100644 index 0000000..f61549b --- /dev/null +++ b/app/src/main/res/drawable/ic_radio_button_unchecked_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_redo_black_24dp.xml b/app/src/main/res/drawable/ic_redo_black_24dp.xml new file mode 100644 index 0000000..424e788 --- /dev/null +++ b/app/src/main/res/drawable/ic_redo_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml new file mode 100644 index 0000000..9af9456 --- /dev/null +++ b/app/src/main/res/drawable/ic_remove_circle_outline_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_replay_black_24dp.xml b/app/src/main/res/drawable/ic_replay_black_24dp.xml new file mode 100644 index 0000000..0ff0a64 --- /dev/null +++ b/app/src/main/res/drawable/ic_replay_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_slideshow_black_24dp.xml b/app/src/main/res/drawable/ic_slideshow_black_24dp.xml new file mode 100644 index 0000000..de38db8 --- /dev/null +++ b/app/src/main/res/drawable/ic_slideshow_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_timer_black_24dp.xml b/app/src/main/res/drawable/ic_timer_black_24dp.xml new file mode 100644 index 0000000..f41be80 --- /dev/null +++ b/app/src/main/res/drawable/ic_timer_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_undo_black_24dp.xml b/app/src/main/res/drawable/ic_undo_black_24dp.xml new file mode 100644 index 0000000..5558e37 --- /dev/null +++ b/app/src/main/res/drawable/ic_undo_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_vertical_align_top_black_24dp.xml b/app/src/main/res/drawable/ic_vertical_align_top_black_24dp.xml new file mode 100644 index 0000000..1312b6c --- /dev/null +++ b/app/src/main/res/drawable/ic_vertical_align_top_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_wifi_black_24dp.xml b/app/src/main/res/drawable/ic_wifi_black_24dp.xml new file mode 100644 index 0000000..69c81f1 --- /dev/null +++ b/app/src/main/res/drawable/ic_wifi_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout-land/fragment_live_view.xml b/app/src/main/res/layout-land/fragment_live_view.xml index 0de0501..dc03d24 100644 --- a/app/src/main/res/layout-land/fragment_live_view.xml +++ b/app/src/main/res/layout-land/fragment_live_view.xml @@ -279,6 +279,16 @@ android:focusable="true" android:src="@drawable/ic_wb_auto_black_24dp" /> + +