Merge branch 'release/ios/3.1.4-346'

SRGSSR · Oct 27, 2020 · 7a9f5c1 · 7a9f5c1
2 parents 14d2337 + e5d1f72
commit 7a9f5c1
Show file tree

Hide file tree

Showing 697 changed files with 15,023 additions and 4,079 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-.DS_Store
+	.DS_Store
 
 *.xccheckout
 *.xcscmblueprint
@@ -10,16 +10,14 @@ xcuserdata
 /Configuration
 
 /Carthage
-/Cartfile.private
-/Cartfile.resolved
 
 /.env
 /Xcode/Links
 
 /fastlane/export
-/fastlane/last-nightlies-success-git-commit-hash.txt
+/fastlane/*commit-hash.txt
 /fastlane/Preview.html
-/fastlane/report.xml
+/fastlane/*.xml
 /fastlane/screenshots
 /fastlane/test_output
 

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -17,6 +17,7 @@ Metrics/BlockLength:
 # Lane description and gem lines can be long
 Layout/LineLength:
   Enabled: true
+  Max: 100
   IgnoredPatterns: ['^gem', '^(\s+|)desc', '^(\s+|)UI.']
 
 # They have not to be snake_case

diff --git a/Application/Application-Info.plist b/Application/Application-Info.plist
@@ -23,7 +23,7 @@
 	<key>CFBundleIcons~ipad</key>
 	<dict/>
 	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -172,6 +172,8 @@
 	</dict>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>The application uses the microphone for Google Cast receiver discovery.</string>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>The application uses the local network for Google Cast receiver discovery.</string>
 	<key>NSUserActivityTypes</key>
 	<array>
 		<string>$(PRODUCT_BUNDLE_IDENTIFIER).playing</string>
@@ -249,5 +251,12 @@
 	<string>Dark</string>
 	<key>AVInitialRouteSharingPolicy</key>
 	<string>LongFormVideo</string>
+	<key>GoogleCastReceiverIdentifier</key>
+	<string>${GOOGLE_CAST_RECEIVER_IDENTIFIER}</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_googlecast._tcp</string>
+		<string>_${GOOGLE_CAST_RECEIVER_IDENTIFIER}._googlecast._tcp</string>
+	</array>
 </dict>
 </plist>
diff --git a/Application/Resources/Apps/Play RSI/ApplicationConfiguration.json b/Application/Resources/Apps/Play RSI/ApplicationConfiguration.json
@@ -4,7 +4,6 @@
   "comScoreVirtualSite": "rsi-player-ios-v",
   "netMetrixIdentifier": "srgplayer",
   "voiceOverLanguageCode": "it",
-  "googleCastReceiverIdentifier": "1AC2931D",
   "appStoreProductIdentifier": 920753497,
   "playURL": "https://www.rsi.ch/play/",
   "middlewareURL": "https://playfff.herokuapp.com",

diff --git a/Application/Resources/Apps/Play RSI/it.lproj/InfoPlist.strings b/Application/Resources/Apps/Play RSI/it.lproj/InfoPlist.strings
@@ -3,3 +3,4 @@
 "History" = "Cronologia";
 "Search" = "Ricerca";
 "NSMicrophoneUsageDescription" = "L'applicazione utilizza il microfono per rilevare il ricevitore Google Cast.";
+"NSLocalNetworkUsageDescription" = "Questa app usa la rete locale per identificare un ricevitore Google Cast.";
diff --git a/Application/Resources/Apps/Play RSI/it.lproj/Localizable.strings b/Application/Resources/Apps/Play RSI/it.lproj/Localizable.strings
@@ -159,16 +159,16 @@
 /* Question displayed at the top of an alert asking the user to enable notifications */
 "Enable notifications?" = "Abilitare le notifiche?";
 
