diff --git a/apps/demo-angular/package.json b/apps/demo-angular/package.json index 404adc7f..aa78069b 100644 --- a/apps/demo-angular/package.json +++ b/apps/demo-angular/package.json @@ -5,7 +5,7 @@ "@triniwiz/nativescript-masonkit": "file:../../dist/packages/nativescript-masonkit" }, "devDependencies": { - "@nativescript/android": "~8.3.0", - "@nativescript/ios": "~8.3.0" + "@nativescript/android": "dev", + "@nativescript/ios": "dev" } } diff --git a/apps/demo-angular/project.json b/apps/demo-angular/project.json index b4a1dd86..a7297306 100644 --- a/apps/demo-angular/project.json +++ b/apps/demo-angular/project.json @@ -1,4 +1,5 @@ { + "name": "demo-angular", "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/demo-angular/src", "projectType": "application", diff --git a/apps/demo/project.json b/apps/demo/project.json index d1eb6d1a..0aeba744 100644 --- a/apps/demo/project.json +++ b/apps/demo/project.json @@ -1,4 +1,5 @@ { + "name": "demo", "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/demo/src", "projectType": "application", diff --git a/nx.json b/nx.json index 11912e72..06707dfe 100644 --- a/nx.json +++ b/nx.json @@ -3,16 +3,6 @@ "affected": { "defaultBase": "master" }, - "implicitDependencies": { - "workspace.json": "*", - "package.json": { - "dependencies": "*", - "devDependencies": "*" - }, - "tsconfig.base.json": "*", - "tslint.json": "*", - "nx.json": "*" - }, "workspaceLayout": { "appsDir": "apps", "libsDir": "packages" @@ -28,5 +18,18 @@ } } }, - "$schema": "./node_modules/nx/schemas/nx-schema.json" + "$schema": "./node_modules/nx/schemas/nx-schema.json", + "namedInputs": { + "default": ["{projectRoot}/**/*", "sharedGlobals"], + "sharedGlobals": ["{workspaceRoot}/workspace.json", "{workspaceRoot}/tsconfig.base.json", "{workspaceRoot}/tslint.json", "{workspaceRoot}/nx.json"], + "production": ["default", "!{projectRoot}/.eslintrc.json"] + }, + "targetDefaults": { + "build": { + "inputs": ["production", "^production"] + }, + "lint": { + "inputs": ["default", "{workspaceRoot}/.eslintrc.json"] + } + } } diff --git a/package.json b/package.json index aaf20a73..61a2cd82 100644 --- a/package.json +++ b/package.json @@ -16,29 +16,29 @@ }, "private": true, "devDependencies": { - "@angular/animations": "^14.2.0", - "@angular/common": "^14.2.0", - "@angular/compiler": "^14.2.0", - "@angular/compiler-cli": "^14.2.0", - "@angular/core": "^14.2.0", - "@angular/forms": "^14.2.0", - "@angular/platform-browser": "^14.2.0", - "@angular/platform-browser-dynamic": "^14.2.0", - "@angular/router": "^14.2.0", - "@nativescript/angular": "^14.2.0", - "@nativescript/core": "~8.3.0", - "@nativescript/plugin-tools": "4.1.1", - "@nativescript/types": "~8.3.0", + "@angular/animations": "^15.0.0", + "@angular/common": "^15.0.0", + "@angular/compiler": "^15.0.0", + "@angular/compiler-cli": "^15.0.0", + "@angular/core": "^15.0.0", + "@angular/forms": "^15.0.0", + "@angular/platform-browser": "^15.0.0", + "@angular/platform-browser-dynamic": "^15.0.0", + "@angular/router": "^15.0.0", + "@nativescript/angular": "^15.0.0", + "@nativescript/core": "~8.4.0", + "@nativescript/plugin-tools": "5.0.3", + "@nativescript/types": "~8.4.0", "@nativescript/webpack": "~5.0.5", - "@ngtools/webpack": "^14.2.0", + "@ngtools/webpack": "^15.0.0", "husky": "^8.0.0", "nativescript-vue": "~2.9.0", "nativescript-vue-template-compiler": "~2.9.0", - "ng-packagr": "^14.2.0", + "ng-packagr": "^15.0.0", "rxjs": "~7.5.0", - "typescript": "~4.7.3", + "typescript": "~4.8.0", "zone.js": "~0.11.1", - "@angular-devkit/build-angular": "^14.2.0", + "@angular-devkit/build-angular": "^15.0.0", "nativescript-permissions": "1.3.11" }, "lint-staged": { diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason-Swift.h b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason-Swift.h index 9c6637f8..4237958e 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason-Swift.h +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/Mason-Swift.h @@ -679,7 +679,7 @@ SWIFT_CLASS_NAMED("MasonReexports") + (void)destroyWithTrackSizingFunctionArray:(CMasonTrackSizingFunctionArray * _Nonnull)trackSizingFunctionArray; + (NSString * _Nonnull)util_parse_non_repeated_track_sizing_function:(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT; + (NSString * _Nonnull)util_parse_auto_repeating_track_sizing_function:(CMasonTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT; -+ (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(int32_t)track_value_type :(float)track_value SWIFT_WARN_UNUSED_RESULT; ++ (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(float)track_value SWIFT_WARN_UNUSED_RESULT; + (void)style_update_with_values:(void * _Nonnull)style :(int32_t)display :(int32_t)position :(int32_t)direction :(int32_t)flexDirection :(int32_t)flexWrap :(int32_t)overflow :(int32_t)alignItems :(int32_t)alignSelf :(int32_t)alignContent :(int32_t)justifyItems :(int32_t)justifySelf :(int32_t)justifyContent :(int32_t)insetLeftType :(float)insetLeftValue :(int32_t)insetRightType :(float)insetRightValue :(int32_t)insetTopType :(float)insetTopValue :(int32_t)insetBottomType :(float)insetBottomValue :(int32_t)marginLeftType :(float)marginLeftValue :(int32_t)marginRightType :(float)marginRightValue :(int32_t)marginTopType :(float)marginTopValue :(int32_t)marginBottomType :(float)marginBottomValue :(int32_t)paddingLeftType :(float)paddingLeftValue :(int32_t)paddingRightType :(float)paddingRightValue :(int32_t)paddingTopType :(float)paddingTopValue :(int32_t)paddingBottomType :(float)paddingBottomValue :(int32_t)borderLeftType :(float)borderLeftValue :(int32_t)borderRightType :(float)borderRightValue :(int32_t)borderTopType :(float)borderTopValue :(int32_t)borderBottomType :(float)borderBottomValue :(float)flexGrow :(float)flexShrink :(int32_t)flexBasisType :(float)flexBasisValue :(int32_t)widthType :(float)widthValue :(int32_t)heightType :(float)heightValue :(int32_t)minWidthType :(float)minWidthValue :(int32_t)minHeightType :(float)minHeightValue :(int32_t)maxWidthType :(float)maxWidthValue :(int32_t)maxHeightType :(float)maxHeightValue :(int32_t)gapRowType :(float)gapRowValue :(int32_t)gapColumnType :(float)gapColumnValue :(float)aspectRatio :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoRows :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoColumns :(int32_t)gridAutoFlow :(int32_t)gridColumnStartType :(int16_t)gridColumnStartValue :(int32_t)gridColumnEndType :(int16_t)gridColumnEndValue :(int32_t)gridRowStartType :(int16_t)gridRowStartValue :(int32_t)gridRowEndType :(int16_t)gridRowEndValue :(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateRows gridTemplateColumns:(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateColumns; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/mason_native.h b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/mason_native.h index ab343556..a8947c73 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/mason_native.h +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Headers/mason_native.h @@ -933,7 +933,6 @@ void mason_style_update_with_values(void *style, struct CMasonTrackSizingFunctionArray *grid_template_columns); struct CMasonMinMax mason_util_create_non_repeated_track_sizing_function_with_type_value(int32_t track_type, - int32_t track_value_type, float track_value); char *mason_util_parse_non_repeated_track_sizing_function(struct CMasonNonRepeatedTrackSizingFunctionArray *value); diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Mason b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Mason index 199d7473..a7d9ed6f 100755 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Mason and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Mason differ diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo index 76b4f57a..9c26914f 100644 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios.swiftsourceinfo differ diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.abi.json b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.abi.json index 31c2e600..46a14959 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.abi.json +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.abi.json @@ -16,6 +16,46 @@ "kind": "TypeDecl", "name": "Line", "printedName": "Line", + "children": [ + { + "kind": "Constructor", + "name": "init", + "printedName": "init(_:_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Line", + "printedName": "Mason.Line<τ_0_0>", + "children": [ + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + } + ], + "usr": "s:5Mason4LineV" + }, + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + }, + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + } + ], + "declKind": "Constructor", + "usr": "s:5Mason4LineVyACyxGx_xtcfc", + "mangledName": "$s5Mason4LineVyACyxGx_xtcfc", + "moduleName": "Mason", + "genericSig": "<τ_0_0>", + "sugared_genericSig": "", + "declAttributes": ["AccessControl"], + "init_kind": "Designated" + } + ], "declKind": "Struct", "usr": "s:5Mason4LineV", "mangledName": "$s5Mason4LineV", @@ -8851,7 +8891,7 @@ { "kind": "Function", "name": "util_create_non_repeated_track_sizing_function_with_type_value", - "printedName": "util_create_non_repeated_track_sizing_function_with_type_value(_:_:_:)", + "printedName": "util_create_non_repeated_track_sizing_function_with_type_value(_:_:)", "children": [ { "kind": "TypeNominal", @@ -8865,12 +8905,6 @@ "printedName": "Swift.Int32", "usr": "s:s5Int32V" }, - { - "kind": "TypeNominal", - "name": "Int32", - "printedName": "Swift.Int32", - "usr": "s:s5Int32V" - }, { "kind": "TypeNominal", "name": "Float", @@ -8879,8 +8913,8 @@ } ], "declKind": "Func", - "usr": "c:@M@Mason@objc(cs)MasonReexports(cm)util_create_non_repeated_track_sizing_function_with_type_value:::", - "mangledName": "$s5Mason0A9ReexportsC62util_create_non_repeated_track_sizing_function_with_type_valueySo12CMasonMinMaxVs5Int32V_AHSftFZ", + "usr": "c:@M@Mason@objc(cs)MasonReexports(cm)util_create_non_repeated_track_sizing_function_with_type_value::", + "mangledName": "$s5Mason0A9ReexportsC62util_create_non_repeated_track_sizing_function_with_type_valueySo12CMasonMinMaxVs5Int32V_SftFZ", "moduleName": "Mason", "static": true, "declAttributes": ["Final", "AccessControl", "ObjC"], @@ -30813,7 +30847,7 @@ { "filePath": "/Users/triniwiz/Desktop/oss/mason/nativescript-mason/packages/nativescript-masonkit/src-native/mason-ios/Mason/Mason/MasonLine.swift", "kind": "StringLiteral", - "offset": 1217, + "offset": 1224, "length": 23, "value": "\"Mason.LineGridPlacementCompat\"" }, diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.private.swiftinterface b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.private.swiftinterface index 81b8120c..fc2e6329 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.private.swiftinterface +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.private.swiftinterface @@ -9,6 +9,7 @@ import UIKit import _Concurrency import _StringProcessing public struct Line { + public init(_ start: T, _ end: T) } @_hasMissingDesignatedInitializers @objcMembers @objc(LineGridPlacementCompat) public class LineGridPlacementCompat : ObjectiveC.NSObject { @objc public var start: Mason.GridPlacementCompat { @@ -301,7 +302,7 @@ public let MasonLengthPercentageSizeZero: Mason.MasonSize) @objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String @objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String - @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax + @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax @objc public static func style_update_with_values(_ style: Swift.UnsafeMutableRawPointer, _ display: Swift.Int32, _ position: Swift.Int32, _ direction: Swift.Int32, _ flexDirection: Swift.Int32, _ flexWrap: Swift.Int32, _ overflow: Swift.Int32, _ alignItems: Swift.Int32, _ alignSelf: Swift.Int32, _ alignContent: Swift.Int32, _ justifyItems: Swift.Int32, _ justifySelf: Swift.Int32, _ justifyContent: Swift.Int32, _ insetLeftType: Swift.Int32, _ insetLeftValue: Swift.Float, _ insetRightType: Swift.Int32, _ insetRightValue: Swift.Float, _ insetTopType: Swift.Int32, _ insetTopValue: Swift.Float, _ insetBottomType: Swift.Int32, _ insetBottomValue: Swift.Float, _ marginLeftType: Swift.Int32, _ marginLeftValue: Swift.Float, _ marginRightType: Swift.Int32, _ marginRightValue: Swift.Float, _ marginTopType: Swift.Int32, _ marginTopValue: Swift.Float, _ marginBottomType: Swift.Int32, _ marginBottomValue: Swift.Float, _ paddingLeftType: Swift.Int32, _ paddingLeftValue: Swift.Float, _ paddingRightType: Swift.Int32, _ paddingRightValue: Swift.Float, _ paddingTopType: Swift.Int32, _ paddingTopValue: Swift.Float, _ paddingBottomType: Swift.Int32, _ paddingBottomValue: Swift.Float, _ borderLeftType: Swift.Int32, _ borderLeftValue: Swift.Float, _ borderRightType: Swift.Int32, _ borderRightValue: Swift.Float, _ borderTopType: Swift.Int32, _ borderTopValue: Swift.Float, _ borderBottomType: Swift.Int32, _ borderBottomValue: Swift.Float, _ flexGrow: Swift.Float, _ flexShrink: Swift.Float, _ flexBasisType: Swift.Int32, _ flexBasisValue: Swift.Float, _ widthType: Swift.Int32, _ widthValue: Swift.Float, _ heightType: Swift.Int32, _ heightValue: Swift.Float, _ minWidthType: Swift.Int32, _ minWidthValue: Swift.Float, _ minHeightType: Swift.Int32, _ minHeightValue: Swift.Float, _ maxWidthType: Swift.Int32, _ maxWidthValue: Swift.Float, _ maxHeightType: Swift.Int32, _ maxHeightValue: Swift.Float, _ gapRowType: Swift.Int32, _ gapRowValue: Swift.Float, _ gapColumnType: Swift.Int32, _ gapColumnValue: Swift.Float, _ aspectRatio: Swift.Float, _ gridAutoRows: Swift.UnsafeMutablePointer, _ gridAutoColumns: Swift.UnsafeMutablePointer, _ gridAutoFlow: Swift.Int32, _ gridColumnStartType: Swift.Int32, _ gridColumnStartValue: Swift.Int16, _ gridColumnEndType: Swift.Int32, _ gridColumnEndValue: Swift.Int16, _ gridRowStartType: Swift.Int32, _ gridRowStartValue: Swift.Int16, _ gridRowEndType: Swift.Int32, _ gridRowEndValue: Swift.Int16, _ gridTemplateRows: Swift.UnsafeMutablePointer, gridTemplateColumns: Swift.UnsafeMutablePointer) @objc override dynamic public init() @objc deinit diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftinterface b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftinterface index 81b8120c..fc2e6329 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftinterface +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios.swiftinterface @@ -9,6 +9,7 @@ import UIKit import _Concurrency import _StringProcessing public struct Line { + public init(_ start: T, _ end: T) } @_hasMissingDesignatedInitializers @objcMembers @objc(LineGridPlacementCompat) public class LineGridPlacementCompat : ObjectiveC.NSObject { @objc public var start: Mason.GridPlacementCompat { @@ -301,7 +302,7 @@ public let MasonLengthPercentageSizeZero: Mason.MasonSize) @objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String @objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String - @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax + @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax @objc public static func style_update_with_values(_ style: Swift.UnsafeMutableRawPointer, _ display: Swift.Int32, _ position: Swift.Int32, _ direction: Swift.Int32, _ flexDirection: Swift.Int32, _ flexWrap: Swift.Int32, _ overflow: Swift.Int32, _ alignItems: Swift.Int32, _ alignSelf: Swift.Int32, _ alignContent: Swift.Int32, _ justifyItems: Swift.Int32, _ justifySelf: Swift.Int32, _ justifyContent: Swift.Int32, _ insetLeftType: Swift.Int32, _ insetLeftValue: Swift.Float, _ insetRightType: Swift.Int32, _ insetRightValue: Swift.Float, _ insetTopType: Swift.Int32, _ insetTopValue: Swift.Float, _ insetBottomType: Swift.Int32, _ insetBottomValue: Swift.Float, _ marginLeftType: Swift.Int32, _ marginLeftValue: Swift.Float, _ marginRightType: Swift.Int32, _ marginRightValue: Swift.Float, _ marginTopType: Swift.Int32, _ marginTopValue: Swift.Float, _ marginBottomType: Swift.Int32, _ marginBottomValue: Swift.Float, _ paddingLeftType: Swift.Int32, _ paddingLeftValue: Swift.Float, _ paddingRightType: Swift.Int32, _ paddingRightValue: Swift.Float, _ paddingTopType: Swift.Int32, _ paddingTopValue: Swift.Float, _ paddingBottomType: Swift.Int32, _ paddingBottomValue: Swift.Float, _ borderLeftType: Swift.Int32, _ borderLeftValue: Swift.Float, _ borderRightType: Swift.Int32, _ borderRightValue: Swift.Float, _ borderTopType: Swift.Int32, _ borderTopValue: Swift.Float, _ borderBottomType: Swift.Int32, _ borderBottomValue: Swift.Float, _ flexGrow: Swift.Float, _ flexShrink: Swift.Float, _ flexBasisType: Swift.Int32, _ flexBasisValue: Swift.Float, _ widthType: Swift.Int32, _ widthValue: Swift.Float, _ heightType: Swift.Int32, _ heightValue: Swift.Float, _ minWidthType: Swift.Int32, _ minWidthValue: Swift.Float, _ minHeightType: Swift.Int32, _ minHeightValue: Swift.Float, _ maxWidthType: Swift.Int32, _ maxWidthValue: Swift.Float, _ maxHeightType: Swift.Int32, _ maxHeightValue: Swift.Float, _ gapRowType: Swift.Int32, _ gapRowValue: Swift.Float, _ gapColumnType: Swift.Int32, _ gapColumnValue: Swift.Float, _ aspectRatio: Swift.Float, _ gridAutoRows: Swift.UnsafeMutablePointer, _ gridAutoColumns: Swift.UnsafeMutablePointer, _ gridAutoFlow: Swift.Int32, _ gridColumnStartType: Swift.Int32, _ gridColumnStartValue: Swift.Int16, _ gridColumnEndType: Swift.Int32, _ gridColumnEndValue: Swift.Int16, _ gridRowStartType: Swift.Int32, _ gridRowStartValue: Swift.Int16, _ gridRowEndType: Swift.Int32, _ gridRowEndValue: Swift.Int16, _ gridTemplateRows: Swift.UnsafeMutablePointer, gridTemplateColumns: Swift.UnsafeMutablePointer) @objc override dynamic public init() @objc deinit diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason index 949b5c0a..4b87f03d 100644 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason differ diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason-Swift.h b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason-Swift.h index 7ac8b9cf..a89f1479 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason-Swift.h +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/Mason-Swift.h @@ -679,7 +679,7 @@ SWIFT_CLASS_NAMED("MasonReexports") + (void)destroyWithTrackSizingFunctionArray:(CMasonTrackSizingFunctionArray * _Nonnull)trackSizingFunctionArray; + (NSString * _Nonnull)util_parse_non_repeated_track_sizing_function:(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT; + (NSString * _Nonnull)util_parse_auto_repeating_track_sizing_function:(CMasonTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT; -+ (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(int32_t)track_value_type :(float)track_value SWIFT_WARN_UNUSED_RESULT; ++ (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(float)track_value SWIFT_WARN_UNUSED_RESULT; + (void)style_update_with_values:(void * _Nonnull)style :(int32_t)display :(int32_t)position :(int32_t)direction :(int32_t)flexDirection :(int32_t)flexWrap :(int32_t)overflow :(int32_t)alignItems :(int32_t)alignSelf :(int32_t)alignContent :(int32_t)justifyItems :(int32_t)justifySelf :(int32_t)justifyContent :(int32_t)insetLeftType :(float)insetLeftValue :(int32_t)insetRightType :(float)insetRightValue :(int32_t)insetTopType :(float)insetTopValue :(int32_t)insetBottomType :(float)insetBottomValue :(int32_t)marginLeftType :(float)marginLeftValue :(int32_t)marginRightType :(float)marginRightValue :(int32_t)marginTopType :(float)marginTopValue :(int32_t)marginBottomType :(float)marginBottomValue :(int32_t)paddingLeftType :(float)paddingLeftValue :(int32_t)paddingRightType :(float)paddingRightValue :(int32_t)paddingTopType :(float)paddingTopValue :(int32_t)paddingBottomType :(float)paddingBottomValue :(int32_t)borderLeftType :(float)borderLeftValue :(int32_t)borderRightType :(float)borderRightValue :(int32_t)borderTopType :(float)borderTopValue :(int32_t)borderBottomType :(float)borderBottomValue :(float)flexGrow :(float)flexShrink :(int32_t)flexBasisType :(float)flexBasisValue :(int32_t)widthType :(float)widthValue :(int32_t)heightType :(float)heightValue :(int32_t)minWidthType :(float)minWidthValue :(int32_t)minHeightType :(float)minHeightValue :(int32_t)maxWidthType :(float)maxWidthValue :(int32_t)maxHeightType :(float)maxHeightValue :(int32_t)gapRowType :(float)gapRowValue :(int32_t)gapColumnType :(float)gapColumnValue :(float)aspectRatio :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoRows :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoColumns :(int32_t)gridAutoFlow :(int32_t)gridColumnStartType :(int16_t)gridColumnStartValue :(int32_t)gridColumnEndType :(int16_t)gridColumnEndValue :(int32_t)gridRowStartType :(int16_t)gridRowStartValue :(int32_t)gridRowEndType :(int16_t)gridRowEndValue :(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateRows gridTemplateColumns:(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateColumns; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end @@ -1663,7 +1663,7 @@ SWIFT_CLASS_NAMED("MasonReexports") + (void)destroyWithTrackSizingFunctionArray:(CMasonTrackSizingFunctionArray * _Nonnull)trackSizingFunctionArray; + (NSString * _Nonnull)util_parse_non_repeated_track_sizing_function:(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT; + (NSString * _Nonnull)util_parse_auto_repeating_track_sizing_function:(CMasonTrackSizingFunctionArray * _Nonnull)value SWIFT_WARN_UNUSED_RESULT; -+ (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(int32_t)track_value_type :(float)track_value SWIFT_WARN_UNUSED_RESULT; ++ (CMasonMinMax)util_create_non_repeated_track_sizing_function_with_type_value:(int32_t)track_type :(float)track_value SWIFT_WARN_UNUSED_RESULT; + (void)style_update_with_values:(void * _Nonnull)style :(int32_t)display :(int32_t)position :(int32_t)direction :(int32_t)flexDirection :(int32_t)flexWrap :(int32_t)overflow :(int32_t)alignItems :(int32_t)alignSelf :(int32_t)alignContent :(int32_t)justifyItems :(int32_t)justifySelf :(int32_t)justifyContent :(int32_t)insetLeftType :(float)insetLeftValue :(int32_t)insetRightType :(float)insetRightValue :(int32_t)insetTopType :(float)insetTopValue :(int32_t)insetBottomType :(float)insetBottomValue :(int32_t)marginLeftType :(float)marginLeftValue :(int32_t)marginRightType :(float)marginRightValue :(int32_t)marginTopType :(float)marginTopValue :(int32_t)marginBottomType :(float)marginBottomValue :(int32_t)paddingLeftType :(float)paddingLeftValue :(int32_t)paddingRightType :(float)paddingRightValue :(int32_t)paddingTopType :(float)paddingTopValue :(int32_t)paddingBottomType :(float)paddingBottomValue :(int32_t)borderLeftType :(float)borderLeftValue :(int32_t)borderRightType :(float)borderRightValue :(int32_t)borderTopType :(float)borderTopValue :(int32_t)borderBottomType :(float)borderBottomValue :(float)flexGrow :(float)flexShrink :(int32_t)flexBasisType :(float)flexBasisValue :(int32_t)widthType :(float)widthValue :(int32_t)heightType :(float)heightValue :(int32_t)minWidthType :(float)minWidthValue :(int32_t)minHeightType :(float)minHeightValue :(int32_t)maxWidthType :(float)maxWidthValue :(int32_t)maxHeightType :(float)maxHeightValue :(int32_t)gapRowType :(float)gapRowValue :(int32_t)gapColumnType :(float)gapColumnValue :(float)aspectRatio :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoRows :(CMasonNonRepeatedTrackSizingFunctionArray * _Nonnull)gridAutoColumns :(int32_t)gridAutoFlow :(int32_t)gridColumnStartType :(int16_t)gridColumnStartValue :(int32_t)gridColumnEndType :(int16_t)gridColumnEndValue :(int32_t)gridRowStartType :(int16_t)gridRowStartValue :(int32_t)gridRowEndType :(int16_t)gridRowEndValue :(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateRows gridTemplateColumns:(CMasonTrackSizingFunctionArray * _Nonnull)gridTemplateColumns; - (nonnull instancetype)init OBJC_DESIGNATED_INITIALIZER; @end diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/mason_native.h b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/mason_native.h index ab343556..a8947c73 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/mason_native.h +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Headers/mason_native.h @@ -933,7 +933,6 @@ void mason_style_update_with_values(void *style, struct CMasonTrackSizingFunctionArray *grid_template_columns); struct CMasonMinMax mason_util_create_non_repeated_track_sizing_function_with_type_value(int32_t track_type, - int32_t track_value_type, float track_value); char *mason_util_parse_non_repeated_track_sizing_function(struct CMasonNonRepeatedTrackSizingFunctionArray *value); diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Mason b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Mason index c9968f67..9ce5a87d 100755 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Mason and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Mason differ diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo index 943048f6..ead1aca7 100644 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo differ diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo index bb4fb25c..bdb09717 100644 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo differ diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json index 31c2e600..46a14959 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json @@ -16,6 +16,46 @@ "kind": "TypeDecl", "name": "Line", "printedName": "Line", + "children": [ + { + "kind": "Constructor", + "name": "init", + "printedName": "init(_:_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Line", + "printedName": "Mason.Line<τ_0_0>", + "children": [ + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + } + ], + "usr": "s:5Mason4LineV" + }, + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + }, + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + } + ], + "declKind": "Constructor", + "usr": "s:5Mason4LineVyACyxGx_xtcfc", + "mangledName": "$s5Mason4LineVyACyxGx_xtcfc", + "moduleName": "Mason", + "genericSig": "<τ_0_0>", + "sugared_genericSig": "", + "declAttributes": ["AccessControl"], + "init_kind": "Designated" + } + ], "declKind": "Struct", "usr": "s:5Mason4LineV", "mangledName": "$s5Mason4LineV", @@ -8851,7 +8891,7 @@ { "kind": "Function", "name": "util_create_non_repeated_track_sizing_function_with_type_value", - "printedName": "util_create_non_repeated_track_sizing_function_with_type_value(_:_:_:)", + "printedName": "util_create_non_repeated_track_sizing_function_with_type_value(_:_:)", "children": [ { "kind": "TypeNominal", @@ -8865,12 +8905,6 @@ "printedName": "Swift.Int32", "usr": "s:s5Int32V" }, - { - "kind": "TypeNominal", - "name": "Int32", - "printedName": "Swift.Int32", - "usr": "s:s5Int32V" - }, { "kind": "TypeNominal", "name": "Float", @@ -8879,8 +8913,8 @@ } ], "declKind": "Func", - "usr": "c:@M@Mason@objc(cs)MasonReexports(cm)util_create_non_repeated_track_sizing_function_with_type_value:::", - "mangledName": "$s5Mason0A9ReexportsC62util_create_non_repeated_track_sizing_function_with_type_valueySo12CMasonMinMaxVs5Int32V_AHSftFZ", + "usr": "c:@M@Mason@objc(cs)MasonReexports(cm)util_create_non_repeated_track_sizing_function_with_type_value::", + "mangledName": "$s5Mason0A9ReexportsC62util_create_non_repeated_track_sizing_function_with_type_valueySo12CMasonMinMaxVs5Int32V_SftFZ", "moduleName": "Mason", "static": true, "declAttributes": ["Final", "AccessControl", "ObjC"], @@ -30813,7 +30847,7 @@ { "filePath": "/Users/triniwiz/Desktop/oss/mason/nativescript-mason/packages/nativescript-masonkit/src-native/mason-ios/Mason/Mason/MasonLine.swift", "kind": "StringLiteral", - "offset": 1217, + "offset": 1224, "length": 23, "value": "\"Mason.LineGridPlacementCompat\"" }, diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface index d472a0b2..4a22066e 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface @@ -9,6 +9,7 @@ import UIKit import _Concurrency import _StringProcessing public struct Line { + public init(_ start: T, _ end: T) } @_hasMissingDesignatedInitializers @objcMembers @objc(LineGridPlacementCompat) public class LineGridPlacementCompat : ObjectiveC.NSObject { @objc public var start: Mason.GridPlacementCompat { @@ -301,7 +302,7 @@ public let MasonLengthPercentageSizeZero: Mason.MasonSize) @objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String @objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String - @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax + @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax @objc public static func style_update_with_values(_ style: Swift.UnsafeMutableRawPointer, _ display: Swift.Int32, _ position: Swift.Int32, _ direction: Swift.Int32, _ flexDirection: Swift.Int32, _ flexWrap: Swift.Int32, _ overflow: Swift.Int32, _ alignItems: Swift.Int32, _ alignSelf: Swift.Int32, _ alignContent: Swift.Int32, _ justifyItems: Swift.Int32, _ justifySelf: Swift.Int32, _ justifyContent: Swift.Int32, _ insetLeftType: Swift.Int32, _ insetLeftValue: Swift.Float, _ insetRightType: Swift.Int32, _ insetRightValue: Swift.Float, _ insetTopType: Swift.Int32, _ insetTopValue: Swift.Float, _ insetBottomType: Swift.Int32, _ insetBottomValue: Swift.Float, _ marginLeftType: Swift.Int32, _ marginLeftValue: Swift.Float, _ marginRightType: Swift.Int32, _ marginRightValue: Swift.Float, _ marginTopType: Swift.Int32, _ marginTopValue: Swift.Float, _ marginBottomType: Swift.Int32, _ marginBottomValue: Swift.Float, _ paddingLeftType: Swift.Int32, _ paddingLeftValue: Swift.Float, _ paddingRightType: Swift.Int32, _ paddingRightValue: Swift.Float, _ paddingTopType: Swift.Int32, _ paddingTopValue: Swift.Float, _ paddingBottomType: Swift.Int32, _ paddingBottomValue: Swift.Float, _ borderLeftType: Swift.Int32, _ borderLeftValue: Swift.Float, _ borderRightType: Swift.Int32, _ borderRightValue: Swift.Float, _ borderTopType: Swift.Int32, _ borderTopValue: Swift.Float, _ borderBottomType: Swift.Int32, _ borderBottomValue: Swift.Float, _ flexGrow: Swift.Float, _ flexShrink: Swift.Float, _ flexBasisType: Swift.Int32, _ flexBasisValue: Swift.Float, _ widthType: Swift.Int32, _ widthValue: Swift.Float, _ heightType: Swift.Int32, _ heightValue: Swift.Float, _ minWidthType: Swift.Int32, _ minWidthValue: Swift.Float, _ minHeightType: Swift.Int32, _ minHeightValue: Swift.Float, _ maxWidthType: Swift.Int32, _ maxWidthValue: Swift.Float, _ maxHeightType: Swift.Int32, _ maxHeightValue: Swift.Float, _ gapRowType: Swift.Int32, _ gapRowValue: Swift.Float, _ gapColumnType: Swift.Int32, _ gapColumnValue: Swift.Float, _ aspectRatio: Swift.Float, _ gridAutoRows: Swift.UnsafeMutablePointer, _ gridAutoColumns: Swift.UnsafeMutablePointer, _ gridAutoFlow: Swift.Int32, _ gridColumnStartType: Swift.Int32, _ gridColumnStartValue: Swift.Int16, _ gridColumnEndType: Swift.Int32, _ gridColumnEndValue: Swift.Int16, _ gridRowStartType: Swift.Int32, _ gridRowStartValue: Swift.Int16, _ gridRowEndType: Swift.Int32, _ gridRowEndValue: Swift.Int16, _ gridTemplateRows: Swift.UnsafeMutablePointer, gridTemplateColumns: Swift.UnsafeMutablePointer) @objc override dynamic public init() @objc deinit diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface index d472a0b2..4a22066e 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface @@ -9,6 +9,7 @@ import UIKit import _Concurrency import _StringProcessing public struct Line { + public init(_ start: T, _ end: T) } @_hasMissingDesignatedInitializers @objcMembers @objc(LineGridPlacementCompat) public class LineGridPlacementCompat : ObjectiveC.NSObject { @objc public var start: Mason.GridPlacementCompat { @@ -301,7 +302,7 @@ public let MasonLengthPercentageSizeZero: Mason.MasonSize) @objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String @objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String - @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax + @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax @objc public static func style_update_with_values(_ style: Swift.UnsafeMutableRawPointer, _ display: Swift.Int32, _ position: Swift.Int32, _ direction: Swift.Int32, _ flexDirection: Swift.Int32, _ flexWrap: Swift.Int32, _ overflow: Swift.Int32, _ alignItems: Swift.Int32, _ alignSelf: Swift.Int32, _ alignContent: Swift.Int32, _ justifyItems: Swift.Int32, _ justifySelf: Swift.Int32, _ justifyContent: Swift.Int32, _ insetLeftType: Swift.Int32, _ insetLeftValue: Swift.Float, _ insetRightType: Swift.Int32, _ insetRightValue: Swift.Float, _ insetTopType: Swift.Int32, _ insetTopValue: Swift.Float, _ insetBottomType: Swift.Int32, _ insetBottomValue: Swift.Float, _ marginLeftType: Swift.Int32, _ marginLeftValue: Swift.Float, _ marginRightType: Swift.Int32, _ marginRightValue: Swift.Float, _ marginTopType: Swift.Int32, _ marginTopValue: Swift.Float, _ marginBottomType: Swift.Int32, _ marginBottomValue: Swift.Float, _ paddingLeftType: Swift.Int32, _ paddingLeftValue: Swift.Float, _ paddingRightType: Swift.Int32, _ paddingRightValue: Swift.Float, _ paddingTopType: Swift.Int32, _ paddingTopValue: Swift.Float, _ paddingBottomType: Swift.Int32, _ paddingBottomValue: Swift.Float, _ borderLeftType: Swift.Int32, _ borderLeftValue: Swift.Float, _ borderRightType: Swift.Int32, _ borderRightValue: Swift.Float, _ borderTopType: Swift.Int32, _ borderTopValue: Swift.Float, _ borderBottomType: Swift.Int32, _ borderBottomValue: Swift.Float, _ flexGrow: Swift.Float, _ flexShrink: Swift.Float, _ flexBasisType: Swift.Int32, _ flexBasisValue: Swift.Float, _ widthType: Swift.Int32, _ widthValue: Swift.Float, _ heightType: Swift.Int32, _ heightValue: Swift.Float, _ minWidthType: Swift.Int32, _ minWidthValue: Swift.Float, _ minHeightType: Swift.Int32, _ minHeightValue: Swift.Float, _ maxWidthType: Swift.Int32, _ maxWidthValue: Swift.Float, _ maxHeightType: Swift.Int32, _ maxHeightValue: Swift.Float, _ gapRowType: Swift.Int32, _ gapRowValue: Swift.Float, _ gapColumnType: Swift.Int32, _ gapColumnValue: Swift.Float, _ aspectRatio: Swift.Float, _ gridAutoRows: Swift.UnsafeMutablePointer, _ gridAutoColumns: Swift.UnsafeMutablePointer, _ gridAutoFlow: Swift.Int32, _ gridColumnStartType: Swift.Int32, _ gridColumnStartValue: Swift.Int16, _ gridColumnEndType: Swift.Int32, _ gridColumnEndValue: Swift.Int16, _ gridRowStartType: Swift.Int32, _ gridRowStartValue: Swift.Int16, _ gridRowEndType: Swift.Int32, _ gridRowEndValue: Swift.Int16, _ gridTemplateRows: Swift.UnsafeMutablePointer, gridTemplateColumns: Swift.UnsafeMutablePointer) @objc override dynamic public init() @objc deinit diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json index 31c2e600..46a14959 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json @@ -16,6 +16,46 @@ "kind": "TypeDecl", "name": "Line", "printedName": "Line", + "children": [ + { + "kind": "Constructor", + "name": "init", + "printedName": "init(_:_:)", + "children": [ + { + "kind": "TypeNominal", + "name": "Line", + "printedName": "Mason.Line<τ_0_0>", + "children": [ + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + } + ], + "usr": "s:5Mason4LineV" + }, + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + }, + { + "kind": "TypeNominal", + "name": "GenericTypeParam", + "printedName": "τ_0_0" + } + ], + "declKind": "Constructor", + "usr": "s:5Mason4LineVyACyxGx_xtcfc", + "mangledName": "$s5Mason4LineVyACyxGx_xtcfc", + "moduleName": "Mason", + "genericSig": "<τ_0_0>", + "sugared_genericSig": "", + "declAttributes": ["AccessControl"], + "init_kind": "Designated" + } + ], "declKind": "Struct", "usr": "s:5Mason4LineV", "mangledName": "$s5Mason4LineV", @@ -8851,7 +8891,7 @@ { "kind": "Function", "name": "util_create_non_repeated_track_sizing_function_with_type_value", - "printedName": "util_create_non_repeated_track_sizing_function_with_type_value(_:_:_:)", + "printedName": "util_create_non_repeated_track_sizing_function_with_type_value(_:_:)", "children": [ { "kind": "TypeNominal", @@ -8865,12 +8905,6 @@ "printedName": "Swift.Int32", "usr": "s:s5Int32V" }, - { - "kind": "TypeNominal", - "name": "Int32", - "printedName": "Swift.Int32", - "usr": "s:s5Int32V" - }, { "kind": "TypeNominal", "name": "Float", @@ -8879,8 +8913,8 @@ } ], "declKind": "Func", - "usr": "c:@M@Mason@objc(cs)MasonReexports(cm)util_create_non_repeated_track_sizing_function_with_type_value:::", - "mangledName": "$s5Mason0A9ReexportsC62util_create_non_repeated_track_sizing_function_with_type_valueySo12CMasonMinMaxVs5Int32V_AHSftFZ", + "usr": "c:@M@Mason@objc(cs)MasonReexports(cm)util_create_non_repeated_track_sizing_function_with_type_value::", + "mangledName": "$s5Mason0A9ReexportsC62util_create_non_repeated_track_sizing_function_with_type_valueySo12CMasonMinMaxVs5Int32V_SftFZ", "moduleName": "Mason", "static": true, "declAttributes": ["Final", "AccessControl", "ObjC"], @@ -30813,7 +30847,7 @@ { "filePath": "/Users/triniwiz/Desktop/oss/mason/nativescript-mason/packages/nativescript-masonkit/src-native/mason-ios/Mason/Mason/MasonLine.swift", "kind": "StringLiteral", - "offset": 1217, + "offset": 1224, "length": 23, "value": "\"Mason.LineGridPlacementCompat\"" }, diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface index a64c1b06..50ea1104 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface @@ -9,6 +9,7 @@ import UIKit import _Concurrency import _StringProcessing public struct Line { + public init(_ start: T, _ end: T) } @_hasMissingDesignatedInitializers @objcMembers @objc(LineGridPlacementCompat) public class LineGridPlacementCompat : ObjectiveC.NSObject { @objc public var start: Mason.GridPlacementCompat { @@ -301,7 +302,7 @@ public let MasonLengthPercentageSizeZero: Mason.MasonSize) @objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String @objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String - @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax + @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax @objc public static func style_update_with_values(_ style: Swift.UnsafeMutableRawPointer, _ display: Swift.Int32, _ position: Swift.Int32, _ direction: Swift.Int32, _ flexDirection: Swift.Int32, _ flexWrap: Swift.Int32, _ overflow: Swift.Int32, _ alignItems: Swift.Int32, _ alignSelf: Swift.Int32, _ alignContent: Swift.Int32, _ justifyItems: Swift.Int32, _ justifySelf: Swift.Int32, _ justifyContent: Swift.Int32, _ insetLeftType: Swift.Int32, _ insetLeftValue: Swift.Float, _ insetRightType: Swift.Int32, _ insetRightValue: Swift.Float, _ insetTopType: Swift.Int32, _ insetTopValue: Swift.Float, _ insetBottomType: Swift.Int32, _ insetBottomValue: Swift.Float, _ marginLeftType: Swift.Int32, _ marginLeftValue: Swift.Float, _ marginRightType: Swift.Int32, _ marginRightValue: Swift.Float, _ marginTopType: Swift.Int32, _ marginTopValue: Swift.Float, _ marginBottomType: Swift.Int32, _ marginBottomValue: Swift.Float, _ paddingLeftType: Swift.Int32, _ paddingLeftValue: Swift.Float, _ paddingRightType: Swift.Int32, _ paddingRightValue: Swift.Float, _ paddingTopType: Swift.Int32, _ paddingTopValue: Swift.Float, _ paddingBottomType: Swift.Int32, _ paddingBottomValue: Swift.Float, _ borderLeftType: Swift.Int32, _ borderLeftValue: Swift.Float, _ borderRightType: Swift.Int32, _ borderRightValue: Swift.Float, _ borderTopType: Swift.Int32, _ borderTopValue: Swift.Float, _ borderBottomType: Swift.Int32, _ borderBottomValue: Swift.Float, _ flexGrow: Swift.Float, _ flexShrink: Swift.Float, _ flexBasisType: Swift.Int32, _ flexBasisValue: Swift.Float, _ widthType: Swift.Int32, _ widthValue: Swift.Float, _ heightType: Swift.Int32, _ heightValue: Swift.Float, _ minWidthType: Swift.Int32, _ minWidthValue: Swift.Float, _ minHeightType: Swift.Int32, _ minHeightValue: Swift.Float, _ maxWidthType: Swift.Int32, _ maxWidthValue: Swift.Float, _ maxHeightType: Swift.Int32, _ maxHeightValue: Swift.Float, _ gapRowType: Swift.Int32, _ gapRowValue: Swift.Float, _ gapColumnType: Swift.Int32, _ gapColumnValue: Swift.Float, _ aspectRatio: Swift.Float, _ gridAutoRows: Swift.UnsafeMutablePointer, _ gridAutoColumns: Swift.UnsafeMutablePointer, _ gridAutoFlow: Swift.Int32, _ gridColumnStartType: Swift.Int32, _ gridColumnStartValue: Swift.Int16, _ gridColumnEndType: Swift.Int32, _ gridColumnEndValue: Swift.Int16, _ gridRowStartType: Swift.Int32, _ gridRowStartValue: Swift.Int16, _ gridRowEndType: Swift.Int32, _ gridRowEndValue: Swift.Int16, _ gridTemplateRows: Swift.UnsafeMutablePointer, gridTemplateColumns: Swift.UnsafeMutablePointer) @objc override dynamic public init() @objc deinit diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface index a64c1b06..50ea1104 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface @@ -9,6 +9,7 @@ import UIKit import _Concurrency import _StringProcessing public struct Line { + public init(_ start: T, _ end: T) } @_hasMissingDesignatedInitializers @objcMembers @objc(LineGridPlacementCompat) public class LineGridPlacementCompat : ObjectiveC.NSObject { @objc public var start: Mason.GridPlacementCompat { @@ -301,7 +302,7 @@ public let MasonLengthPercentageSizeZero: Mason.MasonSize) @objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String @objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer) -> Swift.String - @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax + @objc public static func util_create_non_repeated_track_sizing_function_with_type_value(_ track_type: Swift.Int32, _ track_value: Swift.Float) -> Mason.CMasonMinMax @objc public static func style_update_with_values(_ style: Swift.UnsafeMutableRawPointer, _ display: Swift.Int32, _ position: Swift.Int32, _ direction: Swift.Int32, _ flexDirection: Swift.Int32, _ flexWrap: Swift.Int32, _ overflow: Swift.Int32, _ alignItems: Swift.Int32, _ alignSelf: Swift.Int32, _ alignContent: Swift.Int32, _ justifyItems: Swift.Int32, _ justifySelf: Swift.Int32, _ justifyContent: Swift.Int32, _ insetLeftType: Swift.Int32, _ insetLeftValue: Swift.Float, _ insetRightType: Swift.Int32, _ insetRightValue: Swift.Float, _ insetTopType: Swift.Int32, _ insetTopValue: Swift.Float, _ insetBottomType: Swift.Int32, _ insetBottomValue: Swift.Float, _ marginLeftType: Swift.Int32, _ marginLeftValue: Swift.Float, _ marginRightType: Swift.Int32, _ marginRightValue: Swift.Float, _ marginTopType: Swift.Int32, _ marginTopValue: Swift.Float, _ marginBottomType: Swift.Int32, _ marginBottomValue: Swift.Float, _ paddingLeftType: Swift.Int32, _ paddingLeftValue: Swift.Float, _ paddingRightType: Swift.Int32, _ paddingRightValue: Swift.Float, _ paddingTopType: Swift.Int32, _ paddingTopValue: Swift.Float, _ paddingBottomType: Swift.Int32, _ paddingBottomValue: Swift.Float, _ borderLeftType: Swift.Int32, _ borderLeftValue: Swift.Float, _ borderRightType: Swift.Int32, _ borderRightValue: Swift.Float, _ borderTopType: Swift.Int32, _ borderTopValue: Swift.Float, _ borderBottomType: Swift.Int32, _ borderBottomValue: Swift.Float, _ flexGrow: Swift.Float, _ flexShrink: Swift.Float, _ flexBasisType: Swift.Int32, _ flexBasisValue: Swift.Float, _ widthType: Swift.Int32, _ widthValue: Swift.Float, _ heightType: Swift.Int32, _ heightValue: Swift.Float, _ minWidthType: Swift.Int32, _ minWidthValue: Swift.Float, _ minHeightType: Swift.Int32, _ minHeightValue: Swift.Float, _ maxWidthType: Swift.Int32, _ maxWidthValue: Swift.Float, _ maxHeightType: Swift.Int32, _ maxHeightValue: Swift.Float, _ gapRowType: Swift.Int32, _ gapRowValue: Swift.Float, _ gapColumnType: Swift.Int32, _ gapColumnValue: Swift.Float, _ aspectRatio: Swift.Float, _ gridAutoRows: Swift.UnsafeMutablePointer, _ gridAutoColumns: Swift.UnsafeMutablePointer, _ gridAutoFlow: Swift.Int32, _ gridColumnStartType: Swift.Int32, _ gridColumnStartValue: Swift.Int16, _ gridColumnEndType: Swift.Int32, _ gridColumnEndValue: Swift.Int16, _ gridRowStartType: Swift.Int32, _ gridRowStartValue: Swift.Int16, _ gridRowEndType: Swift.Int32, _ gridRowEndValue: Swift.Int16, _ gridTemplateRows: Swift.UnsafeMutablePointer, gridTemplateColumns: Swift.UnsafeMutablePointer) @objc override dynamic public init() @objc deinit diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/_CodeSignature/CodeResources b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/_CodeSignature/CodeResources index b9bb4be0..d64d5b8c 100644 --- a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/_CodeSignature/CodeResources +++ b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/Mason.framework/_CodeSignature/CodeResources @@ -6,7 +6,7 @@ Headers/Mason-Swift.h - m0gEtOmcifuzSwiRXIvVftOXC90= + kBN6MMpKRqRsLGTbQAcfi7pH5OI= Headers/Mason.h @@ -14,7 +14,7 @@ Headers/mason_native.h - TgLmIqsge99htvei80Jed5qMQu4= + h6EvnsjFm5O7NO+IlixMvYFlAq8= Info.plist @@ -22,19 +22,19 @@ Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo - dXHbgsSYGd8wZ/MNNfvOyfSwP14= + pCHiiJD4iUpg2Y104QVm1BBX0rM= Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo - trKfIYgGlFhu2PjB21TACmL0yFU= + pMOa8Hj5dVSCWZe5hPm/mHyOSwk= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json - q+lZzE/SKiR8AACyrYKhleHOlTQ= + HclbWQoe1GMN3zPSmDJZmPKuH14= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface - w+O8utiDsGCCKwbPCwKbJ9hk4+A= + MMsQcXNg1Z0MHHm9rqlDWPI0z6A= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftdoc @@ -42,19 +42,19 @@ Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftinterface - w+O8utiDsGCCKwbPCwKbJ9hk4+A= + MMsQcXNg1Z0MHHm9rqlDWPI0z6A= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftmodule - qGfMtCXM7buBqQA0qmNFbkM25iY= + jpLNzG2n3GqnkDUmIzvE0PEpBR0= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json - q+lZzE/SKiR8AACyrYKhleHOlTQ= + HclbWQoe1GMN3zPSmDJZmPKuH14= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface - vQKlBAbUCEyEQ7q3b59LYTPAQW4= + DFSx2cOihhdB0rIEf7/uBTW/sAA= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftdoc @@ -62,11 +62,11 @@ Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftinterface - vQKlBAbUCEyEQ7q3b59LYTPAQW4= + DFSx2cOihhdB0rIEf7/uBTW/sAA= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftmodule - kjHab+TROnoEMwsTQ9Av78aeCTQ= + EAEjI+/jr2tlM1WJBoYSdePnfKs= Modules/module.modulemap @@ -79,11 +79,11 @@ hash - m0gEtOmcifuzSwiRXIvVftOXC90= + kBN6MMpKRqRsLGTbQAcfi7pH5OI= hash2 - Z++6a3s1lvbGxVz20uYnPoX+O/LdHYvurkk8BcJh124= + lj88MCAxJMUhuY41MMvANSaLXWjXwpw2vV3d2vBJFbk= Headers/Mason.h @@ -101,55 +101,55 @@ hash - TgLmIqsge99htvei80Jed5qMQu4= + h6EvnsjFm5O7NO+IlixMvYFlAq8= hash2 - 9KacSx7vD4+o40CbfPnTp9W+xh6HXLrcoCN8skqc9jY= + FA/yTIMgxc2NcIECKz1P/7Gz5V9Y56hr+PqedUZ5eUs= Modules/Mason.swiftmodule/Project/arm64-apple-ios-simulator.swiftsourceinfo hash - dXHbgsSYGd8wZ/MNNfvOyfSwP14= + pCHiiJD4iUpg2Y104QVm1BBX0rM= hash2 - L9PLqkL2FAcE56ZohGNijVUzTrH7/qZstiQNfDH4iYM= + xYfjI13kuRbKzwyb2wpIGbCDsKmte+ozfsDiDw5Z7c4= Modules/Mason.swiftmodule/Project/x86_64-apple-ios-simulator.swiftsourceinfo hash - trKfIYgGlFhu2PjB21TACmL0yFU= + pMOa8Hj5dVSCWZe5hPm/mHyOSwk= hash2 - hQeQie0F/M1/sIZkDqLty3ixMaNoYZnVvWIY2x9yRxg= + ugneZhysZRrSCwYjUjALlTBIvovC/nT+dltaJK09sHI= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.abi.json hash - q+lZzE/SKiR8AACyrYKhleHOlTQ= + HclbWQoe1GMN3zPSmDJZmPKuH14= hash2 - CabO83W1GP0rvCWdbelQx/GPgKXeGqFmqfpu1TLFCPs= + 9ebW1gMvot3XBzm83oN5QA+H5d5K3aBB6+zqkgXig5U= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.private.swiftinterface hash - w+O8utiDsGCCKwbPCwKbJ9hk4+A= + MMsQcXNg1Z0MHHm9rqlDWPI0z6A= hash2 - SeIJxuhrK5K/yQh0KaI39c5plIk368H/hYD2t3UHPTY= + +lck5O4NAi/40THG/98BenFXXQWaAZ5sj9tQfHlLfBc= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftdoc @@ -167,44 +167,44 @@ hash - w+O8utiDsGCCKwbPCwKbJ9hk4+A= + MMsQcXNg1Z0MHHm9rqlDWPI0z6A= hash2 - SeIJxuhrK5K/yQh0KaI39c5plIk368H/hYD2t3UHPTY= + +lck5O4NAi/40THG/98BenFXXQWaAZ5sj9tQfHlLfBc= Modules/Mason.swiftmodule/arm64-apple-ios-simulator.swiftmodule hash - qGfMtCXM7buBqQA0qmNFbkM25iY= + jpLNzG2n3GqnkDUmIzvE0PEpBR0= hash2 - bUy3RWQVHCyTH2IgitxGh8edpIEvAFYpEpsg15HwtyE= + /FVCpMZ4CojY6CW2uafoAxmGd2gjMp/7bB+s1yb3bcs= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.abi.json hash - q+lZzE/SKiR8AACyrYKhleHOlTQ= + HclbWQoe1GMN3zPSmDJZmPKuH14= hash2 - CabO83W1GP0rvCWdbelQx/GPgKXeGqFmqfpu1TLFCPs= + 9ebW1gMvot3XBzm83oN5QA+H5d5K3aBB6+zqkgXig5U= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.private.swiftinterface hash - vQKlBAbUCEyEQ7q3b59LYTPAQW4= + DFSx2cOihhdB0rIEf7/uBTW/sAA= hash2 - y9sA0+S+YDtAth9DXgO2uZ/4jCZPiPMiscU/sbQkk8c= + jUEkv3BXuHGDv/6dZc7vMv2sN9zKOiH20OKv9ZWEJGw= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftdoc @@ -222,22 +222,22 @@ hash - vQKlBAbUCEyEQ7q3b59LYTPAQW4= + DFSx2cOihhdB0rIEf7/uBTW/sAA= hash2 - y9sA0+S+YDtAth9DXgO2uZ/4jCZPiPMiscU/sbQkk8c= + jUEkv3BXuHGDv/6dZc7vMv2sN9zKOiH20OKv9ZWEJGw= Modules/Mason.swiftmodule/x86_64-apple-ios-simulator.swiftmodule hash - kjHab+TROnoEMwsTQ9Av78aeCTQ= + EAEjI+/jr2tlM1WJBoYSdePnfKs= hash2 - svG/ARZJAWbR+0qeNwS1TnwZQo0sYRLRewI5Csu5jF8= + cpctQQ2o2PNVCP9xghmJ756YHc/vYRxWOX4zWrnaeKg= Modules/module.modulemap diff --git a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason index 0e7ea450..f76404e8 100644 Binary files a/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason and b/packages/nativescript-masonkit/platforms/ios/Mason.xcframework/ios-arm64_x86_64-simulator/dSYMs/Mason.framework.dSYM/Contents/Resources/DWARF/Mason differ diff --git a/packages/nativescript-masonkit/platforms/ios/src/include/mason_native.h b/packages/nativescript-masonkit/platforms/ios/src/include/mason_native.h index ab343556..a8947c73 100644 --- a/packages/nativescript-masonkit/platforms/ios/src/include/mason_native.h +++ b/packages/nativescript-masonkit/platforms/ios/src/include/mason_native.h @@ -933,7 +933,6 @@ void mason_style_update_with_values(void *style, struct CMasonTrackSizingFunctionArray *grid_template_columns); struct CMasonMinMax mason_util_create_non_repeated_track_sizing_function_with_type_value(int32_t track_type, - int32_t track_value_type, float track_value); char *mason_util_parse_non_repeated_track_sizing_function(struct CMasonNonRepeatedTrackSizingFunctionArray *value); diff --git a/packages/nativescript-masonkit/project.json b/packages/nativescript-masonkit/project.json index 315dbac0..7a75e2a7 100644 --- a/packages/nativescript-masonkit/project.json +++ b/packages/nativescript-masonkit/project.json @@ -1,4 +1,5 @@ { + "name": "nativescript-masonkit", "$schema": "../../node_modules/nx/schemas/project-schema.json", "projectType": "library", "sourceRoot": "packages/nativescript-masonkit", @@ -29,12 +30,12 @@ } }, "build.all": { - "executor": "@nrwl/workspace:run-commands", + "executor": "nx:run-commands", "options": { "commands": ["node tools/scripts/build-finish.ts nativescript-masonkit"], "parallel": false }, - "outputs": ["dist/packages/nativescript-masonkit"], + "outputs": ["{workspaceRoot}/dist/packages/nativescript-masonkit"], "dependsOn": [ { "target": "build.all", @@ -47,43 +48,43 @@ ] }, "build.native.ios.framework.release": { - "outputs": ["dist/packages"], + "outputs": ["{workspaceRoot}/dist/packages"], "options": { "commands": ["sh masonkit-build-ios-framework.sh"], "cwd": "tools/scripts", "parallel": false }, - "executor": "@nrwl/workspace:run-commands" + "executor": "nx:run-commands" }, "build.native.ios.framework.debug": { - "outputs": ["dist/packages"], + "outputs": ["{workspaceRoot}/dist/packages"], "options": { "commands": ["sh masonkit-build-ios-framework.sh"], "cwd": "tools/scripts", "parallel": false }, - "executor": "@nrwl/workspace:run-commands" + "executor": "nx:run-commands" }, "build.native.ios.debug": { - "outputs": ["dist/packages"], + "outputs": ["{workspaceRoot}/dist/packages"], "options": { "commands": ["sh masonkit-build-ios-native.sh"], "cwd": "tools/scripts", "parallel": false }, - "executor": "@nrwl/workspace:run-commands" + "executor": "nx:run-commands" }, "build.native.ios.release": { - "outputs": ["dist/packages"], + "outputs": ["{workspaceRoot}/dist/packages"], "options": { "commands": ["sh masonkit-build-ios-native.sh --release"], "cwd": "tools/scripts", "parallel": false }, - "executor": "@nrwl/workspace:run-commands" + "executor": "nx:run-commands" }, "focus": { - "executor": "@nrwl/workspace:run-commands", + "executor": "nx:run-commands", "options": { "commands": ["nx g @nativescript/plugin-tools:focus-packages nativescript-masonkit"], "parallel": false diff --git a/packages/nativescript-masonkit/src-native/mason-android/app/src/main/java/org/nativescript/mason/masondemo/MainActivity.kt b/packages/nativescript-masonkit/src-native/mason-android/app/src/main/java/org/nativescript/mason/masondemo/MainActivity.kt index 596fa12f..f2496cc2 100644 --- a/packages/nativescript-masonkit/src-native/mason-android/app/src/main/java/org/nativescript/mason/masondemo/MainActivity.kt +++ b/packages/nativescript-masonkit/src-native/mason-android/app/src/main/java/org/nativescript/mason/masondemo/MainActivity.kt @@ -14,103 +14,115 @@ import com.bumptech.glide.Glide import org.nativescript.mason.masonkit.* class MainActivity : AppCompatActivity() { - lateinit var imageView: ImageView - lateinit var rootView: View - lateinit var container: View - lateinit var recyclerView: RecyclerView - val array = ArrayList() - lateinit var adapter: CustomAdapter - lateinit var metrics: DisplayMetrics - - fun dipToPx(value: Float): Float{ - return value * metrics.density - } + lateinit var imageView: ImageView + lateinit var rootView: View + lateinit var container: View + lateinit var recyclerView: RecyclerView + val array = ArrayList() + lateinit var adapter: CustomAdapter + lateinit var metrics: DisplayMetrics + + fun dipToPx(value: Float): Float { + return value * metrics.density + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + Mason.shared = false + metrics = resources.displayMetrics + adapter = CustomAdapter(array, resources.displayMetrics.density) + rootView = findViewById(R.id.rootView) + // container = findViewById(R.id.container) + imageView = findViewById(R.id.imageView) + recyclerView = findViewById(R.id.recyclerView) + + rootView.configure { + it.style.display = Display.Grid - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - Mason.shared = false - metrics = resources.displayMetrics - adapter = CustomAdapter(array, resources.displayMetrics.density) - rootView = findViewById(R.id.rootView) - // container = findViewById(R.id.container) - imageView = findViewById(R.id.imageView) - recyclerView = findViewById(R.id.recyclerView) // rootView.setGap(dipToPx(10f), dipToPx(10f)) // -// rootView.gridTemplateColumns = arrayOf(TrackSizingFunction.AutoRepeat(GridTrackRepetition.AutoFill, -// arrayOf(MinMax.Values(MinSizing.Points(dipToPx(200f)), MaxSizing.Flex(1f))))) + it.style.gridTemplateRows = arrayOf( + TrackSizingFunction.AutoRepeat( + GridTrackRepetition.AutoFill, + arrayOf(MinMax.Values(MinSizing.Points(100f), MaxSizing.Flex(1f))) + ), + TrackSizingFunction.Single( + MinMax.Values(MinSizing.Points(100f), MaxSizing.Flex(1f)) + ) + ) + } - Glide.with(this) - .load("https://hips.hearstapps.com/digitalspyuk.cdnds.net/17/19/1494434353-deadpool.jpg") - .fitCenter() - .override(500, 500) - .into(imageView) +// rootView.gridTemplateRows = arrayOf(TrackSizingFunction.AutoRepeat(GridTrackRepetition.AutoFill, +// arrayOf(MinMax.Flex(1F),MinMax.Flex(1F) ,MinMax.Flex(1F) , MinMax.Flex(1F), MinMax.Flex(1F)))) + Glide.with(this) + .load("https://hips.hearstapps.com/digitalspyuk.cdnds.net/17/19/1494434353-deadpool.jpg") + .fitCenter() + .override(500, 500) + .into(imageView) - val start = System.currentTimeMillis() - val params = ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT - ) - repeat(1000) { - array.add("https://robohash.org/${it + 1}?set=set4") - rootView.node.configure { + val start = System.currentTimeMillis() - } + val params = ViewGroup.LayoutParams( + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT + ) + repeat(1000) { + array.add("https://robohash.org/${it + 1}?set=set4") // val view = TextView(this) // view.text = "Laffy Taffy ${it + 1}" // // container.addView( // view, params // ) - } + } - recyclerView.adapter = adapter + recyclerView.adapter = adapter - recyclerView.layoutManager = LinearLayoutManager(this) + recyclerView.layoutManager = LinearLayoutManager(this) - } + } - class CustomAdapter(private val dataSet: ArrayList, val scale: Float) : - RecyclerView.Adapter() { + class CustomAdapter(private val dataSet: ArrayList, val scale: Float) : + RecyclerView.Adapter() { - class ViewHolder(view: android.view.View) : RecyclerView.ViewHolder(view) { - val textView: TextView - val imageView: ImageView + class ViewHolder(view: android.view.View) : RecyclerView.ViewHolder(view) { + val textView: TextView + val imageView: ImageView - init { - textView = view.findViewById(R.id.listTextView) - imageView = view.findViewById(R.id.listImageView) - } - } + init { + textView = view.findViewById(R.id.listTextView) + imageView = view.findViewById(R.id.listImageView) + } + } - override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder { - val view = LayoutInflater.from(viewGroup.context) - .inflate(R.layout.list_item, viewGroup, false) + override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): ViewHolder { + val view = LayoutInflater.from(viewGroup.context) + .inflate(R.layout.list_item, viewGroup, false) - return ViewHolder(view) - } + return ViewHolder(view) + } - override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) { - val url = dataSet[position] - viewHolder.textView.text = url - Glide - .with(viewHolder.imageView) - .load(url) - .fitCenter() - .override((150 * scale).toInt(), (150 * scale).toInt()) - .into(viewHolder.imageView) - } + override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) { + val url = dataSet[position] + viewHolder.textView.text = url + Glide + .with(viewHolder.imageView) + .load(url) + .fitCenter() + .override((150 * scale).toInt(), (150 * scale).toInt()) + .into(viewHolder.imageView) + } - override fun getItemCount() = dataSet.size + override fun getItemCount() = dataSet.size - } + } } diff --git a/packages/nativescript-masonkit/src-native/mason-android/app/src/main/res/layout/activity_main.xml b/packages/nativescript-masonkit/src-native/mason-android/app/src/main/res/layout/activity_main.xml index 800ba557..0df2ffd7 100644 --- a/packages/nativescript-masonkit/src-native/mason-android/app/src/main/res/layout/activity_main.xml +++ b/packages/nativescript-masonkit/src-native/mason-android/app/src/main/res/layout/activity_main.xml @@ -9,7 +9,6 @@ mason:mason_alignItems="center" mason:mason_flexDirection="column" mason:mason_justifyContent="start" - mason:mason_display="flex" tools:context=".MainActivity">