mirrors/grayjay
1
0
Fork 0
mirror of https://gitlab.futo.org/videostreaming/grayjay.git synced 2025-04-20 03:24:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'subscription-submission-modal'

Browse source 
# Conflicts:
#   app/src/main/res/values/strings.xml
This commit is contained in:
Kai DeLorenzo 2024-11-19 16:29:32 +00:00
commit 2a7a332160
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/futo/platformplayer/states/StatePlatform.kt
View file

@ -537,7 +537,7 @@ class StatePlatform {
else getSortedEnabledClient().filter { if (it is JSClient) it.enableInSearch else true };
clients.parallelStream().forEach {
val searchCapabilities = it.getSearchCapabilities();
val searchCapabilities = it.getSearchChannelContentsCapabilities();
val mappedFilters = filters.map { pair -> Pair(pair.key, pair.value.map { v -> searchCapabilities.filters.first { g -> g.idOrName == pair.key }.filters.first { f -> f.idOrName == v }.value }) }.toMap();
if (it.isChannelUrl(channelUrl)) {

3
app/src/main/res/values/strings.xml
View file

@ -840,7 +840,7 @@
<string name="cd_platform_indicator">Platform indicator</string>
<string name="cd_image_device">Device icon</string>
<string name="cd_image_loader">Loader</string>
<string name="cd_donation_author_image">Donation author's image</string>
<string name="cd_donation_author_image">Donation author image</string>
<string name="cd_edit_image">Edit image</string>
<string name="cd_button_add">Add</string>
<string name="cd_download_indicator">Download indicator</string>
@ -862,7 +862,6 @@
<string name="cd_button_scan_qr">Scan QR code</string>
<string name="cd_button_help">Help</string>
<string name="cd_image_polycentric">Change Polycentric profile picture</string>
<string name="cd_button_settings">Settings</string>
<string-array name="home_screen_array">
<item>Recommendations</item>
<item>Subscriptions</item>