Changed default sorting option for books

app/src/main/java/com/sirekanyan/knigopis/repository/BookOrganizer.kt

@@ -26,8 +26,8 @@ class PlannedBookOrganizerImpl(
 
     override fun sort(books: List<PlannedBook>): List<PlannedBook> =
         when (config.bookSorting) {
-            BookSorting.DEFAULT -> books.sortedByDescending(PlannedBook::priority)
-            BookSorting.BY_TIME -> books.sortedByDescending(PlannedBook::updatedAt)
+            BookSorting.DEFAULT -> books.sortedByDescending(PlannedBook::updatedAt)
+            BookSorting.BY_PROGRESS -> books.sortedByDescending(PlannedBook::priority)
             BookSorting.BY_TITLE -> books.sortedBy(PlannedBook::title)
             BookSorting.BY_AUTHOR -> books.sortedBy(PlannedBook::author)
         }

app/src/main/java/com/sirekanyan/knigopis/repository/BookSorting.kt

@@ -4,20 +4,15 @@ import androidx.annotation.IdRes
 import androidx.annotation.StringRes
 import com.sirekanyan.knigopis.R
 import com.sirekanyan.knigopis.common.android.menu.OptionItem
-import com.sirekanyan.knigopis.common.android.menu.findOption
 
 enum class BookSorting(
     @IdRes override val id: Int,
     @StringRes override val title: Int
 ) : OptionItem {
 
-    DEFAULT(R.id.option_sort_by_progress, R.string.main_option_sort_by_progress),
-    BY_TIME(R.id.option_sort_by_time, R.string.main_option_sort_by_time),
+    DEFAULT(R.id.option_sort_by_time, R.string.main_option_sort_by_time),
+    BY_PROGRESS(R.id.option_sort_by_progress, R.string.main_option_sort_by_progress),
     BY_TITLE(R.id.option_sort_by_title, R.string.main_option_sort_by_title),
     BY_AUTHOR(R.id.option_sort_by_author, R.string.main_option_sort_by_author);
 
-    companion object {
-        fun getById(@IdRes id: Int): BookSorting = findOption(id) ?: DEFAULT
-    }
-
 }

app/src/main/res/values-ru/strings.xml

@@ -23,8 +23,8 @@
     <string name="main.option.profile">Мой профиль</string>
     <string name="main.option.about">О приложении</string>
     <string name="main_option_sort">Сортировать</string>
+    <string name="main_option_sort_by_time">По актуальности</string>
     <string name="main_option_sort_by_progress">По прогрессу</string>
-    <string name="main_option_sort_by_time">По свежести</string>
     <string name="main_option_sort_by_title">По названию</string>
     <string name="main_option_sort_by_author">По автору</string>
     <string name="main_option_sort_users_by_time">По активности</string>

app/src/main/res/values/strings.xml

@@ -22,8 +22,8 @@
     <string name="main.option.profile">Profile</string>
     <string name="main.option.about">About</string>
     <string name="main_option_sort">Sort</string>
-    <string name="main_option_sort_by_progress">By progress</string>
     <string name="main_option_sort_by_time">By update time</string>
+    <string name="main_option_sort_by_progress">By progress</string>
     <string name="main_option_sort_by_title">By title</string>
     <string name="main_option_sort_by_author">By author</string>
     <string name="main_option_sort_users_by_time">By update time</string>