Commit Graph

105 Commits

Author SHA1 Message Date
Kevin G Christiano
d7844d607e space. 2020-01-13 16:00:00 -05:00
Kevin G Christiano
8490ef3572 enabled/disabled colors. 2020-01-13 15:46:50 -05:00
Kevin G Christiano
edddac84a8 Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:59:46 -05:00
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
8ff92b5cc0 one line, truncation. 2020-01-13 14:31:04 -05:00
Kevin G Christiano
0b87ff254b Merge branch 'develop' into feature/link 2020-01-13 13:32:21 -05:00
Kevin G Christiano
5ce8446be2 Updating Link class. adding identifier to molecule mapping. 2020-01-13 13:31:25 -05:00
Kevin G Christiano
9882528b9e Merge branch 'develop' into feature/link
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 12:50:08 -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
e11f64f0a4 Changed to optionalStringForKey 2019-12-19 13:41:27 -05:00
Robinson, Blake
87613fb375 Used guard instead of if let because some code after the if let was removed 2019-12-19 13:38:51 -05:00
Robinson, Blake
8d417068a9 Removed heightConstraint-related logic because the heightConstraint was added to increase the tappable area of Link's predecessor, MFTextButton. 2019-12-19 13:13:57 -05:00
Robinson, Blake
6e233e9bab Removes self where unnecessary 2019-12-19 12:23:18 -05:00
Robinson, Blake
7c17889b57 Changed to MVMCoreUIUtility.getWidth() as per pr comments 2019-12-19 12:23:01 -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
Robinson, Blake
f731b56f2e Revert "Make Link subclass from View instead of MFCustomButton"
This reverts commit 439261e4c4.
2019-12-17 10:23:56 -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
Robinson, Blake
439261e4c4 Make Link subclass from View instead of MFCustomButton
The bounds of the Link often extend far beyond the width of the button text, which, if MFCustomButton is used, extend the tappable area far beyond the link.
2019-12-12 15:23:30 -05:00
Robinson, Blake
d3dbfdd997 changes size object to private since it shouldn't be accessed from outside the class 2019-12-12 15:01:54 -05:00
Robinson, Blake
3fc3b6cb0a Removes convenience init since updateView is called by the framework and so does not need to be part of initialization 2019-12-12 10:39:21 -05:00
Robinson, Blake
3001f1df78 Remove self where it is not necessary for clarity 2019-12-12 10:00:59 -05:00
Robinson, Blake
b8e0fbff75 Removed line spaces 2019-12-12 09:33:03 -05:00
Robinson, Blake
5135835471 Removed UIColor prefix as per code review comments 2019-12-12 09:32:09 -05:00
Robinson, Blake
fb2cade157 Fixed spacing before colon as per code review comment 2019-12-12 09:30:00 -05:00
Robinson, Blake
16cc667b02 Expands tappable area of Link 2019-12-09 14:15:55 -05:00
Robinson, Blake
1d647ec662 Code standard change. Removed legacy-like methods. 2019-12-03 15:21:45 -05:00
Robinson, Blake
988e30daa9 Creates Link atom to replace MFTextButton 2019-12-02 11:15:50 -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