#149 - UI updates (#150)

ramz1t · web-flow · commit ae2a94a20971 · 2025-01-14T20:42:07.000+01:00
* notifications offset options translation, ru translation fix

* Various ui updates
diff --git a/App/Extensions/Presentation/View/ViewExtensions.swift b/App/Extensions/Presentation/View/ViewExtensions.swift
@@ -33,7 +33,7 @@ extension View {
     
     func searchBox() -> some View {
         padding(10)
-            .background(Color.gray.opacity(0.3))
+            .background(Color.gray.opacity(0.2))
             .cornerRadius(10)
     }
     
diff --git a/App/Presentation/Views/Account/User/ResourceSection/Booking/Events/EventCardButton.swift b/App/Presentation/Views/Account/User/ResourceSection/Booking/Events/EventCardButton.swift
@@ -25,7 +25,6 @@ struct EventCardButton: View {
                         Text(event.title ?? NSLocalizedString("No title", comment: ""))
                             .font(.system(size: 17, weight: .medium))
                             .foregroundColor(.onSurface)
-                            .lineLimit(1)
                             .truncationMode(.tail)
                     }
                     HStack {
diff --git a/App/Presentation/Views/Account/User/ResourceSection/Booking/Events/UpcomingEventCardButton.swift b/App/Presentation/Views/Account/User/ResourceSection/Booking/Events/UpcomingEventCardButton.swift
@@ -17,7 +17,6 @@ struct UpcomingEventCardButton: View {
                     Text(event.title)
                         .font(.system(size: 17, weight: .medium))
                         .foregroundColor(.onSurface)
-                        .lineLimit(1)
                         .truncationMode(.tail)
                 }
                 HStack {
diff --git a/App/Presentation/Views/Bookmarks/EventDetails/EventDetailsBody.swift b/App/Presentation/Views/Bookmarks/EventDetails/EventDetailsBody.swift
@@ -54,7 +54,7 @@ struct EventDetailsBody: View {
             DetailsBuilder(title: NSLocalizedString("Locations", comment: ""), image: "mappin.and.ellipse") {
                 if event.locations.count > 0 {
                     HStack {
-                        VStack {
+                        VStack(alignment: .leading) {
                             ForEach(event.locations, id: \.self) { location in
                                 Text(location.locationId.capitalized)
                                     .font(.system(size: 16))
diff --git a/App/Presentation/Views/Buttons/CloseCoverButton.swift b/App/Presentation/Views/Buttons/CloseCoverButton.swift
@@ -13,11 +13,13 @@ struct CloseCoverButton: View {
     
     var body: some View {
         Button(action: onClick, label: {
-            Image(systemName: "xmark")
-                .foregroundColor(.onBackground)
-                .font(.system(size: 24, weight: .medium))
+            Image(systemName: "xmark.circle.fill")
+                .foregroundColor(.onBackground.opacity(0.6))
+                .font(.system(size: 28, weight: .medium))
+                .symbolRenderingMode(.hierarchical)
         })
-        .padding()
+        .padding(.trailing, Spacing.medium)
+        .padding(.top, Spacing.small)
     }
 }
 
diff --git a/App/Presentation/Views/General/SearchField.swift b/App/Presentation/Views/General/SearchField.swift
@@ -45,6 +45,7 @@ struct SearchField: View {
                     }
                     .buttonStyle(SearchMenuActionStyle())
                 }
+                .transition(AnyTransition.move(edge: .trailing).combined(with: .opacity))
             }
         }
     }
diff --git a/App/Presentation/Views/Home/Available/NextClass.swift b/App/Presentation/Views/Home/Available/NextClass.swift
@@ -14,15 +14,15 @@ struct NextClass: View {
     var body: some View {
         VStack(alignment: .leading, spacing: Spacing.medium) {
             HStack {
+                Text(NSLocalizedString("Next class", comment: ""))
+                    .font(.system(size: 18, weight: .semibold))
+                    .foregroundColor(.onBackground)
+                Spacer()
                 if let nextClass = nextClass {
                     Text(nextClass.from.formatDate() ?? "")
                         .font(.system(size: 16, weight: .medium))
                         .foregroundColor(.gray)
                 }
-                Spacer()
-                Text(NSLocalizedString("Next class", comment: ""))
-                    .font(.system(size: 18, weight: .semibold))
-                    .foregroundColor(.onBackground)
             }
             if let nextClass = nextClass, let course = nextClass.course {
                 let color: Color = course.color.toColor()
diff --git a/App/Presentation/Views/Home/Available/NextLocation.swift b/App/Presentation/Views/Home/Available/NextLocation.swift
@@ -13,6 +13,7 @@ struct NextLocation: View {
     
     var body: some View {
         Button(action: {
+            HapticsController.triggerHapticLight()
             sheetOpen = true
         }, label: {
             HStack(alignment: .center) {
diff --git a/App/Presentation/Views/Search/Preview/BookmarkButton.swift b/App/Presentation/Views/Search/Preview/BookmarkButton.swift
@@ -51,6 +51,7 @@ struct BookmarkButton: View {
             }
         }
         .buttonStyle(PillStyle(color: .primary))
-        .padding(Spacing.medium)
+        .padding(.leading, Spacing.medium)
+        .padding(.top, Spacing.extraSmall)
     }
 }
diff --git a/App/Presentation/Views/Search/Preview/SearchPreviewList.swift b/App/Presentation/Views/Search/Preview/SearchPreviewList.swift
@@ -38,8 +38,10 @@ struct SearchPreviewList: View {
                     }
                 }
             }
-            .padding(.horizontal, Spacing.medium)
         }
+        .cornerRadius(15)
+        .padding(.horizontal, Spacing.medium)
+        .ignoresSafeArea()
     }
     
     func createDays() -> [Response.Day]? {
diff --git a/Assets/ru.lproj/Localizable.strings b/Assets/ru.lproj/Localizable.strings
@@ -392,7 +392,7 @@
 
 "Failed to book the specified resource"="Не удалось забронировать выбранный ресурс";
 
-"Rooms"="Комныты";
+"Rooms"="Комнаты";
 
 "No name"="Нет имени";
 

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ extension View {`
`33`	`33`
`34`	`34`	`func searchBox() -> some View {`
`35`	`35`	`padding(10)`
`36`		`- .background(Color.gray.opacity(0.3))`
	`36`	`+ .background(Color.gray.opacity(0.2))`
`37`	`37`	`.cornerRadius(10)`
`38`	`38`	`}`
`39`	`39`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ struct EventCardButton: View {`
`25`	`25`	`Text(event.title ?? NSLocalizedString("No title", comment: ""))`
`26`	`26`	`.font(.system(size: 17, weight: .medium))`
`27`	`27`	`.foregroundColor(.onSurface)`
`28`		`- .lineLimit(1)`
`29`	`28`	`.truncationMode(.tail)`
`30`	`29`	`}`
`31`	`30`	`HStack {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ struct UpcomingEventCardButton: View {`
`17`	`17`	`Text(event.title)`
`18`	`18`	`.font(.system(size: 17, weight: .medium))`
`19`	`19`	`.foregroundColor(.onSurface)`
`20`		`- .lineLimit(1)`
`21`	`20`	`.truncationMode(.tail)`
`22`	`21`	`}`
`23`	`22`	`HStack {`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ struct SearchField: View {`
`45`	`45`	`}`
`46`	`46`	`.buttonStyle(SearchMenuActionStyle())`
`47`	`47`	`}`
	`48`	`+ .transition(AnyTransition.move(edge: .trailing).combined(with: .opacity))`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ struct BookmarkButton: View {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`.buttonStyle(PillStyle(color: .primary))`
`54`		`- .padding(Spacing.medium)`
	`54`	`+ .padding(.leading, Spacing.medium)`
	`55`	`+ .padding(.top, Spacing.extraSmall)`
`55`	`56`	`}`
`56`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,10 @@ struct SearchPreviewList: View {`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
`41`		`- .padding(.horizontal, Spacing.medium)`
`42`	`41`	`}`
	`42`	`+ .cornerRadius(15)`
	`43`	`+ .padding(.horizontal, Spacing.medium)`
	`44`	`+ .ignoresSafeArea()`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`func createDays() -> [Response.Day]? {`