Skip to content
This repository was archived by the owner on Dec 27, 2020. It is now read-only.

Commit e352376

Browse files
ay42ay42
authored
inlinable style (#85)
1 parent 978cc2e commit e352376

File tree

7 files changed

+68
-11
lines changed

7 files changed

+68
-11
lines changed

‎GridDemo iOS/ModularGrid/ModularGridView.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ struct ModularGridView: View {
1212
Card(title: "\(item.number)", color: item.color)
1313
}
1414
.padding(8)
15-
.gridStyle(
16-
self.style
17-
)
15+
1816
}
1917
.navigationBarTitle("Modular Grid", displayMode: .inline)
2018
.navigationBarItems(
@@ -32,6 +30,9 @@ struct ModularGridView: View {
3230
.sheet(isPresented: $showSettings) {
3331
ModularGridSettingsView(style: self.$style).accentColor(.purple)
3432
}
33+
.gridStyle(
34+
self.style
35+
)
3536
}
3637

3738
func addMoreItems() {

‎GridDemo iOS/StaggeredGrid/StaggeredGridView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ struct StaggeredGridView: View {
3131
}
3232

3333
)
34-
.gridStyle(
35-
self.style
36-
)
3734
.sheet(isPresented: $showSettings) {
3835
StaggeredGridSettingsView(style: self.$style).accentColor(.purple)
3936
}
37+
.gridStyle(
38+
self.style
39+
)
4040
}
4141

4242
func shuffleImages() {

‎GridDemo macOS/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
<string>1.0</string>
2121
<key>CFBundleVersion</key>
2222
<string>1</string>
23+
<key>LSApplicationCategoryType</key>
24+
<string>public.app-category.developer-tools</string>
2325
<key>LSMinimumSystemVersion</key>
2426
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2527
<key>NSMainStoryboardFile</key>

‎GridDemo.xcodeproj/project.pbxproj

Lines changed: 55 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@
555555
isa = PBXProject;
556556
attributes = {
557557
LastSwiftUpdateCheck = 1130;
558-
LastUpgradeCheck = 1130;
558+
LastUpgradeCheck = 1140;
559559
TargetAttributes = {
560560
FAA2C96623DEAECC00FBDE39 = {
561561
CreatedOnToolsVersion = 11.3.1;
@@ -786,12 +786,64 @@
786786
FAA2C94023DEAD2600FBDE39 /* Debug */ = {
787787
isa = XCBuildConfiguration;
788788
buildSettings = {
789+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
790+
CLANG_WARN_BOOL_CONVERSION = YES;
791+
CLANG_WARN_COMMA = YES;
792+
CLANG_WARN_CONSTANT_CONVERSION = YES;
793+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
794+
CLANG_WARN_EMPTY_BODY = YES;
795+
CLANG_WARN_ENUM_CONVERSION = YES;
796+
CLANG_WARN_INFINITE_RECURSION = YES;
797+
CLANG_WARN_INT_CONVERSION = YES;
798+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
799+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
800+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
801+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
802+
CLANG_WARN_STRICT_PROTOTYPES = YES;
803+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
804+
CLANG_WARN_UNREACHABLE_CODE = YES;
805+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
806+
ENABLE_STRICT_OBJC_MSGSEND = YES;
807+
ENABLE_TESTABILITY = YES;
808+
GCC_NO_COMMON_BLOCKS = YES;
809+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
810+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
811+
GCC_WARN_UNDECLARED_SELECTOR = YES;
812+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
813+
GCC_WARN_UNUSED_FUNCTION = YES;
814+
GCC_WARN_UNUSED_VARIABLE = YES;
815+
ONLY_ACTIVE_ARCH = YES;
789816
};
790817
name = Debug;
791818
};
792819
FAA2C94123DEAD2600FBDE39 /* Release */ = {
793820
isa = XCBuildConfiguration;
794821
buildSettings = {
822+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
823+
CLANG_WARN_BOOL_CONVERSION = YES;
824+
CLANG_WARN_COMMA = YES;
825+
CLANG_WARN_CONSTANT_CONVERSION = YES;
826+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
827+
CLANG_WARN_EMPTY_BODY = YES;
828+
CLANG_WARN_ENUM_CONVERSION = YES;
829+
CLANG_WARN_INFINITE_RECURSION = YES;
830+
CLANG_WARN_INT_CONVERSION = YES;
831+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
832+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
833+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
834+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
835+
CLANG_WARN_STRICT_PROTOTYPES = YES;
836+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
837+
CLANG_WARN_UNREACHABLE_CODE = YES;
838+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
839+
ENABLE_STRICT_OBJC_MSGSEND = YES;
840+
GCC_NO_COMMON_BLOCKS = YES;
841+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
842+
GCC_WARN_ABOUT_RETURN_TYPE = YES;
843+
GCC_WARN_UNDECLARED_SELECTOR = YES;
844+
GCC_WARN_UNINITIALIZED_AUTOS = YES;
845+
GCC_WARN_UNUSED_FUNCTION = YES;
846+
GCC_WARN_UNUSED_VARIABLE = YES;
795847
};
796848
name = Release;
797849
};
@@ -971,6 +1023,7 @@
9711023
CLANG_WARN_UNREACHABLE_CODE = YES;
9721024
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
9731025
CODE_SIGN_ENTITLEMENTS = "GridDemo macOS/GridDemo_macOS.entitlements";
1026+
CODE_SIGN_IDENTITY = "-";
9741027
CODE_SIGN_STYLE = Automatic;
9751028
COMBINE_HIDPI_IMAGES = YES;
9761029
COPY_PHASE_STRIP = NO;
@@ -1045,6 +1098,7 @@
10451098
CLANG_WARN_UNREACHABLE_CODE = YES;
10461099
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10471100
CODE_SIGN_ENTITLEMENTS = "GridDemo macOS/GridDemo_macOS.entitlements";
1101+
CODE_SIGN_IDENTITY = "-";
10481102
CODE_SIGN_STYLE = Automatic;
10491103
COMBINE_HIDPI_IMAGES = YES;
10501104
COPY_PHASE_STRIP = NO;

‎Sources/Grid/Styles/Style/EnvironmentValues+GridStyle.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import SwiftUI
22

3-
extension EnvironmentValues {
3+
public extension EnvironmentValues {
44
var gridStyle: GridStyle {
55
get {
66
return self[GridStyleKey.self]

‎Sources/Grid/Styles/Style/GridStyleKey.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import SwiftUI
22

33
struct GridStyleKey: EnvironmentKey {
4-
static let defaultValue: GridStyle = ModularGridStyle(columns: .min(100), rows: .min(100))
4+
static let defaultValue: GridStyle = ModularGridStyle(columns: .min(100), rows: .fixed(100))
55
}

‎Sources/Grid/Styles/Style/View+GridStyle.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import SwiftUI
22

3-
extension View {
3+
public extension View {
44
/// Sets the style for `Grid` within the environment of `self`.
5-
public func gridStyle<S>(_ style: S) -> some View where S : GridStyle {
5+
@inlinable func gridStyle<S>(_ style: S) -> some View where S : GridStyle {
66
self.environment(\.gridStyle, style)
77
}
88
}

0 commit comments

Comments
 (0)