-/* Title label used to present scheduled livestream medias. Only on test versions. */
+/* Title label used to present scheduled livestream medias */
 "Events" = "Eventi";
 
 /* Short label identifying content which has expired. */
 "Expired" = "Scaduto";
 
 /* Favorite show label when added ,in the show view
    Label to present Favorites
-   Title label used to present the radio favorite shows.
-   Title label used to present the TV favorite shows. */
+   Title label used to present the radio favorite shows
+   Title label used to present the TV favorite shows */
 "Favorites" = "Preferiti";
 
 /* Title displayed at the top of the features list */
@@ -184,7 +184,7 @@
 /* Total free space size, display at the bottom of download list */
 "Free space: %@" = "Spazio libero: %@";
 
-/* Title label used to present TV event modules while loading. It appears if no network connection available and no cache available. */
+/* Title label used to present TV event modules while loading. It appears if no network connection is available and no cache is available */
 "Highlights" = "Highlights";
 
 /* Label to present history */
@@ -199,9 +199,6 @@
 /* Title of the alert view to keep autoplay permanently */
 "Keep autoplay?" = "Mantenere l'autoplay attivo?";
 
-/* Label on recently played livestreams */
-"Last played" = "Ultimo contenuto visionato";
-
 /* Introductory text for the most recent data synchronization date */
 "Last synchronization: %@" = "Ultima sincronizzazione: %@";
 
@@ -234,6 +231,9 @@
    Title displayed at the top of the livestream view */
 "Livestreams" = "Live";
 
+/* Setting footer message for system permission group. New rule for iOS 14 and more. */
+"Local network access must be allowed for Google Cast receiver discovery." = "Per poter utilizzare un adattatore Google Cast è necessario permettere l'accesso alla rete locale.";
+
 /* Text displayed within the login / sign up profile header when no user is displayed */
 "Login / Sign up" = "Login / Registrati";
 
@@ -254,11 +254,11 @@
 /* Title of the related content player section */
 "More on this subject" = "Di più sull'argomento";
 
-/* Title label used to present the radio most listened / popular audio medias */
+/* Title label used to present the radio most popular audio medias */
 "Most listened to" = "I più ascoltati";
 
 /* Short title for the most clicked video topic list
-   Title label used to present the TV most seen / clicked / popular videos */
+   Title label used to present the TV most popular videos */
 "Most popular" = "I più visti";
 
 /* Short title for the most recent video topic list */
@@ -458,8 +458,8 @@
    Shows search setting option
    Shows search setting option list view title
    Title label used to present radio associated shows
-   Title label used to present the radio shows AZ and radio shows by date access buttons.
-   Title label used to present the TV shows AZ and TV shows by date access buttons. */
+   Title label used to present the radio shows AZ and radio shows by date access buttons
+   Title label used to present the TV shows AZ and TV shows by date access buttons */
 "Shows" = "Programmi";
 
 /* Title of the button to skip updating the application */
@@ -471,14 +471,14 @@
 /* Settings section header */
 "Sort by" = "Ordinare per";
 
-/* Title label used to present live center medias. Only on test versions. */
+/* Title label used to present live center medias */
 "Sport" = "Sport";
 
 /* Subtitles short label on media cells */
 "ST" = "ST";
 
 /* Explains that a content is still online (for days or hours) but will expire. Displayed in the media player view. */
-"Still available for %@" = "Ancora disponibile per %@";
+"Still available for %@" = "Disponibile ancora per %@";
 
 /* Message displayed when no notifications have been received */
 "Subscribe to shows you like to be notified when a new episode is available." = "Abbonati ai programmi che preferisci. Riceverai una notifica ogni volta che un nuovo episodio sarà disponibile.";
@@ -558,7 +558,7 @@
 
 /* Categories search setting option
    Title label used to present TV topics
-   Title label used to present TV topics while loading. It appears if no network connection available and no cache available.
+   Title label used to present TV topics while loading. It appears if no network connection is available and no cache is available
    Topics search setting option list view title */
 "Topics" = "Categorie";
 
@@ -594,7 +594,7 @@
 "Watch later" = "Guardare dopo";
 
 /* Web first label on media cells */
-"WEB FIRST" = "WEB FIRST";
+"Web first" = "Web first";
 
 /* Title displayed at the top of the What's new view */
 "What's new" = "Novità";

