Merge pull request #1019 from kiwix/1018-get-the-logo-size-from-assets

Get image size from assets, instead of hard coding it

Model/Brand.swift

@@ -47,11 +47,8 @@ enum Brand {
     static let appName: String = Config.value(for: .displayName) ?? "Kiwix"
     static let appStoreId: String = Config.value(for: .appStoreID) ?? "id997079563"
     static let loadingLogoImage: String = "welcomeLogo"
-    static let loadingLogoWidth: Int = Config.value(for: .logoWidth) ?? 192
-    static let loadingLogoHeight: Int = Config.value(for: .logoHeight) ?? 140
-    static var loadingLogoSize: CGSize {
-        CGSize(width: loadingLogoWidth, height: loadingLogoHeight)
-    }
+    static var loadingLogoSize: CGSize = ImageInfo.sizeOf(imageName: loadingLogoImage)!
+
     static let aboutText: String = Config.value(for: .aboutText) ?? "settings.about.description".localized
     static let aboutWebsite: String = Config.value(for: .aboutWebsite) ?? "https://www.kiwix.org"
 
@@ -84,8 +81,6 @@ enum Config: String {
     case showSearchSnippetInSettings = "SETTINGS_SHOW_SEARCH_SNIPPET"
     case aboutText = "CUSTOM_ABOUT_TEXT"
     case aboutWebsite = "CUSTOM_ABOUT_WEBSITE"
-    case logoWidth = "LOGO_WIDTH"
-    case logoHeight = "LOGO_HEIGHT"
 
     static func value<T>(for key: Config) -> T? where T: LosslessStringConvertible {
         guard let object = Bundle.main.object(forInfoDictionaryKey: key.rawValue) else {

Model/Utilities/ImageInfo.swift

@@ -0,0 +1,28 @@
+// This file is part of Kiwix for iOS & macOS.
+//
+// Kiwix is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// any later version.
+//
+// Kiwix is distributed in the hope that it will be useful, but
+// WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Kiwix; If not, see https://www.gnu.org/licenses/.
+
+import Foundation
+import SwiftUI
+
+enum ImageInfo {
+    static func sizeOf(imageName: String) -> CGSize? {
+        #if os(macOS)
+        NSImage(named: imageName)?.size
+        #else
+        guard let cgImage = UIImage(named: imageName)?.cgImage else { return nil }
+        return CGSize(width: cgImage.width, height: cgImage.height)
+        #endif
+    }
+}