Commit Graph

657 Commits

Author SHA1 Message Date
Robinson, Blake
674dc70b84 Creates method to dismiss regular picker view to avoid relying on dismissDatePicker method 2019-05-31 10:46:44 -04:00
Pfeil, Scott Robert
e46ace462a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-05-31 09:42:40 -04:00
Pfeil, Scott Robert
38dc726f41 Setting up for defaults 2019-05-31 09:42:31 -04:00
Christiano, Kevin
efec81871c corrections made. 2019-05-30 14:13:44 -04:00
Christiano, Kevin
845036b4ec Changed atom name. making changes to LabelWithIntenralButton. 2019-05-29 21:10:29 -04:00
Christiano, Kevin
a4d9e770e5 Merge branch 'develop' into feature/kevin 2019-05-29 13:59:38 -04:00
panxi
697362f1a3 Merge branch 'feature/fiveg_font' into 'develop'
Feature/fiveg font

See merge request BPHV_MIPS/mvm_core_ui!69
2019-05-29 13:19:14 -04:00
Christiano, Kevin
6dae7e9299 making some comments readable from option key. 2019-05-29 11:41:18 -04:00
Christiano, Kevin
7b2cfb7abb space. 2019-05-29 10:57:53 -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
341aef0184 more merge fixes 2019-05-29 10:13:48 -04:00
Pfeil, Scott Robert
119a9e8c0f merge develop 2019-05-29 09:07:15 -04:00
Pfeil, Scott Robert
1e9e1d2dda Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-05-29 09:05:13 -04:00
Pfeil, Scott Robert
a3325035b9 fix override... 2019-05-28 17:04:25 -04:00
Pfeil, Scott Robert
403f0bbea8 42 update to estimated height 2019-05-28 16:47:07 -04:00
Pfeil, Scott Robert
9cf37d0850 fix extra space 2019-05-28 16:26:23 -04:00
Pfeil, Scott Robert
59900d987a fix to mismatch 2019-05-28 16:00:00 -04:00
Pfeil, Scott Robert
1799f166ee remove duplicate 2019-05-28 10:08:04 -04:00
Christiano, Kevin
f1ba116e8b switch to true. 2019-05-24 14:58:54 -04:00
Christiano, Kevin
8c2b00657e added ItemDetailView to molecule mapping. 2019-05-24 12:58:48 -04:00
Pfeil, Scott Robert
f4cfd0386c add forgotten separator override 2019-05-24 12:30:04 -04:00
Pfeil, Scott Robert
89ed78a0eb miss 2019-05-24 11:57:00 -04:00
Pfeil, Scott Robert
699aa94d0a fixes 2019-05-24 11:56:07 -04:00
Pfeil, Scott Robert
b03fa77dfd added to molecule list 2019-05-24 09:45:42 -04:00
Pfeil, Scott Robert
cf4af8731e fix to parameter 2019-05-24 09:42:20 -04:00
Christiano, Kevin
3b66bcfdc3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-05-24 09:20:56 -04:00
Christiano, Kevin
6d2220cbbf latest version of ItemDetailView. 2019-05-24 09:19:22 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
c0surk2
dd4c541098 Merge branch 'feature/switch' into 'develop'
Feature/switch

