[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: fix or suppress miscellaneous lint
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/326055 )
Change subject: Hygiene: fix or suppress miscellaneous lint
..
Hygiene: fix or suppress miscellaneous lint
Change-Id: Ib0fdf6a5e79b377f79c1d651a5152631b756e888
---
D app/src/main/java/org/wikipedia/model/EnumStrMap.java
D app/src/main/res/color/nav_item_selector_dark.xml
D app/src/main/res/color/nav_item_selector_light.xml
D app/src/main/res/layout/inflate_header_nav_drawer.xml
M app/src/main/res/layout/view_description_edit.xml
M app/src/main/res/values/dimens.xml
6 files changed, 1 insertion(+), 97 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git a/app/src/main/java/org/wikipedia/model/EnumStrMap.java
b/app/src/main/java/org/wikipedia/model/EnumStrMap.java
deleted file mode 100644
index 2ab5ba1..000
--- a/app/src/main/java/org/wikipedia/model/EnumStrMap.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.wikipedia.model;
-
-import android.support.annotation.NonNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class EnumStrMap & EnumStr> {
-@NonNull private final Map map;
-
-public EnumStrMap(@NonNull Class enumeration) {
-map = strToEnumMap(enumeration);
-}
-
-@NonNull public T get(@NonNull String str) {
-T status = map.get(str);
-if (status == null) {
-throw new IllegalArgumentException("str=" + str);
-}
-return status;
-}
-
-@NonNull private Map strToEnumMap(@NonNull Class
enumeration) {
-Map ret = new HashMap<>();
-for (T value : enumeration.getEnumConstants()) {
-ret.put(value.str(), value);
-}
-return ret;
-}
-}
\ No newline at end of file
diff --git a/app/src/main/res/color/nav_item_selector_dark.xml
b/app/src/main/res/color/nav_item_selector_dark.xml
deleted file mode 100644
index 042e303..000
--- a/app/src/main/res/color/nav_item_selector_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-http://schemas.android.com/apk/res/android";>
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/color/nav_item_selector_light.xml
b/app/src/main/res/color/nav_item_selector_light.xml
deleted file mode 100644
index 8d13e2e..000
--- a/app/src/main/res/color/nav_item_selector_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-http://schemas.android.com/apk/res/android";>
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/inflate_header_nav_drawer.xml
b/app/src/main/res/layout/inflate_header_nav_drawer.xml
deleted file mode 100644
index 4b5b8e9..000
--- a/app/src/main/res/layout/inflate_header_nav_drawer.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-http://schemas.android.com/apk/res/android";
-xmlns:app="http://schemas.android.com/apk/res-auto";
-xmlns:tools="http://schemas.android.com/tools";
-android:layout_width="match_parent"
-android:layout_height="wrap_content"
-android:minHeight="@dimen/nav_drawer_header_height"
-android:orientation="vertical"
-android:background="@color/foundation_blue">
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_description_edit.xml
b/app/src/main/res/layout/view_description_edit.xml
index 198dcee..ba29420 100644
--- a/app/src/main/res/layout/view_description_edit.xml
+++ b/app/src/main/res/layout/view_description_edit.xml
@@ -78,7 +78,7 @@
android:textAlignment="viewStart"
android:gravity="start"
app:counterEnabled="true"
-app:counterMaxLength="140"
+app:counterMaxLength="@integer/description_max_chars"
app:counterOverflowTextAppearance="@style/CounterOverflowTextAppearance">
8dp
0dp
-150dp
-
3dp
12
--
To view, visit https://gerrit.wikimedia.org/r/326055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0fdf6a5e79b377f79c1d651a5152631b756e888
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: BearND
Gerrit-Reviewer: Dbrant
Gerrit-Reviewer: Mholloway
Gerrit-Reviewer: Sniedzielski
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: fix or suppress miscellaneous lint
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325987 )
Change subject: Hygiene: fix or suppress miscellaneous lint
..
Hygiene: fix or suppress miscellaneous lint
Change-Id: Iadd5b34119aa7ffacce7917949e2eeaf503cdafe
---
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/res/drawable/ic_illustration_description_success.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
8 files changed, 20 insertions(+), 12 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
index 96dec4d..a7fddc8 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
@@ -32,7 +32,6 @@
@BindView(R.id.view_description_edit_text_layout) TextInputLayout
pageDescriptionLayout;
@BindView(R.id.view_description_edit_progress_bar) ProgressBar progressBar;
-@Nullable private PageTitle pageTitle;
@Nullable private String originalDescription;
@Nullable private Callback callback;
@@ -66,7 +65,6 @@
}
public void setPageTitle(@NonNull PageTitle pageTitle) {
-this.pageTitle = pageTitle;
setTitle(pageTitle.getDisplayText());
originalDescription = pageTitle.getDescription();
setDescription(originalDescription);
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index b8b5149..b77aac2 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -1,5 +1,6 @@
package org.wikipedia.main;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.DownloadManager;
@@ -429,6 +430,7 @@
Constants.ACTIVITY_REQUEST_WRITE_EXTERNAL_STORAGE_PERMISSION);
}
+@SuppressLint("CommitTransaction")
private void openSearchFragment(@NonNull SearchInvokeSource source,
@Nullable String query) {
Fragment fragment = searchFragment();
if (fragment == null) {
@@ -440,6 +442,7 @@
}
}
+@SuppressLint("CommitTransaction")
private void closeSearchFragment(@NonNull SearchFragment fragment) {
getChildFragmentManager().beginTransaction().remove(fragment).commitNowAllowingStateLoss();
}
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index d6aebab..992e4dc 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,5 +1,6 @@
package org.wikipedia.page;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.SearchManager;
import android.appwidget.AppWidgetManager;
@@ -847,6 +848,7 @@
this.pageLoadCallbacks = pageLoadCallbacks;
}
+@SuppressLint("CommitTransaction")
private void openSearchFragment(@NonNull SearchInvokeSource source,
@Nullable String query) {
Fragment fragment = searchFragment();
if (fragment == null) {
@@ -858,6 +860,7 @@
}
}
+@SuppressLint("CommitTransaction")
private void closeSearchFragment(@NonNull SearchFragment fragment) {
getSupportFragmentManager().beginTransaction().remove(fragment).commitNowAllowingStateLoss();
}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index 46e972a..feaf172 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -353,6 +353,9 @@
private void setTopOffset(boolean noImage) {
statusBarPlaceholder.setVisibility(noImage ? View.VISIBLE : View.GONE);
int offset = noImage ?
getDimensionPixelSize(R.dimen.lead_no_image_top_offset_dp) : 0;
+
+// Offset is a resolved pixel dimension, not a resource id
+//noinspection ResourceType
setPadding(0, offset, 0, 0);
}
diff --git a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
index 747e287..dc305ed 100644
--- a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
+++ b/app/src/main/java/or
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: fix or suppress miscellaneous lint
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/326055 )
Change subject: Hygiene: fix or suppress miscellaneous lint
..
Hygiene: fix or suppress miscellaneous lint
Change-Id: Ib0fdf6a5e79b377f79c1d651a5152631b756e888
---
M app/src/main/java/org/wikipedia/feed/FeedFragment.java
D app/src/main/java/org/wikipedia/model/EnumStrMap.java
D app/src/main/res/color/nav_item_selector_dark.xml
D app/src/main/res/color/nav_item_selector_light.xml
D app/src/main/res/layout/inflate_header_nav_drawer.xml
M app/src/main/res/layout/view_description_edit.xml
M app/src/main/res/values/dimens.xml
7 files changed, 2 insertions(+), 98 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/55/326055/1
diff --git a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
index 4078712..420ccd7 100644
--- a/app/src/main/java/org/wikipedia/feed/FeedFragment.java
+++ b/app/src/main/java/org/wikipedia/feed/FeedFragment.java
@@ -153,7 +153,7 @@
coordinator.setFeedUpdateListener(null);
swipeRefreshLayout.setOnRefreshListener(null);
feedView.removeOnScrollListener(feedScrollListener);
-feedView.setCallback((FeedAdapter.Callback) null);
+feedView.setCallback(null);
feedView.setAdapter(null);
feedAdapter = null;
unbinder.unbind();
diff --git a/app/src/main/java/org/wikipedia/model/EnumStrMap.java
b/app/src/main/java/org/wikipedia/model/EnumStrMap.java
deleted file mode 100644
index 2ab5ba1..000
--- a/app/src/main/java/org/wikipedia/model/EnumStrMap.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.wikipedia.model;
-
-import android.support.annotation.NonNull;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class EnumStrMap & EnumStr> {
-@NonNull private final Map map;
-
-public EnumStrMap(@NonNull Class enumeration) {
-map = strToEnumMap(enumeration);
-}
-
-@NonNull public T get(@NonNull String str) {
-T status = map.get(str);
-if (status == null) {
-throw new IllegalArgumentException("str=" + str);
-}
-return status;
-}
-
-@NonNull private Map strToEnumMap(@NonNull Class
enumeration) {
-Map ret = new HashMap<>();
-for (T value : enumeration.getEnumConstants()) {
-ret.put(value.str(), value);
-}
-return ret;
-}
-}
\ No newline at end of file
diff --git a/app/src/main/res/color/nav_item_selector_dark.xml
b/app/src/main/res/color/nav_item_selector_dark.xml
deleted file mode 100644
index 042e303..000
--- a/app/src/main/res/color/nav_item_selector_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-http://schemas.android.com/apk/res/android";>
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/color/nav_item_selector_light.xml
b/app/src/main/res/color/nav_item_selector_light.xml
deleted file mode 100644
index 8d13e2e..000
--- a/app/src/main/res/color/nav_item_selector_light.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-http://schemas.android.com/apk/res/android";>
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/inflate_header_nav_drawer.xml
b/app/src/main/res/layout/inflate_header_nav_drawer.xml
deleted file mode 100644
index 4b5b8e9..000
--- a/app/src/main/res/layout/inflate_header_nav_drawer.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-http://schemas.android.com/apk/res/android";
-xmlns:app="http://schemas.android.com/apk/res-auto";
-xmlns:tools="http://schemas.android.com/tools";
-android:layout_width="match_parent"
-android:layout_height="wrap_content"
-android:minHeight="@dimen/nav_drawer_header_height"
-android:orientation="vertical"
-android:background="@color/foundation_blue">
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_description_edit.xml
b/app/src/main/res/layout/view_description_edit.xml
index 198dcee..ba29420 100644
--- a/app/src/main/res/layout/view_description_edit.xml
+++ b/app/src/main/res/layout/view_description_edit.xml
@@ -78,7 +78,7 @@
android:textAlignment="viewStart"
android:gravity="start"
app:counterEnabled="true"
-app:counterMaxLength="140"
+app:counterMaxLength="@integer/description_max_chars"
app:counterOverflowTextAppearance="@style/CounterOverflowTextAppearance">
8dp
0dp
-150dp
-
3dp
12
--
To view, visit https://gerrit.wikimedia.org/r/326055
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0fdf6a5e79b377f79c1d651a5152631b756e888
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski
Gerrit-Reviewer: Sniedzielski
_
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Hygiene: fix or suppress miscellaneous lint
Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/325987 )
Change subject: Hygiene: fix or suppress miscellaneous lint
..
Hygiene: fix or suppress miscellaneous lint
Change-Id: Iadd5b34119aa7ffacce7917949e2eeaf503cdafe
---
M app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
M app/src/main/java/org/wikipedia/main/MainFragment.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
M app/src/main/res/drawable/ic_illustration_description_success.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
8 files changed, 20 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/87/325987/1
diff --git
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
index 96dec4d..a7fddc8 100644
--- a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditView.java
@@ -32,7 +32,6 @@
@BindView(R.id.view_description_edit_text_layout) TextInputLayout
pageDescriptionLayout;
@BindView(R.id.view_description_edit_progress_bar) ProgressBar progressBar;
-@Nullable private PageTitle pageTitle;
@Nullable private String originalDescription;
@Nullable private Callback callback;
@@ -66,7 +65,6 @@
}
public void setPageTitle(@NonNull PageTitle pageTitle) {
-this.pageTitle = pageTitle;
setTitle(pageTitle.getDisplayText());
originalDescription = pageTitle.getDescription();
setDescription(originalDescription);
diff --git a/app/src/main/java/org/wikipedia/main/MainFragment.java
b/app/src/main/java/org/wikipedia/main/MainFragment.java
index b8b5149..b77aac2 100644
--- a/app/src/main/java/org/wikipedia/main/MainFragment.java
+++ b/app/src/main/java/org/wikipedia/main/MainFragment.java
@@ -1,5 +1,6 @@
package org.wikipedia.main;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.DownloadManager;
@@ -429,6 +430,7 @@
Constants.ACTIVITY_REQUEST_WRITE_EXTERNAL_STORAGE_PERMISSION);
}
+@SuppressLint("CommitTransaction")
private void openSearchFragment(@NonNull SearchInvokeSource source,
@Nullable String query) {
Fragment fragment = searchFragment();
if (fragment == null) {
@@ -440,6 +442,7 @@
}
}
+@SuppressLint("CommitTransaction")
private void closeSearchFragment(@NonNull SearchFragment fragment) {
getChildFragmentManager().beginTransaction().remove(fragment).commitNowAllowingStateLoss();
}
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index d6aebab..992e4dc 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -1,5 +1,6 @@
package org.wikipedia.page;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.SearchManager;
import android.appwidget.AppWidgetManager;
@@ -847,6 +848,7 @@
this.pageLoadCallbacks = pageLoadCallbacks;
}
+@SuppressLint("CommitTransaction")
private void openSearchFragment(@NonNull SearchInvokeSource source,
@Nullable String query) {
Fragment fragment = searchFragment();
if (fragment == null) {
@@ -858,6 +860,7 @@
}
}
+@SuppressLint("CommitTransaction")
private void closeSearchFragment(@NonNull SearchFragment fragment) {
getSupportFragmentManager().beginTransaction().remove(fragment).commitNowAllowingStateLoss();
}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index 46e972a..feaf172 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
@@ -353,6 +353,9 @@
private void setTopOffset(boolean noImage) {
statusBarPlaceholder.setVisibility(noImage ? View.VISIBLE : View.GONE);
int offset = noImage ?
getDimensionPixelSize(R.dimen.lead_no_image_top_offset_dp) : 0;
+
+// Offset is a resolved pixel dimension, not a resource id
+//noinspection ResourceType
setPadding(0, offset, 0, 0);
}
diff --git a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
b/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
index 747e287..dc305ed 100644
--- a/app/src/main/java/org/wikipedia/page/tabs/TabsProvider.java
+++ b/app/src/
