Merge pull request #209 from V1taS/feature/Artem_Pavlov/Create-a-seri…

…es-module Feature/artem pavlov/create a series module
V1taS · Dec 4, 2023 · 0209256 · 0209256
2 parents 940261c + f97f25a
commit 0209256
Show file tree

Hide file tree

Showing 27 changed files with 1,133 additions and 5 deletions.
diff --git a/Random/App/Resources/de.lproj/Localizable.strings b/Random/App/Resources/de.lproj/Localizable.strings
@@ -25,6 +25,7 @@
 "can_generate_random_contact" = "Es ist möglich, einen zufälligen Kontakt aus einer Liste zu generieren";
 "can_generate_random_lottery_ticket" = "Es ist möglich, ein zufälliges Los für die Teilnahme am Gewinnspiel zu generieren";
 "can_generate_random_movie" = "Es ist möglich, einen zufälligen Film zu erzeugen";
+"can_generate_random_series" = "Es ist möglich, eine zufällige Serie zu erzeugen";
 "can_generate_random_password" = "Es ist möglich, ein zufälliges Passwort für die Registrierung zu generieren";
 "can_generate_random_photo_filter" = "Es ist möglich, einen zufälligen Filter für ein Foto zu erzeugen";
 "can_participate_in_weekly_prize_draw" = "Sie können an der wöchentlichen Verlosung teilnehmen";
@@ -216,6 +217,7 @@
 "select_coin_style" = "Münzstil auswählen";
 "select_icon" = "Symbol auswählen";
 "selen" = "Selen";
+"series" = "Serien";
 "september" = "September";
 "settings" = "Einstellungen";
 "seven_days_free" = "7 Tage kostenlos";
@@ -258,6 +260,7 @@
 "vendor_identifier" = "Anbieter-ID";
 "violet_lemon" = "Violett-Zitrone";
 "walk" = "Spaziergang";
+"watchTrailer" = "Trailer ansehen";
 "wednesday" = "Mittwoch";
 "yes" = "Ja";
 "yes_or_no" = "Ja oder Nein";

diff --git a/Random/App/Resources/en.lproj/Localizable.strings b/Random/App/Resources/en.lproj/Localizable.strings
@@ -25,6 +25,7 @@
 "can_generate_random_contact" = "You can generate a random contact from the list";
 "can_generate_random_lottery_ticket" = "You can generate a random lot to participate in the lottery";
 "can_generate_random_movie" = "You can generate a random movie";
+"can_generate_random_series" = "You can generate a random series";
 "can_generate_random_password" = "You can generate a random password for registration";
 "can_generate_random_photo_filter" = "You can generate a random filter for photos";
 "can_participate_in_weekly_prize_draw" = "You can participate in the weekly prize draw";
@@ -216,6 +217,7 @@
 "select_coin_style" = "Select coin style";
 "select_icon" = "Select icon";
 "selen" = "Selenium";
+"series" = "Series";
 "september" = "September";
 "settings" = "Settings";
 "seven_days_free" = "7 days free";
@@ -258,6 +260,7 @@
 "vendor_identifier" = "Vendor ID";
 "violet_lemon" = "Violet-lemon";
 "walk" = "Walk";
+"watchTrailer" = "Watch trailer";
 "wednesday" = "Wednesday";
 "yes" = "Yes";
 "yes_or_no" = "Yes or No";

diff --git a/Random/App/Resources/es.lproj/Localizable.strings b/Random/App/Resources/es.lproj/Localizable.strings
@@ -25,6 +25,7 @@
 "can_generate_random_contact" = "se puede generar un contacto aleatorio de una lista";
 "can_generate_random_lottery_ticket" = "se puede generar un lote aleatorio para participar en la lotería";
 "can_generate_random_movie" = "se puede generar una película aleatoria";
+"can_generate_random_series" = "Se puede generar una serie aleatoria";
 "can_generate_random_password" = "se puede generar una contraseña aleatoria para el registro";
 "can_generate_random_photo_filter" = "se puede generar un filtro aleatorio para la foto";
 "can_participate_in_weekly_prize_draw" = "se Puede participar en el sorteo semanal";
@@ -216,6 +217,7 @@
 "select_coin_style" = "Seleccionar estilo de moneda";
 "select_icon" = "Seleccione un icono";
 "selen" = "Selenio";