See merge request BPHV_MIPS/mvm_core_ui!74
2019-05-23 17:07:13 -04:00
Priya
f53bd03212 Switch molecule 2019-05-23 17:02:30 -04:00
Priya
b73c916192 Switch molecule 2019-05-23 16:32:14 -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
Priya
9fd2d2cbda Switch molecule 2019-05-21 14:04:46 -04:00
Panth Patel
a95456edff ProgressBar Changes 2019-05-20 17:31:41 -04:00
Panth Patel
145cafbc30 ProgreessBar Modifications 2019-05-20 17:14:21 -04:00
Christiano, Kevin
0f9aa7dc01 Adding new atom. 2019-05-20 16:34:02 -04:00
Priya
9f5600a0f3 switch modification 2019-05-20 15:51:07 -04:00
Priya
ddd8eb9d45 Switch molecule 2019-05-20 09:35:35 -04:00
Pfeil, Scott Robert
e92bc6abf9 Smooths out animation into 5g 2019-05-20 09:30:31 -04:00
Priya
aac9db9ca5 Switch molecule 2019-05-17 15:22:12 -04:00
Priya
281a10f7e1 Switch molecule 2019-05-17 14:36:18 -04:00
Pfeil, Scott Robert
5e49d5c55d update for error to be called 2019-05-17 11:26:14 -04:00
Pfeil, Scott Robert
1aa53ead0b Merge branch 'feature/fiveg_font' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/fiveg_font 2019-05-17 10:38:24 -04:00
Pfeil, Scott Robert
c59be1b9a8 menu fixing 2019-05-17 10:37:32 -04:00
Chowdhury, Shohrab
d0a0957bb1 show left pannel 2019-05-17 10:35:54 -04:00
Pfeil, Scott Robert
91890011d8 Panel protocol for override panel 2019-05-16 16:44:52 -04:00
Panth Patel
d535e9190b ProgressBar Changes 2019-05-16 15:47:58 -04:00
Panth Patel
6cab25d384 ProgressBar 2019-05-16 15:39:29 -04:00
Priya
85e9c56dcf switch modification 2019-05-16 15:05:05 -04:00
Priya
9ecc7f21a6 switch modification 2019-05-16 11:54:57 -04:00
Priya
97b7fbebad switch modification 2019-05-16 10:20:13 -04:00
Panth Patel
ff823d6862 merge 2019-05-15 12:27:48 -04:00
Panth Patel
78f035ce08 Molecule ProgressBar 2019-05-15 12:19:54 -04:00
Priya
8ef420e3a4 switch modification 2019-05-15 12:01:30 -04:00
Pfeil, Scott Robert
0f458d21a3 module molecule 2019-05-15 11:16:08 -04:00
Christiano, Kevin
ec1682a632 Updated Label. Change LabelWithInternal for when nil is set for actionBlock. 2019-05-14 16:26:35 -04:00
Chowdhury, Shohrab
5da427d469 add font 2019-05-14 14:43:22 -04:00
Chowdhury, Shohrab
150c218ea7 update ble pair 2019-05-14 14:37:41 -04:00
Priya
b77ec675e0 Switch molecule 2019-05-14 14:34:54 -04:00
Christiano, Kevin
42bc51373a Merge branch 'develop' into feature/kevin 2019-05-14 12:37:18 -04:00
Chowdhury, Shohrab
e949f6ec2f add space in method name 2019-05-13 16:07:17 -04:00
Chowdhury, Shohrab
629c531d21 update name 2019-05-13 16:03:59 -04:00
Chowdhury, Shohrab
e4d8e3695b update name method 2019-05-13 16:02:04 -04:00
Chowdhury, Shohrab
bad190a3ab update font name 2019-05-13 15:59:10 -04:00
Chowdhury, Shohrab
315ea87c10 add new font method for 5g 2019-05-13 15:51:21 -04:00
Christiano, Kevin
f00f24f35f Merge branch 'develop' into feature/kevin 2019-05-10 13:10:13 -04:00
Christiano, Kevin
59248974ab Changes made to Label & LabelWithInternalButton. 2019-05-10 13:09:58 -04:00
Panth Patel
2bd55296b8 ProgressBar molecule with a Label 2019-05-09 17:31:18 -04:00
Suresh, Kamlesh
ff07bb1cac Merge branch 'bugfix/checkbox' into 'develop'
update checkbox for crash

See merge request BPHV_MIPS/mvm_core_ui!65
2019-05-09 14:46:21 -04:00
Priya
af81b62f93 switch 2019-05-09 10:58:05 -04:00
panxi
b5f65b6fdf update checkbox for crash 2019-05-09 10:50:36 -04:00
Panth Patel
350385a499 progress_bar changes 2019-05-09 10:45:22 -04:00
Panth Patel
1b116485e4 pbchanges 2019-05-08 17:27:20 -04:00
Panth Patel
c0c3d0df66 changes 2019-05-08 17:23:54 -04:00
Panth Patel
faf0ce2607 progress 2019-05-08 17:20:15 -04:00
Panth Patel
8c0e387663 progresschanges123 2019-05-08 17:13:16 -04:00
Christiano, Kevin
f04e4de01c Merge branch 'develop' into feature/kevin 2019-05-08 16:23:22 -04:00
panxi
2dde640793 Merge branch 'develop' into bugfix/detail_view_controller 2019-05-08 12:45:42 -04:00
panxi
f4bf4c0b5a update code based on Scott's comment 2019-05-08 11:03:14 -04:00
Priya
14b01d0ae0 switch changes 2019-05-07 12:55:46 -04:00
Christiano, Kevin
93f90bad47 corrections made. 2019-05-07 10:48:52 -04:00
Suresh, Kamlesh
682759bc9a Merge branch 'feature/formvalidator_improvements' into 'develop'
improvements

