Commit Graph

657 Commits

Author SHA1 Message Date
Kevin G Christiano
38912a4f85 some changes made. More to come. 2019-08-29 16:21:30 -04:00
Kevin G Christiano
c2a432fd25 Updated localizable strings to include spanish. Renamed the variable to be more in line with its generic purpose. 2019-08-29 14:58:02 -04:00
Kevin G Christiano
2792808c9e Further changes made. 2019-08-29 14:20:42 -04:00
Kevin G Christiano
8e216f8b90 Corrections made. 2019-08-29 14:13:44 -04:00
Kevin G Christiano
0a97774098 Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 13:29:16 -04:00
Kevin G Christiano
40b771f2da Merge branch 'develop' into feature/align_actiondetaiimage_with_android 2019-08-29 10:52:45 -04:00
Kevin G Christiano
4f47aa9ad5 changed key. 2019-08-29 10:52:20 -04:00
Pfeil, Scott Robert
3e426cb80b Fix to two button view 2019-08-29 10:19:28 -04:00
Kevin G Christiano
1c5b2e448e Merge branch 'develop' into feature/label_accessibility 2019-08-29 09:39:37 -04:00
Kevin G Christiano
5351c31b1c latest from develop. 2019-08-29 09:39:22 -04:00
Pfeil, Scott Robert
3234a6ee7e estimated heights update 2019-08-29 08:35:27 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Kevin G Christiano
e0643d834e adding dimension ratio. 2019-08-28 10:40:43 -04:00
Kevin G Christiano
c7501f9cd6 Added asychronous behavior to adding image. 2019-08-27 16:28:19 -04:00
Pfeil, Scott Robert
4bc22dbb8e switches 2019-08-26 12:35:04 -04:00
Kevin G Christiano
f73d5e73a5 altered comments. 2019-08-22 11:37:50 -04:00
Pfeil, Scott Robert
a9539c6c89 Fix competition 2019-08-20 10:44:15 -04:00
Pfeil, Scott Robert
6a2405989d Fixes to ambiguity 2019-08-20 10:00:07 -04:00
Pfeil, Scott Robert
11669c173e typo fix 2019-08-19 16:18:27 -04:00
Pfeil, Scott Robert
021036d88c fix to use margins 2019-08-19 16:16:50 -04:00
Pfeil, Scott Robert
84ecaa9a81 height changes minor 2019-08-19 13:30:50 -04:00
Kevin G Christiano
b21664288d Allows JSON to set wholeViewIsClickable. 2019-08-19 13:13:27 -04:00
Kevin G Christiano
a4bec1d956 mild changes. 2019-08-19 12:11:55 -04:00
Pfeil, Scott Robert
10755d888f change vertical 2019-08-15 15:24:37 -04:00
Pfeil, Scott Robert
d810667473 Fixes! 2019-08-15 12:08:44 -04:00
Pfeil, Scott Robert
f3f8d57a0b timing fix... 2019-08-15 10:59:25 -04:00
Pfeil, Scott Robert
d5e49d0e5a progress bar fixes 2019-08-15 10:50:29 -04:00
Kevin G Christiano
abde89f06f Latest changes to account for variable icon locations and text alignments. 2019-08-14 12:58:46 -04:00
Kevin G Christiano
7c93506d87 Merge branch 'develop' into feature/label_export_box 2019-08-14 10:35:52 -04:00
Kevin G Christiano
248ee9a0d4 Changed code to align with Android. 2019-08-14 10:05:44 -04:00
Pan, Xinlei (Ryan)
b65cb3ed5c Merge branch 'bugfix/insets' into 'develop'
fix inset defect for safe area

See merge request BPHV_MIPS/mvm_core_ui!114
2019-08-13 16:24:18 -04:00
Pfeil, Scott Robert
ab08845708 fix inset defect for safe area 2019-08-13 15:38:06 -04:00
Pfeil, Scott Robert
8983f3b642 Merge branch 'feature/standardlistitemwithimage' into 'develop'
Moved File.

See merge request BPHV_MIPS/mvm_core_ui!113
2019-08-13 09:59:26 -04:00
Kevin G Christiano
669d087a57 moved file. 2019-08-13 09:38:05 -04:00
Pfeil, Scott Robert
18c916eba0 Merge branch 'bugfix/size_calculation' into 'develop'
Calculation of size fix

