Skip to content

Remove Support[Util|Factory] #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmathieum merged 4 commits into from
Mar 30, 2026
Merged

Remove Support[Util|Factory] #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7397a0c
Remove `Support[Util|Factory]`
mmathieum Mar 30, 2026
b63fe08
fix
mmathieum Mar 30, 2026
ac2e5a5
fix
mmathieum Mar 30, 2026
f219efd
wip
mmathieum Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 20 additions & 21 deletions src/main/java/org/mtransit/android/commons/StringUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,10 @@
import androidx.annotation.Nullable;
import androidx.annotation.PluralsRes;
import androidx.annotation.StringRes;
import androidx.core.util.ObjectsCompat;

import org.mtransit.android.commons.api.SupportFactory;

import java.util.regex.Pattern;

@SuppressWarnings({"unused", "WeakerAccess"})
@SuppressWarnings("WeakerAccess")
public final class StringUtils implements MTLog.Loggable {

private static final String LOG_TAG = StringUtils.class.getSimpleName();
Expand All @@ -24,6 +21,7 @@ public String getLogTag() {
return LOG_TAG;
}

@SuppressWarnings("unused")
public static final char EMPTY_CAR = 0;
public static final String EMPTY = "";

Expand All @@ -38,6 +36,7 @@ public String getLogTag() {

private static final Pattern DUPLICATE_WHITESPACES = Pattern.compile("\\s{2,}");

@SuppressWarnings("unused")
@Nullable
public static String oneLine(@Nullable String string) {
if (string == null || string.isEmpty()) {
Expand All @@ -46,6 +45,7 @@ public static String oneLine(@Nullable String string) {
return ONE_LINE.matcher(string).replaceAll(SPACE_STRING);
}

@SuppressWarnings("unused")
@Nullable
public static String removeDuplicateWhitespaces(@Nullable String string) {
if (string == null || string.isEmpty()) {
Expand All @@ -72,7 +72,6 @@ public static String ellipsize(@Nullable String string, int size) {
return string.substring(0, size - ELLIPSIZE.length()) + ELLIPSIZE;
}


@NonNull
public static String ellipsizeNN(@NonNull String string, int size) {
if (string.length() < size) {
Expand All @@ -89,11 +88,7 @@ public static String trim(@Nullable String string) {
return string.trim();
}

public static boolean equals(@Nullable String str1, @Nullable String str2) {
return ObjectsCompat.equals(str1, str2);
}

public static boolean equalsAlphabeticsAndDigits(@Nullable String str1, @Nullable String str2) {
public static boolean equalsAlphabeticAndDigits(@Nullable String str1, @Nullable String str2) {
if (str1 == null) {
return str2 == null;
} else if (str2 == null) {
Expand All @@ -109,8 +104,8 @@ public static boolean equalsAlphabeticsAndDigits(@Nullable String str1, @Nullabl
for (int i = 0; i < str1Count; ++i) {
char c1 = str1.charAt(i);
char c2 = str2.charAt(i);
if ((SupportFactory.get().isCharacterAlphabetic(c1) || Character.isDigit(c1)) //
&& (SupportFactory.get().isCharacterAlphabetic(c2) || Character.isDigit(c2))) {
if ((Character.isAlphabetic(c1) || Character.isDigit(c1)) //
&& (Character.isAlphabetic(c2) || Character.isDigit(c2))) {
if (c1 != c2 && foldCase(c1) != foldCase(c2)) {
return false;
}
Expand Down Expand Up @@ -147,10 +142,11 @@ public static boolean isDigitsOnly(@NonNull CharSequence str, boolean allowWhite
return true;
}

public static boolean isAlphabeticsOnly(@NonNull CharSequence str, boolean allowWhitespace) {
@SuppressWarnings("unused")
public static boolean isAlphabeticOnly(@NonNull CharSequence str, boolean allowWhitespace) {
final int len = str.length();
for (int i = 0; i < len; i++) {
if (!SupportFactory.get().isCharacterAlphabetic(str.charAt(i))) {
if (!Character.isAlphabetic(str.charAt(i))) {
if (allowWhitespace && Character.isWhitespace(str.charAt(i))) {
continue;
}
Expand All @@ -170,6 +166,7 @@ private static char foldCase(char ch) {
return Character.toLowerCase(Character.toUpperCase(ch));
}

@SuppressWarnings("unused")
public static boolean equalsIgnoreCase(@Nullable String str1, @Nullable String str2) {
return str1 == null ? str2 == null : str1.equalsIgnoreCase(str2);
}
Expand All @@ -186,6 +183,7 @@ public static int getPluralsIdentifier(@NonNull Context context, @NonNull String
return context.getResources().getIdentifier(name, "plurals", context.getPackageName());
}

@SuppressWarnings("unused")
@NonNull
public static String getEmptyOrPlurals(@NonNull Context context, int emptyRes, int pluralsRes, int quantity) {
if (quantity == 0) {
Expand All @@ -204,6 +202,7 @@ public static String getEmptyOrPluralsIdentifier(@NonNull Context context, @NonN
}
}

@SuppressWarnings("unused")
@Nullable
public static String removeNewLine(@Nullable String string) {
if (string == null) {
Expand All @@ -212,6 +211,7 @@ public static String removeNewLine(@Nullable String string) {
return string.replaceAll("[\n\r]", EMPTY);
}

@SuppressWarnings("unused")
@Nullable
public static String removeStartWith(@Nullable String string, @Nullable String[] removeChars) {
if (string == null || string.isEmpty()) {
Expand All @@ -227,6 +227,7 @@ public static String removeStartWith(@Nullable String string, @Nullable String[]
return string;
}

@SuppressWarnings("unused")
@Nullable
public static String replaceStartWith(@Nullable String string, @Nullable String[] removeChars, @NonNull String replacement) {
if (string == null || string.isEmpty()) {
Expand All @@ -242,6 +243,7 @@ public static String replaceStartWith(@Nullable String string, @Nullable String[
return string;
}

@SuppressWarnings("unused")
@Nullable
public static String removeStartWith(@Nullable String string, @Nullable String[] removeChars, int keepLast) {
if (string == null || string.isEmpty()) {
Expand Down Expand Up @@ -272,9 +274,7 @@ public static String replaceAll(@Nullable String string, @Nullable String[] repl

@NonNull
public static String replaceAll(@NonNull String string, @Nullable Pattern[] patterns, @NonNull String replacement) {
if (string.isEmpty()) {
return string;
}
if (string.isEmpty()) return string;
Comment thread
mmathieum marked this conversation as resolved.
if (patterns != null) {
for (Pattern pattern : patterns) {
string = pattern.matcher(string).replaceAll(replacement);
Expand All @@ -283,13 +283,12 @@ public static String replaceAll(@NonNull String string, @Nullable Pattern[] patt
return string;
}

@SuppressWarnings("unused")
public static boolean isUppercaseOnly(@Nullable CharSequence str, boolean allowWhitespace, boolean checkAZOnly) {
if (str == null || str.length() == 0) {
return false;
}
if (str == null || str.length() == 0) return false;
Comment thread
mmathieum marked this conversation as resolved.
final int len = str.length();
for (int i = 0; i < len; i++) {
if (checkAZOnly && !SupportFactory.get().isCharacterAlphabetic(str.charAt(i))) {
if (checkAZOnly && !Character.isAlphabetic(str.charAt(i))) {
continue;
}
if (!Character.isUpperCase(str.charAt(i))) {
Expand Down
19 changes: 0 additions & 19 deletions src/main/java/org/mtransit/android/commons/api/BaklavaAndroid16Support.java
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions src/main/java/org/mtransit/android/commons/api/NougatSupport.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/org/mtransit/android/commons/api/NougatSupportMR1.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/org/mtransit/android/commons/api/OreoSupport.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/org/mtransit/android/commons/api/OreoSupportMR1.java
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions src/main/java/org/mtransit/android/commons/api/PieSupport.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/java/org/mtransit/android/commons/api/QAndroid10Support.java
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions src/main/java/org/mtransit/android/commons/api/RAndroid11Support.java
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/main/java/org/mtransit/android/commons/api/SAndroid12Support.java
View file
Open in desktop

This file was deleted.

Loading