新增性能选项

Lessica · Jan 1, 2024 · 84a3b03 · 84a3b03
1 parent f4574cf
commit 84a3b03
Show file tree

Hide file tree

Showing 13 changed files with 186 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -4,6 +4,10 @@
 
 Reveil is a replication of [Unveil](https://unveilapp.com) in pure SwiftUI.
 
+**IMPORTANT**: iOS 15 and above is required.
+
+> Currently, Reveil is in early development, and we are working hard to make it better.
+
 ![Screenshot](./Artworks/Screenshot.png)
 
 ## Why we developed this again?

diff --git a/Reveil.xcodeproj/project.pbxproj b/Reveil.xcodeproj/project.pbxproj
@@ -38,6 +38,8 @@
 		0FA065812B3D83E6000A7ECE /* ObjCClassItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F16593C2AFA702C00268572 /* ObjCClassItem.swift */; };
 		0FA065822B3D83E6000A7ECE /* URLSchemeItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0F1659392AF9FD4500268572 /* URLSchemeItem.swift */; };
 		0FA065852B3D8436000A7ECE /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = 0FA065842B3D8436000A7ECE /* ArgumentParser */; };
+		0FA065872B42803B000A7ECE /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 0FA065862B42803B000A7ECE /* Settings.bundle */; };
+		0FA065892B4282BC000A7ECE /* StandardUserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FA065882B4282BC000A7ECE /* StandardUserDefaults.swift */; };
 		0FD0D2682AE0CB27001DD1E8 /* Entry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD0D2672AE0CB27001DD1E8 /* Entry.swift */; };
 		0FD0D26A2AE0CD95001DD1E8 /* Dashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD0D2692AE0CD95001DD1E8 /* Dashboard.swift */; };
 		0FD0D26C2AE0D39C001DD1E8 /* EntryExporter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0FD0D26B2AE0D39C001DD1E8 /* EntryExporter.swift */; };
@@ -222,6 +224,8 @@
 		0F7E1A582AD5976A0016F31A /* NetworkUsageListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkUsageListView.swift; sourceTree = "<group>"; };
 		0FA065782B3D8363000A7ECE /* ReveilHelper */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = ReveilHelper; sourceTree = BUILT_PRODUCTS_DIR; };
 		0FA0657A2B3D8363000A7ECE /* PresetsHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PresetsHelper.swift; sourceTree = "<group>"; };
+		0FA065862B42803B000A7ECE /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
+		0FA065882B4282BC000A7ECE /* StandardUserDefaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StandardUserDefaults.swift; sourceTree = "<group>"; };
 		0FD0D2672AE0CB27001DD1E8 /* Entry.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Entry.swift; sourceTree = "<group>"; };
 		0FD0D2692AE0CD95001DD1E8 /* Dashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dashboard.swift; sourceTree = "<group>"; };
 		0FD0D26B2AE0D39C001DD1E8 /* EntryExporter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryExporter.swift; sourceTree = "<group>"; };
@@ -408,6 +412,7 @@
 				0F4955F42ADAD2F200227265 /* DefaultsWriter.swift */,
 				0F4955F52ADAD2F200227265 /* PropertyListRepresentable.swift */,
 				0F4955F32ADAD2F200227265 /* AppCodableStorage.swift */,
+				0FA065882B4282BC000A7ECE /* StandardUserDefaults.swift */,
 			);
 			path = Storage;
 			sourceTree = "<group>";
@@ -492,6 +497,7 @@
 				CC21B5242ACD4B87003EC114 /* rsc-005-ipad-models.json */,
 				CC21B5252ACD4B87003EC114 /* rsc-006-ipod-models.json */,
 				0F0819372ADAE97200BB626C /* PinStorage.plist */,
+				0FA065862B42803B000A7ECE /* Settings.bundle */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -891,6 +897,7 @@
 				CC21B4BD2ACAE5E5003EC114 /* Localizable.strings in Resources */,
 				CC21B52A2ACD4B87003EC114 /* rsc-005-ipad-models.json in Resources */,
 				0F0819382ADAE97200BB626C /* PinStorage.plist in Resources */,
+				0FA065872B42803B000A7ECE /* Settings.bundle in Resources */,
 				CC4AE2BC2ACAA4B500DA23AC /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -976,6 +983,7 @@
 				CCA095F92AEE219300F5E55F /* CheckResult.swift in Sources */,
 				0F16593D2AFA702C00268572 /* ObjCClassItem.swift in Sources */,
 				0F4955DE2AD83A3800227265 /* NetworkDetailsListView.swift in Sources */,
+				0FA065892B4282BC000A7ECE /* StandardUserDefaults.swift in Sources */,
 				CC21B5492ACE809D003EC114 /* MemoryInformation.swift in Sources */,
 				0F4955F62ADAD2F200227265 /* DefaultsKeyObservation.swift in Sources */,
 				CC21B4EA2ACB1E9E003EC114 /* TrafficWidget.swift in Sources */,

diff --git a/Reveil/Resources/Settings.bundle/Root.plist b/Reveil/Resources/Settings.bundle/Root.plist
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>StringsTable</key>
+	<string>Root</string>
+	<key>PreferenceSpecifiers</key>
+	<array>
+		<dict>
+			<key>Type</key>
+			<string>PSGroupSpecifier</string>
+			<key>Title</key>
+			<string>Performance</string>
+			<key>FooterText</key>
+			<string>Restart “Reveil” to make things happen.</string>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Animated Text</string>
+			<key>Key</key>
+			<string>AnimatedText</string>
+			<key>DefaultValue</key>
+			<true/>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Animated Background</string>
+			<key>Key</key>
+			<string>AnimatedBackground</string>
+			<key>DefaultValue</key>
+			<true/>
+		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSToggleSwitchSpecifier</string>
+			<key>Title</key>
+			<string>Limit Frame Rate to 30</string>
+			<key>Key</key>
+			<string>LowFrameRate</string>
+			<key>DefaultValue</key>
+			<false/>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/Reveil/Resources/Settings.bundle/en.lproj/Root.strings b/Reveil/Resources/Settings.bundle/en.lproj/Root.strings
diff --git a/Reveil/Resources/Settings.bundle/zh_Hans.lproj/Root.strings b/Reveil/Resources/Settings.bundle/zh_Hans.lproj/Root.strings
diff --git a/Reveil/Storage/AppCodableStorage.swift b/Reveil/Storage/AppCodableStorage.swift
@@ -1,3 +1,10 @@
+//
+//  AppCodableStorage.swift
+//  Reveil
+//
+//  Created by Lessica on 2023/10/14.
+//
+
 import SwiftUI
 
 @MainActor

diff --git a/Reveil/Storage/DefaultsKeyObservation.swift b/Reveil/Storage/DefaultsKeyObservation.swift
@@ -1,3 +1,10 @@
+//
+//  DefaultsKeyObservation.swift
+//  Reveil
+//
+//  Created by Lessica on 2023/10/14.
+//
+
 import Foundation
 
 /// API to observe UserDefaults with a `String` key (not `KeyPath`),  as `AppStorage` and `.string( forKey:)` use

diff --git a/Reveil/Storage/DefaultsWriter.swift b/Reveil/Storage/DefaultsWriter.swift
@@ -1,3 +1,10 @@
+//
+//  DefaultsWriter.swift
+//  Reveil
+//
+//  Created by Lessica on 2023/10/14.
+//
+
 import Combine
 import Foundation
 

diff --git a/Reveil/Storage/PropertyListRepresentable.swift b/Reveil/Storage/PropertyListRepresentable.swift
@@ -1,3 +1,10 @@
+//
+//  PropertyListRepresentable.swift
+//  Reveil
+//
+//  Created by Lessica on 2023/10/14.
+//
+
 import DictionaryCoder
 import Foundation
 

