From 8bcb4043281607dff3531459bafb39c694690381 Mon Sep 17 00:00:00 2001 From: Daniel Kloeck Date: Wed, 2 Nov 2022 13:23:18 +0100 Subject: [PATCH] fix #32: "anyView" on MacOS in InternalWrappingHStack + add osx example app --- .../InternalWrappingHStack.swift | 2 +- WrappingHStack.podspec | 2 +- .../project.pbxproj | 358 ++++++++++++++++++ .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../AccentColor.colorset/Contents.json | 0 .../AppIcon.appiconset/Contents.json | 58 +++ .../Assets.xcassets/Contents.json | 0 .../WrappingHStackExample/ExampleView.swift | 92 +++++ .../WrappingHStackExample.entitlements | 10 + .../WrappingHStackExampleApp.swift | 29 ++ .../project.pbxproj | 40 +- .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../AccentColor.colorset/Contents.json | 11 + .../AppIcon.appiconset/Contents.json | 0 .../Assets.xcassets/Contents.json | 6 + .../WrappingHStackExample/ExampleView.swift | 2 +- .../WrappingHStackExample/Info.plist | 0 .../WrappingHStackExampleApp.swift | 0 20 files changed, 597 insertions(+), 28 deletions(-) create mode 100644 WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.pbxproj rename {WrappingHStackExample => WrappingHStackExample-OSX}/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {WrappingHStackExample => WrappingHStackExample-OSX}/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {WrappingHStackExample => WrappingHStackExample-OSX}/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json (100%) create mode 100644 WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json rename {WrappingHStackExample => WrappingHStackExample-OSX}/WrappingHStackExample/Assets.xcassets/Contents.json (100%) create mode 100644 WrappingHStackExample-OSX/WrappingHStackExample/ExampleView.swift create mode 100644 WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExample.entitlements create mode 100644 WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExampleApp.swift rename {WrappingHStackExample => WrappingHStackExample-iOS}/WrappingHStackExample.xcodeproj/project.pbxproj (86%) create mode 100644 WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json rename {WrappingHStackExample => WrappingHStackExample-iOS}/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) create mode 100644 WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/Contents.json rename WrappingHStackExample/WrappingHStackExample/ContentView.swift => WrappingHStackExample-iOS/WrappingHStackExample/ExampleView.swift (98%) rename {WrappingHStackExample => WrappingHStackExample-iOS}/WrappingHStackExample/Info.plist (100%) rename {WrappingHStackExample => WrappingHStackExample-iOS}/WrappingHStackExample/WrappingHStackExampleApp.swift (100%) diff --git a/Sources/WrappingHStack/InternalWrappingHStack.swift b/Sources/WrappingHStack/InternalWrappingHStack.swift index 2d01759..9229ad9 100644 --- a/Sources/WrappingHStack/InternalWrappingHStack.swift +++ b/Sources/WrappingHStack/InternalWrappingHStack.swift @@ -75,7 +75,7 @@ struct InternalWrappingHStack: View { #if os(iOS) return UIHostingController(rootView: view).sizeThatFits(in: CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)).width > 0 #else - return NSHostingController(rootView: anyView).sizeThatFits(in: CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)).width > 0 + return NSHostingController(rootView: view).sizeThatFits(in: CGSize(width: CGFloat.greatestFiniteMagnitude, height: CGFloat.greatestFiniteMagnitude)).width > 0 #endif } diff --git a/WrappingHStack.podspec b/WrappingHStack.podspec index 54615a3..936e6fe 100644 --- a/WrappingHStack.podspec +++ b/WrappingHStack.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'WrappingHStack' - s.version = '2.2.2' + s.version = '2.2.5' s.summary = 'Like HStack, but automatically positions overflowing elements on next lines.' s.description = <<-DESC WrappingHStack is a UI Element that works in a very similar way to HStack, but automatically positions overflowing elements on next lines. diff --git a/WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.pbxproj b/WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.pbxproj new file mode 100644 index 0000000..8328b55 --- /dev/null +++ b/WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.pbxproj @@ -0,0 +1,358 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXBuildFile section */ + AF37EE272912918900B4B709 /* WrappingHStackExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF37EE262912918900B4B709 /* WrappingHStackExampleApp.swift */; }; + AF37EE292912918900B4B709 /* ExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF37EE282912918900B4B709 /* ExampleView.swift */; }; + AF37EE2B2912918900B4B709 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AF37EE2A2912918900B4B709 /* Assets.xcassets */; }; + AF37EE5B291295ED00B4B709 /* WrappingHStack in Frameworks */ = {isa = PBXBuildFile; productRef = AF37EE5A291295ED00B4B709 /* WrappingHStack */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + AF37EE232912918900B4B709 /* WrappingHStackExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WrappingHStackExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; + AF37EE262912918900B4B709 /* WrappingHStackExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrappingHStackExampleApp.swift; sourceTree = ""; }; + AF37EE282912918900B4B709 /* ExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleView.swift; sourceTree = ""; }; + AF37EE2A2912918900B4B709 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + AF37EE2F2912918900B4B709 /* WrappingHStackExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WrappingHStackExample.entitlements; sourceTree = ""; }; + AF37EE42291293EA00B4B709 /* WrappingHStack */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = WrappingHStack; path = ..; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + AF37EE202912918900B4B709 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + AF37EE5B291295ED00B4B709 /* WrappingHStack in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + AF37EE1A2912918900B4B709 = { + isa = PBXGroup; + children = ( + AF37EE42291293EA00B4B709 /* WrappingHStack */, + AF37EE252912918900B4B709 /* WrappingHStackExample */, + AF37EE242912918900B4B709 /* Products */, + ); + sourceTree = ""; + }; + AF37EE242912918900B4B709 /* Products */ = { + isa = PBXGroup; + children = ( + AF37EE232912918900B4B709 /* WrappingHStackExample.app */, + ); + name = Products; + sourceTree = ""; + }; + AF37EE252912918900B4B709 /* WrappingHStackExample */ = { + isa = PBXGroup; + children = ( + AF37EE262912918900B4B709 /* WrappingHStackExampleApp.swift */, + AF37EE282912918900B4B709 /* ExampleView.swift */, + AF37EE2A2912918900B4B709 /* Assets.xcassets */, + AF37EE2F2912918900B4B709 /* WrappingHStackExample.entitlements */, + ); + path = WrappingHStackExample; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + AF37EE222912918900B4B709 /* WrappingHStackExample */ = { + isa = PBXNativeTarget; + buildConfigurationList = AF37EE322912918900B4B709 /* Build configuration list for PBXNativeTarget "WrappingHStackExample" */; + buildPhases = ( + AF37EE1F2912918900B4B709 /* Sources */, + AF37EE202912918900B4B709 /* Frameworks */, + AF37EE212912918900B4B709 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = WrappingHStackExample; + packageProductDependencies = ( + AF37EE5A291295ED00B4B709 /* WrappingHStack */, + ); + productName = WrappingHStackExample; + productReference = AF37EE232912918900B4B709 /* WrappingHStackExample.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + AF37EE1B2912918900B4B709 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + LastSwiftUpdateCheck = 1400; + LastUpgradeCheck = 1400; + TargetAttributes = { + AF37EE222912918900B4B709 = { + CreatedOnToolsVersion = 14.0.1; + }; + }; + }; + buildConfigurationList = AF37EE1E2912918900B4B709 /* Build configuration list for PBXProject "WrappingHStackExample" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = AF37EE1A2912918900B4B709; + packageReferences = ( + AF37EE59291295ED00B4B709 /* XCRemoteSwiftPackageReference "WrappingHStack" */, + ); + productRefGroup = AF37EE242912918900B4B709 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + AF37EE222912918900B4B709 /* WrappingHStackExample */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + AF37EE212912918900B4B709 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + AF37EE2B2912918900B4B709 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + AF37EE1F2912918900B4B709 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + AF37EE292912918900B4B709 /* ExampleView.swift in Sources */, + AF37EE272912918900B4B709 /* WrappingHStackExampleApp.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + AF37EE302912918900B4B709 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 12.3; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + AF37EE312912918900B4B709 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 12.3; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + AF37EE332912918900B4B709 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = WrappingHStackExample/WrappingHStackExample.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"WrappingHStackExample/Preview Content\""; + DEVELOPMENT_TEAM = RB643832BT; + ENABLE_HARDENED_RUNTIME = YES; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.danielkloeck.WrappingHStackExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + AF37EE342912918900B4B709 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + CODE_SIGN_ENTITLEMENTS = WrappingHStackExample/WrappingHStackExample.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_ASSET_PATHS = "\"WrappingHStackExample/Preview Content\""; + DEVELOPMENT_TEAM = RB643832BT; + ENABLE_HARDENED_RUNTIME = YES; + ENABLE_PREVIEWS = YES; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.danielkloeck.WrappingHStackExample; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + AF37EE1E2912918900B4B709 /* Build configuration list for PBXProject "WrappingHStackExample" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + AF37EE302912918900B4B709 /* Debug */, + AF37EE312912918900B4B709 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + AF37EE322912918900B4B709 /* Build configuration list for PBXNativeTarget "WrappingHStackExample" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + AF37EE332912918900B4B709 /* Debug */, + AF37EE342912918900B4B709 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + AF37EE59291295ED00B4B709 /* XCRemoteSwiftPackageReference "WrappingHStack" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/dkk/WrappingHStack.git"; + requirement = { + branch = main; + kind = branch; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + AF37EE5A291295ED00B4B709 /* WrappingHStack */ = { + isa = XCSwiftPackageProductDependency; + package = AF37EE59291295ED00B4B709 /* XCRemoteSwiftPackageReference "WrappingHStack" */; + productName = WrappingHStack; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = AF37EE1B2912918900B4B709 /* Project object */; +} diff --git a/WrappingHStackExample/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from WrappingHStackExample/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/WrappingHStackExample/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from WrappingHStackExample/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to WrappingHStackExample-OSX/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/WrappingHStackExample/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json b/WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from WrappingHStackExample/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json rename to WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..3f00db4 --- /dev/null +++ b/WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,58 @@ +{ + "images" : [ + { + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WrappingHStackExample/WrappingHStackExample/Assets.xcassets/Contents.json b/WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/Contents.json similarity index 100% rename from WrappingHStackExample/WrappingHStackExample/Assets.xcassets/Contents.json rename to WrappingHStackExample-OSX/WrappingHStackExample/Assets.xcassets/Contents.json diff --git a/WrappingHStackExample-OSX/WrappingHStackExample/ExampleView.swift b/WrappingHStackExample-OSX/WrappingHStackExample/ExampleView.swift new file mode 100644 index 0000000..650d5ad --- /dev/null +++ b/WrappingHStackExample-OSX/WrappingHStackExample/ExampleView.swift @@ -0,0 +1,92 @@ +import SwiftUI +import WrappingHStack + +struct ExampleView: View { + enum ExampleType: String, CaseIterable { + case leading, center, trailing, dynamicLeading, dynamicCenter, dynamicTrailing, dynamicIncludingBorders + } + + @State var exampleType: ExampleType + + func example(alignment: HorizontalAlignment, spacing: WrappingHStack.Spacing) -> some View { + WrappingHStack(alignment: alignment, spacing: spacing, lineSpacing: 10) { + Text("WrappingHStack") + + Image(systemName: "scribble") + .font(.title) + .frame(width: 20, height: 20) + .background(Color.purple) + + NewLine() + + Text("NL") + + Image(systemName: "face.dashed") + .font(.title) + .border(Color.green) + + Text("bcdefghijklmnopqrs") + .font(.title) + + WrappingHStack(1...9, id:\.self, alignment: alignment, spacing: spacing) { + if $0 != 2 { + Text("Item: \($0)") + .padding(.all, 12) + .background(RoundedRectangle(cornerRadius: 10).stroke()) + } + }.frame(width: 380) + + Text("1234567898") + .bold() + } + } + + + var body: some View { + switch exampleType { + case .leading: + example(alignment: .leading, spacing: .constant(0)) + + case .center: + example(alignment: .center, spacing: .constant(0)) + + case .trailing: + example(alignment: .trailing, spacing: .constant(0)) + + case .dynamicLeading: + example(alignment: .leading, spacing: .dynamic(minSpacing: 0)) + + case .dynamicCenter: + example(alignment: .center, spacing: .dynamic(minSpacing: 0)) + + case .dynamicTrailing: + example(alignment: .trailing, spacing: .dynamic(minSpacing: 0)) + + case .dynamicIncludingBorders: + example(alignment: .leading, spacing: .dynamicIncludingBorders(minSpacing: 0)) + } + } +} + +struct ExampleView_Previews: PreviewProvider { + static var previews: some View { + Group { + ForEach(ExampleView.ExampleType.allCases, id: \.self) { + ExampleView(exampleType: $0) + .previewDisplayName($0.rawValue) + } + + NavigationView { + VStack { + NavigationLink("To the WrappingHStack") { + NavigationView { + ExampleView(exampleType: .center) + } + } + } + } + .previewDisplayName("Link") + } + .previewLayout(.fixed(width: 380, height: 250)) + } +} diff --git a/WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExample.entitlements b/WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExample.entitlements new file mode 100644 index 0000000..f2ef3ae --- /dev/null +++ b/WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExample.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + + diff --git a/WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExampleApp.swift b/WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExampleApp.swift new file mode 100644 index 0000000..364cd7c --- /dev/null +++ b/WrappingHStackExample-OSX/WrappingHStackExample/WrappingHStackExampleApp.swift @@ -0,0 +1,29 @@ +// +// WrappingHStackExampleApp.swift +// WrappingHStackExample +// +// Created by Daniel Kloeck on 02.11.22. +// + +import SwiftUI + +@main +struct WrappingHStackExampleApp: App { + var body: some Scene { + WindowGroup { + ScrollView { + VStack(alignment: .leading) { + ForEach(ExampleView.ExampleType.allCases, id: \.self) { + Text($0.rawValue) + .font(.title) + .padding(.horizontal) + + ExampleView(exampleType: $0) + + Divider() + } + } + } + } + } +} diff --git a/WrappingHStackExample/WrappingHStackExample.xcodeproj/project.pbxproj b/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.pbxproj similarity index 86% rename from WrappingHStackExample/WrappingHStackExample.xcodeproj/project.pbxproj rename to WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.pbxproj index ed70e9a..580f66a 100644 --- a/WrappingHStackExample/WrappingHStackExample.xcodeproj/project.pbxproj +++ b/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.pbxproj @@ -8,20 +8,19 @@ /* Begin PBXBuildFile section */ AF0EE8FF2603577D008FB2E9 /* WrappingHStackExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF0EE8FE2603577D008FB2E9 /* WrappingHStackExampleApp.swift */; }; - AF0EE9012603577D008FB2E9 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF0EE9002603577D008FB2E9 /* ContentView.swift */; }; + AF0EE9012603577D008FB2E9 /* ExampleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AF0EE9002603577D008FB2E9 /* ExampleView.swift */; }; AF0EE9032603577E008FB2E9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AF0EE9022603577E008FB2E9 /* Assets.xcassets */; }; - AF0EE9062603577E008FB2E9 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AF0EE9052603577E008FB2E9 /* Preview Assets.xcassets */; }; - AF0EE910260357E8008FB2E9 /* WrappingHStack in Frameworks */ = {isa = PBXBuildFile; productRef = AF0EE90F260357E8008FB2E9 /* WrappingHStack */; }; + AF37EE46291294F500B4B709 /* WrappingHStack in Resources */ = {isa = PBXBuildFile; fileRef = AF37EE45291294F500B4B709 /* WrappingHStack */; }; + AF37EE5E291296E200B4B709 /* WrappingHStack in Frameworks */ = {isa = PBXBuildFile; productRef = AF37EE5D291296E200B4B709 /* WrappingHStack */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ AF0EE8FB2603577D008FB2E9 /* WrappingHStackExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WrappingHStackExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; AF0EE8FE2603577D008FB2E9 /* WrappingHStackExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WrappingHStackExampleApp.swift; sourceTree = ""; }; - AF0EE9002603577D008FB2E9 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + AF0EE9002603577D008FB2E9 /* ExampleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExampleView.swift; sourceTree = ""; }; AF0EE9022603577E008FB2E9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; - AF0EE9052603577E008FB2E9 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; AF0EE9072603577E008FB2E9 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - AF0EE9162603588D008FB2E9 /* WrappingHStack */ = {isa = PBXFileReference; lastKnownFileType = folder; name = WrappingHStack; path = ..; sourceTree = ""; }; + AF37EE45291294F500B4B709 /* WrappingHStack */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = WrappingHStack; path = ..; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -29,7 +28,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - AF0EE910260357E8008FB2E9 /* WrappingHStack in Frameworks */, + AF37EE5E291296E200B4B709 /* WrappingHStack in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -39,7 +38,7 @@ AF0EE8F22603577D008FB2E9 = { isa = PBXGroup; children = ( - AF0EE9162603588D008FB2E9 /* WrappingHStack */, + AF37EE45291294F500B4B709 /* WrappingHStack */, AF0EE8FD2603577D008FB2E9 /* WrappingHStackExample */, AF0EE8FC2603577D008FB2E9 /* Products */, ); @@ -57,22 +56,13 @@ isa = PBXGroup; children = ( AF0EE8FE2603577D008FB2E9 /* WrappingHStackExampleApp.swift */, - AF0EE9002603577D008FB2E9 /* ContentView.swift */, + AF0EE9002603577D008FB2E9 /* ExampleView.swift */, AF0EE9022603577E008FB2E9 /* Assets.xcassets */, AF0EE9072603577E008FB2E9 /* Info.plist */, - AF0EE9042603577E008FB2E9 /* Preview Content */, ); path = WrappingHStackExample; sourceTree = ""; }; - AF0EE9042603577E008FB2E9 /* Preview Content */ = { - isa = PBXGroup; - children = ( - AF0EE9052603577E008FB2E9 /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -90,7 +80,7 @@ ); name = WrappingHStackExample; packageProductDependencies = ( - AF0EE90F260357E8008FB2E9 /* WrappingHStack */, + AF37EE5D291296E200B4B709 /* WrappingHStack */, ); productName = WrappingHStackExample; productReference = AF0EE8FB2603577D008FB2E9 /* WrappingHStackExample.app */; @@ -120,7 +110,7 @@ ); mainGroup = AF0EE8F22603577D008FB2E9; packageReferences = ( - AF0EE90E260357E8008FB2E9 /* XCRemoteSwiftPackageReference "WrappingHStack" */, + AF37EE5C291296E200B4B709 /* XCRemoteSwiftPackageReference "WrappingHStack" */, ); productRefGroup = AF0EE8FC2603577D008FB2E9 /* Products */; projectDirPath = ""; @@ -136,7 +126,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - AF0EE9062603577E008FB2E9 /* Preview Assets.xcassets in Resources */, + AF37EE46291294F500B4B709 /* WrappingHStack in Resources */, AF0EE9032603577E008FB2E9 /* Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -148,7 +138,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - AF0EE9012603577D008FB2E9 /* ContentView.swift in Sources */, + AF0EE9012603577D008FB2E9 /* ExampleView.swift in Sources */, AF0EE8FF2603577D008FB2E9 /* WrappingHStackExampleApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -340,7 +330,7 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - AF0EE90E260357E8008FB2E9 /* XCRemoteSwiftPackageReference "WrappingHStack" */ = { + AF37EE5C291296E200B4B709 /* XCRemoteSwiftPackageReference "WrappingHStack" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/dkk/WrappingHStack.git"; requirement = { @@ -351,9 +341,9 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - AF0EE90F260357E8008FB2E9 /* WrappingHStack */ = { + AF37EE5D291296E200B4B709 /* WrappingHStack */ = { isa = XCSwiftPackageProductDependency; - package = AF0EE90E260357E8008FB2E9 /* XCRemoteSwiftPackageReference "WrappingHStack" */; + package = AF37EE5C291296E200B4B709 /* XCRemoteSwiftPackageReference "WrappingHStack" */; productName = WrappingHStack; }; /* End XCSwiftPackageProductDependency section */ diff --git a/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/WrappingHStackExample-iOS/WrappingHStackExample.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json b/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..eb87897 --- /dev/null +++ b/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WrappingHStackExample/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json b/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from WrappingHStackExample/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json rename to WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/Contents.json b/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/Contents.json new file mode 100644 index 0000000..73c0059 --- /dev/null +++ b/WrappingHStackExample-iOS/WrappingHStackExample/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/WrappingHStackExample/WrappingHStackExample/ContentView.swift b/WrappingHStackExample-iOS/WrappingHStackExample/ExampleView.swift similarity index 98% rename from WrappingHStackExample/WrappingHStackExample/ContentView.swift rename to WrappingHStackExample-iOS/WrappingHStackExample/ExampleView.swift index 3315c0c..7c044cd 100644 --- a/WrappingHStackExample/WrappingHStackExample/ContentView.swift +++ b/WrappingHStackExample-iOS/WrappingHStackExample/ExampleView.swift @@ -68,7 +68,7 @@ struct ExampleView: View { } } -struct ContentView_Previews: PreviewProvider { +struct ExampleView_Previews: PreviewProvider { static var previews: some View { Group { ForEach(ExampleView.ExampleType.allCases, id: \.self) { diff --git a/WrappingHStackExample/WrappingHStackExample/Info.plist b/WrappingHStackExample-iOS/WrappingHStackExample/Info.plist similarity index 100% rename from WrappingHStackExample/WrappingHStackExample/Info.plist rename to WrappingHStackExample-iOS/WrappingHStackExample/Info.plist diff --git a/WrappingHStackExample/WrappingHStackExample/WrappingHStackExampleApp.swift b/WrappingHStackExample-iOS/WrappingHStackExample/WrappingHStackExampleApp.swift similarity index 100% rename from WrappingHStackExample/WrappingHStackExample/WrappingHStackExampleApp.swift rename to WrappingHStackExample-iOS/WrappingHStackExample/WrappingHStackExampleApp.swift