Commit Graph

507 Commits

Author SHA1 Message Date
Kevin G Christiano
aea8bc5f7b Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 16:02:18 -05:00
Kevin G Christiano
ad4eddb450 some class is using a xib. 2020-01-13 14:43:16 -05:00
Kevin G Christiano
f81b50d077 Merge branch 'develop' into feature/swiftified_textField 2020-01-13 11:05:31 -05:00
Kevin G Christiano
85f210abe8 Accessibility fixes. 2020-01-13 08:49:51 -05:00
Kevin G Christiano
efc163ab38 no com 2020-01-08 15:08:31 -05:00
Kevin G Christiano
a99dd7f0a6 removed isSelected. 2020-01-08 14:46:40 -05:00
Kevin G Christiano
dfa2fa3343 Ensure that isEnabled only triggers when false. Preventing isEnabled from changing isON. 2020-01-08 11:03:44 -05:00
Kevin G Christiano
14f49882b1 Big Self. 2020-01-08 10:44:36 -05:00
Kevin G Christiano
4a49c40b19 Using pointInside from Control. 2020-01-08 10:28:37 -05:00
Kevin G Christiano
a88bb1e0ff Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI/BaseClasses/Control.swift
2020-01-08 10:19:01 -05:00
Kevin G Christiano
2ec963e2b6 latest changes of pr. 2020-01-07 16:08:53 -05:00
Kevin G Christiano
d2162cb9b6 removed override to conform. 2019-12-20 08:43:13 -05:00
Kevin G Christiano
cf41609210 correcting alignment func. 2019-12-19 16:09:41 -05:00
Kevin G Christiano
a04399516d Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Views/Checkbox.swift
2019-12-19 15:32:57 -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
Kevin G Christiano
f56b08fa0c Merge branch 'develop' into feature/checkboxView_constraints
# Conflicts:
#	MVMCoreUI/Atoms/Views/CheckboxWithLabelView.swift
2019-12-19 11:21:44 -05:00
Kevin G Christiano
6c9fede0b9 improved reset. 2019-12-19 11:12:59 -05:00
Kevin G Christiano
9e5ccb01a7 removed unused func. 2019-12-19 11:09:18 -05:00
Pan, Xinlei (Ryan)
21da4f960d Merge branch 'feature/container' into 'develop'
Feature/container

See merge request BPHV_MIPS/mvm_core_ui!202
2019-12-19 11:05:58 -05:00
Khan, Arshad
eec15fc65e added comment as per Scott feedback 2019-12-19 19:21:49 +05:30
Khan, Arshad
aff4b75368 Changing to CGFloat, instead of Double as per feedback provided by Ryan.
Root Cause: Swift was treating it as Double, instead of Float.
2019-12-18 22:28:22 +05:30
Khan, Arshad
95c528b658 progress bar percentage is been treated as Double for two decimal places(Like 54.17) in iOS JSON object, due to that progress percentage is not shown, where as working on Android.
So, changing Float to Double.
2019-12-18 21:20:58 +05:30
Pfeil, Scott Robert
f610264327 alignment updates 2019-12-16 11:19:30 -05:00
Kevin G Christiano
3dd9decfed Removed height constraint. This class will expect text to function properly. 2019-12-12 14:53:52 -05:00
Kevin G Christiano
8804e21d3c New constant. Updated control to work with Apple's design guidelines with control. Updates made to checkbox and checkboxLabel. 2019-12-12 14:42:32 -05:00
Kevin G Christiano
39b752d01b Included reset function. accounted for isAnimated state when changing isOn without animations. 2019-12-12 13:37:18 -05:00
Kevin G Christiano
ed18970625 correcting errors. Improving Control. 2019-12-12 09:23:04 -05:00
Kevin G Christiano
639330ad5b More comments. 2019-12-11 16:03:01 -05:00
Kevin G Christiano
98997bfa80 Comments, logical updates, refactoring. 2019-12-11 15:58:18 -05:00
Kevin G Christiano
eab910011e General working order of the Toggle. 2019-12-11 15:10:26 -05:00
Kevin G Christiano
d1ee242ca7 should did action. 2019-12-11 10:47:52 -05:00
Kevin G Christiano
c32a0d71b0 good working state. 2019-12-10 15:58:59 -05:00
Kevin G Christiano
ab0ff64677 General Working order. 2019-12-10 14:38:32 -05:00
Kevin G Christiano
335649860b constraint adjustments. 2019-12-10 11:15:09 -05:00
Kevin G Christiano
83370956c1 movemt,. 2019-12-10 10:34:08 -05:00
Kevin G Christiano
dd47707064 the latest switch. 2019-12-10 08:54:01 -05:00
Kevin G Christiano
1668fb8c32 More Switch development. 2019-12-09 15:03:53 -05:00
Kevin G Christiano
cbb016406a WIP, putting Switch together. 2019-12-09 13:37:33 -05:00
Kevin G Christiano
a7989c589f Increased the tappable space of the Checkbox. 2019-12-09 11:03:31 -05:00
Kevin G Christiano
a00fdbad60 Grooming process in converting objc to swift with Switch. 2019-12-05 15:16:46 -05:00
Kevin G Christiano
aaa8e4132e Brought back resizing to checkbox. 2019-12-04 16:25:31 -05:00
Kevin G Christiano
8a796467e6 Initial state of Swiftified Switch. 2019-12-04 15:50:08 -05:00
Pfeil, Scott Robert
d95e42330e moving files 2019-12-04 13:09:50 -05:00
Kevin G Christiano
9b53f4bac0 Paired down constraints. Made variables public. Mild formatting. 2019-12-03 09:07:43 -05:00
Kevin G Christiano
b443c4a389 Reducing constraints. 2019-12-02 17:33:06 -05:00
Kevin G Christiano
5e28b0bdc5 Merge branch 'develop' into feature/swiftified_textField 2019-12-02 10:43:45 -05:00
Pfeil, Scott Robert
3e46438fd0 label font bugfix caused by the dissonance between label and styler setting.... 2019-12-02 10:11:04 -05:00
Kevin G Christiano
0f04ebe177 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2019-12-02 09:04:17 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -05:00