diff --git a/core/res/menu/activity_torrents.xml b/core/res/menu/activity_torrents.xml index a596e1ec..1b368620 100644 --- a/core/res/menu/activity_torrents.xml +++ b/core/res/menu/activity_torrents.xml @@ -69,6 +69,7 @@ + diff --git a/core/res/values/strings.xml b/core/res/values/strings.xml index eaa7d429..72c12dc4 100644 --- a/core/res/values/strings.xml +++ b/core/res/values/strings.xml @@ -32,6 +32,7 @@ Status Date done Date added + Percent downloaded Download speed Upload speed Ratio diff --git a/core/src/org/transdroid/core/gui/TorrentsActivity.java b/core/src/org/transdroid/core/gui/TorrentsActivity.java index 3d6bd178..611f5221 100644 --- a/core/src/org/transdroid/core/gui/TorrentsActivity.java +++ b/core/src/org/transdroid/core/gui/TorrentsActivity.java @@ -796,6 +796,11 @@ public class TorrentsActivity extends Activity implements OnNavigationListener, fragmentTorrents.sortBy(TorrentsSortBy.DateAdded); } + @OptionsItem(resName = "action_sort_percent") + protected void sortByPercent() { + fragmentTorrents.sortBy(TorrentsSortBy.Percent); + } + @OptionsItem(resName = "action_sort_downspeed") protected void sortByDownspeed() { fragmentTorrents.sortBy(TorrentsSortBy.DownloadSpeed); diff --git a/lib/src/org/transdroid/daemon/TorrentsComparator.java b/lib/src/org/transdroid/daemon/TorrentsComparator.java index 64ea5bd6..57bfc15d 100644 --- a/lib/src/org/transdroid/daemon/TorrentsComparator.java +++ b/lib/src/org/transdroid/daemon/TorrentsComparator.java @@ -66,6 +66,8 @@ public class TorrentsComparator implements Comparator { return tor1.getDateAdded().compareTo(tor2.getDateAdded()); case DateDone: return tor1.getDateDone().compareTo(tor2.getDateDone()); + case Percent: + return new Float(tor1.getDownloadedPercentage()).compareTo(new Float(tor2.getDownloadedPercentage())); case DownloadSpeed: return new Integer(tor1.getRateDownload()).compareTo(new Integer(tor2.getRateDownload())); case UploadSpeed: @@ -87,6 +89,8 @@ public class TorrentsComparator implements Comparator { return 0 - tor1.getDateAdded().compareTo(tor2.getDateAdded()); case DateDone: return 0 - tor1.getDateDone().compareTo(tor2.getDateDone()); + case Percent: + return 0 - (new Float(tor1.getDownloadedPercentage()).compareTo(new Float(tor2.getDownloadedPercentage()))); case DownloadSpeed: return 0 - (new Integer(tor1.getRateDownload()).compareTo(new Integer(tor2.getRateDownload()))); case UploadSpeed: diff --git a/lib/src/org/transdroid/daemon/TorrentsSortBy.java b/lib/src/org/transdroid/daemon/TorrentsSortBy.java index c4d9a7a0..afc7a92b 100644 --- a/lib/src/org/transdroid/daemon/TorrentsSortBy.java +++ b/lib/src/org/transdroid/daemon/TorrentsSortBy.java @@ -28,7 +28,8 @@ public enum TorrentsSortBy { DateAdded (4), UploadSpeed (5), Ratio (6), - DownloadSpeed (7); + DownloadSpeed (7), + Percent (8); private int code; private static final Map lookup = new HashMap();