Skip to content
This repository was archived by the owner on Jan 20, 2021. It is now read-only.

Commit 83d27a4

Browse files
Julian KahnertJulian Kahnert
Julian Kahnert
authored and
Julian Kahnert
committed
+ fix MoreTab/Settings link
+ fix linting issues + bump build number
1 parent e21547c commit 83d27a4

File tree

24 files changed

+53
-99
lines changed

24 files changed

+53
-99
lines changed

‎ArchiveCore/Sources/ArchiveBackend/Protocols/ErrorPresenter.swift

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ArchiveCore/Sources/ArchiveBackend/Protocols/Search.swift

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎ArchiveCore/Sources/ArchiveBackend/Protocols/SearchScope.swift

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
//
2+
// Search.swift
3+
// ArchiveLib
4+
//
5+
// Created by Julian Kahnert on 13.11.18.
6+
//
7+
8+
import Foundation
9+
10+
/// Scope, which defines the documents that should be searched.
11+
public enum SearchScope {
12+
13+
/// Search the whole archive.
14+
case all
15+
16+
/// Search in a specific year.
17+
case year(year: String)
18+
}

‎ArchiveCore/Sources/ArchiveBackend/Storage/StorageHelper+Errors.swift renamed to ‎ArchiveCore/Sources/ArchiveBackend/Storage/StorageError.swift

File renamed without changes.

‎ArchiveCore/Sources/ArchiveBackend/Storage/StorageHelperAPI.swift

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎ArchiveCore/Sources/ArchiveSharedConstants/Color.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public extension Color {
1919
static var paPDFBackground = Color("PDFBackground")
2020
static var paBackground = Color("Background")
2121
#if os(macOS)
22-
//swiftlint:disable:next force_unwrapping
22+
// swiftlint:disable:next force_unwrapping
2323
static var paSecondaryBackground = Color(NSColor.alternatingContentBackgroundColors.last!)
2424
#else
2525
static var paSecondaryBackground = Color("SecondaryBackground")

‎ArchiveCore/Sources/ArchiveSharedConstants/Extensions/NSItemProvider.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public extension NSItemProvider {
7979

8080
} else if let image = rawData as? Image {
8181
#if os(macOS)
82-
//swiftlint:disable:next force_unwrapping
82+
// swiftlint:disable:next force_unwrapping
8383
let cgImage = image.cgImage(forProposedRect: nil, context: nil, hints: nil)!
8484
let bitmapRep = NSBitmapImageRep(cgImage: cgImage)
8585
data = bitmapRep.representation(using: .jpeg, properties: [.compressionFactor: NSNumber(value: 1)])

‎ArchiveCore/Sources/ArchiveViews/ArchiveTab/ArchiveViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//
88
// swiftlint:disable function_body_length
99

10-
//import ArchiveCore
10+
// import ArchiveCore
1111
import Combine
1212
import Foundation
1313
import SwiftUI

‎ArchiveCore/Sources/ArchiveViews/Helper/MissingViews/WrappingHStack.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public struct WrappingHStack<Item: Identifiable & Hashable, Content: View>: View
2828
}
2929
}
3030
.frame(height: totalHeight)// << variant for ScrollView/List
31-
//.frame(maxHeight: totalHeight) // << variant for VStack
31+
// .frame(maxHeight: totalHeight) // << variant for VStack
3232
}
3333