+"series" = "Seriales";
 "september" = "Septiembre";
 "settings" = "Configuraciones";
 "seven_days_free" = "7 días gratis";
@@ -258,6 +260,7 @@
 "vendor_identifier" = "id del proveedor";
 "violet_lemon" = "violeta-limón";
 "walk" = "caminar";
+"watchTrailer" = "Ver tráiler";
 "wednesday" = "Miércoles";
 "yes" = "Sí";
 "yes_or_no" = "Sí o No";

diff --git a/Random/App/Resources/it.lproj/Localizable.strings b/Random/App/Resources/it.lproj/Localizable.strings
@@ -25,6 +25,7 @@
 "can_generate_random_contact" = "è possibile generare un contatto casuale dall'elenco";
 "can_generate_random_lottery_ticket" = "è possibile generare un lotto casuale per partecipare alla lotteria";
 "can_generate_random_movie" = "è possibile generare un filmato casuale";
+"can_generate_random_series" = "È possibile generare una serie casuale";
 "can_generate_random_password" = "è possibile generare una password casuale per la registrazione";
 "can_generate_random_photo_filter" = "è possibile generare un filtro casuale per le foto";
 "can_participate_in_weekly_prize_draw" = "puoi partecipare all'estrazione settimanale dei Premi";
@@ -216,6 +217,7 @@
 "select_coin_style" = "Seleziona stile moneta";
 "select_icon" = "Scegli un'icona";
 "selen" = "selenio";
+"series" = "Serials";
 "september" = "settembre";
 "settings" = "Impostazioni";
 "seven_days_free" = "7 giorni gratis";
@@ -258,6 +260,7 @@
 "vendor_identifier" = "ID fornitore";
 "violet_lemon" = "Viola-limone";
 "walk" = "Passeggiata";
+"watchTrailer" = "Guarda il trailer";
 "wednesday" = "Mercoledì";
 "yes" = "Sì";
 "yes_or_no" = "Sì o no";

diff --git a/Random/App/Resources/ru.lproj/Localizable.strings b/Random/App/Resources/ru.lproj/Localizable.strings
@@ -25,6 +25,7 @@
 "can_generate_random_contact" = "Можно генерировать рандомный контакт из списка";
 "can_generate_random_lottery_ticket" = "Можно генерировать рандомный лот для участия в лотереи";
 "can_generate_random_movie" = "Можно генерировать рандомный фильм";
+"can_generate_random_series" = "Можно генерировать рандомный сериал";
 "can_generate_random_password" = "Можно генерировать рандомный пароль для регистрации";
 "can_generate_random_photo_filter" = "Можно генерировать рандомный фильтр для фото";
 "can_participate_in_weekly_prize_draw" = "Можно участвовать в еженедельном розыгрыше призов";
@@ -216,6 +217,7 @@
 "select_coin_style" = "Выбрать стиль монеты";
 "select_icon" = "Выберите иконку";
 "selen" = "Селен";
+"series" = "Сериалы";
 "september" = "Сентябрь";
 "settings" = "Настройки";
 "seven_days_free" = "7 дней бесплатно";
@@ -258,6 +260,7 @@
 "vendor_identifier" = "Идентийфикатор поставщика";
 "violet_lemon" = "Фиолотово-лимонный";
 "walk" = "Прогулка";
+"watchTrailer" = "Смотреть трейлер";
 "wednesday" = "Среда";
 "yes" = "Да";
 "yes_or_no" = "Да или Нет";

diff --git a/Random/App/Sources/ApplicationServices/DeepLinkService/DeepLinkType.swift b/Random/App/Sources/ApplicationServices/DeepLinkService/DeepLinkType.swift
@@ -81,6 +81,8 @@ enum DeepLinkType: CaseIterable, UserDefaultsCodable {
       return "settings_share_app"
     case .settingsfeedBackButton:
       return "settings_feed_back_button"
+    case .series:
+      return "series_screen"
     }
   }
 
@@ -187,4 +189,7 @@ enum DeepLinkType: CaseIterable, UserDefaultsCodable {
 
   /// Раздел мемов
   case memes
+
+  /// Раздел `Сериалы`
+  case series
 }
