Commit Graph

82 Commits

Author SHA1 Message Date
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Kevin G Christiano
0b9f641d87 reset super. 2020-01-09 15:43:10 -05:00
Kevin G Christiano
6b983d2f69 Moved out. 2020-01-09 14:11:50 -05:00
Kevin G Christiano
e674fe4d94 Adding protocols, comments, and mild reworks. 2020-01-08 14:19:37 -05:00
Kevin G Christiano
468f58b88e Merge branch 'develop' into feature/button 2020-01-08 13:34:31 -05:00
Kevin G Christiano
cf41609210 correcting alignment func. 2019-12-19 16:09:41 -05:00
Kevin G Christiano
3b59e03695 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
#	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
2019-12-19 15:11:48 -05:00
Robinson, Blake
82c76c6084 Removed self where unnecessary 2019-12-19 10:37:57 -05:00
Robinson, Blake
1de7618e5c Changed to MVMCoreUIDelegateObject 2019-12-19 10:36:57 -05:00
Robinson, Blake
6cf4ba0594 Improved swifty-ness of these lines 2019-12-19 10:30:14 -05:00
Robinson, Blake
8f23dd391c Removes disabled logic from Button because it won't be in the actionMap going forward 2019-12-19 10:19:42 -05:00
Robinson, Blake
2c5e2286b1 Removed line setting title because title won't be part of actionMap in the future 2019-12-19 10:06:54 -05:00
Robinson, Blake
109ef54479 Rewrote ButtonTapBlock in swift 2019-12-19 09:53:09 -05:00
Robinson, Blake
4b855a1a63 Removes unused property heightConstraint 2019-12-19 09:28:41 -05:00
Robinson, Blake
39c96849c8 Translates MFCustomButton to Button 2019-12-18 17:58:53 -05:00
Pfeil, Scott Robert
dc8910c61d add height constraint 2019-12-16 13:54:52 -05:00
Pfeil, Scott Robert
092dfd6ad0 List item updates 2019-12-16 13:40:04 -05:00
Pfeil, Scott Robert
f610264327 alignment updates 2019-12-16 11:19:30 -05:00
Kevin G Christiano
30a56923c0 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-11-12 11:08:55 -05:00
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Kevin G Christiano
bb3277e1ba latest and greatest. 2019-11-04 11:39:32 -05:00
Kevin G Christiano
ba602c1c86 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-30 09:35:39 -04:00
Pfeil, Scott Robert
48a940f160 fix to typos 2019-10-29 10:12:59 -04:00
Kevin G Christiano
5bc78e594e getting ready for the next phase. 2019-10-24 15:43:06 -04:00
Suresh, Kamlesh
73342e40d1 code optimization 2019-10-23 14:51:35 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
panxi
034610af5e fixing merging issue 2019-10-17 15:50:25 -04:00
Suresh, Kamlesh
eac6bf3aa3 impreovements 2019-09-11 15:56:24 -04:00
Suresh, Kamlesh
fe066f5530 merge 2019-09-10 10:42:08 -04:00
Suresh, Kamlesh
062edc5d41 refactoring for validation based on group 2019-08-30 15:33:05 -04:00
Pfeil, Scott Robert
b5276f5519 New molecules and arranging files 2019-08-29 08:28:07 -04:00
Pfeil, Scott Robert
93f7aae529 estimated heights 2019-06-27 16:18:32 -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
161f3e9f08 reset function.
standard spacing for cell molecule
MFTextField to view contstraining view
constraining protocol
2019-06-04 12:42:52 -04:00
Pfeil, Scott Robert
81df953669 disable fix. highlight fix. 2019-06-03 10:30:09 -04:00
Pfeil, Scott Robert
c5e306f0ae highlight button status 2019-05-31 14:22:52 -04:00
Pfeil, Scott Robert
0f5cb47765 molecule list
moduleMolecule
2019-05-23 18:32:11 -04:00
Suresh, Kamlesh
770f952904 Merge branch 'feature/molecule_list' into 'develop'
Feature/molecule list

See merge request BPHV_MIPS/mvm_core_ui!52
2019-04-30 11:16:17 -04:00
Pfeil, Scott Robert
302a2f887f thickness. molecule alignment 2019-04-29 13:36:36 -04:00
Christiano, Kevin
1ab359e360 merge from release/6_14_merge 2019-04-26 14:23:11 -04:00
panxi
2f0a727d03 copy from Kevin's commit: aac5093c37 2019-04-26 13:41:54 -04:00
panxi
d380328913 copy from Kevin commis: d373a3f7be 2019-04-26 13:41:26 -04:00
Pfeil, Scott Robert
8a349ae16f constraining for stack 2019-04-24 16:14:22 -04:00
Christiano, Kevin
d767890017 Mild fix to caretButton. Fixed dictionary and attributed text issues with Label. 2019-04-24 13:32:13 -04:00
panxi
32bd4c9d07 bugfix for caretbutton 2019-04-19 15:22:54 -04:00
Pfeil, Scott Robert
8c19755ba8 warning fix 2019-04-15 13:31:45 -04:00
Pfeil, Scott Robert
5ebcba15fa molecule delegate object 2019-04-15 12:59:27 -04:00
Pfeil, Scott Robert
aa4da8f74f deprecating 2019-04-15 11:14:29 -04:00
Pfeil, Scott Robert
3ee784ccb0 Changes for new feed template 2019-04-09 10:38:26 -04:00