Commit Graph

560 Commits

Author SHA1 Message Date
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
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
5b898b1b21 small clean and reorg 2020-02-12 20:56:05 -05:00
Pfeil, Scott Robert
04e1e44343 merge 2020-02-12 20:55:46 -05:00
Pfeil, Scott Robert
5cecd5f031 Minor fixes 2020-02-12 20:36:05 -05:00
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
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
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
c94a440008 ThreeColumnPlanDataDividerList reference file 2020-02-10 11:54:45 +05:30
Pfeil, Scott Robert
bf8ea963b0 bring back view controller 2020-02-07 15:29:58 -05:00
Prateek Arora
5ae5cfd2d8 WIP: New molecule changes 2020-02-07 17:03:33 +05:30
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
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
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
Prateek Arora
35e7052abb WIP: LabelsWithCircleProgressBar 2020-02-04 14:10:01 +05:30
Pfeil, Scott Robert
205e9707e6 move legacy 2020-01-31 16:37:24 -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
Xinlei(Ryan) Pan
347f054ed1 merge from develop 2020-01-29 15:44:42 -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
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
ecb381e943 switch to toggle 2020-01-27 12:10:48 -05:00
Pfeil, Scott Robert
fe10b40148 reorg 2020-01-24 16:48:28 -05:00
Xinlei(Ryan) Pan
085aa62c8b merge from feature/coding 2020-01-24 15:13:04 -05:00
Xinlei(Ryan) Pan
5e4f976a1c re add entry field container for fixing odd behavior 2020-01-24 10:42:13 -05:00
Xinlei(Ryan) Pan
af20b0a8a4 remove entryfieldcontainer for odd behavior 2020-01-24 10:41:04 -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
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Kevin G Christiano
af83a2aa1e alighing with merge. 2020-01-23 13:10:27 -05:00
Kevin G Christiano
4cc5a15db9 checkbox modeling. Strange issue with EntryFieldContainer. To be observed. 2020-01-23 12:12:45 -05:00
Kevin G Christiano
8a09424dbe Removed and added file back. Something was corrupted with the path name. 2020-01-23 10:27:36 -05:00
Suresh, Kamlesh
d78bc7aa58 moving top 2020-01-22 14:38:54 -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
f816081d8e check box 2020-01-22 13:58:56 -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
85675a1d0e merge feature/coding 2020-01-22 10:24: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
00d1bf7be6 re-organizing 2020-01-22 09:11:56 -05:00
Suresh, Kamlesh
943799d462 more models 2020-01-21 23:33:24 -05:00
Xinlei(Ryan) Pan
eb1cc491b3 Merge branch 'feature/coding' into feature/link 2020-01-21 15:38:28 -05:00
Xinlei(Ryan) Pan
cc27b7e6cf public mftextbutton 2020-01-21 15:36:22 -05:00
Xinlei(Ryan) Pan
66ee6bbc72 update mftextbutton missing 2020-01-21 15:35:14 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Xinlei(Ryan) Pan
b24745fd89 merge from feature/coding 2020-01-21 15:22:15 -05:00
Pfeil, Scott Robert
42b57dcd5d Cleaning 2020-01-21 12:10:48 -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
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
panxi
437138007f merge 2019-11-26 13:54:00 -05:00
panxi
8422362e77 merge from develop 2019-11-26 11:30:43 -05:00
Pfeil, Scott Robert
cc2e4751f5 merge 2019-11-25 09:09:45 -05:00
Pfeil, Scott Robert
d884602d87 tweaks 2019-11-25 09:06:09 -05:00
Pfeil, Scott Robert
dd85a134ac merge 2019-11-25 09:05:32 -05:00
panxi
9ec661ae3b add label model 2019-11-22 14:31:17 -05:00
Kevin G Christiano
72553935c2 latestst state. 2019-11-22 12:53:40 -05:00
panxi
6303c3f92d update label model 2019-11-21 13:15:27 -05:00
Kevin G Christiano
f19d45b865 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/CaretView.swift
#	MVMCoreUI/Molecules/Items/TableViewCell.swift
2019-11-21 11:55:21 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Hedden, Kyle Matthew
3944e02863 Remote Scott's missing test controller. 2019-11-20 17:30:52 -05:00
panxi
715b5f0167 add image, move label model next to label 2019-11-20 15:48:14 -05:00
panxi
28a04218f9 create image model 2019-11-20 15:43:26 -05:00
panxi
dde5f1d1a4 add caret view model and dash line model 2019-11-20 15:30:42 -05:00
panxi
5fd74b695f create model for progress bar, using ModelMoleculeViewProtocol 2019-11-20 14:58:58 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
Pfeil, Scott Robert
d29e8ea3bd small changes 2019-11-19 09:18:15 -05:00
Kevin G Christiano
588f801322 Adding Base TextField. More improvements. 2019-11-18 14:18:36 -05:00
Kevin G Christiano
80c700ba55 Further improvements made to dropdaown. 2019-11-14 11:41:02 -05:00
panxi
1a3d3eb36f update with new code, move core code to mvmcore 2019-11-12 17:36:00 -05:00
panxi
4111080497 Merge branch 'develop' into feature/models 2019-11-12 15:28:38 -05:00
Pfeil, Scott Robert
716dcff566 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-12 14:45:48 -05:00
Kevin G Christiano
48bcd87bc1 Refactored UI drawing to new class. Reflected change. 2019-11-12 14:29:37 -05:00
Kevin G Christiano
30a56923c0 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-11-12 11:08:55 -05:00
Kevin G Christiano
df1a2a0da0 latest changes for entry. 2019-11-12 11:06:43 -05:00
Pfeil, Scott Robert
4a1a196854 typos 2019-11-05 12:32:32 -05:00
Pfeil, Scott Robert
5b8fce36e6 merge develop 2019-11-05 09:14:19 -05:00
Pfeil, Scott Robert
4b374c4e7e modernizing 2019-11-05 08:50:54 -05:00
Pfeil, Scott Robert
0a45d61eb7 merge 2019-11-05 08:50:17 -05:00
Kevin G Christiano
5e96653d4b undo. 2019-11-01 10:17:20 -04:00
Kevin G Christiano
6e8a8a78cc getting ready to try another refactor. 2019-11-01 10:08:13 -04:00
panxi
7870a116c6 create circle progress view 2019-10-31 16:15:47 -04:00
Kevin G Christiano
ba602c1c86 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-30 09:35:39 -04:00
Pfeil, Scott Robert
77a11a69d5 Fix for project file 2019-10-29 12:12:58 -04:00
Pfeil, Scott Robert
d4cacec310 list item separation 2019-10-29 12:05:37 -04:00
Suresh, Kamlesh
205c83c097 intial draft 2019-10-28 14:47:42 -04:00
Pfeil, Scott Robert
b5a97de183 swiftify 2019-10-28 14:03:47 -04:00
Kevin G Christiano
d15d8b2636 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-24 11:20:26 -04:00
Kevin G Christiano
393b3f355b lztest greatest. 2019-10-24 09:08:53 -04:00
Pfeil, Scott Robert
909fe9ae75 Merge branch 'feature/molecule_radio_button' into 'develop'
Feature/molecule radio button

