mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/move_legacy_files' into 'develop'

Browse Source 
Feature/move legacy files

See merge request BPHV_MIPS/mvm_core_ui!196
This commit is contained in:
Pfeil, Scott Robert 2019-12-04 13:39:35 -05:00
commit 6cc31113f7
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MVMCoreUI.xcodeproj/project.pbxproj
View File

@ -454,6 +454,12 @@
D29DF31F21ED0CBA003B2FB9 /* LabelView.m */,
D29DF15921E697DA003B2FB9 /* SeparatorView.h */,
D29DF15A21E697DA003B2FB9 /* SeparatorView.m */,
D22D1F1C220343560077CEC0 /* MVMCoreUICheckMarkView.h */,
D22D1F1D220343560077CEC0 /* MVMCoreUICheckMarkView.m */,
D22D1F18220341F50077CEC0 /* MVMCoreUICheckBox.h */,
D22D1F19220341F50077CEC0 /* MVMCoreUICheckBox.m */,
0198F7A02256A80A0066C936 /* MFRadioButton.h */,
0198F7A22256A80A0066C936 /* MFRadioButton.m */,
);
path = Views;
sourceTree = "<group>";
@ -764,16 +770,10 @@
D29DF32221ED0DA2003B2FB9 /* TextButtonView.m */,
D29770FB21F7C77400B2F0D0 /* MVMCoreUITextFieldView.h */,
D29770FA21F7C77400B2F0D0 /* MVMCoreUITextFieldView.m */,
D22D1F1C220343560077CEC0 /* MVMCoreUICheckMarkView.h */,
D22D1F1D220343560077CEC0 /* MVMCoreUICheckMarkView.m */,
D22D1F18220341F50077CEC0 /* MVMCoreUICheckBox.h */,
D22D1F19220341F50077CEC0 /* MVMCoreUICheckBox.m */,
D22D1F44220496A30077CEC0 /* MVMCoreUISwitch.h */,
D22D1F45220496A30077CEC0 /* MVMCoreUISwitch.m */,
DBC4391C2245232D001AB423 /* LabelWithInternalButton.swift */,
DB891E822253FA8500022516 /* Label.swift */,
0198F7A02256A80A0066C936 /* MFRadioButton.h */,
0198F7A22256A80A0066C936 /* MFRadioButton.m */,
0A7BAFA0232BE61800FB8E22 /* Checkbox.swift */,
0A7BAFA2232BE63400FB8E22 /* CheckboxWithLabelView.swift */,
01004F2F22721C3800991ECC /* RadioButton.swift */,

0
MVMCoreUI/Atoms/Views/MFRadioButton.h → MVMCoreUI/Legacy/Views/MFRadioButton.h
View File

0
MVMCoreUI/Atoms/Views/MFRadioButton.m → MVMCoreUI/Legacy/Views/MFRadioButton.m
View File

0
MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.h → MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.h
View File

0
MVMCoreUI/Atoms/Views/MVMCoreUICheckBox.m → MVMCoreUI/Legacy/Views/MVMCoreUICheckBox.m
View File

0
MVMCoreUI/Atoms/Views/MVMCoreUICheckMarkView.h → MVMCoreUI/Legacy/Views/MVMCoreUICheckMarkView.h
View File

0
MVMCoreUI/Atoms/Views/MVMCoreUICheckMarkView.m → MVMCoreUI/Legacy/Views/MVMCoreUICheckMarkView.m
View File

4
MVMCoreUI/Organisms/MoleculeStackView.swift
View File

@ -264,7 +264,7 @@ public class MoleculeStackView: ViewConstrainingView {
} else if let previousView = items.last(where: { stackItem in
return !stackItem.gone
})?.view {
_ = NSLayoutConstraint(pinFirstView: previousView, toSecondView: view, withConstant: spacing, directionVertical: true)
view.topAnchor.constraint(equalTo: previousView.bottomAnchor, constant: spacing).isActive = true
}
pinView(view, toView: contentView, attribute: .leading, relation: .equal, priority: .required, constant: 0)
pinView(contentView, toView: view, attribute: .trailing, relation: .equal, priority: .required, constant: 0)
@ -281,7 +281,7 @@ public class MoleculeStackView: ViewConstrainingView {
} else if let previousView = items.last(where: { stackItem in
return !stackItem.gone
})?.view {
_ = NSLayoutConstraint(pinFirstView: previousView, toSecondView: view, withConstant: spacing, directionVertical: false)
view.leftAnchor.constraint(equalTo: previousView.rightAnchor, constant: spacing).isActive = true
}
pinView(view, toView: contentView, attribute: .top, relation: .equal, priority: .required, constant: 0)
pinView(contentView, toView: view, attribute: .bottom, relation: .equal, priority: .required, constant: 0)