mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-04 08:08:55 +01:00 
			
		
		
		
	Reword download chapter number sorting options
This commit is contained in:
		@@ -147,31 +147,26 @@ class DownloadController :
 | 
			
		||||
                presenter.clearQueue()
 | 
			
		||||
            }
 | 
			
		||||
            R.id.newest, R.id.oldest -> {
 | 
			
		||||
                val adapter = adapter ?: return false
 | 
			
		||||
                val items = adapter.currentItems.sortedBy { it.download.chapter.date_upload }
 | 
			
		||||
                    .toMutableList()
 | 
			
		||||
                if (item.itemId == R.id.newest) {
 | 
			
		||||
                    items.reverse()
 | 
			
		||||
                }
 | 
			
		||||
                adapter.updateDataSet(items)
 | 
			
		||||
                val downloads = items.mapNotNull { it.download }
 | 
			
		||||
                presenter.reorder(downloads)
 | 
			
		||||
                reorderQueue({ it.download.chapter.date_upload }, item.itemId == R.id.newest)
 | 
			
		||||
            }
 | 
			
		||||
            R.id.bigest, R.id.smallest -> {
 | 
			
		||||
                val adapter = adapter ?: return false
 | 
			
		||||
                val items = adapter.currentItems.sortedBy { it.download.chapter.chapter_number }
 | 
			
		||||
                    .toMutableList()
 | 
			
		||||
                if (item.itemId == R.id.bigest) {
 | 
			
		||||
                    items.reverse()
 | 
			
		||||
                }
 | 
			
		||||
                adapter.updateDataSet(items)
 | 
			
		||||
                val downloads = items.mapNotNull { it.download }
 | 
			
		||||
                presenter.reorder(downloads)
 | 
			
		||||
            R.id.asc, R.id.desc -> {
 | 
			
		||||
                reorderQueue({ it.download.chapter.chapter_number }, item.itemId == R.id.desc)
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        return super.onOptionsItemSelected(item)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun <R : Comparable<R>> reorderQueue(selector: (DownloadItem) -> R, reverse: Boolean = false) {
 | 
			
		||||
        val adapter = adapter ?: return
 | 
			
		||||
        val items = adapter.currentItems.sortedBy(selector).toMutableList()
 | 
			
		||||
        if (reverse) {
 | 
			
		||||
            items.reverse()
 | 
			
		||||
        }
 | 
			
		||||
        adapter.updateDataSet(items)
 | 
			
		||||
        val downloads = items.mapNotNull { it.download }
 | 
			
		||||
        presenter.reorder(downloads)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
     * Called when the status of a download changes.
 | 
			
		||||
     *
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user