diff --git a/Reveil/Storage/StandardUserDefaults.swift b/Reveil/Storage/StandardUserDefaults.swift
@@ -0,0 +1,36 @@
+//
+//  StandardUserDefaults.swift
+//  Reveil
+//
+//  Created by Lessica on 2024/1/1.
+//
+
+import Foundation
+
+private let gDefaultsKeyAnimatedText = "AnimatedText"
+private let gDefaultsKeyAnimatedBackground = "AnimatedBackground"
+private let gDefaultsKeyLowFrameRate = "LowFrameRate"
+
+class StandardUserDefaults {
+    static let shared = StandardUserDefaults()
+
+    private init() {
+        UserDefaults.standard.register(defaults: [
+            gDefaultsKeyAnimatedText: true,
+            gDefaultsKeyAnimatedBackground: true,
+            gDefaultsKeyLowFrameRate: false,
+        ])
+    }
+
+    lazy var isAnimatedTextEnabled: Bool = {
+        UserDefaults.standard.bool(forKey: gDefaultsKeyAnimatedText)
+    }()
+
+    lazy var isAnimatedBackgroundEnabled: Bool = {
+        UserDefaults.standard.bool(forKey: gDefaultsKeyAnimatedBackground)
+    }()
+
+    lazy var isLowFrameRateEnabled: Bool = {
+        UserDefaults.standard.bool(forKey: gDefaultsKeyLowFrameRate)
+    }()
+}
diff --git a/Reveil/Views/AnimatedText.swift b/Reveil/Views/AnimatedText.swift
@@ -13,11 +13,19 @@ struct AnimatedText: View {
         self.text = text
     }
 
+    var isAnimatedTextEnabled: Bool {
+        StandardUserDefaults.shared.isAnimatedTextEnabled && !ProcessInfo.processInfo.isLowPowerModeEnabled
+    }
+
     var body: some View {
-        if #available(iOS 16.0, *) {
-            Text(text)
-                .contentTransition(.numericText())
-                .animation(.spring(duration: 0.2), value: text)
+        if isAnimatedTextEnabled {
+            if #available(iOS 17.0, *) {
+                Text(text)
+                    .contentTransition(.numericText())
+                    .animation(.spring(duration: 0.2), value: text)
+            } else {
+                Text(text)
+            }
         } else {
             Text(text)
         }

diff --git a/Reveil/Views/ColorfulBackground.swift b/Reveil/Views/ColorfulBackground.swift
@@ -8,26 +8,37 @@
 import ColorfulX
 import SwiftUI
 
