Refactoring + Merge branch 'pr/399' into 5.0.0
* pr/399: feat: update swift version for all sub-projects (example, pod, etc) to 4.2 feat: update pod swift version to 4.2 feat: update support for swift 4.2 (source and example) # Conflicts: # Pod/Classes/SideMenuManager.swift
This commit is contained in:
commit
cb89d98dd8
6 files changed
+35
-47
No files matched your search
@@ -42,7 +42,7 @@ class MainViewController: UIViewController {
|
||||
let modes:[SideMenuManager.MenuPresentMode] = [.menuSlideIn, .viewSlideOut, .menuDissolveIn]
|
||||
presentModeSegmentedControl.selectedSegmentIndex = modes.index(of: SideMenuManager.default.menuPresentMode)!
|
||||
|
||||
let styles:[UIBlurEffectStyle] = [.dark, .light, .extraLight]
|
||||
let styles:[UIBlurEffect.Style] = [.dark, .light, .extraLight]
|
||||
if let menuBlurEffectStyle = SideMenuManager.default.menuBlurEffectStyle {
|
||||
blurSegmentControl.selectedSegmentIndex = styles.index(of: menuBlurEffectStyle) ?? 0
|
||||
} else {
|
||||
@@ -65,7 +65,7 @@ class MainViewController: UIViewController {
|
||||
if segmentControl.selectedSegmentIndex == 0 {
|
||||
SideMenuManager.default.menuBlurEffectStyle = nil
|
||||
} else {
|
||||
let styles:[UIBlurEffectStyle] = [.dark, .light, .extraLight]
|
||||
let styles:[UIBlurEffect.Style] = [.dark, .light, .extraLight]
|
||||
SideMenuManager.default.menuBlurEffectStyle = styles[segmentControl.selectedSegmentIndex - 1]
|
||||
}
|
||||
default: break;
|
||||
|
||||
Reference in new issue
Block a user