Commit Graph

2043 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
29f89154f8 small model fix for images 2020-02-18 16:55:56 -05:00
Kevin G Christiano
8b309c928f conflict resolution 2020-02-18 15:56:21 -05:00
Kevin G Christiano
633eb4ec21 adding a new action type. updated action map flow. 2020-02-18 15:19:28 -05:00
Pfeil, Scott Robert
a620dd2401 some fixes for catching and remove file 2020-02-18 14:59:17 -05:00
Pfeil, Scott Robert
db8a27ec2f update to label attributes 2020-02-18 14:29:35 -05:00
Suresh, Kamlesh
ff0758106e init 2020-02-18 12:31:55 -05:00
Suresh, Kamlesh
4378a6f132 Merge branch 'develop' into feature/parse 2020-02-18 11:15:41 -05:00
Hedden, Kyle Matthew
a29b4b17a0 add toggle for server s7 params 2020-02-18 09:48:58 -05:00
Prateek Arora
c97c3fe734 Code changes and cleaning 2020-02-18 19:22:17 +05:30
Prateek Arora
a7ebc798d2 Removing hardcoded constraints replacing with multiplier 2020-02-18 19:01:08 +05:30
Lekshmi S
72d0a24061 Modified code as image is optional. 2020-02-18 16:50:03 +05:30
Lekshmi S
43a809aba0 Modified code as labels are optional. 2020-02-18 16:33:28 +05:30
Subhankar Acharya
5646c27adf Merge branch 'feature/rightVariable_payments_list' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-18 16:09:45 +05:30
Subhankar Acharya
c43a3da712 Code commit after adding a createPayPal function. 2020-02-18 16:06:30 +05:30
Lekshmi S
77476e1355 19162- List - Four Column - Data Usage - Divider story initial commit.
Added molecule class, model class.
2020-02-18 14:31:26 +05:30
Prateek Arora
f8fea032b5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-18 13:42:31 +05:30
Suresh, Kamlesh
e2860efaf6 fixes 2020-02-17 22:28:09 -05:00
Lekshmi S
391cd9ae2c Merge branch 'develop' into feature/rightVariable_payments_list
# Conflicts:
#	MVMCoreUI/Atoms/Views/ImageViewModel.swift
2020-02-18 08:29:39 +05:30
Suresh, Kamlesh
a2700e81b4 remove file 2020-02-17 21:54:47 -05:00
Suresh, Kamlesh
d8acbec046 fixes 2020-02-17 19:07:23 -05:00
Pfeil, Scott Robert
d40d15e344 Merge branch 'feature/moar_colors' into 'develop'
changing pumpkin to orange for design update.

See merge request BPHV_MIPS/mvm_core_ui!263
2020-02-17 17:48:11 -05:00
Suresh, Kamlesh Jain
6d819897bd Merge branch 'feature/model_fixes' into 'develop'
fixes

See merge request BPHV_MIPS/mvm_core_ui!262
2020-02-17 17:46:42 -05:00
Suresh, Kamlesh
9211d6c86d public 2020-02-17 17:44:12 -05:00
Suresh, Kamlesh
3e14e39542 public 2020-02-17 17:37:46 -05:00
Suresh, Kamlesh
68bf45f583 content mode 2020-02-17 17:35:20 -05:00
Suresh, Kamlesh
347928a9b6 remove files 2020-02-17 16:48:42 -05:00
Suresh, Kamlesh
79eceb693e moleculeName 2020-02-17 15:06:33 -05:00
Suresh, Kamlesh
438661dfe1 moleculeName 2020-02-17 15:05:02 -05:00
Suresh, Kamlesh
6de4fc4864 fill color 2020-02-17 14:19:17 -05:00
Suresh, Kamlesh
cf4832bca7 fixes 2020-02-17 13:39:13 -05:00
Kevin G Christiano
06fe32f37b changing pumpkin to orange for design update. 2020-02-17 12:21:32 -05:00
Subhankar Acharya
273b131714 Code commit - changes has to be done to model. 2020-02-17 22:50:43 +05:30
Suresh, Kamlesh
87dcde3317 WIP 2020-02-17 12:11:57 -05:00
Suresh, Kamlesh
e431ea2de9 fixes 2020-02-14 15:56:36 -05:00
Kevin G Christiano
7708678fec Merge branch 'develop' 2020-02-14 09:18:26 -05:00
Kevin G Christiano
ee85a8972e relaigning key name with legacy name. 2020-02-14 08:58:32 -05:00
Subhankar Acharya
5da415d0fc removed line break. 2020-02-14 18:17:10 +05:30
Subhankar Acharya
21fc9c1802 Adding up the percentages for stacks. 2020-02-14 17:46:56 +05:30
Lekshmi S
0d6322b693 Removed percent for stackitems. 2020-02-14 16:02:05 +05:30
Lekshmi S
6cbf4a53bc Restructured file group. 2020-02-14 14:09:03 +05:30
Lekshmi S
69919f5beb Added percent for stack items.
Removed conformance to ContainerModel and ListItemModelProtocol.
2020-02-14 14:05:54 +05:30
Lekshmi S
23b2df3c82 Code commit - Conforming to ListItemModel and MoleculeModelProtocol based on review comments. 2020-02-14 12:35:43 +05:30
Lekshmi S
194c004f17 Merge branch 'develop' into feature/ListLeftVar_Checkbox-_Right_Caret 2020-02-14 10:37:14 +05:30
Lekshmi S
f5b537084f Merge branch 'develop' into feature/rightVariable_payments_list 2020-02-14 10:31:56 +05:30
Lekshmi S
5b1b29c10d Removed container and added stackmodel code changes. 2020-02-14 10:17:54 +05:30
Pfeil, Scott Robert
c4c96dc4d4 x color fix 2020-02-13 15:43:59 -05:00
Pfeil, Scott Robert
8d3dea90a8 top alert content color update 2020-02-13 13:26:59 -05:00
Pfeil, Scott Robert
5bc5739e8c merge develop 2020-02-13 11:37:10 -05:00
Pfeil, Scott Robert
5d578b0eea remove unneeded check 2020-02-13 11:00:18 -05:00
Pfeil, Scott Robert
c6e9c84809 Comments update 2020-02-13 10:55:46 -05:00
Pfeil, Scott Robert
adaa9ca1f3 Bug fixes 2020-02-13 10:45:00 -05:00
Pfeil, Scott Robert
66a06d9815 Clean up and list item convenience 2020-02-13 10:19:22 -05:00
Subhankar Acharya
ca39be5643 Code Fixes after comments. 2020-02-13 19:41:11 +05:30
Pfeil, Scott Robert
6d31cb15d5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-02-13 09:09:29 -05:00
Lekshmi S
5b3e213ed6 Removed constraints and prioritylevel as per review comments. 2020-02-13 12:59:11 +05:30
Lekshmi S
cadf70ce70 Merge branch 'develop' into feature/ListLeftVar_Checkbox-_Right_Caret
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-13 12:28:35 +05:30
Lekshmi S
d0d8fa54ca Code fixes and removed unwanted code. 2020-02-13 12:12:12 +05:30
Lekshmi S
6925d1ed46 Merge branch 'develop' into feature/rightVariable_payments_list 2020-02-13 09:38:09 +05:30
Lekshmi S
c953981406 Removed container and added stackmodel 2020-02-13 09:00:37 +05:30
Pfeil, Scott Robert
f94056bc9a Merge branch 'bugfix/label_model_fix' into 'develop'
Codable Change

See merge request BPHV_MIPS/mvm_core_ui!254
2020-02-12 22:06:34 -05:00
Pfeil, Scott Robert
24f44e5829 Small cleaning 2020-02-12 22:03:46 -05:00
Lekshmi S
8ca1ebc6ad Merge branch 'develop' into feature/rightVariable_payments_list
# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-13 08:33:30 +05:30
Pfeil, Scott Robert
54e012d699 name fix 2020-02-12 21:55:27 -05:00
Pfeil, Scott Robert
eae3653b65 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-02-12 20:57:04 -05:00
Pfeil, Scott Robert
04e1e44343 merge 2020-02-12 20:55:46 -05:00
Pfeil, Scott Robert
02166c8b52 Merge branch 'feature/leftvariableicon_with_rightcaretlist' into 'develop'
Feature/leftvariableicon with rightcaretlist

See merge request BPHV_MIPS/mvm_core_ui!253
2020-02-12 20:36:46 -05:00
Pfeil, Scott Robert
5cecd5f031 Minor fixes 2020-02-12 20:36:05 -05:00
Xinlei(Ryan) Pan
e1d56bcc0c update image method 2020-02-12 15:32:33 -05:00
Xinlei(Ryan) Pan
0113387f00 add new image method 2020-02-12 15:31:45 -05:00
Pfeil, Scott Robert
05bda7076d Layout constraint helpers 2020-02-12 14:39:38 -05:00
Subhankar Acharya
692689a900 Code clean up for stack and removed line break. 2020-02-13 00:34:41 +05:30
Subhankar Acharya
c30a001239 Code Changes after reimplementing the molecule class. 2020-02-12 23:01:02 +05:30
Kevin G Christiano
e0bb0e45dc integrating changes to make fan out instance models into categories due to name conflicts 2020-02-12 11:25:37 -05:00
Subhankar Acharya
394a5aba18 Code fixes for alignment and StackItemModel conformance change. 2020-02-12 21:34:47 +05:30
Lekshmi S
3dbbc1a876 Code fix 2020-02-12 16:50:46 +05:30
Kruthika KP
fed9b8ff92 added default horizontal padding 2020-02-12 16:45:09 +05:30
Lekshmi S
63201a8fa6 19042 - List - Left Variable - Checkbox - With Right Caret - All Text & Links story commit.
Added Molecule class, Model class
2020-02-12 15:11:41 +05:30
Subhankar Acharya
d92c5b5679 Code changes using the StackModel 2020-02-11 22:21:07 +05:30
Subhankar Acharya
d5ac7e3e6d removed line break 2020-02-11 17:33:12 +05:30
Subhankar Acharya
fb65f9e976 Deleted the files after changing naming convention. 2020-02-11 17:31:28 +05:30
Subhankar Acharya
05aaac573d Code checkin after changing way of implementation. 2020-02-11 17:30:34 +05:30
Lekshmi S
d683d420c8 Code changes based on review:
Modified class name according to Confluence
Removed Initializers
Removed extra spaces.
2020-02-11 12:22:50 +05:30
Kruthika KP
965dcf538b Class naming convention changed and removed init methods where not required. 2020-02-11 12:18:45 +05:30
Lekshmi S
66f0cf6b8e Modified code based on review comments
Molecule class conforming to TableViewCell instead of Container.
Model class conforming to ListItemModelProtocol instead of MoleculeModelProtocol
Removed extra spaces and added comments
2020-02-11 08:39:09 +05:30
Lekshmi S
5686fea2c8 Merge branch 'develop' into feature/leftvariableicon_with_rightcaretlist 2020-02-10 15:43:56 +05:30
Lekshmi S
a87926a810 Story - 19072: List - Right Variable - Payments Initial Commit
Added Molecule Class, Model Class
2020-02-10 15:41:12 +05:30
Subhankar Acharya
bc1cc9b1d2 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/three_column_plan_data_list
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-02-10 11:50:47 +05:30
Subhankar Acharya
593bae7820 Molecule-ThreeColumnPlanDataDividerList 2020-02-10 11:49:03 +05:30
Pfeil, Scott Robert
bf8ea963b0 bring back view controller 2020-02-07 15:29:58 -05:00
Pan, Xinlei (Ryan)
c163e963d2 Merge branch 'bugfix/dropdown_issue' into 'develop'
type change to support equatable dictionaries.

See merge request BPHV_MIPS/mvm_core_ui!249
2020-02-07 09:15:24 -05:00
Kevin G Christiano
3eb94fe616 removing print statements. 2020-02-07 09:11:06 -05:00
Prateek Arora
5ae5cfd2d8 WIP: New molecule changes 2020-02-07 17:03:33 +05:30
Prateek Arora
7572bf0214 Fixes as per Review comments 2020-02-07 13:48:35 +05:30
Pan, Xinlei (Ryan)
e95fffbe82 Merge branch 'bugfix/misbehaving_entry' into 'develop'
EntryField responder fix.

See merge request BPHV_MIPS/mvm_core_ui!250
2020-02-06 14:16:46 -05:00
Kevin G Christiano
61a5932a88 fixing bug where textfield was not being recognized when resigning responder. 2020-02-06 13:25:52 -05:00
Pfeil, Scott Robert
0dad2aedb1 type fix 2020-02-06 13:00:55 -05:00
Kevin G Christiano
23e87b1cbb removed caveman code. 2020-02-06 12:44:25 -05:00
Pfeil, Scott Robert
00b179d8c2 fix to reuse issue two button view 2020-02-06 12:09:35 -05:00
Pfeil, Scott Robert
f24485c699 fix button order 2020-02-06 11:59:45 -05:00
Kevin G Christiano
1e9b228730 Merge branch 'develop' 2020-02-06 11:19:27 -05:00
Kevin G Christiano
a31d5ccfd8 redundant statement removed. 2020-02-06 11:07:09 -05:00
Kevin G Christiano
b2241e47e1 fixing change 2020-02-06 10:29:52 -05:00
Pfeil, Scott Robert
0d4008dec7 CaretLink 2020-02-06 09:55:18 -05:00
Pfeil, Scott Robert
59707ef781 merge 2020-02-06 09:52:05 -05:00
Prateek Arora
21c749489c Review Comments 2020-02-06 20:20:04 +05:30
Pfeil, Scott Robert
595dc99936 button minimum
caretLink
2020-02-06 09:50:03 -05:00
Kevin G Christiano
15bfb6b481 Bug fix and general shape-up 2020-02-06 09:31:23 -05:00
Kruthika KP
5f2abffba0 Changed TableViewCell to Container in Molecule class and ListItemModelProtocol to MoleculeModelProtocol 2020-02-06 18:43:53 +05:30
Prateek Arora
b6762fc455 Extra space removal 2020-02-06 18:21:28 +05:30
Prateek Arora
8f225dda70 Code clean 2020-02-06 18:19:15 +05:30
Prateek Arora
07d8ef5d13 Progress bar molecule changes 2020-02-06 17:30:29 +05:30
Prateek Arora
d56335d103 Progress bar molecule changes 2020-02-06 16:59:42 +05:30
Kruthika KP
8ca15468f4 changes to image leading space 2020-02-06 16:30:20 +05:30
Prateek Arora
93ba680bb8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-06 12:31:48 +05:30
Kruthika KP
e2d2decc5c Merge branch 'develop' into feature/leftvariableicon_with_rightcaretlist 2020-02-06 10:36:42 +05:30
Pan, Xinlei (Ryan)
4ff660accc Merge branch 'feature/caretbutton' into 'develop'
change CaretButton to MFCaretButton in legacy view/viewcontroller, CaretButton...

See merge request BPHV_MIPS/mvm_core_ui!244
2020-02-05 15:08:00 -05:00
Pan, Xinlei (Ryan)
468a297014 Merge branch 'bugfix/addons_banner_fix' into 'develop'
Add-ons banner fif for defect: CXTDT-54990

See merge request BPHV_MIPS/mvm_core_ui!246
2020-02-05 11:29:18 -05:00
Khan, Arshad
2e37041e7e Add-ons banner fif for defect: CXTDT-54990
verbiage truncation
design 2/3 feedback implemenation
2020-02-05 20:30:01 +05:30
Khan, Arshad
fa1c8bad92 corner label bug fixes: CXTDT-54851 & CXTDT-4571(see comments)
making molecule optional as per one confluence document.
Same has been implemented in Android and Server.
2020-02-05 20:26:34 +05:30
Kruthika KP
4bcfdb96db 18936 - Left Variable Icon - with - Right Caret - initial commit. 2020-02-05 13:17:50 +05:30
Xinlei(Ryan) Pan
2b74531ce1 change CaretButton to MFCaretButton in legacy view/viewcontroller, CaretButton will be only used in molecule 2020-02-04 13:59:14 -05:00
Pfeil, Scott Robert
40da48bc6e Fix stack percent defect 2020-02-04 13:34:39 -05:00
Pfeil, Scott Robert
fe15372437 defect fixes 2020-02-04 12:08:26 -05:00
Pfeil, Scott Robert
2d400b045d Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/two_button_remove_legacy 2020-02-04 10:46:17 -05:00
Chintakrinda, Arun Kumar (Arun)
c83302ec08 Stack model bug fix from molecueStack to stack 2020-02-04 14:37:31 +05:30
Prateek Arora
35e7052abb WIP: LabelsWithCircleProgressBar 2020-02-04 14:10:01 +05:30
Pfeil, Scott Robert
6fa74c11cf Merge branch 'feature/new_color' into 'develop'
Adding color and removing pointless func.

See merge request BPHV_MIPS/mvm_core_ui!239
2020-02-03 15:44:19 -05:00
Xinlei(Ryan) Pan
9110c842a5 fix typo 2020-02-03 09:42:11 -05:00
Kevin G Christiano
be2e9473b3 Removing func as the static dictionary can carry the weight. 2020-02-03 09:00:03 -05:00
Kevin G Christiano
c81f68d66d adding color and removing pointless loop. 2020-02-03 08:54:41 -05:00
Pfeil, Scott Robert
205e9707e6 move legacy 2020-01-31 16:37:24 -05:00
Pfeil, Scott Robert
e2f1da7c27 estimated height 2020-01-31 16:29:46 -05:00
Pfeil, Scott Robert
37228669e0 Two button remove legacy 2020-01-31 16:27:20 -05:00
Pfeil, Scott Robert
365bbad168 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/button_swifty 2020-01-31 16:01:26 -05:00
Pfeil, Scott Robert
487d41b3d9 two button view update 2020-01-31 16:01:06 -05:00
Pan, Xinlei (Ryan)
ae00d57bd3 Merge branch 'feature/primarybuttonview' into 'develop'
Feature/primarybuttonview

See merge request BPHV_MIPS/mvm_core_ui!237
2020-01-31 15:11:52 -05:00
Pfeil, Scott Robert
a19a06e7b6 Merge branch 'feature/button_swifty' into 'develop'
Feature/button swifty

See merge request BPHV_MIPS/mvm_core_ui!235
2020-01-30 13:55:25 -05:00
Pfeil, Scott Robert
521fc75e59 remove unused 2020-01-30 11:56:57 -05:00
Pfeil, Scott Robert
58a40a7752 fixes and color addition 2020-01-30 11:56:37 -05:00
Pfeil, Scott Robert
f367b03233 Review comments 2020-01-30 11:41:43 -05:00
Xinlei(Ryan) Pan
54dc30a41a update based on Scott's comments 2020-01-29 15:47:37 -05:00
Xinlei(Ryan) Pan
347f054ed1 merge from develop 2020-01-29 15:44:42 -05:00
Xinlei(Ryan) Pan
9ce1e7ec93 add PrimaryButtonView back to prepay legacy view/ view controller 2020-01-29 11:27:24 -05:00
Xinlei(Ryan) Pan
e6ae064c44 add PrimaryButtonView back into legacy view and view controller 2020-01-29 10:30:01 -05:00
Pfeil, Scott Robert
5f40942468 missed CheckboxLabel name change 2020-01-29 10:13:30 -05:00
Pfeil, Scott Robert
ad8d18eabe buttonmodelprotocol 2020-01-29 09:17:36 -05:00
Pfeil, Scott Robert
2ebce1b93b swift button 2020-01-28 14:04:56 -05:00
Pfeil, Scott Robert
c0ca81c568 Pill button 2020-01-28 13:55:55 -05:00
Pfeil, Scott Robert
ba8058cceb button swift 2020-01-28 12:58:51 -05:00
Pfeil, Scott Robert
98d0dc26f6 name update 2020-01-27 12:28:18 -05:00
Pfeil, Scott Robert
41a60d552d link name change 2020-01-27 12:19:52 -05:00
Pfeil, Scott Robert
1f48ad485f update comment 2020-01-27 12:15:14 -05:00
Pfeil, Scott Robert
ecb381e943 switch to toggle 2020-01-27 12:10:48 -05:00
Pan, Xinlei (Ryan)
0438f02a08 Merge branch 'bugfix/graphview' into 'develop'
Bugfix/graphview

See merge request BPHV_MIPS/mvm_core_ui!233
2020-01-27 10:05:01 -05:00
Pfeil, Scott Robert
fe10b40148 reorg 2020-01-24 16:48:28 -05:00
Kevin G Christiano
a932e554d5 timing fix 2020-01-24 15:32:40 -05:00
Xinlei(Ryan) Pan
a3a3d4b66a add file back 2020-01-24 15:14:02 -05:00
Xinlei(Ryan) Pan
085aa62c8b merge from feature/coding 2020-01-24 15:13:04 -05:00
Kevin G Christiano
3eb97d65c9 fixing reuse error in setWithModel 2020-01-24 15:06:45 -05:00
Kevin G Christiano
11aaedfa6b pr fixes 2020-01-24 13:25:59 -05:00
Kevin G Christiano
c250769620 using existing model encoding func 2020-01-24 13:20:02 -05:00
Kevin G Christiano
7b8b2a059f no need for val 2020-01-24 12:43:38 -05:00
Kevin G Christiano
e5948e05e5 pr fixes 2020-01-24 12:33:22 -05:00
Suresh, Kamlesh
9748e38296 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 12:10:58 -05:00
Suresh, Kamlesh
a16a362c03 dash color 2020-01-24 12:10:43 -05:00
Kevin G Christiano
7019bdaa78 no longer needed. 2020-01-24 11:54:23 -05:00
Kevin G Christiano
451e28cdfd removed conflict file 2020-01-24 11:47:25 -05:00
Kevin G Christiano
851d5b57ff remvoe explicit unwrapping 2020-01-24 10:58:03 -05:00
Xinlei(Ryan) Pan
5e4f976a1c re add entry field container for fixing odd behavior 2020-01-24 10:42:13 -05:00
Kevin G Christiano
af7e813e18 model reuse again 2020-01-24 10:41:38 -05:00
Xinlei(Ryan) Pan
af20b0a8a4 remove entryfieldcontainer for odd behavior 2020-01-24 10:41:04 -05:00
Kevin G Christiano
f43e018e21 model reuse 2020-01-24 10:38:38 -05:00
Suresh, Kamlesh
0808d63e24 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 10:34:27 -05:00
Pfeil, Scott Robert
5a1aad63c7 remove axis property wrapper 2020-01-24 10:33:16 -05:00
Pfeil, Scott Robert
ebf089888b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 10:30:50 -05:00
Pfeil, Scott Robert
9384e28eb8 fix on rotate margin issue 2020-01-24 10:29:36 -05:00
Pfeil, Scott Robert
8b8ec937b1 caret link hiding 2020-01-24 10:24:49 -05:00
Pan, Xinlei (Ryan)
b20212ccd4 Merge branch 'feature/checkbox_label_fix' into 'feature/coding'
Checkbox models added

See merge request BPHV_MIPS/mvm_core_ui!231
2020-01-24 10:23:17 -05:00
Pfeil, Scott Robert
4a194d4e6f fixes for the banner 2020-01-24 10:21:42 -05:00
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Kevin G Christiano
86f60bccf8 adding height override 2020-01-24 10:11:42 -05:00
Kevin G Christiano
304b4cbc4c models encode properly 2020-01-24 09:41:34 -05:00
Pfeil, Scott Robert
d7f955c991 fix to error check 2020-01-24 09:35:38 -05:00
Xinlei(Ryan) Pan
6602ac505a Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 09:26:00 -05:00
Xinlei(Ryan) Pan
d6a7e98718 remove conflicts file 2020-01-24 09:25:09 -05:00
Pfeil, Scott Robert
c0c5eef9e1 dash update 2020-01-24 09:22:45 -05:00
Pfeil, Scott Robert
633bcf9fd0 dash line update 2020-01-24 09:21:03 -05:00
Pfeil, Scott Robert
203b049829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 08:49:13 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Kevin G Christiano
6139f31e54 wring label 2020-01-23 22:42:19 -05:00
Kevin G Christiano
c5e80d602e temp fix for arch issue 2020-01-23 21:04:48 -05:00
Kevin G Christiano
83d5721e68 temp fix for arch issue 2020-01-23 19:59:05 -05:00
Suresh, Kamlesh
f39e483a4e Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-23 17:39:15 -05:00
Suresh, Kamlesh
31c148de97 fixes 2020-01-23 14:46:32 -05:00
Kevin G Christiano
8fb8694b82 merge fix 2020-01-23 14:30:11 -05:00
Kevin G Christiano
0c7a2940d9 Fixing issues for model reuse. 2020-01-23 14:26:04 -05:00
Xinlei(Ryan) Pan
0069f38d4e update toggle alignment 2020-01-23 14:06:25 -05:00
Xinlei(Ryan) Pan
2f68dcb695 update horizontal alignment 2020-01-23 14:05:36 -05:00
Kevin G Christiano
e143c75215 redirect type 2020-01-23 13:10:57 -05:00
Kevin G Christiano
af83a2aa1e alighing with merge. 2020-01-23 13:10:27 -05:00
Kevin G Christiano
ea40da2c90 diabled functionality 2020-01-23 12:55:21 -05:00
Pfeil, Scott Robert
5d23b8329f list item fix 2020-01-23 12:54:34 -05:00
Kevin G Christiano
2100468899 disabled colors 2020-01-23 12:32:33 -05:00
Kevin G Christiano
4cc5a15db9 checkbox modeling. Strange issue with EntryFieldContainer. To be observed. 2020-01-23 12:12:45 -05:00
Suresh, Kamlesh
ac17015a09 container model 2020-01-23 11:10:28 -05:00
Pfeil, Scott Robert
6d81705c2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-23 11:01:49 -05:00
Pfeil, Scott Robert
abc854e152 List template change to molecules not required (for now) 2020-01-23 11:01:36 -05:00
Pfeil, Scott Robert
d3edf62a94 toggle name change 2020-01-23 10:42:39 -05:00
Pfeil, Scott Robert
e0abe4c8cd More opening 2020-01-23 10:40:17 -05:00
Pfeil, Scott Robert
a2b62767bd base classes open ModelMoleculeViewProtocol functions 2020-01-23 10:33:56 -05:00
Pfeil, Scott Robert
b80cd421cf height fixes 2020-01-23 10:24:11 -05:00
Pfeil, Scott Robert
15a943d2e7 Changed stack to use a percent modifier to compensate for spacing. 2020-01-23 09:31:33 -05:00
Suresh, Kamlesh
611246cb14 remove left 2020-01-22 17:14:08 -05:00
Suresh, Kamlesh
822180ec9f code fixes 2020-01-22 16:09:36 -05:00
Kevin G Christiano
ccb8a2cf52 weak change 2020-01-22 15:39:39 -05:00
Suresh, Kamlesh
9e7df20877 left 2020-01-22 15:37:37 -05:00
Suresh, Kamlesh
7c70b0a4a1 remove methods 2020-01-22 15:32:31 -05:00
Suresh, Kamlesh
50f573688f position 2020-01-22 15:15:13 -05:00
Kevin G Christiano
86ce3c9d4f modeling entryField 2020-01-22 14:51:27 -05:00
Suresh, Kamlesh
61edfcc747 fixes 2020-01-22 14:51:17 -05:00
Suresh, Kamlesh
791138c345 private 2020-01-22 14:36:12 -05:00
Suresh, Kamlesh
f438e25556 new registation 2020-01-22 14:34:50 -05:00
Pfeil, Scott Robert
c6ba48397c Add some missing models 2020-01-22 14:31:33 -05:00
Suresh, Kamlesh
a068c0af1b merge 2020-01-22 14:30:00 -05:00
Suresh, Kamlesh
5dafbe6a85 more color 2020-01-22 14:21:48 -05:00
Suresh, Kamlesh
f816081d8e check box 2020-01-22 13:58:56 -05:00
Kevin G Christiano
1eec90e8e1 align model. 2020-01-22 11:57:16 -05:00
Kevin G Christiano
6522472be2 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2020-01-22 11:50:52 -05:00
Kevin G Christiano
f7ce81874e EntryField Models. Updated dropdown for new dropdown. 2020-01-22 11:47:21 -05:00
Pfeil, Scott Robert
d22715585e Eyebrow headline body to link 2020-01-22 11:44:02 -05:00
Xinlei(Ryan) Pan
6a8221ff4d merge from feature/coding 2020-01-22 11:32:25 -05:00
Xinlei(Ryan) Pan
d30f6314a5 remove unneeded property 2020-01-22 11:27:24 -05:00
Chintakrinda, Arun Kumar (Arun)
70c3da70d5 Fixing for comments 2020-01-22 21:53:07 +05:30
Pfeil, Scott Robert
712d18d123 Model organizing 2020-01-22 11:12:07 -05:00
Xinlei(Ryan) Pan
b512db7b92 remove space 2020-01-22 10:52:57 -05:00
Xinlei(Ryan) Pan
ab66cfae3c update method 2020-01-22 10:42:01 -05:00
Xinlei(Ryan) Pan
17983b51f5 merge from feature/coding 2020-01-22 10:29:54 -05:00
Xinlei(Ryan) Pan
85675a1d0e merge feature/coding 2020-01-22 10:24:18 -05:00
Pfeil, Scott Robert
016c6edc06 Cleanup 2020-01-22 10:24:04 -05:00
Xinlei(Ryan) Pan
cd231746cf update link model 2020-01-22 10:16:18 -05:00
Chintakrinda, Arun Kumar (Arun)
5534f6ba58 Checkbox models added
Label action attribute issue fixed
2020-01-22 20:27:14 +05:30
Pfeil, Scott Robert
db0cb77756 Update button to model 2020-01-22 09:22:57 -05:00
Pfeil, Scott Robert
00d1bf7be6 re-organizing 2020-01-22 09:11:56 -05:00
Pfeil, Scott Robert
045cfeb7f9 pull 2020-01-22 09:11:21 -05:00
Suresh, Kamlesh
943799d462 more models 2020-01-21 23:33:24 -05:00
Suresh, Kamlesh
4d155b9f97 ActionModelProtocol 2020-01-21 18:23:32 -05:00
Suresh, Kamlesh
117c112b6b color 2020-01-21 18:13:42 -05:00
Suresh, Kamlesh
8c9cf025c6 Merge branch 'develop' into feature/coding 2020-01-21 16:41:19 -05:00
Pfeil, Scott Robert
74b09fa51d name change 2020-01-21 15:47:02 -05:00
Xinlei(Ryan) Pan
25db4b1e14 update link based on naming change 2020-01-21 15:40:45 -05:00
Xinlei(Ryan) Pan
eb1cc491b3 Merge branch 'feature/coding' into feature/link 2020-01-21 15:38:28 -05:00
Pfeil, Scott Robert
03a907a39b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-21 15:33:37 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Xinlei(Ryan) Pan
01780e708f update link 2020-01-21 15:33:10 -05:00
Xinlei(Ryan) Pan
b24745fd89 merge from feature/coding 2020-01-21 15:22:15 -05:00
Suresh, Kamlesh Jain
be710bfb0e Merge branch 'feature/HeadLineBodyCaretLinkImage_alignment_issues' into 'feature/coding'
Feature/head line body caret link image alignment issues

See merge request BPHV_MIPS/mvm_core_ui!229
2020-01-21 13:55:30 -05:00
Pfeil, Scott Robert
b158e07383 Merge branch 'bugfix/custom_access_internal' into 'develop'
AccessibilityCustomAction requires more than an empty string.

See merge request BPHV_MIPS/mvm_core_ui!228
2020-01-21 13:55:19 -05:00
Pfeil, Scott Robert
747132f72d Merge branch 'bugfix/label_layout_constraint_fix' into 'feature/coding'
Bugfix/label layout constraint fix

See merge request BPHV_MIPS/mvm_core_ui!227
2020-01-21 13:54:30 -05:00
Khan, Arshad
8e28403480 alignment fixes and progressBar mapping change. 2020-01-21 23:44:31 +05:30
Pfeil, Scott Robert
42b57dcd5d Cleaning 2020-01-21 12:10:48 -05:00
Xinlei(Ryan) Pan
2de9142969 remove one more line 2020-01-21 12:00:28 -05:00
Xinlei(Ryan) Pan
8816a06fe5 public globalLeftPanel/globalRightPanel 2020-01-21 11:58:08 -05:00
Murugan, Vimal
4760c10c8d removed comment 2020-01-21 21:51:22 +05:30
Kevin G Christiano
cedcc6b099 AccessibilityCustomAction requires more than an empty string. 2020-01-21 10:24:20 -05:00
Xinlei(Ryan) Pan
5b92e64507 Merge branch 'develop' into feature/disable_chatbot 2020-01-21 10:04:38 -05:00
Murugan, Vimal
fffb04e5e1 avoid negative value 2020-01-21 20:31:02 +05:30
Murugan, Vimal
13cc6bf209 removed padding 2020-01-21 17:11:00 +05:30
Murugan, Vimal
8c373ebfa4 index update 2020-01-21 16:56:30 +05:30
Murugan, Vimal
d3c6448053 fix for separator 2020-01-20 14:50:53 +05:30
Murugan, Vimal
a76fb75200 crash fix 2020-01-20 11:53:22 +05:30
Xinlei(Ryan) Pan
0c7726bcc3 fix caretbutton 2020-01-17 17:32:32 -05:00
Pfeil, Scott Robert
e0ec089c93 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-17 16:32:06 -05:00
Pfeil, Scott Robert
332e05f8a5 fix to wrong model 2020-01-17 16:32:00 -05:00
Pfeil, Scott Robert
299a519e20 Default alignment fix 2020-01-17 15:56:48 -05:00
Pfeil, Scott Robert
20dbbc0829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-17 14:55:07 -05:00
Suresh, Kamlesh
9e066be3fa setDefaultCustom 2020-01-17 14:53:23 -05:00
Suresh, Kamlesh
c2f3a7a2db primary button and top bottom pin 2020-01-17 14:31:32 -05:00
Suresh, Kamlesh
69c86c4479 flip button position 2020-01-17 14:15:37 -05:00
Suresh, Kamlesh
dc19d850c1 setDefaultCustom 2020-01-17 14:12:51 -05:00
Suresh, Kamlesh
9e789e2312 secondary 2020-01-17 14:11:37 -05:00
Suresh, Kamlesh
19d3b960ae button alignment 2020-01-17 14:10:26 -05:00
Pfeil, Scott Robert
d80ae0bd04 more label fix 2020-01-17 14:07:31 -05:00
Pfeil, Scott Robert
6aba575703 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-17 14:01:17 -05:00
Pfeil, Scott Robert
9847ef5302 stack flexibility update
molecule container protocol fix missing functions
update numbered and unordered list to more model approach
2020-01-17 13:51:46 -05:00
Suresh, Kamlesh
401370f976 toggle action 2020-01-17 12:03:31 -05:00
Suresh, Kamlesh
f1fd5c89fc Merge branch 'feature/doughnutchart_from_coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-17 11:04:46 -05:00
Suresh, Kamlesh
13dbb28357 caret title 2020-01-17 11:04:35 -05:00
Khan, Arshad
017dc1d002 secondary button top alignment fix, which was breaking all BAU secondary buttons. 2020-01-17 21:32:49 +05:30
Pfeil, Scott Robert
d26d3b1e40 merge 2020-01-17 09:32:58 -05:00
Pfeil, Scott Robert
d8a7efde8a undo register change 2020-01-16 20:57:17 -05:00
Suresh, Kamlesh
54cc1f5426 registerModels() 2020-01-16 19:48:14 -05:00
Pfeil, Scott Robert
8209101b73 hot fix 2020-01-16 18:54:01 -05:00
Suresh, Kamlesh
48a8f4aba8 Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-16 17:36:09 -05:00
Suresh, Kamlesh
4dde423d2f button fixes 2020-01-16 17:32:00 -05:00
Suresh, Kamlesh
e326ba9a47 Merge branch 'feature/doughnutchart_from_coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-16 16:48:09 -05:00
Suresh, Kamlesh
3cfe5aa423 StackModel 2020-01-16 16:47:53 -05:00
Xinlei(Ryan) Pan
b1abe0810c put clockwise into method 2020-01-16 16:43:16 -05:00
Xinlei(Ryan) Pan
36cbccd39c update name 2020-01-16 16:30:05 -05:00
Pfeil, Scott Robert
cb89795b4c remove ! 2020-01-16 16:17:36 -05:00
Pfeil, Scott Robert
7d5bee5654 Label fix 2020-01-16 15:51:15 -05:00
Pfeil, Scott Robert
0529c9d357 merge 2020-01-16 15:03:16 -05:00
Pfeil, Scott Robert
db0d9f4353 Container protocol
Doughnut chart model
Break stack into regular and dynamic components
2020-01-16 14:59:24 -05:00
Pan, Xinlei (Ryan)
b876d81922 two button view's internal spacing constraint change for a huge height bug 2020-01-16 14:29:30 -05:00
Suresh, Kamlesh
71efaa9026 alignment 2020-01-16 13:51:55 -05:00
Suresh, Kamlesh
9bf9d71195 optional 2020-01-16 13:30:30 -05:00
Xinlei(Ryan) Pan
e3b0b43272 update link method 2020-01-16 10:30:20 -05:00
Xinlei(Ryan) Pan
56b37255c2 merge from feature/coding 2020-01-16 09:59:14 -05:00
Suresh, Kamlesh
de27398c49 leftRightLabelView 2020-01-15 18:59:48 -05:00
Suresh, Kamlesh
ef1215c130 merge 2020-01-15 18:37:36 -05:00
Suresh, Kamlesh
d69dbc41d0 fixes 2020-01-15 18:27:56 -05:00
Xinlei(Ryan) Pan
5d1ef7161d update to cgcolor directly 2020-01-15 17:03:09 -05:00
Suresh, Kamlesh
47ccd681ae merge 2020-01-15 16:49:42 -05:00
Pfeil, Scott Robert
ebd1128ffe Merge branch 'feature/hero_check' into 'feature/coding'
caret fix.

See merge request BPHV_MIPS/mvm_core_ui!222
2020-01-15 16:37:34 -05:00
Pan, Xinlei (Ryan)
e95afdc249 update color 2020-01-15 16:36:13 -05:00
Xinlei(Ryan) Pan
e5accc7611 update height 2020-01-15 13:54:31 -05:00
Xinlei(Ryan) Pan
00d78cfded update label frame 2020-01-15 13:53:54 -05:00
Xinlei(Ryan) Pan
9329f0ca15 update left and right padding 2020-01-15 13:28:40 -05:00
Kevin G Christiano
388d88b47c autorResiszing exception. 2020-01-15 13:13:15 -05:00
Kevin G Christiano
703e0cd32b Convenience to access cgColor. 2020-01-15 12:38:31 -05:00
Pfeil, Scott Robert
a318b19410 Merge branch 'feature/coding' into feature/doughnutchart_from_coding 2020-01-15 10:41:53 -05:00
Pfeil, Scott Robert
74eea1ac2d Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 21:10:40 -05:00
Pfeil, Scott Robert
9a01d9de5b merge 2020-01-14 21:09:55 -05:00
Pfeil, Scott Robert
952c3bdb53 Toggle model temporary 2020-01-14 21:08:48 -05:00
Pfeil, Scott Robert
8936f510b2 temporary change to match 2020-01-14 20:35:53 -05:00
Pfeil, Scott Robert
a737b3b94c Remove adding view constraining view 2020-01-14 20:23:14 -05:00
Pfeil, Scott Robert
76b14f6e8e fix typo 2020-01-14 20:20:02 -05:00
Suresh, Kamlesh
c3433c2f80 merge 2020-01-14 19:29:37 -05:00
Pfeil, Scott Robert
f87ddf3448 name update 2020-01-14 18:41:54 -05:00
Pfeil, Scott Robert
9477218d78 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 18:35:35 -05:00
Pfeil, Scott Robert
e85270d038 new molecules to model 2020-01-14 18:33:34 -05:00
Pfeil, Scott Robert
7723ffb260 verbose errors 2020-01-14 17:40:51 -05:00
Pfeil, Scott Robert
fc2326e9a8 button size 2020-01-14 16:32:42 -05:00
Pfeil, Scott Robert
7255c0c354 Merge remote-tracking branch 'refs/remotes/origin/feature/coding'
Conflicts:
	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
	MVMCoreUI/Molecules/Items/TableViewCell.swift
	MVMCoreUI/Molecules/ModelMoleculeViewProtocol.swift
	MVMCoreUI/Organisms/MoleculeStackView.swift
2020-01-14 15:58:12 -05:00
Pfeil, Scott Robert
27793931f5 fix for static functions 2020-01-14 15:55:18 -05:00
Suresh, Kamlesh
5560084c1d Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 15:52:16 -05:00
Suresh, Kamlesh
147ce53c90 name for class 2020-01-14 15:50:46 -05:00
Pfeil, Scott Robert
3d2fd02ac5 undo view constraining removal code
fix molecule table cell
fix corner labels
2020-01-14 13:58:18 -05:00
Pfeil, Scott Robert
a204603616 temp corner labels fix 2020-01-14 12:19:26 -05:00
Pfeil, Scott Robert
979718d4b8 Defaults, percent fix 2020-01-14 11:56:50 -05:00
Murugan, Vimal
31aabef3ae Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 21:57:12 +05:30
Pfeil, Scott Robert
7790a20ad3 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-14 11:18:31 -05:00
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Suresh, Kamlesh
0090b686a5 default stryle and spacing 2020-01-14 11:11:28 -05:00
Murugan, Vimal
46b37a5f56 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 20:50:24 +05:30
Murugan, Vimal
7e38657b63 review comments updated
models updated
2020-01-14 20:48:15 +05:30
Pfeil, Scott Robert
9c0bea033c actionType fix 2020-01-14 10:13:19 -05:00
Pfeil, Scott Robert
77af932f5d update old key 2020-01-14 09:26:04 -05:00
Murugan, Vimal
36a469ab6b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 19:42:33 +05:30
Pfeil, Scott Robert
447df655df make the error throwable 2020-01-14 09:12:09 -05:00
Kevin G Christiano
874addef63 Changed name. New disabled KV. mild updates. 2020-01-14 09:06:39 -05:00
Pfeil, Scott Robert
198ebe722b missed name change 2020-01-14 08:59:58 -05:00
Pfeil, Scott Robert
461a51d880 stack item change decoding 2020-01-13 22:18:40 -05:00
Pfeil, Scott Robert
96d533780f update multi progress to match color 2020-01-13 21:25:24 -05:00
Pfeil, Scott Robert
145b9d5423 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 21:16:03 -05:00
Pfeil, Scott Robert
6b7bb180fc corner labels temporary 2020-01-13 21:15:21 -05:00
panxi
cd3555466f remove duplicate 2020-01-13 17:18:49 -05:00
panxi
a6dc16889c fix error from merging 2020-01-13 17:07:16 -05:00
panxi
53e00a7654 Merge branch 'feature/coding' into feature/unordered_numbered_list_from_coding 2020-01-13 17:03:00 -05:00
Kevin G Christiano
32f85dfbf1 renamed func. changed location of action. 2020-01-13 16:30:29 -05:00
Kevin G Christiano
3d2137fc11 Now subclassing Button. 2020-01-13 16:19:49 -05:00
Kevin G Christiano
aea8bc5f7b Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 16:02:18 -05:00
Kevin G Christiano
d7844d607e space. 2020-01-13 16:00:00 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Kevin G Christiano
8490ef3572 enabled/disabled colors. 2020-01-13 15:46:50 -05:00
Pfeil, Scott Robert
4437338620 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:29:07 -05:00
Pfeil, Scott Robert
5c2f93e06f move register to init for now
dash line update temporary for legacy
2020-01-13 15:28:53 -05:00
Pfeil, Scott Robert
f64424a2c5 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:27:27 -05:00
Pfeil, Scott Robert
57753f6697 Change keys 2020-01-13 15:26:51 -05:00
Kevin G Christiano
edddac84a8 Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:59:46 -05:00
Pfeil, Scott Robert
9a18346fca Merge branch 'feature/button' into 'develop'
Translates MFCustomButton to Button

See merge request BPHV_MIPS/mvm_core_ui!205
2020-01-13 14:51:05 -05:00
Kevin G Christiano
ad4eddb450 some class is using a xib. 2020-01-13 14:43:16 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Kevin G Christiano
8ff92b5cc0 one line, truncation. 2020-01-13 14:31:04 -05:00
Ryan
595cc04ec0 merge from feature/coding 2020-01-13 14:18:47 -05:00
Ryan
a2d5474b10 merge feature/coding 2020-01-13 14:12:16 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Murugan, Vimal
e6079eab55 updated model 2020-01-14 00:11:41 +05:30
Murugan, Vimal
ec451d1f2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 00:04:39 +05:30
Kevin G Christiano
0b87ff254b Merge branch 'develop' into feature/link 2020-01-13 13:32:21 -05:00
Kevin G Christiano
5ce8446be2 Updating Link class. adding identifier to molecule mapping. 2020-01-13 13:31:25 -05:00
Kevin G Christiano
9882528b9e Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 12:50:08 -05:00
Kevin G Christiano
b79ddf7346 additions for accessibility. 2020-01-13 12:45:49 -05:00
Pfeil, Scott Robert
788145332f Two button view temporary model fix
primary button model
2020-01-13 12:44:05 -05:00
Murugan, Vimal
be094b3cf9 review comments updated 2020-01-13 22:49:51 +05:30
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00
Pfeil, Scott Robert
73c19383b6 Scroller update 2020-01-13 11:08:58 -05:00
Kevin G Christiano
f81b50d077 Merge branch 'develop' into feature/swiftified_textField 2020-01-13 11:05:31 -05:00
Pfeil, Scott Robert
3edb1a583f module molecule update 2020-01-13 10:53:52 -05:00
Pfeil, Scott Robert
1feee6aa9a three layer model fix 2020-01-13 10:48:35 -05:00
Pfeil, Scott Robert
824e077097 stack model fixes 2020-01-13 10:46:18 -05:00
Pfeil, Scott Robert
f9620e4bc7 List template fix 2020-01-13 10:40:53 -05:00
Pfeil, Scott Robert
fe9131f3c6 update json func 2020-01-13 10:22:04 -05:00
Pfeil, Scott Robert
1b06d7007b circle progress 2020-01-13 10:20:11 -05:00
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
Murugan, Vimal
b4859988c2 set with json removed 2020-01-13 19:52:04 +05:30
Kevin G Christiano
85f210abe8 Accessibility fixes. 2020-01-13 08:49:51 -05:00
Murugan, Vimal
396c22f243 doughnut chart model added
doughnut chart view added
doughnut chart added
2020-01-11 16:06:25 +05:30
Murugan, Vimal
30d864749a unordered list added
numbered list added
2020-01-11 10:30:40 +05:30
Pan, Xinlei (Ryan)
a2ef7e026f Merge branch 'feature/headline_body_caret_link_image_molecule' into 'develop'
Feature/headline body caret link image molecule

See merge request BPHV_MIPS/mvm_core_ui!212
2020-01-10 11:38:32 -05:00
panxi
c4112665d9 add bottom padding 2020-01-10 11:35:29 -05:00
Khan, Arshad
7a48633cce Implemented Ryan's feedback, as Prateek is out of office for next week. 2020-01-10 10:59:13 -05:00
Pfeil, Scott Robert
90d7b188d1 each template must parse themselves... 2020-01-10 09:55:42 -05:00
Pfeil, Scott Robert
99a258c0f8 Template associated type testing 2020-01-10 08:57:56 -05:00
Arora, Prateek
61d36b25a7 Code changes 2020-01-10 11:04:07 +05:30
Pfeil, Scott Robert
629f30e073 container updates 2020-01-09 16:38:14 -05:00
Pfeil, Scott Robert
c098914309 pull 2020-01-09 16:37:54 -05:00
Pfeil, Scott Robert
826cb7f284 container change footer 2020-01-09 16:28:00 -05:00
Pfeil, Scott Robert
7fb22648c0 Container updates 2020-01-09 16:27:02 -05:00
panxi
83b0a55404 merge from feature/coding 2020-01-09 16:22:47 -05:00
panxi
99b97fd934 merge from develop 2020-01-09 16:17:29 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Suresh, Kamlesh
49a7df70e1 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 16:00:09 -05:00
Suresh, Kamlesh
8d2348fe63 swiftify MoleculeDelegateProtocol 2020-01-09 15:59:56 -05:00
Pfeil, Scott Robert
0e6a2202ea Remove old file 2020-01-09 15:51:42 -05:00
Kevin G Christiano
0b9f641d87 reset super. 2020-01-09 15:43:10 -05:00
Kevin G Christiano
47b82f7e87 date formatting exposure. 2020-01-09 15:32:35 -05:00
Suresh, Kamlesh
c8f8f8136d model changes 2020-01-09 15:11:03 -05:00
Pfeil, Scott Robert
40def6e19b control default 2020-01-09 14:30:25 -05:00
Pfeil, Scott Robert
b3b37db848 remove deprecated 2020-01-09 14:26:26 -05:00
Suresh, Kamlesh
e310a2b74e Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 14:22:03 -05:00
Pfeil, Scott Robert
f6c3a02f0e remove old extension 2020-01-09 14:20:58 -05:00
Kevin G Christiano
6b983d2f69 Moved out. 2020-01-09 14:11:50 -05:00
Pfeil, Scott Robert
78461d0557 CaretLink 2020-01-09 13:48:35 -05:00
Suresh, Kamlesh
dba412c7d9 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 13:45:27 -05:00
Suresh, Kamlesh
2365a2fab4 fixes 2020-01-09 13:45:17 -05:00
Kevin G Christiano
4c078d607c access didits. 2020-01-09 13:34:37 -05:00
panxi
c8fcbeaefd update right panel view controller 2020-01-09 12:47:03 -05:00
Kevin G Christiano
371fb148d1 altered constraint. 2020-01-09 12:09:33 -05:00
Arora, Prateek
b037d23adb Code changes 2020-01-09 22:25:53 +05:30
Pfeil, Scott Robert
3e8b69a0bc Line and image update 2020-01-09 11:38:32 -05:00
Pfeil, Scott Robert
d651fb5783 Dash line color require for model, optional for server 2020-01-09 11:00:00 -05:00
Pfeil, Scott Robert
f40335ce19 progress, multi progress, caret 2020-01-09 10:46:00 -05:00
Arora, Prateek
20f62ce4c5 Code clean 2020-01-09 20:10:39 +05:30
Arora, Prateek
b8a162da54 Code cleaning removing duplicate constraint 2020-01-09 20:10:17 +05:30
Chintakrinda, Arun Kumar (Arun)
0ca77eadc2 Chatbot disable to BD users 2020-01-09 18:24:18 +05:30
Arora, Prateek
7b49224abd Caret link bottom spacing 2020-01-09 18:19:52 +05:30
Arora, Prateek
03aeb1fc63 headline body width 85% having max as 350px 2020-01-09 16:35:56 +05:30
Arora, Prateek
67304b7657 Changes as suggested by Ryan 2020-01-09 13:26:09 +05:30
Suresh, Kamlesh
54d0ea3e5c ModuleMolecule fixes 2020-01-08 16:50:47 -05:00
Pfeil, Scott Robert
b97416e7d6 Multip progress 2020-01-08 16:45:42 -05:00
Pfeil, Scott Robert
b3f10ec1c6 Fix stack 2020-01-08 16:25:35 -05:00
Kevin G Christiano
efc163ab38 no com 2020-01-08 15:08:31 -05:00
Kevin G Christiano
a99dd7f0a6 removed isSelected. 2020-01-08 14:46:40 -05:00
Kevin G Christiano
62c637f02b Merge branch 'develop' into feature/swiftify_switch 2020-01-08 14:39:49 -05:00
Pfeil, Scott Robert
d4c9753041 Percent 2020-01-08 14:27:10 -05:00
Kevin G Christiano
e674fe4d94 Adding protocols, comments, and mild reworks. 2020-01-08 14:19:37 -05:00
Kevin G Christiano
468f58b88e Merge branch 'develop' into feature/button 2020-01-08 13:34:31 -05:00
Pfeil, Scott Robert
2e514a7de5 Colors 2020-01-08 13:22:45 -05:00
Kevin G Christiano
e8f52cd75a execute if no text. 2020-01-08 13:13:17 -05:00
Kevin G Christiano
b6cb83a146 Merge branch 'develop' into feature/swiftified_textField 2020-01-08 13:08:46 -05:00
Suresh, Kamlesh Jain
f0c7fbcb9e Merge branch 'feature/textfield_list_update_drop_down' into 'develop'
Feature/textfield list update drop down

See merge request BPHV_MIPS/mvm_core_ui!211
2020-01-08 11:58:08 -05:00
Kevin G Christiano
55b38e48ef Remove asynchronous statement which was preventing proper redrawing. 2020-01-08 11:42:17 -05:00
Pfeil, Scott Robert
b620a533d5 Color
CaretLink model change name
2020-01-08 11:22:34 -05:00
Kevin G Christiano
dfa2fa3343 Ensure that isEnabled only triggers when false. Preventing isEnabled from changing isON. 2020-01-08 11:03:44 -05:00
Kevin G Christiano
14f49882b1 Big Self. 2020-01-08 10:44:36 -05:00
Kevin G Christiano
4a49c40b19 Using pointInside from Control. 2020-01-08 10:28:37 -05:00
Kevin G Christiano
a88bb1e0ff Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI/BaseClasses/Control.swift
2020-01-08 10:19:01 -05:00
Kevin G Christiano
84462a197e changed comment. 2020-01-08 09:37:47 -05:00
Kevin G Christiano
2d0377acfc small format. 2020-01-08 09:30:55 -05:00
Kevin G Christiano
7d2770356b Merge branch 'develop' into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-08 09:29:52 -05:00
Kevin G Christiano
2abd6a866a Explaining use case of Color. 2020-01-08 09:28:54 -05:00
Arora, Prateek
203484b288 Code clean 2020-01-08 18:49:36 +05:30
Arora, Prateek
0226eb2cac Review comments : added default padding 2020-01-08 18:46:02 +05:30
Arora, Prateek
4c60ea2f1f Review comment changes 2020-01-08 14:53:59 +05:30
Arora, Prateek
c908606b79 Review Comment Changes 2020-01-08 13:08:09 +05:30
Arora, Prateek
f32cc7d05c Code cleaning 2020-01-08 12:21:28 +05:30
Kevin G Christiano
916f63240b Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-07 16:14:42 -05:00
Kevin G Christiano
2ec963e2b6 latest changes of pr. 2020-01-07 16:08:53 -05:00
Pfeil, Scott Robert
90f388ffa7 Merge branch 'feature/appleguidelinesprotocol' into 'develop'
Created Protocol to centralize tap detection logic.

See merge request BPHV_MIPS/mvm_core_ui!207
2020-01-07 15:56:12 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Kevin G Christiano
30bb405b3f Merge branch 'develop' into feature/swiftified_textField 2020-01-07 11:36:38 -05:00
Kevin G Christiano
05b3f78853 dropping extraneous top and bottom constraints. 2020-01-07 11:36:14 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Arora, Prateek
d891d7ba1a Code cleaning 2020-01-07 19:29:26 +05:30
Arora, Prateek
129a0e9241 New molecule -> headLineBodyCaretLinkImage 2020-01-07 12:34:29 +05:30
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Khan, Arshad
bf0b2ecb79 changed separator style to thin 2020-01-06 16:49:03 +05:30
Murugan, Vimal
f1f34b2893 textfield list view and textfield list form controller been moved to mobilefirstframework 2020-01-04 14:26:09 +05:30
Kevin G Christiano
dc201022ea changed comment. 2020-01-03 14:15:22 -05:00
Murugan, Vimal
709277362f updated constraints 2020-01-03 20:20:23 +05:30
Murugan, Vimal
dd49c43946 code cleanup 2020-01-03 20:18:30 +05:30
Khan, Arshad
c4fbf57890 MOBFIRST-19249 : List Item Style Updates
Adding shortDivider and tallDivider style.
Removing header style.
2020-01-03 19:52:10 +05:30
Murugan, Vimal
e5ca7b5c9e bullet list molecule added 2020-01-02 21:33:31 +05:30
Pfeil, Scott Robert
58c4a7fd8d merge 2020-01-02 09:34:29 -05:00
Pfeil, Scott Robert
5a8584342a merge 2020-01-02 09:31:58 -05:00
Murugan, Vimal
ccc535360c protocol implementation 2019-12-27 13:02:13 +05:30
Murugan, Vimal
1d843ae29a main thread update
access modifier update
2019-12-26 19:33:37 +05:30
panxi
e36d487d32 change model name to containerModel to avoid compiling error 2019-12-20 15:00:42 -05:00
panxi
ca1a6f8c83 merge from develop 2019-12-20 14:59:44 -05:00
Kevin G Christiano
fbc6e83038 Created Protocol to centralize tap detection logic. 2019-12-20 13:27:22 -05:00
Suresh, Kamlesh
7b0e423759 conflict 2019-12-20 12:07:59 -05:00
Suresh, Kamlesh
ba76fedff4 fixes 2019-12-20 10:24:36 -05:00
Kevin G Christiano
d2162cb9b6 removed override to conform. 2019-12-20 08:43:13 -05:00
Kevin G Christiano
cf41609210 correcting alignment func. 2019-12-19 16:09:41 -05:00
Kevin G Christiano
a04399516d Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Views/Checkbox.swift
2019-12-19 15:32:57 -05:00
Kevin G Christiano
3b59e03695 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
#	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
2019-12-19 15:11:48 -05:00
panxi
bf27d19ae1 change float to cgfloat for nslayoutconstraint 2019-12-19 14:25:26 -05:00
panxi
d17ab73d34 update encode decode method 2019-12-19 14:02:52 -05:00
Robinson, Blake
e11f64f0a4 Changed to optionalStringForKey 2019-12-19 13:41:27 -05:00
Robinson, Blake
87613fb375 Used guard instead of if let because some code after the if let was removed 2019-12-19 13:38:51 -05:00