Loading and LogoViews

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

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/Views/BuildingBlocks/LoadingView.swift b/Views/BuildingBlocks/LoadingView.swift
@@ -15,7 +15,7 @@
 
 import SwiftUI
 
-struct LoadingView: View {
+struct LogoView: View {
  var body: some View {
  GeometryReader { geometry in
  Image("kiwix-full")
@@ -29,6 +29,33 @@ struct LoadingView: View {
  }
 }
 
+struct LoadingProgressView: View {
+ var body: some View {
+ GeometryReader { geometry in
+ ProgressView()
+ .progressViewStyle(.circular)
+ .tint(Color.primary)
+ .frame(
+ width: geometry.size.width * 0.618,
+ height: geometry.size.height * 0.191
+ )
+ .position(
+ x: geometry.size.width * 0.5,
+ y: geometry.size.height * 0.809
+ )
+ }
+ }
+}
+
+struct LoadingView: View {
+ var body: some View {
+ ZStack {
+ LogoView()
+ LoadingProgressView()
+ }.ignoresSafeArea()
+ }
+}
+
 #Preview {
  LoadingView()
 }
diff --git a/Views/Welcome.swift b/Views/Welcome.swift
@@ -34,7 +34,9 @@ struct Welcome: View {
 
  var body: some View {
  if zimFiles.isEmpty {
- LoadingView().ignoresSafeArea()
+ ZStack {
+ LogoView()
+ }.ignoresSafeArea()
 // ZStack {
 // LoadingView()
 // HStack {