iOS: Minor fix

viere1234 · viere1234 · commit e4e4f7718654 · 2024-11-06T23:07:12.000+08:00
diff --git a/iosApp/OPass/Event/EventView.swift b/iosApp/OPass/Event/EventView.swift
@@ -49,12 +49,20 @@ struct EventView: View {
 
             FeatureGrid(config: config)
         }
-        .onChange(of: eventID) { viewModel.reset() }
+        .onChange(of: eventID) { Task { await viewModel.loadEvent(reload: true) } }
+        .navigationBarTitleDisplayMode(.inline)
+        .toolbar {
+            ToolbarItem(placement: .principal) {
+                Text(config.name)
+                    .bold()
+            }
+        }
     }
 
     @ViewBuilder
     private func loadingView() -> some View {
         ProgressView("Loading")
+            .frame(maxWidth: .infinity, maxHeight: .infinity)
             .task { await viewModel.loadEvent() }
     }
 }
diff --git a/iosApp/OPass/Event/FeatureGrid.swift b/iosApp/OPass/Event/FeatureGrid.swift
@@ -41,11 +41,11 @@ struct FeatureGrid: View {
                             .renderingMode(.template)
                             .interpolation(.none)
                             .resizable()
-                            .scaledToFill()
+                            .scaledToFit()
                     default:
                         Image(systemName: feature.symbol)
                             .resizable()
-                            .scaledToFill()
+                            .scaledToFit()
                             .padding(3)
                     }
                 }
@@ -57,7 +57,6 @@ struct FeatureGrid: View {
                 .font(.custom("RobotoCondensed-Regular", size: 11, relativeTo: .caption2))
                 .fixedSize(horizontal: false, vertical: true)
                 .multilineTextAlignment(.center)
-
         }
     }
 }
diff --git a/iosApp/Supporting Files/Localizable.xcstrings b/iosApp/Supporting Files/Localizable.xcstrings
@@ -37,7 +37,7 @@
     "Clean Cache" : {
 
     },
-    "Clean cache will only remove unnecessary cache to free up space and improve performance. Some essential cache required for the app to operate will remain intact." : {
+    "Clean cache will only remove unnecessary cache to free up space. Some essential cache required for the app to operate will remain intact." : {
 
     },
     "Dark Mode" : {

Original file line number	Diff line number	Diff line change
`@@ -49,12 +49,20 @@ struct EventView: View {`
`49`	`49`
`50`	`50`	`FeatureGrid(config: config)`
`51`	`51`	`}`
`52`		`- .onChange(of: eventID) { viewModel.reset() }`
	`52`	`+ .onChange(of: eventID) { Task { await viewModel.loadEvent(reload: true) } }`
	`53`	`+ .navigationBarTitleDisplayMode(.inline)`
	`54`	`+ .toolbar {`
	`55`	`+ ToolbarItem(placement: .principal) {`
	`56`	`+ Text(config.name)`
	`57`	`+ .bold()`
	`58`	`+ }`
	`59`	`+ }`
`53`	`60`	`}`
`54`	`61`
`55`	`62`	`@ViewBuilder`
`56`	`63`	`private func loadingView() -> some View {`
`57`	`64`	`ProgressView("Loading")`
	`65`	`+ .frame(maxWidth: .infinity, maxHeight: .infinity)`
`58`	`66`	`.task { await viewModel.loadEvent() }`
`59`	`67`	`}`
`60`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,11 @@ struct FeatureGrid: View {`
`41`	`41`	`.renderingMode(.template)`
`42`	`42`	`.interpolation(.none)`
`43`	`43`	`.resizable()`
`44`		`- .scaledToFill()`
	`44`	`+ .scaledToFit()`
`45`	`45`	`default:`
`46`	`46`	`Image(systemName: feature.symbol)`
`47`	`47`	`.resizable()`
`48`		`- .scaledToFill()`
	`48`	`+ .scaledToFit()`
`49`	`49`	`.padding(3)`
`50`	`50`	`}`
`51`	`51`	`}`
`@@ -57,7 +57,6 @@ struct FeatureGrid: View {`
`57`	`57`	`.font(.custom("RobotoCondensed-Regular", size: 11, relativeTo: .caption2))`
`58`	`58`	`.fixedSize(horizontal: false, vertical: true)`
`59`	`59`	`.multilineTextAlignment(.center)`
`60`		`-`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`	`}`