3434
private func generateContent(in proxy: GeometryProxy) -> some View {
@@ -47,7 +47,7 @@ public struct WrappingHStack<Item: Identifiable & Hashable, Content: View>: View
4747
let result = width
4848
if let lastItem = self.items.last,
4949
item == lastItem {
50-
width = 0 //last item
50+
width = 0 // last item
5151
} else {
5252
width -= dimensions.width
5353
}

‎ArchiveCore/Sources/ArchiveViews/IAPView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ struct IAPView_Previews: PreviewProvider {
168168
@State static var viewModel = IAPViewModel(iapService: MockIAPService())
169169
static var previews: some View {
170170
IAPView(viewModel: viewModel)
171-
//.previewDevice("Mac")
171+
// .previewDevice("Mac")
172172
.makeForPreviewProvider()
173173
}
174174
}

‎ArchiveCore/Sources/ArchiveViews/MainNavigationView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ public struct MainNavigationView: View {
131131
#endif
132132
}
133133

134-
//struct MainNavigationView_Previews: PreviewProvider {
134+
// struct MainNavigationView_Previews: PreviewProvider {
135135
// @State static var viewModel = MainNavigationViewModel()
136136
// static var previews: some View {
137137
// MainNavigationView(viewModel: viewModel)
138138
// }
139-
//}
139+
// }
140140

141141
fileprivate extension View {
142142

‎ArchiveCore/Sources/ArchiveViews/MoreTab/MoreTabView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ struct MoreTabView: View {
7777
NavigationLink(destination: AboutMeView()) {
7878
Text("About 👤")
7979
}
80-
Link("PDF Archiver (macOS) 🖥", destination: viewModel.macOSAppUrl)
80+
Link("PDF Archiver Website 🖥", destination: viewModel.pdfArchiverUrl)
8181
MoreTabViewModel.markdownView(for: "Terms of Use & Privacy Policy", withKey: "Privacy")
8282
MoreTabViewModel.markdownView(for: "Imprint", withKey: "Imprint")
8383
DetailRowView(name: "Contact Support 🚑") {

‎ArchiveCore/Sources/ArchiveViews/MoreTab/MoreTabViewModel.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ public final class MoreTabViewModel: ObservableObject, Log {
3333
URL(string: "https://apps.apple.com/account/subscriptions")!
3434
}
3535

36-
var macOSAppUrl: URL {
37-
URL(string: "https://macos.pdf-archiver.io")!
36+
var pdfArchiverUrl: URL {
37+
URL(string: "https://pdf-archiver.io")!
3838
}
3939

4040
private let iapService: IAPServiceAPI

‎ArchiveCore/Sources/ArchiveViews/SettingsView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public struct SettingsView: View {
128128
NotificationCenter.default.post(Notification(name: .showSendDiagnosticsReport))
129129
}
130130
Spacer()
131-
Link("PDF Archiver Website 🖥", destination: viewModel.macOSAppUrl)
131+
Link("PDF Archiver Website 🖥", destination: viewModel.pdfArchiverUrl)
132132
Text("Version \(MoreTabViewModel.appVersion)")
133133
.font(.caption)
134134
}

‎ArchiveCore/Sources/ArchiveViews/TagTab/DocumentInformationForm.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ struct DocumentInformationForm: View {
3232
private func documentTagTapped(_ tag: String) {
3333
tags.removeAll { $0 == tag }
3434
// just remove the tapped tag
35-
//$suggestedTags.insertAndSort(tag)
35+
// $suggestedTags.insertAndSort(tag)
3636
}
3737

3838
private func saveCurrentTag() {

‎ArchiveCore/Sources/ArchiveViews/TagTab/DocumentList.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct DocumentList: View {
2323
.padding()
2424

2525
// There is currently no way to remove the list separators, so we have to use a LazyVStack
26-
//List(documents) { document in
26+
// List(documents) { document in
2727
ScrollView {
2828
LazyVStack {
2929
ForEach(documents) { document in

‎ArchiveCore/Tests/ArchiveSharedConstantsTests/FileManagerMoveTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// *** FOLDERSTRUCTURE ***
99
//
10-
//sourcefolder
10+
// sourcefolder
1111
// |
1212
// - file1
1313
// - subfolder
@@ -16,14 +16,14 @@
1616
// |
1717
// - file22
1818
//
19-
//destinationfolder
19+
// destinationfolder
2020
// |
2121
// - file3
2222
// - subfolder
2323
// - file4
2424
// - file5
2525
//
26-
//resultingfolder
26+
// resultingfolder
2727
// |
2828
// - file1
2929
// - file3
@@ -92,7 +92,7 @@ final class FileManagerMoveTests: XCTestCase {
9292
let files2 = FileManager.default.getFilesRecursive(at: url)
9393
XCTAssertEqual(files2.count, 6)
9494

95-
//swiftlint:disable identifier_name
95+
// swiftlint:disable identifier_name
9696
let fm = FileManager.default
9797
XCTAssert(fm.fileExists(at: destination.appendingPathComponent("file1")))
9898
XCTAssert(fm.fileExists(at: destination.appendingPathComponent("file3")))

‎PDFArchiver.xcodeproj/project.pbxproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1014,7 +1014,7 @@
10141014
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
10151015
CODE_SIGN_ENTITLEMENTS = iOS/PDFArchiver.entitlements;
10161016
CODE_SIGN_STYLE = Automatic;
1017-
CURRENT_PROJECT_VERSION = 3;
1017+
CURRENT_PROJECT_VERSION = 4;
10181018
DEVELOPMENT_TEAM = 87KNVHZ8C7;
10191019
ENABLE_PREVIEWS = YES;
10201020
INFOPLIST_FILE = iOS/Info.plist;
@@ -1041,7 +1041,7 @@
10411041
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
10421042
CODE_SIGN_ENTITLEMENTS = iOS/PDFArchiver.entitlements;
10431043
CODE_SIGN_STYLE = Automatic;
1044-
CURRENT_PROJECT_VERSION = 3;
1044+
CURRENT_PROJECT_VERSION = 4;
10451045
DEVELOPMENT_TEAM = 87KNVHZ8C7;
10461046
ENABLE_PREVIEWS = YES;
10471047
INFOPLIST_FILE = iOS/Info.plist;
@@ -1070,7 +1070,7 @@
10701070
CODE_SIGN_IDENTITY = "Apple Development";
10711071
CODE_SIGN_STYLE = Automatic;
10721072
COMBINE_HIDPI_IMAGES = YES;
1073-
CURRENT_PROJECT_VERSION = 11;
1073+
CURRENT_PROJECT_VERSION = 12;
10741074
DEVELOPMENT_TEAM = 87KNVHZ8C7;
10751075
ENABLE_HARDENED_RUNTIME = YES;
10761076
ENABLE_PREVIEWS = YES;
@@ -1097,7 +1097,7 @@
10971097
CODE_SIGN_IDENTITY = "Apple Development";
10981098
CODE_SIGN_STYLE = Automatic;
10991099
COMBINE_HIDPI_IMAGES = YES;
1100-
CURRENT_PROJECT_VERSION = 11;
1100+
CURRENT_PROJECT_VERSION = 12;
11011101
DEVELOPMENT_TEAM = 87KNVHZ8C7;
11021102
ENABLE_HARDENED_RUNTIME = YES;
11031103
ENABLE_PREVIEWS = YES;
@@ -1210,7 +1210,7 @@
12101210
CLANG_ENABLE_MODULES = YES;
12111211
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
12121212
CODE_SIGN_STYLE = Automatic;
1213-
CURRENT_PROJECT_VERSION = 3;
1213+
CURRENT_PROJECT_VERSION = 4;
12141214
DEVELOPMENT_TEAM = 87KNVHZ8C7;
12151215
INFOPLIST_FILE = ShareExtension/Info.plist;
12161216
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -1237,7 +1237,7 @@
12371237
CLANG_ENABLE_MODULES = YES;
12381238
CODE_SIGN_ENTITLEMENTS = ShareExtension/ShareExtension.entitlements;
12391239
CODE_SIGN_STYLE = Automatic;
1240-
CURRENT_PROJECT_VERSION = 3;
1240+
CURRENT_PROJECT_VERSION = 4;
12411241
DEVELOPMENT_TEAM = 87KNVHZ8C7;
12421242
INFOPLIST_FILE = ShareExtension/Info.plist;
12431243
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -1308,7 +1308,7 @@
13081308
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
13091309
CODE_SIGN_ENTITLEMENTS = AppClip/AppClip.entitlements;
13101310
CODE_SIGN_STYLE = Automatic;
1311-
CURRENT_PROJECT_VERSION = 3;
1311+
CURRENT_PROJECT_VERSION = 4;
13121312
DEVELOPMENT_ASSET_PATHS = "\"AppClip/Preview Content\"";
13131313
DEVELOPMENT_TEAM = 87KNVHZ8C7;
13141314
ENABLE_PREVIEWS = YES;
@@ -1335,7 +1335,7 @@
13351335
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
13361336
CODE_SIGN_ENTITLEMENTS = AppClip/AppClip.entitlements;
13371337
CODE_SIGN_STYLE = Automatic;
1338-
CURRENT_PROJECT_VERSION = 3;
1338+
CURRENT_PROJECT_VERSION = 4;
13391339
DEVELOPMENT_ASSET_PATHS = "\"AppClip/Preview Content\"";
13401340
DEVELOPMENT_TEAM = 87KNVHZ8C7;
13411341
ENABLE_PREVIEWS = YES;

‎Shared/PDFArchiverApp.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ import SwiftUI
1818
@main
1919
struct PDFArchiverApp: App, Log {
2020

21+
// swiftlint:disable weak_delegate
2122
#if os(macOS)
22-
//swiftlint:disable:next weak_delegate
2323
@NSApplicationDelegateAdaptor(AppDelegate.self) var delegate
2424
#else
25-
//swiftlint:disable:next weak_delegate
2625
@UIApplicationDelegateAdaptor(AppDelegate.self) var delegate
2726
#endif
27+
// swiftlint:enable weak_delegate
2828
@Environment(\.scenePhase) private var scenePhase
2929
@StateObject var mainNavigationViewModel = MainNavigationViewModel()
3030

@@ -38,7 +38,7 @@ struct PDFArchiverApp: App, Log {
3838
mainView
3939
}
4040
// use this when tool bar items were added
41-
//.windowToolbarStyle(UnifiedCompactWindowToolbarStyle())
41+
// .windowToolbarStyle(UnifiedCompactWindowToolbarStyle())
4242
.windowStyle(HiddenTitleBarWindowStyle())
4343
.commands {
4444
SidebarCommands()

‎Shared/Resources/Settings.bundle/Root.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<array>
77
<dict>
88
<key>DefaultValue</key>
9-
<string>3.2.2 (3)</string>
9+
<string>3.2.2 (4)</string>
1010
<key>Key</key>
1111
<string>version_preference</string>
1212
<key>Title</key>

‎Shared/Views/MainTabView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ struct MainNavigationView: View {
119119
}
120120
}
121121

122-
//struct MainTabView_Previews: PreviewProvider {
122+
// struct MainTabView_Previews: PreviewProvider {
123123
// @State static var viewModel = MainNavigationViewModel()
124124
// static var previews: some View {
125125
// MainTabView(viewModel: viewModel)
126126
// }
127-
//}
127+
// }

‎Tests iOS/TestsIOS.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// Created by Julian Kahnert on 24.06.20.
66
//
77

8-
//@testable import PDFArchiver
8+
// @testable import PDFArchiver
99
import XCTest
1010

1111
final class TestsIOS: XCTestCase {

‎Tests macOS/Tests_macOS.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import XCTest
99

10-
//swiftlint:disable:next type_name
10+
// swiftlint:disable:next type_name
1111
final class Tests_macOS: XCTestCase {
1212

1313
override func setUpWithError() throws {

‎fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ end
2828
desc "Upload binary to Sentry.io"
2929
lane :sentry do
3030
download_dsyms(
31-
min_version: "2.3.0",
31+
min_version: "3.2.0",
3232
output_directory: "build/"
3333
)
3434
sentry_upload_dsym(

0 commit comments

Comments
 (0)