Merge branch 'release/3.0.0-326'

.gitignore

@@ -20,7 +20,7 @@ xcuserdata
 /fastlane/last-nightlies-success-git-commit-hash.txt
 /fastlane/Preview.html
 /fastlane/report.xml
-/fastlane/screenshots/**/*.png
+/fastlane/screenshots
 /fastlane/test_output
 
 /Pods

.rubocop.yml

@@ -0,0 +1,33 @@
+inherit_mode:
+  merge:
+    - Include
+
+AllCops:
+  Exclude:
+    - 'Carthage/**/*'
+    - 'vendor/**/*'
+  Include:
+    - 'fastlane/Pluginfile'
+
+# this would cause errors with long lanes
+Metrics/BlockLength:
+  Enabled: true
+  ExcludedMethods: ['platform', 'for_platform', 'abstract_target']
+
+# Lane description and gem lines can be long
+Layout/LineLength:
+  Enabled: true
+  IgnoredPatterns: ['^gem', '^(\s+|)desc', '^(\s+|)UI.']
+
+# They have not to be snake_case
+Naming/FileName:
+  Exclude:
+    - '**/Appfile'
+    - '**/Gemfile'
+    - '**/Pluginfile'
+    - '**/Fastfile'
+
+# Variables have to be as described in fastlane documentation
+Style/RedundantInterpolation:
+  Exclude:
+    - '**/Appfile'

Application/Resources/Apps/Play RSI/ApplicationConfiguration.json

@@ -8,26 +8,21 @@
   "appStoreProductIdentifier": 920753497,
   "playURL": "https://www.rsi.ch/play/",
   "middlewareURL": "https://playfff.herokuapp.com",
-  "feedbackURL": "https://play.typeform.com/to/yrmKKf",
-  "searchOptions": "tvShows,videos,radioShows,audios",
-  "tvHomeSections": "tvTrending,tvLive,tvFavoriteShows,tvEvents,tvTopics",
+  "videoHomeSections": "tvTrending,tvShowsAccess,tvFavoriteShows,tvEvents,tvTopics",
+  "liveHomeSections": "tvLive,radioLive",
   "tvTrendingEpisodesOnly": false,
   "tvFeaturedHomeSectionHeaderHidden": true,
-  "tvNumberOfLivePlaceholders": 2,
-  "radioHomeSections": "radioLive,radioFavoriteShows,radioShowsAccess,radioMostPopular,radioLatest",
+  "audioHomeSections": "radioLatest,radioShowsAccess,radioFavoriteShows,radioMostPopular",
   "radioFeaturedHomeSectionHeaderHidden": true,
+  "topicHomeHeadersHidden": true,
   "topicSections": "latest,mostPopular",
   "topicSectionsWithSubtopics": "latest",
-  "tvMenuItems": "showAZ,byDate",
-  "radioMenuItems": "showAZ",
   "minimumSocialViewCount": 50,
   "termsAndConditionsURL": "https://www.rsi.ch/chi-siamo",
   "dataProtectionURL": "https://www.rsi.ch/chi-siamo/protezione-dei-dati/Dichiarazione-sulla-protezione-dei-dati-10499633.html",
   "whatsNewURL": "https://pastebin.com/raw/WUM7QS1W",
   "radioChannels": "[   {     \"uid\": \"rete-uno\",     \"name\": \"Rete Uno\",     \"resourceUid\": \"rete_uno\",     \"color\": \"#0074C2\"   },   {     \"uid\": \"rete-due\",     \"name\": \"Rete Due\",     \"resourceUid\": \"rete_due\",     \"color\": \"#05A73A\"   },   {     \"uid\": \"rete-tre\",     \"name\": \"Rete Tre\",     \"resourceUid\": \"rete_tre\",     \"color\": \"#A3BA1B\"   } ]",
   "tvChannels": "[   {     \"uid\": \"la1\",     \"name\": \"LA 1\",     \"resourceUid\": \"la1\"   },   {     \"uid\": \"la2\",     \"name\": \"LA 2\",     \"resourceUid\": \"la2\"   } ]",
-  "moduleDefaultLinkColor": "#D2D2D2",
-  "moduleDefaultTextColor": "#969696",
   "continuousPlaybackPlayerViewTransitionDuration": 5,
   "continuousPlaybackForegroundTransitionDuration": 0,
   "continuousPlaybackBackgroundTransitionDuration": 0,

