Merge pull request #60 from adisve/patch/search/localizations

Search page, localizations
tumble-for-kronox · May 18, 2023 · ad31acc · ad31acc
2 parents 26b7cf9 + 5fed612
commit ad31acc
Show file tree

Hide file tree

Showing 15 changed files with 50 additions and 29 deletions.
diff --git a/Assets/bs-BA.lproj/Localizable.strings b/Assets/bs-BA.lproj/Localizable.strings
@@ -6,6 +6,8 @@
 
 */
 
+"%@ at %@"="%@ u %@ sati";
+
 "Continue"="Nastavi";
 
 "Search events"="Traži događaje";

diff --git a/Assets/de.lproj/Localizable.strings b/Assets/de.lproj/Localizable.strings
@@ -6,6 +6,8 @@
 
 */
 
+"%@ at %@"="%@ um %@";
+
 "Continue"="Fortsetzen";
 
 "Search events" = "Ereignisse suchen";

diff --git a/Assets/en.lproj/Localizable.strings b/Assets/en.lproj/Localizable.strings
@@ -6,6 +6,8 @@
 
 */
 
+"%@ at %@"="%@ at %@";
+
 "Continue"="Continue";
 
 "Search events" = "Search events";

diff --git a/Assets/fr.lproj/Localizable.strings b/Assets/fr.lproj/Localizable.strings
@@ -6,6 +6,8 @@
 
 */
 
+"%@ at %@"="%@ à %@";
+
 "Continue"="Continuer";
 
 "Search events" = "Rechercher des événements";

diff --git a/Assets/it.lproj/Localizable.strings b/Assets/it.lproj/Localizable.strings
@@ -6,6 +6,8 @@
 
 */
 
+"%@ at %@"="%@ alle %@";
+
 "Continue"="Continua";
 
 "Search events"="Cerca eventi";

diff --git a/Assets/sv.lproj/Localizable.strings b/Assets/sv.lproj/Localizable.strings
@@ -6,6 +6,8 @@
 
 */
 
+"%@ at %@"="%@ kl. %@";
+
 "Continue"="Fortsätt";
 
 "Search events" = "Sök händelser";

