Removed deprecated and also done #4

oolxg · Jun 6, 2023 · 56b2bdb · 56b2bdb
1 parent 3ae7873
commit 56b2bdb
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/oolxg.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/oolxg.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Hanami/App/Core/Manga/MangaView/Offline/OfflineMangaFeature.swift b/Hanami/App/Core/Manga/MangaView/Offline/OfflineMangaFeature.swift
@@ -25,7 +25,7 @@ struct OfflineMangaFeature: ReducerProtocol {
         var lastReadChapter: CoreDataChapterDetailsEntry?
 
         // MARK: - Props for MangaReadingView
-        @BindableState var isUserOnReadingView = false
+        @BindingState var isUserOnReadingView = false
 
         var mangaReadingViewState: OfflineMangaReadingFeature.State? {
             didSet { isUserOnReadingView = mangaReadingViewState.hasValue }

diff --git a/Hanami/App/Core/Manga/MangaView/Online/OnlineMangaFeature.swift b/Hanami/App/Core/Manga/MangaView/Online/OnlineMangaFeature.swift
@@ -40,7 +40,7 @@ struct OnlineMangaFeature: ReducerProtocol {
         // MARK: END Props for view
 
         // MARK: - Props for MangaReadingView
-        @BindableState var isUserOnReadingView = false
+        @BindingState var isUserOnReadingView = false
         var mangaReadingViewState: OnlineMangaReadingFeature.State? {
             didSet { isUserOnReadingView = mangaReadingViewState.hasValue }
         }
@@ -49,7 +49,7 @@ struct OnlineMangaFeature: ReducerProtocol {
         // MARK: - Props for inner states/views
         var authorViewState: AuthorFeature.State?
         var chapterLoaderState: MangaChapterLoaderFeature.State?
-        @BindableState var showAuthorView = false
+        @BindingState var showAuthorView = false
         // MARK: END Props for inner states/views
 
         // MARK: - Behavior props

diff --git a/Hanami/App/Core/MangaThumbnail/MangaThumbnailFeature.swift b/Hanami/App/Core/MangaThumbnail/MangaThumbnailFeature.swift
@@ -38,7 +38,7 @@ struct MangaThumbnailFeature: ReducerProtocol {
         }
 
         var online: Bool { onlineMangaState.hasValue }
-        @BindableState var navigationLinkActive = false
+        @BindingState var navigationLinkActive = false
         var id: UUID { manga.id }
     }
 

diff --git a/Hanami/App/Core/Search/Filter/FiltersView.swift b/Hanami/App/Core/Search/Filter/FiltersView.swift
@@ -193,7 +193,7 @@ extension FiltersView {
 
                     Spacer()
 
-                    if !viewStore.state[keyPath: path].filter { $0.state != .notSelected }.isEmpty {
+                    if !viewStore.state[keyPath: path].filter({ $0.state != .notSelected }).isEmpty {
                         Circle()
                             .frame(width: 10, height: 10)
                             .foregroundColor(.theme.green)

diff --git a/Hanami/App/Core/Search/SearchFeature.swift b/Hanami/App/Core/Search/SearchFeature.swift
@@ -17,11 +17,11 @@ struct SearchFeature: ReducerProtocol {
         var searchResultsFetched = false
         var isLoading = false
 
-        @BindableState var searchSortOption = FiltersFeature.QuerySortOption.relevance
-        @BindableState var searchSortOptionOrder = FiltersFeature.QuerySortOption.Order.desc
-        @BindableState var resultsCount = 10
+        @BindingState var searchSortOption = FiltersFeature.QuerySortOption.relevance
+        @BindingState var searchSortOptionOrder = FiltersFeature.QuerySortOption.Order.desc
+        @BindingState var resultsCount = 10
 
-        @BindableState var searchText = ""
+        @BindingState var searchText = ""
 
         var lastSuccessfulRequestParams: SearchParams?
 

diff --git a/Hanami/App/Core/Settings/SettingsFeature.swift b/Hanami/App/Core/Settings/SettingsFeature.swift
@@ -11,7 +11,7 @@ import Nuke
 
 struct SettingsFeature: ReducerProtocol {
     struct State: Equatable {
-        @BindableState var config = SettingsConfig(
+        @BindingState var config = SettingsConfig(
             autolockPolicy: .never,
             blurRadius: Defaults.Security.minBlurRadius,
             useHigherQualityImagesForOnlineReading: false,

diff --git a/Hanami/Model/WebAPI/ChapterDetails.swift b/Hanami/Model/WebAPI/ChapterDetails.swift
@@ -113,7 +113,7 @@ extension ChapterDetails {
         ]
 
         if let translatedLanguage = attributes.translatedLanguage {
-            return flags[translatedLanguage] ?? "❓"
+            return flags[translatedLanguage, default: "❓"]
         }
 
         return "❓"

diff --git a/Hanami/Tools/ISO639-1.swift b/Hanami/Tools/ISO639-1.swift
@@ -14,9 +14,10 @@ enum ISO639Language: String {
     case hi, hu, fa, fr, it
     case jp = "ja"
     case jpRo = "ja-ro"
-    case ko, mn, ms, nl, ru
+    case ko, mn, ms, nl
     case ptBr = "pt-br"
-    case vi, th, uk, zh
+    case ru, vi, th, tr, uk
+    case zh
     case zhRo = "zh-ro"
     // swiftlint:enable identifier_name
 }
@@ -48,6 +49,7 @@ extension ISO639Language {
         case .mn: return "Mongolian"
         case .fa: return "Persian"
         case .vi: return "Vietnamese"
+        case .tr: return "Turkish"
         case .ru: return "Russian"
         case .es: return "Spanish, Castilian"
         case .th: return "Thai"