Application/Resources/Apps/Play RSI/RSIResources.xcassets/Radio/Rete Due/logo_rete_due-22.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "logo_menu_retedue.pdf"
+      "filename" : "logo_rete_due.pdf"
     }
   ],
   "info" : {

Application/Resources/Apps/Play RSI/RSIResources.xcassets/Radio/Rete Tre/logo_rete_tre-22.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "logo_menu_retetre.pdf"
+      "filename" : "logo_rete_tre.pdf"
     }
   ],
   "info" : {

Application/Resources/Apps/Play RSI/RSIResources.xcassets/Radio/Rete Uno/logo_rete_uno-22.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "logo_menu_reteuno.pdf"
+      "filename" : "logo_rete_uno.pdf"
     }
   ],
   "info" : {

Application/Resources/Apps/Play RSI/RSIResources.xcassets/Logos/logo_play-20.imageset/Contents.json → Application/Resources/Apps/Play RSI/RSIResources.xcassets/TV/La1/logo_la1-22.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "playrsi_20.pdf"
+      "filename" : "logo_la1.pdf"
     }
   ],
   "info" : {

Application/Resources/Apps/Play SRF/SRFResources.xcassets/Logos/logo_play-20.imageset/Contents.json → Application/Resources/Apps/Play RSI/RSIResources.xcassets/TV/La2/logo_la2-22.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "playsrf_20.pdf"
+      "filename" : "logo_la2.pdf"
     }
   ],
   "info" : {

Application/Resources/Apps/Play RSI/it.lproj/Accessibility.strings

@@ -21,15 +21,23 @@
 /* Title of the first cell of a media list on homepage. */
 "All content for \"%@\"" = "Mostra tutto \"%@\"";
 
-/* Accessibility label for the audio description badge */
+/* Accessibility label for a media cell with audio description
+   Accessibility label for the audio description badge */
 "Audio described" = "Audiodescrizione";
 
-/* Close button label on player view
-   Close button label on search view */
+/* Close button label
+   Close button label on player view
+   Close button label on settings view */
 "Close" = "Chiudere";
 
 /* Player close button hint */
-"Closes the player while continuing to play audio." = "Chiude il player mentre si continua a riprodurre l'audio.";
+"Closes the player and continue playing audio." = "Chiude il player ma continua a riprodurre l'audio.";
+
+/* Player close button hint */
+"Closes the player and continue playing in the background." = "Chiude il player ma continua la riproduzione in background";
+
+/* Player close button hint */
+"Closes the player and continue playing video with AirPlay." = "Chiude il player ma continua la riproduzione con AirPlay.";
 
 /* Delete button label */
 "Delete" = "Elimina";
@@ -61,21 +69,9 @@
 /* Accessibility hint associated with the account header */
 "Manages account information" = "Gestire le informazioni sull'account";
 
-/* Menu button label */
-"Menu" = "Menu";
-
-/* Announcement made when the left menu is closed */
-"Menu closed" = "Menu chiuso";
-
-/* Announcement made when the left menu is opened */
-"Menu open" = "Menu aperto";
-
 /* Text displayed when a user is logged in but no information has been retrieved yet */
 "My account" = "Il mio account";
 
-/* Notifications button label */
-"Notifications" = "Notifiche";
-
 /* Mini player label */
 "Now playing: %@" = "In riproduzione: %@";
 
@@ -88,11 +84,17 @@
 /* Show cell hint */
 "Opens show details." = "Dettagli del programma.";
 
+/* Mini player action hint */
+"Opens the full screen player" = "Player a schermo pieno";
+
 /* Accessibility label for the multi audio badge */
 "Original version" = "Versione originale";
 
-/* Livestream play action hint */
-"Plays livestream." = "Play streaming live.";
+/* Pause button label */
+"Pause" = "Pausa";
+
+/* Play button label */
+"Play" = "Play";
 
 /* Media cell hint
    Mini player action hint */
@@ -120,18 +122,21 @@
 /* A download button label */
 "Retry download" = "Riprovare il download";
 
-/* Search button label */
-"Search" = "Ricerca";
-
 /* Regional livestream selection hint */
 "Select regional radio" = "Selezionare radio regionale";
 
+/* Settings button label on home view */
+"Settings" = "Impostazioni";
+
 /* Share button label on player view */
 "Share" = "Condividi";
 
 /* Homepage header action hint */
 "Shows all contents." = "Mostra tutti i contenuti.";
 
+/* Stop button label */
+"Stop" = "Stop";
+
 /* A download button label */
 "Stop downloading" = "Interrompere il download";