Merge branch 'release/release-late-05-2024'

SRGSSR · May 28, 2024 · 3f620a6 · 3f620a6
2 parents 1c8d6ec + 5743eac
commit 3f620a6
Show file tree

Hide file tree

Showing 122 changed files with 1,574 additions and 718 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,18 +1,19 @@
+## Description
 
-### Motivation and Context
+> Please provide a brief summary of the changes made. Please explain why
+> this change was necessary. Was there a problem or an issue this change
+> will address? What will be improved with this change?
 
-> Why is this change required? What problem does it solve?
+## Changes Made
 
-### Description
+> Please detail the modifications made. This could include areas such as
+> code, documentation, structure, or formatting.
 
-> Please describe the changes and how to test.
+## Checklist
 
-### Checklist
-
-- The branch should be rebased onto the `develop` branch for whole tests with nighties, but it's not required.*
-- The code followed the code style as `make quality` passes with a green tick on the last commit.
-- [ ] Remote configuration properties have been properly documented (if relevant).
-- [ ] The documentation has been updated (if relevant).
-- [ ] Issues are linked to the PR, if any.
-
-\* The project uses Github merge queue feature, which rebases onto the `develop` branch before squashing and merging the PR. 
+- [ ] I have followed the project's style guidelines.
+- [ ] I have performed a self-review of my own changes.
+- [ ] I have made corresponding changes to the documentation.
+- [ ] My changes do not generate new warnings.
+- [ ] I have tested my changes and I am confident that it works as expected and doesn't introduce any known regressions.
+- [ ] I have reviewed the contribution guidelines.
diff --git a/.github/workflows/pr-closure.yml b/.github/workflows/pr-closure.yml
@@ -42,19 +42,6 @@ jobs:
           # Remove "feature/" from the head branch
           BUILD_NAME=$(echo "$HEAD_BRANCH" | sed 's/feature\///g')
 
-          # Define environment names
-          IOS_ENVIRONMENT=$(echo "playsrg-ios-nightly+$BUILD_NAME" | jq -R -r @uri)
-          TVOS_ENVIRONMENT=$(echo "playsrg-tvos-nightly+$BUILD_NAME" | jq -R -r @uri)
-
-          echo "Working with iOS environment: $IOS_ENVIRONMENT"
-          echo "Working with tvOS environment: $TVOS_ENVIRONMENT"
-
-          # Get the latest active deployment for iOS
-          IOS_DEPLOYMENT=$(curl -s -H "$AUTHORIZATION" "$DEPLOYMENTS_URL?environment=$IOS_ENVIRONMENT" | jq '.[0]')
-
-          # Get the latest active deployment for tvOS
-          TVOS_DEPLOYMENT=$(curl -s -H "$AUTHORIZATION" "$DEPLOYMENTS_URL?environment=$TVOS_ENVIRONMENT" | jq '.[0]')
-
           # Function to fetch log and environment URLs from status URL
           fetch_status_urls() {
             STATUS_URL=$1
@@ -65,54 +52,43 @@ jobs:
             echo "$LOG_URL,$ENVIRONMENT_URL"
           }
 