diff --git a/Random/App/Sources/ApplicationServices/MetricsService/MetricsnSections.swift b/Random/App/Sources/ApplicationServices/MetricsService/MetricsnSections.swift
@@ -49,6 +49,7 @@ enum MetricsSections: String {
   case memes = "Раздел Мемов"
   case onboarding = "Раздел Onboarding"
   case sales = "Sales"
+  case seriesScreen = "Series"
 
   // Настройки главного экрана
   case mainSettingsScreen = "Настройки главного экрана"

diff --git a/...App/Sources/Modules/MainScreen/MainScreenModule/Abstractions/MainScreenAbstractions.swift b/...App/Sources/Modules/MainScreen/MainScreenModule/Abstractions/MainScreenAbstractions.swift
@@ -108,6 +108,9 @@ protocol MainScreenModuleOutput: AnyObject {
 
   /// Открыть раздел `Мемы`
   func openMemes()
+
+  /// Открыть раздел `Сериалы`
+  func openSeries()
 
   /// Была нажата кнопка (настройки)
   func settingButtonAction()

diff --git a/Random/App/Sources/Modules/MainScreen/MainScreenModule/Factory/MainScreenFactory.swift b/Random/App/Sources/Modules/MainScreen/MainScreenModule/Factory/MainScreenFactory.swift
@@ -292,6 +292,14 @@ extension MainScreenFactory {
             isPremium: true,
             advLabel: .none
           ))
+        case .series:
+          allSections.append(MainScreenModel.Section(
+            type: section,
+            isEnabled: true,
+            isHidden: false,
+            isPremium: true,
+            advLabel: .none
+          ))
         }
       }
 
@@ -543,6 +551,14 @@ extension MainScreenFactory {
                 isPremium: model.isPremium,
                 advLabel: self.setLabelFrom(featureToggleRawValue: labelString, oldLabel: model.advLabel)
               ))
+            case .series:
+              cardSections.append(MainScreenModel.Section(
+                type: model.type,
+                isEnabled: model.isEnabled,
+                isHidden: self.ifDebugFeatureSectionIsHidden(isHidenSection),
+                isPremium: model.isPremium,
+                advLabel: self.setLabelFrom(featureToggleRawValue: labelString, oldLabel: model.advLabel)
+              ))
             }
           }
           DispatchQueue.main.async {

diff --git a/...m/App/Sources/Modules/MainScreen/MainScreenModule/Models/MainScreenModel+Appearance.swift b/...m/App/Sources/Modules/MainScreen/MainScreenModule/Models/MainScreenModel+Appearance.swift
@@ -31,7 +31,8 @@ extension MainScreenModel {
     let imageFiltersDescriptionForNoPremiumAccess = RandomStrings.Localizable.canGenerateRandomPhotoFilter
     let filmsDescriptionForNoPremiumAccess = RandomStrings.Localizable.canGenerateRandomMovie
     let nickNameDescriptionForNoPremiumAccess = RandomStrings.Localizable.generateRandomNickname
-
+    let seriesDescriptionForNoPremiumAccess = RandomStrings.Localizable.canGenerateRandomSeries
+
     let imageCardTeam = "person.circle"
     let titleCardTeam = RandomStrings.Localizable.teams
 
@@ -79,6 +80,9 @@ extension MainScreenModel {
 
     let imageFilms = "film"
     let titleFilms = RandomStrings.Localizable.movies
+
+    let imageSeries = "film.stack"
+    let titleSeries = RandomStrings.Localizable.series
 
     let imageNickName = "square.and.pencil"
     let titleNickName = RandomStrings.Localizable.nickname

diff --git a/.../App/Sources/Modules/MainScreen/MainScreenModule/Models/MainScreenModel+SectionType.swift b/.../App/Sources/Modules/MainScreen/MainScreenModule/Models/MainScreenModel+SectionType.swift
@@ -86,6 +86,8 @@ extension MainScreenModel {
         return appearance.titleTruthOrDareOther
       case .memes:
         return appearance.titleMemes
+      case .series:
+        return appearance.titleSeries
       }
     }
 
@@ -149,6 +151,8 @@ extension MainScreenModel {
         return appearance.imageTruthOrDare
       case .memes:
         return appearance.imageMemes
+      case .series:
+        return appearance.imageSeries
       }
     }
 
@@ -212,6 +216,8 @@ extension MainScreenModel {
         return appearance.fortuneWheelDescriptionForNoPremiumAccess
       case .memes:
         return appearance.memesDescriptionForNoPremiumAccess
+      case .series:
+        return appearance.seriesDescriptionForNoPremiumAccess
       }
     }
 
