Fixed pageIndex display by vertical reading format.

oolxg · Dec 23, 2022 · ccbcc86 · ccbcc86
1 parent 1fb7ea6
commit ccbcc86
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 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/MangaReadingView/Offline/OfflineMangaReadingFeature.swift b/Hanami/App/Core/Manga/MangaReadingView/Offline/OfflineMangaReadingFeature.swift
@@ -24,7 +24,7 @@ struct OfflineMangaReadingFeature: ReducerProtocol {
         let pagesCount: Int
         var pageIndex = 0
         var pageIndexToDisplay: Int? {
-            if pageIndex > mostLeftPageIndex && pageIndex < mostRightPageIndex {
+            if pageIndex > mostLeftPageIndex && pageIndex < mostRightPageIndex, readingFormat != .vertical {
                 return readingFormat == .rightToLeft ? pagesCount - pageIndex : pageIndex + 1
             }
             return nil

diff --git a/Hanami/App/Core/Manga/MangaReadingView/Offline/OfflineMangaReadingView.swift b/Hanami/App/Core/Manga/MangaReadingView/Offline/OfflineMangaReadingView.swift
@@ -156,7 +156,7 @@ extension OfflineMangaReadingView {
                                 .disabled(true)
                         }
                     }
-                    .frame(height: 60)
+                    .frame(height: 40)
 
                     Spacer()
 
@@ -231,7 +231,6 @@ extension OfflineMangaReadingView {
             Image(systemName: "xmark")
                 .font(.title3)
                 .foregroundColor(.theme.foreground)
-                .padding(.vertical)
         }
     }
 }
diff --git a/Hanami/App/Core/Manga/MangaReadingView/Online/OnlineMangaReadingFeature.swift b/Hanami/App/Core/Manga/MangaReadingView/Online/OnlineMangaReadingFeature.swift
@@ -42,7 +42,8 @@ struct OnlineMangaReadingFeature: ReducerProtocol {
         var pageIndex = 0
         // need this var for avoiding computations of page index when `readMangaRightToLeft` is set to true
         var pageIndexToDisplay: Int? {
-            if let pagesCount, pageIndex > mostLeftPageIndex && pageIndex < mostRightPageIndex {
+            if let pagesCount, pageIndex > mostLeftPageIndex
+                && pageIndex < mostRightPageIndex, readingFormat != .vertical {
                 return readingFormat == .rightToLeft ? pagesCount - pageIndex : pageIndex + 1
             }
             return nil

diff --git a/Hanami/App/Core/Manga/MangaReadingView/Online/OnlineMangaReadingView.swift b/Hanami/App/Core/Manga/MangaReadingView/Online/OnlineMangaReadingView.swift
@@ -131,7 +131,6 @@ extension OnlineMangaReadingView {
             Image(systemName: "xmark")
                 .font(.title3)
                 .foregroundColor(.theme.foreground)
-                .padding(.vertical)
         }
     }
 
@@ -171,7 +170,7 @@ extension OnlineMangaReadingView {
                                 .disabled(true)
                         }
                     }
-                    .frame(height: 60)
+                    .frame(height: 40)
 
                     Spacer()