-          if [ "$IOS_DEPLOYMENT" != "null" ]; then
-            DEPLOYMENT_ID=$(echo "$IOS_DEPLOYMENT" | jq -r '.id')
-            STATUSES_URL=$(echo "$IOS_DEPLOYMENT" | jq -r '.statuses_url')
-
-            echo "Working with iOS deployment ID: $DEPLOYMENT_ID"
+          # Function to set inactive state to the latest deployment
+          set_inactive_latest_deployment() {
+              local ENVIRONMENT=$1
+              local ENVIRONMENT_ENCODED=$(echo "$ENVIRONMENT" | jq -R -r @uri)
 
-            URLS=$(fetch_status_urls "$STATUSES_URL")
-            IFS=',' read -r LOG_URL ENVIRONMENT_URL <<< "$URLS"
+              # Get the latest active deployment
+              local DEPLOYMENTS_FULL_URL="$DEPLOYMENTS_URL?environment=$ENVIRONMENT_ENCODED"
+              local DEPLOYMENT_DATA=$(curl -s -H "$AUTHORIZATION" "$DEPLOYMENTS_FULL_URL" | jq '.[0]')
 
-            # Mark the latest deployment for iOS nightly as inactive
-            DEPLOYMENT_URL="$DEPLOYMENTS_URL/$DEPLOYMENT_ID/statuses"
-            BODY="{\"state\": \"inactive\", \"description\": \"The PR is closed.\", \
-              \"log_url\": \"$LOG_URL\", \"environment_url\": \"$ENVIRONMENT_URL\"}"
-            RESPONSE=$(curl -s -X POST -H "$AUTHORIZATION" -H "$ACCEPT" "$DEPLOYMENT_URL" -d "$BODY")
+              if [ "$DEPLOYMENT_DATA" != "null" ]; then
+                  local DEPLOYMENT_ID=$(echo "$DEPLOYMENT_DATA" | jq -r '.id')
+                  local STATUSES_URL=$(echo "$DEPLOYMENT_DATA" | jq -r '.statuses_url')
 
-            # Extract information from the response
-            RESPONSE_STATE=$(echo "$RESPONSE" | jq -r '.state')
-            RESPONSE_ENVIRONMENT=$(echo "$RESPONSE" | jq -r '.environment')
+                  echo "Working with $ENVIRONMENT deployment ID: $DEPLOYMENT_ID"
 
-            # Output the information
-            echo "-> Update $RESPONSE_ENVIRONMENT latest deployment to $RESPONSE_STATE state."
-          else
-            IOS_ENVIRONMENT=$(printf '%b' "${IOS_ENVIRONMENT//%/\\x}")
-            echo "-> No deployment for $IOS_ENVIRONMENT environment. No update."
-          fi
-
-          if [ "$TVOS_DEPLOYMENT" != "null" ]; then
-            DEPLOYMENT_ID=$(echo "$TVOS_DEPLOYMENT" | jq -r '.id')
-            STATUSES_URL=$(echo "$TVOS_DEPLOYMENT" | jq -r '.statuses_url')
-
-            echo "Working with tvOS deployment ID: $DEPLOYMENT_ID"
+                  local URLS=$(fetch_status_urls "$STATUSES_URL")
+                  IFS=',' read -r LOG_URL ENVIRONMENT_URL <<< "$URLS"
 
-            URLS=$(fetch_status_urls "$STATUSES_URL")
-            IFS=',' read -r LOG_URL ENVIRONMENT_URL <<< "$URLS"
+                  # Mark the latest deployment as inactive
+                  local DEPLOYMENT_URL="$DEPLOYMENTS_URL/$DEPLOYMENT_ID/statuses"
+                  local BODY="{\"state\": \"inactive\", \"description\": \"The PR is closed.\", \
+                    \"log_url\": \"$LOG_URL\", \"environment_url\": \"$ENVIRONMENT_URL\"}"
+                  local RESPONSE=$(curl -s -X POST -H "$AUTHORIZATION" -H "$ACCEPT" "$DEPLOYMENT_URL" -d "$BODY")
 
-            # Mark the latest deployment for tvOS nightly as inactive
-            DEPLOYMENT_URL="$DEPLOYMENTS_URL/$DEPLOYMENT_ID/statuses"
-            BODY="{\"state\": \"inactive\", \"description\": \"The PR is closed.\", \
-              \"log_url\": \"$LOG_URL\", \"environment_url\": \"$ENVIRONMENT_URL\"}"
-            RESPONSE=$(curl -s -X POST -H "$AUTHORIZATION" -H "$ACCEPT" "$DEPLOYMENT_URL" -d "$BODY")
+                  # Extract information from the response
+                  local RESPONSE_STATE=$(echo "$RESPONSE" | jq -r '.state')
+                  local RESPONSE_ENVIRONMENT=$(echo "$RESPONSE" | jq -r '.environment')
 
-            # Extract information from the response
-            RESPONSE_STATE=$(echo "$RESPONSE" | jq -r '.state')
-            RESPONSE_ENVIRONMENT=$(echo "$RESPONSE" | jq -r '.environment')
+                  # Output the information
+                  echo "-> Update $RESPONSE_ENVIRONMENT latest deployment to $RESPONSE_STATE state."
+              else
+                  echo "-> No deployment for $ENVIRONMENT environment. No update."
+              fi
+          }
 
