Several fixes

Source/Hollow.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -73,15 +73,6 @@
           "version": "1.8.1"
         }
       },
-      {
-        "package": "Introspect",
-        "repositoryURL": "https://github.com/siteline/SwiftUI-Introspect.git",
-        "state": {
-          "branch": null,
-          "revision": "2e09be8af614401bc9f87d40093ec19ce56ccaf2",
-          "version": "0.1.3"
-        }
-      },
       {
         "package": "WaterfallGrid",
         "repositoryURL": "https://github.com/paololeonardi/WaterfallGrid.git",

Source/Hollow/App/HollowApp.swift

@@ -32,8 +32,6 @@ struct HollowApp: App {
             }
             // Set larger size category for macOS
             .conditionalSizeCategory()
-//            // Inject the app model into the environment
-//            .environmentObject(appModel)
             // Set the color scheme when appear
             .onAppear {
                 IntegrationUtilities.setCustomColorScheme()
@@ -44,7 +42,7 @@ struct HollowApp: App {
                 NotificationCenter.default.publisher(for: UIApplication.didBecomeActiveNotification),
                 perform: { _ in
                     appDelegate.fetchConfig()
-                    if appModel.widgetReloadCount % 3 == 0 {
+                    if appModel.widgetReloadCount % 3 == 1 {
                         WidgetCenter.shared.reloadAllTimelines()
                         appModel.widgetReloadCount += 1
                     }

Source/Hollow/View/Hierarchy/Account/SettingsSubViews.swift

@@ -332,7 +332,7 @@ struct PushNotificationSettingsView: View {
             })
     }
 
-    class ViewModel: ObservableObject, AppModelEnvironment {
+    class ViewModel: ObservableObject, HollowErrorHandler {
         @Published var isLoading = false
         @Published var notificationType = Defaults[.notificationTypeCache]
         @Published var tempNotificationType = Defaults[.notificationTypeCache]

Source/Hollow/View/Hierarchy/Hollow/Content/HollowTextView.swift

@@ -8,7 +8,6 @@
 
 import SwiftUI
 import Defaults
-import Introspect
 
 struct HollowTextView: View {
     var text: String

Source/Hollow/View/Hierarchy/Hollow/Detail/HollowDetailView.swift

@@ -7,7 +7,6 @@
 
 import SwiftUI
 import Defaults
-import Introspect
 
 struct HollowDetailView: View {
     @ObservedObject var store: HollowDetailStore
@@ -129,7 +128,6 @@ struct HollowDetailView: View {
                     }
 
                 }
-                .introspectTableView(customize: { $0.backgroundColor = nil })
                 .background(Color.hollowCardBackground)
                 .coordinateSpace(name: "detail.scrollview")
                 .buttonStyle(BorderlessButtonStyle())

Source/Hollow/View/Hierarchy/Main/MainView.swift

@@ -23,8 +23,6 @@ struct MainView: View {
 
     let overlayTransition = AnyTransition.asymmetric(insertion: .opacity, removal: .scaleAndOpacity)
     @Namespace var namespace
-
-    @Environment(\.colorScheme) var colorScheme
 
     var body: some View {
         ZStack {

Source/Hollow/View/Integration/IntegrationUtilities.swift

@@ -79,7 +79,7 @@ struct IntegrationUtilities {
                 store = detailVC.store
             }
         } else {
-            if let detailVC = topViewController() as? HollowDetailViewController {
+            if let detailVC = getDetailVC() {
                 store = detailVC.store
             }
         }
@@ -158,4 +158,8 @@ extension IntegrationUtilities {
         vc.view.backgroundColor = nil
         navigationVC.pushViewController(vc, animated: true)
     }
+
+    static private func getDetailVC() -> HollowDetailViewController? {
+        return (topViewController() as? UINavigationController)?.topViewController as? HollowDetailViewController
+    }
 }

Source/Hollow/App/AppModelEnvironment.swift → Source/Hollow/ViewModel/HollowErrorHandler.swift

@@ -1,5 +1,5 @@
 //
-//  AppModelEnvironment.swift
+//  HollowErrorHandler.swift
 //  Hollow
 //
 //  Created by liang2kl on 2021/2/15.
@@ -10,9 +10,9 @@ import SwiftUI
 import Defaults
 
 /// Protocol for a view model which protentially modify the shared `AppModel` instance.
-protocol AppModelEnvironment: ObservableObject {}
+protocol HollowErrorHandler: ObservableObject {}
 
-extension AppModelEnvironment {
+extension HollowErrorHandler {
     /// Default implementation to handle token expire error.
     ///
     /// - parameter error: The request error

Source/Hollow/en.lproj/Localizable.strings

@@ -659,9 +659,9 @@
 
 "SETTINGSVIEW_APPEARANCE_BLURRED_IMG_BG" = "Blurred Image Background";
 
-"HOLLOWDETAIL_COMMENTS_ORDER_OLD_TO_NEW" = "Old to New";
+"HOLLOWDETAIL_COMMENTS_ORDER_OLD_TO_NEW" = "OLD TO NEW";
 
-"HOLLOWDETAIL_COMMENTS_ORDER_NEW_TO_OLD" = "New to Old";
+"HOLLOWDETAIL_COMMENTS_ORDER_NEW_TO_OLD" = "NEW TO OLD";
 
 "COMMENT_VIEW_SHOW_ONLY_LABEL" = "Show this Person Only";
 

Source/HollowMac/App/AppModelEnvironment.swift → Source/HollowMac/App/HollowErrorHandler.swift

@@ -1,5 +1,5 @@
 //
-//  AppModelEnvironment.swift
+//  HollowErrorHandler.swift
 //  HollowMac
 //
 //  Created by liang2kl on 2021/4/24.
@@ -9,11 +9,10 @@
 import SwiftUI
 import Defaults
 
-protocol AppModelEnvironment: ObservableObject {
-    var appModelState: AppModelState { get set }
+protocol HollowErrorHandler: ObservableObject {
 }
 
-extension AppModelEnvironment {
+extension HollowErrorHandler {
     /// Default implementation to handle token expire error.
     ///
     /// - parameter error: The request error

Source/HollowMac/View/Hierarchy/Login/LoginView.swift

@@ -116,8 +116,6 @@ struct LoginView: View {
             .disabled(disableButton)
         }
         .errorAlert($store.errorMessage)
-
-        .modifier(AppModelBehaviour(state: store.appModelState))
     }
 }
 

Source/Shared/ViewModel/Account/AccountInfoStore.swift

@@ -10,7 +10,7 @@ import SwiftUI
 import Combine
 import Defaults
 
-class AccountInfoStore: ObservableObject, AppModelEnvironment {
+class AccountInfoStore: ObservableObject, HollowErrorHandler {
     @Published var errorMessage: (title: String, message: String)?
     @Published var isLoading = false
 

Source/Shared/ViewModel/Account/DeviceListStore.swift

@@ -11,7 +11,7 @@ import Combine
 import SwiftUI
 import Defaults
 
-class DeviceListStore: ObservableObject, AppModelEnvironment {
+class DeviceListStore: ObservableObject, HollowErrorHandler {
     @Published var deviceData: DeviceListRequestResultData
     @Published var isLoading: Bool = false
     @Published var loggingoutUUID: String?

Source/Shared/ViewModel/Account/MessageStore.swift

@@ -10,7 +10,7 @@ import Combine
 import Defaults
 import SwiftUI
 
-class MessageStore: ObservableObject, AppModelEnvironment {
+class MessageStore: ObservableObject, HollowErrorHandler {
     @Published var messages: [SystemMessage] = []
     @Published var errorMessage: (title: String, message: String)?
     @Published var isLoading = false

Source/Shared/ViewModel/Hollow/HollowDetailStore.swift

@@ -14,7 +14,7 @@ import Defaults
 import Connectivity
 #endif
 
-class HollowDetailStore: ObservableObject, ImageCompressStore, AppModelEnvironment {
+class HollowDetailStore: ObservableObject, ImageCompressStore, HollowErrorHandler {
     // MARK: Post Variables
     var bindingPostWrapper: Binding<PostDataWrapper>
     @Published var postDataWrapper: PostDataWrapper

Source/Shared/ViewModel/Hollow/HollowInputStore.swift

@@ -11,7 +11,7 @@ import Combine
 import SwiftUI
 import Defaults
 
-class HollowInputStore: ObservableObject, AppModelEnvironment, ImageCompressStore {
+class HollowInputStore: ObservableObject, HollowErrorHandler, ImageCompressStore {
     var presented: Binding<Bool>
     var selfDismiss: Bool
     var refreshHandler: (() -> Void)?

Source/Shared/ViewModel/Hollow/PostListRequestStore.swift

@@ -12,7 +12,7 @@ import Combine
 
 /// Shared view model for views that request `PostList`, `Search`, `AttentionList`
 /// and `AttentionListSearch`.
-class PostListRequestStore: ObservableObject, AppModelEnvironment {
+class PostListRequestStore: ObservableObject, HollowErrorHandler {
 
     // MARK: - Shared Variables
     let type: PostListRequestGroupType

Source/Shared/ViewModel/Login/LoginStore.swift

@@ -12,7 +12,7 @@ import SwiftUI
 import Defaults
 
 /// View model for `LoginView`
-class LoginStore: ObservableObject, AppModelEnvironment {
+class LoginStore: ObservableObject, HollowErrorHandler {
 
     @Published var showsRecaptcha = false
     @Published var reCAPTCHAToken: String = ""

Source/Shared/ViewModel/Login/UnregisterStore.swift

@@ -10,7 +10,7 @@ import Combine
 import Defaults
 import SwiftUI
 
-class UnregisterStore: ObservableObject, AppModelEnvironment {
+class UnregisterStore: ObservableObject, HollowErrorHandler {
     var presented: Binding<Bool>
     @Published var email = "" {
         didSet { if email != oldValue { restore() } }