Release 1.2.6 (115)

.github/workflows/beta.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - beta
       - beta-hotfix
+
+  workflow_dispatch:
 
 jobs:
   build:

Nicegram/NGCopyProtectedContent/BUILD

@@ -9,7 +9,7 @@ swift_library(
     deps = [
         "//Nicegram/NGData:NGData",
         "//Nicegram/NGRemoteConfig:NGRemoteConfig",
-		"//Nicegram/NGSubscription:NGSubscription",
+        "@swiftpkg_nicegram_assistant_ios//:Sources_NGPremiumUI",
     ],
     visibility = [
         "//visibility:public",

Nicegram/NGCopyProtectedContent/Sources/CopyProtectedContent.swift

@@ -1,9 +1,8 @@
 import Foundation
 import NGData
+import NGPremiumUI
 import NGRemoteConfig
-import NGSubscription
 import Postbox
-import TelegramPresentationData
 import UIKit
 
 //  MARK: - Logic
@@ -34,8 +33,8 @@ public func shouldSubscribeToCopyContent(message: Message) -> Bool {
     }
 }
 
-public func routeToNicegramPremiumForCopyContent(presentationData: PresentationData) {
-    routeToNicegramPremium(presentationData: presentationData)
+public func routeToNicegramPremiumForCopyContent() {
+    PremiumUITgHelper.routeToPremium()
 }
 
 //  MARK: - Bypass setting (Secret Menu)

Nicegram/NGLogging/BUILD

@@ -8,7 +8,8 @@ swift_library(
     ]),
     deps = [
 		"@FirebaseSDK//:FirebaseAnalytics",
-        "//submodules/TelegramCore:TelegramCore"
+        "//submodules/TelegramCore:TelegramCore",
+		"@swiftpkg_nicegram_assistant_ios//:Sources_NGAnalytics",
     ],
     visibility = [
         "//visibility:public",

Nicegram/NGLogging/Sources/FirebaseLogger.swift

@@ -1,4 +1,5 @@
 import FirebaseAnalytics
+import NGAnalytics
 
 public class FirebaseLogger {
 
@@ -12,3 +13,9 @@ extension FirebaseLogger: EventsLogger {
         Analytics.logEvent(name, parameters: params)
     }
 }
+
+extension FirebaseLogger: AnalyticsSender {
+    public func trackEvent(_ name: String, params: [String: Any]) {
+        Analytics.logEvent(name, parameters: params)
+    }
+}

Nicegram/NGOnboarding/BUILD

@@ -8,7 +8,9 @@ swift_library(
     ]),
     deps = [
         "//Nicegram/NGData:NGData",
-        "//Nicegram/NGSubscription:NGSubscription",
+        "//Nicegram/NGStrings:NGStrings",
+        "//Nicegram/NGTheme:NGTheme",
+        "@swiftpkg_nicegram_assistant_ios//:Sources_NGPremiumUI",
     ],
     visibility = [
         "//visibility:public",

Nicegram/NGOnboarding/Sources/OnboardingFlow.swift

@@ -1,49 +1,29 @@
-import Display
 import Foundation
 import UIKit
 import NGData
+import NGPremiumUI
 import NGStrings
-import NGSubscription
 
 public func onboardingController(languageCode: String, onComplete: @escaping () -> Void) -> UIViewController {
-    var routeToSubscription: (() -> Void)?
-
     let controller = OnboardingViewController(
         items: onboardingPages(languageCode: languageCode),
         languageCode: languageCode,
         onComplete: {
             if isPremium() {
                 onComplete()
+            } else if #available(iOS 13.0, *) {
+                PremiumUITgHelper.routeToPremium(onComplete: onComplete)
             } else {
-                routeToSubscription?()
+                onComplete()
             }
         }
     )
 
-    routeToSubscription = { [weak controller] in
-        let c = subscriptionController(onComplete: onComplete)
-        c.modalPresentationStyle = .fullScreen
-        controller?.present(c, animated: true)
-    }
-
-    return controller
-}
-
-private func subscriptionController(onComplete: @escaping () -> Void) -> UIViewController {
-    let builder: SubscriptionBuilder = SubscriptionBuilderImpl(languageCode: Locale.currentAppLocale.langCode)
-    let controller = builder.build(
-        handlers: SubscriptionHandlers(
-            onSuccessPurchase: onComplete,
-            onSuccessRestore: onComplete,
-            onClose: onComplete
-        )
-    )
-
     return controller
 }
 
 private func onboardingPages(languageCode: String) -> [OnboardingPageViewModel] {
-    (1...5).map { index in
+    (1...6).map { index in
         OnboardingPageViewModel(
             title: l("NicegramOnboarding.\(index).Title", languageCode),
             description: l("NicegramOnboarding.\(index).Desc", languageCode),

Nicegram/NGOnboarding/Sources/Views/OnboardingPageView.swift

@@ -1,6 +1,7 @@
 import UIKit
 import SnapKit
 import AVKit
+import NGTheme
 
 struct OnboardingPageViewModel {
     let title: String

Nicegram/NGSubscription/BUILD

@@ -7,15 +7,8 @@ swift_library(
         "Sources/**/*.swift",
     ]),
     deps = [
-        "@swiftpkg_snapkit//:Sources_SnapKit",
-		"@swiftpkg_nicegram_assistant_ios//:Sources_NGCoreUI",
-        "//submodules/Markdown:Markdown",
-        "//submodules/TelegramPresentationData:TelegramPresentationData",
-        "//Nicegram/NGStrings:NGStrings",
-        "//Nicegram/SubscriptionAnalytics:SubscriptionAnalytics",
-        "//Nicegram/NGLoadingIndicator:NGLoadingIndicator",
-        "//Nicegram/NGEnv:NGEnv",
-        "//Nicegram/NGTheme:NGTheme",
+		"@swiftpkg_nicegram_assistant_ios//:Sources_NGPremium",
+		"//Nicegram/SubscriptionAnalytics:SubscriptionAnalytics",
     ],
     visibility = [
         "//visibility:public",