-            # Output the information
-            echo "-> Update $RESPONSE_ENVIRONMENT latest deployment to $RESPONSE_STATE state."
-          else
-            TVOS_ENVIRONMENT=$(printf '%b' "${TVOS_ENVIRONMENT//%/\\x}")
-            echo "-> No deployment for $TVOS_ENVIRONMENT environment. No update."
-          fi
+          # Set inactive state to the latest deployment of branch environments
+          set_inactive_latest_deployment "playsrg-ios-nightly+$BUILD_NAME"
+          set_inactive_latest_deployment "playsrg-tvos-nightly+$BUILD_NAME"
+          set_inactive_latest_deployment "playsrg-ios-beta+$BUILD_NAME"
+          set_inactive_latest_deployment "playsrg-tvos-beta+$BUILD_NAME"
diff --git a/.issuetracker b/.issuetracker
@@ -0,0 +1,11 @@
+# Integration with Issue Tracker
+#
+# (note that '\' need to be escaped).
+
+[issuetracker "GitHub Rule"]
+  regex = "#(\\d+)"
+  url = "https://github.com/srgssr/playsrg-apple/issues/$1"
+
+[issuetracker "Jira Rule"]
+  regex = "(PLAYSRG|PLAY|PLAYRTS|SMAC|ADI)-(\\d+)"
+  url = "https://srgssr-ch.atlassian.net/browse/$1-$2"
diff --git a/Application/Resources/Apps/Play RSI/ApplicationConfiguration.json b/Application/Resources/Apps/Play RSI/ApplicationConfiguration.json
@@ -20,7 +20,8 @@
   "whatsNewURL": "https://srgssr.github.io/playsrg-apple/releases/release_notes-ios-rsi.html",
   "radioChannels": "[{\"uid\":\"rete-uno\",\"name\":\"Rete Uno\",\"resourceUid\":\"rete_uno\",\"songsViewStyle\":\"collapsed\",\"color\":\"#0074C2\",\"secondColor\":\"#54B8EF\"},{\"uid\":\"rete-due\",\"name\":\"Rete Due\",\"resourceUid\":\"rete_due\",\"songsViewStyle\":\"collapsed\",\"color\":\"#06A73B\",\"secondColor\":\"#30E96B\"},{\"uid\":\"rete-tre\",\"name\":\"Rete Tre\",\"resourceUid\":\"rete_tre\",\"songsViewStyle\":\"collapsed\",\"color\":\"#A4BB1B\",\"secondColor\":\"#DEF355\"},{\"uid\":\"podcast\",\"name\":\"Podcast\",\"resourceUid\":\"rsi_podcast\",\"color\":\"#333333\",\"homeSections\":\"radioLatest,radioFavoriteShows,radioLatestEpisodesFromFavorites,radioResumePlayback,radioMostPopular,radioWatchLater,radioAllShows\"}]",
   "tvChannels": "[{\"uid\":\"la1\",\"name\":\"LA 1\",\"resourceUid\":\"la1\",\"color\":\"#FF9120\",\"secondColor\":\"#E15100\"},{\"uid\":\"la2\",\"name\":\"LA 2\",\"resourceUid\":\"la2\",\"color\":\"#FFCF2F\",\"secondColor\":\"#F38A0D\"},{\"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\":\"#3787FF\",\"secondColor\":\"#153567\"},{\"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-it\",\"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}]",
