From 0f989fbe25c415d2c0916df105681eea6d72500d Mon Sep 17 00:00:00 2001 From: Maryom Date: Wed, 25 Jan 2017 13:54:10 +0300 Subject: [PATCH 1/2] Fixed some typos in readme --- .../AppIcon.appiconset/Contents.json | 20 +++++++++++++++++++ README.md | 4 +++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json index eeea76c..1d060ed 100644 --- a/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "idiom" : "iphone", "size" : "29x29", @@ -30,6 +40,16 @@ "size" : "60x60", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "idiom" : "ipad", "size" : "29x29", diff --git a/README.md b/README.md index f3ee1ca..dfba152 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ Next, go to the Storyboard, and change the class of the SideMenuController to th In `AppDelegate.swift`, override `application:didFinishLaunchingWithOptions:`: ```swift -func func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { +func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { // Override point for customization after application launch. SideMenuController.preferences.drawing.menuButtonImage = UIImage(named: "menu") @@ -156,6 +156,8 @@ func func application(_ application: UIApplication, didFinishLaunchingWithOption SideMenuController.preferences.drawing.sidePanelWidth = 300 SideMenuController.preferences.drawing.centerPanelShadow = true SideMenuController.preferences.animating.statusBarBehaviour = .showUnderlay + + return true } ``` ⚠️_If you **do not** specify a menu button image, `SideMenuController` **will not add one by default** and you will have to manually add one whenever transitioning to a new center view controller._ From 3ea30620d2224cabfa08133b54be7c8550e973bc Mon Sep 17 00:00:00 2001 From: Mariam Date: Wed, 25 Jan 2017 20:42:45 +0300 Subject: [PATCH 2/2] Fixed --- .../AppIcon.appiconset/Contents.json | 20 ------------------ Example/Example/Assets.xcassets/Contents.json | 0 .../menu.imageset/Contents.json | 0 .../menu.imageset/Menu2-128.png | Bin 4 files changed, 20 deletions(-) mode change 100644 => 100755 Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json mode change 100644 => 100755 Example/Example/Assets.xcassets/Contents.json mode change 100644 => 100755 Example/Example/Assets.xcassets/menu.imageset/Contents.json mode change 100644 => 100755 Example/Example/Assets.xcassets/menu.imageset/Menu2-128.png diff --git a/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json b/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json old mode 100644 new mode 100755 index 1d060ed..eeea76c --- a/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Example/Example/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,15 +1,5 @@ { "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, { "idiom" : "iphone", "size" : "29x29", @@ -40,16 +30,6 @@ "size" : "60x60", "scale" : "3x" }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, { "idiom" : "ipad", "size" : "29x29", diff --git a/Example/Example/Assets.xcassets/Contents.json b/Example/Example/Assets.xcassets/Contents.json old mode 100644 new mode 100755 diff --git a/Example/Example/Assets.xcassets/menu.imageset/Contents.json b/Example/Example/Assets.xcassets/menu.imageset/Contents.json old mode 100644 new mode 100755 diff --git a/Example/Example/Assets.xcassets/menu.imageset/Menu2-128.png b/Example/Example/Assets.xcassets/menu.imageset/Menu2-128.png old mode 100644 new mode 100755