[MediaWiki-commits] [Gerrit] Convert some fields to local variables - change (apps...wikipedia)

2015-11-23 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Convert some fields to local variables
..


Convert some fields to local variables

This patch converts some fields to local variables where appropriate, as this
generally improves performance and helps code style and readability.

Change-Id: Ibda77087b2d349c2e1f63450afe6d71c61521cf5
---
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
2 files changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 222b4ed..c1e9d76 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -50,7 +50,6 @@
 
 private Sprite markerIconPassive;
 
-private WikipediaApp app;
 private Site site;
 private NearbyResult lastResult;
 @Nullable private Location currentLocation;
@@ -60,8 +59,7 @@
 @Override
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
-app = WikipediaApp.getInstance();
-site = app.getPrimarySite();
+site = WikipediaApp.getInstance().getPrimarySite();
 }
 
 @Override
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 5152b71..e116c13 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -108,7 +108,6 @@
 private View fragmentContainerView;
 private View tabsContainerView;
 private WikiDrawerLayout drawerLayout;
-private NavigationView navDrawer;
 private Menu navMenu;
 private SearchArticlesFragment searchFragment;
 private TextView searchHintText;
@@ -210,7 +209,7 @@
 if (!ApiUtil.hasLollipop()) {
 drawerLayout.setDrawerShadow(R.drawable.nav_drawer_shadow, 
GravityCompat.START);
 }
-navDrawer = (NavigationView) findViewById(R.id.navdrawer);
+NavigationView navDrawer = (NavigationView) 
findViewById(R.id.navdrawer);
 navMenu = navDrawer.getMenu();
 navDrawerHelper = new NavDrawerHelper(this, 
navDrawer.getHeaderView(0));
 
navDrawer.setNavigationItemSelectedListener(navDrawerHelper.getNewListener());

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

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

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

[MediaWiki-commits] [Gerrit] Convert some fields to local variables - change (apps...wikipedia)

2015-11-22 Thread Deskana (Code Review) 
Deskana has uploaded a new change for review.

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

Change subject: Convert some fields to local variables
..

Convert some fields to local variables

This patch converts some fields to local variables where appropriate, as this
generally improves performance and helps code style and readability.

Change-Id: Ibda77087b2d349c2e1f63450afe6d71c61521cf5
---
M app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
2 files changed, 2 insertions(+), 5 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java 
b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index 222b4ed..c1e9d76 100644
--- a/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/app/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -50,7 +50,6 @@
 
 private Sprite markerIconPassive;
 
-private WikipediaApp app;
 private Site site;
 private NearbyResult lastResult;
 @Nullable private Location currentLocation;
@@ -60,8 +59,7 @@
 @Override
 public void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
-app = WikipediaApp.getInstance();
-site = app.getPrimarySite();
+site = WikipediaApp.getInstance().getPrimarySite();
 }
 
 @Override
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java 
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 5152b71..e116c13 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -108,7 +108,6 @@
 private View fragmentContainerView;
 private View tabsContainerView;
 private WikiDrawerLayout drawerLayout;
-private NavigationView navDrawer;
 private Menu navMenu;
 private SearchArticlesFragment searchFragment;
 private TextView searchHintText;
@@ -210,7 +209,7 @@
 if (!ApiUtil.hasLollipop()) {
 drawerLayout.setDrawerShadow(R.drawable.nav_drawer_shadow, 
GravityCompat.START);
 }
-navDrawer = (NavigationView) findViewById(R.id.navdrawer);
+NavigationView navDrawer = (NavigationView) 
findViewById(R.id.navdrawer);
 navMenu = navDrawer.getMenu();
 navDrawerHelper = new NavDrawerHelper(this, 
navDrawer.getHeaderView(0));
 
navDrawer.setNavigationItemSelectedListener(navDrawerHelper.getNewListener());

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

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

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

[MediaWiki-commits] [Gerrit] Convert some fields to local variables. - change (apps...wikipedia)

2015-08-28 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Convert some fields to local variables.
..


Convert some fields to local variables.

This patch converts some fields that are only used in a single method to
local variables, to optimise performance and maintain code tidiness.

