Update rows for UversizeUI 3.0

oversizedev · Jun 29, 2023 · 2cf0dca · 2cf0dca
1 parent 89a7561
commit 2cf0dca
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 80 deletions.
diff --git a/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventView.swift b/Sources/OversizeCalendarKit/CreateEventScreen/CreateEventView.swift
@@ -33,28 +33,25 @@ public struct CreateEventView: View {
             })
         }
         .trailingBar {
-            if viewModel.title.isEmpty {
-                BarButton(.disabled(L10n.Button.save))
-            } else {
-                BarButton(.accent(L10n.Button.save, action: {
-                    switch viewModel.type {
-                    case .new:
+            BarButton(.accent(L10n.Button.save, action: {
+                switch viewModel.type {
+                case .new:
+                    Task {
+                        _ = await viewModel.save()
+                        dismiss()
+                    }
+                case .update:
+                    if viewModel.span == nil, viewModel.repitRule != .never {
+                        viewModel.present(.span)
+                    } else {
                         Task {
                             _ = await viewModel.save()
                             dismiss()
                         }
-                    case .update:
-                        if viewModel.span == nil, viewModel.repitRule != .never {
-                            viewModel.present(.span)
-                        } else {
-                            Task {
-                                _ = await viewModel.save()
-                                dismiss()
-                            }
-                        }
                     }
-                }))
-            }
+                }
+            }))
+            .disabled(viewModel.title.isEmpty)
         }
         .titleLabel {
             Button { viewModel.present(.calendar) } label: {

diff --git a/Sources/OversizeCalendarKit/Pickers/RepeatPicker.swift b/Sources/OversizeCalendarKit/Pickers/RepeatPicker.swift
@@ -82,15 +82,12 @@ public struct RepeatPicker: View {
                 BarButton(.close)
             }
             .trailingBar {
-                if rule == .never {
-                    BarButton(.disabled("Done"))
-                } else {
-                    BarButton(.accent("Done", action: {
-                        selectionRule = rule
-                        selectionEndRule = endRule
-                        dismiss()
-                    }))
-                }
+                BarButton(.accent("Done", action: {
+                    selectionRule = rule
+                    selectionEndRule = endRule
+                    dismiss()
+                }))
+                .disabled(rule == .never)
             }
             .surfaceContentRowInsets()
         }

diff --git a/Sources/OversizeContactsKit/AttendeesList/AttendeesView.swift b/Sources/OversizeContactsKit/AttendeesList/AttendeesView.swift
@@ -52,17 +52,15 @@ public struct AttendeesView: View {
         if let attendees = viewModel.event.attendees {
             VStack(spacing: .zero) {
                 if let organizer = viewModel.event.organizer {
-                    Row(organizer.name ?? organizer.url.absoluteString, subtitle: "Organizer")
-                        .rowLeading(.view(AnyView(
-                            userAvatarView(participant: organizer)
-                        )))
+                    Row(organizer.name ?? organizer.url.absoluteString, subtitle: "Organizer") {
+                        userAvatarView(participant: organizer)
+                    }
                 }
 
                 ForEach(attendees, id: \.self) { attender in
-                    Row(attender.name ?? attender.url.absoluteString, subtitle: attender.participantRole.title)
-                        .rowLeading(.view(AnyView(
-                            userAvatarView(participant: attender)
-                        )))
+                    Row(attender.name ?? attender.url.absoluteString, subtitle: attender.participantRole.title) {
+                        userAvatarView(participant: attender)
+                    }
                 }
             }
         }
@@ -83,7 +81,7 @@ public struct AttendeesView: View {
                             .fillBackgroundPrimary()
                     }
                 Image(systemName: participant.symbolName)
-                    .foregroundOnPrimaryHighEmphasis()
+                    .onPrimaryHighEmphasisForegroundColor()
                     .font(.system(size: 9, weight: .black))
             }
         }

diff --git a/Sources/OversizeContactsKit/ContactsLists/ContactsListsView.swift b/Sources/OversizeContactsKit/ContactsLists/ContactsListsView.swift
@@ -56,8 +56,9 @@ public struct ContactsListsView: View {
                     }
                 }
             } else {
-                Row(email)
-                    .rowLeading(.avatar(Avatar(firstName: email)))
+                Row(email) {
+                    Avatar(firstName: email)
+                }
             }
         }
     }
@@ -66,19 +67,22 @@ public struct ContactsListsView: View {
     private func emailRow(email: CNLabeledValue<NSString>, contact: CNContact) -> some View {
         let email = email.value as String
         if let avatarThumbnailData = contact.thumbnailImageData, let avatarThumbnail = UIImage(data: avatarThumbnailData) {
-            Row(contact.givenName + " " + contact.familyName, subtitle: email)
-                .rowLeading(.avatar(Avatar(firstName: contact.givenName, lastName: contact.familyName, avatar: Image(uiImage: avatarThumbnail))))
+            Row(contact.givenName + " " + contact.familyName, subtitle: email) {
+                Avatar(firstName: contact.givenName, lastName: contact.familyName, avatar: Image(uiImage: avatarThumbnail))
+            }
         } else {
-            Row(contact.givenName + " " + contact.familyName, subtitle: email)
-                .rowLeading(.avatar(Avatar(firstName: contact.givenName, lastName: contact.familyName)))
+            Row(contact.givenName + " " + contact.familyName, subtitle: email) {
+                Avatar(firstName: contact.givenName, lastName: contact.familyName)
+            }
         }
     }
 
     @ViewBuilder
     private func placeholder() -> some View {
         ForEach(emails, id: \.self) { email in
-            Row(email)
-                .rowLeading(.avatar(Avatar(firstName: email)))
+            Row(email) {
+                Avatar(firstName: email)
+            }
         }
     }
 }
