Commit Graph

244 Commits

Author SHA1 Message Date
Christiano, Kevin
edb2118538 comment out for now. 2019-04-16 09:14:39 -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
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
Pfeil, Scott Robert
75093ca764 Merge branch 'feature/feed_two_button' into 'develop'
Changes for new feed template

See merge request BPHV_MIPS/mvm_core_ui!26
2019-04-10 15:46:25 -04:00
Pfeil, Scott Robert
ba7011d39a Merge branch 'feature/kevin' into 'develop'
Converted LabelWithInternalButton

See merge request BPHV_MIPS/mvm_core_ui!22
2019-04-10 15:35:41 -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
5be26ebaa4 Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into develop 2019-04-09 13:35:25 -04:00
Suresh, Kamlesh
fb61d4664d Merge branch 'feature/loader_accessibilityID' into 'develop'
adding "Loader" as accessibility id

See merge request BPHV_MIPS/mvm_core_ui!25
2019-04-09 11:20:04 -04:00
Pfeil, Scott Robert
3ee784ccb0 Changes for new feed template 2019-04-09 10:38:26 -04:00
Ajai Prabhu G S
e3670a4977 adding "Loader" as accessibility id 2019-04-09 15:34:09 +05:30
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
d8978910bc Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into develop 2019-04-07 20:19:06 -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
Christiano, Kevin
91c6a11bbf Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into develop 2019-04-04 14:00:47 -04:00
Pfeil, Scott Robert
62fe21a9d3 Merge branch 'feature/label' into 'develop'
Feature/label

See merge request BPHV_MIPS/mvm_core_ui!17
2019-04-04 13:57:26 -04:00
Jackson, Jermaine
e61ef45913 Merge branch 'feature/molecule_testfields' into 'develop'
Feature/molecule testfields

See merge request BPHV_MIPS/mvm_core_ui!16
2019-04-04 13:52:20 -04:00
Suresh, Kamlesh
63aa52da39 new group 2019-04-04 13:45:18 -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
Suresh, Kamlesh
ba3dec3043 comments 2019-04-04 11:51:45 -04:00
Pfeil, Scott Robert
8d3a6852cd remove extra block 2019-04-04 10:15:01 -04:00
Pfeil, Scott Robert
df67ded57b small formatting fixes 2019-04-04 09:47:45 -04:00
Christiano, Kevin
46d41125c8 Merge branch 'develop' into feature/kevin 2019-04-04 09:30:32 -04:00
Christiano, Kevin
c78482bad3 added @class. 2019-04-04 09:29:54 -04:00
panxi
30fe1c6a08 remove import for actions in mflabel 2019-04-04 08:26:58 -04:00
Suresh, Kamlesh
63f02a0c7c code review 2019-04-03 17:05:21 -04:00
panxi
b58c191401 update stylegetattributestring function name to 2.0
change grayish color to mfgraycolor for body lighter
2019-04-03 16:12:27 -04:00
panxi
4e328eeb83 update label and styler 2019-04-03 15:46:06 -04:00
Christiano, Kevin
4477647658 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
2019-04-03 13:33:34 -04:00
Christiano, Kevin
ce68eafd34 stopping for now. 2019-04-03 13:31:29 -04:00
Pfeil, Scott Robert
1c33ba0c09 Merge branch 'feature/atomization_ke' into 'develop'
Fixed setWithJSON, allows it to work properly with Atom molecule.

See merge request BPHV_MIPS/mvm_core_ui!19
2019-04-03 13:29:22 -04:00
panxi
7d7284bd8d remove actions from mflabel 2019-04-03 12:21:31 -04:00
Christiano, Kevin
00feea9a58 Added default text color for enabled and disabled states. 2019-04-03 12:09:17 -04:00
Christiano, Kevin
08dc333568 Further work on conversion. 2019-04-03 11:14:13 -04:00
Christiano, Kevin
39edb4c055 changes actionMap to json. 2019-04-03 09:44:47 -04:00
Christiano, Kevin
cad3555156 Removed unnecessary setTitle call. 2019-04-03 09:40:03 -04:00