diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java index 01b6ebe7..6d1ec23f 100644 --- a/mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java +++ b/mobile/src/com/cradle/iitc_mobile/IITC_ActionBarHelper.java @@ -7,6 +7,8 @@ import android.preference.PreferenceManager; import android.widget.ArrayAdapter; import android.widget.Toast; +import java.util.Comparator; + public class IITC_ActionBarHelper implements OnNavigationListener { // Show/hide the up arrow on the very left // getActionBar().setDisplayHomeAsUpEnabled(enabled); @@ -21,6 +23,19 @@ public class IITC_ActionBarHelper implements OnNavigationListener { // getActionBar().setHomeButtonEnabled(enabled); private class HighlighterAdapter extends ArrayAdapter { + + // Move "No Highlights" on top. Sort the rest alphabetically + private class HighlighterComparator implements Comparator { + @Override + public int compare(String lhs, String rhs) { + if (lhs.equals("No Highlights")) return -1000; + else if (rhs.equals("No Highlights")) return 1000; + else return lhs.compareTo(rhs); + } + } + + private HighlighterComparator mComparator = new HighlighterComparator(); + public HighlighterAdapter() { super(mIitc, android.R.layout.simple_list_item_1); clear(); @@ -30,6 +45,7 @@ public class IITC_ActionBarHelper implements OnNavigationListener { public void add(String object) { super.remove(object); // to avoid duplicates super.add(object); + super.sort(mComparator); } @Override