diff --git a/Application/Resources/Apps/Play RTR/ApplicationConfiguration.json b/Application/Resources/Apps/Play RTR/ApplicationConfiguration.json
@@ -3,7 +3,6 @@
   "container": 10,
   "comScoreVirtualSite": "rtr-player-ios-v",
   "netMetrixIdentifier": "srgplayer",
-  "googleCastReceiverIdentifier": "1AC2931D",
   "appStoreProductIdentifier": 920754925,
   "playURL": "https://www.rtr.ch/play/",
   "middlewareURL": "https://playfff.herokuapp.com",

diff --git a/Application/Resources/Apps/Play RTR/rm.lproj/InfoPlist.strings b/Application/Resources/Apps/Play RTR/rm.lproj/InfoPlist.strings
@@ -3,3 +3,4 @@
 "History" = "Cronologia";
 "Search" = "Tschertga";
 "NSMicrophoneUsageDescription" = "L'applicaziun dovra il microfon per chattar il receptur Google Cast.";
+"NSLocalNetworkUsageDescription" = "La applicaziun utilisescha la rait locala per Google Cast.";
diff --git a/Application/Resources/Apps/Play RTR/rm.lproj/Localizable.strings b/Application/Resources/Apps/Play RTR/rm.lproj/Localizable.strings
@@ -159,16 +159,16 @@
 /* Question displayed at the top of an alert asking the user to enable notifications */
 "Enable notifications?" = "Activar las notificaziuns?";
 
-/* Title label used to present scheduled livestream medias. Only on test versions. */
+/* Title label used to present scheduled livestream medias */
 "Events" = "Eveniments";
 
 /* Short label identifying content which has expired. */
 "Expired" = "Expirà";
 
 /* Favorite show label when added ,in the show view
    Label to present Favorites
-   Title label used to present the radio favorite shows.
-   Title label used to present the TV favorite shows. */
+   Title label used to present the radio favorite shows
+   Title label used to present the TV favorite shows */
 "Favorites" = "Favurits";
 
 /* Title displayed at the top of the features list */
@@ -184,7 +184,7 @@
 /* Total free space size, display at the bottom of download list */
 "Free space: %@" = "Spaci liber: %@";
 
-/* Title label used to present TV event modules while loading. It appears if no network connection available and no cache available. */
+/* Title label used to present TV event modules while loading. It appears if no network connection is available and no cache is available */
 "Highlights" = "Highlights";
 
 /* Label to present history */
@@ -199,9 +199,6 @@
 /* Title of the alert view to keep autoplay permanently */
 "Keep autoplay?" = "Tegnair autoplay?";
 
-/* Label on recently played livestreams */
-"Last played" = "Ultim guardà";
-
 /* Introductory text for the most recent data synchronization date */
 "Last synchronization: %@" = "Ultima sincronisaziun: %@";
 
@@ -234,6 +231,9 @@
    Title displayed at the top of the livestream view */
 "Livestreams" = "Live";
 
+/* Setting footer message for system permission group. New rule for iOS 14 and more. */
+"Local network access must be allowed for Google Cast receiver discovery." = "Il access a la rait locala è necessari per utilisar Google Cast. ";
+
 /* Text displayed within the login / sign up profile header when no user is displayed */
 "Login / Sign up" = "Login";
 
@@ -254,11 +254,11 @@
 /* Title of the related content player section */
 "More on this subject" = "Dapli";
 
-/* Title label used to present the radio most listened / popular audio medias */
+/* Title label used to present the radio most popular audio medias */
 "Most listened to" = "Tadlà il pli savens";
 
 /* Short title for the most clicked video topic list
-   Title label used to present the TV most seen / clicked / popular videos */
+   Title label used to present the TV most popular videos */
 "Most popular" = "Il pli tschertgà";
 
 /* Short title for the most recent video topic list */
@@ -458,8 +458,8 @@
    Shows search setting option
    Shows search setting option list view title
    Title label used to present radio associated shows
