Commit Graph

374 Commits

Author SHA1 Message Date
Kevin G Christiano
4742eace6b Merge branch 'develop' into feature/swiftified_textField 2019-10-21 12:12:19 -04:00
Pfeil, Scott Robert
9ef670cfc4 Merge branch 'feature/label_hero_character' into 'develop'
Label Hero

See merge request BPHV_MIPS/mvm_core_ui!136
2019-10-18 12:05:55 -04:00
Kevin G Christiano
6d52663b4f fixed small error in refactor. 2019-10-17 14:06:01 -04:00
Kevin G Christiano
73ac4b932b refacgtorerd. 2019-10-17 12:39:05 -04:00
Kevin G Christiano
11b2ddc4dd Merge branch 'develop' into feature/label_hero_character 2019-10-17 12:17:17 -04:00
Kevin G Christiano
b5dcf68c5d refactoring taxtcontainer. 2019-10-17 12:17:14 -04:00
Kevin G Christiano
2fdc4795f4 correcting type. 2019-10-17 12:00:44 -04:00
Kevin G Christiano
29ffa40cc3 Merge branch 'develop' into feature/checkbox_update 2019-10-17 11:57:34 -04:00
Kevin G Christiano
f267b98438 constraints added. changes made. 2019-10-17 11:57:30 -04:00
Pfeil, Scott Robert
bb51fba0e5 remove legacy os code 2019-10-17 10:31:34 -04:00
Kevin G Christiano
19310bff89 generally functioning. some loose ends with TextField. 2019-10-16 13:51:55 -04:00
Kevin G Christiano
403f0b261b Major swiftification of MFTextField to TextField. 2019-10-14 15:24:48 -04:00
Kevin G Christiano
5ef9754e2c defaulting to clear. 2019-10-09 12:45:18 -04:00
Kevin G Christiano
960d9e0e7c removed comment. 2019-10-09 10:18:18 -04:00
Kevin G Christiano
9922ef4674 added enabled molecule logic. 2019-10-08 16:45:34 -04:00
Kevin G Christiano
1618583acc corrected comment. 2019-10-08 15:19:12 -04:00
Kevin G Christiano
03f12b8a7a added isEnabled func. 2019-10-08 13:15:10 -04:00
Kevin G Christiano
ec190a28bd Further updates made. 2019-10-08 11:47:08 -04:00
Kevin G Christiano
bbdb2181f2 aligning with invision. 2019-10-08 11:30:25 -04:00
Kevin G Christiano
66e45378f4 shapelayer . 2019-10-07 16:33:39 -04:00
Kevin G Christiano
7d6289463d Improved molecular logic of checkbox. 2019-10-07 16:30:14 -04:00
Kevin G Christiano
5043964c29 revised alignment for case when no label. 2019-10-03 16:43:58 -04:00
Kevin G Christiano
44e420218d Constraints mended. more commenting. 2019-10-03 13:22:15 -04:00
Kevin G Christiano
5d1c87819d making changes to align with comments. 2019-10-03 11:14:16 -04:00
Kevin G Christiano
61fcd981c1 setting up the rest. 2019-10-02 15:27:32 -04:00
Kevin G Christiano
77a3eb8827 Added a new extension file for CATransaction. Implementation of Checkbox and CheckboxWithLabel. 2019-10-02 15:22:12 -04:00
Kevin G Christiano
5f8780614f borders. 2019-09-27 14:28:16 -04:00
Kevin G Christiano
b032e40400 Checkbox in good place. 2019-09-27 14:23:46 -04:00
Kevin G Christiano
f5f994648a Decent working state with animation and touch. 2019-09-27 13:43:02 -04:00
Kevin G Christiano
afcf8d535b updates. 2019-09-26 13:56:02 -04:00
Kevin G Christiano
c75337bfdf Getting closer to testing phase. 2019-09-26 11:42:16 -04:00
Kevin G Christiano
38c74acc6e moar. 2019-09-25 14:43:29 -04:00
Kevin G Christiano
35f7024f8d Adding two new checkbox swift classes. 2019-09-25 14:19:49 -04:00
Kevin G Christiano
7722dc5619 Merge branch 'develop' into feature/check_box_mole_revision
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-09-23 14:30:04 -04:00
Kevin G Christiano
96e5f47dd0 Merge branch 'develop' into feature/label_hero_character 2019-09-23 14:28:42 -04:00
Pfeil, Scott Robert
6cdde756e5 bug fixes 2019-09-19 09:06:14 -04:00
Kevin G Christiano
5bc420ac05 accessoryVIew can now center itself in relation to the hero character. 2019-09-18 14:13:33 -04:00
Kevin G Christiano
52387fe9c9 Merge branch 'develop' into feature/label_hero_character 2019-09-17 16:37:50 -04:00
Kevin G Christiano
fc4fcc25f6 Current take on hero. Needs to be refactored and placed into a protocol. 2019-09-17 16:37:27 -04:00
Kevin G Christiano
b9e80398c1 Decent palce. 2019-09-17 09:41:14 -04:00
Murugan, Vimal
44ebfb9294 fix for cxtdt_28106 2019-09-17 16:25:00 +05:30
Kevin G Christiano
6f4db10d33 beginning work on hero. 2019-09-16 10:24:18 -04:00
Kevin G Christiano
bbdb0301eb Further checkbox setups. 2019-09-16 09:50:35 -04:00
Kevin G Christiano
8238a42177 Added the new classes. 2019-09-13 12:28:34 -04:00
Pan, Xinlei (Ryan)
52679e95f3 Merge branch 'bugfix/constraining_molecules' into 'develop'
alignment fix issues.

See merge request BPHV_MIPS/mvm_core_ui!133
2019-09-12 09:51:14 -04:00
panxi
f69fe85d83 update based on Scott's comment 2019-09-11 10:19:03 -04:00
panxi
358842e433 update based on Scott's comment 2019-09-11 10:04:19 -04:00
panxi
d52e204721 update multiprogressbar 2019-09-10 15:57:00 -04:00
Pfeil, Scott Robert
4050b784ed alignment fix issues. 2019-09-10 14:11:09 -04:00
panxi
595a3b1e38 fix typo 2019-09-09 16:49:12 -04:00