Compare commits

...

4 Commits

Author SHA1 Message Date
Matt Bruce
8077a5c9ef Merge branch 'develop' into update/tilelet-sample 2023-06-28 09:52:54 -05:00
Matt Bruce
b4c1c919c6 Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2023-06-27 09:32:42 -05:00
Matt Bruce
e1e82ae995 updated text
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
2023-06-27 09:32:28 -05:00
Matt Bruce
d6828532e8 Signed-off-by: Matt Bruce <matt.bruce@verizon.com> 2023-06-27 09:32:08 -05:00
7 changed files with 569 additions and 351 deletions

View File

@ -88,6 +88,17 @@ class DetailViewController: UIViewController {
navigation.pushViewController(viewController, animated: false) navigation.pushViewController(viewController, animated: false)
MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = splitViewController MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = splitViewController
MVMCoreNavigationHandler.shared()?.present(navigation, animated: true) MVMCoreNavigationHandler.shared()?.present(navigation, animated: true)
// Notify of json change
let systemParameters = jsonObject.optionalDictionaryForKey(KeySystemParameters)
loadObject.responseJSON = jsonObject
loadObject.systemParametersJSON = systemParameters
loadObject.responseInfoMap = jsonObject.optionalDictionaryForKey(KeyResponseInfo)
var pages = jsonObject.dictionaryForKey(KeyPageMap)
if !pages.isEmpty {
MVMCoreLoadRequestOperation.cachePages(pages, loadObject: loadObject, error: &errorObject)
}
} else if let errorObject = errorObject { } else if let errorObject = errorObject {
let error = NSError(domain: ErrorDomainNative, code: ErrorCode.initViewController.rawValue, userInfo: [NSLocalizedDescriptionKey: errorObject.messageToLog ?? errorObject.messageToDisplay!]) let error = NSError(domain: ErrorDomainNative, code: ErrorCode.initViewController.rawValue, userInfo: [NSLocalizedDescriptionKey: errorObject.messageToLog ?? errorObject.messageToDisplay!])

View File

@ -0,0 +1,21 @@
{
"ResponseInfo": {
"code": "00000",
"type": "Success"
},
"Page": {
"pageType": "x",
"template": "threeLayer",
"header": {},
"footer": {},
"middle": {
"moleculeName": "container",
"molecule": {
"moleculeName": "badge",
"text": "hello my name is",
"numberOfLines": 4,
"surface": "light"
}
}
}
}

View File

@ -1,297 +1,355 @@
{ {
"ResponseInfo" : { "ResponseInfo": {
"code" : "00000", "code": "00000",
"type" : "Success" "type": "Success"
}, },
"Page": { "Page": {
"pageType":"x", "pageType": "x",
"template":"list", "template": "list",
"header": { "header": {
"moleculeName":"header", "moleculeName": "header",
"molecule": { "molecule": {
"moleculeName": "headlineBody", "moleculeName": "headlineBody",
"headline":{ "headline": {
"moleculeName": "label", "moleculeName": "label",
"text":"Your lines are on Unlimited plans." "text": "Your lines are on Unlimited plans."
},
"body":{
"moleculeName": "label",
"text":"Need something different? Take a minute to explore other plan options."
}
}
}, },
"footer":{ "body": {
"moleculeName":"footer", "moleculeName": "label",
"molecule": { "text": "Need something different? Take a minute to explore other plan options."
"moleculeName":"twoButtonView", }
"primaryButton":{ }
"moleculeName": "button", },
"title":"Explore", "footer": {
"action":{ "moleculeName": "footer",
"actionType": "openPage", "molecule": {
"pageType": "explore" "moleculeName": "twoButtonView",
} "primaryButton": {
}, "moleculeName": "button",
"secondaryButton":{ "title": "Explore",
"moleculeName": "button", "action": {
"title":"Recommend", "actionType": "openPage",
"action":{ "pageType": "explore"
"actionType": "openPage", }
"pageType": "recommend" },
} "secondaryButton": {
} "moleculeName": "button",
"title": "Recommend",
"action": {
"actionType": "openPage",
"pageType": "recommend"
}
}
}
},
"molecules": [
{
"moleculeName": "tabsListItem",
"tabs": {
"moleculeName": "tabs",
"tabs": [
{
"label": {
"moleculeName": "label",
"text": "All"
}
},
{
"label": {
"moleculeName": "label",
"text": "Work Devices"
}
},
{
"label": {
"moleculeName": "label",
"text": "3"
}
},
{
"label": {
"moleculeName": "label",
"text": "4"
}
},
{
"label": {
"moleculeName": "label",
"text": "5"
}
},
{
"label": {
"moleculeName": "label",
"text": "6 Devices"
}
},
{
"label": {
"moleculeName": "label",
"text": "7 Devices"
}
},
{
"label": {
"moleculeName": "label",
"text": "8 Devices"
}
},
{
"label": {
"moleculeName": "label",
"text": "9 Devices"
}
},
{
"label": {
"moleculeName": "label",
"text": "10 Devices"
}
} }
]
}, },
"molecules": [ "molecules": [
[
{ {
"moleculeName": "tabsListItem", "moleculeName": "listItem",
"tabs": { "molecule": {
"moleculeName": "tabs", "moleculeName": "label",
"tabs": [{ "text": "1 0"
"label":{ }
"moleculeName": "label",
"text": "All"
}
} ,{
"label":{
"moleculeName": "label",
"text": "Work Devices"
}},{
"label":{
"moleculeName": "label",
"text": "3"
}},{
"label":{
"moleculeName": "label",
"text": "4"
}},{
"label":{
"moleculeName": "label",
"text": "5"
}},{
"label":{
"moleculeName": "label",
"text": "6 Devices"
}},{
"label":{
"moleculeName": "label",
"text": "7 Devices"
}},{
"label":{
"moleculeName": "label",
"text": "8 Devices"
}},{
"label":{
"moleculeName": "label",
"text": "9 Devices"
}},{
"label":{
"moleculeName": "label",
"text": "10 Devices"
}
}]
}, },
"molecules": [ {
[{ "moleculeName": "listItem",
"moleculeName":"listItem", "molecule": {
"molecule": { "moleculeName": "label",
"moleculeName":"label", "text": "1 1"
"text":"1 0" }
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"1 1"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 2"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 3"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 4"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 5"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 6"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 7"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 8"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 9"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 10"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 11"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"2 12"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"3 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"3 2"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"4 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"4 2"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"5 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"5 2"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"6 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"6 2"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"7 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"7 2"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"8 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"8 2"
}
}],[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"9 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"9 2"
}
}],
[{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"10 1"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label"
,"text":"10 2"
}
}]
]
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName":"label",
"text":"after"
} }
}] ],
} [
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 2"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 3"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 4"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 5"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 6"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 7"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 8"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 9"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 10"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 11"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "2 12"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "3 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "3 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "4 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "4 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "5 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "5 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "6 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "6 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "7 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "7 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "8 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "8 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "9 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "9 2"
}
}
],
[
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "10 1"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "10 2"
}
}
]
]
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "This is a List Item label outside of tabs"
}
}
]
}
} }

