Skip to content

Commit 033d288

Browse files
Isira-SeneviratneIsira-Seneviratne
committed
Use "Sort By" label, remove outdated translations
1 parent 851ba4b commit 033d288

80 files changed

Lines changed: 77 additions & 217 deletions

File tree

Some content is hidden

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

‎app/src/main/java/org/schabi/newpipe/local/history/SortKey.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import androidx.annotation.StringRes
44
import org.schabi.newpipe.R
55

66
enum class SortKey(@StringRes val title: Int) {
7-
LAST_PLAYED(R.string.title_last_played),
8-
MOST_PLAYED(R.string.title_most_played)
7+
LAST_PLAYED(R.string.history_sort_date),
8+
MOST_PLAYED(R.string.history_sort_views)
99
}

‎app/src/main/java/org/schabi/newpipe/ui/screens/HistoryScreen.kt‎

Lines changed: 72 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import androidx.compose.material.icons.filled.ClearAll
1313
import androidx.compose.material.icons.filled.Headphones
1414
import androidx.compose.material.icons.filled.PictureInPicture
1515
import androidx.compose.material3.AlertDialog
16-
import androidx.compose.material3.ExperimentalMaterial3Api
1716
import androidx.compose.material3.Icon
1817
import androidx.compose.material3.SegmentedButton
1918
import androidx.compose.material3.SegmentedButtonDefaults
@@ -75,7 +74,7 @@ fun HistoryScreen(viewModel: HistoryViewModel = viewModel()) {
7574
})
7675
}
7776

