refactor: movie nowPlaying to upcoming

Author: ngocpd-1250

BaseSwiftUI/Data/DataSource/API/API+Movie.swift

@@ -13,7 +13,7 @@ extension API {
         return request(input)
     }
 
-    func getNowPlayingMovies(_ input: GetNowPlayingMoviesInput) -> Observable<GetNowPlayingMoviesOutput> {
+    func getUpcomingMovies(_ input: GetUpcomingMoviesInput) -> Observable<GetUpcomingMoviesOutput> {
         return request(input)
     }
 
@@ -42,16 +42,16 @@ extension API {
 }
 
 extension API {
-    final class GetNowPlayingMoviesInput: APIInput {
+    final class GetUpcomingMoviesInput: APIInput {
         init() {
-            super.init(urlString: API.Urls.Movie.nowPlaying,
+            super.init(urlString: API.Urls.Movie.upcoming,
                        parameters: nil,
                        method: .get,
                        requireAccessToken: false)
         }
     }
 
-    final class GetNowPlayingMoviesOutput: APIOutput {
+    final class GetUpcomingMoviesOutput: APIOutput {
         private(set) var movies: [Movie] = []
 
         private enum CodingKeys: String, CodingKey {

BaseSwiftUI/Data/DataSource/API/APIUrls.swift

@@ -18,7 +18,7 @@ extension API {
 extension API.Urls {
     enum Movie {
         static var topRated: String { return baseUrl / "movie" / "top_rated" }
-        static var nowPlaying: String { return baseUrl / "movie" / "upcoming" }
+        static var upcoming: String { return baseUrl / "movie" / "upcoming" }
         static var movieDetail: String { return baseUrl / "movie" / "%d" }
     }
 }

BaseSwiftUI/Data/RepositoryImpl/MovieRepositoryImpl.swift

@@ -17,9 +17,9 @@ struct MovieRepositoryImpl: MovieRepository {
             .eraseToAnyPublisher()
     }
 
-    func getNowPlayingMovies(page _: Int) -> Observable<[Movie]> {
-        let input = API.GetNowPlayingMoviesInput()
-        return API.shared.getNowPlayingMovies(input)
+    func getUpcomingMovies(page _: Int) -> Observable<[Movie]> {
+        let input = API.GetUpcomingMoviesInput()
+        return API.shared.getUpcomingMovies(input)
             .map { $0.movies }
             .eraseToAnyPublisher()
     }

BaseSwiftUI/Domain/Repository/MovieRepository.swift

@@ -9,6 +9,6 @@ import Foundation
 
 protocol MovieRepository {
     func getTopRatedMovies(page: Int) -> Observable<[Movie]>
-    func getNowPlayingMovies(page: Int) -> Observable<[Movie]>
+    func getUpcomingMovies(page: Int) -> Observable<[Movie]>
     func getMovieDetail(id: Int) -> Observable<Movie?>
 }

BaseSwiftUI/Domain/UseCase/MovieUseCase.swift

@@ -10,7 +10,7 @@ import Factory
 
 protocol MovieUseCaseType {
     func getTopRatedMovies(page: Int) -> Observable<[Movie]>
-    func getNowPlayingMovies(page: Int) -> Observable<[Movie]>
+    func getUpcomingMovies(page: Int) -> Observable<[Movie]>
     func getMovieDetail(id: Int) -> Observable<Movie?>
 }
 
@@ -21,8 +21,8 @@ struct MovieUseCase: MovieUseCaseType {
         return movieRepository.getTopRatedMovies(page: page)
     }
 
-    func getNowPlayingMovies(page: Int) -> Observable<[Movie]> {
-        return movieRepository.getNowPlayingMovies(page: page)
+    func getUpcomingMovies(page: Int) -> Observable<[Movie]> {
+        return movieRepository.getUpcomingMovies(page: page)
     }
 
     func getMovieDetail(id: Int) -> Observable<Movie?> {

BaseSwiftUI/Presentation/Scene/Home/Movies/TopMoviesScreen.swift

@@ -18,11 +18,11 @@ struct TopMoviesScreen: View {
     private let loadTrigger = PublishRelay<Bool>()
 
     @ViewBuilder
-    func nowPlayingMovies() -> some View {
-        Section(title: R.string.localizable.movieNowPlaying()) {
+    func upcomingMovies() -> some View {
+        Section(title: R.string.localizable.movieUpcoming()) {
             ScrollView(.horizontal, showsIndicators: false) {
                 LazyHStack(spacing: 16) {
-                    ForEach(output.data.nowPlaying) { movie in
+                    ForEach(output.data.upcoming) { movie in
                         Button {
                             toDetailTrigger.send(movie.id)
                         } label: {
@@ -53,8 +53,8 @@ struct TopMoviesScreen: View {
         Screen(isLoading: $output.isLoading, localizeTitleResource: R.string.localizable.movieWatchTitle) {
             ScrollView(showsIndicators: false) {
                 VStack(alignment: .leading, spacing: 16) {
-                    if !output.data.nowPlaying.isEmpty {
-                        nowPlayingMovies()
+                    if !output.data.upcoming.isEmpty {
+                        upcomingMovies()
                     }
                     if !output.data.topRated.isEmpty {
                         topRatedMovies()

BaseSwiftUI/Presentation/Scene/Home/Movies/TopMoviesViewModel.swift

@@ -18,7 +18,7 @@ struct TopMoviesViewModel {
 extension TopMoviesViewModel: ViewModel {
     struct MoviesData {
         var topRated: [Movie] = []
-        var nowPlaying: [Movie] = []
+        var upcoming: [Movie] = []
     }
 
     final class Input: ObservableObject {
@@ -44,9 +44,9 @@ extension TopMoviesViewModel: ViewModel {
         let reloadActivityTracker = ActivityTracker()
         let output = Output()
 
-        let nowPlaying = input.loadTrigger
+        let upcoming = input.loadTrigger
             .map { isReload in
-                self.movieUseCase.getNowPlayingMovies(page: 1)
+                self.movieUseCase.getUpcomingMovies(page: 1)
                     .trackError(errorTracker)
                     .trackActivity(isReload ? reloadActivityTracker : activityTracker)
                     .asDriver()
@@ -62,9 +62,9 @@ extension TopMoviesViewModel: ViewModel {
             }
             .switchToLatest()
 
-        Publishers.Zip(nowPlaying, topRated)
+        Publishers.Zip(upcoming, topRated)
             .map {
-                MoviesData(topRated: $0.0, nowPlaying: $0.1)
+                MoviesData(topRated: $0.0, upcoming: $0.1)
             }
             .assign(to: \.data, on: output)
             .cancel(with: cancelBag)

BaseSwiftUI/Utils/Resources/en.lproj/Localizable.strings

@@ -29,7 +29,7 @@
 "tabbar.todos" = "Todos";
 "tabbar.settings" = "Settings";
 
-"movie.now.playing" = "Now Playing";
+"movie.upcoming" = "Upcoming";
 "movie.top.rated" = "Top Rated";
 "movie.release" = "Release";
 "movie.watch.title" = "What do you want to watch?";

BaseSwiftUI/Utils/Resources/ja.lproj/Localizable.strings

@@ -29,7 +29,7 @@
 "tabbar.todos" = "すべて";
 "tabbar.settings" = "設定";
 
-"movie.now.playing" = "現在上映中";
+"movie.upcoming" = "今後の予定";
 "movie.top.rated" = "トップ評価";
 "movie.release" = "リリース";
 "movie.watch.title" = "何を見たいですか？";