Commit Graph

98 Commits

Author SHA1 Message Date
Christiano, Kevin
71f1f499e0 optional check improvements. 2019-04-12 12:23:55 -04:00
Christiano, Kevin
d6fdf9958e Converted MFLabel to Label. 2019-04-12 12:12:33 -04:00
Christiano, Kevin
1b1c35873a development of Label conversion. wip. 2019-04-11 14:25:34 -04:00
Christiano, Kevin
0e5582beed Removing enum. won't bridge to objc correctly. 2019-04-10 16:33:47 -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
d0bc96e3a5 Corrections made. 2019-04-10 12:12:44 -04:00
Christiano, Kevin
503bbc4605 removed redundant check. 2019-04-10 10:06:53 -04:00
Christiano, Kevin
39ce8af7ab further work on conversion. 2019-04-09 15:18:14 -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
6114bbbf92 changed the protocol type. 2019-04-09 14:43:06 -04:00
Christiano, Kevin
6ec133d3c9 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-04-09 13:53:48 -04:00
Christiano, Kevin
edde99cc23 Changes made to satisfy update to MFLabel. 2019-04-07 20:18:40 -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
Christiano, Kevin
baa0f3d3f7 Fixed how NSMutableAttribute is used. 2019-04-04 13:39:59 -04:00
Christiano, Kevin
14d66d1fc6 only used internally 2019-04-04 13:18:06 -04:00
panxi
30fe1c6a08 remove import for actions in mflabel 2019-04-04 08:26:58 -04:00
panxi
4e328eeb83 update label and styler 2019-04-03 15:46:06 -04:00
Christiano, Kevin
ce68eafd34 stopping for now. 2019-04-03 13:31:29 -04:00
panxi
7d7284bd8d remove actions from mflabel 2019-04-03 12:21:31 -04:00
Christiano, Kevin
08dc333568 Further work on conversion. 2019-04-03 11:14:13 -04:00
Christiano, Kevin
656652b962 Conversion of MFLabel to Label. WIP. 2019-04-03 09:35:26 -04:00
panxi
1baa755cae change font to B20 form feed message 2019-04-01 15:05:42 -04:00
panxi
b70f27f67a change feed headline to H32 2019-04-01 14:53:29 -04:00
Christiano, Kevin
bd69d9fb89 mild changes. 2019-04-01 14:10:47 -04:00
panxi
560ea1030d add actions into mflabel 2019-04-01 12:01:44 -04:00
Christiano, Kevin
c5233a680d Further swapping of didSet/willSet. 2019-04-01 11:44:25 -04:00
Christiano, Kevin
f68c355527 name issue came from property observers. NewValue only appears in willSet, not didSet. 2019-04-01 10:08:11 -04:00
Christiano, Kevin
27127aacfb WIP. Issues from language paradigms. Further work to resolve. 2019-03-31 21:08:11 -04:00
Christiano, Kevin
c791d78671 Working with ranges. Overall improvement of swift code. 2019-03-29 16:37:51 -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
panxi
8e0671f9bc Merge branch 'develop' into feature/label 2019-03-29 09:45:22 -04:00
Christiano, Kevin
ef1e43f6c2 Merge branch 'develop' into feature/kevin 2019-03-28 13:21:41 -04:00
panxi
0db36c1405 reduce fonts 2019-03-28 12:01:57 -04:00
panxi
b43690d10e clean up some fonts method 2019-03-28 11:19:18 -04:00
panxi
6ee6170031 remove feedsubmessage 2019-03-28 10:43:09 -04:00
panxi
3cc9750333 remove 1.0 fonts 2019-03-28 10:39:02 -04:00
panxi
5fa9bd1572 remove SubheadBold and SubheadBoldlarge 2019-03-27 17:40:37 -04:00
panxi
ca1c77bc10 remove plan card title 2019-03-27 17:13:20 -04:00
panxi
883c4b6ea2 remove headlineblack 2019-03-27 17:02:17 -04:00
panxi
6c7e745358 remove HeadlineExtraLarge 2019-03-27 16:57:13 -04:00
panxi
23f75ab2cc remove BodyLighter font and label 2019-03-27 16:52:14 -04:00
panxi
4240b6a2f4 change body bold to b1 2019-03-27 16:35:55 -04:00
panxi
124069c0be change body bold to b1 2019-03-27 15:59:28 -04:00
Christiano, Kevin
f903e4ee60 Removed Line. Changed comment. 2019-03-27 11:17:05 -04:00
Pfeil, Scott Robert
ae4512abff html string 2019-03-27 10:13:51 -04:00
Christiano, Kevin
6f77c64e16 Improvements made. 2019-03-26 16:40:23 -04:00
Christiano, Kevin
45467c9e3f Merge branch 'develop' into feature/kevin 2019-03-25 13:15:36 -04:00
Pfeil, Scott Robert
7341e6930c Fix mfloadimageView to swift crash 2019-03-22 12:06:24 -04:00