Merge pull request #334 from EhPanda-Team/develop

Bugfixes
EhPanda-Team · Jun 3, 2023 · ac4a6ed · ac4a6ed
2 parents a229d8b + 90c1bc7
commit ac4a6ed
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 56 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_14.3.app
-  APP_VERSION: '2.7.0'
+  APP_VERSION: '2.7.1'
   SCHEME_NAME: 'EhPanda'
   ALTSTORE_JSON_PATH: './AltStore.json'
   BUILDS_PATH: '/tmp/action-builds'

diff --git a/EhPanda/DataFlow/AppLockReducer.swift b/EhPanda/DataFlow/AppLockReducer.swift
@@ -36,7 +36,7 @@ struct AppLockReducer: ReducerProtocol {
             switch action {
             case .onBecomeActive(let threshold, let blurRadius):
                 if let date = state.becameInactiveDate, threshold >= 0,
-                   Date().timeIntervalSince(date) > Double(threshold)
+                   Date.now.timeIntervalSince(date) >= Double(threshold)
                 {
                     return .merge(
                         .init(value: .authorize),

diff --git a/EhPanda/DataFlow/AppReducer.swift b/EhPanda/DataFlow/AppReducer.swift
@@ -56,18 +56,21 @@ struct AppReducer: ReducerProtocol {
                     return .none
 
                 case .onScenePhaseChange(let scenePhase):
+                    guard state.settingState.hasLoadedInitialSetting else { return .none }
+
                     switch scenePhase {
                     case .active:
                         let threshold = state.settingState.setting.autoLockPolicy.rawValue
                         let blurRadius = state.settingState.setting.backgroundBlurRadius
                         return .init(value: .appLock(.onBecomeActive(threshold, blurRadius)))
+
                     case .inactive:
                         let blurRadius = state.settingState.setting.backgroundBlurRadius
                         return .init(value: .appLock(.onBecomeInactive(blurRadius)))
+
                     default:
-                        break
+                        return .none
                     }
-                    return .none
 
                 case .appDelegate(.migration(.onDatabasePreparationSuccess)):
                     return .merge(

diff --git a/EhPanda/View/Detail/DetailReducer.swift b/EhPanda/View/Detail/DetailReducer.swift
@@ -363,58 +363,58 @@ struct DetailReducer: ReducerProtocol {
                     return .none
                 }
             }
+            .ifLet(
+                \.commentsState,
+                action: /Action.comments,
+                then: CommentsReducer.init
+            )
+            .ifLet(
+                \.detailSearchState,
+                action: /Action.detailSearch,
+                then: DetailSearchReducer.init
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.detailSearch,
+                hapticsClient: hapticsClient,
+                style: .soft
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.postComment,
+                hapticsClient: hapticsClient
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.tagDetail,
+                hapticsClient: hapticsClient
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.torrents,
+                hapticsClient: hapticsClient
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.archives,
+                hapticsClient: hapticsClient
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.reading,
+                hapticsClient: hapticsClient
+            )
+            .haptics(
+                unwrapping: \.route,
+                case: /Route.share,
+                hapticsClient: hapticsClient
+            )
+
+            Scope(state: \.readingState, action: /Action.reading, child: ReadingReducer.init)
+            Scope(state: \.archivesState, action: /Action.archives, child: ArchivesReducer.init)
+            Scope(state: \.torrentsState, action: /Action.torrents, child: TorrentsReducer.init)
+            Scope(state: \.previewsState, action: /Action.previews, child: PreviewsReducer.init)
+            Scope(state: \.galleryInfosState, action: /Action.galleryInfos, child: GalleryInfosReducer.init)
         }
-        .ifLet(
-            \.commentsState,
-            action: /Action.comments,
-            then: CommentsReducer.init
-        )
-        .ifLet(
-            \.detailSearchState,
-            action: /Action.detailSearch,
-            then: DetailSearchReducer.init
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.detailSearch,
-            hapticsClient: hapticsClient,
-            style: .soft
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.postComment,
-            hapticsClient: hapticsClient
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.tagDetail,
-            hapticsClient: hapticsClient
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.torrents,
-            hapticsClient: hapticsClient
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.archives,
-            hapticsClient: hapticsClient
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.reading,
-            hapticsClient: hapticsClient
-        )
-        .haptics(
-            unwrapping: \.route,
-            case: /Route.share,
-            hapticsClient: hapticsClient
-        )
-
-        Scope(state: \.readingState, action: /Action.reading, child: ReadingReducer.init)
-        Scope(state: \.archivesState, action: /Action.archives, child: ArchivesReducer.init)
-        Scope(state: \.torrentsState, action: /Action.torrents, child: TorrentsReducer.init)
-        Scope(state: \.previewsState, action: /Action.previews, child: PreviewsReducer.init)
-        Scope(state: \.galleryInfosState, action: /Action.galleryInfos, child: GalleryInfosReducer.init)
     }
 }
diff --git a/EhPanda/View/Setting/SettingReducer.swift b/EhPanda/View/Setting/SettingReducer.swift
@@ -26,6 +26,8 @@ struct SettingReducer: ReducerProtocol {
         var tagTranslator = TagTranslator()
         var user = User()
 
+        var hasLoadedInitialSetting = false
+
         @BindingState var route: Route?
         var tagTranslatorLoadingState: LoadingState = .idle
 
@@ -263,6 +265,7 @@ struct SettingReducer: ReducerProtocol {
                 return .merge(effects)
 
             case .loadUserSettingsDone:
+                state.hasLoadedInitialSetting = true
                 return .none
 
             case .createDefaultEhProfile: