1.5.3

kiwix · Dec 11, 2021 · 9f61ae1 · 9f61ae1
1 parent a12b313
commit 9f61ae1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 1.15.3
+
+- Revert libkiwix and libzim to the last known stable release (9.4.1 and 6.3.2 respectively)
+- Added version notation of libkiwix and libzim to the about page
+
+## 1.15.2
+
+- Fixed an issue where press random button could lead to app crash
+
 ## 1.15.1
 
 - Fixed an issue where open in places zim files are identified as corrupted.

diff --git a/Kiwix.xcodeproj/project.pbxproj b/Kiwix.xcodeproj/project.pbxproj
@@ -1701,7 +1701,7 @@
 				CODE_SIGN_ENTITLEMENTS = iOS/Support/Kiwix.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = L7HWM3SP3L;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = iOS/Support/Info.plist;
@@ -1710,7 +1710,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.2;
+				MARKETING_VERSION = 1.15.3;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					SwiftUI,
@@ -1737,7 +1737,7 @@
 				CODE_SIGN_ENTITLEMENTS = iOS/Support/Kiwix.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = L7HWM3SP3L;
 				ENABLE_BITCODE = YES;
 				INFOPLIST_FILE = iOS/Support/Info.plist;
@@ -1746,7 +1746,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.15.2;
+				MARKETING_VERSION = 1.15.3;
 				OTHER_LDFLAGS = (
 					"-weak_framework",
 					SwiftUI,
@@ -1962,7 +1962,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = L7HWM3SP3L;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = iOS/QuickLookPreview/Info.plist;
@@ -1974,7 +1974,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.15.2;
+				MARKETING_VERSION = 1.15.3;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = self.Kiwix.QuickLook;
@@ -1997,7 +1997,7 @@
 				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 84;
+				CURRENT_PROJECT_VERSION = 85;
 				DEVELOPMENT_TEAM = L7HWM3SP3L;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = iOS/QuickLookPreview/Info.plist;
@@ -2009,7 +2009,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.15.2;
+				MARKETING_VERSION = 1.15.3;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = self.Kiwix.QuickLook;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/iOS/SwiftUI/SettingsView.swift b/iOS/SwiftUI/SettingsView.swift
@@ -181,27 +181,25 @@ fileprivate struct AboutView: View {
                      It makes knowledge available to people with no or limited internet access. \
                      The software as well as the content is free to use for anyone.
                      """
-                ).multilineTextAlignment(.leading)
-                Button("Our Website") {
-                    externalLinkURL = URL(string: "https://www.kiwix.org")
-                }
+                )
+                    .lineLimit(nil)
+                    .minimumScaleFactor(0.5) // to avoid unnecessary truncation (three dots)
+                Button("Our Website") { externalLinkURL = URL(string: "https://www.kiwix.org") }
             }
             Section(header: Text("Release")) {
                 Text("This app is released under the terms of the GNU General Public License version 3.")
-                Button("Source") {
-                    externalLinkURL = URL(string: "https://github.com/kiwix/apple")
-                }
+                Button("Source") { externalLinkURL = URL(string: "https://github.com/kiwix/apple") }
                 Button("GNU General Public License v3") {
                     externalLinkURL = URL(string: "https://www.gnu.org/licenses/gpl-3.0.en.html")
                 }
             }
             Section(header: Text("Dependencies")) {
-                Dependency(name: "kiwix-lib", license: "GPLv3")
-                Dependency(name: "libzim", license: "GPLv2")
+                Dependency(name: "libkiwix", license: "GPLv3", version: "9.4.1")
+                Dependency(name: "libzim", license: "GPLv2", version: "6.3.2")
                 Dependency(name: "Xapian", license: "GPLv2")
                 Dependency(name: "ICU", license: "ICU")
                 Dependency(name: "Realm", license: "Apachev2")
-                Dependency(name: "SwiftSoup", license: "MIT")
+                Dependency(name: "Fuzi", license: "MIT")
                 Dependency(name: "Defaults", license: "MIT")
             }
         }
@@ -213,12 +211,22 @@ fileprivate struct AboutView: View {
     struct Dependency: View {
         let name: String
         let license: String
+        let version: String?
+
+        init(name: String, license: String, version: String? = nil) {
+            self.name = name
+            self.license = license
+            self.version = version
+        }
 
         var body: some View {
             HStack {
                 Text(name)
                 Spacer()
                 Text(license).foregroundColor(.secondary)
+                if let version = version {
+                    Text("(\(version))").foregroundColor(.secondary)
+                }
             }
         }
     }