Skip to content

Commit a931e42

Browse files
author
たつぞう
committed
Merge branch 'develop'
2 parents 59f1c24 + 8c482db commit a931e42

File tree

14 files changed

+309
-77
lines changed

14 files changed

+309
-77
lines changed

‎EhPanda.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
/* Begin PBXBuildFile section */
1010
AB018DD2268756D000EB0EA9 /* Kanna in Frameworks */ = {isa = PBXBuildFile; productRef = AB018DD1268756D000EB0EA9 /* Kanna */; };
1111
AB19D619266E5C6700BA752A /* TTProgressHUD in Frameworks */ = {isa = PBXBuildFile; productRef = AB19D618266E5C6700BA752A /* TTProgressHUD */; };
12-
AB2B0F3B2684228400777944 /* SwiftyBeaver in Frameworks */ = {isa = PBXBuildFile; productRef = AB2B0F3A2684228400777944 /* SwiftyBeaver */; };
1312
AB2F72BF2685A8B00088DECA /* Kingfisher in Frameworks */ = {isa = PBXBuildFile; productRef = AB2F72BE2685A8B00088DECA /* Kingfisher */; };
1413
AB38A0CB25CA993D00764D64 /* ColorCodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB38A0CA25CA993D00764D64 /* ColorCodable.swift */; };
1514
AB40CFDC25983EC200D1DC9A /* FileStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB40CFDB25983EC200D1DC9A /* FileStorage.swift */; };
@@ -24,6 +23,8 @@
2423
AB47FDB425BC859E0007765D /* Weird-ipad@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDB125BC859E0007765D /* Weird-ipad@2x.png */; };
2524
AB47FDB525BC859E0007765D /* Weird-ipad-pro@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDB225BC859E0007765D /* Weird-ipad-pro@2x.png */; };
2625
AB47FDB625BC859E0007765D /* Weird-ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = AB47FDB325BC859E0007765D /* Weird-ipad.png */; };
26+
AB6DE897268822390087C579 /* LogsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AB6DE896268822390087C579 /* LogsView.swift */; };
27+
AB6DE89A268861790087C579 /* SwiftyBeaver in Frameworks */ = {isa = PBXBuildFile; productRef = AB6DE899268861790087C579 /* SwiftyBeaver */; };
2728
AB7E6B3025D24FE00035CC68 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AB7E6B3225D24FE00035CC68 /* InfoPlist.strings */; };
2829
ABA732D925A8018A00B3D9AB /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA732D825A8018A00B3D9AB /* Extensions.swift */; };
2930
ABA732DF25A852D800B3D9AB /* Filter.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABA732DE25A852D800B3D9AB /* Filter.swift */; };
@@ -34,7 +35,7 @@
3435
ABC3C7872593699B00E0C11B /* EhPandaApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC3C76B2593699A00E0C11B /* EhPandaApp.swift */; };
3536
ABC3C7892593699B00E0C11B /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC3C76D2593699A00E0C11B /* Defaults.swift */; };
3637
ABC3C78F2593699B00E0C11B /* ViewModifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC3C7762593699A00E0C11B /* ViewModifiers.swift */; };
37-
ABC3C7962593699B00E0C11B /* Manga.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC3C7802593699A00E0C11B /* Manga.swift */; };
38+
ABC3C7962593699B00E0C11B /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABC3C7802593699A00E0C11B /* Models.swift */; };
3839
ABCD2F0A259763FC008E5A20 /* Request.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABCD2F09259763FC008E5A20 /* Request.swift */; };
3940
ABCD2F0E25976B95008E5A20 /* Parser.swift in Sources */ = {isa = PBXBuildFile; fileRef = ABCD2F0D25976B95008E5A20 /* Parser.swift */; };
4041
ABD5FDD4263D05110021A4C6 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = ABD5FDD3263D05110021A4C6 /* .swiftlint.yml */; };
@@ -89,6 +90,7 @@
8990
AB47FDB125BC859E0007765D /* Weird-ipad@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Weird-ipad@2x.png"; sourceTree = "<group>"; };
9091
AB47FDB225BC859E0007765D /* Weird-ipad-pro@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Weird-ipad-pro@2x.png"; sourceTree = "<group>"; };
9192
AB47FDB325BC859E0007765D /* Weird-ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Weird-ipad.png"; sourceTree = "<group>"; };
93+
AB6DE896268822390087C579 /* LogsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LogsView.swift; sourceTree = "<group>"; };
9294
AB7E6B3125D24FE00035CC68 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/InfoPlist.strings; sourceTree = "<group>"; };
9395
AB7E6B3425D24FE40035CC68 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
9496
AB7E6B3525D24FE50035CC68 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -104,7 +106,7 @@
104106
ABC3C76D2593699A00E0C11B /* Defaults.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Defaults.swift; sourceTree = "<group>"; };
105107
ABC3C76E2593699A00E0C11B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
106108
ABC3C7762593699A00E0C11B /* ViewModifiers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewModifiers.swift; sourceTree = "<group>"; };
107-
ABC3C7802593699A00E0C11B /* Manga.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Manga.swift; sourceTree = "<group>"; };
109+
ABC3C7802593699A00E0C11B /* Models.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
108110
ABCD2F09259763FC008E5A20 /* Request.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Request.swift; sourceTree = "<group>"; };
109111
ABCD2F0D25976B95008E5A20 /* Parser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Parser.swift; sourceTree = "<group>"; };
110112
ABD5FDD3263D05110021A4C6 /* .swiftlint.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = SOURCE_ROOT; };
@@ -154,8 +156,8 @@
154156
buildActionMask = 2147483647;
155157
files = (
156158
ABE0FA2F25D4CAEC00E52F18 /* SDWebImageSwiftUI in Frameworks */,
157-
AB2B0F3B2684228400777944 /* SwiftyBeaver in Frameworks */,
158159
AB19D619266E5C6700BA752A /* TTProgressHUD in Frameworks */,
160+
AB6DE89A268861790087C579 /* SwiftyBeaver in Frameworks */,
159161
AB2F72BF2685A8B00088DECA /* Kingfisher in Frameworks */,
160162
AB018DD2268756D000EB0EA9 /* Kanna in Frameworks */,
161163
);
@@ -253,7 +255,7 @@
253255
children = (
254256
ABF75F3E25A19CD200544D29 /* User.swift */,
255257
ABA732DE25A852D800B3D9AB /* Filter.swift */,
256-
ABC3C7802593699A00E0C11B /* Manga.swift */,
258+
ABC3C7802593699A00E0C11B /* Models.swift */,
257259
ABEA1FE525A9B40B002966B9 /* Setting.swift */,
258260
ABF313A425B1AB6600D47A2F /* Misc.swift */,
259261
);
@@ -342,6 +344,7 @@
342344
ABF45ADB25F3313D00ECB568 /* ReadingSettingView.swift */,
343345
ABF45ADE25F3313D00ECB568 /* EhPandaView.swift */,
344346
ABF45ADA25F3313D00ECB568 /* WebView.swift */,
347+
AB6DE896268822390087C579 /* LogsView.swift */,
345348
);
346349
path = Setting;
347350
sourceTree = "<group>";
@@ -366,9 +369,9 @@
366369
packageProductDependencies = (
367370
ABE0FA2E25D4CAEC00E52F18 /* SDWebImageSwiftUI */,
368371
AB19D618266E5C6700BA752A /* TTProgressHUD */,
369-
AB2B0F3A2684228400777944 /* SwiftyBeaver */,
370372
AB2F72BE2685A8B00088DECA /* Kingfisher */,
371373
AB018DD1268756D000EB0EA9 /* Kanna */,
374+
AB6DE899268861790087C579 /* SwiftyBeaver */,
372375
);
373376
productName = EhPanda;
374377
productReference = ABC3C7542593696C00E0C11B /* EhPanda.app */;
@@ -403,9 +406,9 @@
403406
packageReferences = (
404407
ABE0FA2D25D4CAEC00E52F18 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */,
405408
AB19D617266E5C6700BA752A /* XCRemoteSwiftPackageReference "TTProgressHUD" */,
406-
AB2B0F392684228400777944 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */,
407409
AB2F72BD2685A8B00088DECA /* XCRemoteSwiftPackageReference "Kingfisher" */,
408410
AB018DD0268756D000EB0EA9 /* XCRemoteSwiftPackageReference "Kanna" */,
411+
AB6DE898268861790087C579 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */,
409412
);
410413
productRefGroup = ABC3C7552593696C00E0C11B /* Products */;
411414
projectDirPath = "";
@@ -490,6 +493,7 @@
490493
ABF45AF725F3313D00ECB568 /* SettingView.swift in Sources */,
491494
ABF45AEA25F3313D00ECB568 /* Placeholder.swift in Sources */,
492495
ABF45AE125F3313D00ECB568 /* Home.swift in Sources */,
496+
AB6DE897268822390087C579 /* LogsView.swift in Sources */,
493497
ABF45AF025F3313D00ECB568 /* CommentView.swift in Sources */,
494498
ABF45AE325F3313D00ECB568 /* SlideMenu.swift in Sources */,
495499
ABF45AE225F3313D00ECB568 /* AuthView.swift in Sources */,
@@ -503,7 +507,7 @@
503507
ABF45AEE25F3313D00ECB568 /* ArchiveView.swift in Sources */,
504508
ABF45AEC25F3313D00ECB568 /* ContentView.swift in Sources */,
505509
ABEA1FE625A9B40B002966B9 /* Setting.swift in Sources */,
506-
ABC3C7962593699B00E0C11B /* Manga.swift in Sources */,
510+
ABC3C7962593699B00E0C11B /* Models.swift in Sources */,
507511
ABC3C7872593699B00E0C11B /* EhPandaApp.swift in Sources */,
508512
ABF313A525B1AB6600D47A2F /* Misc.swift in Sources */,
509513
ABA732DF25A852D800B3D9AB /* Filter.swift in Sources */,
@@ -745,8 +749,8 @@
745749
isa = XCRemoteSwiftPackageReference;
746750
repositoryURL = "https://github.com/tid-kijyun/Kanna.git";
747751
requirement = {
748-
kind = revision;
749-
revision = 211beb276b7563eb9bb09474ce2d5f2176976232;
752+
branch = master;
753+
kind = branch;
750754
};
751755
};
752756
AB19D617266E5C6700BA752A /* XCRemoteSwiftPackageReference "TTProgressHUD" */ = {
@@ -757,19 +761,19 @@
757761
kind = branch;
758762
};
759763
};
760-
AB2B0F392684228400777944 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */ = {
764+
AB2F72BD2685A8B00088DECA /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
761765
isa = XCRemoteSwiftPackageReference;
762-
repositoryURL = "https://github.com/SwiftyBeaver/SwiftyBeaver.git";
766+
repositoryURL = "https://github.com/tatsuz0u/Kingfisher";
763767
requirement = {
764-
kind = upToNextMajorVersion;
765-
minimumVersion = 1.9.5;
768+
branch = "Xcode-13-fix";
769+
kind = branch;
766770
};
767771
};
768-
AB2F72BD2685A8B00088DECA /* XCRemoteSwiftPackageReference "Kingfisher" */ = {
772+
AB6DE898268861790087C579 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */ = {
769773
isa = XCRemoteSwiftPackageReference;
770-
repositoryURL = "https://github.com/tatsuz0u/Kingfisher";
774+
repositoryURL = "https://github.com/tatsuz0u/SwiftyBeaver";
771775
requirement = {
772-
branch = "Xcode-13-fix";
776+
branch = "expose-calendar";
773777
kind = branch;
774778
};
775779
};
@@ -794,16 +798,16 @@
794798
package = AB19D617266E5C6700BA752A /* XCRemoteSwiftPackageReference "TTProgressHUD" */;
795799
productName = TTProgressHUD;
796800
};
797-
AB2B0F3A2684228400777944 /* SwiftyBeaver */ = {
798-
isa = XCSwiftPackageProductDependency;
799-
package = AB2B0F392684228400777944 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */;
800-
productName = SwiftyBeaver;
801-
};
802801
AB2F72BE2685A8B00088DECA /* Kingfisher */ = {
803802
isa = XCSwiftPackageProductDependency;
804803
package = AB2F72BD2685A8B00088DECA /* XCRemoteSwiftPackageReference "Kingfisher" */;
805804
productName = Kingfisher;
806805
};
806+
AB6DE899268861790087C579 /* SwiftyBeaver */ = {
807+
isa = XCSwiftPackageProductDependency;
808+
package = AB6DE898268861790087C579 /* XCRemoteSwiftPackageReference "SwiftyBeaver" */;
809+
productName = SwiftyBeaver;
810+
};
807811
ABE0FA2E25D4CAEC00E52F18 /* SDWebImageSwiftUI */ = {
808812
isa = XCSwiftPackageProductDependency;
809813
package = ABE0FA2D25D4CAEC00E52F18 /* XCRemoteSwiftPackageReference "SDWebImageSwiftUI" */;

‎EhPanda.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved‎

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎EhPanda/App/Defaults.swift‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,43 @@ struct Defaults {
1919
}
2020
}
2121
struct ImageSize {
22-
static var rowScale: CGFloat = 8/11
23-
static var avatarScale: CGFloat = 1/1
24-
static var headerScale: CGFloat = 8/11
25-
static var previewScale: CGFloat = 32/45
26-
static var contentHScale: CGFloat = 7/10
22+
static let rowScale: CGFloat = 8/11
23+
static let avatarScale: CGFloat = 1/1
24+
static let headerScale: CGFloat = 8/11
25+
static let previewScale: CGFloat = 32/45
26+
static let contentHScale: CGFloat = 7/10
2727

28-
static var rowW: CGFloat = rowH * rowScale
29-
static var rowH: CGFloat = 110
30-
static var avatarW: CGFloat = 100
31-
static var avatarH: CGFloat = 100
32-
static var headerW: CGFloat = headerH * headerScale
33-
static var headerH: CGFloat = 150
34-
static var previewW: CGFloat = previewH * previewScale
35-
static var previewH: CGFloat = 200
28+
static let rowW: CGFloat = rowH * rowScale
29+
static let rowH: CGFloat = 110
30+
static let avatarW: CGFloat = 100
31+
static let avatarH: CGFloat = 100
32+
static let headerW: CGFloat = headerH * headerScale
33+
static let headerH: CGFloat = 150
34+
static let previewW: CGFloat = previewH * previewScale
35+
static let previewH: CGFloat = 200
3636
}
3737
struct Cookie {
38-
static var null = "null"
39-
static var expired = "expired"
40-
static var mystery = "mystery"
38+
static let null = "null"
39+
static let expired = "expired"
40+
static let mystery = "mystery"
4141

42-
static var igneous = "igneous"
43-
static var ipbMemberId = "ipb_member_id"
44-
static var ipbPassHash = "ipb_pass_hash"
42+
static let igneous = "igneous"
43+
static let ipbMemberId = "ipb_member_id"
44+
static let ipbPassHash = "ipb_pass_hash"
4545
}
4646
struct DateFormat {
47-
static var publish = "yyyy-MM-dd HH:mm"
48-
static var torrent = "yyyy-MM-dd HH:mm"
49-
static var comment = "dd MMMM yyyy, HH:mm"
47+
static let publish = "yyyy-MM-dd HH:mm"
48+
static let torrent = "yyyy-MM-dd HH:mm"
49+
static let comment = "dd MMMM yyyy, HH:mm"
50+
}
51+
struct FilePath {
52+
static let logs = "logs"
53+
static let ehpandaLog = "EhPanda.log"
5054
}
5155
struct Response {
52-
static var hathClientNotFound = "You must have a H@H client assigned to your account to use this feature."
53-
static var hathClientNotOnline = "Your H@H client appears to be offline. Turn it on, then try again."
54-
static var invalidResolution = "The requested gallery cannot be downloaded with the selected resolution."
56+
static let hathClientNotFound = "You must have a H@H client assigned to your account to use this feature."
57+
static let hathClientNotOnline = "Your H@H client appears to be offline. Turn it on, then try again."
58+
static let invalidResolution = "The requested gallery cannot be downloaded with the selected resolution."
5559
}
5660
struct URL {
5761
// Domains

‎EhPanda/App/EhPandaApp.swift‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,15 @@ private extension EhPandaApp {
7878
#endif
7979
}
8080
func configure(file: inout FileDestination) {
81-
file.logFileAmount = 5
82-
file.logFileURL = try? FileManager.default.url(
83-
for: .documentDirectory, in: .userDomainMask,
84-
appropriateFor: nil, create: true
85-
).appendingPathComponent("EhPanda.log")
81+
file.calendar = Calendar(identifier: .gregorian)
82+
file.logFileAmount = 10
83+
file.logFileURL = logsDirectoryURL?
84+
.appendingPathComponent(
85+
Defaults.FilePath.ehpandaLog
86+
)
8687
}
8788
func configure(console: inout ConsoleDestination) {
89+
console.calendar = Calendar(identifier: .gregorian)
8890
#if DEBUG
8991
console.asynchronously = false
9092
#endif

‎EhPanda/App/Utility.swift‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,13 @@ func notificFeedback(style: UINotificationFeedbackGenerator.FeedbackType) {
198198
var animatedTransition: AnyTransition {
199199
AnyTransition.opacity.animation(.default)
200200
}
201+
var logsDirectoryURL: URL? {
202+
try? FileManager.default.url(
203+
for: .documentDirectory, in: .userDomainMask,
204+
appropriateFor: nil, create: true
205+
)
206+
.appendingPathComponent(Defaults.FilePath.logs)
207+
}
201208
func clearPasteboard() {
202209
UIPasteboard.general.string = ""
203210
}
@@ -246,6 +253,28 @@ func dispatchMainSync(execute work: () -> Void) {
246253
}
247254
}
248255

256+
func presentActivityVC(items: [Any]) {
257+
let activityVC = UIActivityViewController(
258+
activityItems: items,
259+
applicationActivities: nil
260+
)
261+
if isPad {
262+
activityVC.popoverPresentationController?.sourceView = keyWindow
263+
activityVC.popoverPresentationController?.sourceRect = CGRect(
264+
x: screenW, y: 0,
265+
width: 200, height: 200
266+
)
267+
}
268+
activityVC.modalPresentationStyle = .overFullScreen
269+
keyWindow?.rootViewController?
270+
.present(
271+
activityVC,
272+
animated: true,
273+
completion: nil
274+
)
275+
impactFeedback(style: .light)
276+
}
277+
249278
// MARK: UserDefaults
250279
let isDebugModeOn = UserDefaults.standard.bool(forKey: "debugModeOn")
251280

‎EhPanda/App/ja.lproj/Localizable.strings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@
116116
"Website" = "ウェブサイト";
117117
"Acknowledgement" = "謝辞";
118118

119+
// MARK: LogsView
120+
"Logs" = "ログ";
121+
"Latest" = "最新";
122+
" records" = "件レコード";
123+
119124
// MARK: FilterView
120125
"Filters" = "フィルター";
121126
"Basic" = "基本";

‎EhPanda/App/zh-Hans.lproj/Localizable.strings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@
116116
"Website" = "网站";
117117
"Acknowledgement" = "致谢";
118118

119+
// MARK: LogsView
120+
"Logs" = "日志";
121+
"Latest" = "最新";
122+
" records" = "条记录";
123+
119124
// MARK: FilterView
120125
"Filters" = "筛选";
121126
"Basic" = "基础";

‎EhPanda/App/zh-Hant.lproj/Localizable.strings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@
116116
"Website" = "網站";
117117
"Acknowledgement" = "致謝";
118118

119+
// MARK: LogsView
120+
"Logs" = "日誌";
121+
"Latest" = "最新";
122+
" records" = "條紀錄";
123+
119124
// MARK: FilterView
120125
"Filters" = "篩選";
121126
"Basic" = "基本";

EhPanda/Models/Manga.swift renamed to EhPanda/Models/Models.swift

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Manga.swift
2+
// Models.swift
33
// EhPanda
44
//
55
// Created by 荒木辰造 on R 2/11/22.
@@ -204,6 +204,16 @@ struct MangaTorrent: Identifiable, Codable {
204204
let magnet: String
205205
}
206206

207+
struct Log: Identifiable, Comparable {
208+
static func < (lhs: Log, rhs: Log) -> Bool {
209+
lhs.fileName < rhs.fileName
210+
}
211+
212+
var id: String { fileName }
213+
let fileName: String
214+
let contents: [String]
215+
}
216+
207217
// MARK: Computed Properties
208218
extension Manga: DateFormattable, CustomStringConvertible {
209219
var description: String {

‎EhPanda/View/Content/ContentView.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ struct ContentView: View, StoreAccessor {
7373
.onAppear {
7474
onWebImageAppear(item: item)
7575
}
76+
#if DEBUG
7677
Text("\(item.tag + 1)/\(mangaDetail?.pageCount ?? "")")
7778
.bold().font(.largeTitle).foregroundColor(.gray)
79+
#endif
7880
}
7981
}
8082
LoadMoreFooter(

0 commit comments

Comments
 (0)