See merge request BPHV_MIPS/mvm_core_ui!112
2019-08-13 09:35:04 -04:00
Kevin G Christiano
dd18fd2517 Merge branch 'develop' into feature/standardlistitemwithimage 2019-08-13 09:32:02 -04:00
Kevin G Christiano
324b132051 padding change. 2019-08-13 09:27:38 -04:00
Pfeil, Scott Robert
2424176131 Calculation of size fix 2019-08-13 09:14:56 -04:00
Pfeil, Scott Robert
d754944fcd text alignment and mark fix 2019-08-12 15:28:06 -04:00
Kevin G Christiano
444fbc65f5 padding correction. 2019-08-12 13:28:20 -04:00
Kevin G Christiano
fd8b8fb7b7 updates made to padding and reset/module functionality. 2019-08-12 12:47:21 -04:00
Kevin G Christiano
57f82aa60a Call super reset in vcv. Further adjustments to atom. 2019-08-12 09:40:15 -04:00
Kevin G Christiano
4fc5ff9313 adjustments made. 2019-08-12 09:04:18 -04:00
Kevin G Christiano
7085137210 Merge branch 'develop' into feature/standardlistitemwithimage 2019-08-09 15:23:12 -04:00
Kevin G Christiano
f78a952905 space. 2019-08-09 15:22:49 -04:00
Kevin G Christiano
d4a19d9086 Removed unneeded line. 2019-08-09 09:45:44 -04:00
Kevin G Christiano
55f4fec029 Merge branch 'develop' into feature/customeragreement_support 2019-08-08 16:21:33 -04:00
Kevin G Christiano
93ed26820d Latest State 2019-08-05 16:37:27 -04:00
Kevin G Christiano
cbe572b8ba Merge branch 'develop' into feature/support_colorpicker 2019-08-05 11:50:42 -04:00
Kevin G Christiano
1ec98eb29a Needed to expose a few properties of the class in order to have adapt it to slight changes for use in support class. 2019-08-05 11:50:15 -04:00
Kevin G Christiano
7176155dfc Merge branch 'develop' into feature/label_export_box 2019-08-05 10:16:54 -04:00
Kevin G Christiano
519542d3e5 Renamed class. 2019-08-05 10:09:11 -04:00
Kevin G Christiano
f2d5570989 layoutMarginsGuide. 2019-08-05 09:58:43 -04:00
Kevin G Christiano
eea2560e15 Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-08-05 09:11:44 -04:00
Kevin G Christiano
dd05284b95 latest updates. 2019-08-05 09:09:57 -04:00
Pfeil, Scott Robert
e0afa92c79 carousel bug fix.
imageHeadlineBody
2019-08-02 10:26:16 -04:00
Pfeil, Scott Robert
708b947b02 Revert "Merge branch 'feature/molecule_multiLabelListItem' into 'develop'"
This reverts merge request !99
2019-08-01 11:57:57 -04:00
Pfeil, Scott Robert
85675b8637 separator color fix for list item 2019-08-01 11:49:17 -04:00
Pfeil, Scott Robert
4d905bb17d fix to bool typo 2019-08-01 11:45:10 -04:00
Pfeil, Scott Robert
ee2fbbecfe Merge branch 'develop' into bugfix/paging_crash 2019-08-01 09:24:00 -04:00
Pfeil, Scott Robert
7bb6e5ba8d check before use 2019-08-01 09:23:10 -04:00
Kevin G Christiano
b35df4c07b Merge branch 'develop' into feature/customeragreement_support 2019-07-31 12:09:22 -04:00
Kevin G Christiano
00f3152472 reversed trailing anchor constraints. 2019-07-31 12:03:54 -04:00
Kevin G Christiano
ae92c9bbf8 composition. 2019-07-29 09:41:42 -04:00
Kevin G Christiano
905a2b948e Added some sugar to typealias definition. 2019-07-29 09:40:33 -04:00
Kevin G Christiano
f6cd3aad18 Improved functioning of tap when adding icon before action. Appears to have separate behavior when done as a molecule than from source. 2019-07-29 09:35:00 -04:00
Kevin G Christiano
c6d445034b Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-07-27 18:17:29 -04:00
Kevin G Christiano
a2d4984822 Currently investigate separate treatment for label image attachments in molecular structure. 2019-07-27 18:11:57 -04:00
Kevin G Christiano
45689c7c51 Made fix to TopLabelBottomButtomVC. Added close X image to replace 'X' char. 2019-07-27 17:31:19 -04:00
Kevin G Christiano
ddb4ba39d0 Reworked mutable insert logic. Revised comments. 2019-07-27 17:00:27 -04:00
Kevin G Christiano
5a7acf6a33 Merge branch 'feature/label_export_box' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/label_export_box 2019-07-26 15:21:40 -04:00
Kevin G Christiano
64e6b8bbfe preventing space if 0. 2019-07-26 15:21:27 -04:00
Kevin G Christiano
a21774b390 comment & preventing leading text image due to problem. 2019-07-26 15:21:01 -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
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
Pfeil, Scott Robert
245d7d93d6 efficiency commit 2019-07-25 10:44:14 -04:00
Pfeil, Scott Robert
5ebc4b0e31 strikethrough fix
warning fix.
2019-07-24 15:38:13 -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
Kevin G Christiano
bc516ff74c removed statement causing loop. 2019-07-23 12:14:18 -04:00
Kevin G Christiano
c9c3ef1ade Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 11:58:54 -04:00
Pfeil, Scott Robert
6537523373 different way to update 2019-07-23 11:57:03 -04:00
Kevin G Christiano
7472533bc1 fixes error alert. 2019-07-23 10:13:44 -04:00
Kevin G Christiano
1ec4f271ff Merge branch 'bugfix/update_after_load_image' into feature/standardlistitemwithimage 2019-07-23 10:07:35 -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
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
Kevin G Christiano
da1ce6718b Merge branch 'develop' into feature/standardlistitemwithimage 2019-07-16 10:26:26 -04:00
Kevin G Christiano
9444df4d7c latest take on listitemwithimage. 2019-07-16 10:25:53 -04:00