From 86dec07ccdf1663ac9e7d4767f59e2d16a994aaf Mon Sep 17 00:00:00 2001 From: jahorton Date: Tue, 28 Jul 2020 08:33:56 +0700 Subject: [PATCH] change(ios/engine): author -> copyright, view ordering when all vertically stacked --- .../PackageInstallView.xib | 191 +++++++++--------- .../PackageInstallViewController.swift | 8 +- 2 files changed, 95 insertions(+), 104 deletions(-) diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallView.xib b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallView.xib index 011c478405..7ce1c1ca15 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallView.xib +++ b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallView.xib @@ -10,7 +10,7 @@ - + @@ -21,8 +21,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -53,53 +100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -113,11 +113,9 @@ - - - + @@ -127,6 +125,7 @@ + @@ -147,7 +146,7 @@ - + @@ -161,7 +160,6 @@ - @@ -173,7 +171,6 @@ - @@ -181,32 +178,12 @@ - - - - - - - - - - - - - - - - - - - - - + @@ -217,7 +194,25 @@ + + + + + + + + + + + + + + + + + + @@ -227,7 +222,6 @@ - @@ -238,16 +232,16 @@ - - - - - + + + + + @@ -256,13 +250,13 @@ - - - + + + @@ -271,40 +265,37 @@ - - - - - - - + + + + + - - - - - - - + + + + + + - + diff --git a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallViewController.swift b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallViewController.swift index 2043a91351..8933718bf2 100644 --- a/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallViewController.swift +++ b/ios/engine/KMEI/KeymanEngine/Classes/Resource Management/PackageInstallViewController.swift @@ -15,7 +15,7 @@ public class PackageInstallViewController: UIViewCon // Needed to support iOS 9 + 10. @IBOutlet weak var webViewContainer: UIView! @IBOutlet weak var lblVersion: UILabel! - @IBOutlet weak var lblAuthor: UILabel! + @IBOutlet weak var lblCopyright: UILabel! let package: Resource.Package var wkWebView: WKWebView? @@ -64,10 +64,10 @@ public class PackageInstallViewController: UIViewCon navigationItem.title = package.name lblVersion.text = "Version: \(package.version)" - if let author = package.metadata.info?.author?.description { - lblAuthor.text = "Author: \(author)" + if let copyright = package.metadata.info?.copyright?.description { + lblCopyright.text = copyright } else { - lblAuthor.isHidden = true + lblCopyright.isHidden = true } }