Commit Graph

591 Commits

Author SHA1 Message Date
Kevin G Christiano
64e6b8bbfe preventing space if 0. 2019-07-26 15:21:27 -04:00
Kevin G Christiano
6dd7cab8f4 Comments added. Further logic added for adding image attachments. 2019-07-26 14:46:29 -04:00
Kevin G Christiano
3a31441bc8 Merge branch 'develop' into feature/label_export_box 2019-07-26 13:39:46 -04:00
Kevin G Christiano
81ccaa5bbd Restructuring the tappable text feature. Must account of the offset incurred by adding an extra space and image attachment to the overall length of the label. Included a sorting feature to ensure clauses array is always in ascending order by location. 2019-07-26 13:39:28 -04:00
Suresh, Kamlesh
d0935a6d65 Merge branch 'feature/molecule_multiLabelListItem' into 'develop'
Added multiLabelListItem - iOS as per MOBFIRST-17824

See merge request BPHV_MIPS/mvm_core_ui!99
2019-07-26 09:50:32 -04:00
vasavk
eeae9a7c70 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/molecule_multiLabelListItem
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m

Signed-off-by: vasavk <vasavi.kanamarlapudi@verizon.com>
2019-07-26 19:19:00 +05:30
Kevin G Christiano
849a4d761a Merge branch 'develop' into feature/label_export_box 2019-07-25 16:48:03 -04:00
Kevin G Christiano
a47e8d4313 Adding check to look for attachments and scale the accordingly. 2019-07-25 16:47:14 -04:00
Kevin G Christiano
7a86febc7c corrected logic error. 2019-07-25 15:15:32 -04:00
Kevin G Christiano
8e6087f86e Merge branch 'develop' into feature/label_export_box 2019-07-25 14:45:27 -04:00
Pan, Xinlei (Ryan)
9c8a806dbd Merge branch 'feature/image_load_efficiency' into 'develop'
efficiency commit

See merge request BPHV_MIPS/mvm_core_ui!103
2019-07-25 12:07:59 -04:00
Pfeil, Scott Robert
245d7d93d6 efficiency commit 2019-07-25 10:44:14 -04:00
Pfeil, Scott Robert
9849a4d287 Merge branch 'feature/scroller' into 'develop'
Feature/scroller

See merge request BPHV_MIPS/mvm_core_ui!102
2019-07-25 08:42:44 -04:00
Pfeil, Scott Robert
5ebc4b0e31 strikethrough fix
warning fix.
2019-07-24 15:38:13 -04:00
Pfeil, Scott Robert
9f3b6e5fe9 Merge branch 'bugfix/update_after_load_image' into 'develop'
Bugfix/update after load image

See merge request BPHV_MIPS/mvm_core_ui!100
2019-07-24 12:50:48 -04:00
Pfeil, Scott Robert
f2db8528a7 threeLayer template
scroller molecule
border color.
remove default height
fix missing update view
2019-07-24 12:44:45 -04:00
Pfeil, Scott Robert
6537523373 different way to update 2019-07-23 11:57:03 -04:00
Pfeil, Scott Robert
482c6c4fab auto looks better 2019-07-23 09:56:49 -04:00
Pfeil, Scott Robert
dace6a6374 update table cell 2019-07-23 09:55:43 -04:00
Pan, Xinlei (Ryan)
362c9b3937 Merge branch 'feature/molecule_carousel' into 'develop'
Feature/molecule carousel

See merge request BPHV_MIPS/mvm_core_ui!97
2019-07-22 13:30:34 -04:00
Pfeil, Scott Robert
f12805ba2a update comment 2019-07-22 09:53:22 -04:00
Pfeil, Scott Robert
c5f8d27636 fix prod break defect 2019-07-19 11:34:22 -04:00
Pfeil, Scott Robert
8842ca8113 Merge branch 'develop' into 'feature/molecule_carousel'
# Conflicts:
#   MVMCoreUI/Molecules/StandardFooterView.swift
#   MVMCoreUI/Molecules/StandardHeaderView.swift
2019-07-19 10:54:43 -04:00
Pfeil, Scott Robert
8400c0eae8 name change 2019-07-19 10:53:16 -04:00
Pfeil, Scott Robert
5c619aa843 remove preserves 2019-07-19 10:48:01 -04:00
Pfeil, Scott Robert
5b1fab39a7 alignment defaults change 2019-07-19 10:14:51 -04:00
vasavk
ecf34bb34d Added multiLabelListItem - iOS as per MOBFIRST-17824
Signed-off-by: vasavk <vasavi.kanamarlapudi@verizon.com>
2019-07-18 15:45:52 +05:30
Suresh, Kamlesh
f76cfcee54 Merge branch 'feature/status_bar_color_updates' into 'develop'
Expose status bar color setting.

