Commit Graph

690 Commits

Author SHA1 Message Date
Kevin G Christiano
87cc0842de removed programmatic space insert. 2019-09-03 10:36:16 -04:00
Kevin G Christiano
890c1221d3 Merge branch 'develop' into feature/label_export_box 2019-09-03 10:07:38 -04:00
Kevin G Christiano
62418f5132 Moved hasAttachmentImage to a function. 2019-09-03 10:07:15 -04:00
Kevin G Christiano
38912a4f85 some changes made. More to come. 2019-08-29 16:21:30 -04:00
Pfeil, Scott Robert
b13400ab56 Merge branch 'feature/align_actiondetaiimage_with_android' into 'develop'
Changed code to align with Android.

See merge request BPHV_MIPS/mvm_core_ui!115
2019-08-29 15:42:18 -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
Pfeil, Scott Robert
740aaf09e0 Merge branch 'feature/switches' into 'develop'
Feature/switches

See merge request BPHV_MIPS/mvm_core_ui!119
2019-08-29 12:44:53 -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
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
Pan, Xinlei (Ryan)
8448156ed3 Merge branch 'bugfix/height_standards' into 'develop'
Bugfix/height standards

See merge request BPHV_MIPS/mvm_core_ui!117
2019-08-20 12:18:57 -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
Pfeil, Scott Robert
d197b30be7 Merge branch 'feature/standardlistitemwithimage' into 'develop'
StandardListItemWithImage Molecule

See merge request BPHV_MIPS/mvm_core_ui!90
2019-08-13 09:32:30 -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
Pan, Xinlei (Ryan)
a6be4887ec Merge branch 'feature/text_alignment' into 'develop'
text alignment and mark fix

See merge request BPHV_MIPS/mvm_core_ui!111
2019-08-12 15:33:31 -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