Update code base

wallabag · Jan 24, 2024 · fc30903 · fc30903
1 parent 7922973
commit fc30903
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 26 deletions.
diff --git a/App/Features/About/AboutView.swift b/App/Features/About/AboutView.swift
@@ -20,8 +20,6 @@ struct AboutView: View {
     }
 }
 
-struct AboutView_Previews: PreviewProvider {
-    static var previews: some View {
-        AboutView()
-    }
+#Preview {
+    AboutView()
 }
diff --git a/App/Features/BugReport/BugReportView.swift b/App/Features/BugReport/BugReportView.swift
@@ -17,8 +17,6 @@ struct BugReportView: View {
     }
 }
 
-struct BugReportView_Previews: PreviewProvider {
-    static var previews: some View {
-        BugReportView()
-    }
+#Preview {
+    BugReportView()
 }
diff --git a/App/Features/Entry/AddEntryView.swift b/App/Features/Entry/AddEntryView.swift
@@ -48,8 +48,6 @@ private class AddEntryModel: ObservableObject {
     }
 }
 
-struct AddEntryView_Previews: PreviewProvider {
-    static var previews: some View {
-        AddEntryView()
-    }
+#Preview {
+    AddEntryView()
 }
diff --git a/App/Features/Sync/CoreDataSync.swift b/App/Features/Sync/CoreDataSync.swift
@@ -4,7 +4,7 @@ import Factory
 import Foundation
 import SharedLib
 
-class CoreDataSync {
+final class CoreDataSync {
     private var objectsDidChangeCancellable: AnyCancellable?
 
     @Injected(\.appSync) private var appSync

diff --git a/App/Lib/AppState.swift b/App/Lib/AppState.swift
@@ -5,7 +5,7 @@ import SharedLib
 import SwiftUI
 import WallabagKit
 
-final class AppState: NSObject, ObservableObject {
+final class AppState: ObservableObject {
     @Injected(\.wallabagSession) private var session
 
     @Published var registred: Bool = false {
@@ -16,8 +16,7 @@ final class AppState: NSObject, ObservableObject {
 
     @AppStorage("readingSpeed") var readingSpeed: Double = 200
 
-    override init() {
-        super.init()
+    init() {
         registred = WallabagUserDefaults.registred
     }
 

diff --git a/App/WallabagApp.swift b/App/WallabagApp.swift
@@ -14,15 +14,15 @@ struct WallabagApp: App {
     #endif
 
     @InjectedObject(\.wallabagPlusStore) private var wallabagPlusStore
-    @Injected(\.appState) private var appState
-    @Injected(\.router) private var router
+    @InjectedObject(\.appState) private var appState
+    @InjectedObject(\.router) private var router
     #if os(iOS)
-        @Injected(\.playerPublisher) private var playerPublisher
+        @InjectedObject(\.playerPublisher) private var playerPublisher
     #endif
-    @Injected(\.errorHandler) private var errorHandler
-    @Injected(\.appSync) private var appSync
+    @InjectedObject(\.errorHandler) private var errorHandler
+    @InjectedObject(\.appSync) private var appSync
+    @InjectedObject(\.appSetting) private var appSetting
     @Injected(\.coreDataSync) private var coreDataSync
-    @Injected(\.appSetting) private var appSetting
     @Injected(\.coreData) private var coreData
 
     var body: some Scene {

diff --git a/wallabag.xcodeproj/project.pbxproj b/wallabag.xcodeproj/project.pbxproj
@@ -845,7 +845,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1240;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1520;
 				TargetAttributes = {
 					094AA03A2629EB1F006E5605 = {
 						CreatedOnToolsVersion = 12.4;

diff --git a/wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme b/wallabag.xcodeproj/xcshareddata/xcschemes/bagit.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction

diff --git a/wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme b/wallabag.xcodeproj/xcshareddata/xcschemes/wallabag.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1510"
+   LastUpgradeVersion = "1520"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -83,7 +83,7 @@
          </BuildableReference>
       </BuildableProductRunnable>
       <StoreKitConfigurationFileReference
-         identifier = "../App/WallabagStoreKit.storekit">
+         identifier = "../../App/WallabagStoreKit.storekit">
       </StoreKitConfigurationFileReference>
    </LaunchAction>
    <ProfileAction