Merge pull request #457 from razeware/development

v1.0.4: 🐼n Leaf
razeware · Apr 9, 2020 · 5803f77 · 5803f77
2 parents f9d63ab + 437f79d
commit 5803f77
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git 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;

diff --git 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
@@ -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/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
@@ -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"
     }
   }
 

diff --git 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\non 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\nwhen 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
@@ -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)