@@ -264,6 +270,9 @@ extension MainScreenModel {
 
     /// Раздел `Фильмы`
     case films
+
+    /// Раздел `Сериалы`
+    case series
 
     /// Раздел `Никнейм`
     case nickName

diff --git a/.../App/Sources/Modules/MainScreen/MainScreenModule/Presenter/MainScreenViewController.swift b/.../App/Sources/Modules/MainScreen/MainScreenModule/Presenter/MainScreenViewController.swift
@@ -119,6 +119,10 @@ final class MainScreenViewController: MainScreenModule {
 // MARK: - MainScreenViewOutput
 
 extension MainScreenViewController: MainScreenViewOutput {
+  func openSeries() {
+    moduleOutput?.openSeries()
+  }
+
   func openMemes() {
     moduleOutput?.openMemes()
   }

diff --git a/Random/App/Sources/Modules/MainScreen/MainScreenModule/View/MainScreenView.swift b/Random/App/Sources/Modules/MainScreen/MainScreenModule/View/MainScreenView.swift
@@ -95,6 +95,9 @@ protocol MainScreenViewOutput: AnyObject {
 
   /// Открыть раздел `Мемы`
   func openMemes()
+
+  /// Открыть раздел `Сериалы`
+  func openSeries()
 
   /// Нет премиум доступа
   /// - Parameter section: Секция на главном экране
@@ -257,6 +260,8 @@ extension MainScreenView: UICollectionViewDelegate {
         output?.openTruthOrDare()
       case .memes:
         output?.openMemes()
+      case .series:
+        output?.openSeries()
       }
     }
   }

diff --git a/...Sources/Modules/MainScreen/SeriesScreenModule/Abstractions/SeriesScreenAbstractions.swift b/...Sources/Modules/MainScreen/SeriesScreenModule/Abstractions/SeriesScreenAbstractions.swift
@@ -0,0 +1,32 @@
+//
+//  SeriesScreenAbstractions.swift
+//  Random
+//
+//  Created by Artem Pavlov on 13.11.2023.
+//
+
+import FancyUIKit
+
+/// События которые отправляем из `SeriesScreenModule` в `Coordinator`
+public protocol SeriesScreenModuleOutput: AnyObject {
+
+  /// Что-то пошло не так
+  func somethingWentWrong()
+
+  /// Проиграть трайлер по ссылке
+  ///  - Parameter url: Ссылка на трейлер
+  func playTrailerActionWith(url: String)
+
+  /// Модуль был закрыт
+  func moduleClosed()
+}
+
+/// События которые отправляем из `Coordinator` в `SeriesScreenModule`
+public protocol SeriesScreenModuleInput {
+
+  /// События которые отправляем из `SeriesScreenModule` в `Coordinator`
+  var moduleOutput: SeriesScreenModuleOutput? { get set }
+}
+
+/// Готовый модуль `SeriesScreenModule`
+public typealias SeriesScreenModule = ViewController & SeriesScreenModuleInput
diff --git a/Random/App/Sources/Modules/MainScreen/SeriesScreenModule/Assembly/SeriesScreenAssembly.swift b/Random/App/Sources/Modules/MainScreen/SeriesScreenModule/Assembly/SeriesScreenAssembly.swift
@@ -0,0 +1,31 @@
+//
+//  SeriesScreenAssembly.swift
+//  Random
+//
+//  Created by Artem Pavlov on 13.11.2023.
+//
+
+import Foundation
+
+/// Сборщик `SeriesScreen`
+final class SeriesScreenAssembly {
+
+  /// Собирает модуль `SeriesScreen`
+  /// - Parameter services: Сервисы приложения
+  /// - Returns: Cобранный модуль `SeriesScreen`
+  func createModule(services: ApplicationServices) -> SeriesScreenModule {
+    let view = SeriesScreenView()
+    let factory = SeriesScreenFactory()
+    let interactor = SeriesScreenInteractor(services: services, factory: factory)
+    let presenter = SeriesScreenViewController(
+      moduleView: view,
+      interactor: interactor,
+      factory: factory
+    )
+
+    view.output = presenter
+    interactor.output = presenter
+    factory.output = presenter
+    return presenter
+  }
+}