From 4faca1c24b1be8885be982d3e8217c62f9943265 Mon Sep 17 00:00:00 2001 From: jellodiil <58082567+jellodiil@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:38:25 +0100 Subject: [PATCH 1/4] Filter Wordings Removing words in filters. --- Emitron/Emitron/Filters/FilterGroup.swift | 2 +- Emitron/Emitron/Models/ContentSubscriptionPlan.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Emitron/Emitron/Filters/FilterGroup.swift b/Emitron/Emitron/Filters/FilterGroup.swift index b4c2723d..877d5d59 100644 --- a/Emitron/Emitron/Filters/FilterGroup.swift +++ b/Emitron/Emitron/Filters/FilterGroup.swift @@ -58,7 +58,7 @@ struct FilterGroup: Hashable { enum FilterGroupType: String, Hashable, CaseIterable, Codable { case platforms = "Platforms" case categories = "Categories" - case subscriptionPlans = "Subscription Plans" + case subscriptionPlans = "Membership Level" case contentTypes = "Content Type" case difficulties = "Difficulty" case search = "Search" diff --git a/Emitron/Emitron/Models/ContentSubscriptionPlan.swift b/Emitron/Emitron/Models/ContentSubscriptionPlan.swift index 78b42677..241f6fd8 100644 --- a/Emitron/Emitron/Models/ContentSubscriptionPlan.swift +++ b/Emitron/Emitron/Models/ContentSubscriptionPlan.swift @@ -39,9 +39,9 @@ enum ContentSubscriptionPlan: Int, Codable { var displayString: String { switch self { case .beginner: - return "Beginner Subscription" + return "Beginner" case .professional: - return "Pro Subscription" + return "Professional" } } From 218bb1d22d80140393d3d28929b6fda75ba96d50 Mon Sep 17 00:00:00 2001 From: jellodiil <58082567+jellodiil@users.noreply.github.com> Date: Thu, 9 Apr 2020 10:58:23 +0100 Subject: [PATCH 2/4] De-subscriptioning Some words changed --- Emitron/Emitron/Constants.swift | 2 +- Emitron/Emitron/Data/ViewModels/ContentScreen.swift | 4 ++-- Emitron/Emitron/UI/App Root/LoginView.swift | 4 ++-- Emitron/Emitron/UI/App Root/LogoutView.swift | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Emitron/Emitron/Constants.swift b/Emitron/Emitron/Constants.swift index d09568ce..5569a7fd 100644 --- a/Emitron/Emitron/Constants.swift +++ b/Emitron/Emitron/Constants.swift @@ -102,7 +102,7 @@ enum Constants { static let settingsClosedCaptionOnLabel = "Subtitles" // Detail View - static let detailContentLockedCosPro = "To unlock this course visit raywenderlich.com/subscription for more information" + static let detailContentLockedCosPro = "Upgrade your account to watch this and other Pro courses" // Pull-to-refresh static let pullToRefreshPullMessage = "Pull to refresh" diff --git a/Emitron/Emitron/Data/ViewModels/ContentScreen.swift b/Emitron/Emitron/Data/ViewModels/ContentScreen.swift index 678dd4e3..8865a4e5 100644 --- a/Emitron/Emitron/Data/ViewModels/ContentScreen.swift +++ b/Emitron/Emitron/Data/ViewModels/ContentScreen.swift @@ -51,7 +51,7 @@ enum ContentScreen { case .downloads(permitted: true): return "You haven't downloaded any tutorials yet" case .downloads(permitted: false): - return "Upgrade your subscription to download videos" + return "Upgrade your account to download videos" case .bookmarked: return "You haven't bookmarked any tutorials yet" case .inProgress: @@ -74,7 +74,7 @@ enum ContentScreen { case .downloads(permitted: true): return "Tap the download icon to download a video course or episode to watch offline." case .downloads(permitted: false): - return "raywenderlich.com Professional subscribers can download videos and watch them offline.\n\nVisit raywenderlich.com/subscription to upgrade and start downloading videos today!" + return "Members on the Professional plan are able to download videos and watch them offline." } } diff --git a/Emitron/Emitron/UI/App Root/LoginView.swift b/Emitron/Emitron/UI/App Root/LoginView.swift index 952e0727..233ab704 100644 --- a/Emitron/Emitron/UI/App Root/LoginView.swift +++ b/Emitron/Emitron/UI/App Root/LoginView.swift @@ -53,7 +53,7 @@ struct LoginView: View { .multilineTextAlignment(.center) .padding([.bottom], 15) - Text("raywenderlich subscribers can watch over\n2,000+ video tutorials on iPhone and iPad.") + Text("Watch over 3,000+ video tutorials on iPhone and iPad.") .font(.uiLabel) .foregroundColor(.contentText) .multilineTextAlignment(.center) @@ -73,7 +73,7 @@ struct LoginView: View { .multilineTextAlignment(.center) .padding([.bottom], 15) - Text("Professional subscribers can download and\nwatch videos even when they're offline.") + Text("Download and watch videos — even when you’re offline.") .font(.uiLabel) .foregroundColor(.contentText) .multilineTextAlignment(.center) diff --git a/Emitron/Emitron/UI/App Root/LogoutView.swift b/Emitron/Emitron/UI/App Root/LogoutView.swift index e434800f..85693ef1 100644 --- a/Emitron/Emitron/UI/App Root/LogoutView.swift +++ b/Emitron/Emitron/UI/App Root/LogoutView.swift @@ -45,7 +45,7 @@ struct LogoutView: View { .padding([.bottom], 15) .multilineTextAlignment(.center) - Text("The raywenderlich.com app is only available to subscribers. ") + Text("The raywenderlich app is only available to members.") .lineSpacing(8) .font(.uiLabel) .foregroundColor(.contentText) From a088124639ff55c548b70ab627d56108b53cb1fe Mon Sep 17 00:00:00 2001 From: jellodiil <58082567+jellodiil@users.noreply.github.com> Date: Thu, 9 Apr 2020 15:12:06 +0100 Subject: [PATCH 3/4] Line Breaks Line breaks on login screen --- Emitron/Emitron/UI/App Root/LoginView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Emitron/Emitron/UI/App Root/LoginView.swift b/Emitron/Emitron/UI/App Root/LoginView.swift index 233ab704..a583016f 100644 --- a/Emitron/Emitron/UI/App Root/LoginView.swift +++ b/Emitron/Emitron/UI/App Root/LoginView.swift @@ -53,7 +53,7 @@ struct LoginView: View { .multilineTextAlignment(.center) .padding([.bottom], 15) - Text("Watch over 3,000+ video tutorials on iPhone and iPad.") + Text("Watch over 3,000+ video tutorials\non iPhone and iPad.") .font(.uiLabel) .foregroundColor(.contentText) .multilineTextAlignment(.center) @@ -73,7 +73,7 @@ struct LoginView: View { .multilineTextAlignment(.center) .padding([.bottom], 15) - Text("Download and watch videos — even when you’re offline.") + Text("Download and watch videos — even\nwhen you’re offline.") .font(.uiLabel) .foregroundColor(.contentText) .multilineTextAlignment(.center) From 8be193aedff58d8727a1923ac1b20dfa86a875c9 Mon Sep 17 00:00:00 2001 From: jellodiil <58082567+jellodiil@users.noreply.github.com> Date: Thu, 9 Apr 2020 16:31:45 +0100 Subject: [PATCH 4/4] Update version no --- Emitron/Emitron.xcodeproj/project.pbxproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Emitron/Emitron.xcodeproj/project.pbxproj b/Emitron/Emitron.xcodeproj/project.pbxproj index 9d74de03..5df7f6f2 100644 --- a/Emitron/Emitron.xcodeproj/project.pbxproj +++ b/Emitron/Emitron.xcodeproj/project.pbxproj @@ -2385,7 +2385,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.4; PRODUCT_BUNDLE_IDENTIFIER = "com.razeware.emitron.ios$(BUNDLE_ID_SUFFIX)"; PRODUCT_MODULE_NAME = Emitron; PRODUCT_NAME = raywenderlich; @@ -2588,7 +2588,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.4; PRODUCT_BUNDLE_IDENTIFIER = "com.razeware.emitron.ios$(BUNDLE_ID_SUFFIX)"; PRODUCT_MODULE_NAME = Emitron; PRODUCT_NAME = raywenderlich; @@ -2614,7 +2614,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.0.3; + MARKETING_VERSION = 1.0.4; PRODUCT_BUNDLE_IDENTIFIER = "com.razeware.emitron.ios$(BUNDLE_ID_SUFFIX)"; PRODUCT_MODULE_NAME = Emitron; PRODUCT_NAME = raywenderlich;