From 42b6bc44bb900dd12b22d4122992f6e6a1da8f83 Mon Sep 17 00:00:00 2001 From: x_0o0 Date: Tue, 2 Jan 2024 21:22:53 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20(#10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [수정] NavigationStack 적용 (NavigationView is deprecated) * [추가] Mocking 데이터에 SPI 추가 * [추가] @Observable 을 수정하지 말도록 안내하는 문구 추가 * [수정] 안내 문구 수정 --- SwiftCinema/ContentView.swift | 2 +- swift-cinema/Sources/CinemaUI/MovieList.swift | 4 ++-- swift-cinema/Sources/CinemaUI/MovieRow.swift | 2 +- swift-cinema/Sources/CinemaUI/SubmissionDetailView.swift | 2 +- swift-cinema/Sources/Fetcher/MovieCollectionFetcher.swift | 2 +- swift-cinema/Sources/Models/Movie.swift | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SwiftCinema/ContentView.swift b/SwiftCinema/ContentView.swift index 0fc6171..7f74ada 100644 --- a/SwiftCinema/ContentView.swift +++ b/SwiftCinema/ContentView.swift @@ -10,7 +10,7 @@ import CinemaUI struct ContentView: View { var body: some View { - NavigationView { + NavigationStack { MovieList() } } diff --git a/swift-cinema/Sources/CinemaUI/MovieList.swift b/swift-cinema/Sources/CinemaUI/MovieList.swift index 6fd0da0..6cb7822 100644 --- a/swift-cinema/Sources/CinemaUI/MovieList.swift +++ b/swift-cinema/Sources/CinemaUI/MovieList.swift @@ -22,7 +22,7 @@ public struct MovieList: View { // 수정하지 마십시오 Section { #if targetEnvironment(simulator) - Text("실제 기기에서 돌리십시오") + Text("실제 기기에서 실행하십시오") NavigationLink("개발자 계정이 없어서 실제 기기 실행이 불가합니까?") { SubmissionDetailView( @@ -53,7 +53,7 @@ public struct MovieList: View { } #Preview { - NavigationView { + NavigationStack { MovieList() } .environment(MovieCollectionFetcher()) diff --git a/swift-cinema/Sources/CinemaUI/MovieRow.swift b/swift-cinema/Sources/CinemaUI/MovieRow.swift index f887be9..058a18d 100644 --- a/swift-cinema/Sources/CinemaUI/MovieRow.swift +++ b/swift-cinema/Sources/CinemaUI/MovieRow.swift @@ -4,7 +4,7 @@ - Note: See the `License.txt` file for this sample’s licensing information. */ -import Models +@_spi(Mocks) import Models import SwiftUI struct MovieRow: View { diff --git a/swift-cinema/Sources/CinemaUI/SubmissionDetailView.swift b/swift-cinema/Sources/CinemaUI/SubmissionDetailView.swift index eabc0e4..f9073fb 100644 --- a/swift-cinema/Sources/CinemaUI/SubmissionDetailView.swift +++ b/swift-cinema/Sources/CinemaUI/SubmissionDetailView.swift @@ -38,7 +38,7 @@ struct SubmissionDetailView: View { } #Preview { - NavigationView { + NavigationStack { SubmissionDetailView( needsAlternative: false ) diff --git a/swift-cinema/Sources/Fetcher/MovieCollectionFetcher.swift b/swift-cinema/Sources/Fetcher/MovieCollectionFetcher.swift index 84ebee9..d74a9ea 100644 --- a/swift-cinema/Sources/Fetcher/MovieCollectionFetcher.swift +++ b/swift-cinema/Sources/Fetcher/MovieCollectionFetcher.swift @@ -5,7 +5,7 @@ import Models import SwiftUI -@Observable +@Observable // 수정하지 마십시오 public class MovieCollectionFetcher { /// 영화 순위 별로 나열된 영화 정보 public var movies: [Movie] = [] { diff --git a/swift-cinema/Sources/Models/Movie.swift b/swift-cinema/Sources/Models/Movie.swift index bebb2e9..41ee4b1 100644 --- a/swift-cinema/Sources/Models/Movie.swift +++ b/swift-cinema/Sources/Models/Movie.swift @@ -17,7 +17,7 @@ public struct Movie: Identifiable, Decodable { } extension Movie { - public static var kuflix = Movie( + @_spi(Mocks) public static var kuflix = Movie( name: "Kuflix", rank: Int.random(in: 1...10).description, code: UUID().uuidString