Skip to content

Commit 91335e8

Browse files
committed
More API 16 fixes, toLowerCase with root locale
1 parent ea881c9 commit 91335e8

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

icondialog/src/main/java/com/maltaisn/icondialog/IconFilter.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,12 @@
2222
package com.maltaisn.icondialog;
2323

2424

25-
import androidx.annotation.NonNull;
26-
import androidx.annotation.Nullable;
27-
2825
import java.util.ArrayList;
2926
import java.util.List;
27+
import java.util.Locale;
28+
29+
import androidx.annotation.NonNull;
30+
import androidx.annotation.Nullable;
3031

3132
/**
3233
* Default icon searcher used by IconDialog
@@ -123,7 +124,7 @@ public List<Icon> getIconsForSearch(@Nullable String search) {
123124
if (normalizeSearch) {
124125
searchTerms[i] = IconHelper.normalizeText(searchTerms[i]);
125126
} else {
126-
searchTerms[i] = searchTerms[i].toLowerCase();
127+
searchTerms[i] = searchTerms[i].toLowerCase(Locale.ROOT);
127128
}
128129
}
129130
}

icondialog/src/main/java/com/maltaisn/icondialog/IconHelper.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,6 @@
2727
import android.util.Log;
2828
import android.util.SparseArray;
2929

30-
import androidx.annotation.NonNull;
31-
import androidx.annotation.Nullable;
32-
import androidx.annotation.XmlRes;
33-
3430
import org.xmlpull.v1.XmlPullParser;
3531
import org.xmlpull.v1.XmlPullParserException;
3632

@@ -39,6 +35,11 @@
3935
import java.util.ArrayList;
4036
import java.util.Collections;
4137
import java.util.List;
38+
import java.util.Locale;
39+
40+
import androidx.annotation.NonNull;
41+
import androidx.annotation.Nullable;
42+
import androidx.annotation.XmlRes;
4243

4344
@SuppressWarnings({"WeakerAccess", "unused"})
4445
public class IconHelper {
@@ -177,7 +178,7 @@ SparseArray<Icon> getIcons() {
177178
public Label getLabel(String name) {
178179
if (!dataLoaded) return null;
179180

180-
name = name.toLowerCase();
181+
name = name.toLowerCase(Locale.ROOT);
181182
if (name.startsWith("_")) {
182183
name = name.substring(1);
183184
int index = Collections.binarySearch(groupLabels, name);
@@ -636,7 +637,7 @@ private static class LabelRef {
636637
static String normalizeText(String text) {
637638
// NOTE: Might have to change this method if more translations are made
638639
// For example, right now it would remove all chinese and arabic characters
639-
text = text.toLowerCase().trim();
640+
text = text.toLowerCase(Locale.ROOT).trim();
640641
String normalized = Normalizer.normalize(text, Normalizer.Form.NFKD);
641642
StringBuilder sb = new StringBuilder();
642643
for (int i = 0; i < normalized.length(); i++) {

icondialog/src/main/java/com/maltaisn/icondialog/StickyHeaderDecoration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private void setHeaderViewHolder(int position, View parent) {
118118

119119
if (stickyHeaderHeight == -1) {
120120
// Measure parent RecyclerView
121-
int parentWidth = parent.getWidth() + parent.getPaddingStart() + parent.getPaddingEnd();
121+
int parentWidth = parent.getWidth() + parent.getPaddingLeft() + parent.getPaddingRight();
122122
int widthSpec = View.MeasureSpec.makeMeasureSpec(parentWidth, View.MeasureSpec.EXACTLY);
123123
int heightSpec = View.MeasureSpec.makeMeasureSpec(parent.getHeight(), View.MeasureSpec.UNSPECIFIED);
124124

0 commit comments

Comments
 (0)