+  "satelliteRadioChannels": "[{\"uid\":\"rsp\",\"name\":\"Radio Swiss Pop\",\"resourceUid\":\"rsp\",\"songsViewStyle\":\"expanded\",\"color\":\"#F01F73\",\"secondColor\":\"#D31A3C\",\"homepageHidden\":true, \"shareURL\":\"https://www.radioswisspop.ch/it\"},{\"uid\":\"rsc-it\",\"name\":\"Radio Swiss Classic\",\"resourceUid\":\"rsc\",\"songsViewStyle\":\"expanded\",\"color\":\"#09A1DE\",\"secondColor\":\"#036E99\",\"homepageHidden\":true, \"shareURL\":\"https://www.radioswissclassic.ch/it\"},{\"uid\":\"rsj\",\"name\":\"Radio Swiss Jazz\",\"resourceUid\":\"rsj\",\"songsViewStyle\":\"expanded\",\"color\":\"#F7B222\",\"secondColor\":\"#CC7A00\",\"homepageHidden\":true, \"shareURL\":\"https://www.radioswissjazz.ch/it\"}]",
+  "topicColors": "{\"urn:rsi:topic:tv:1\":{\"firstColor\":\"#c01232\",\"secondColor\":\"#480010\"},\"urn:rsi:topic:tv:4\":{\"firstColor\":\"#d7b447\",\"secondColor\":\"#b62019\",\"reduceBrightness\":true},\"urn:rsi:topic:tv:7\":{\"firstColor\":\"#da2146\",\"secondColor\":\"#2d38c0\",\"reduceBrightness\":true},\"urn:rsi:topic:tv:8\":{\"firstColor\":\"#cd4023\",\"secondColor\":\"#90062e\"},\"urn:rsi:topic:tv:11\":{\"firstColor\":\"#dea706\",\"secondColor\":\"#bd2e5e\",\"reduceBrightness\":true},\"urn:rsi:topic:tv:40\":{\"firstColor\":\"#44bda8\",\"secondColor\":\"#00324e\",\"reduceBrightness\":true},\"urn:rsi:topic:tv:80\":{\"firstColor\":\"#1f509d\",\"secondColor\":\"#121a37\"},\"urn:rsi:topic:tv:90\":{\"firstColor\":\"#738dae\",\"secondColor\":\"#3a465e\"},\"urn:rsi:topic:tv:100\":{\"firstColor\":\"#d75959\",\"secondColor\":\"#29336c\",\"reduceBrightness\":true},\"urn:rsi:topic:tv:600\":{\"firstColor\":\"#27DCF9\",\"secondColor\":\"#932387\"},\"urn:rsi:topic:tv:6000\":{\"firstColor\":\"#02cde9\",\"secondColor\":\"#011844\"},\"urn:rtr:topic:tv:2d48ba80-566c-4359-9e8d-8d9b2d570e0a\":{\"firstColor\":\"#00A1A1\",\"secondColor\":\"#04575B\"},\"urn:rtr:topic:tv:7d7f21be-6727-4939-9126-5bca25eb3a49\":{\"firstColor\":\"#80D2E3\",\"secondColor\":\"#003D58\"},\"urn:rtr:topic:tv:20e7478f-1ea1-49c3-81c2-5f157d6ff092\":{\"firstColor\":\"#340101\",\"secondColor\":\"#8F0E0F\"},\"urn:rtr:topic:tv:50bb90d6-41af-4bbd-b92c-6ef5db16a9b3\":{\"firstColor\":\"#8A0533\",\"secondColor\":\"#812626\"},\"urn:rtr:topic:tv:c50140e7-5740-4c44-abd0-0f7d9ea68da7\":{\"firstColor\":\"#A6A6A7\",\"secondColor\":\"#2C2B2D\"},\"urn:rtr:topic:tv:dfb7ae6d-cb73-431b-a817-b1663ec2f58a\":{\"firstColor\":\"#00F8CC\",\"secondColor\":\"#018864\"},\"urn:rts:topic:tv:623\":{\"firstColor\":\"#5C845B\",\"secondColor\":\"#16280F\"},\"urn:rts:topic:tv:665\":{\"firstColor\":\"#3787FF\",\"secondColor\":\"#0A1C33\"},\"urn:rts:topic:tv:1095\":{\"firstColor\":\"#F5F500\",\"secondColor\":\"#BEB405\",\"reduceBrightness\":true},\"urn:rts:topic:tv:1353\":{\"firstColor\":\"#084165\",\"secondColor\":\"#140953\"},\"urn:rts:topic:tv:2743\":{\"firstColor\":\"#BCF6FF\",\"secondColor\":\"#00D0EF\",\"reduceBrightness\":true},\"urn:rts:topic:tv:10193\":{\"firstColor\":\"#EB2350\",\"secondColor\":\"#A61637\"},\"urn:rts:topic:tv:54537\":{\"firstColor\":\"#FFE03E\",\"secondColor\":\"#F98E73\",\"reduceBrightness\":true},\"urn:rts:topic:tv:59220\":{\"firstColor\":\"#492b63\",\"secondColor\":\"#271633\"},\"urn:rts:topic:tv:67132\":{\"firstColor\":\"#415FAF\",\"secondColor\":\"#23376B\"},\"urn:srf:topic:tv:1d7d9cfb-6682-4d5b-9e36-322e8fa93c03\":{\"firstColor\":\"#00A4B3\",\"secondColor\":\"#006973\"},\"urn:srf:topic:tv:4acf86dd-7ff7-45d3-baf8-33375340d976\":{\"firstColor\":\"#3f4b70\",\"secondColor\":\"#131a2d\"},\"urn:srf:topic:tv:9a79b1de-cde8-4528-b304-d1ae1363f52f\":{\"firstColor\":\"#836fcd\",\"secondColor\":\"#36343f\"},\"urn:srf:topic:tv:63f937e4-859e-42c4-a430-bdb74dd09645\":{\"firstColor\":\"#4480a2\",\"secondColor\":\"#20182c\"},\"urn:srf:topic:tv:67f812fd-19a3-4c22-9e6b-ec36e65a4703\":{\"firstColor\":\"#bb3966\",\"secondColor\":\"#190406\"},\"urn:srf:topic:tv:593eb926-d892-41ba-8b1f-eccbcfd7f15f\":{\"firstColor\":\"#2bbf9b\",\"secondColor\":\"#02291e\"},\"urn:srf:topic:tv:649e36d7-ff57-41c8-9c1b-7892daf15e78\":{\"firstColor\":\"#FF0037\",\"secondColor\":\"#AF001E\"},\"urn:srf:topic:tv:882cb264-cf81-4a9c-b660-d42519b7ce28\":{\"firstColor\":\"#c91d7d\",\"secondColor\":\"#31041f\"},\"urn:srf:topic:tv:43741c59-317e-458b-ac38-c2b1c065c865\":{\"firstColor\":\"#0075ad\",\"secondColor\":\"#000022\"},\"urn:srf:topic:tv:516421f0-ec89-43ba-823b-1b5ceec262f3\":{\"firstColor\":\"#5FB281\",\"secondColor\":\"#154e60\"},\"urn:srf:topic:tv:641223fa-f112-4d98-8aec-cb22262a1182\":{\"firstColor\":\"#c55cee\",\"secondColor\":\"#0c1c68\"},\"urn:srf:topic:tv:a2d97206-0b85-4226-8afe-06e86ebd05b2\":{\"firstColor\":\"#9fc885\",\"secondColor\":\"#20281a\"},\"urn:srf:topic:tv:a709c610-b275-4c0c-a496-cba304c36712\":{\"firstColor\":\"#b3131d\",\"secondColor\":\"#3e0b14\"},\"urn:srf:topic:tv:b58dcf14-96ac-4046-8676-fd8a942c0e88\":{\"firstColor\":\"#7081b0\",\"secondColor\":\"#202020\"},\"urn:srf:topic:tv:bb7b21e0-1056-4e28-bac3-c610393b5b0f\":{\"firstColor\":\"#3c788e\",\"secondColor\":\"#1b3e48\"},\"urn:srf:topic:tv:e52080fc-f36b-481e-955f-071b6c8d6dc3\":{\"firstColor\":\"#ff6778\",\"secondColor\":\"#920a1a\",\"reduceBrightness\":true},\"urn:srf:topic:tv:fa793c13-bebc-41b9-9710-bf8a34192c15\":{\"firstColor\":\"#baead5\",\"secondColor\":\"#010b40\",\"reduceBrightness\":true}}",
   "continuousPlaybackPlayerViewTransitionDuration": 10,
   "continuousPlaybackForegroundTransitionDuration": 0,
   "continuousPlaybackBackgroundTransitionDuration": 0,

diff --git a/Application/Resources/Apps/Play RSI/it.lproj/Localizable.strings b/Application/Resources/Apps/Play RSI/it.lproj/Localizable.strings
@@ -738,7 +738,8 @@
    Error message when a media cannot be opened via Handoff, deep linking or a push notification */
 "The media cannot be opened." = "Il media non può essere riprodotto.";
 
-/* Error message when a page cannot be opened via Handoff, deep linking or a push notification
+/* Error message when a page cannot be opened from a page section title
+   Error message when a page cannot be opened via Handoff, deep linking or a push notification
    Error message when a topic cannot be opened via Handoff, deep linking or a push notification */
 "The page cannot be opened." = "La pagina non può essere aperta.";