yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source 
Settings activity refactor
This commit is contained in:
NekoInverter committed 2020-03-23 14:26:54 +08:00
1 parent ba6d41b91f
commit a9b7df3284
248 files changed
+8700 -8980
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/src/main/java/com/hippo/util/PathNaturalComparator.java
+80 -80
View File
@@ -11,94 +11,94 @@ import java.util.Comparator;
*/
public class PathNaturalComparator implements Comparator<String> {
private static final boolean TYPE_SEPARATOR = false;
private static final boolean TYPE_NORMAL = true;
private static final boolean TYPE_SEPARATOR = false;
private static final boolean TYPE_NORMAL = true;
private Comparator<String> naturalComparator = new NaturalComparator();
private Comparator<String> naturalComparator = new NaturalComparator();
@Override
public int compare(String o1, String o2) {
if (o1 == null && o2 == null) {
return 0;
}
if (o1 == null) {
return -1;
}
if (o2 == null) {
return 1;
}
int index1 = 0;
int index2 = 0;
while (true) {
String data1;
String data2;
for (;;) {
int newIndex1 = nextSegmentStart(o1, index1);
if (newIndex1 == index1) {
data1 = null;
break;
private static int nextSegmentStart(String str, int index) {
if (index >= str.length()) {
return index;
}
if (getType(o1.charAt(newIndex1 - 1)) == TYPE_NORMAL) {
data1 = o1.substring(index1, newIndex1);
index1 = newIndex1;
break;
boolean type = getType(str.charAt(index));
int i = index + 1;
while (i < str.length() && type == getType(str.charAt(i))) {
i += 1;
}
index1 = newIndex1;
}
for (;;) {
int newIndex2 = nextSegmentStart(o2, index2);
if (newIndex2 == index2) {
data2 = null;
break;
return i;
}
private static boolean getType(char c) {
if (c == '/' || c == '\\') {
return TYPE_SEPARATOR;
} else {
return TYPE_NORMAL;
}
if (getType(o2.charAt(newIndex2 - 1)) == TYPE_NORMAL) {
data2 = o2.substring(index2, newIndex2);
index2 = newIndex2;
break;
}
@Override
public int compare(String o1, String o2) {
if (o1 == null && o2 == null) {
return 0;
}
if (o1 == null) {
return -1;
}
if (o2 == null) {
return 1;
}
index2 = newIndex2;
}
if (data1 == null && data2 == null) {
return 0;
}
if (data1 == null) {
return -1;
}
if (data2 == null) {
return 1;
}
int index1 = 0;
int index2 = 0;
int result = naturalComparator.compare(data1, data2);
if (result != 0) {
return result;
}
while (true) {
String data1;
String data2;
for (; ; ) {
int newIndex1 = nextSegmentStart(o1, index1);
if (newIndex1 == index1) {
data1 = null;
break;
}
if (getType(o1.charAt(newIndex1 - 1)) == TYPE_NORMAL) {
data1 = o1.substring(index1, newIndex1);
index1 = newIndex1;
break;
}
index1 = newIndex1;
}
for (; ; ) {
int newIndex2 = nextSegmentStart(o2, index2);
if (newIndex2 == index2) {
data2 = null;
break;
}
if (getType(o2.charAt(newIndex2 - 1)) == TYPE_NORMAL) {
data2 = o2.substring(index2, newIndex2);
index2 = newIndex2;
break;
}
index2 = newIndex2;
}
if (data1 == null && data2 == null) {
return 0;
}
if (data1 == null) {
return -1;
}
if (data2 == null) {
return 1;
}
int result = naturalComparator.compare(data1, data2);
if (result != 0) {
return result;
}
}
}
}
private static int nextSegmentStart(String str, int index) {
if (index >= str.length()) {
return index;
}
boolean type = getType(str.charAt(index));
int i = index + 1;
while (i < str.length() && type == getType(str.charAt(i))) {
i += 1;
}
return i;
}
private static boolean getType(char c) {
if (c == '/' || c == '\\') {
return TYPE_SEPARATOR;
} else {
return TYPE_NORMAL;
}
}
}