See merge request BPHV_MIPS/mvm_core_ui!63
2019-05-07 10:25:14 -04:00
Christiano, Kevin
dadfc83744 requested changes. 2019-05-07 09:36:10 -04:00
Panth Patel
8a626df980 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2019-05-06 14:13:36 -04:00
Christiano, Kevin
d83cc8f8ae Merge branch 'develop' into feature/kevin 2019-05-06 12:04:16 -04:00
Christiano, Kevin
f1474ca74c removed comment. 2019-05-06 12:03:54 -04:00
Suresh, Kamlesh
1f36121866 ONVIK-16357 2019-05-06 11:00:22 -04:00
Panth Patel
7f21ff89bc lc1 2019-05-05 22:54:41 -04:00
Panth Patel
dc4a7d9cc1 lc 2019-05-05 22:45:50 -04:00
Christiano, Kevin
b7e99e9e5b LabelWithInternalButton now properly relies on Label for its actions. Reworked makeWholeViewClickable. 2019-05-04 16:34:08 -04:00
Suresh, Kamlesh
524eef4379 improvements 2019-05-03 16:47:45 -04:00
panxi
3ec1364aed let tabbar manager handle child viewcontroller's behavior 2019-05-03 15:25:41 -04:00
Christiano, Kevin
51820794db remove test val. 2019-05-03 14:27:51 -04:00
Christiano, Kevin
fa10cb8e58 Merge branch 'develop' into feature/kevin 2019-05-03 14:20:43 -04:00
Christiano, Kevin
2f69b07bf5 Removed unneeded parameter. 2019-05-03 14:20:23 -04:00
Suresh, Kamlesh
d7069129d7 remove from subview not needed 2019-05-03 14:01:35 -04:00
Suresh, Kamlesh
c210ad80e4 clear color 2019-05-03 12:33:42 -04:00
Christiano, Kevin
211d9f6c3b More functionality for label. 2019-05-03 11:28:25 -04:00
Murugan, Vimal
d2c489811b setupview added to initialiser method 2019-05-03 20:03:48 +05:30
panxi
f8ec75c7d5 fix bug for tabbar 2019-05-02 16:34:21 -04:00
Christiano, Kevin
18f8f7d9f3 Two means to set actionable text in code. 2019-05-02 15:37:12 -04:00
panxi
2fdd88356b update acc for mfstyler 2019-05-02 14:34:39 -04:00
Christiano, Kevin
d1153d4bf8 Added button delegate checks for labelWithInternalButton. WIP with multi-action label. 2019-05-02 14:12:41 -04:00
panxi
c99ffc1af7 avoid duplicate use 2019-05-02 13:59:50 -04:00
panxi
791f2e98c7 Merge branch 'develop' into feature/carouselacc 2019-05-02 13:43:16 -04:00
Christiano, Kevin
9c6ddc2470 Small changes. 2019-05-01 16:30:24 -04:00
Christiano, Kevin
2ec2c2b0b8 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
2019-05-01 15:47:46 -04:00
Christiano, Kevin
f64c793aeb Multi-action-text label WIP. 2019-05-01 15:42:49 -04:00
Chowdhury, Shohrab
cff8361f9f allow user to overrise pannable Percentage value 2019-05-01 14:00:57 -04:00
panxi
8ca991b322 bug fix 2019-05-01 11:40:29 -04:00
Pfeil, Scott Robert
cc940d1ab2 Merge branch 'bugfix/match_recent_merge' into 'develop'
matching change from release.

See merge request BPHV_MIPS/mvm_core_ui!53
2019-05-01 09:20:03 -04:00
Suresh, Kamlesh
175fe574c7 typo 2019-04-30 16:04:51 -04:00
Christiano, Kevin
dc6f0d48d4 Merge branch 'develop' into feature/kevin 2019-04-30 15:59:06 -04:00
Suresh, Kamlesh
8282e9a617 fixes with constaints 2019-04-30 15:14:38 -04:00
Suresh, Kamlesh
257cac3794 file 2019-04-30 13:47:08 -04:00
Suresh, Kamlesh
25156195a2 merge 2019-04-30 13:32:12 -04:00
Pfeil, Scott Robert
973ba11822 fix 2019-04-30 13:29:30 -04:00
Christiano, Kevin
14f65b0cd3 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
2019-04-30 13:00:03 -04:00
Christiano, Kevin
2a05328f1a LabelWithInternalButton is in a functional place. Further work required for Label. 2019-04-30 12:11:36 -04:00
Suresh, Kamlesh
770f952904 Merge branch 'feature/molecule_list' into 'develop'
Feature/molecule list

See merge request BPHV_MIPS/mvm_core_ui!52
2019-04-30 11:16:17 -04:00
Pfeil, Scott Robert
2d73f89fd4 separator
keys
clean up
2019-04-30 10:34:25 -04:00
panxi
884b18a8ef order fix 2019-04-30 09:40:54 -04:00
panxi
a51079b601 add 1of 3 into tabbar for accessibility team 2019-04-29 17:44:58 -04:00
panxi
522f7a4be2 add index to tab for accessibility 2019-04-29 17:17:21 -04:00
Christiano, Kevin
2fafde090e matching change from release. 2019-04-29 16:55:22 -04:00
Suresh, Kamlesh
d2d4c30cf6 labelMap 2019-04-29 16:20:27 -04:00
Christiano, Kevin
f6f2cd2068 Carry over caret fixes. 2019-04-29 16:14:13 -04:00
Suresh, Kamlesh
9709c7195d use molecule label 2019-04-29 15:00:29 -04:00
Pfeil, Scott Robert
302a2f887f thickness. molecule alignment 2019-04-29 13:36:36 -04:00
Suresh, Kamlesh
668d42176a merge 2019-04-29 13:29:33 -04:00
Christiano, Kevin
1ab359e360 merge from release/6_14_merge 2019-04-26 14:23:11 -04:00
panxi
2f0a727d03 copy from Kevin's commit: aac5093c37 2019-04-26 13:41:54 -04:00
panxi
d380328913 copy from Kevin commis: d373a3f7be 2019-04-26 13:41:26 -04:00
Christiano, Kevin
8da88c4c87 Moving interaction functionality to label. 2019-04-25 11:41:06 -04:00
Pfeil, Scott Robert
d3361fedeb molecule list fix 2019-04-24 16:21:16 -04:00
Pfeil, Scott Robert
8a349ae16f constraining for stack 2019-04-24 16:14:22 -04:00
Pfeil, Scott Robert
1573e57f2c constraining 2019-04-24 15:38:59 -04:00
Pfeil, Scott Robert
dc1372ca40 merge 2019-04-24 15:38:35 -04:00
Christiano, Kevin
07f8921a4f minor. 2019-04-24 14:32:43 -04:00
Pfeil, Scott Robert
90d2290843 remove extra view I created 2019-04-24 14:30:16 -04:00
Christiano, Kevin
d767890017 Mild fix to caretButton. Fixed dictionary and attributed text issues with Label. 2019-04-24 13:32:13 -04:00
Christiano, Kevin
7d12e70d46 conflict change resolution. 2019-04-23 16:32:04 -04:00
Christiano, Kevin
92c3f22ffe Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
2019-04-23 15:35:25 -04:00
Christiano, Kevin
959d570113 Merge branch 'develop' into feature/delegate_object
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
2019-04-23 15:33:48 -04:00
Pan, Xinlei (Ryan)
e3fd47d9e2 Merge branch 'feature/delegate_object' into 'develop'
LabelWithInternalButton updated with DelegateObject

See merge request BPHV_MIPS/mvm_core_ui!36
2019-04-23 14:09:17 -04:00
Christiano, Kevin
8ae77df354 Removed labelwithoutaccessibilitytraints. 2019-04-23 13:34:51 -04:00
Christiano, Kevin
4e6bd61ae6 Merge branch 'develop' into feature/kevin 2019-04-23 11:44:36 -04:00
Christiano, Kevin
3d2059754c Unnecessary import. Simplified code. Fixed font optional. 2019-04-23 11:20:05 -04:00
Pfeil, Scott Robert
3f6fcdbe16 Merge branch 'develop' into feature/molecule_list 2019-04-22 13:17:13 -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
panxi
32bd4c9d07 bugfix for caretbutton 2019-04-19 15:22:54 -04:00
Pfeil, Scott Robert
52f36aa8e8 merge develop 2019-04-19 10:07:57 -04:00
Pfeil, Scott Robert
a45fd12da5 Merge branch 'bugfix/labelWithInternalButton' into 'develop'
Adding further checks for safety.

See merge request BPHV_MIPS/mvm_core_ui!39
2019-04-19 08:27:35 -04:00
Pfeil, Scott Robert
9865f168c0 Merge branch 'feature/fill' into 'develop'
fill back

