Fix 'binding(_:fileID:line:)'

EhPanda/View/Detail/Archives/ArchivesView.swift

@@ -33,7 +33,7 @@ struct ArchivesView: View {
  NavigationView {
  ZStack {
  VStack {
- HathArchivesView(archives: viewStore.hathArchives, selection: viewStore.binding(\.$selectedArchive))
+ HathArchivesView(archives: viewStore.hathArchives, selection: viewStore.$selectedArchive)
  Spacer()
  if let credits = Int(user.credits ?? ""), let galleryPoints = Int(user.galleryPoints ?? "") {
  ArchiveFundsView(credits: credits, galleryPoints: galleryPoints)
@@ -55,12 +55,12 @@ struct ArchivesView: View {
  }
  .progressHUD(
  config: viewStore.communicatingHUDConfig,
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /ArchivesReducer.Route.communicatingHUD
  )
  .progressHUD(
  config: viewStore.messageHUDConfig,
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /ArchivesReducer.Route.messageHUD
  )
  .animation(.default, value: viewStore.hathArchives)

EhPanda/View/Detail/Comments/CommentsView.swift

@@ -92,14 +92,14 @@ struct CommentsView: View {
  }
  }
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /CommentsReducer.Route.postComment) { route in
+ .sheet(unwrapping: viewStore.$route, case: /CommentsReducer.Route.postComment) { route in
  let hasCommentID = !route.wrappedValue.isEmpty
  PostCommentView(
  title: hasCommentID
  ? L10n.Localizable.PostCommentView.Title.editComment
  : L10n.Localizable.PostCommentView.Title.postComment,
- content: viewStore.binding(\.$commentContent),
- isFocused: viewStore.binding(\.$postCommentFocused),
+ content: viewStore.$commentContent,
+ isFocused: viewStore.$postCommentFocused,
  postAction: {
  if hasCommentID {
  viewStore.send(.postComment(galleryURL, route.wrappedValue))
@@ -116,7 +116,7 @@ struct CommentsView: View {
  }
  .progressHUD(
  config: viewStore.hudConfig,
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /CommentsReducer.Route.hud
  )
  .animation(.default, value: viewStore.scrollRowOpacity)
@@ -143,7 +143,7 @@ struct CommentsView: View {
 // MARK: NavigationLinks
 private extension CommentsView {
  @ViewBuilder var navigationLink: some View {
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /CommentsReducer.Route.detail) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /CommentsReducer.Route.detail) { route in
  DetailView(
  store: store.scope(state: \.detailState, action: CommentsReducer.Action.detail),
  gid: route.wrappedValue, user: user, setting: $setting,

EhPanda/View/Detail/DetailSearch/DetailSearchView.swift

@@ -45,7 +45,7 @@ struct DetailSearchView: View {
  }
  )
  .sheet(
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /DetailSearchReducer.Route.detail,
  isEnabled: DeviceUtil.isPad
  ) { route in
@@ -58,7 +58,7 @@ struct DetailSearchView: View {
  }
  .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailSearchReducer.Route.quickSearch) { _ in
+ .sheet(unwrapping: viewStore.$route, case: /DetailSearchReducer.Route.quickSearch) { _ in
  QuickSearchView(
  store: store.scope(state: \.quickDetailSearchState, action: DetailSearchReducer.Action.quickSearch)
  ) { keyword in
@@ -68,14 +68,14 @@ struct DetailSearchView: View {
  .accentColor(setting.accentColor)
  .autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailSearchReducer.Route.filters) { _ in
+ .sheet(unwrapping: viewStore.$route, case: /DetailSearchReducer.Route.filters) { _ in
  FiltersView(store: store.scope(state: \.filtersState, action: DetailSearchReducer.Action.filters))
  .accentColor(setting.accentColor).autoBlur(radius: blurRadius)
  }
- .searchable(text: viewStore.binding(\.$keyword))
+ .searchable(text: viewStore.$keyword)
  .searchSuggestions {
  TagSuggestionView(
- keyword: viewStore.binding(\.$keyword), translations: tagTranslator.translations,
+ keyword: viewStore.$keyword, translations: tagTranslator.translations,
  showsImages: setting.showsImagesInTags, isEnabled: setting.showsTagsSearchSuggestion
  )
  }
@@ -96,7 +96,7 @@ struct DetailSearchView: View {
 
  @ViewBuilder private var navigationLink: some View {
  if DeviceUtil.isPhone {
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /DetailSearchReducer.Route.detail) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /DetailSearchReducer.Route.detail) { route in
  DetailView(
  store: store.scope(state: \.detailState, action: DetailSearchReducer.Action.detail),
  gid: route.wrappedValue, user: user, setting: $setting,

EhPanda/View/Detail/DetailView.swift

@@ -121,15 +121,15 @@ struct DetailView: View {
  ErrorView(error: error ?? .unknown, action: error?.isRetryable != false ? retryAction : nil)
  .opacity(viewStore.galleryDetail == nil && error != nil ? 1 : 0)
  }
- .fullScreenCover(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.reading) { _ in
+ .fullScreenCover(unwrapping: viewStore.$route, case: /DetailReducer.Route.reading) { _ in
  ReadingView(
  store: store.scope(state: \.readingState, action: DetailReducer.Action.reading),
  gid: gid, setting: $setting, blurRadius: blurRadius
  )
  .accentColor(setting.accentColor)
  .autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.archives) { route in
+ .sheet(unwrapping: viewStore.$route, case: /DetailReducer.Route.archives) { route in
  let (galleryURL, archiveURL) = route.wrappedValue
  ArchivesView(
  store: store.scope(state: \.archivesState, action: DetailReducer.Action.archives),
@@ -138,23 +138,23 @@ struct DetailView: View {
  .accentColor(setting.accentColor)
  .autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.torrents) { _ in
+ .sheet(unwrapping: viewStore.$route, case: /DetailReducer.Route.torrents) { _ in
  TorrentsView(
  store: store.scope(state: \.torrentsState, action: DetailReducer.Action.torrents),
  gid: gid, token: viewStore.gallery.token, blurRadius: blurRadius
  )
  .accentColor(setting.accentColor)
  .autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.share) { route in
+ .sheet(unwrapping: viewStore.$route, case: /DetailReducer.Route.share) { route in
  ActivityView(activityItems: [route.wrappedValue])
  .autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.postComment) { _ in
+ .sheet(unwrapping: viewStore.$route, case: /DetailReducer.Route.postComment) { _ in
  PostCommentView(
  title: L10n.Localizable.PostCommentView.Title.postComment,
- content: viewStore.binding(\.$commentContent),
- isFocused: viewStore.binding(\.$postCommentFocused),
+ content: viewStore.$commentContent,
+ isFocused: viewStore.$postCommentFocused,
  postAction: {
  if let galleryURL = viewStore.gallery.galleryURL {
  viewStore.send(.postComment(galleryURL))
@@ -167,10 +167,10 @@ struct DetailView: View {
  .accentColor(setting.accentColor)
  .autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.newDawn) { route in
+ .sheet(unwrapping: viewStore.$route, case: /DetailReducer.Route.newDawn) { route in
  NewDawnView(greeting: route.wrappedValue).autoBlur(radius: blurRadius)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.tagDetail) { route in
+ .sheet(unwrapping: viewStore.$route, case: /DetailReducer.Route.tagDetail) { route in
  TagDetailView(detail: route.wrappedValue).autoBlur(radius: blurRadius)
  }
  .animation(.default, value: viewStore.showsUserRating)
@@ -189,13 +189,13 @@ struct DetailView: View {
 // MARK: NavigationLinks
 private extension DetailView {
  @ViewBuilder var navigationLinks: some View {
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.previews) { _ in
+ NavigationLink(unwrapping: viewStore.$route, case: /DetailReducer.Route.previews) { _ in
  PreviewsView(
  store: store.scope(state: \.previewsState, action: DetailReducer.Action.previews),
  gid: gid, setting: $setting, blurRadius: blurRadius
  )
  }
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.comments) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /DetailReducer.Route.comments) { route in
  IfLetStore(store.scope(state: \.commentsState, action: DetailReducer.Action.comments)) { store in
  CommentsView(
  store: store, gid: gid, token: viewStore.gallery.token, apiKey: viewStore.apiKey,
@@ -205,15 +205,15 @@ private extension DetailView {
  )
  }
  }
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.detailSearch) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /DetailReducer.Route.detailSearch) { route in
  IfLetStore(store.scope(state: \.detailSearchState, action: DetailReducer.Action.detailSearch)) { store in
  DetailSearchView(
  store: store, keyword: route.wrappedValue, user: user, setting: $setting,
  blurRadius: blurRadius, tagTranslator: tagTranslator
  )
  }
  }
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /DetailReducer.Route.galleryInfos) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /DetailReducer.Route.galleryInfos) { route in
  let (gallery, galleryDetail) = route.wrappedValue
  GalleryInfosView(
  store: store.scope(state: \.galleryInfosState, action: DetailReducer.Action.galleryInfos),

EhPanda/View/Detail/GalleryInfos/GalleryInfosView.swift

@@ -118,7 +118,7 @@ struct GalleryInfosView: View {
  }
  .progressHUD(
  config: viewStore.hudConfig,
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /GalleryInfosReducer.Route.hud
  )
  .navigationTitle(L10n.Localizable.GalleryInfosView.Title.galleryInfos)

EhPanda/View/Detail/Previews/PreviewsView.swift

@@ -68,7 +68,7 @@ struct PreviewsView: View {
  .padding(.bottom)
  .id(viewStore.databaseLoadingState)
  }
- .fullScreenCover(unwrapping: viewStore.binding(\.$route), case: /PreviewsReducer.Route.reading) { _ in
+ .fullScreenCover(unwrapping: viewStore.$route, case: /PreviewsReducer.Route.reading) { _ in
  ReadingView(
  store: store.scope(state: \.readingState, action: PreviewsReducer.Action.reading),
  gid: gid, setting: $setting, blurRadius: blurRadius

EhPanda/View/Detail/Torrents/TorrentsView.swift

@@ -45,13 +45,13 @@ struct TorrentsView: View {
  }
  .opacity(error != nil && viewStore.torrents.isEmpty ? 1 : 0)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /TorrentsReducer.Route.share) { route in
+ .sheet(unwrapping: viewStore.$route, case: /TorrentsReducer.Route.share) { route in
  ActivityView(activityItems: [route.wrappedValue])
  .autoBlur(radius: blurRadius)
  }
  .progressHUD(
  config: viewStore.hudConfig,
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /TorrentsReducer.Route.hud
  )
  .animation(.default, value: viewStore.torrents)

EhPanda/View/Favorites/FavoritesView.swift

@@ -56,7 +56,7 @@ struct FavoritesView: View {
  }
  }
  .sheet(
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /FavoritesReducer.Route.detail,
  isEnabled: DeviceUtil.isPad
  ) { route in
@@ -69,7 +69,7 @@ struct FavoritesView: View {
  }
  .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /FavoritesReducer.Route.quickSearch) { _ in
+ .sheet(unwrapping: viewStore.$route, case: /FavoritesReducer.Route.quickSearch) { _ in
  QuickSearchView(
  store: store.scope(state: \.quickSearchState, action: FavoritesReducer.Action.quickSearch)
  ) { keyword in
@@ -79,10 +79,10 @@ struct FavoritesView: View {
  .accentColor(setting.accentColor)
  .autoBlur(radius: blurRadius)
  }
- .searchable(text: viewStore.binding(\.$keyword))
+ .searchable(text: viewStore.$keyword)
  .searchSuggestions {
  TagSuggestionView(
- keyword: viewStore.binding(\.$keyword), translations: tagTranslator.translations,
+ keyword: viewStore.$keyword, translations: tagTranslator.translations,
  showsImages: setting.showsImagesInTags, isEnabled: setting.showsTagsSearchSuggestion
  )
  }
@@ -104,7 +104,7 @@ struct FavoritesView: View {
 
  @ViewBuilder private var navigationLink: some View {
  if DeviceUtil.isPhone {
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /FavoritesReducer.Route.detail) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /FavoritesReducer.Route.detail) { route in
  DetailView(
  store: store.scope(state: \.detailState, action: FavoritesReducer.Action.detail),
  gid: route.wrappedValue, user: user, setting: $setting,

EhPanda/View/Home/Frontpage/FrontpageView.swift

@@ -44,7 +44,7 @@ struct FrontpageView: View {
  }
  )
  .sheet(
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /FrontpageReducer.Route.detail,
  isEnabled: DeviceUtil.isPad
  ) { route in
@@ -57,11 +57,11 @@ struct FrontpageView: View {
  }
  .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
  }
- .sheet(unwrapping: viewStore.binding(\.$route), case: /FrontpageReducer.Route.filters) { _ in
+ .sheet(unwrapping: viewStore.$route, case: /FrontpageReducer.Route.filters) { _ in
  FiltersView(store: store.scope(state: \.filtersState, action: FrontpageReducer.Action.filters))
  .autoBlur(radius: blurRadius).environment(\.inSheet, true)
  }
- .searchable(text: viewStore.binding(\.$keyword), prompt: L10n.Localizable.Searchable.Prompt.filter)
+ .searchable(text: viewStore.$keyword, prompt: L10n.Localizable.Searchable.Prompt.filter)
  .onAppear {
  if viewStore.galleries.isEmpty {
  DispatchQueue.main.async {
@@ -76,7 +76,7 @@ struct FrontpageView: View {
 
  @ViewBuilder private var navigationLink: some View {
  if DeviceUtil.isPhone {
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /FrontpageReducer.Route.detail) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /FrontpageReducer.Route.detail) { route in
  DetailView(
  store: store.scope(state: \.detailState, action: FrontpageReducer.Action.detail),
  gid: route.wrappedValue, user: user, setting: $setting,

EhPanda/View/Home/History/HistoryView.swift

@@ -42,7 +42,7 @@ struct HistoryView: View {
  }
  )
  .sheet(
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /HistoryReducer.Route.detail,
  isEnabled: DeviceUtil.isPad
  ) { route in
@@ -55,7 +55,7 @@ struct HistoryView: View {
  }
  .autoBlur(radius: blurRadius).environment(\.inSheet, true).navigationViewStyle(.stack)
  }
- .searchable(text: viewStore.binding(\.$keyword), prompt: L10n.Localizable.Searchable.Prompt.filter)
+ .searchable(text: viewStore.$keyword, prompt: L10n.Localizable.Searchable.Prompt.filter)
  .onAppear {
  if viewStore.galleries.isEmpty {
  DispatchQueue.main.async {
@@ -70,7 +70,7 @@ struct HistoryView: View {
 
  @ViewBuilder private var navigationLink: some View {
  if DeviceUtil.isPhone {
- NavigationLink(unwrapping: viewStore.binding(\.$route), case: /HistoryReducer.Route.detail) { route in
+ NavigationLink(unwrapping: viewStore.$route, case: /HistoryReducer.Route.detail) { route in
  DetailView(
  store: store.scope(state: \.detailState, action: HistoryReducer.Action.detail),
  gid: route.wrappedValue, user: user, setting: $setting,
@@ -89,7 +89,7 @@ struct HistoryView: View {
  .disabled(viewStore.loadingState != .idle || viewStore.galleries.isEmpty)
  .confirmationDialog(
  message: L10n.Localizable.ConfirmationDialog.Title.clear,
- unwrapping: viewStore.binding(\.$route),
+ unwrapping: viewStore.$route,
  case: /HistoryReducer.Route.clearHistory
  ) {
  Button(L10n.Localizable.ConfirmationDialog.Button.clear, role: .destructive) {