View File

@ -5,6 +5,74 @@
"screenHeading": "Select an international plan", "screenHeading": "Select an international plan",
"template": "list", "template": "list",
"molecules": [ "molecules": [
{
"moleculeName": "listItem",
"molecule": {
"directionalIcon": {
"size": "medium"
},
"moleculeName": "tilelet",
"subTitle": {
"text": "You are enrolled in Auto Pay & paper-free billing."
},
"title": {
"text": "Youre getting $50 off on your monthly bill."
},
"action": {
"actionType": "openPage",
"pageType": "tileletPush",
"presentationStyle": "push",
"title": "Test"
}
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "twoButtonView",
"primaryButton": {
"moleculeName": "button",
"title": "Edit",
"groupName": "default",
"action": {
"actionType": "openPage",
"pageType": "updateProfile",
"extraParameters": {
"from": "none"
},
"presentationStyle": "push"
}
}
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf\n\nadsfa\nadfs"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf\n\nadsfa\nadfs"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafafttttt"
}
},
{ {
"moleculeName": "listItem", "moleculeName": "listItem",
"molecule": { "molecule": {
@ -41,70 +109,103 @@
"title": "Auto Pay discount" "title": "Auto Pay discount"
} }
} }
},
{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "twoButtonView",
"primaryButton": {
"moleculeName": "button",
"title": "Edit",
"groupName": "default",
"action": {
"actionType": "openPage",
"pageType": "updateProfile",
"extraParameters": {
"from": "none"
},
"presentationStyle": "push"
}
}
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf\ndafsdssfafs"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf\n\nadsfa\nadfs"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafafttttt"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf\n\nadsfa\nadfs"
}
},{
"moleculeName":"listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafafttttt"
}
} }
], ],
"middle": { "middle": {}
},
"PageMap": {
"tileletPush": {
"pageType": "tileletPush",
"screenHeading": "Select an international plan",
"template": "list",
"molecules": [
{
"moleculeName": "listItem",
"molecule": {
"directionalIcon": {
"size": "medium"
},
"moleculeName": "tilelet",
"subTitle": {
"text": "You are enrolled in Auto Pay & paper-free billing."
},
"title": {
"text": "This was a push test --- awesome."
}
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "twoButtonView",
"primaryButton": {
"moleculeName": "button",
"title": "Edit",
"groupName": "default",
"action": {
"actionType": "openPage",
"pageType": "updateProfile",
"extraParameters": {
"from": "none"
},
"presentationStyle": "push"
}
}
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf"
}
},
{
"moleculeName": "listItem",
"molecule": {
"moleculeName": "label",
"text": "afa\ndasfdsa\nadfadfda\nasadfsafa\nafsafsa\nafsadfas\nadffafaf"
}
},
{
"moleculeName": "listItem",
"molecule": {
"directionalIcon": {
"size": "medium"
},
"moleculeName": "tilelet",
"subTitle": {
"text": "You are enrolled in Auto Pay & paper-free billing."
},
"title": {
"text": "Youre getting $50 off on your monthly bill."
},
"action": {
"actionType": "openPage",
"analyticsData": {
"vzdl.page.displayChannel": "mva",
"vzwi.mvmapp.pageTypeLink": "settingsLanding|Auto Pay discount",
"vzdl.page.id": "settingslanding",
"vzdl.page.linkName": "Auto Pay discount",
"vzdl.page.sourceChannel": "mva",
"vzdl.page.name": "settings landing"
},
"pageType": "managePmts",
"presentationStyle": "push",
"requestURL": "https://mobile-exp-qa2.vzw.com/mobile/nsa/nos/gw/launchapp/l2/webview",
"extraParameters": {
"pageTitle": "Auto Pay discount",
"screenHeading": "Auto Pay discount",
"browserUrl": "https://vzwqa2.verizonwireless.com/digital/nsa/secure/ui/payment/settings#/enrollAandP",
"locale": "EN",
"flowName": "accountsettings"
},
"title": "Auto Pay discount"
}
}
}
],
"middle": {}
} }
} }
} }

