Skip to content

Commit 1ea5da3

Browse files
weblateweblate
committed
Merge remote-tracking branch 'origin/main'
2 parents 8f450a4 + 9366051 commit 1ea5da3

File tree

57 files changed

+210
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+210
-214
lines changed

‎app/src/main/java/com/capyreader/app/preferences/AppPreferences.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import com.jocmp.capy.ArticleFilter
1111
import com.jocmp.capy.articles.FontOption
1212
import com.jocmp.capy.articles.FontSize
1313
import com.jocmp.capy.articles.FullContentParserType
14-
import com.jocmp.capy.articles.UnreadSortOrder
14+
import com.jocmp.capy.articles.SortOrder
1515
import com.jocmp.capy.preferences.AndroidPreferenceStore
1616
import com.jocmp.capy.preferences.Preference
1717
import com.jocmp.capy.preferences.PreferenceStore
@@ -134,10 +134,10 @@ class AppPreferences(context: Context) {
134134
val backAction: Preference<BackAction>
135135
get() = preferenceStore.getEnum("article_list_back_action", BackAction.default)
136136

137-
val unreadSort: Preference<UnreadSortOrder>
137+
val sortOrder: Preference<SortOrder>
138138
get() = preferenceStore.getEnum(
139-
"article_list_unread_sort_order",
140-
UnreadSortOrder.default
139+
"article_list_sort_order",
140+
SortOrder.default
141141
)
142142

143143
val showFeedName: Preference<Boolean>

‎app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class ArticleScreenViewModel(
7474

7575
private var _showUnauthorizedMessage by mutableStateOf(UnauthorizedMessageState.HIDE)
7676

77-
val unreadSort = appPreferences.articleListOptions.unreadSort.stateIn(viewModelScope)
77+
val sortOrder = appPreferences.articleListOptions.sortOrder.stateIn(viewModelScope)
7878

7979
val afterReadAll =
8080
appPreferences.articleListOptions.afterReadAllBehavior.stateIn(viewModelScope)
@@ -88,12 +88,12 @@ class ArticleScreenViewModel(
8888
filter,
8989
_searchQuery,
9090
articlesSince,
91-
unreadSort
91+
sortOrder
9292
) { filter, query, since, sort ->
9393
account.buildArticlePager(
9494
filter = filter,
9595
query = query,
96-
unreadSort = sort,
96+
sortOrder = sort,
9797
since = since
9898
).flow
9999
}.flatMapLatest { it }
@@ -263,7 +263,7 @@ class ArticleScreenViewModel(
263263
val articleIDs = account.unreadArticleIDs(
264264
filter = latestFilter,
265265
range = range,
266-
unreadSort = unreadSort.value,
266+
sortOrder = sortOrder.value,
267267
query = _searchQuery.value,
268268
)
269269

‎app/src/main/java/com/capyreader/app/ui/settings/PreferenceSelect.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ private fun PreferenceSelectPreview() {
141141
update = { selected = it },
142142
options = options,
143143
optionText = { it },
144-
label = R.string.article_list_unread_sort_title
144+
label = R.string.article_list_sort_title
145145
)
146146
}
147147
}

‎app/src/main/java/com/capyreader/app/ui/settings/panels/GeneralSettingsPanel.kt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ import com.capyreader.app.ui.theme.CapyTheme
5858
import com.jocmp.capy.accounts.AutoDelete
5959
import com.jocmp.capy.accounts.Source
6060
import com.jocmp.capy.articles.FullContentParserType
61-
import com.jocmp.capy.articles.UnreadSortOrder
61+
import com.jocmp.capy.articles.SortOrder
6262
import com.jocmp.capy.common.launchUI
6363
import org.koin.androidx.compose.koinViewModel
6464
import java.lang.String.CASE_INSENSITIVE_ORDER
@@ -90,8 +90,8 @@ fun GeneralSettingsPanel(
9090
updateAutoDelete = viewModel::updateAutoDelete,
9191
autoDelete = viewModel.autoDelete,
9292
onClearArticles = viewModel::clearAllArticles,
93-
updateUnreadSort = viewModel::updateUnreadSort,
94-
unreadSort = viewModel.unreadSort,
93+
updateSortOrder = viewModel::updateSortOrder,
94+
sortOrder = viewModel.sortOrder,
9595
updateConfirmMarkAllRead = viewModel::updateConfirmMarkAllRead,
9696
updateMarkReadOnScroll = viewModel::updateMarkReadOnScroll,
9797
confirmMarkAllRead = viewModel.confirmMarkAllRead,
@@ -119,8 +119,8 @@ fun GeneralSettingsPanelView(
119119
updateOpenLinksInternally: (canOpenLinksInternally: Boolean) -> Unit,
120120
updateAutoDelete: (AutoDelete) -> Unit,
121121
autoDelete: AutoDelete,
122-
updateUnreadSort: (UnreadSortOrder) -> Unit,
123-
unreadSort: UnreadSortOrder,
122+
updateSortOrder: (SortOrder) -> Unit,
123+
sortOrder: SortOrder,
124124
updateStickyFullContent: (enable: Boolean) -> Unit,
125125
enableStickyFullContent: Boolean,
126126
updateConfirmMarkAllRead: (enable: Boolean) -> Unit,
@@ -149,9 +149,9 @@ fun GeneralSettingsPanelView(
149149
verticalArrangement = Arrangement.spacedBy(16.dp),
150150
modifier = Modifier.verticalScroll(rememberScrollState())
151151
) {
152-
UnreadSortOrderSelect(
153-
unreadSort,
154-
updateUnreadSort
152+
SortOrderSelect(
153+
sortOrder,
154+
updateSortOrder
155155
)
156156

157157
FormSection(title = stringResource(R.string.settings_section_categories)) {
@@ -377,8 +377,8 @@ private fun GeneralSettingsPanelPreview() {
377377
updateOpenLinksInternally = {},
378378
updateAutoDelete = {},
379379
autoDelete = AutoDelete.WEEKLY,
380-
unreadSort = UnreadSortOrder.NEWEST_FIRST,
381-
updateUnreadSort = {},
380+
sortOrder = SortOrder.NEWEST_FIRST,
381+
updateSortOrder = {},
382382
onNavigateToNotifications = {},
383383
markReadOnScroll = true,
384384
updateConfirmMarkAllRead = {},

‎app/src/main/java/com/capyreader/app/ui/settings/panels/GeneralSettingsViewModel.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import com.capyreader.app.refresher.RefreshScheduler
1212
import com.jocmp.capy.Account
1313
import com.jocmp.capy.accounts.AutoDelete
1414
import com.jocmp.capy.articles.FullContentParserType
15-
import com.jocmp.capy.articles.UnreadSortOrder
15+
import com.jocmp.capy.articles.SortOrder
1616
import com.jocmp.capy.preferences.getAndSet
1717
import kotlinx.coroutines.Dispatchers
1818
import kotlinx.coroutines.launch
@@ -33,7 +33,7 @@ class GeneralSettingsViewModel(
3333
var canOpenLinksInternally by mutableStateOf(appPreferences.openLinksInternally.get())
3434
private set
3535

36-
var unreadSort by mutableStateOf(appPreferences.articleListOptions.unreadSort.get())
36+
var sortOrder by mutableStateOf(appPreferences.articleListOptions.sortOrder.get())
3737
private set
3838

3939
var confirmMarkAllRead by mutableStateOf(appPreferences.articleListOptions.confirmMarkAllRead.get())
@@ -64,10 +64,10 @@ class GeneralSettingsViewModel(
6464
this.refreshInterval = interval
6565
}
6666

67-
fun updateUnreadSort(sort: UnreadSortOrder) {
68-
appPreferences.articleListOptions.unreadSort.set(sort)
67+
fun updateSortOrder(sort: SortOrder) {
68+
appPreferences.articleListOptions.sortOrder.set(sort)
6969

70-
this.unreadSort = sort
70+
this.sortOrder = sort
7171
}
7272

7373
fun updateAutoDelete(autoDelete: AutoDelete) {

‎app/src/main/java/com/capyreader/app/ui/settings/panels/UnreadSortOrderSelect.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ import androidx.compose.runtime.Composable
44
import androidx.compose.ui.res.stringResource
55
import com.capyreader.app.R
66
import com.capyreader.app.ui.settings.PreferenceSelect
7-
import com.jocmp.capy.articles.UnreadSortOrder
7+
import com.jocmp.capy.articles.SortOrder
88

99
@Composable
10-
fun UnreadSortOrderSelect(
11-
selected: UnreadSortOrder,
12-
update: (UnreadSortOrder) -> Unit = {},
10+
fun SortOrderSelect(
11+
selected: SortOrder,
12+
update: (SortOrder) -> Unit = {},
1313
) {
1414
PreferenceSelect(
1515
selected = selected,
1616
update = update,
17-
options = UnreadSortOrder.entries,
17+
options = SortOrder.entries,
1818
optionText = { stringResource(translationKey(it)) },
19-
label = R.string.article_list_unread_sort_title
19+
label = R.string.article_list_sort_title
2020
)
2121
}
2222

23-
private fun translationKey(sortOrder: UnreadSortOrder) =
23+
private fun translationKey(sortOrder: SortOrder) =
2424
when (sortOrder) {
25-
UnreadSortOrder.NEWEST_FIRST -> R.string.article_list_unread_sort_newest_first
26-
UnreadSortOrder.OLDEST_FIRST -> R.string.article_list_unread_sort_oldest_first
25+
SortOrder.NEWEST_FIRST -> R.string.article_list_sort_newest_first
26+
SortOrder.OLDEST_FIRST -> R.string.article_list_sort_oldest_first
2727
}

‎app/src/main/res/values-ar/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
<string name="settings_support_button">الدعم</string>
148148
<string name="settings_article_list_title">قائمة المقالات</string>
149149
<string name="article_vertical_swipe_next_article">المقالة التالية</string>
150-
<string name="article_list_unread_sort_oldest_first">الأقدم أولاً</string>
150+
<string name="article_list_sort_oldest_first">الأقدم أولاً</string>
151151
<string name="article_view_mark_as_unread">وضع علامة كغير مقروءة</string>
152152
<string name="article_view_unstar">إزالة النجمة</string>
153153
<string name="settings_panel_gestures_title">الإيماءات</string>
@@ -162,8 +162,8 @@
162162
<string name="article_list_row_swipe_disabled">تعطيل</string>
163163
<string name="article_list_row_swipe_toggle_read">وضع علامة مقروء/غير مقروء</string>
164164
<string name="article_list_row_swipe_toggle_starred">وضع علامة مميز/غير مميز بنجمة</string>
165-
<string name="article_list_unread_sort_title">فرز غير المقروء</string>
166-
<string name="article_list_unread_sort_newest_first">الأحدث أولاً</string>
165+
<string name="article_list_sort_title">فرز المقالات</string>
166+
<string name="article_list_sort_newest_first">الأحدث أولاً</string>
167167
<string name="opml_exporter_success">إكتمل التصدير</string>
168168
<string name="settings_gestures_list_back_navigation_action">إجراء زر العودة للخلف</string>
169169
<string name="settings_gestures_list_back_navigation_system_back">الأفتراضي</string>

‎app/src/main/res/values-b+sr+Latn/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<string name="settings_about_title">O</string>
156156
<string name="settings_list_top_bar_title">Podešavanja</string>
157157
<string name="article_view_open_externally">Otvori spolja(U pretrazivacu)</string>
158-
<string name="article_list_unread_sort_oldest_first">Prvo Najstariji</string>
158+
<string name="article_list_sort_oldest_first">Prvo Najstariji</string>
159159
<string name="settings_gestures_list_back_navigation_system_back">Podrazumevano</string>
160160
<string name="crash_log_export_item_title">Delite evidenciju o pada aplikacije</string>
161161
<string name="edit_feed_tags_section">Oznake</string>
@@ -170,8 +170,8 @@
170170
<string name="article_list_row_swipe_disabled">Onemogućeno</string>
171171
<string name="article_list_row_swipe_toggle_read">Uključi Pročitano</string>
172172
<string name="article_list_row_swipe_toggle_starred">Uključi Sačuvno</string>
173-
<string name="article_list_unread_sort_newest_first">Najnovije Prvo</string>
174-
<string name="article_list_unread_sort_title">Sortiraj Nepročitano</string>
173+
<string name="article_list_sort_newest_first">Najnovije Prvo</string>
174+
<string name="article_list_sort_title">Sortiraj Članke</string>
175175
<string name="settings_panel_notifications_title">Obaveštenja</string>
176176
<string name="crash_log_export_item_subtitle">Čuva evidenciju o padu u datoteku za deljenje sa programerom</string>
177177
<string name="notifications_permissions_disabled_call_to_action">Podešavanja</string>

‎app/src/main/res/values-bg/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<string name="settings_auto_delete_option_keep_for_three_month">3 месеца</string>
2323
<string name="article_vertical_swipe_previous_article">Предишна статия</string>
2424
<string name="settings_gestures_reader_swipe_up">Плъзнете нагоре</string>
25-
<string name="article_list_unread_sort_newest_first">Първо най-новите</string>
25+
<string name="article_list_sort_newest_first">Първо най-новите</string>
2626
<string name="settings_gestures_list_back_navigation_open_drawer">Отвори чекмеджето за навигация</string>
2727
<string name="crash_log_export_item_subtitle">Запазва дневници за срив във файл, за споделяне с разработчика</string>
2828
<string name="settings_option_auto_delete_articles_title">Автоматично изтриване на статии</string>
@@ -163,8 +163,8 @@
163163
<string name="article_list_row_swipe_disabled">Забрани</string>
164164
<string name="article_list_row_swipe_toggle_read">Превключи към прочетени</string>
165165
<string name="article_list_row_swipe_toggle_starred">Превключи към със звезда</string>
166-
<string name="article_list_unread_sort_title">Сортирай непрочетени</string>
167-
<string name="article_list_unread_sort_oldest_first">Първо най-старите</string>
166+
<string name="article_list_sort_title">Сортирай непрочетени</string>
167+
<string name="article_list_sort_oldest_first">Първо най-старите</string>
168168
<string name="settings_gestures_list_back_navigation_action">Действие връщане назад</string>
169169
<string name="settings_gestures_list_back_navigation_system_back">По подразбиране</string>
170170
<string name="crash_log_export_item_title">Сподели дневници за срив</string>

‎app/src/main/res/values-cs/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@
150150
<string name="article_list_row_swipe_disabled">Vypnuto</string>
151151
<string name="article_list_row_swipe_toggle_read">Prohodit přečtení</string>
152152
<string name="article_list_row_swipe_toggle_starred">Prohodit ohvězdičkování</string>
153-
<string name="article_list_unread_sort_title">Řazení nepřečtených</string>
154-
<string name="article_list_unread_sort_oldest_first">Nejstarší nahoře</string>
153+
<string name="article_list_sort_title">Řazení článků</string>
154+
<string name="article_list_sort_oldest_first">Nejstarší nahoře</string>
155155
<string name="opml_exporter_success">Export dokončen</string>
156156
<string name="opml_exporter_failure">Export selhal</string>
157157
<string name="settings_gestures_list_back_navigation_system_back">Výchozí</string>
@@ -165,7 +165,7 @@
165165
<string name="settings_list_top_bar_title">Nastavení</string>
166166
<string name="settings_auto_delete_option_keep_for_one_week">1 týden</string>
167167
<string name="settings_gestures_list_row_swipe_end">Přejetím doleva</string>
168-
<string name="article_list_unread_sort_newest_first">Nejnovější nahoře</string>
168+
<string name="article_list_sort_newest_first">Nejnovější nahoře</string>
169169
<string name="settings_gestures_list_back_navigation_action">Navigovat zpátky</string>
170170
<string name="article_bottom_bar_next_article">Jít na další článek</string>
171171
<string name="settings_reader_title">Čtečka</string>

0 commit comments

Comments
 (0)