Commit Graph

6090 Commits

Author SHA1 Message Date
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
Kevin G Christiano
55f20e0633 Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-07-08 11:00:33 -04:00
Kevin G Christiano
1bfbe95b68 updated file name. 2019-07-08 10:36:56 -04:00
Kevin G Christiano
ce1a8c3598 Renamed to comply with MFAtom design doc. 2019-07-08 10:36:34 -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
ada34f6f13 condensed constraint command. 2019-07-01 13:16:14 -04:00
Kevin G Christiano
b821250042 improvements made. 2019-07-01 12:28:28 -04:00
Kevin G Christiano
ce681db033 Merge branch 'develop' into feature/label_export_box 2019-07-01 09:40:44 -04:00
Kevin G Christiano
d79dc3e8ab Merge branch 'develop' into feature/standardlistitemwithimage
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-07-01 09:38:09 -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
Kevin G Christiano
8813646852 Added exportIcon images. Added convenience function which adds the new images to attributed string. 2019-06-27 15:29:33 -04:00
Pfeil, Scott Robert
d742ef9b6a Digit text box molecule 2019-06-27 13:24:32 -04:00
Pfeil, Scott Robert
93dfde6fc6 fix to load timing issue for list 2019-06-27 10:42:22 -04:00
Pfeil, Scott Robert
5a9e1a9a93 remove debug 2019-06-27 10:24:35 -04:00
Pfeil, Scott Robert
868593aabe move module from page to mfviewcontroller 2019-06-27 10:03:24 -04:00
Kevin G Christiano
dbeb5156c5 StandardListItemWithImage assembled. 2019-06-26 14:49:01 -04:00
Pfeil, Scott Robert
bd365d60d2 background color for constrained views optional 2019-06-26 13:09:31 -04:00
Pfeil, Scott Robert
01803e90d6 background color consolidation 2019-06-26 12:58:43 -04:00
Pfeil, Scott Robert
0db0f91b3b ModuleMolecule is now a self contained view.
Fixed priority defect in view constraining view.
Change the way names are set for reuse
improve current margin logic
2019-06-26 12:01:47 -04:00
Suresh, Kamlesh
dcd782903e constraints 2019-06-25 09:49:05 -04:00
Suresh, Kamlesh
73e6f7f513 spelling 2019-06-25 09:20:27 -04:00
Kevin G Christiano
569ae1481c latest iteration. 2019-06-24 16:04:06 -04:00
Pfeil, Scott Robert
ab33ceebde name change 2019-06-24 10:55:07 -04:00
Kevin G Christiano
ba84d2780d Added standardlistitem. 2019-06-24 10:48:28 -04:00
Suresh, Kamlesh
8eae881bf1 code review 2019-06-24 10:47:43 -04:00
Suresh, Kamlesh
9316343c0e merge 2019-06-21 16:58:47 -04:00
Pfeil, Scott Robert
fe09ce04dc add setter to label 2019-06-21 13:48:29 -04:00
Pfeil, Scott Robert
cb8ad83149 fix label overriding itself 2019-06-21 13:34:02 -04:00
Pfeil, Scott Robert
9f038467a9 key fix 2019-06-21 13:14:25 -04:00
Pfeil, Scott Robert
cb03232a13 missing comma 2019-06-21 13:04:39 -04:00
Pfeil, Scott Robert
e8b9de6d35 merge 2019-06-21 13:04:11 -04:00
Pfeil, Scott Robert
ed87bd2cfc Button json to have style and size.
Separator alone in stack fix.
remove view constraining view auto background color
fix padding for stack in stack
2019-06-21 12:52:30 -04:00
Pfeil, Scott Robert
cd577288c3 Merge branch 'feature/kevin' into 'develop'
Label Multi-Action

See merge request BPHV_MIPS/mvm_core_ui!62
2019-06-21 12:33:56 -04:00
Suresh, Kamlesh
897a7a9bbd Merge branch 'feature/molecule_progressbar' into 'develop'
ProgressBar changes

See merge request BPHV_MIPS/mvm_core_ui!87
2019-06-21 11:40:18 -04:00
Pfeil, Scott Robert
dc62e16c07 image view name change, allow view override of width and height 2019-06-21 09:28:51 -04:00
Pfeil, Scott Robert
086378608d small logic cleaning 2019-06-21 08:56:57 -04:00
Pfeil, Scott Robert
a7f9104bd8 re-molecule image view 2019-06-20 16:04:59 -04:00
Christiano, Kevin
9cfa00c533 Further improved label dynamic sizing. 2019-06-20 09:20:45 -04:00
Christiano, Kevin
353f8cd301 VCV updated to account for directionalLayoutMargins. LRLabel improved. Needs slight adjustment for iPhone SE. 2019-06-19 16:49:07 -04:00