-   Title label used to present the radio shows AZ and radio shows by date access buttons.
-   Title label used to present the TV shows AZ and TV shows by date access buttons. */
+   Title label used to present the radio shows AZ and radio shows by date access buttons
+   Title label used to present the TV shows AZ and TV shows by date access buttons */
 "Shows" = "Emissiuns";
 
 /* Title of the button to skip updating the application */
@@ -471,7 +471,7 @@
 /* Settings section header */
 "Sort by" = "Sortar tenor";
 
-/* Title label used to present live center medias. Only on test versions. */
+/* Title label used to present live center medias */
 "Sport" = "Sport";
 
 /* Subtitles short label on media cells */
@@ -558,7 +558,7 @@
 
 /* Categories search setting option
    Title label used to present TV topics
-   Title label used to present TV topics while loading. It appears if no network connection available and no cache available.
+   Title label used to present TV topics while loading. It appears if no network connection is available and no cache is available
    Topics search setting option list view title */
 "Topics" = "Themas";
 
@@ -594,7 +594,7 @@
 "Watch later" = "Guardar pli tard";
 
 /* Web first label on media cells */
-"WEB FIRST" = "WEB l‘emprim";
+"Web first" = "Web l'emprim";
 
 /* Title displayed at the top of the What's new view */
 "What's new" = "Il nov";

diff --git a/Application/Resources/Apps/Play RTS/ApplicationConfiguration.json b/Application/Resources/Apps/Play RTS/ApplicationConfiguration.json
@@ -4,7 +4,6 @@
   "comScoreVirtualSite": "rts-player-ios-v",
   "netMetrixIdentifier": "srgplayer",
   "voiceOverLanguageCode": "fr",
-  "googleCastReceiverIdentifier": "1AC2931D",
   "appStoreProductIdentifier": 920754415,
   "playURL": "https://www.rts.ch/play/",
   "middlewareURL": "https://playfff.herokuapp.com",

diff --git a/Application/Resources/Apps/Play RTS/RTSResources.xcassets/Youth Protection/Contents.json b/Application/Resources/Apps/Play RTS/RTSResources.xcassets/Youth Protection/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...RTS/RTSResources.xcassets/Youth Protection/youth_protection_red-18.imageset/Contents.json b/...RTS/RTSResources.xcassets/Youth Protection/youth_protection_red-18.imageset/Contents.json
@@ -1,12 +1,16 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "trait_rouge_v2_app.pdf"
+      "filename" : "trait_rouge_v2_app.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "trait_rouge.pdf",
+      "idiom" : "tv"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...S/RTSResources.xcassets/Youth Protection/youth_protection_red-18.imageset/trait_rouge.pdf b/...S/RTSResources.xcassets/Youth Protection/youth_protection_red-18.imageset/trait_rouge.pdf
diff --git a/.../RTSResources.xcassets/Youth Protection/youth_protection_yellow-18.imageset/Contents.json b/.../RTSResources.xcassets/Youth Protection/youth_protection_yellow-18.imageset/Contents.json
@@ -1,12 +1,16 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
-      "filename" : "youth_protection_yellow-18.pdf"
+      "filename" : "youth_protection_yellow-18.pdf",
+      "idiom" : "universal"
+    },
+    {
+      "filename" : "carre_jaune.pdf",
+      "idiom" : "tv"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/...TSResources.xcassets/Youth Protection/youth_protection_yellow-18.imageset/carre_jaune.pdf b/...TSResources.xcassets/Youth Protection/youth_protection_yellow-18.imageset/carre_jaune.pdf
diff --git a/Application/Resources/Apps/Play RTS/fr.lproj/InfoPlist.strings b/Application/Resources/Apps/Play RTS/fr.lproj/InfoPlist.strings
@@ -3,3 +3,4 @@
 "History" = "Historique";
 "Search" = "Recherche";
 "NSMicrophoneUsageDescription" = "L'application utilise le micro pour la découverte de récepteur Google Cast.";
+"NSLocalNetworkUsageDescription" = "L'application utilise le réseau local pour la découverte de récepteur Google Cast.";