Merge pull request #144 from tatsuz0u/develop

Update Korean translations & Bugfix
EhPanda-Team · Sep 24, 2021 · 5ddaff5 · 5ddaff5
2 parents b9049ba + de1b3a9
commit 5ddaff5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -6,7 +6,7 @@ on:
     types: [closed]
 env:
   DEVELOPER_DIR: /Applications/Xcode_13.0.app
-  APP_VERSION: '1.2.1'
+  APP_VERSION: '1.2.2'
   SCHEME_NAME: 'EhPanda'
   ALTSTORE_JSON_PATH: './AltStore.json'
   BUILDS_PATH: '/tmp/action-builds'

diff --git a/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -33,7 +33,7 @@
         "repositoryURL": "https://github.com/tatsuz0u/Kingfisher.git",
         "state": {
           "branch": "fix/binder-loaded",
-          "revision": "31268315fed1d0f5846a592deab3b3959751e482",
+          "revision": "184d0968c9cbefde319f47e992913ef7bc64de5c",
           "version": null
         }
       },

diff --git a/EhPanda/App/Utility.swift b/EhPanda/App/Utility.swift
@@ -108,7 +108,7 @@ var isPad: Bool {
 }
 
 var isPadWidth: Bool {
-    windowW > 768
+    windowW >= 744
 }
 
 var isSEWidth: Bool {

diff --git a/EhPanda/DataFlow/Store.swift b/EhPanda/DataFlow/Store.swift
@@ -442,7 +442,7 @@ final class Store: ObservableObject {
             appState.homeInfo.moreFavoritesLoadFailed[favIndex] = false
 
             let pageNumber = appState.homeInfo.favoritesPageNumbers[favIndex]
-            if (pageNumber?.current ?? 0) + 1 >= pageNumber?.maximum ?? 1 { break }
+            if (pageNumber?.current ?? 0) + 1 > pageNumber?.maximum ?? 0 { break }
 
             if appState.homeInfo.moreFavoritesLoading[favIndex] == true { break }
             appState.homeInfo.moreFavoritesLoading[favIndex] = true
@@ -496,7 +496,7 @@ final class Store: ObservableObject {
             appState.homeInfo.moreToplistsLoadFailed[topType.rawValue] = false
 
             let pageNumber = appState.homeInfo.toplistsPageNumbers[topType.rawValue]
-            if pageNumber?.current ?? 0 + 1 >= pageNumber?.maximum ?? 1 { break }
+            if pageNumber?.current ?? 0 + 1 > pageNumber?.maximum ?? 0 { break }
 
             if appState.homeInfo.moreToplistsLoading[topType.rawValue] == true { break }
             appState.homeInfo.moreToplistsLoading[topType.rawValue] = true

diff --git a/EhPanda/View/Tools/GalleryThumbnailCell.swift b/EhPanda/View/Tools/GalleryThumbnailCell.swift
@@ -80,15 +80,14 @@ struct GalleryThumbnailCell: View {
                         .font(.caption)
                     Spacer()
                     HStack(spacing: 10) {
-                        Text(gallery.language?.languageAbbr ?? "")
                         if !isSEWidth {
                             HStack(spacing: 2) {
                                 Image(systemName: "photo.on.rectangle.angled")
                                 Text(String(gallery.pageCount))
                             }
                         }
                     }
-                    .fixedSize().lineLimit(1).font(.footnote)
+                    .lineLimit(1).font(.footnote)
                     .foregroundStyle(.secondary)
                 }
                 .padding(.top, 1)