Clean up assets, align welcome screen

kiwix · Sep 14, 2024 · d7b0e7c · d7b0e7c
1 parent 1f98231
commit d7b0e7c
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 92 deletions.
diff --git a/Model/Brand.swift b/Model/Brand.swift
@@ -46,7 +46,7 @@ enum AppType {
 enum Brand {
  static let appName: String = Config.value(for: .displayName) ?? "Kiwix"
  static let appStoreId: String = Config.value(for: .appStoreID) ?? "id997079563"
- static let welcomeLogoImageName: String = "welcomeLogo"
+ static let loadingLogoImage: String = "kiwix-full"
  static let aboutText: String = Config.value(for: .aboutText) ?? "settings.about.description".localized
  static let aboutWebsite: String = Config.value(for: .aboutWebsite) ?? "https://www.kiwix.org"
 

diff --git a/Support/Assets.xcassets/Kiwix_logo_v4.imageset/Contents.json b/Support/Assets.xcassets/Kiwix_logo_v4.imageset/Contents.json
diff --git a/Support/Assets.xcassets/Kiwix_logo_v4.imageset/Kiwix_logo_v4.png b/Support/Assets.xcassets/Kiwix_logo_v4.imageset/Kiwix_logo_v4.png
diff --git a/Support/Assets.xcassets/welcomeLogo.imageset/Contents.json b/Support/Assets.xcassets/welcomeLogo.imageset/Contents.json
diff --git a/Support/Assets.xcassets/welcomeLogo.imageset/Kiwix_logo_v3.svg b/Support/Assets.xcassets/welcomeLogo.imageset/Kiwix_logo_v3.svg
diff --git a/Support/SplashScreenKiwix.storyboard b/Support/SplashScreenKiwix.storyboard
@@ -25,7 +25,7 @@
  <constraint firstItem="gOr-0c-AYj" firstAttribute="width" relation="lessThanOrEqual" secondItem="Ze5-6b-2t3" secondAttribute="width" multiplier="0.618" id="G29-6Y-oWb"/>
  <constraint firstItem="gOr-0c-AYj" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="MYi-uf-geF"/>
  <constraint firstItem="gOr-0c-AYj" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="ohB-Hm-56e"/>
- <constraint firstItem="gOr-0c-AYj" firstAttribute="height" relation="lessThanOrEqual" secondItem="Ze5-6b-2t3" secondAttribute="height" multiplier="0.618" id="zTu-F5-CRx"/>
+ <constraint firstItem="gOr-0c-AYj" firstAttribute="height" relation="lessThanOrEqual" secondItem="Ze5-6b-2t3" secondAttribute="height" multiplier="0.382" id="zTu-F5-CRx"/>
  </constraints>
  </view>
  </viewController>

diff --git a/Views/BuildingBlocks/LoadingView.swift b/Views/BuildingBlocks/LoadingView.swift
@@ -18,8 +18,10 @@ import SwiftUI
 struct LogoView: View {
  var body: some View {
  GeometryReader { geometry in
- Image("kiwix-full")
- .frame(width: geometry.size.width * 0.618, height: geometry.size.height * 0.618)
+ Image(Brand.loadingLogoImage)
+ .frame(
+ width: geometry.size.width * 0.618,
+ height: geometry.size.height * 0.3820)
  .aspectRatio(contentMode: .fit)
  .position(
  x: geometry.size.width * 0.5,

diff --git a/Views/Welcome.swift b/Views/Welcome.swift
@@ -36,42 +36,8 @@ struct Welcome: View {
  if zimFiles.isEmpty {
  ZStack {
  LogoView()
+ welcomeContent
  }.ignoresSafeArea()
-// ZStack {
-// LoadingView()
-// HStack {
-// Spacer()
-// VStack(spacing: 20) {
-// Spacer(minLength: 200)
-// Divider()
-// actions
-// Text("library_refresh_error.retrieve.description".localized)
-// .foregroundColor(.red)
-// .opacity(library.state == .error ? 1 : 0)
-// Spacer()
-// }
-// #if os(macOS)
-// .frame(maxWidth: 300)
-// #elseif os(iOS)
-// .frame(maxWidth: 600)
-// #endif
-// Spacer()
-// }
-// .padding()
-// .ignoresSafeArea()
-// .onChange(of: library.state) { state in
-// guard state == .complete else { return }
-// #if os(macOS)
-// navigation.currentItem = .categories
-// #elseif os(iOS)
-// if horizontalSizeClass == .regular {
-// navigation.currentItem = .categories
-// } else {
-// showLibrary?()
-// }
-// #endif
-// }
-// }
  } else {
  LazyVGrid(
  columns: ([GridItem(.adaptive(minimum: 250, maximum: 500), spacing: 12)]),
@@ -106,15 +72,40 @@ struct Welcome: View {
  }
  }
 
- /// App logo shown in onboarding view
- private var logo: some View {
- VStack(spacing: 6) {
- Image(Brand.welcomeLogoImageName)
- .resizable()
- .aspectRatio(1, contentMode: .fit)
- .frame(width: 60, height: 60)
- .background(RoundedRectangle(cornerRadius: 10, style: .continuous).foregroundColor(.white))
-// Text(Brand.appName.uppercased()).font(.largeTitle).fontWeight(.bold)
+ private var welcomeContent: some View {
+ GeometryReader { geometry in
+ HStack {
+ Spacer()
+ VStack(spacing: 20) {
+ Spacer()
+ .frame(height: geometry.size.height * 0.618)
+ Divider()
+ actions
+ Text("library_refresh_error.retrieve.description".localized)
+ .foregroundColor(.red)
+ .opacity(library.state == .error ? 1 : 0)
+ Spacer()
+ }
+ .padding()
+#if os(macOS)
+ .frame(maxWidth: 300)
+#elseif os(iOS)
+ .frame(maxWidth: 600)
+#endif
+ .onChange(of: library.state) { state in
+ guard state == .complete else { return }
+#if os(macOS)
+ navigation.currentItem = .categories
+#elseif os(iOS)
+ if horizontalSizeClass == .regular {
+ navigation.currentItem = .categories
+ } else {
+ showLibrary?()
+ }
+#endif
+ }
+ Spacer()
+ }
  }
  }