View File

@ -56,7 +56,24 @@
"title": "Auto Pay discount" "title": "Auto Pay discount"
} }
} }
},
{
"moleculeName": "stackItem",
"molecule":
{
"directionalIcon": {
"size": "medium"
},
"moleculeName": "tilelet",
"subTitle": {
"text": "Details"
},
"title": {
"text": "Youre getting $50 off on your monthly bill."
}
}
} }
] ]
}, },
"footer": {} "footer": {}

View File

@ -25,6 +25,13 @@
"moleculeName": "toggle", "moleculeName": "toggle",
"fieldKey": "isActive" "fieldKey": "isActive"
} }
},
{
"moleculeName": "stackItem",
"molecule": {
"moleculeName": "badge",
"text": "This is the badge"
}
} }
] ]
}, },
@ -58,3 +65,6 @@
} }
} }

View File

@ -1,3 +1,3 @@
../../SharedFrameworks/VDSColorTokens.xcframework GVJV_VDS_Maven/%40vds-tokens/ios/VDSColorTokens.1.0.6.xcframework.zip ../../SharedFrameworks/VDSColorTokens.xcframework GVJV_VDS_Maven/%40vds-tokens/ios/VDSColorTokens.2.0.0.xcframework.zip
../../SharedFrameworks/VDSFormControlsTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSFormControlsTokens.1.0.7.xcframework.zip ../../SharedFrameworks/VDSFormControlsTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSFormControlsTokens.1.0.7.xcframework.zip
../../SharedFrameworks/VDSTypographyTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSTypographyTokens.2.0.0.xcframework.zip ../../SharedFrameworks/VDSTypographyTokens.xcframework GVJV_VDS_Maven/@vds-tokens/ios/VDSTypographyTokens.2.0.0.xcframework.zip