wbrawner/PassAndroid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ability to sort by date Ascending and Descending

Browse source
This commit is contained in:
ligi 2016-03-20 05:17:25 +01:00
parent 2484bd29b4
commit b0bdeddfe2
7 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/src/androidTest/java/org/ligi/passandroid/TestModule.java
View file

@ -56,7 +56,7 @@ public class TestModule {
@Provides
Settings provideSettings() {
final Settings mock = mock(Settings.class);
when(mock.getSortOrder()).thenReturn(PassSortOrder.DATE);
when(mock.getSortOrder()).thenReturn(PassSortOrder.DATE_ASC);
when(mock.doTraceDroidEmailSend()).thenReturn(false);
return mock;
}

2
android/src/main/java/org/ligi/passandroid/model/AndroidSettings.java
View file

@ -33,7 +33,7 @@ public class AndroidSettings implements Settings {
return order;
}
}
return PassSortOrder.DATE;
return PassSortOrder.DATE_ASC;
}
@Override

12
android/src/main/java/org/ligi/passandroid/model/comparator/PassByTimeComparator.java
View file

@ -6,6 +6,16 @@ import java.util.Comparator;
public class PassByTimeComparator implements Comparator<Pass> {
public final static int DIRECTION_DESC = 1;
public final static int DIRECTION_ASC = -1;
private final int direction;
public PassByTimeComparator(int direction) {
this.direction = direction;
}
@Override
public int compare(Pass lhs, Pass rhs) {
@ -19,6 +29,6 @@ public class PassByTimeComparator implements Comparator<Pass> {
if (rhs.getRelevantDate() == null) {
return -1;
}
return rhs.getRelevantDate().compareTo(lhs.getRelevantDate());
return rhs.getRelevantDate().compareTo(lhs.getRelevantDate()) * direction;
}
}

4
android/src/main/java/org/ligi/passandroid/model/comparator/PassByTypeFirstAndTimeSecondComparator.java
View file

@ -4,9 +4,11 @@ import org.ligi.passandroid.model.Pass;
import java.util.Comparator;
import static org.ligi.passandroid.model.comparator.PassByTimeComparator.DIRECTION_ASC;
public class PassByTypeFirstAndTimeSecondComparator implements Comparator<Pass> {
private final PassByTimeComparator passByTimeComparator = new PassByTimeComparator();
private final PassByTimeComparator passByTimeComparator = new PassByTimeComparator(DIRECTION_ASC);
@Override
public int compare(Pass lhs, Pass rhs) {

9
android/src/main/java/org/ligi/passandroid/model/comparator/PassSortOrder.java
View file

@ -5,7 +5,8 @@ import org.ligi.passandroid.model.Pass;
import java.util.Comparator;
public enum PassSortOrder {
DATE(0),
DATE_DESC(-1),
DATE_ASC(0),
TYPE(1);
private final int i;
@ -22,9 +23,11 @@ public enum PassSortOrder {
switch (this) {
case TYPE:
return new PassByTypeFirstAndTimeSecondComparator();
case DATE_DESC:
return new PassByTimeComparator(-1);
default:
case DATE:
return new PassByTimeComparator();
case DATE_ASC:
return new PassByTimeComparator(1);
}
}
}

1
android/src/main/res/values/arrays.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="sort_order_keys" >
<item>-1</item>
<item>0</item>
<item>1</item>
</string-array>

3
android/src/main/res/values/strings.xml
View file

@ -118,7 +118,8 @@ WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWIS
<string name="found_pass">found: %s</string>
<string name="found__pass">And %d more</string>
<string-array name="sort_orders">
<item>Date</item>
<item>Date Ascending</item>
<item>Date Descending</item>
<item>Type</item>
</string-array>
</resources>