From 7498bd56f2a9ca8c9e1c93e24c30b44db426bfa3 Mon Sep 17 00:00:00 2001 From: Kristijan Perusko Date: Thu, 28 Jan 2016 12:39:51 -0500 Subject: [PATCH 01/14] #95 Fixed width of the supplies plaintext and replaced icon for the List view page --- .../Pencil_Icon_Gray.imageset/Contents.json | 23 +++++ .../Pencil_Icon_Gray.imageset/Pencil.png | Bin 0 -> 536 bytes .../Pencil_Icon_Gray.imageset/Pencil@2x.png | Bin 0 -> 1086 bytes .../Pencil_Icon_Gray.imageset/Pencil@3x.png | Bin 0 -> 1598 bytes .../Base.lproj/Main.storyboard | 91 +++++++++--------- .../ViewModels/HomeViewModel.swift | 6 +- 6 files changed, 74 insertions(+), 46 deletions(-) create mode 100644 DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Contents.json create mode 100644 DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Pencil.png create mode 100644 DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Pencil@2x.png create mode 100644 DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Pencil@3x.png diff --git a/DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Contents.json b/DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Contents.json new file mode 100644 index 0000000..e23c041 --- /dev/null +++ b/DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "Pencil.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "Pencil@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "Pencil@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Pencil.png b/DesignStudioExpress/Assets.xcassets/Pencil_Icon_Gray.imageset/Pencil.png new file mode 100644 index 0000000000000000000000000000000000000000..57950ee7bea8c7c782c7cc4d7741b1daf37cdee4 GIT binary patch literal 536 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 literal 0 HcmV?d00001 diff --git a/DesignStudioExpress/Base.lproj/Main.storyboard b/DesignStudioExpress/Base.lproj/Main.storyboard index d5f1925..7004505 100644 --- a/DesignStudioExpress/Base.lproj/Main.storyboard +++ b/DesignStudioExpress/Base.lproj/Main.storyboard @@ -635,7 +635,7 @@ Background music is optional. - + @@ -694,6 +694,7 @@ Background music is optional. + Colored markers Pens @@ -711,11 +712,13 @@ Sketching Templates + + @@ -2369,33 +2372,33 @@ Sketching Templates - - - - - + + + + - - - - - - + + - - - + + + + + + + + + - @@ -2411,33 +2414,33 @@ Sketching Templates - - - - - + + + + - - - - - - + + - - - + + + + + + + + + - @@ -4768,22 +4771,22 @@ Sketching Templates - + - + - + - + @@ -5035,11 +5039,11 @@ Please contact us at sms@alexanderinteractive.com - - + + @@ -5049,11 +5053,11 @@ Please contact us at sms@alexanderinteractive.com - - + + @@ -5082,6 +5086,7 @@ Please contact us at sms@alexanderinteractive.com + diff --git a/DesignStudioExpress/ViewModels/HomeViewModel.swift b/DesignStudioExpress/ViewModels/HomeViewModel.swift index 52952fe..9bc1042 100644 --- a/DesignStudioExpress/ViewModels/HomeViewModel.swift +++ b/DesignStudioExpress/ViewModels/HomeViewModel.swift @@ -14,8 +14,6 @@ class HomeViewModel { private var data: [DesignStudio] = [] init () { - data = self.loadDesignStudios() - /* * This will delete entire database, only for testing purposes * @@ -23,7 +21,9 @@ class HomeViewModel { if NSFileManager.defaultManager().fileExistsAtPath(path) { try! NSFileManager.defaultManager().removeItemAtPath(path) } - } */ + }*/ + + data = self.loadDesignStudios() } private func loadDesignStudios() -> [DesignStudio] { From 11866b3feb6b5ad7592ea16f000c9ce886802c58 Mon Sep 17 00:00:00 2001 From: Kristijan Perusko Date: Thu, 28 Jan 2016 12:53:43 -0500 Subject: [PATCH 02/14] #92 'Edit it' label is hidden when the Design studio is locked on Details DS screen --- DesignStudioExpress/Base.lproj/Main.storyboard | 1 + .../Views/DetailDesignStudioViewController.swift | 3 +++ 2 files changed, 4 insertions(+) diff --git a/DesignStudioExpress/Base.lproj/Main.storyboard b/DesignStudioExpress/Base.lproj/Main.storyboard index 7004505..d0a7ef5 100644 --- a/DesignStudioExpress/Base.lproj/Main.storyboard +++ b/DesignStudioExpress/Base.lproj/Main.storyboard @@ -1531,6 +1531,7 @@ Sketching Templates + diff --git a/DesignStudioExpress/Views/DetailDesignStudioViewController.swift b/DesignStudioExpress/Views/DetailDesignStudioViewController.swift index ec0ce1f..cf8c9ba 100644 --- a/DesignStudioExpress/Views/DetailDesignStudioViewController.swift +++ b/DesignStudioExpress/Views/DetailDesignStudioViewController.swift @@ -8,6 +8,7 @@ import UIKit import SZTextView +import FXLabel class DetailDesignStudioViewController: UIViewControllerBase { @@ -20,6 +21,7 @@ class DetailDesignStudioViewController: UIViewControllerBase { @IBOutlet weak var challenges: UILabel! @IBOutlet weak var continueButton: UIButtonRed! @IBOutlet weak var editIcon: UIImageView! + @IBOutlet weak var editLabel: FXLabel! let vm = DetailDesignStudioViewModel() @@ -120,6 +122,7 @@ class DetailDesignStudioViewController: UIViewControllerBase { self.name.editable = vm.editingEnabled self.duration.enabled = vm.editingEnabled self.editIcon.image = UIImage(named: vm.editIconImage) + self.editLabel.hidden = !vm.editingEnabled } func updateData() { From 57365807b5a6c68da841a86347a377cf22071706 Mon Sep 17 00:00:00 2001 From: Kristijan Perusko Date: Thu, 28 Jan 2016 13:03:51 -0500 Subject: [PATCH 03/14] #104 Replaced Sammy's email with app support email --- DesignStudioExpress/ViewModels/SettingsViewModel.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DesignStudioExpress/ViewModels/SettingsViewModel.swift b/DesignStudioExpress/ViewModels/SettingsViewModel.swift index 23b42e4..46bdcae 100644 --- a/DesignStudioExpress/ViewModels/SettingsViewModel.swift +++ b/DesignStudioExpress/ViewModels/SettingsViewModel.swift @@ -51,8 +51,7 @@ class SettingsViewModel { feedbackController.mailComposeDelegate = vc as! SettingsViewController - // TODO update with real email - feedbackController.setToRecipients(["sms@alexanderinteractive.com"]) + feedbackController.setToRecipients(["appsupport@alexanderinteractive.com"]) feedbackController.setSubject("Design Studio Express Feedback") feedbackController.setMessageBody("Feedback:\n\n\n\n\n\n\n\n\n--------\nDeveloper Information:", isHTML:false) From b9d3d53a4e1d333999d3da063e67e578300da395 Mon Sep 17 00:00:00 2001 From: Kristijan Perusko Date: Thu, 28 Jan 2016 13:13:15 -0500 Subject: [PATCH 04/14] #96 Fixed the copy on the Settings/Extra screen --- DesignStudioExpress/Base.lproj/Main.storyboard | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/DesignStudioExpress/Base.lproj/Main.storyboard b/DesignStudioExpress/Base.lproj/Main.storyboard index d0a7ef5..8f43c06 100644 --- a/DesignStudioExpress/Base.lproj/Main.storyboard +++ b/DesignStudioExpress/Base.lproj/Main.storyboard @@ -4544,11 +4544,8 @@ Sketching Templates - - - -