Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395597 )
Change subject: Fix boldening of on-this-day links.
......................................................................
Fix boldening of on-this-day links.
The previous boldening algorithm was case-sensitive, whereas now it will
be case-insensitive.
Change-Id: I378070b5cc5ebc346082e4781bef7ce422b8a72e
---
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
M app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
M app/src/main/java/org/wikipedia/util/StringUtil.java
3 files changed, 8 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/97/395597/1
diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
index b9688b6..c9dde84 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDay.java
@@ -2,7 +2,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.text.SpannableStringBuilder;
import org.apache.commons.lang3.StringUtils;
import org.wikipedia.dataclient.restbase.page.RbPageSummary;
@@ -11,7 +10,6 @@
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
@@ -41,12 +39,7 @@
if (holidays != null) {
allEvents.addAll(holidays);
}
- Collections.sort(allEvents, new Comparator<Event>() {
- @Override
- public int compare(Event e1, Event e2) {
- return Integer.compare(e2.year(), e1.year());
- }
- });
+ Collections.sort(allEvents, (e1, e2) -> Integer.compare(e2.year(),
e1.year()));
return allEvents;
}
@@ -56,7 +49,7 @@
@SuppressWarnings("unused,NullableProblems") @Required @NonNull
private List<RbPageSummary> pages;
@NonNull
- public SpannableStringBuilder text() {
+ public CharSequence text() {
List<String> pageTitles = new ArrayList<>();
for (RbPageSummary page : pages) {
pageTitles.add((StringUtil.fromHtml(StringUtils.defaultString(page.getNormalizedTitle()))).toString());
diff --git a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
index b730913..bb265e8 100644
--- a/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
+++ b/app/src/main/java/org/wikipedia/feed/onthisday/OnThisDayCard.java
@@ -2,7 +2,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.text.SpannableStringBuilder;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
@@ -67,7 +66,7 @@
return DateUtil.getMonthOnlyDateString(date.getTime());
}
- @NonNull public SpannableStringBuilder text() {
+ @NonNull public CharSequence text() {
return eventShownOnCard.text();
}
diff --git a/app/src/main/java/org/wikipedia/util/StringUtil.java
b/app/src/main/java/org/wikipedia/util/StringUtil.java
index 6345fa5..83752a5 100644
--- a/app/src/main/java/org/wikipedia/util/StringUtil.java
+++ b/app/src/main/java/org/wikipedia/util/StringUtil.java
@@ -137,18 +137,18 @@
}
}
- public static SpannableStringBuilder boldenSubstrings(String text,
@NonNull List<String> subStrings) {
+ @NonNull
+ public static SpannableStringBuilder boldenSubstrings(@NonNull String
text, @NonNull List<String> subStrings) {
SpannableStringBuilder sb = new SpannableStringBuilder(text);
for (String subString : subStrings) {
- if (text.contains(subString)) {
+ int index = text.toLowerCase().indexOf(subString.toLowerCase());
+ if (index != -1) {
StyleSpan b = new StyleSpan(android.graphics.Typeface.BOLD);
- sb.setSpan(b, text.indexOf(subString), text.indexOf(subString)
+ subString.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+ sb.setSpan(b, index, index + subString.length(),
Spannable.SPAN_INCLUSIVE_INCLUSIVE);
}
}
return sb;
}
-
-
private StringUtil() { }
}
--
To view, visit https://gerrit.wikimedia.org/r/395597
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I378070b5cc5ebc346082e4781bef7ce422b8a72e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
