[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: use @OnClick for SearchFragment listeners

2016-09-15 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: use @OnClick for SearchFragment listeners
..


Hygiene: use @OnClick for SearchFragment listeners

Change-Id: I14af19ea104d36424d86e31cea1edbc75080b2d4
---
M app/src/main/java/org/wikipedia/search/SearchFragment.java
1 file changed, 12 insertions(+), 16 deletions(-)

Approvals:
  BearND: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/app/src/main/java/org/wikipedia/search/SearchFragment.java 
b/app/src/main/java/org/wikipedia/search/SearchFragment.java
index 3573c9f..ed2e58d 100644
--- a/app/src/main/java/org/wikipedia/search/SearchFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchFragment.java
@@ -39,6 +39,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import butterknife.Unbinder;
 
 public class SearchFragment extends Fragment implements BackPressedHandler,
@@ -118,7 +119,7 @@
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 app = WikipediaApp.getInstance();
-funnel = new SearchFunnel(WikipediaApp.getInstance(), 
SearchInvokeSource.of(invokeSource.code()));
+funnel = new SearchFunnel(app, 
SearchInvokeSource.of(invokeSource.code()));
 }
 
 @Override
@@ -132,15 +133,6 @@
 app = WikipediaApp.getInstance();
 View view = inflater.inflate(R.layout.fragment_search, container, 
false);
 unbinder = ButterKnife.bind(this, view);
-
-searchContainer.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View view) {
-// Give the root container view an empty click handler, so 
that click events won't
-// get passed down to any underlying views (e.g. a 
PageFragment on top of which
-// this fragment is shown)
-}
-});
 
 FragmentManager childFragmentManager = getChildFragmentManager();
 recentSearchesFragment = 
(RecentSearchesFragment)childFragmentManager.findFragmentById(
@@ -332,6 +324,16 @@
 updateZeroChrome();
 }
 
+@OnClick(R.id.search_container) void onSearchContainerClick() {
+// Give the root container view an empty click handler, so that click 
events won't
+// get passed down to any underlying views (e.g. a PageFragment on top 
of which
+// this fragment is shown)
+}
+
+@OnClick(R.id.search_lang_button_container) void onLangButtonClick() {
+showLangPreferenceDialog();
+}
+
 /**
  * Show a particular panel, which can be one of:
  * - PANEL_RECENT_SEARCHES
@@ -390,12 +392,6 @@
 private void initLangButton() {
 langButton.setText(app.getAppOrSystemLanguageCode().toUpperCase());
 formatLangButtonText();
-langButtonContainer.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View v) {
-showLangPreferenceDialog();
-}
-});
 FeedbackUtil.setToolbarButtonLongPressToast(langButtonContainer);
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/310969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I14af19ea104d36424d86e31cea1edbc75080b2d4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: use @OnClick for SearchFragment listeners

2016-09-15 Thread Niedzielski (Code Review) 
Niedzielski has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/310969

Change subject: Hygiene: use @OnClick for SearchFragment listeners
..

Hygiene: use @OnClick for SearchFragment listeners

Change-Id: I14af19ea104d36424d86e31cea1edbc75080b2d4
---
M app/src/main/java/org/wikipedia/search/SearchFragment.java
1 file changed, 12 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/69/310969/1

diff --git a/app/src/main/java/org/wikipedia/search/SearchFragment.java 
b/app/src/main/java/org/wikipedia/search/SearchFragment.java
index 3573c9f..ed2e58d 100644
--- a/app/src/main/java/org/wikipedia/search/SearchFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchFragment.java
@@ -39,6 +39,7 @@
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import butterknife.OnClick;
 import butterknife.Unbinder;
 
 public class SearchFragment extends Fragment implements BackPressedHandler,
@@ -118,7 +119,7 @@
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 app = WikipediaApp.getInstance();
-funnel = new SearchFunnel(WikipediaApp.getInstance(), 
SearchInvokeSource.of(invokeSource.code()));
+funnel = new SearchFunnel(app, 
SearchInvokeSource.of(invokeSource.code()));
 }
 
 @Override
@@ -132,15 +133,6 @@
 app = WikipediaApp.getInstance();
 View view = inflater.inflate(R.layout.fragment_search, container, 
false);
 unbinder = ButterKnife.bind(this, view);
-
-searchContainer.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View view) {
-// Give the root container view an empty click handler, so 
that click events won't
-// get passed down to any underlying views (e.g. a 
PageFragment on top of which
-// this fragment is shown)
-}
-});
 
 FragmentManager childFragmentManager = getChildFragmentManager();
 recentSearchesFragment = 
(RecentSearchesFragment)childFragmentManager.findFragmentById(
@@ -332,6 +324,16 @@
 updateZeroChrome();
 }
 
+@OnClick(R.id.search_container) void onSearchContainerClick() {
+// Give the root container view an empty click handler, so that click 
events won't
+// get passed down to any underlying views (e.g. a PageFragment on top 
of which
+// this fragment is shown)
+}
+
+@OnClick(R.id.search_lang_button_container) void onLangButtonClick() {
+showLangPreferenceDialog();
+}
+
 /**
  * Show a particular panel, which can be one of:
  * - PANEL_RECENT_SEARCHES
@@ -390,12 +392,6 @@
 private void initLangButton() {
 langButton.setText(app.getAppOrSystemLanguageCode().toUpperCase());
 formatLangButtonText();
-langButtonContainer.setOnClickListener(new View.OnClickListener() {
-@Override
-public void onClick(View v) {
-showLangPreferenceDialog();
-}
-});
 FeedbackUtil.setToolbarButtonLongPressToast(langButtonContainer);
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/310969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14af19ea104d36424d86e31cea1edbc75080b2d4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits