Commit Graph

1337 Commits

Author SHA1 Message Date
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
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
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
Robinson, Blake
8d417068a9 Removed heightConstraint-related logic because the heightConstraint was added to increase the tappable area of Link's predecessor, MFTextButton. 2019-12-19 13:13:57 -05:00
Robinson, Blake
6e233e9bab Removes self where unnecessary 2019-12-19 12:23:18 -05:00
Robinson, Blake
7c17889b57 Changed to MVMCoreUIUtility.getWidth() as per pr comments 2019-12-19 12:23:01 -05:00
Kevin G Christiano
f56b08fa0c Merge branch 'develop' into feature/checkboxView_constraints
# Conflicts:
#	MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
2019-12-19 11:21:44 -05:00
Kevin G Christiano
6c9fede0b9 improved reset. 2019-12-19 11:12:59 -05:00
Kevin G Christiano
9e5ccb01a7 removed unused func. 2019-12-19 11:09:18 -05:00