diff --git a/Sources/OversizeContactsKit/ContactsPicker/EmailPickerView.swift b/Sources/OversizeContactsKit/ContactsPicker/EmailPickerView.swift
@@ -41,13 +41,10 @@ public struct EmailPickerView: View {
             BarButton(.close)
         }
         .trailingBar {
-            if selectedEmails.isEmpty, !viewModel.searchText.isEmail {
-                BarButton(.disabled("Done"))
-            } else {
-                BarButton(.accent("Done", action: {
-                    onDoneAction()
-                }))
-            }
+            BarButton(.accent("Done", action: {
+                onDoneAction()
+            }))
+            .disabled(selectedEmails.isEmpty && !viewModel.searchText.isEmail)
         }
         .topToolbar {
             TextField("Email or name", text: $viewModel.searchText)
@@ -77,10 +74,15 @@ public struct EmailPickerView: View {
     @ViewBuilder
     private func newEmailView() -> some View {
         if !viewModel.searchText.isEmpty {
-            Row(viewModel.searchText, subtitle: "New member")
-                .rowLeading(.avatar(Avatar(firstName: viewModel.searchText)))
-                .rowTrailing(.checkbox(isOn: .constant(viewModel.searchText.isEmail)))
-                .padding(.bottom, .small)
+            Checkbox(
+                isOn: .constant(viewModel.searchText.isEmail),
+                label: {
+                    Row(viewModel.searchText, subtitle: "New member") {
+                        Avatar(firstName: viewModel.searchText)
+                    }
+                }
+            )
+            .padding(.bottom, .small)
         }
     }
 
@@ -92,7 +94,7 @@ public struct EmailPickerView: View {
                 Spacer()
             }
             .title3()
-            .foregroundOnSurfaceMediumEmphasis()
+            .onSurfaceMediumEmphasisForegroundColor()
             .padding(.vertical, .xxSmall)
             .paddingContent(.horizontal)
 
@@ -106,11 +108,17 @@ public struct EmailPickerView: View {
                     }
                 } else {
                     let isSelected = selectedEmails.contains(email)
-                    Row(email) {
-                        onContactClick(email: email)
-                    }
-                    .rowLeading(.avatar(Avatar(firstName: email)))
-                    .rowTrailing(.checkbox(isOn: .constant(isSelected)))
+                    Checkbox(
+                        isOn: Binding(
+                            get: { isSelected },
+                            set: { _ in onContactClick(email: email) }
+                        ),
+                        label: {
+                            Row(email) {
+                                Avatar(firstName: email)
+                            }
+                        }
+                    )
                 }
             }
         }
@@ -145,17 +153,25 @@ public struct EmailPickerView: View {
         let email = email.value as String
         let isSelected = selectedEmails.contains(email)
         if let avatarThumbnailData = contact.thumbnailImageData, let avatarThumbnail = UIImage(data: avatarThumbnailData) {
-            Row(contact.givenName + " " + contact.familyName, subtitle: email) {
-                onContactClick(email: email)
-            }
-            .rowLeading(.avatar(Avatar(firstName: contact.givenName, lastName: contact.familyName, avatar: Image(uiImage: avatarThumbnail))))
-            .rowTrailing(.checkbox(isOn: .constant(isSelected)))
+            Checkbox(isOn: Binding(
+                get: { isSelected },
+                set: { _ in onContactClick(email: email) }
+            ), label: {
+                Row(contact.givenName + " " + contact.familyName, subtitle: email) {
+                    Avatar(firstName: contact.givenName, lastName: contact.familyName, avatar: Image(uiImage: avatarThumbnail))
+                }
+
+            })
         } else {
-            Row(contact.givenName + " " + contact.familyName, subtitle: email) {
-                onContactClick(email: email)
-            }
-            .rowLeading(.avatar(Avatar(firstName: contact.givenName, lastName: contact.familyName)))
-            .rowTrailing(.checkbox(isOn: .constant(isSelected)))
+            Checkbox(isOn: Binding(
+                get: { isSelected },
+                set: { _ in onContactClick(email: email) }
+            ), label: {
+                Row(contact.givenName + " " + contact.familyName, subtitle: email) {
+                    Avatar(firstName: contact.givenName, lastName: contact.familyName)
+                }
+
+            })
         }
     }
 

diff --git a/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift b/Sources/OversizeKit/SettingsKit/Views/Apperance/AppearanceSettingView.swift
@@ -233,21 +233,15 @@ import SwiftUI
                         .premium()
                         .onPremiumTap()
 
-                        //Switch(isOn: theme.$borderApp) {
+                        Switch(isOn: theme.$borderApp) {
                             Row("Borders") {
                                 pageDestenation = .border
                             } leading: {
                                 borderIcon
-                            } trailing: {
-                                Toggle("", isOn: theme.$borderApp)
-                                    .labelsHidden()
-                                    .disabled(!isPremium)
                             }
                             .premium()
-                            .onPremiumTap()
-
-                       // }
-
+                        }
+                        .onPremiumTap()
 //                        Row("Borders", leadingType: .image(borderIcon), trallingType: .toggleWithArrowButton(isOn: theme.$borderApp, action: {
 //                            pageDestenation = .border
 //                        })) {

diff --git a/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift b/Sources/OversizeKit/SettingsKit/Views/Security/SecuritySettingsView.swift
@@ -138,7 +138,6 @@ import SwiftUI
                         Switch(isOn: $settingsService.blurMinimizeEnabend) {
                             Row(L10n.Security.blurMinimize)
                                 .premium()
-
                         }
                         .onPremiumTap()
                     }