Skip to content

Commit

Permalink
fixup! Convert ConfirmationView form UIKit to SwiftUI
Browse files Browse the repository at this point in the history
This PR is experimental, yet important first step towards transitioning
to SwiftUI. ConfirmationView has been rewritten entirely in SwiftUI. The
primary motivator for this PR was the frustrating nature of UIKit constraints.

Key factors to keep in mind while reviewing:

1. Checkmark image has been made smaller, which was the request from the
design team

2. UIFont does not translate 1:1 to SwiftUI Font, meaning the same font
looks just a little big different now. But dynamic scaling works, and all
our default fonts translate to expected outcome (font size, weight etc.)

3. Some approaches used in view layouts is due to the restrictions of
SwiftUI 1.0 capabilities. Those can and will be upgraded in the future

4. The naming of Views, and Objects, as well as file locations in the
directory are up for discussion. Everyone's input is much appreciated.

5. Prefix SwiftUI is used in lots of places due to a conflict with existing
custom objects Button and Image

6. New HeaderSwiftUI view does not include all the possible configuration
possibilities, as confirmations view's needs are not very demanding. So,
that view can be upgraded in future.

This PR also covers the ticket MOB-2488 which focuses on ADA-compliance
in ConfigurationsView
  • Loading branch information
rasmustautsglia committed Sep 15, 2023
1 parent 5051718 commit 5e700f7
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Foundation

extension SecureConversations.ConfirmationViewSwiftUI {
class Model: ObservableObject {
final class Model: ObservableObject {
let orientation: OrientationManager
let style: SecureConversations.ConfirmationStyle
var delegate: ((DelegateEvent) -> Void)?
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ struct ActionButtonSwiftUI: View {
}

extension ActionButtonSwiftUI {
class Model: ObservableObject {
final class Model: ObservableObject {
let style: ActionButtonStyle
let height: CGFloat
let tap: Cmd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ struct HeaderButtonSwiftUI: View {
}

extension HeaderButtonSwiftUI {
class Model: ObservableObject {
final class Model: ObservableObject {
var tap: Cmd
var style: HeaderButtonStyle
var size: CGSize
Expand Down
2 changes: 1 addition & 1 deletion GliaWidgets/SwiftUI/Components/Header/HeaderSwiftUI.swift
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ struct HeaderSwiftUI: View {
}

extension HeaderSwiftUI {
class Model: ObservableObject {
final class Model: ObservableObject {
let title: String
let effect: Effect
let endButton: ActionButtonSwiftUI.Model
Expand Down

0 comments on commit 5e700f7

Please sign in to comment.