78-
@OptIn(ExperimentalMaterial3Api::class, ExperimentalLayoutApi::class)
77+
@OptIn(ExperimentalLayoutApi::class)
7978
@Composable
8079
private fun HistoryHeader(
8180
sortKey: SortKey,
@@ -92,6 +91,23 @@ private fun HistoryHeader(
9291
verticalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterVertically),
9392
horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.CenterHorizontally),
9493
) {
94+
HistorySortRow(sortKey, onSelectSortKey)
95+
96+
HistoryButtons(onClickClear, onClickBackground, onClickPlayAll, onClickPopup)
97+
}
98+
}
99+
100+
@Composable
101+
private fun HistorySortRow(
102+
sortKey: SortKey,
103+
onSelectSortKey: (SortKey) -> Unit,
104+
) {
105+
Row(
106+
horizontalArrangement = Arrangement.spacedBy(8.dp),
107+
verticalAlignment = Alignment.CenterVertically,
108+
) {
109+
Text(text = stringResource(R.string.history_sort_label))
110+
95111
SingleChoiceSegmentedButtonRow {
96112
SortKey.entries.forEachIndexed { index, key ->
97113
SegmentedButton(
@@ -104,68 +120,68 @@ private fun HistoryHeader(
104120
}
105121
}
106122
}
123+
}
124+
}
107125

108-
FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally)) {
109-
IconButtonWithLabel(
110-
icon = Icons.Default.Headphones,
111-
label = R.string.controls_background_title,
112-
onClick = onClickBackground,
113-
)
126+
@OptIn(ExperimentalLayoutApi::class)
127+
@Composable
128+
private fun HistoryButtons(
129+
onClickClear: () -> Unit,
130+
onClickBackground: () -> Unit,
131+
onClickPlayAll: () -> Unit,
132+
onClickPopup: () -> Unit
133+
) {
134+
FlowRow(horizontalArrangement = Arrangement.spacedBy(4.dp, Alignment.CenterHorizontally)) {
135+
IconButtonWithLabel(
136+
icon = Icons.Default.Headphones,
137+
label = R.string.controls_background_title,
138+
onClick = onClickBackground,
139+
)
114140

115-
IconButtonWithLabel(
116-
icon = Icons.AutoMirrored.Filled.PlaylistPlay,
117-
label = R.string.play_all,
118-
onClick = onClickPlayAll,
119-
)
141+
IconButtonWithLabel(
142+
icon = Icons.AutoMirrored.Filled.PlaylistPlay,
143+
label = R.string.play_all,
144+
onClick = onClickPlayAll,
145+
)
120146

121-
IconButtonWithLabel(
122-
icon = Icons.Default.PictureInPicture,
123-
label = R.string.controls_popup_title,
124-
onClick = onClickPopup,
125-
)
147+
IconButtonWithLabel(
148+
icon = Icons.Default.PictureInPicture,
149+
label = R.string.controls_popup_title,
150+
onClick = onClickPopup,
151+
)
126152

127-
var openClearDialog by remember { mutableStateOf(false) }
153+
var openClearDialog by remember { mutableStateOf(false) }
128154

129-
TextButton(onClick = { openClearDialog = true }) {
130-
Row(
131-
horizontalArrangement = Arrangement.spacedBy(4.dp),
132-
verticalAlignment = Alignment.CenterVertically,
133-
) {
134-
Icon(imageVector = Icons.Default.ClearAll, contentDescription = null)
135-
Text(text = stringResource(R.string.clear))
136-
}
155+
TextButton(onClick = { openClearDialog = true }) {
156+
Row(
157+
horizontalArrangement = Arrangement.spacedBy(4.dp),
158+
verticalAlignment = Alignment.CenterVertically,
159+
) {
160+
Icon(imageVector = Icons.Default.ClearAll, contentDescription = null)
161+
Text(text = stringResource(R.string.clear))
137162
}
138-
139-
ClearHistoryDialog(openClearDialog, onClickClear, onDismissRequest = { openClearDialog = false })
140163
}
141-
}
142-
}
143164

144-
@Composable
145-
private fun ClearHistoryDialog(
146-
openClearDialog: Boolean,
147-
onClickClear: () -> Unit,
148-
onDismissRequest: () -> Unit
149-
) {
150-
if (openClearDialog) {
151-
AlertDialog(
152-
onDismissRequest = onDismissRequest,
153-
title = { Text(text = stringResource(R.string.delete_view_history_alert)) },
154-
text = { Text(text = stringResource(R.string.delete_view_history_description)) },
155-
confirmButton = {
156-
TextButton(onClick = {
157-
onClickClear()
158-
onDismissRequest()
159-
}) {
160-
Text(stringResource(R.string.delete))
161-
}
162-
},
163-
dismissButton = {
164-
TextButton(onClick = onDismissRequest) {
165-
Text(stringResource(R.string.cancel))
166-
}
167-
},
168-
)
165+
if (openClearDialog) {
166+
AlertDialog(
167+
onDismissRequest = { openClearDialog = false },
168+
title = { Text(text = stringResource(R.string.delete_view_history_alert)) },
169+
text = { Text(text = stringResource(R.string.delete_view_history_description)) },
170+
confirmButton = {
171+
TextButton(onClick = {
172+
onClickClear()
173+
openClearDialog = false
174+
}) {
175+
Text(stringResource(R.string.delete))
176+
}
177+
},
178+
dismissButton = {
179+
TextButton(onClick = { openClearDialog = false }) {
180+
Text(stringResource(R.string.cancel))
181+
}
182+
},
183+
)
184+
}
169185
}
170186
}
171187

‎app/src/main/res/layout/statistic_playlist_control.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
android:layout_height="50dp"
3131
android:layout_toRightOf="@id/sortButtonIcon"
3232
android:gravity="left|center"
33-
android:text="@string/title_most_played"
33+
android:text="@string/history_sort_views"
3434
android:textAppearance="?android:attr/textAppearanceLarge"
3535
android:textSize="15sp"
3636
android:textStyle="bold"

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@
406406
<string name="right_gesture_control_title">اجراء الإيماءة اليمنى</string>
407407
<string name="settings_file_charset_title">الرموز المسموح بها في أسماء الملفات</string>
408408
<string name="audio_track_name">%1$s %2$s</string>
409-
<string name="title_last_played">آخر ما تم تشغيله</string>
410409
<string name="always_use_exoplayer_set_output_surface_workaround_title">استخدم دائمًا الحل البديل لإعداد سطح إخراج فيديو ExoPlayer</string>
411410
<string name="next_stream">البث التالي</string>
412411
<string name="disable_media_tunneling_automatic_info">تم تعطيل نفق وسائل الإعلام عن طريق التقصير على جهازك لأن نموذج جهازك معروف بأنه لا يدعمه.</string>
@@ -496,7 +495,6 @@
496495
<string name="search_showing_result_for">عرض نتائج ل: %s</string>
497496
<string name="open_with">افتح باستخدام</string>
498497
<string name="delete_item_search_history">هل تريد حذف هذا العنصر من سجل البحث؟</string>
499-
<string name="title_most_played">الأكثر تشغيلا</string>
500498
<string name="show_original_time_ago_title">عرض الوقت الأصلي على العناصر</string>
501499
<string name="import_from">استعادة مِن</string>
502500
<string name="default_resolution_title">الدقة الافتراضية</string>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,6 @@
286286
<string name="no_streams_available_download">لا يوجد بث متاح للتنزيل</string>
287287
<string name="one_item_deleted">تم حذف عنصر واحد.</string>
288288
<string name="app_license">NewPipe هو برنامج مفتوح المصدر وبحقوق متروكة: يمكنك استخدام الكود ودراسته وتحسينه كما شئت. وعلى وجه التحديد يمكنك إعادة توزيعه / أو تعديله تحت شروط رخصة GNU العمومية والتي نشرتها مؤسسة البرمجيات الحرة، سواء الإصدار 3 من الرخصة، أو (باختيارك) أي إصدار أحدث.</string>
289-
<string name="title_last_played">آخر ما تم تشغيله</string>
290-
<string name="title_most_played">الأكثر تشغيلا</string>
291289
<string name="override_current_data">هذا سوف يُزيل إعداداتك الحالية.</string>
292290
<string name="preferred_open_action_settings_title">طريقة \'التشغيل\' المفضلة</string>
293291
<string name="preferred_open_action_settings_summary">الإجراء الافتراضي عند فتح المحتوى — %s</string>
@@ -572,7 +570,6 @@
572570
<string name="search_showing_result_for">عرض نتائج ل: %s</string>
573571
<string name="never">أبدا</string>
574572
<string name="wifi_only">فقط على شبكة Wi-Fi</string>
575-
<string name="autoplay_summary">بدء التشغيل تلقائياً — %s</string>
576573
<string name="title_activity_play_queue">تشغيل قائمة الانتظار</string>
577574
<string name="unsupported_url_dialog_message">تعذر التعرف على الرابط. فتح باستخدام تطبيق آخر؟</string>
578575
<string name="auto_queue_toggle">قائمة انتظار تلقائيّة</string>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,6 @@
335335
<string name="app_license_title">NewPipe Lisenziyası</string>
336336
<string name="action_history">Tarixçə</string>
337337
<string name="delete_item_search_history">Bu elementi axtarış tarixçəsindən silmək istəyirsiniz\?</string>
338-
<string name="title_last_played">Son Oynadılan</string>
339-
<string name="title_most_played">Ən Çox Oynadılan</string>
340338
<string name="select_a_kiosk">Bölmə seç</string>
341339
<string name="import_complete_toast">İdxal edildi</string>
342340
<string name="no_valid_zip_file">Etibarlı ZIP faylı yoxdur</string>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -412,8 +412,6 @@
412412
<string name="channel_page_summary">Páxina d\'una canal</string>
413413
<string name="default_kiosk_page_summary">Quioscu predetermináu</string>
414414
<string name="kiosk_page_summary">Páxina de quioscu</string>
415-
<string name="title_most_played">Lo más reproducío</string>
416-
<string name="title_last_played">Lo último reproducío</string>
417415
<string name="app_license">NewPipe ye software copyleft: pues usalu, estudialu, compartilu y ameyoralu como quieras. N\'especial, pues redistribuyilu y/o modificalu baxo los términos de la GNU General Public License según espublizó la Free Software Foundation, quier la versión 3 de la llicencia quier (na to opinión) cualesquier versión posterior.</string>
418416
<string name="privacy_policy_encouragement">El proyeutu de NewPipe toma mui en serio la privacidá. Poro, l\'aplicación nun recueye nengún datu ensin el to consentimientu.
419417
\nLa política de privacidá de NewPipe desplica en detalle los datos que s\'unvien y atroxen cuando unvies un informe de casque.</string>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,6 @@
182182
<string name="blank_page_summary">Bo\'sh sahifa</string>
183183
<string name="main_page_content_summary">Asosiy sahifada qanday yorliqlar ko\'rsatilgan</string>
184184
<string name="main_page_content">Asosiy sahifaning tarkibi</string>
185-
<string name="title_most_played">Eng ko\'p ijrolar etilganlar</string>
186-
<string name="title_last_played">Oxirgi ijro</string>
187185
<string name="delete_item_search_history">Ushbu narsani qidiruv tarixidan o\'chirmoqchimisiz\?</string>
188186
<string name="action_history">Tarix</string>
189187
<string name="title_activity_history">Tarix</string>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,6 @@
231231
<string name="title_activity_history">Гісторыя</string>
232232
<string name="action_history">Гісторыя</string>
233233
<string name="delete_item_search_history">Выдаліць гэты элемент з гісторыі пошуку?</string>
234-
<string name="title_last_played">Нядаўна прайграныя</string>
235-
<string name="title_most_played">Найбольш прайграваныя</string>
236234
<string name="main_page_content">Кантэнт галоўнай старонкі</string>
237235
<string name="blank_page_summary">Пустая старонка</string>
238236
<string name="kiosk_page_summary">Старонка кіёска</string>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,8 +224,6 @@
224224
<string name="title_activity_history">История</string>
225225
<string name="action_history">История</string>
226226
<string name="delete_item_search_history">Искате ли да изтриете този елемент от историята на търсенията?</string>
227-
<string name="title_last_played">Последно възпроизвеждани</string>
228-
<string name="title_most_played">Най-възпроизвеждани</string>
229227
<string name="main_page_content">Съдържание на главната страница</string>
230228
<string name="blank_page_summary">Празна страница</string>
231229
<string name="kiosk_page_summary">Страница-павилион</string>

0 commit comments

Comments
 (0)