Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit 19182a2

Browse files
committed
Make module sorting ignore case! (Fix #142)
1 parent 7e4da5c commit 19182a2

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

app/src/main/java/com/fox2code/mmm/module/ModuleHolder.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import java.util.Comparator;
2323
import java.util.List;
24+
import java.util.Locale;
2425
import java.util.Objects;
2526

2627
public final class ModuleHolder implements Comparable<ModuleHolder> {
@@ -95,6 +96,10 @@ public String getMainModuleName() {
9596
return moduleInfo.name;
9697
}
9798

99+
public String getMainModuleNameLowercase() {
100+
return this.getMainModuleName().toLowerCase(Locale.ROOT);
101+
}
102+
98103
public String getMainModuleConfig() {
99104
if (this.moduleInfo == null) return null;
100105
String config = this.moduleInfo.config;
@@ -250,7 +255,8 @@ public int compare(ModuleHolder o1, ModuleHolder o2) {
250255
public int compare(ModuleHolder o1, ModuleHolder o2) {
251256
int cmp = Integer.compare(o1.filterLevel, o2.filterLevel);
252257
if (cmp != 0) return cmp;
253-
return o1.getMainModuleName().compareTo(o2.getMainModuleName());
258+
return o1.getMainModuleNameLowercase()
259+
.compareTo(o2.getMainModuleNameLowercase());
254260
}
255261
},
256262
SPECIAL_NOTIFICATIONS(R.string.loading, true, false),

app/src/main/java/com/fox2code/mmm/module/ModuleSorter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ public int compare(ModuleHolder holder1, ModuleHolder holder2) {
2121
if (type1 == type2 && type1 == ModuleHolder.Type.INSTALLABLE) {
2222
int compare = Integer.compare(holder1.filterLevel, holder2.filterLevel);
2323
if (compare != 0) return compare;
24-
compare = holder1.getMainModuleName()
25-
.compareTo(holder2.getMainModuleName());
24+
compare = holder1.getMainModuleNameLowercase()
25+
.compareTo(holder2.getMainModuleNameLowercase());
2626
if (compare != 0) return compare;
2727
}
2828
return super.compare(holder1, holder2);

0 commit comments

Comments
 (0)