+
 struct ColorfulBackground: View {
     @Environment(\.colorScheme) var colorScheme
 
+    var isAnimatedBackgroundEnabled: Bool {
+        StandardUserDefaults.shared.isAnimatedBackgroundEnabled && !ProcessInfo.processInfo.isLowPowerModeEnabled
+    }
+
+    var isLowFrameRateEnabled: Bool = StandardUserDefaults.shared.isLowFrameRateEnabled
+
+    var colorfulView: some View {
+        if colorScheme == .light {
+            ColorfulView(
+                color: .constant(ColorfulPreset.winter.colors),
+                speed: isAnimatedBackgroundEnabled ? .constant(0.5) : .constant(0),
+                frameLimit: isLowFrameRateEnabled ? 30 : 60
+            )
+            .opacity(0.5)
+        } else {
+            ColorfulView(
+                color: .constant(ColorfulPreset.aurora.colors),
+                speed: isAnimatedBackgroundEnabled ? .constant(0.5) : .constant(0),
+                frameLimit: isLowFrameRateEnabled ? 30 : 60
+            )
+            .opacity(0.25)
+        }
+    }
+
     var body: some View {
         Group {
-            if colorScheme == .light { // recreate pls
-                ColorfulView(
-                    color: .constant(ColorfulPreset.winter.colors),
-                    speed: .constant(0.5),
-                    frameLimit: 60
-                )
-                .opacity(0.5)
-            } else {
-                ColorfulView(
-                    color: .constant(ColorfulPreset.aurora.colors),
-                    speed: .constant(0.5),
-                    frameLimit: 60
-                )
-                .opacity(0.25)
-            }
+            self.colorfulView
         }
         .background(Color(PlatformColor.systemBackground))
         .ignoresSafeArea()

diff --git a/Reveil/Views/Dashboard/CheckmarkWidget.swift b/Reveil/Views/Dashboard/CheckmarkWidget.swift
@@ -5,12 +5,19 @@
 //  Created by Lessica on 2023/10/3.
 //
 
+import ColorfulX
 import SwiftUI
 
 struct CheckmarkWidget: View {
     @StateObject var securityModel: Security = .shared
     @State var openDetail: Bool = false
 
+    var isAnimatedBackgroundEnabled: Bool {
+        StandardUserDefaults.shared.isAnimatedBackgroundEnabled && !ProcessInfo.processInfo.isLowPowerModeEnabled
+    }
+
+    var isLowFrameRateEnabled: Bool = StandardUserDefaults.shared.isLowFrameRateEnabled
+
     var label: String { securityModel.description }
     var isLoading: Bool { securityModel.isLoading }
     var isInsecure: Bool { securityModel.isInsecure }
@@ -25,17 +32,19 @@ struct CheckmarkWidget: View {
         ).capitalized
     }
 
-    var backgroundColor: Color {
-        if isInsecure { return Color("SecurityLeaks") }
-        return Color(PlatformColor.secondarySystemBackgroundAlias)
-    }
-
-    var labelColor: Color {
-        return isInsecure ? .white : .primary
+    var animatedBackgroundColors: [Color] {
+        if isLoading { return ColorfulPreset.aurora.colors }
+        if isInsecure { return [.red, .pink, .red, .pink] }
+        return [.accent, .accent, .accent, .accent]
     }
 
-    var descriptionColor: Color {
-        return isInsecure ? .white : .accent
+    var colorfulBackground: some View {
+        ColorfulView(
+            color: .init(get: { animatedBackgroundColors }, set: { _ in }),
+            speed: isAnimatedBackgroundEnabled ? .constant(0.5) : .constant(0),
+            transitionInterval: isAnimatedBackgroundEnabled ? .constant(1) : .constant(0),
+            frameLimit: isLowFrameRateEnabled ? 30 : 60
+        )
     }
 
     var body: some View {
@@ -51,7 +60,6 @@ struct CheckmarkWidget: View {
                         .font(Font.system(.body).weight(.regular))
                 }
             }
-            .foregroundColor(labelColor)
 
             HStack {
                 Image(systemName: isLoading ? "magnifyingglass.circle.fill" : (isInsecure ? "xmark.circle.fill" : "checkmark.circle.fill"))
@@ -61,19 +69,14 @@ struct CheckmarkWidget: View {
                     .lineLimit(1)
                 Spacer()
             }
-            .foregroundColor(descriptionColor)
         }
+        .foregroundColor(.white)
         .frame(maxWidth: .infinity, alignment: .leading)
         .padding(.all, 12)
-        .background(
-            RoundedRectangle(cornerRadius: 4)
-                .foregroundColor(backgroundColor)
-                .opacity(isInsecure ? 0.75 : 0.25)
-        )
-        .overlay {
-            RoundedRectangle(cornerRadius: 4)
-                .stroke(Color(PlatformColor.separatorAlias), lineWidth: 1)
-                .opacity(isInsecure ? 0 : 1)
+        .background {
+            self.colorfulBackground
+                .opacity(0.75)
+                .clipShape(RoundedRectangle(cornerRadius: 4))
         }
         .onChange(of: isLoading) { _ in
             if isLoading { openDetail = false }