tpuMerge branch 'main' of https://github.com/aheze/Setting

aheze · aheze · commit cbd6bd70c183 · 2023-02-24T10:39:10.000-08:00
diff --git a/Example/SettingExample.xcodeproj/project.pbxproj b/Example/SettingExample.xcodeproj/project.pbxproj
@@ -282,7 +282,7 @@
 				CODE_SIGN_ENTITLEMENTS = SettingExample/SettingExample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = WV6XDLHK3W;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -296,10 +296,10 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 13.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aheze.SettingExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -319,7 +319,7 @@
 				CODE_SIGN_ENTITLEMENTS = SettingExample/SettingExample.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = WV6XDLHK3W;
+				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -333,10 +333,10 @@
 				"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
-				IPHONEOS_DEPLOYMENT_TARGET = 16.2;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
 				LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
 				"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 13.0;
+				MACOSX_DEPLOYMENT_TARGET = 12.0;
 				MARKETING_VERSION = 1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.aheze.SettingExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
diff --git a/Example/SettingExample/PreferencesView.swift b/Example/SettingExample/PreferencesView.swift
@@ -176,7 +176,7 @@ struct PreferencesView: View {
                     ) {
                         SettingCustomView(id: "Color Picker Preview") {
                             VStack {
-                                if #available(iOS 16.0, macOS 12.0, *) {
+                                if #available(iOS 16.0, macOS 13.0, *) {
                                     Rectangle()
                                         .fill(Color(hex: model.color).gradient)
                                 } else {
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 **Compose beautiful preference panels.**
 
-- Simple but powerful syntax.
+- Simple but powerful syntax (powered by [result builders](https://www.hackingwithswift.com/swift/5.4/result-builders)).
 - Create nested pages and groups.
 - Fully searchable.
 - Native integration with SwiftUI and AppStorage.
@@ -259,6 +259,8 @@ SettingCustomView {
 }
 ```
 
+- Need to store custom structs in `AppStorage`? Check out @IanKeen's awesome [gist](https://gist.github.com/IanKeen/4d29b48519dca125b21675eeb7623d60)!
+
 - You can pass in a custom `SettingViewModel` instance for finer control.
 
 <table>
@@ -273,11 +275,7 @@ struct PlaygroundView: View {
         SettingStack(settingViewModel: settingViewModel) {
             SettingPage(title: "Playground") {
                 SettingGroup {
-                    SettingPicker(
-                        title: "Picker",
-                        choices: ["A", "B", "C", "D"],
-                        selectedIndex: $index
-                    )
+                    SettingText(title: "Welcome to Setting!")
                 }
             }
         } customNoResultsView: {
@@ -337,4 +335,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-```
+```