Change-Id: Ia38f84ecdc87c66a3924b06b43d19e31f7131691
---
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
3 files changed, 3 insertions(+), 6 deletions(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index a4e71aa..2cc2af6 100644
--- 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -61,7 +61,6 @@
 private View bottomContentContainer;
 private TextView pageLastUpdatedText;
 private TextView pageLicenseText;
-private TextView pageExternalLink;
 private View readMoreContainer;
 private ListView readMoreList;
 
@@ -88,7 +87,7 @@
 readMoreContainer = 
bottomContentContainer.findViewById(R.id.read_more_container);
 readMoreList = 
(ListView)bottomContentContainer.findViewById(R.id.read_more_list);
 
-pageExternalLink = (TextView) 
bottomContentContainer.findViewById(R.id.page_external_link);
+TextView pageExternalLink = (TextView) 
bottomContentContainer.findViewById(R.id.page_external_link);
 pageExternalLink.setPaintFlags(pageExternalLink.getPaintFlags() | 
Paint.UNDERLINE_TEXT_FLAG);
 pageExternalLink.setOnClickListener(new View.OnClickListener() {
 @Override
diff --git 
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java 
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
index babd012..8d5bbc8 100644
--- 
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
+++ 
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
@@ -50,7 +50,6 @@
  */
 public abstract class SwipeableBottomDialog extends DialogFragment {
 private final List dialogViews = new ArrayList<>();
-private ViewGroup rootView;
 private ListView dialogListView;
 private int dialogPeekHeight;
 
@@ -76,7 +75,7 @@
 int displayWidth = getDialogWidth();
 int displayHeight = 
inflater.getContext().getResources().getDisplayMetrics().heightPixels;
 
-rootView = (ViewGroup) inflater.inflate(R.layout.dialog_bottom_swipe, 
container);
+ViewGroup rootView = (ViewGroup) 
inflater.inflate(R.layout.dialog_bottom_swipe, container);
 
 dialogViews.add(makeSpaceView(displayWidth, 1));
 dialogViews.add(makeSpaceView(displayWidth, dialogPeekHeight));
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e19cf49..4d4d897 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -44,7 +44,6 @@
 private EditText searchEditText;
 private SearchFunnel funnel;
 private TextView langButton;
-private FrameLayout langButtonContainer;
 
 public SearchFunnel getFunnel() {
 return funnel;
@@ -287,7 +286,7 @@
 LinearLayout enabledSearchBar = (LinearLayout) 
getActivity().findViewById(R.id.search_bar_enabled);
 TextView searchButton = (TextView) 
getActivity().findViewById(R.id.main_search_bar_text);
 langButton = (TextView) 
getActivity().findViewById(R.id.search_lang_button);
-langButtonContainer = (FrameLayout) 
getActivity().findViewById(R.id.search_lang_button_container);
+FrameLayout langButtonContainer = (FrameLayout) 
getActivity().findViewById(R.id.search_lang_button_container);
 
 if (enabled) {
 // set up the language picker

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

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

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

[MediaWiki-commits] [Gerrit] Convert some fields to local variables. - change (apps...wikipedia)

2015-08-28 Thread Deskana (Code Review) 
Deskana has uploaded a new change for review.

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

Change subject: Convert some fields to local variables.
..

Convert some fields to local variables.

This patch converts some fields that are only used in a single method to
local variables, to optimise performance and maintain code tidiness.

Change-Id: Ia38f84ecdc87c66a3924b06b43d19e31f7131691
---
M app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
M app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
M app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
M app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
4 files changed, 3 insertions(+), 8 deletions(-)


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

diff --git a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java 
b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
index e3c2b82..c181788 100644
--- a/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
+++ b/app/src/main/java/org/wikipedia/analytics/LinkPreviewFunnel.java
@@ -12,8 +12,6 @@
 private static final int PROD_LINK_PREVIEW_VERSION = 3;
 private final int version;
 
-private final PageTitle title;
-
 public LinkPreviewFunnel(WikipediaApp app, PageTitle title) {
 super(app, SCHEMA_NAME, REV_ID, app.isProdRelease() ? 
Funnel.SAMPLE_LOG_100 : Funnel.SAMPLE_LOG_ALL);
 this.title = title;
diff --git 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
index a4e71aa..2cc2af6 100644
--- 
a/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
+++ 
b/app/src/main/java/org/wikipedia/page/bottomcontent/BottomContentHandler.java
@@ -61,7 +61,6 @@
 private View bottomContentContainer;
 private TextView pageLastUpdatedText;
 private TextView pageLicenseText;
-private TextView pageExternalLink;
 private View readMoreContainer;
 private ListView readMoreList;
 
@@ -88,7 +87,7 @@
 readMoreContainer = 
bottomContentContainer.findViewById(R.id.read_more_container);
 readMoreList = 
(ListView)bottomContentContainer.findViewById(R.id.read_more_list);
 
-pageExternalLink = (TextView) 
bottomContentContainer.findViewById(R.id.page_external_link);
+TextView pageExternalLink = (TextView) 
bottomContentContainer.findViewById(R.id.page_external_link);
 pageExternalLink.setPaintFlags(pageExternalLink.getPaintFlags() | 
Paint.UNDERLINE_TEXT_FLAG);
 pageExternalLink.setOnClickListener(new View.OnClickListener() {
 @Override
diff --git 
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java 
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
index babd012..8d5bbc8 100644
--- 
a/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
+++ 
b/app/src/main/java/org/wikipedia/page/linkpreview/SwipeableBottomDialog.java
@@ -50,7 +50,6 @@
  */
 public abstract class SwipeableBottomDialog extends DialogFragment {
 private final List dialogViews = new ArrayList<>();
-private ViewGroup rootView;
 private ListView dialogListView;
 private int dialogPeekHeight;
 
@@ -76,7 +75,7 @@
 int displayWidth = getDialogWidth();
 int displayHeight = 
inflater.getContext().getResources().getDisplayMetrics().heightPixels;
 
-rootView = (ViewGroup) inflater.inflate(R.layout.dialog_bottom_swipe, 
container);
+ViewGroup rootView = (ViewGroup) 
inflater.inflate(R.layout.dialog_bottom_swipe, container);
 
 dialogViews.add(makeSpaceView(displayWidth, 1));
 dialogViews.add(makeSpaceView(displayWidth, dialogPeekHeight));
diff --git a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java 
b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index e19cf49..4d4d897 100644
--- a/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/app/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -44,7 +44,6 @@
 private EditText searchEditText;
 private SearchFunnel funnel;
 private TextView langButton;
-private FrameLayout langButtonContainer;
 
 public SearchFunnel getFunnel() {
 return funnel;
@@ -287,7 +286,7 @@
 LinearLayout enabledSearchBar = (LinearLayout) 
getActivity().findViewById(R.id.search_bar_enabled);
 TextView searchButton = (TextView) 
getActivity().findViewById(R.id.main_search_bar_text);
 langButton = (TextView) 
getActivity().findViewById(R.id.search_lang_button);
-langButtonContainer = (FrameLayout) 
getActivity().findViewById(R.id.search_lang_button_container);
+FrameLayout langButtonContainer = (FrameLayout) 
getActivity().findV