See merge request BPHV_MIPS/mvm_core_ui!32
2019-04-19 08:20:12 -04:00
Christiano, Kevin
52d909797e adding further checks for safety. 2019-04-18 16:31:11 -04:00
Suresh, Kamlesh
a9734be4df detail view controller 2019-04-18 12:32:59 -04:00
Christiano, Kevin
83dda81d55 Removed MFLabel. Reflected delegate paradigm. 2019-04-18 10:01:35 -04:00
Christiano, Kevin
241ebf2ae8 Merge branch 'develop' into feature/delegate_object 2019-04-18 09:32:44 -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
Pfeil, Scott Robert
c0d4e553d0 Merge branch 'feature/statusstyle' into 'develop'
add override status bar function

See merge request BPHV_MIPS/mvm_core_ui!31
2019-04-17 15:30:05 -04:00
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
panxi
935b32ed6d update status bar for presented view controller 2019-04-17 12:37:02 -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
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
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
Suresh, Kamlesh
b1869730f5 button_delegate 2019-04-10 12:43:39 -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
Suresh, Kamlesh
0169d50c80 merge and remove CheckBoxWithLabel 2019-04-09 15:42:27 -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
Pfeil, Scott Robert
741785cc22 secondary default as white for the feed 2019-04-09 13:46:28 -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
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
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
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
Suresh, Kamlesh
2b4d8b95c9 checkbox 2019-04-03 14:46:34 -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
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
Christiano, Kevin
656652b962 Conversion of MFLabel to Label. WIP. 2019-04-03 09:35:26 -04:00
Suresh, Kamlesh
d0ac49663a space 2019-04-02 17:21:56 -04:00
Suresh, Kamlesh
8b3d561543 code review 2019-04-02 17:16:22 -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
Christiano, Kevin
dd407f45f9 changes made. Reduced access to caret dimensions. 2019-04-01 16:44:33 -04:00
panxi
1f83778680 remove useless font 2019-04-01 15:22:17 -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
Christiano, Kevin
499f9eb55d Fixed setWithJSON, allows it to work properly with Atom molecule. Provided more properties to control. 2019-04-01 13:30:31 -04:00
Christiano, Kevin
16c644e12d Removed super call for setWithJSON. Provided more functionality for atom steup. 2019-04-01 13:28:15 -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
814f2e1386 Removed a comma at the end 2019-03-29 08:54:36 -04:00
Christiano, Kevin
5083fb7c88 molecule map change. 2019-03-29 08:52:22 -04:00
Christiano, Kevin
f12f9b17f7 Removed dash line from molecule map. 2019-03-29 08:51:37 -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
Suresh, Kamlesh
720c97efb9 merge 2019-03-27 11:42:06 -04:00
Christiano, Kevin
f903e4ee60 Removed Line. Changed comment. 2019-03-27 11:17:05 -04:00
Suresh, Kamlesh
629736b7fc swifting 2019-03-27 11:16:58 -04:00
Christiano, Kevin
42e482d727 Returned addCaretImageView() to the golden path. 2019-03-27 10:46:26 -04:00
Pfeil, Scott Robert
ae4512abff html string 2019-03-27 10:13:51 -04:00
Christiano, Kevin
f154befabf Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-03-26 16:43:47 -04:00
Christiano, Kevin
6f77c64e16 Improvements made. 2019-03-26 16:40:23 -04:00
Suresh, Kamlesh
69309cf3b1 molecule testfields 2019-03-26 13:51:33 -04:00
Pfeil, Scott Robert
bc5e4b311b un nonnulla 2019-03-25 17:32:24 -04:00
Pfeil, Scott Robert
623b1590ee delete unused 2019-03-25 17:11:31 -04:00
Pfeil, Scott Robert
aab0fbc083 non null 2019-03-25 17:07:02 -04:00
Pfeil, Scott Robert
f63b157c16 Fixes to make two button more compatible with legacy 2019-03-25 16:51:51 -04:00
Christiano, Kevin
45467c9e3f Merge branch 'develop' into feature/kevin 2019-03-25 13:15:36 -04:00
Pfeil, Scott Robert
b25b869c4d fix to size check 2019-03-25 12:59:07 -04:00
Pfeil, Scott Robert
b7556fdce9 merge 2019-03-25 09:57:47 -04:00
Pfeil, Scott Robert
b61b6959ca Merge branch 'develop' into feature/load_image_swift 2019-03-25 09:53:46 -04:00
Pfeil, Scott Robert
a2ab8c6571 swifty buttons 2019-03-25 09:37:54 -04:00
Pfeil, Scott Robert
7341e6930c Fix mfloadimageView to swift crash 2019-03-22 12:06:24 -04:00
Christiano, Kevin
b592ff5047 Merge branch 'develop' into feature/kevin
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-03-21 15:47:49 -04:00