Skip to content

Commit

Permalink
Merge branch 'release/mid-08-2023'
Browse files Browse the repository at this point in the history
  • Loading branch information
rts-devops committed Aug 11, 2023
2 parents d874d02 + b9c69d7 commit cf0a5c1
Show file tree
Hide file tree
Showing 42 changed files with 36 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -719,10 +719,10 @@
"The history will be deleted on all devices connected to your account." = "La cronologia sarà eliminata da tutti i dispositivi collegati al tuo account.";

/* Title label used to present the radio latest audios */
"The latest audios" = "Gli audio più recenti";
"The latest audios" = "I più recenti";

/* Title label used to present the radio latest audio episodes */
"The latest episodes" = "Ultimi episodi";
"The latest episodes" = "I più recenti";

/* Error message when a media cannot be opened via Handoff
Error message when a media cannot be opened via Handoff, deep linking or a push notification */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"dataProtectionURL": "https://www.rts.ch/article/8994006",
"whatsNewURL": "https://srgssr.github.io/playsrg-apple/releases/release_notes-ios-rts.html",
"radioChannels": "[{\"uid\":\"a9e7621504c6959e35c3ecbe7f6bed0446cdf8da\",\"name\":\"La 1ère\",\"resourceUid\":\"la1ere\",\"songsViewStyle\":\"collapsed\",\"color\":\"#E20026\",\"secondColor\":\"#5A285B\"},{\"uid\":\"a83f29dee7a5d0d3f9fccdb9c92161b1afb512db\",\"name\":\"Espace 2\",\"resourceUid\":\"espace2\",\"songsViewStyle\":\"collapsed\",\"color\":\"#0071CE\",\"secondColor\":\"#23B7C1\"},{\"uid\":\"8ceb28d9b3f1dd876d1df1780f908578cbefc3d7\",\"name\":\"Couleur 3\",\"resourceUid\":\"couleur3\",\"songsViewStyle\":\"collapsed\",\"color\":\"#E60096\",\"secondColor\":\"#FB5952\"},{\"uid\":\"f8517e5319a515e013551eea15aa114fa5cfbc3a\",\"name\":\"Option Musique\",\"resourceUid\":\"option_musique\",\"songsViewStyle\":\"expanded\",\"color\":\"#00CC99\",\"secondColor\":\"#CBC57A\"},{\"uid\":\"123456789101112131415161718192021222324x\",\"name\":\"Podcasts Originaux\",\"resourceUid\":\"podcasts_originaux\",\"color\":\"#A550F9\",\"homeSections\":\"radioLatestEpisodes,radioShowsAccess,radioFavoriteShows,radioLatestEpisodesFromFavorites,radioResumePlayback,radioMostPopular,radioWatchLater,radioAllShows\"}]",
"tvChannels": "[{\"uid\":\"143932a79bb5a123a646b68b1d1188d7ae493e5b\",\"name\":\"RTS 1\",\"resourceUid\":\"rts_un\",\"color\":\"#007896\",\"secondColor\":\"#00303C\"},{\"uid\":\"d7dfff28deee44e1d3c49a3d37d36d492b29671b\",\"name\":\"RTS 2\",\"resourceUid\":\"rts_deux\",\"color\":\"#DC5C43\",\"secondColor\":\"#9E2D17\"},{\"uid\":\"5d332a26e06d08eec8ad385d566187df72955623\",\"name\":\"RTS Info\",\"resourceUid\":\"rts_info\",\"color\":\"#AF001E\",\"secondColor\":\"#860017\"}]",
"tvChannels": "[{\"uid\":\"143932a79bb5a123a646b68b1d1188d7ae493e5b\",\"name\":\"RTS 1\",\"resourceUid\":\"rts_un\",\"color\":\"#00D6F3\",\"secondColor\":\"#00B6F0\",\"titleColor\":\"#161616\"},{\"uid\":\"d7dfff28deee44e1d3c49a3d37d36d492b29671b\",\"name\":\"RTS 2\",\"resourceUid\":\"rts_deux\",\"color\":\"#BB66FF\",\"secondColor\":\"#782EB5\"},{\"uid\":\"5d332a26e06d08eec8ad385d566187df72955623\",\"name\":\"RTS Info\",\"resourceUid\":\"rts_info\",\"color\":\"#AF001E\",\"secondColor\":\"#860017\"}]",
"satelliteRadioChannels": "[{\"uid\":\"rsp\",\"name\":\"Radio Swiss Pop\",\"resourceUid\":\"rsp\",\"songsViewStyle\":\"expanded\",\"color\":\"#F01F73\",\"secondColor\":\"#D31A3C\",\"homepageHidden\":true},{\"uid\":\"rsc-fr\",\"name\":\"Radio Swiss Classic\",\"resourceUid\":\"rsc\",\"songsViewStyle\":\"expanded\",\"color\":\"#09A1DE\",\"secondColor\":\"#036E99\",\"homepageHidden\":true},{\"uid\":\"rsj\",\"name\":\"Radio Swiss Jazz\",\"resourceUid\":\"rsj\",\"songsViewStyle\":\"expanded\",\"color\":\"#F7B222\",\"secondColor\":\"#CC7A00\",\"homepageHidden\":true}]",
"continuousPlaybackPlayerViewTransitionDuration": 10,
"continuousPlaybackForegroundTransitionDuration": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,15 @@
"images" : [
{
"filename" : "marts.pdf",
"idiom" : "universal"
"idiom" : "iphone"
},
{
"filename" : "marts 1.pdf",
"idiom" : "ipad"
},
{
"filename" : "marts 2.pdf",
"idiom" : "tv"
}
],
"info" : {
Expand Down
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"images" : [
{
"filename" : "RTS_1.pdf",
"filename" : "rts1_32.pdf",
"idiom" : "iphone"
},
{
"filename" : "RTS_1-1.pdf",
"filename" : "rts1_32 1.pdf",
"idiom" : "ipad"
},
{
"filename" : "Logos_rts1_60.pdf",
"filename" : "rts1_60.pdf",
"idiom" : "tv"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"images" : [
{
"filename" : "logo_rts1.pdf",
"filename" : "rts1_22.pdf",
"idiom" : "iphone"
},
{
"filename" : "logo_rts1-1.pdf",
"filename" : "rts1_22 1.pdf",
"idiom" : "ipad"
},
{
"filename" : "logo_rts1-2.pdf",
"filename" : "rts1_22 2.pdf",
"idiom" : "tv"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"images" : [
{
"filename" : "RTS_2.pdf",
"filename" : "rts1_32.pdf",
"idiom" : "iphone"
},
{
"filename" : "RTS_2-1.pdf",
"filename" : "rts1_32 1.pdf",
"idiom" : "ipad"
},
{
"filename" : "Logos_rts2_60.pdf",
"filename" : "rts1_60.pdf",
"idiom" : "tv"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"images" : [
{
"filename" : "logo_rts2.pdf",
"filename" : "rts2_22.pdf",
"idiom" : "iphone"
},
{
"filename" : "logo_rts2-1.pdf",
"filename" : "rts2_22 1.pdf",
"idiom" : "ipad"
},
{
"filename" : "logo_rts2-2.pdf",
"filename" : "rts2_22 2.pdf",
"idiom" : "tv"
}
],
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
"faqURL": "https://www.srf.ch/play/tv/hilfe",
"dataProtectionURL": "https://www.srf.ch/article/617762",
"whatsNewURL": "https://srgssr.github.io/playsrg-apple/releases/release_notes-ios-srf.html",
"radioChannels": "[{\"uid\":\"69e8ac16-4327-4af4-b873-fd5cd6e895a7\",\"name\":\"Radio SRF 1\",\"resourceUid\":\"srf1\",\"songsViewStyle\":\"collapsed\",\"color\":\"#F7A600\",\"secondColor\":\"#FFD651\",\"titleColor\":\"#333333\",\"hasDarkStatusBar\":true,\"numberOfLivePlaceholders\":8},{\"uid\":\"c8537421-c9c5-4461-9c9c-c15816458b46\",\"name\":\"Radio SRF 2 Kultur\",\"resourceUid\":\"srf2\",\"songsViewStyle\":\"collapsed\",\"color\":\"#CA3DAB\",\"secondColor\":\"#8C1D60\"},{\"uid\":\"dd0fa1ba-4ff6-4e1a-ab74-d7e49057d96f\",\"name\":\"Radio SRF 3\",\"resourceUid\":\"srf3\",\"songsViewStyle\":\"expanded\",\"color\":\"#464646\",\"secondColor\":\"#000000\"},{\"uid\":\"ee1fb348-2b6a-4958-9aac-ec6c87e190da\",\"name\":\"Radio SRF 4 News\",\"resourceUid\":\"srf4\",\"color\":\"#E31F2B\",\"secondColor\":\"#6A0B0C\"},{\"uid\":\"a9c5c070-8899-46c7-ac27-f04f1be902fd\",\"name\":\"Radio SRF Musikwelle\",\"resourceUid\":\"srf_musikwelle\",\"songsViewStyle\":\"expanded\",\"color\":\"#42A3F1\",\"secondColor\":\"#0066B0\"},{\"uid\":\"66815fe2-9008-4853-80a5-f9caaffdf3a9\",\"name\":\"Radio SRF Virus\",\"resourceUid\":\"virus\",\"songsViewStyle\":\"expanded\",\"color\":\"#A5FF00\",\"secondColor\":\"#BDFF44\",\"titleColor\":\"#333333\",\"hasDarkStatusBar\":true,\"homepageHidden\":true}]",
"tvChannels": "[{\"uid\":\"23FFBE1B-65CE-4188-ADD2-C724186C2C9F\",\"name\":\"SRF 1\",\"resourceUid\":\"tv_srf1\",\"color\":\"#C91024\",\"secondColor\":\"#8D0614\"},{\"uid\":\"E4D5AD08-C1E8-46A3-BB58-4875051D60D2\",\"name\":\"SRF zwei\",\"resourceUid\":\"tv_srf2\",\"color\":\"#FFB600\",\"secondColor\":\"#ED7004\",\"titleColor\":\"#333333\",\"hasDarkStatusBar\":true},{\"uid\":\"34c2819e-e715-43d7-9026-40a443152a97\",\"name\":\"SRF info\",\"resourceUid\":\"tv_srf_info\",\"color\":\"#AF001E\",\"secondColor\":\"#830512\"}]",
"radioChannels": "[{\"uid\":\"69e8ac16-4327-4af4-b873-fd5cd6e895a7\",\"name\":\"Radio SRF 1\",\"resourceUid\":\"srf1\",\"songsViewStyle\":\"collapsed\",\"color\":\"#F7A600\",\"secondColor\":\"#FFD651\",\"titleColor\":\"#161616\",\"hasDarkStatusBar\":true,\"numberOfLivePlaceholders\":8},{\"uid\":\"c8537421-c9c5-4461-9c9c-c15816458b46\",\"name\":\"Radio SRF 2 Kultur\",\"resourceUid\":\"srf2\",\"songsViewStyle\":\"collapsed\",\"color\":\"#CA3DAB\",\"secondColor\":\"#8C1D60\"},{\"uid\":\"dd0fa1ba-4ff6-4e1a-ab74-d7e49057d96f\",\"name\":\"Radio SRF 3\",\"resourceUid\":\"srf3\",\"songsViewStyle\":\"expanded\",\"color\":\"#464646\",\"secondColor\":\"#000000\"},{\"uid\":\"ee1fb348-2b6a-4958-9aac-ec6c87e190da\",\"name\":\"Radio SRF 4 News\",\"resourceUid\":\"srf4\",\"color\":\"#E31F2B\",\"secondColor\":\"#6A0B0C\"},{\"uid\":\"a9c5c070-8899-46c7-ac27-f04f1be902fd\",\"name\":\"Radio SRF Musikwelle\",\"resourceUid\":\"srf_musikwelle\",\"songsViewStyle\":\"expanded\",\"color\":\"#42A3F1\",\"secondColor\":\"#0066B0\"},{\"uid\":\"66815fe2-9008-4853-80a5-f9caaffdf3a9\",\"name\":\"Radio SRF Virus\",\"resourceUid\":\"virus\",\"songsViewStyle\":\"expanded\",\"color\":\"#A5FF00\",\"secondColor\":\"#BDFF44\",\"titleColor\":\"#161616\",\"hasDarkStatusBar\":true,\"homepageHidden\":true}]",
"tvChannels": "[{\"uid\":\"23FFBE1B-65CE-4188-ADD2-C724186C2C9F\",\"name\":\"SRF 1\",\"resourceUid\":\"tv_srf1\",\"color\":\"#C91024\",\"secondColor\":\"#8D0614\"},{\"uid\":\"E4D5AD08-C1E8-46A3-BB58-4875051D60D2\",\"name\":\"SRF zwei\",\"resourceUid\":\"tv_srf2\",\"color\":\"#FFB600\",\"secondColor\":\"#ED7004\",\"titleColor\":\"#161616\",\"hasDarkStatusBar\":true},{\"uid\":\"34c2819e-e715-43d7-9026-40a443152a97\",\"name\":\"SRF info\",\"resourceUid\":\"tv_srf_info\",\"color\":\"#AF001E\",\"secondColor\":\"#830512\"}]",
"satelliteRadioChannels": "[{\"uid\":\"rsp\",\"name\":\"Radio Swiss Pop\",\"resourceUid\":\"rsp\",\"songsViewStyle\":\"expanded\",\"color\":\"#F01F73\",\"secondColor\":\"#D31A3C\",\"homepageHidden\":true},{\"uid\":\"rsc-de\",\"name\":\"Radio Swiss Classic\",\"resourceUid\":\"rsc\",\"songsViewStyle\":\"expanded\",\"color\":\"#09A1DE\",\"secondColor\":\"#036E99\",\"homepageHidden\":true},{\"uid\":\"rsj\",\"name\":\"Radio Swiss Jazz\",\"resourceUid\":\"rsj\",\"songsViewStyle\":\"expanded\",\"color\":\"#F7B222\",\"secondColor\":\"#CC7A00\",\"homepageHidden\":true}]",
"continuousPlaybackPlayerViewTransitionDuration": 10,
"continuousPlaybackForegroundTransitionDuration": 0,
Expand Down

This file was deleted.

This file was deleted.

3 changes: 2 additions & 1 deletion WhatsNew-iOS-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,5 +199,6 @@
"3.7.3-420": "Branch beta\n- Update SRGAnalytics with Tag Commander V5 update.\n- Page views have page name property.",
"3.7.3-421": "- Maintenance build.",
"3.7.3-422": "- Updated video/audio image in control center.\n- Image service maintnance. [RSI, RTR, SRF, SWI]",
"3.7.3-423": "- Fix some crashes in the player.\n- AppStore release."
"3.7.3-423": "- Fix some crashes in the player.\n- AppStore release.",
"3.7.4-424": "- Update italian translations. [RSI]\n- Update channel logos. [RTS]"
}
3 changes: 2 additions & 1 deletion WhatsNew-tvOS-beta.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,6 @@
"1.7.2-420": "Branch beta\n- Update SRGAnalytics with Tag Commander V5 update.\n- Page views have page name property.",
"1.7.2-421": "- Maintenance build.",
"1.7.2-422": "- Updated video/audio image in control center.\n- Image service maintnance. [RSI, RTR, SRF, SWI]",
"1.7.2-423": "- AppStore release."
"1.7.2-423": "- AppStore release.",
"1.7.3-424": "- Update italian translations. [RSI]\n- Update channel logos. [RTS]\n- Fix service logo size in login view. [RTS]"
}
2 changes: 1 addition & 1 deletion Xcode/Shared/Common.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ PRODUCT_BUNDLE_IDENTIFIER = $(BU__BUNDLE_IDENTIFIER_PREFIX)$(BU__BUNDLE_IDENTIFI
PRODUCT_NAME = $(BU__PRODUCT_NAME)$(TARGET__PRODUCT_NAME_SUFFIX)

// Version information
CURRENT_PROJECT_VERSION = 423
CURRENT_PROJECT_VERSION = 424

GCC_PREPROCESSOR_DEFINITIONS[config=Beta] = BETA=1
GCC_PREPROCESSOR_DEFINITIONS[config=Beta_AppCenter] = BETA=1 APPCENTER=1
Expand Down
2 changes: 1 addition & 1 deletion Xcode/Shared/Targets/iOS/Common.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Xcode/Shared/Common.xcconfig"

// Version information
MARKETING_VERSION = 3.7.3
MARKETING_VERSION = 3.7.4

SDKROOT = iphoneos
TARGETED_DEVICE_FAMILY=1,2
2 changes: 1 addition & 1 deletion Xcode/Shared/Targets/tvOS/Common.xcconfig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "Xcode/Shared/Common.xcconfig"

// Version information
MARKETING_VERSION = 1.7.2
MARKETING_VERSION = 1.7.3

SDKROOT = appletvos
TARGETED_DEVICE_FAMILY=3
3 changes: 3 additions & 0 deletions docs/REMOTE_CONFIGURATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,9 @@ The keys common to both TV and radio channels JSON dictionaries are:
The radio channel JSON dictionaries have one more key:

* `homepageHidden` (optional, boolean): Set to `true` iff a homepage does not have to be displayed for the radio channel. If omitted, `false`.

## Shows

* `showLeadPreferred` (optional, boolean): Set to `true` iff show pages and show elements should display lead instead of description. If omitted, `false`.

## Audio homepage
Expand Down

0 comments on commit cf0a5c1

Please sign in to comment.