See merge request BPHV_MIPS/mvm_core_ui!98
2019-07-15 11:43:42 -04:00
Hedden, Kyle Matthew
b8b1e0ddba Expose status bar color setting. 2019-07-15 11:43:42 -04:00
Pfeil, Scott Robert
3fefff2d51 still need to workout how to know when to use margins... 2019-07-15 10:41:41 -04:00
Pfeil, Scott Robert
5e2d009313 accessibility 2019-07-12 14:49:16 -04:00
Pfeil, Scott Robert
39cb930263 accessibility and page control fixes 2019-07-12 10:25:42 -04:00
Pfeil, Scott Robert
8866e91caa add peaking logic 2019-07-11 16:11:58 -04:00
Pfeil, Scott Robert
33020844dc carousel 2019-07-11 11:54:14 -04:00
Kevin G Christiano
c06a15c91b Added insert external link functionality. Refactored code. 2019-07-09 10:53:29 -04:00
Kevin G Christiano
540439709b Updated Label to account for situations where the text will have an image attachment. There is some bug that affects how the TextContainer looks at multiline text. 2019-07-08 16:35:28 -04:00
Pan, Xinlei (Ryan)
cfcf73634a Merge branch 'feature/header_footer_containers' into 'develop'
header footer as containers

See merge request BPHV_MIPS/mvm_core_ui!94
2019-07-03 13:23:18 -04:00
Pfeil, Scott Robert
436e9035d2 resolve discussions 2019-07-03 13:21:52 -04:00
Pfeil, Scott Robert
033cf878a6 carousel 2019-07-03 13:18:27 -04:00
Pfeil, Scott Robert
eaa8397493 Merge branch 'feature/label_export_box' into 'develop'
Added convenience function which adds the new images to attributed string.

See merge request BPHV_MIPS/mvm_core_ui!92
2019-07-02 10:42:27 -04:00
Pfeil, Scott Robert
f6021bb382 header footer as containers 2019-07-02 10:23:58 -04:00
Kevin G Christiano
8bf4befd02 link icon now scales in size with the text. 2019-07-01 14:23:44 -04:00
Kevin G Christiano
ce681db033 Merge branch 'develop' into feature/label_export_box 2019-07-01 09:40:44 -04:00
Pfeil, Scott Robert
94c6f2f088 Merge branch 'feature/digit_text_field' into 'develop'
Feature/digit text field

See merge request BPHV_MIPS/mvm_core_ui!91
2019-07-01 09:14:53 -04:00
Pfeil, Scott Robert
7fa0943a42 Merge branch 'feature/estimated_heights' into 'develop'
Feature/estimated heights

See merge request BPHV_MIPS/mvm_core_ui!93
2019-07-01 09:14:34 -04:00
Pfeil, Scott Robert
e3c6c004da Merge branch 'bugfix/molecules' into 'develop'
re-molecule image view

See merge request BPHV_MIPS/mvm_core_ui!88
2019-06-28 15:29:36 -04:00
Pfeil, Scott Robert
311ffa8a46 comment clarification 2019-06-28 15:04:43 -04:00
Pfeil, Scott Robert
6fde7bc8b4 two typo fix
list and stack template required molecules
2019-06-28 13:34:15 -04:00
Pfeil, Scott Robert
98a5e33caf Moved required module checking to the view controller where it belongs.
Broke down the update with response into two separate functions.
Only update loadObject.pageJSON if pageType is the same check....
2019-06-28 11:26:45 -04:00
Pfeil, Scott Robert
93f7aae529 estimated heights 2019-06-27 16:18:32 -04:00