Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes not needed semicolon #35

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removes not needed semicolon #35

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f59f874
Removes not needed semicolon
valeriyvan Mar 7, 2018
f0204df
Merge branch 'master' into semicolon
valeriyvan Aug 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Sample Code/SwiftSampleCode/UXSDKSwiftSample/PanelsCollectionsViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class PanelsCollectionsViewController: UIViewController {
// Adding our DUXStatusBarViewController to our container in code.
// This could be done in the storyboard
self.addChildViewController(self.statusBarVC)
self.statusBarContainingView.addSubview(self.statusBarVC.view);
self.statusBarContainingView.addSubview(self.statusBarVC.view)
self.statusBarVC.view.translatesAutoresizingMaskIntoConstraints = false;
self.statusBarVC.view.topAnchor.constraint(equalTo: self.statusBarContainingView.topAnchor).isActive = true
self.statusBarVC.view.bottomAnchor.constraint(equalTo: self.statusBarContainingView.bottomAnchor).isActive = true
Expand All @@ -34,22 +34,22 @@ class PanelsCollectionsViewController: UIViewController {

// Removing a pre-defined widget you don't want.
guard let preflightChecklistWidget = self.statusBarVC.widget(at: 1) else {
return;
return
}
self.statusBarVC.removeWidget(preflightChecklistWidget)


// Changing the edgeInset of a placed widget.
guard let djiWidgetItem = self.statusBarVC.widgetItem(at: 0) else {
return;
return
}
djiWidgetItem.edgeInset.top = 10
djiWidgetItem.edgeInset.bottom = 10


// Switch stack for widgets in stack collections
guard let batteryWidget = self.statusBarVC.widget(with: DUXBatteryWidget.self) else {
return;
guard let batteryWidget = self.statusBarVC.widget(with: DULBatteryWidget.self) else {
return
}
self.statusBarVC.statusBarView?.moveWidget(batteryWidget, to: .first)

Expand All @@ -70,8 +70,13 @@ class PanelsCollectionsViewController: UIViewController {

func moveWidget() {
// Switch stack for widgets in stack collections
<<<<<<< HEAD:Sample Code/SwiftSampleCode/UILib Sample/PanelsCollectionsViewController.swift
guard let batteryWidget = self.statusBarVC.widget(with: DULBatteryWidget.self) else {
return
=======
guard let batteryWidget = self.statusBarVC.widget(with: DUXBatteryWidget.self) else {
return;
>>>>>>> master:Sample Code/SwiftSampleCode/UXSDKSwiftSample/PanelsCollectionsViewController.swift
}
self.lastStack = self.lastStack == .first ? .last : .first
self.statusBarVC.statusBarView?.moveWidget(batteryWidget, to: self.lastStack)
Expand Down