From 96555b94c305b5b19f020ed1ffc22b7aa0536577 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Tue, 15 Aug 2023 11:25:42 -0400 Subject: [PATCH 1/3] Split and notifications --- .../JSONCreator/DetailViewController.swift | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/JSONCreator_iOS/JSONCreator/DetailViewController.swift b/JSONCreator_iOS/JSONCreator/DetailViewController.swift index 339a265..4ccf126 100644 --- a/JSONCreator_iOS/JSONCreator/DetailViewController.swift +++ b/JSONCreator_iOS/JSONCreator/DetailViewController.swift @@ -78,17 +78,26 @@ class DetailViewController: UIViewController { let loadObject = MVMCoreLoadObject(pageJSON: page, modulesJSON: jsonObject.optionalDictionaryForKey(KeyModuleMap), requestParameters: nil, dataForPage: nil, delegateObject: nil), viewController.shouldFinishProcessingLoad(loadObject, error: &errorObject) { - //let split = MVMCoreUISplitViewController.setup(asMainController: nil, rightPanel: nil)! - DispatchQueue.main.asyncAfter(deadline: DispatchTime.now() + 2) { - viewController.navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.close)) + Task(priority: .userInitiated) { + let gr = UILongPressGestureRecognizer(target: self, action: #selector(DetailViewController.close)) + viewController.view.addGestureRecognizer(gr) + + let topAlert = NotificationContainerView() + CoreUIObject.sharedInstance()?.topNotificationHandler = NotificationHandler(with: topAlert) + let split = MVMCoreUISplitViewController.setup(asMainController: nil, rightPanel: nil, topAlert: topAlert)! + _ = split.view // Force loadView + //split.navigationController?.setViewControllers([viewController], animated: false) + + let done = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(self.close)) + let spacer = UIBarButtonItem(barButtonSystemItem: .flexibleSpace, target: self, action: nil) + split.navigationController?.isToolbarHidden = false + viewController.setToolbarItems([spacer, done], animated: false) + split.navigationController?.setToolbarItems([spacer, done], animated: false) + + NavigationHandler.shared().viewControllerToPresentOn = splitViewController + await NavigationHandler.shared().present(viewController: split) + await NavigationHandler.shared().push(viewController: viewController, animated: false) } - let gr = UILongPressGestureRecognizer(target: self, action: #selector(DetailViewController.close)) - viewController.view.addGestureRecognizer(gr) - let navigation = NavigationController.setupNavigationControllerAsMainController()! - navigation.pushViewController(viewController, animated: false) - MVMCoreNavigationHandler.shared()?.viewControllerToPresentOn = splitViewController - MVMCoreNavigationHandler.shared()?.present(navigation, animated: true) - } else if let errorObject = errorObject { let error = NSError(domain: ErrorDomainNative, code: ErrorCode.initViewController.rawValue, userInfo: [NSLocalizedDescriptionKey: errorObject.messageToLog ?? errorObject.messageToDisplay!]) showError(error) @@ -100,7 +109,10 @@ class DetailViewController: UIViewController { } @objc func close() { - MVMCoreNavigationHandler.shared()?.dismissTopViewController(animated: true) + guard let splitViewController = splitViewController else { return } + Task(priority: .userInitiated) { + await NavigationHandler.shared().navigate(with: .dismiss(viewController: splitViewController)) + } } } From 53d79daa94fa7af4282a9f634a0aacd43b700abb Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Tue, 15 Aug 2023 11:30:26 -0400 Subject: [PATCH 2/3] JSON updates --- .../JSON/DesignedComponents/Headers/H1.json | 11 +++ .../DesignedComponents/Headers/H1Button.json | 28 ++++++++ .../DesignedComponents/Headers/H1Landing.json | 19 +++-- .../JSON/DesignedComponents/Headers/H2.json | 23 +++++- .../DesignedComponents/Headers/H2Buttons.json | 12 ++++ .../Headers/H2CaretButton.json | 19 +++++ .../DesignedComponents/Headers/H2Link.json | 19 +++++ .../Headers/H2PricingTwoRows.json | 14 ++-- .../Headers/H2TinyButton.json | 19 +++++ .../List/Device/SmallButton.json | 29 ++++++++ .../List/Device/SmallLink.json | 31 ++++++++ .../List/LeftVariable/CheckboxAll.json | 8 +-- .../List/LeftVariable/CheckboxBdy.json | 4 +- .../List/LeftVariable/Icon.json | 6 +- .../List/LeftVariable/IconAll.json | 36 ++++++++++ .../List/LeftVariable/IconAllRight.json | 40 +++++++++++ .../List/LeftVariable/NumberedAll.json | 24 +++++++ .../List/LeftVariable/NumberedBody.json | 13 ++++ .../List/LeftVariable/RadioButtonAll.json | 26 +++++++ .../List/LeftVariable/RadioButtonBdy.json | 15 ++++ .../List/LeftVariable/RadioButtonImage.json | 30 ++++++++ .../Miscellaneous/ListProgressBarData.json | 23 ++++++ .../{ => Miscellaneous}/ProgressBarThin.json | 6 +- .../List/Miscellaneous/StarRating.json | 18 +++++ .../List/Miscellaneous/StoreLocator.json | 13 ++-- .../OneColumn/ListOneColumnFullWidthAll.json | 27 +++++++ .../ListOneColumnFullWidthTextBodyText.json | 6 +- .../List/RightVariable/Button.json | 30 ++++++++ .../List/RightVariable/DataBar.json | 4 +- .../List/RightVariable/Payments.json | 2 +- .../List/RightVariable/PriceChangeAll.json | 10 +-- .../List/RightVariable/PriceChangeBody.json | 6 +- .../List/RightVariable/RVCaretAll.json | 27 +++++++ .../List/RightVariable/Wheel.json | 4 +- .../List/ThreeColumn/BillChanges.json | 13 ++++ .../List/ThreeColumn/BillHistory.json | 13 ++++ .../List/ThreeColumn/Data.json | 13 ++++ .../List/ThreeColumn/IntData.json | 18 +++++ .../List/ThreeColumn/SpeedTest.json | 71 +++++++++++++++++++ .../List/TwoColumn/CompareChanges.json | 20 +++--- .../List/TwoColumn/Dropdown.json | 9 +++ .../List/TwoColumn/PriceDescription.json | 8 +-- .../List/TwoColumn/PriceDetails.json | 6 +- .../DesignedComponents/Lockups/Doughtnut.json | 34 +++++++++ .../Lockups/LockupsPlanNames.json | 13 ++++ .../Lockups/LockupsPlanSMLXL.json | 25 +++++++ .../OneColumn/DividerShort.json | 9 +++ .../OneColumn/DividerTall.json | 9 +++ .../SectionDividers/OneColumn/FullWidth.json | 4 +- .../ThreeColumn/BillChangesDivider.json | 13 ++++ .../ThreeColumn/BillHistoryDivider.json | 13 ++++ .../ThreeColumn/DataDivider.json | 13 ++++ .../ThreeColumn/SpeedTestDivider.json | 13 ++++ .../TwoColumn/DividerSubsection.json | 9 +++ 54 files changed, 856 insertions(+), 72 deletions(-) create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Button.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Buttons.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2CaretButton.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Link.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2TinyButton.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallButton.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallLink.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAll.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAllRight.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedAll.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedBody.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonAll.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonBdy.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonImage.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ListProgressBarData.json rename JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/{ => Miscellaneous}/ProgressBarThin.json (70%) create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StarRating.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthAll.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Button.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/RVCaretAll.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillChanges.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillHistory.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/Data.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/IntData.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/SpeedTest.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/Dropdown.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/Doughtnut.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanNames.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanSMLXL.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerShort.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerTall.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillChangesDivider.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillHistoryDivider.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/DataDivider.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/SpeedTestDivider.json create mode 100644 JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/TwoColumn/DividerSubsection.json diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1.json new file mode 100644 index 0000000..38717cf --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1.json @@ -0,0 +1,11 @@ +"moleculeName":"headerH1", +"headlineBody": { + "headline": { + "moleculeName": "label", + "text": "headline" + }, + "body":{ + "moleculeName": "label", + "text": "body" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Button.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Button.json new file mode 100644 index 0000000..a6fd6c4 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Button.json @@ -0,0 +1,28 @@ +"moleculeName":"headerH1Btn", +"headlineBody": { + "headline": { + "moleculeName": "label", + "text": "headline" + }, + "body":{ + "moleculeName": "label", + "text": "body" + } +}, +"buttons": { + "moleculeName": "twoButtonView", + "primaryButton": { + "moleculeName": "button", + "title": "primary", + "action": { + "actionType": "noop" + } + }, + "secondaryButton": { + "moleculeName": "button", + "title": "secondary", + "action": { + "actionType": "noop" + } + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Landing.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Landing.json index 421a98b..71a955e 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Landing.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H1Landing.json @@ -1,23 +1,23 @@ "moleculeName":"headerH1Landing", "headline":{ "moleculeName": "label", - "text":"x" + "text":"headline" }, "headline2":{ "moleculeName": "label", - "text":"x" + "text":"headline2" }, "subHeadline":{ "moleculeName": "label", - "text":"y" + "text":"subHeadline" }, "body":{ "moleculeName": "label", - "text":"y" + "text":"body" }, "link":{ "moleculeName": "link", - "title":"y", + "title":"link", "action": { "actionType": "back" } @@ -26,17 +26,16 @@ "moleculeName":"twoButtonView", "primaryButton":{ "moleculeName": "button", - "title":"x", + "title":"primary", "action": { - "actionType": "openPage", - "pageType": "verifyZip" + "actionType": "noop" } }, "secondaryButton":{ "moleculeName": "button", - "title":"x", + "title":"secondary", "action": { - "actionType": "back" + "actionType": "noop" } } } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2.json index 2f065c0..2cef4b2 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2.json @@ -1,12 +1,29 @@ -"moleculeName":"headerH2", +"moleculeName":"headerH2Btns", "headlineBody": { "moleculeName": "headlineBody", "headline":{ "moleculeName": "label", - "text":"x" + "text":"headline" }, "body":{ "moleculeName": "label", - "text":"y" + "text":"body" + } +}, +"buttons": { + "moleculeName": "twoButtonView", + "primaryButton": { + "moleculeName": "button", + "title": "primary", + "action": { + "actionType": "noop" + } + }, + "secondaryButton": { + "moleculeName": "button", + "title": "secondary", + "action": { + "actionType": "noop" + } } } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Buttons.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Buttons.json new file mode 100644 index 0000000..3bb9ca6 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Buttons.json @@ -0,0 +1,12 @@ +"moleculeName":"headerH2", +"headlineBody": { + "moleculeName": "headlineBody", + "headline":{ + "moleculeName": "label", + "text":"headline" + }, + "body":{ + "moleculeName": "label", + "text":"body" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2CaretButton.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2CaretButton.json new file mode 100644 index 0000000..b1c7e2d --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2CaretButton.json @@ -0,0 +1,19 @@ +"moleculeName":"headerH2CrtBtn", +"headlineBody": { + "moleculeName": "headlineBody", + "headline":{ + "moleculeName": "label", + "text":"headline" + }, + "body":{ + "moleculeName": "label", + "text":"body" + } +}, +"caretLink": { + "moleculeName": "caretLink", + "title": "link", + "action": { + "actionType": "noop" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Link.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Link.json new file mode 100644 index 0000000..9d582e8 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2Link.json @@ -0,0 +1,19 @@ +"moleculeName":"headerH2Link", +"headlineBody": { + "moleculeName": "headlineBody", + "headline":{ + "moleculeName": "label", + "text":"headline" + }, + "body":{ + "moleculeName": "label", + "text":"body" + } +}, +"link": { + "moleculeName": "link", + "title": "link", + "action": { + "actionType": "noop" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2PricingTwoRows.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2PricingTwoRows.json index 52e92dd..425e9e5 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2PricingTwoRows.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2PricingTwoRows.json @@ -1,29 +1,29 @@ "moleculeName":"headerH2TwoRows", "headline":{ "moleculeName": "label", - "text":"x" + "text":"headline" }, "body":{ "moleculeName": "label", - "text":"y" + "text":"body" }, "subBody":{ "moleculeName": "label", - "text":"y" + "text":"subBody" }, "body2":{ "moleculeName": "label", - "text":"y" + "text":"body2" }, "subBody2":{ "moleculeName": "label", - "text":"y" + "text":"subBody2" }, "body3":{ "moleculeName": "label", - "text":"y" + "text":"body3" }, "subBody3":{ "moleculeName": "label", - "text":"y" + "text":"subBody3" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2TinyButton.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2TinyButton.json new file mode 100644 index 0000000..a915118 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Headers/H2TinyButton.json @@ -0,0 +1,19 @@ +"moleculeName":"headerH2BtnTny", +"headlineBody": { + "moleculeName": "headlineBody", + "headline":{ + "moleculeName": "label", + "text":"headline" + }, + "body":{ + "moleculeName": "label", + "text":"body" + } +}, +"button": { + "moleculeName": "button", + "title": "button", + "action": { + "actionType": "noop" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallButton.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallButton.json new file mode 100644 index 0000000..7bdcd79 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallButton.json @@ -0,0 +1,29 @@ +"moleculeName" : "listDvcBtnS", +"eyebrow" : { + "moleculeName" : "label", + "text" : "8.0 GB" +}, +"headline" : { + "moleculeName" : "label", + "text" : "Verizon L data" +}, +"body" : { + "moleculeName" : "label", + "text" : "2.0 GB" +}, +"body2" : { + "moleculeName" : "label", + "text" : "Additional data" +}, +"button": { + "moleculeName": "button", + "title":"hello", + "action": { + "actionType":"openPage", + "pageType":"hello" + } +}, +"image":{ + "moleculeName":"image", + "image": "https://mobile.vzw.com/hybridClient/is/image/VerizonWireless/iPhoneXr_Black_PureAngles" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallLink.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallLink.json new file mode 100644 index 0000000..186a2f5 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Device/SmallLink.json @@ -0,0 +1,31 @@ +"moleculeName" : "listDvcLnkS", +"eyebrow" : { + "moleculeName" : "label", + "text" : "8.0 GB" +}, +"headline" : { + "moleculeName" : "label", + "text" : "Verizon L data" +}, +"body" : { + "moleculeName" : "label", + "text" : "2.0 GB" +}, +"body2" : { + "moleculeName" : "label", + "text" : "Additional data" +}, +"twoLinkView": { + "leftLink": { + "moleculeName": "link", + "title":"hello", + "action": { + "actionType":"openPage", + "pageType":"hello" + } + } +}, +"image":{ + "moleculeName":"image", + "image": "https://mobile.vzw.com/hybridClient/is/image/VerizonWireless/iPhoneXr_Black_PureAngles" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxAll.json index aa6ca83..d4ae318 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxAll.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxAll.json @@ -6,19 +6,19 @@ "moleculeName" : "eyebrowHeadlineBodyLink", "eyebrow" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "eyebrow" }, "headline" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline" }, "body" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "body" }, "link" : { "moleculeName" : "link", - "title" : "Hello", + "title" : "link", "action": { "actionType":"back" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxBdy.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxBdy.json index 1cd4698..ca193b2 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxBdy.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/CheckboxBdy.json @@ -6,10 +6,10 @@ "moleculeName" : "headlineBody", "headline" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline" }, "body" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "body" } } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/Icon.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/Icon.json index b41a4f6..13a1222 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/Icon.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/Icon.json @@ -2,15 +2,15 @@ "moleculeName": "listLVImg", "leftLabel": { "moleculeName": "label", - "text": "Lorem ipsum" + "text": "left" }, "rightLabel": { "moleculeName": "label", - "text": "Label" + "text": "right" }, "image": { "moleculeName": "image", - "image": "imageName_PayPal_logo" + "image": "alert_standard" }, "action" : { "disabled" : false, diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAll.json new file mode 100644 index 0000000..c7fbdaa --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAll.json @@ -0,0 +1,36 @@ + +"moleculeName": "listLVImgAll", +"eyebrowHeadlineBodyLink" : { + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + }, + "link" : { + "moleculeName" : "link", + "title" : "link", + "action": { + "actionType":"back" + } + } +}, +"image": { + "moleculeName": "image", + "image": "alert_standard" +}, +"action" : { + "disabled" : false, + "analyticsData" : { + }, + "title" : "Manage plan", + "actionType" : "openPage", + "pageType" : "planLanding" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAllRight.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAllRight.json new file mode 100644 index 0000000..147d457 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/IconAllRight.json @@ -0,0 +1,40 @@ + +"moleculeName": "listLVImgRCAll", +"eyebrowHeadlineBodyLink" : { + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + }, + "link" : { + "moleculeName" : "link", + "title" : "link", + "action": { + "actionType":"back" + } + } +}, +"rightLabel": { + "moleculeName": "label", + "text": "right" +}, +"image": { + "moleculeName": "image", + "image": "alert_standard" +}, +"action" : { + "disabled" : false, + "analyticsData" : { + }, + "title" : "Manage plan", + "actionType" : "openPage", + "pageType" : "planLanding" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedAll.json new file mode 100644 index 0000000..f6d0821 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedAll.json @@ -0,0 +1,24 @@ +"number": 1, +"moleculeName" : "listLVNAll", +"eyebrowHeadlineBodyLink" : { + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + }, + "link" : { + "moleculeName" : "link", + "title" : "link", + "action": { + "actionType":"back" + } + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedBody.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedBody.json new file mode 100644 index 0000000..0db1911 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/NumberedBody.json @@ -0,0 +1,13 @@ +"number": 1, +"moleculeName" : "listLVNLBdy", +"headlineBody" : { + "moleculeName" : "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonAll.json new file mode 100644 index 0000000..86b3733 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonAll.json @@ -0,0 +1,26 @@ +"radioButton" : { + "moleculeName" : "radioButton" +}, +"moleculeName" : "listLVRBAll", +"eyebrowHeadlineBodyLink" : { + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + }, + "link" : { + "moleculeName" : "link", + "title" : "link", + "action": { + "actionType":"back" + } + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonBdy.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonBdy.json new file mode 100644 index 0000000..03a6f6c --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonBdy.json @@ -0,0 +1,15 @@ +"radioButton" : { + "moleculeName" : "radioButton" +}, +"moleculeName" : "listLVRBBdy", +"headlineBody" : { + "moleculeName" : "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonImage.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonImage.json new file mode 100644 index 0000000..5293544 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/LeftVariable/RadioButtonImage.json @@ -0,0 +1,30 @@ +"radioButton" : { + "moleculeName" : "radioButton" +}, +"moleculeName" : "listLVRBImg", +"image": { + "moleculeName": "image", + "image": "alert_standard" +}, +"eyebrowHeadlineBodyLink" : { + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + }, + "link" : { + "moleculeName" : "link", + "title" : "Hello", + "action": { + "actionType":"back" + } + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ListProgressBarData.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ListProgressBarData.json new file mode 100644 index 0000000..54c2e40 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ListProgressBarData.json @@ -0,0 +1,23 @@ +"moleculeName" : "listPrgBarData", +"progressBar" : { + "moleculeName" : "multiProgressBar", + "progressList": [{ + "percent" : 40, + "color" : "red" + },{ + "percent" : 30, + "color" : "blue" + }] + +}, +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"action" : { + "actionType" : "back" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "right" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ProgressBarThin.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ProgressBarThin.json similarity index 70% rename from JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ProgressBarThin.json rename to JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ProgressBarThin.json index fdbd70d..0821a2f 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ProgressBarThin.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/ProgressBarThin.json @@ -1,14 +1,14 @@ "moleculeName" : "listPrgBarThin", "leftBody" : { "moleculeName" : "label", - "text" : "x alkdfjaldf kjasdlkfj salkdfj aslkfdj lksafdj aslkdfj slkfd jsalk jasdlk jsadl kjakslfj " + "text" : "body" }, "action" : { "actionType" : "back" }, "rightLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "right" }, "rightBar" : { "moleculeName" : "line", @@ -21,5 +21,5 @@ }, "leftHeadline" : { "moleculeName" : "label", - "text" : "alkjf dsalkjf kjadfl kja" + "text" : "headline" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StarRating.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StarRating.json new file mode 100644 index 0000000..8a416fe --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StarRating.json @@ -0,0 +1,18 @@ + + "moleculeName": "planLockup", + "planLabel": { + "moleculeName": "label", + "text": "XL" + }, +"headline": { + "moleculeName": "label", + "text": "headline" +}, +"subHeadline": { + "moleculeName": "label", + "text": "subHeadline" +}, +"body": { + "moleculeName": "label", + "text": "body" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StoreLocator.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StoreLocator.json index 9813b58..15078cf 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StoreLocator.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/Miscellaneous/StoreLocator.json @@ -5,18 +5,21 @@ }, "leftHeadline": { "moleculeName": "label", - "text": "Lorem ipsum dolor sit." + "text": "headline" }, "leftBody": { "moleculeName": "label", - "text": "Lorem ipsum dolor sit." + "text": "body" }, "leftSubBody": { "moleculeName": "label", - "text": "Lorem ipsum dolor sit." + "text": "subBody" }, "rightLabel": { "moleculeName": "label", - "text": "Label" - } + "text": "right" + }, +"action": { + "actionType": "noop" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthAll.json new file mode 100644 index 0000000..b14cb8f --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthAll.json @@ -0,0 +1,27 @@ +"moleculeName" : "list1CTxt", +"eyebrow": { + "moleculeName" : "label", + "text" : "eyebrow" +}, +"headline": { + "moleculeName" : "label", + "text" : "headline" +}, +"subHeadline": { + "moleculeName" : "label", + "text" : "subHeadline" +}, +"body": { + "moleculeName" : "label", + "text" : "body" +}, +"link": { + "moleculeName" : "link", + "title" : "link", + "action": { + "actionType": "noop" + } +}, +"action": { + "actionType": "back" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.json index 7ee07f8..0a4318b 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/OneColumn/ListOneColumnFullWidthTextBodyText.json @@ -2,13 +2,13 @@ "headlineBody" : { "headline": { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline" }, "body": { "moleculeName" : "label", - "text" : "Hello" + "text" : "body" } }, "action": { - "actionType": "back" + "actionType": "noop" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Button.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Button.json new file mode 100644 index 0000000..bfd16b3 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Button.json @@ -0,0 +1,30 @@ +"moleculeName" : "listRVBtn", +"button" : { + "moleculeName" : "button", + "title": "button", + "action": { + "actionType": "noop" + } +}, +"eyebrowHeadlineBodyLink" : { + "body" : { + "moleculeName" : "label", + "text" : "Body" + }, + "link" : { + "moleculeName" : "link", + "title" : "TextButton", + "action" : { + "actionType" : "back" + } + }, + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "Eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "Headline" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/DataBar.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/DataBar.json index 24f1703..aee9cdf 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/DataBar.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/DataBar.json @@ -1,6 +1,6 @@ "rightLabel" : { "moleculeName" : "label", - "text" : "heeeeyy" + "text" : "right" }, "moleculeName" : "listRVLine", "bar" : { @@ -9,7 +9,7 @@ }, "leftLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "left" }, "action": { "actionType": "back" diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Payments.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Payments.json index 2c2f478..50791a0 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Payments.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Payments.json @@ -4,5 +4,5 @@ }, "leftLabel" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "left" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeAll.json index 4e21b38..e404b79 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeAll.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeAll.json @@ -2,19 +2,19 @@ "eyebrowHeadlineBodyLink": { "eyebrow" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "eyebrow" }, "headline" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "headline" }, "body" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "body" }, "link" : { "moleculeName" : "link", - "title" : "Hello", + "title" : "link", "action": { "actionType":"back" } @@ -22,7 +22,7 @@ }, "rightLabel" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "right" }, "arrow": { "moleculeName": "arrow" diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeBody.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeBody.json index 5480ddd..a76572b 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeBody.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/PriceChangeBody.json @@ -3,16 +3,16 @@ "moleculeName":"headlineBody", "headline" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "headline" }, "body" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "body" } }, "rightLabel" : { "moleculeName" : "label", - "text" : "Hello Ryan!!!" + "text" : "right" }, "arrow": { "moleculeName": "arrow" diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/RVCaretAll.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/RVCaretAll.json new file mode 100644 index 0000000..c4d4581 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/RVCaretAll.json @@ -0,0 +1,27 @@ +"moleculeName" : "listRVCaretAll", +"rightLabel" : { + "moleculeName" : "label", + "text": "right" +}, +"eyebrowHeadlineBodyLink" : { + "body" : { + "moleculeName" : "label", + "text" : "Body" + }, + "link" : { + "moleculeName" : "link", + "title" : "TextButton", + "action" : { + "actionType" : "back" + } + }, + "moleculeName" : "eyebrowHeadlineBodyLink", + "eyebrow" : { + "moleculeName" : "label", + "text" : "Eyebrow" + }, + "headline" : { + "moleculeName" : "label", + "text" : "Headline" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json index 069e5c5..e6c9569 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/RightVariable/Wheel.json @@ -1,6 +1,6 @@ "rightLabel" : { "moleculeName" : "label", - "text" : "heeeeyy" + "text" : "right" }, "moleculeName" : "listRVWheel", "wheel" : { @@ -8,7 +8,7 @@ }, "leftLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "left" }, "action": { "actionType": "back" diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillChanges.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillChanges.json new file mode 100644 index 0000000..8b9fd42 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillChanges.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CBillChg", +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"centerLabel" : { + "moleculeName" : "label", + "text" : "center" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "right" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillHistory.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillHistory.json new file mode 100644 index 0000000..c174381 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/BillHistory.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CBillHst", +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"centerLabel" : { + "moleculeName" : "label", + "text" : "center" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "right" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/Data.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/Data.json new file mode 100644 index 0000000..54e4df8 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/Data.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CDataUsg", + "leftLabel" : { + "moleculeName" : "label", + "text" : "8.0 GB" + }, + "centerLabel" : { + "moleculeName" : "label", + "text" : "Verizon L data" + }, + "rightLabel" : { + "moleculeName" : "label", + "text" : "2.0 GB" + } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/IntData.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/IntData.json new file mode 100644 index 0000000..b7d5874 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/IntData.json @@ -0,0 +1,18 @@ +"moleculeName" : "list3CIntData", + "leftLabel" : { + "moleculeName" : "label", + "text" : "8.0 GB" + }, + "centerLabel" : { + "moleculeName" : "label", + "text" : "Verizon L data" + }, + "rightLabel" : { + "moleculeName" : "label", + "text" : "2.0 GB" + }, +"arrow": { + "moleculeName": "arrow", + "color": "green", + "degrees": 270 +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/SpeedTest.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/SpeedTest.json new file mode 100644 index 0000000..2b381bf --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/ThreeColumn/SpeedTest.json @@ -0,0 +1,71 @@ +"moleculeName" : "list3CSpdTst", +"title": { + "moleculeName" : "label", + "text" : "title" +}, +"topLeftHeadlineBody" : { + "moleculeName": "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +}, +"topCenterHeadlineBody" : { + "moleculeName": "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +}, +"topRightHeadlineBody" : { + "moleculeName": "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +}, +"bottomLeftHeadlineBody" : { + "moleculeName": "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +}, +"bottomCenterHeadlineBody" : { + "moleculeName": "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +}, +"bottomRightHeadlineBody" : { + "moleculeName": "headlineBody", + "headline" : { + "moleculeName" : "label", + "text" : "headline" + }, + "body" : { + "moleculeName" : "label", + "text" : "body" + } +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/CompareChanges.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/CompareChanges.json index 4c76917..a9e52d7 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/CompareChanges.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/CompareChanges.json @@ -1,46 +1,46 @@ "moleculeName" : "list2CCmpr1", "leftHeadline1" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline1" }, "leftHeadline2" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline2" }, "leftHeadline3" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline3" }, "leftBody" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "body" }, "leftLink" : { "moleculeName" : "label", - "title" : "Hello", + "title" : "link", "action": { "actionType": "back" } }, "rightHeadline1" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline1" }, "rightHeadline2" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline2" }, "rightHeadline3" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline3" }, "rightBody" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "body" }, "rightLink" : { "moleculeName" : "label", - "title" : "Hello", + "title" : "link", "action": { "actionType": "back" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/Dropdown.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/Dropdown.json new file mode 100644 index 0000000..18c9fe9 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/Dropdown.json @@ -0,0 +1,9 @@ +"moleculeName" : "list2CDrpDrp1", +"leftDropDown" : { + "moleculeName": "dropDown", + "options": ["Option1","Option2","Option3"] +}, +"rightDropDown" : { + "moleculeName": "dropDown", + "options": ["Option1","Option2","Option3"] +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDescription.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDescription.json index 18baf85..728af7e 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDescription.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDescription.json @@ -1,17 +1,17 @@ "moleculeName" : "list2CTxtPrc1", "leftHeadline" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "headline" }, "leftBody" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "body" }, "rightLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "right" }, "rightSubLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "rightSub" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDetails.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDetails.json index bd1645a..d50957d 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDetails.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/List/TwoColumn/PriceDetails.json @@ -1,9 +1,9 @@ -"moleculeName" : "list2CTxtPrc1", +"moleculeName" : "list2CTxtPrc2", "leftLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "left" }, "rightLabel" : { "moleculeName" : "label", - "text" : "Hello" + "text" : "right" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/Doughtnut.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/Doughtnut.json new file mode 100644 index 0000000..d276577 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/Doughtnut.json @@ -0,0 +1,34 @@ +"moleculeName" : "doughnutChart", +"title" : { + "moleculeName" : "label", + "text" : "title" +}, +"subtitle" : { + "moleculeName" : "label", + "text" : "subtitle" +}, +"sections" : [{ + "moleculeName": "doughnutChartItem", + "label": { + "moleculeName" : "label", + "text" : "subtitle" + }, + "percent": 22, + "color": "green" +},{ + "moleculeName": "doughnutChartItem", + "label": { + "moleculeName" : "label", + "text" : "subtitle" + }, + "percent": 15, + "color": "blue" +},{ + "moleculeName": "doughnutChartItem", + "label": { + "moleculeName" : "label", + "text" : "subtitle" + }, + "percent": 35, + "color": "green" +}] diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanNames.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanNames.json new file mode 100644 index 0000000..f32c41e --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanNames.json @@ -0,0 +1,13 @@ +"moleculeName" : "planNamesLockup", +"headline" : { + "moleculeName" : "label", + "text" : "headline" +}, +"subHeadline" : { + "moleculeName" : "label", + "text" : "subHeadline" +}, +"body" : { + "moleculeName" : "label", + "text" : "body" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanSMLXL.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanSMLXL.json new file mode 100644 index 0000000..0821a2f --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/Lockups/LockupsPlanSMLXL.json @@ -0,0 +1,25 @@ +"moleculeName" : "listPrgBarThin", +"leftBody" : { + "moleculeName" : "label", + "text" : "body" +}, +"action" : { + "actionType" : "back" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "right" +}, +"rightBar" : { + "moleculeName" : "line", + "backgroundColor" : "red" +}, +"progressBar" : { + "moleculeName" : "progressBar", + "percent" : 40, + "color" : "red" +}, +"leftHeadline" : { + "moleculeName" : "label", + "text" : "headline" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerShort.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerShort.json new file mode 100644 index 0000000..74b2410 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerShort.json @@ -0,0 +1,9 @@ +"moleculeName" : "list1CTxtDiv1", +"headline" : { + "moleculeName" : "label", + "text" : "headline" +}, +"body" : { + "moleculeName" : "label", + "text" : "body" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerTall.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerTall.json new file mode 100644 index 0000000..5b96913 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/DividerTall.json @@ -0,0 +1,9 @@ +"moleculeName" : "list1CTxtDiv2", +"headline" : { + "moleculeName" : "label", + "text" : "headline" +}, +"body" : { + "moleculeName" : "label", + "text" : "body" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/FullWidth.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/FullWidth.json index 3b549a3..efc094c 100644 --- a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/FullWidth.json +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/OneColumn/FullWidth.json @@ -1,9 +1,9 @@ "moleculeName" : "list1CTxtDiv3", "headline" : { "moleculeName" : "label", - "text" : "8.0 GB" + "text" : "headline" }, "body" : { "moleculeName" : "label", - "text" : "Verizon L data" + "text" : "body" } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillChangesDivider.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillChangesDivider.json new file mode 100644 index 0000000..ddb1151 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillChangesDivider.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CBillChgDiv", +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"centerLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "left" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillHistoryDivider.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillHistoryDivider.json new file mode 100644 index 0000000..bb1f4b5 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/BillHistoryDivider.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CBillHisDiv", +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"centerLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "left" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/DataDivider.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/DataDivider.json new file mode 100644 index 0000000..fe6a8bb --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/DataDivider.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CDataUsgDiv", + "leftLabel" : { + "moleculeName" : "label", + "text" : "8.0 GB" + }, + "centerLabel" : { + "moleculeName" : "label", + "text" : "Verizon L data" + }, + "rightLabel" : { + "moleculeName" : "label", + "text" : "2.0 GB" + } diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/SpeedTestDivider.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/SpeedTestDivider.json new file mode 100644 index 0000000..9cea8bf --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/ThreeColumn/SpeedTestDivider.json @@ -0,0 +1,13 @@ +"moleculeName" : "list3CSpdTstDiv", +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"centerLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "left" +} diff --git a/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/TwoColumn/DividerSubsection.json b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/TwoColumn/DividerSubsection.json new file mode 100644 index 0000000..3bcaaed --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/JSON/DesignedComponents/SectionDividers/TwoColumn/DividerSubsection.json @@ -0,0 +1,9 @@ +"moleculeName" : "list2CSbscDiv", +"leftLabel" : { + "moleculeName" : "label", + "text" : "left" +}, +"rightLabel" : { + "moleculeName" : "label", + "text" : "right" +} From 8d15e513be52b774c9a5ecf916d525b68a0fd3a6 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Tue, 15 Aug 2023 11:31:53 -0400 Subject: [PATCH 3/3] artifactory --- .../JSONCreator.xcodeproj/project.pbxproj | 4 +- .../xcschemes/Artifactory.xcscheme | 66 +++++++++++++++++++ 2 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 JSONCreator_iOS/JSONCreator.xcodeproj/xcshareddata/xcschemes/Artifactory.xcscheme diff --git a/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj b/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj index 7514c7c..6958ffc 100644 --- a/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj +++ b/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj @@ -507,7 +507,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = FCMA4QKS77; + DEVELOPMENT_TEAM = 59V5935DHZ; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/../SharedFrameworks", @@ -531,7 +531,7 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; - DEVELOPMENT_TEAM = FCMA4QKS77; + DEVELOPMENT_TEAM = 59V5935DHZ; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/../SharedFrameworks", diff --git a/JSONCreator_iOS/JSONCreator.xcodeproj/xcshareddata/xcschemes/Artifactory.xcscheme b/JSONCreator_iOS/JSONCreator.xcodeproj/xcshareddata/xcschemes/Artifactory.xcscheme new file mode 100644 index 0000000..f5d9456 --- /dev/null +++ b/JSONCreator_iOS/JSONCreator.xcodeproj/xcshareddata/xcschemes/Artifactory.xcscheme @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + +