diff --git a/Ring/Ring/Features/Walkthrough/CreateAccount/CreateAccountViewController.swift b/Ring/Ring/Features/Walkthrough/CreateAccount/CreateAccountViewController.swift index 889c748873ccbc8734765843cf648b812bc0f2ad..c7a8876dc4823a0bec1cf3f2016ba6199b0de183 100644 --- a/Ring/Ring/Features/Walkthrough/CreateAccount/CreateAccountViewController.swift +++ b/Ring/Ring/Features/Walkthrough/CreateAccount/CreateAccountViewController.swift @@ -117,7 +117,7 @@ class CreateAccountViewController: UIViewController, StoryboardBased, ViewModelB } func adaptToSystemColor() { - view.backgroundColor = UIColor.jamiBackgroundColor + view.backgroundColor = .clear } func setContentInset(keyboardHeight: CGFloat = 0) { diff --git a/Ring/Ring/Features/Walkthrough/WalkthroughCoordinator.swift b/Ring/Ring/Features/Walkthrough/WalkthroughCoordinator.swift index 36245107b46a0daad7134893994d0b6f32961f25..90745974ef589f5aa2dd235b6f3ae606879f2248 100644 --- a/Ring/Ring/Features/Walkthrough/WalkthroughCoordinator.swift +++ b/Ring/Ring/Features/Walkthrough/WalkthroughCoordinator.swift @@ -98,7 +98,6 @@ class WalkthroughCoordinator: Coordinator, StateableResponsive { switch walkthroughType { case .createAccount: let createAccountViewController = CreateAccountViewController.instantiate(with: self.injectionBag) - createAccountViewController.view.backgroundColor = .clear self.present(viewController: createAccountViewController, withStyle: .formModal, withAnimation: true, withStateable: createAccountViewController.viewModel) case .createSipAccount: let sipAccountViewController = CreateSipAccountViewController.instantiate(with: self.injectionBag) diff --git a/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift b/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift index 6bb8f0c41a85b9e109f638bb60d3525f5dcf49f4..24c5a61aaee1d3bfede137085c6b89bd4fea2b1d 100644 --- a/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift +++ b/Ring/Ring/Features/Walkthrough/WelcomeViewController.swift @@ -130,32 +130,7 @@ class WelcomeViewController: UIViewController, StoryboardBased, ViewModelBased { } private func aboutJamiButtonDidTap() { - var compileDate: String { - let dateDefault = "" - let dateFormatter = DateFormatter() - dateFormatter.dateFormat = "YYYYMMdd" - let bundleName = Bundle.main.infoDictionary!["CFBundleName"] as? String ?? "Info.plist" - if let infoPath = Bundle.main.path(forResource: bundleName, ofType: nil), - let infoAttr = try? FileManager.default.attributesOfItem(atPath: infoPath), - let infoDate = infoAttr[FileAttributeKey.creationDate] as? Date { - return dateFormatter.string(from: infoDate) - } - return dateDefault - } - - let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "" - - let versionName = "Világfa" - let alert = UIAlertController(title: "\nJami\nversion: \(appVersion)(\(compileDate))\n\(versionName)", message: "", preferredStyle: .alert) - alert.addAction(UIAlertAction(title: L10n.Global.ok, style: .default, handler: nil)) - let image = UIImageView(image: UIImage(asset: Asset.jamiIcon)) - alert.view.addSubview(image) - image.translatesAutoresizingMaskIntoConstraints = false - alert.view.addConstraint(NSLayoutConstraint(item: image, attribute: .centerX, relatedBy: .equal, toItem: alert.view, attribute: .centerX, multiplier: 1, constant: 0)) - alert.view.addConstraint(NSLayoutConstraint(item: image, attribute: .centerY, relatedBy: .equal, toItem: alert.view, attribute: .top, multiplier: 1, constant: 0.0)) - alert.view.addConstraint(NSLayoutConstraint(item: image, attribute: .width, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.0, constant: 64.0)) - alert.view.addConstraint(NSLayoutConstraint(item: image, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.0, constant: 64.0)) - self.present(alert, animated: true, completion: nil) + AppInfoHelper.showAboutJamiAlert(onViewController: self) } func setupButtonActions() {