Commit Graph

6090 Commits

Author SHA1 Message Date
panxi
e59adf7e47 change order of code 2019-04-17 15:20:56 -04:00
panxi
575721589a add missing style 2019-04-17 15:13:54 -04:00
panxi
786d517517 update comments 2019-04-17 15:08:18 -04:00
Pan, Xinlei (Ryan)
11f3d6dcab Merge branch 'feature/up_2_0' into 'develop'
Makes a property public to allow for adding padding to the button accessory view

See merge request BPHV_MIPS/mvm_core_ui!35
2019-04-17 13:48:33 -04:00
Robinson, Blake
f35b31b5b3 Makes a property public to allow for adding padding to the button accessory view 2019-04-17 13:45:20 -04:00
Pfeil, Scott Robert
053d0d06d6 Merge branch 'bugfix/onvik_14895' into 'develop'
ONVIK-14895

See merge request BPHV_MIPS/mvm_core_ui!34
2019-04-17 13:24:55 -04:00
panxi
935b32ed6d update status bar for presented view controller 2019-04-17 12:37:02 -04:00
Suresh, Kamlesh
5deab1b869 Merge branch 'develop' into feature/molecule_radio_button 2019-04-17 11:43:56 -04:00
Suresh, Kamlesh
0abefbcdc0 using MVMCoreUIDelegateObject 2019-04-17 11:40:44 -04:00
panxi
a254e7d882 only change the status bar background color 2019-04-17 11:17:44 -04:00
Suresh, Kamlesh
725a0a914f Merge branch 'develop' into feature/form_checkbox 2019-04-17 11:05:36 -04:00
Suresh, Kamlesh
53502a40c1 merge 2019-04-17 10:59:16 -04:00
Suresh, Kamlesh
7aeb76a3c3 merge 2019-04-16 16:21:02 -04:00
Suresh, Kamlesh
3655b4af8d remove space 2019-04-16 15:51:15 -04:00
Suresh, Kamlesh
76506a51b5 ONVIK-14895 2019-04-16 15:33:34 -04:00
panxi
c1fe2c617d Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/statusstyle 2019-04-16 14:49:45 -04:00
panxi
1b5d423659 remove local default status bar style 2019-04-16 14:49:24 -04:00
Christiano, Kevin
2a479170fa Merge branch 'feature/delegate_object' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/delegate_object 2019-04-16 14:17:12 -04:00
Christiano, Kevin
3084a67822 deprecated code to allow for the DelegateObject paradigm change. 2019-04-16 14:17:02 -04:00
Pfeil, Scott Robert
bd62fc14ce fill back 2019-04-16 14:02:20 -04:00
panxi
89427b1b7a update code based on comments 2019-04-16 11:46:53 -04:00
Pfeil, Scott Robert
48c7a842bc Merge branch 'feature/delegate_object' into 'develop'
delegate object and simple deprecation

See merge request BPHV_MIPS/mvm_core_ui!30
2019-04-16 10:55:34 -04:00
Christiano, Kevin
3a8b6890fa Merge branch 'develop' into feature/kevin 2019-04-16 09:15:05 -04:00
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
Pfeil, Scott Robert
2821f7ea09 Merge branch 'develop' into feature/delegate_object 2019-04-15 16:40:57 -04:00
Pfeil, Scott Robert
7343f24e9b missed super 2019-04-15 15:09:25 -04:00
panxi
9278ad75ea add override status bar function 2019-04-15 14:50:45 -04:00
Pfeil, Scott Robert
e2e6cbabf6 textfield delegate object fix 2019-04-15 14:39:37 -04:00
Pfeil, Scott Robert
01c5abc027 warning fix 2019-04-15 13:47:19 -04:00
Pfeil, Scott Robert
8c19755ba8 warning fix 2019-04-15 13:31:45 -04:00
Pfeil, Scott Robert
5ebcba15fa molecule delegate object 2019-04-15 12:59:27 -04:00
Pfeil, Scott Robert
ad3c0f90b4 molecule view changes 2019-04-15 11:46:26 -04:00
Pfeil, Scott Robert
aa4da8f74f deprecating 2019-04-15 11:14:29 -04:00
Pfeil, Scott Robert
67ac36383b Merge branch 'bugfix/labelWithInternalButton' into 'develop'
Bugfix/label with internal button

See merge request BPHV_MIPS/mvm_core_ui!29
2019-04-15 10:58:22 -04:00
Pfeil, Scott Robert
f1d80adf57 delegate object and simple deprecation 2019-04-12 15:32:43 -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
db672f1c21 Trimming whitespace to prevent double spaces from occurring. 2019-04-12 09:53:30 -04:00
Christiano, Kevin
0a3bd5c834 Updated the string analysis of setText to account for scenarios where an HTML tag is passed as a delimiter. Reoriented the design of the tuple. 2019-04-11 16:58:53 -04:00
Christiano, Kevin
1b1c35873a development of Label conversion. wip. 2019-04-11 14:25:34 -04:00
Suresh, Kamlesh
fa4b03ac1d code review 2019-04-11 11:20:46 -04:00
Suresh, Kamlesh
02efde760d Merge branch 'feature/template_layout_guide' into 'develop'
Feature/template layout guide

See merge request BPHV_MIPS/mvm_core_ui!27
2019-04-10 16:35:43 -04:00
Christiano, Kevin
0e5582beed Removing enum. won't bridge to objc correctly. 2019-04-10 16:33:47 -04:00
Pfeil, Scott Robert
56ed225564 Merge branch 'bugfix/button_delegate' into 'develop'
button_delegate

See merge request BPHV_MIPS/mvm_core_ui!28
2019-04-10 16:27:25 -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
9cb836c10e Merge branch 'develop' into feature/template_layout_guide 2019-04-10 15:51:10 -04:00
Pfeil, Scott Robert
074efcbf1d layout margins 2019-04-10 15:49: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