Skip to content
Snippets Groups Projects
Commit 2a7a3321 authored by Kai DeLorenzo's avatar Kai DeLorenzo :purple_heart:
Browse files

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

# Conflicts:
#   app/src/main/res/values/strings.xml
parents a69692be 27ee1eab
No related branches found
No related tags found
1 merge request!38Subscription submission modal
......@@ -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)) {
......
......@@ -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>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment