Commit Graph

91 Commits

Author SHA1 Message Date
Kevin G Christiano
d79dc3e8ab Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-07-01 09:38:09 -04:00
Pfeil, Scott Robert
0db0f91b3b ModuleMolecule is now a self contained view.
Fixed priority defect in view constraining view.
Change the way names are set for reuse
improve current margin logic
2019-06-26 12:01:47 -04:00
Kevin G Christiano
ba84d2780d Added standardlistitem. 2019-06-24 10:48:28 -04:00
Pfeil, Scott Robert
cd577288c3 Merge branch 'feature/kevin' into 'develop'
Label Multi-Action

See merge request BPHV_MIPS/mvm_core_ui!62
2019-06-21 12:33:56 -04:00
Panth Patel
65af40f7c7 json changes updated 2019-06-14 10:41:22 -04:00
Christiano, Kevin
53bdf0fcc5 Merge branch 'develop' into feature/kevin 2019-06-12 10:59:30 -04:00
Suresh, Kamlesh
3671843ecf Merge branch 'feature/molecule_progressbar' into 'develop'
ProgressBar molecule

See merge request BPHV_MIPS/mvm_core_ui!66
2019-06-07 11:47:24 -04:00
Christiano, Kevin
8ebcef3a60 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
2019-06-04 16:23:06 -04:00
Pfeil, Scott Robert
161f3e9f08 reset function.
standard spacing for cell molecule
MFTextField to view contstraining view
constraining protocol
2019-06-04 12:42:52 -04:00
Panth Patel
458cddb421 progress bar changes 2019-06-04 11:52:56 -04:00
Christiano, Kevin
845036b4ec Changed atom name. making changes to LabelWithIntenralButton. 2019-05-29 21:10:29 -04:00
Christiano, Kevin
b00d439ead Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/Label.swift
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-05-29 10:51:11 -04:00
Christiano, Kevin
68f27da117 Changed ItemDetailView name to StandardListItem to comply with molecule listing. 2019-05-29 10:23:39 -04:00
Pfeil, Scott Robert
119a9e8c0f merge develop 2019-05-29 09:07:15 -04:00
Christiano, Kevin
3b66bcfdc3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-05-24 09:20:56 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
Priya
344163de49 Switch molecule 2019-05-23 16:22:32 -04:00
Priya
2e99c7baff Switch molecule 2019-05-23 12:31:36 -04:00
Priya
89b1c9a21b Switch molecule 2019-05-23 11:40:21 -04:00
Christiano, Kevin
c4ad3cc881 adding new atom. 2019-05-20 16:34:17 -04:00
Panth Patel
faf0ce2607 progress 2019-05-08 17:20:15 -04:00
Priya
14b01d0ae0 switch changes 2019-05-07 12:55:46 -04:00
Pfeil, Scott Robert
dc1372ca40 merge 2019-04-24 15:38:35 -04:00
Pfeil, Scott Robert
90d2290843 remove extra view I created 2019-04-24 14:30:16 -04:00
Christiano, Kevin
8ae77df354 Removed labelwithoutaccessibilitytraints. 2019-04-23 13:34:51 -04:00
Pfeil, Scott Robert
b00b43eab0 Helper functions
Molecule List.
Back to view instead of margins for stack due to background color issues.
Standard Header View to margin for internal use.
2019-04-22 13:14:22 -04:00
Christiano, Kevin
83dda81d55 Removed MFLabel. Reflected delegate paradigm. 2019-04-18 10:01:35 -04:00
Christiano, Kevin
17decc6602 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atoms/Views/MFLabel.h
#	MVMCoreUI/Atoms/Views/MFLabel.m
2019-04-18 09:32:31 -04:00
Christiano, Kevin
da1f5a5703 Converted MFLabel (objc) to Label (Swift). Pulled LabelWithoutAccessibilityTraits from Mobilefirst module and converted it. Altered imports where needed. 2019-04-15 16:50:35 -04:00
Pfeil, Scott Robert
5ebcba15fa molecule delegate object 2019-04-15 12:59:27 -04:00
Pfeil, Scott Robert
f1d80adf57 delegate object and simple deprecation 2019-04-12 15:32:43 -04:00
Christiano, Kevin
b88052ed9b Merge branch 'develop' into feature/label_conversion
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-04-10 16:19:07 -04:00
Christiano, Kevin
2827cffd1f Merge branch 'develop' into feature/label_conversion
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-04-09 14:45:55 -04:00
Christiano, Kevin
6ec133d3c9 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-04-09 13:53:48 -04:00
Suresh, Kamlesh
b04a35875b Merge branch 'feature/moving_radio_button' into 'develop'
moving_radio_button

See merge request BPHV_MIPS/mvm_core_ui!24
2019-04-08 16:53:37 -04:00
Christiano, Kevin
fffc9c3932 Merge branch 'develop' into feature/kevin 2019-04-07 20:19:15 -04:00
Christiano, Kevin
edde99cc23 Changes made to satisfy update to MFLabel. 2019-04-07 20:18:40 -04:00
Suresh, Kamlesh
b3138e7508 Merge branch 'feature/swift_5' into 'develop'
swift5

See merge request BPHV_MIPS/mvm_core_ui!20
2019-04-05 17:27:01 -04:00
Christiano, Kevin
ac0e200321 Merge branch 'develop' into feature/label_conversion 2019-04-05 16:45:04 -04:00
Suresh, Kamlesh
5d46f8c0d4 moving_radio_button 2019-04-04 18:03:14 -04:00
Christiano, Kevin
5b1520bc44 Merge branch 'develop' into feature/kevin 2019-04-04 14:00:53 -04:00
Suresh, Kamlesh
63aa52da39 new group 2019-04-04 13:45:18 -04:00
Christiano, Kevin
656652b962 Conversion of MFLabel to Label. WIP. 2019-04-03 09:35:26 -04:00
Suresh, Kamlesh
ff3055a4c7 improvement 2019-04-02 15:55:16 -04:00
Suresh, Kamlesh
5df8ad42f3 merge 2019-04-01 18:01:42 -04:00
Suresh, Kamlesh
b3bbf5f12c Merge branch 'develop' into feature/swift_5 2019-04-01 17:29:22 -04:00
Suresh, Kamlesh
b0b5ffef8e swift5 2019-04-01 13:24:15 -04:00
Christiano, Kevin
abe80a1ce3 Converted LabelWithInternalButton.h/m to LabelWithInternalButton.swift. Removed LabelWithInternalButton.h/m. Changes reflected in project file. 2019-03-29 10:00:35 -04:00
Suresh, Kamlesh
720c97efb9 merge 2019-03-27 11:42:06 -04:00
Suresh, Kamlesh
629736b7fc swifting 2019-03-27 11:16:58 -04:00