From b18a8bb9b5a9a670409955e686179be5d761b33d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=CC=88lenay=20Gu=CC=88l?= Date: Tue, 16 Jan 2024 12:48:29 +0300 Subject: [PATCH 1/2] Issue-76: Fix genre detail pop back bug --- .../views/components/movieDetail/rows/MovieCoverRow.swift | 8 +++++--- .../views/components/moviesList/base/MoviesList.swift | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/MovieSwift/MovieSwift/views/components/movieDetail/rows/MovieCoverRow.swift b/MovieSwift/MovieSwift/views/components/movieDetail/rows/MovieCoverRow.swift index b50e75ff..eb56f061 100644 --- a/MovieSwift/MovieSwift/views/components/movieDetail/rows/MovieCoverRow.swift +++ b/MovieSwift/MovieSwift/views/components/movieDetail/rows/MovieCoverRow.swift @@ -54,9 +54,11 @@ struct MovieCoverRow : ConnectedView { return ScrollView(.horizontal, showsIndicators: false) { HStack { ForEach(props.movie.genres ?? fakeGenres) { genre in - NavigationLink(destination: MoviesGenreList(genre: genre)) { - RoundedBadge(text: genre.name, color: .steam_background) - }.disabled(props.movie.genres == nil) + NavigationLink { + MoviesGenreList(genre: genre) + } label: { + RoundedBadge(text: genre.name, color: .steam_background) + }.disabled(props.movie.genres == nil) } } .padding(.leading, 16) diff --git a/MovieSwift/MovieSwift/views/components/moviesList/base/MoviesList.swift b/MovieSwift/MovieSwift/views/components/moviesList/base/MoviesList.swift index f863fefd..a271897c 100644 --- a/MovieSwift/MovieSwift/views/components/moviesList/base/MoviesList.swift +++ b/MovieSwift/MovieSwift/views/components/moviesList/base/MoviesList.swift @@ -54,7 +54,9 @@ struct MoviesList: ConnectedView { // MARK: - Computed views private func moviesRows(props: Props) -> some View { ForEach(isSearching ? props.searchedMovies ?? [] : movies, id: \.self) { id in - NavigationLink(destination: MovieDetail(movieId: id), tag: String(id), selection:$selectedItem) { + NavigationLink { + MovieDetail(movieId: id) + } label: { MovieRow(movieId: id) } } From 9b620418446e336b9504516d708a8d3f54683ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=CC=88lenay=20Gu=CC=88l?= Date: Wed, 17 Jan 2024 18:31:00 +0300 Subject: [PATCH 2/2] Issue-78: Remove animations from PeopleDetail body --- .../views/components/peopleDetail/PeopleDetail.swift | 3 --- 1 file changed, 3 deletions(-) diff --git a/MovieSwift/MovieSwift/views/components/peopleDetail/PeopleDetail.swift b/MovieSwift/MovieSwift/views/components/peopleDetail/PeopleDetail.swift index 560dbe77..6c14ddc5 100644 --- a/MovieSwift/MovieSwift/views/components/peopleDetail/PeopleDetail.swift +++ b/MovieSwift/MovieSwift/views/components/peopleDetail/PeopleDetail.swift @@ -128,14 +128,11 @@ struct PeopleDetail: ConnectedView { self.moviesSection(props: props, year: year) }) } - .animation(nil) .blur(radius: selectedPoster != nil || isFanScoreUpdated ? 30 : 0) .scaleEffect(selectedPoster != nil ? 0.8 : 1) - .animation(.interactiveSpring()) imagesCarouselView(props: props) scoreUpdateView(props: props) } - .animation(.spring()) .navigationBarItems(trailing: barbuttons(props: props)) .navigationBarTitle(props.people.name) .onAppear {