Commit Graph

353 Commits

Author SHA1 Message Date
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
Pfeil, Scott Robert
d26d3b1e40 merge 2020-01-17 09:32:58 -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
Xinlei(Ryan) Pan
56b37255c2 merge from feature/coding 2020-01-16 09:59:14 -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
Suresh, Kamlesh
47ccd681ae merge 2020-01-15 16:49:42 -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
952c3bdb53 Toggle model temporary 2020-01-14 21:08:48 -05:00
Suresh, Kamlesh
c3433c2f80 merge 2020-01-14 19:29:37 -05:00
Pfeil, Scott Robert
e85270d038 new molecules to model 2020-01-14 18:33:34 -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
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
2f6859f543 button model fix 2020-01-14 11:17:10 -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
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
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
53e00a7654 Merge branch 'feature/coding' into feature/unordered_numbered_list_from_coding 2020-01-13 17:03:00 -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
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -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
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -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
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
9882528b9e Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 12:50:08 -05:00
Pfeil, Scott Robert
788145332f Two button view temporary model fix
primary button model
2020-01-13 12:44:05 -05:00
Pfeil, Scott Robert
5c0d57fded Merge branch 'feature/model_wip_kamlesh' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-13 11:33:59 -05:00
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00
Suresh, Kamlesh
1b28db30a0 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-13 11:11:04 -05:00
Suresh, Kamlesh
13183f7b76 remove null in project file 2020-01-13 11:10:51 -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
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
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
Pfeil, Scott Robert
99a258c0f8 Template associated type testing 2020-01-10 08:57:56 -05:00
Pfeil, Scott Robert
c098914309 pull 2020-01-09 16:37:54 -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
Suresh, Kamlesh
a7072fe1a0 remove template 2020-01-09 16:01:27 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Suresh, Kamlesh
8d2348fe63 swiftify MoleculeDelegateProtocol 2020-01-09 15:59:56 -05:00
Pfeil, Scott Robert
391e3a635d remove file 2020-01-09 15:53:42 -05:00
Pfeil, Scott Robert
f6c3a02f0e remove old extension 2020-01-09 14:20:58 -05:00
Pfeil, Scott Robert
78461d0557 CaretLink 2020-01-09 13:48:35 -05:00
Kevin G Christiano
62c637f02b Merge branch 'develop' into feature/swiftify_switch 2020-01-08 14:39:49 -05:00
Kevin G Christiano
468f58b88e Merge branch 'develop' into feature/button 2020-01-08 13:34:31 -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
Pfeil, Scott Robert
b620a533d5 Color
CaretLink model change name
2020-01-08 11:22:34 -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
7d2770356b Merge branch 'develop' into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-08 09:29:52 -05:00
Kevin G Christiano
916f63240b Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-07 16:14:42 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
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
Murugan, Vimal
f1f34b2893 textfield list view and textfield list form controller been moved to mobilefirstframework 2020-01-04 14:26:09 +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
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
ba76fedff4 fixes 2019-12-20 10:24:36 -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
Robinson, Blake
39c96849c8 Translates MFCustomButton to Button 2019-12-18 17:58:53 -05:00
Kevin G Christiano
77e2269062 Provided an alternative means to provide Codable StackView.Alignment string. 2019-12-17 09:46:47 -05:00
Suresh, Kamlesh
c6d5775d57 CaretButtonModel 2019-12-16 13:51:37 -05:00
Pfeil, Scott Robert
7f01bc286c stack item as container 2019-12-13 17:07:10 -05:00
panxi
8612b34ac7 update listitem 2019-12-13 11:26:48 -05:00
Suresh, Kamlesh
58ec1abcfe list model protocol 2019-12-13 11:07:32 -05:00
panxi
52186bf089 add protocol func into view 2019-12-12 17:22:26 -05:00
panxi
8d811f229f change from viewconstrainingview to view 2019-12-12 15:28:47 -05:00
Pfeil, Scott Robert
be1b867a9a testing container ideas 2019-12-12 14:50:52 -05:00
Pfeil, Scott Robert
e5acf63e6f container testing 2019-12-12 10:03:41 -05:00
Kevin G Christiano
eab910011e General working order of the Toggle. 2019-12-11 15:10:26 -05:00
Suresh, Kamlesh
7c7232fe6a remove PageModel 2019-12-09 14:36:14 -05:00
Suresh, Kamlesh
3a1e3356bf module molecule 2019-12-06 14:30:19 -05:00
Suresh, Kamlesh
9676f41633 container model protocol 2019-12-04 16:59:02 -05:00
Suresh, Kamlesh
b7ff1354b8 clean up 2019-12-04 16:21:10 -05:00
Kevin G Christiano
8a796467e6 Initial state of Swiftified Switch. 2019-12-04 15:50:08 -05:00
Kevin G Christiano
99952db4b3 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2019-12-04 15:28:30 -05:00
Kevin G Christiano
c627901d74 updates to color model and extension. 2019-12-04 15:28:22 -05:00
Pfeil, Scott Robert
a10c1a6161 merge develop 2019-12-04 13:43:24 -05:00
Pfeil, Scott Robert
d95e42330e moving files 2019-12-04 13:09:50 -05:00
Kevin G Christiano
7e48670179 Adding Model for UIColor and supporting UIColor Extension. 2019-12-04 12:38:57 -05:00
Robinson, Blake
988e30daa9 Creates Link atom to replace MFTextButton 2019-12-02 11:15:50 -05:00
Kevin G Christiano
0f04ebe177 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-12-02 09:04:17 -05:00
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Suresh, Kamlesh
7a09e4b830 merge 2019-11-27 14:38:01 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -05:00
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00