Commit Graph

1430 Commits

Author SHA1 Message Date
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
84462a197e changed comment. 2020-01-08 09:37:47 -05:00
Kevin G Christiano
2d0377acfc small format. 2020-01-08 09:30:55 -05:00
Kevin G Christiano
7d2770356b Merge branch 'develop' into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-08 09:29:52 -05:00
Kevin G Christiano
2abd6a866a Explaining use case of Color. 2020-01-08 09:28:54 -05:00
Arora, Prateek
203484b288 Code clean 2020-01-08 18:49:36 +05:30
Arora, Prateek
0226eb2cac Review comments : added default padding 2020-01-08 18:46:02 +05:30
Arora, Prateek
4c60ea2f1f Review comment changes 2020-01-08 14:53:59 +05:30
Arora, Prateek
c908606b79 Review Comment Changes 2020-01-08 13:08:09 +05:30
Arora, Prateek
f32cc7d05c Code cleaning 2020-01-08 12:21:28 +05:30
Kevin G Christiano
916f63240b Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-07 16:14:42 -05:00
Kevin G Christiano
2ec963e2b6 latest changes of pr. 2020-01-07 16:08:53 -05:00
Pfeil, Scott Robert
90f388ffa7 Merge branch 'feature/appleguidelinesprotocol' into 'develop'
Created Protocol to centralize tap detection logic.

See merge request BPHV_MIPS/mvm_core_ui!207
2020-01-07 15:56:12 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Kevin G Christiano
30bb405b3f Merge branch 'develop' into feature/swiftified_textField 2020-01-07 11:36:38 -05:00
Kevin G Christiano
05b3f78853 dropping extraneous top and bottom constraints. 2020-01-07 11:36:14 -05:00
Pfeil, Scott Robert
79f15fd706 Merge branch 'feature/coding_stack' into feature/coding 2020-01-07 11:13:48 -05:00
Pfeil, Scott Robert
5c0aa654b4 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-07 11:13:18 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Arora, Prateek
d891d7ba1a Code cleaning 2020-01-07 19:29:26 +05:30
Arora, Prateek
129a0e9241 New molecule -> headLineBodyCaretLinkImage 2020-01-07 12:34:29 +05:30
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Pan, Xinlei (Ryan)
96fd9174c3 Merge branch 'feature/short_tall_dividers' into 'develop'
MOBFIRST-19249 : List Item Style Updates

See merge request BPHV_MIPS/mvm_core_ui!209
2020-01-06 09:18:43 -05:00
Khan, Arshad
bf0b2ecb79 changed separator style to thin 2020-01-06 16:49:03 +05:30
Murugan, Vimal
f1f34b2893 textfield list view and textfield list form controller been moved to mobilefirstframework 2020-01-04 14:26:09 +05:30
Kevin G Christiano
dc201022ea changed comment. 2020-01-03 14:15:22 -05:00
Murugan, Vimal
709277362f updated constraints 2020-01-03 20:20:23 +05:30
Murugan, Vimal
dd49c43946 code cleanup 2020-01-03 20:18:30 +05:30
Khan, Arshad
c4fbf57890 MOBFIRST-19249 : List Item Style Updates
Adding shortDivider and tallDivider style.
Removing header style.
2020-01-03 19:52:10 +05:30
Murugan, Vimal
e5ca7b5c9e bullet list molecule added 2020-01-02 21:33:31 +05:30
Pfeil, Scott Robert
58c4a7fd8d merge 2020-01-02 09:34:29 -05:00
Pfeil, Scott Robert
5a8584342a merge 2020-01-02 09:31:58 -05:00
Murugan, Vimal
ccc535360c protocol implementation 2019-12-27 13:02:13 +05:30
Murugan, Vimal
1d843ae29a main thread update
access modifier update
2019-12-26 19:33:37 +05:30
panxi
e36d487d32 change model name to containerModel to avoid compiling error 2019-12-20 15:00:42 -05:00
panxi
ca1a6f8c83 merge from develop 2019-12-20 14:59:44 -05:00
Kevin G Christiano
fbc6e83038 Created Protocol to centralize tap detection logic. 2019-12-20 13:27:22 -05:00
Suresh, Kamlesh
7b0e423759 conflict 2019-12-20 12:07:59 -05:00
Suresh, Kamlesh
ba76fedff4 fixes 2019-12-20 10:24:36 -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
Pan, Xinlei (Ryan)
767ee787cb Merge branch 'feature/checkboxView_constraints' into 'develop'
Checkbox view constraints

See merge request BPHV_MIPS/mvm_core_ui!194
2019-12-19 15:26:03 -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
panxi
bf27d19ae1 change float to cgfloat for nslayoutconstraint 2019-12-19 14:25:26 -05:00
panxi
d17ab73d34 update encode decode method 2019-12-19 14:02:52 -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