diff --git a/Sources/Presentation/Views/Account/User/ResourceSection/Booking/Events/EventCardButton.swift b/Sources/Presentation/Views/Account/User/ResourceSection/Booking/Events/EventCardButton.swift
@@ -32,10 +32,11 @@ struct EventCardButton: View {
                         Image(systemName: "calendar.badge.clock")
                             .font(.system(size: 15))
                             .foregroundColor(.onSurface.opacity(0.7))
-                        if let eventStart = event.eventStart.toDate(),
-                           let eventHoursMinutes = event.eventStart.convertToHoursAndMinutes()
+                        if let eventDate = event.eventStart.toDate(),
+                           let eventEnd = event.eventEnd.convertToHoursAndMinutes(),
+                           let eventStart = event.eventStart.convertToHoursAndMinutes()
                         {
-                            Text("\(eventStart) at \(eventHoursMinutes)")
+                            Text(String(format: NSLocalizedString("%@, from %@ - %@", comment: ""), eventDate, eventStart, eventEnd))
                                 .font(.system(size: 15))
                                 .foregroundColor(.onSurface.opacity(0.7))
                         } else {

diff --git a/...sentation/Views/Account/User/ResourceSection/Booking/Events/UpcomingEventCardButton.swift b/...sentation/Views/Account/User/ResourceSection/Booking/Events/UpcomingEventCardButton.swift
@@ -24,10 +24,11 @@ struct UpcomingEventCardButton: View {
                     Image(systemName: "calendar.badge.clock")
                         .font(.system(size: 15))
                         .foregroundColor(.onSurface.opacity(0.7))
-                    if let eventStart = event.eventStart.toDate(),
-                       let eventHoursMinutes = event.eventStart.convertToHoursAndMinutes()
+                    if let eventDate = event.eventStart.toDate(),
+                       let eventEnd = event.eventEnd.toDate(),
+                       let eventStart = event.eventStart.convertToHoursAndMinutes()
                     {
-                        Text(String(format: NSLocalizedString("%@ at %@", comment: ""), eventStart, eventHoursMinutes))
+                        Text(String(format: NSLocalizedString("%@, from %@ - %@", comment: ""), eventDate, eventStart, eventEnd))
                             .font(.system(size: 15))
                             .foregroundColor(.onSurface.opacity(0.7))
 

diff --git a/...ces/Presentation/Views/Account/User/ResourceSection/Booking/Sheets/ExamDetailsSheet.swift b/...ces/Presentation/Views/Account/User/ResourceSection/Booking/Sheets/ExamDetailsSheet.swift
@@ -25,7 +25,7 @@ struct ExamDetailsSheet: View {
                         .foregroundColor(.onSurface)
                 })
                 DetailsBuilder(title: NSLocalizedString("Type", comment: ""), image: "info.circle", content: {
-                    Text(event.type ?? NSLocalizedString("No type", comment: ""))
+                    Text(event.type?.trimmingCharacters(in: .newlines) ?? NSLocalizedString("No type", comment: ""))
                         .font(.system(size: 16))
                         .foregroundColor(.onSurface)
                 })

diff --git a/Sources/Presentation/Views/Account/User/ResourceSection/RegisteredBookings.swift b/Sources/Presentation/Views/Account/User/ResourceSection/RegisteredBookings.swift
@@ -24,11 +24,11 @@ struct RegisteredBookings: View {
                     if !bookings.isEmpty {
                         ForEach(bookings) { resource in
                             ResourceCard(
-                                timeSpan: "\(resource.timeSlot.from?.convertToHoursAndMinutes() ?? "")",
+                                eventStart: resource.timeSlot.from?.convertToHoursAndMinutes() ?? NSLocalizedString("(no time)", comment: ""),
+                                eventEnd: resource.timeSlot.to?.convertToHoursAndMinutes() ?? NSLocalizedString("(no time)", comment: ""),
                                 title: NSLocalizedString("Booked resource", comment: ""),
                                 location: resource.locationID,
                                 date: resource.timeSlot.from?.toDate() ?? NSLocalizedString("(no date)", comment: ""),
-                                hoursMinutes: "\(resource.timeSlot.from?.convertToHoursAndMinutes() ?? NSLocalizedString("(no time)", comment: "")) - \(resource.timeSlot.to?.convertToHoursAndMinutes() ?? NSLocalizedString("(no time)", comment: ""))",
                                 onClick: {
                                     onClickResource(resource)
                                 }

diff --git a/Sources/Presentation/Views/Account/User/ResourceSection/RegisteredEvents.swift b/Sources/Presentation/Views/Account/User/ResourceSection/RegisteredEvents.swift
@@ -27,11 +27,11 @@ struct RegisteredEvents: View {
                                let eventEnd = event.eventEnd.convertToHoursAndMinutes()
                             {
                                 ResourceCard(
-                                    timeSpan: "\(event.eventStart.convertToHoursAndMinutes() ?? "")",
+                                    eventStart: eventStart,
+                                    eventEnd: eventEnd,
                                     type: event.type,
                                     title: event.title,
                                     date: event.eventStart.toDate() ?? NSLocalizedString("(no date)", comment: ""),
-                                    hoursMinutes: "\(eventStart) - \(eventEnd)",
                                     onClick: {
                                         onClickEvent(event)
                                     }

diff --git a/Sources/Presentation/Views/Account/User/ResourceSection/ResourceCard.swift b/Sources/Presentation/Views/Account/User/ResourceSection/ResourceCard.swift
@@ -9,26 +9,27 @@ import SwiftUI
 
 struct ResourceCard: View {
     let date: String
-    let hoursMinutes: String
-    let timeSpan: String
+    let eventStart: String
+    let eventEnd: String
     let type: String?
     let location: String?
     let title: String?
     let onClick: () -> Void
 
-    init(timeSpan: String,
-         type: String? = nil,
-         title: String? = nil,
-         location: String? = nil,
-         date: String,
-         hoursMinutes: String,
-         onClick: @escaping () -> Void)
+    init(
+        eventStart: String,
+        eventEnd: String,
+        type: String? = nil,
+        title: String? = nil,
+        location: String? = nil,
+        date: String,
+        onClick: @escaping () -> Void)
     {
-        self.timeSpan = timeSpan
+        self.eventStart = eventStart
+        self.eventEnd = eventEnd
         self.type = type
         self.title = title
         self.date = date
-        self.hoursMinutes = hoursMinutes
         self.location = location
         self.onClick = onClick
     }
@@ -69,7 +70,7 @@ struct ResourceCard: View {
                         Image(systemName: "calendar.badge.clock")
                             .font(.system(size: 15))
                             .foregroundColor(.onSurface.opacity(0.7))
-                        Text("\(NSLocalizedString("Date:", comment: "")) \(date) \(NSLocalizedString("Time:", comment: "")) \(hoursMinutes)")
+                        Text(String(format: NSLocalizedString("%@, from %@ - %@", comment: ""), date, eventStart, eventEnd))
                             .font(.system(size: 15))
                             .foregroundColor(.onSurface.opacity(0.7))
                     }

diff --git a/Sources/Presentation/Views/Search/Search.swift b/Sources/Presentation/Views/Search/Search.swift
@@ -42,8 +42,12 @@ struct Search: View {
             .padding(.bottom, 15)
         }
         .background(Color.background)
-        .onChange(of: viewModel.selectedSchool) { _ in
-            viewModel.schoolNotSelected.toggle()
+        .onChange(of: viewModel.selectedSchool) { school in
+            if school == nil {
+                viewModel.schoolNotSelected = true
+            } else {
+                viewModel.schoolNotSelected = false
+            }
         }
         .sheet(item: $viewModel.searchPreviewModel) { model in
             SearchPreview(

diff --git a/Sources/Presentation/Views/Search/SearchInfo.swift b/Sources/Presentation/Views/Search/SearchInfo.swift
@@ -44,7 +44,9 @@ struct SearchInfo: View {
                         Group {
                             Text(NSLocalizedString("Important: ", comment: "")).bold()
                                 +
-                                Text(NSLocalizedString("This university requires you to log in to their institution before you can see some of their schedules", comment: ""))
+                                Text(NSLocalizedString(
+                                    "This university requires you to log in to their institution before you can see some of their schedules",
+                                    comment: ""))
                         }.font(.system(size: 14))
                             .foregroundColor(.red)
                     }

diff --git a/Tumble.xcodeproj/project.pbxproj b/Tumble.xcodeproj/project.pbxproj
@@ -1897,7 +1897,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.60;
+				MARKETING_VERSION = 3.2.70;
 				NETWORK_SETTINGS = testing;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.tumble;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2054,7 +2054,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.60;
+				MARKETING_VERSION = 3.2.70;
 				NETWORK_SETTINGS = testing;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.tumble;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -2096,7 +2096,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.2.60;
+				MARKETING_VERSION = 3.2.70;
 				NETWORK_SETTINGS = production;
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.tumble;
 				PRODUCT_NAME = "$(TARGET_NAME)";