See merge request BPHV_MIPS/mvm_core_ui!70
2019-10-23 17:30:00 -04:00
Kevin G Christiano
a5ffae9edd Latest state. 2019-10-23 15:15:23 -04:00
Kevin G Christiano
74abef0c30 saving state. 2019-10-23 13:59:10 -04:00
Suresh, Kamlesh
d398a45054 code review 2019-10-23 13:53:58 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00
Kevin G Christiano
2ce41ad74b moar texht. 2019-10-22 09:52:12 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
Kevin G Christiano
8d11e28f4e promising state. 2019-10-21 12:11:58 -04:00
Kevin G Christiano
6c8ced47c9 trying out a new subclass. 2019-10-21 11:47:13 -04:00
Kevin G Christiano
929b825e11 more to uopdate. 2019-10-18 10:26:47 -04:00
panxi
034610af5e fixing merging issue 2019-10-17 15:50:25 -04:00
Kevin G Christiano
720d17d751 revisions made. 2019-10-17 15:35:14 -04:00
panxi
22eb114635 merge from develop 2019-10-17 15:32:03 -04:00
Kevin G Christiano
3178fa0223 Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-10-17 14:40:51 -04:00
Kevin G Christiano
d2fddaf769 latest textfield development. 2019-10-17 11:42:34 -04:00
Kevin G Christiano
4a833abc31 mase public. 2019-10-16 10:44:16 -04:00
Kevin G Christiano
e92616a7f5 latest state. 2019-10-15 13:46:50 -04:00
Kevin G Christiano
ef2e177b33 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-11 12:38:20 -04:00
panxi
93733fb7b6 add framework back 2019-10-10 12:48:27 -04:00
panxi
db583609ac change to 8.0 2019-10-10 06:49:31 -04:00
Pfeil, Scott Robert
f37ee3c9ba os version 2019-10-09 13:04:04 -04:00
panxi
0f6a243e7b change back to animaitonframework 2019-10-09 10:10:57 -04:00
panxi
cfdf44379d update framework relate to group 2019-10-08 13:44:02 -04:00
panxi
473ec08b07 remove testing scheme 2019-10-07 17:02:06 -04:00
panxi
1d93f0b452 add new mvmanimation xc framework 2019-10-07 16:58:21 -04:00
Kevin G Christiano
65672b1f04 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-04 08:56:47 -04:00
Kevin G Christiano
4915bda4b9 Beginning stages of swiftification. 2019-10-03 10:44:56 -04:00
Kevin G Christiano
77a3eb8827 Added a new extension file for CATransaction. Implementation of Checkbox and CheckboxWithLabel. 2019-10-02 15:22:12 -04:00
Suresh, Kamlesh
727c02a966 Merge branch 'develop' into feature/models 2019-09-26 11:34:59 -04:00
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Kevin G Christiano
7722dc5619 Merge branch 'develop' into feature/check_box_mole_revision
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-23 14:30:04 -04:00
Pfeil, Scott Robert
0bb3c8a719 new molecule and gone state of stack. 2019-09-23 12:21:59 -04:00
Kevin G Christiano
8238a42177 Added the new classes. 2019-09-13 12:28:34 -04:00
Kevin G Christiano
bedd05daa6 Creation and inclusion of HeadlineBodyButton molecule. 2019-09-12 14:42:10 -04:00
Kevin G Christiano
9ae91ca84a Merge branch 'develop' into feature/healine_body_button_molecule
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-12 10:28:45 -04:00
Pan, Xinlei (Ryan)
0e27266b85 Merge branch 'feature/multiprogress' into 'develop'
Feature/multiprogress

See merge request BPHV_MIPS/mvm_core_ui!132
2019-09-11 16:49:31 -04:00
Suresh, Kamlesh
eb3b1a0e81 initial 2019-09-11 11:05:57 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
panxi
dcd87fb924 add MultiProgress 2019-09-09 16:42:38 -04:00
Pfeil, Scott Robert
b4c53f838b Tabs table cell 2019-09-09 14:07:32 -04:00
Pfeil, Scott Robert
658ed16bbd accordion list item 2019-09-03 15:14:12 -04:00
Kevin G Christiano
9ca6ba50da New class. 2019-08-29 10:50:38 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Kevin G Christiano
096c95f6e0 Setting up new molecule. 2019-08-28 12:16:07 -04:00
Suresh, Kamlesh
0f1ea89623 merge 2019-08-27 12:13:48 -04:00
Pfeil, Scott Robert
4bc22dbb8e switches 2019-08-26 12:35:04 -04:00
Pfeil, Scott Robert
d5e49d0e5a progress bar fixes 2019-08-15 10:50:29 -04:00
Kevin G Christiano
669d087a57 moved file. 2019-08-13 09:38:05 -04:00
Kevin G Christiano
519542d3e5 Renamed class. 2019-08-05 10:09:11 -04:00
Kevin G Christiano
eea2560e15 Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-08-05 09:11:44 -04:00
Pfeil, Scott Robert
e0afa92c79 carousel bug fix.
imageHeadlineBody
2019-08-02 10:26:16 -04:00
Pfeil, Scott Robert
708b947b02 Revert "Merge branch 'feature/molecule_multiLabelListItem' into 'develop'"
This reverts merge request !99
2019-08-01 11:57:57 -04:00
Kevin G Christiano
c6d445034b Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-07-27 18:17:29 -04:00