Skip to content

feat: alpha polish pt1 #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Jan 8, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/demo-angular/package.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
1 change: 1 addition & 0 deletions apps/demo-angular/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "demo-angular",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/demo-angular/src",
"projectType": "application",
1 change: 1 addition & 0 deletions apps/demo/project.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"name": "demo",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "apps/demo/src",
"projectType": "application",
25 changes: 14 additions & 11 deletions nx.json
Original file line number Diff line number Diff line change
@@ -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"]
}
}
}
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -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": {
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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);
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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": "<T>",
"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\""
},
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ import UIKit
import _Concurrency
import _StringProcessing
public struct Line<T> {
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<Mason.MasonLengthPerce
@objc public static func destroy(trackSizingFunctionArray: Swift.UnsafeMutablePointer<Mason.CMasonTrackSizingFunctionArray>)
@objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer<Mason.CMasonNonRepeatedTrackSizingFunctionArray>) -> Swift.String
@objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer<Mason.CMasonTrackSizingFunctionArray>) -> 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<Mason.CMasonNonRepeatedTrackSizingFunctionArray>, _ gridAutoColumns: Swift.UnsafeMutablePointer<Mason.CMasonNonRepeatedTrackSizingFunctionArray>, _ 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<Mason.CMasonTrackSizingFunctionArray>, gridTemplateColumns: Swift.UnsafeMutablePointer<Mason.CMasonTrackSizingFunctionArray>)
@objc override dynamic public init()
@objc deinit
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ import UIKit
import _Concurrency
import _StringProcessing
public struct Line<T> {
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<Mason.MasonLengthPerce
@objc public static func destroy(trackSizingFunctionArray: Swift.UnsafeMutablePointer<Mason.CMasonTrackSizingFunctionArray>)
@objc public static func util_parse_non_repeated_track_sizing_function(_ value: Swift.UnsafeMutablePointer<Mason.CMasonNonRepeatedTrackSizingFunctionArray>) -> Swift.String
@objc public static func util_parse_auto_repeating_track_sizing_function(_ value: Swift.UnsafeMutablePointer<Mason.CMasonTrackSizingFunctionArray>) -> 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<Mason.CMasonNonRepeatedTrackSizingFunctionArray>, _ gridAutoColumns: Swift.UnsafeMutablePointer<Mason.CMasonNonRepeatedTrackSizingFunctionArray>, _ 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<Mason.CMasonTrackSizingFunctionArray>, gridTemplateColumns: Swift.UnsafeMutablePointer<Mason.CMasonTrackSizingFunctionArray>)
@objc override dynamic public init()
@objc deinit
Binary file not shown.
Loading