Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solve UI scaling problems #2327

Merged
merged 1 commit into from
Jan 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions LocalPackages/DuckUI/Sources/DuckUI/Button.swift
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ public struct PrimaryButtonStyle: ButtonStyle {
let foregroundColor = disabled ? disabledForegroundColor : standardForegroundColor

configuration.label
.fixedSize(horizontal: false, vertical: true)
.multilineTextAlignment(.center)
.lineLimit(nil)
.font(Font(UIFont.boldAppFont(ofSize: compact ? Consts.fontSize - 1 : Consts.fontSize)))
.foregroundColor(configuration.isPressed ? standardForegroundColor.opacity(Consts.pressedOpacity) : foregroundColor)
.padding()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,15 @@ public struct CameraView: View {

Text(UserText.cameraPermissionRequired)
.daxTitle3()
.multilineTextAlignment(.center)
.fixedSize(horizontal: false, vertical: true)
.lineSpacing(1.05)
.padding(.bottom, 8)

Text(UserText.cameraPermissionInstructions)
.lineLimit(nil)
.multilineTextAlignment(.center)
.fixedSize(horizontal: false, vertical: true)
.daxBodyRegular()
.lineSpacing(1.1)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public struct RecoverSyncedDataView: View {
.buttonStyle(PrimaryButtonStyle())
.frame(maxWidth: 360)
.padding(.horizontal, 30)
.padding(.bottom, 8)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public struct SaveRecoveryKeyView: View {
: nil
)
.padding(.horizontal, 20)
.padding(.bottom, 8)
}

@ViewBuilder
Expand Down
78 changes: 50 additions & 28 deletions LocalPackages/SyncUI/Sources/SyncUI/Views/ScanOrPasteCodeView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,24 +31,29 @@ public struct ScanOrSeeCode: View {
}

public var body: some View {
VStack(spacing: 10) {
VStack(spacing: 10) {
titleView()
CameraView(model: model)
}
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(UserText.cancelButton, action: model.cancel)
.foregroundColor(Color.white)
GeometryReader { geometry in
ScrollView {
VStack(spacing: 10) {
let heightFactor = geometry.size.width < 380 ? 1 : 0.84
titleView()
CameraView(model: model)
.frame(width: geometry.size.width)
.frame(minHeight: geometry.size.width * heightFactor)
qrCodeView(width: geometry.size.width)
}
ToolbarItem(placement: .navigationBarTrailing) {
NavigationLink(UserText.scanOrSeeCodeManuallyEnterCodeLink, destination: {
PasteCodeView(model: model)
})
.foregroundColor(Color(designSystemColor: .accent))
.toolbar {
ToolbarItem(placement: .navigationBarLeading) {
Button(UserText.cancelButton, action: model.cancel)
.foregroundColor(Color.white)
}
ToolbarItem(placement: .navigationBarTrailing) {
NavigationLink(UserText.scanOrSeeCodeManuallyEnterCodeLink, destination: {
PasteCodeView(model: model)
})
.foregroundColor(Color(designSystemColor: .accent))
}
}
}
qrCodeView()
}
}

Expand Down Expand Up @@ -85,15 +90,23 @@ public struct ScanOrSeeCode: View {


@ViewBuilder
func qrCodeView() -> some View {
func qrCodeView(width: CGFloat) -> some View {
var maxWidth: CGFloat {
let basedOnScreenWidth = (width - 70) / 3 * 2
if width < 390 {
return basedOnScreenWidth
}
return 180
}
VStack(spacing: 8) {
HStack(alignment: .top, spacing: 20) {
QRCodeView(string: qrCodeModel.code ?? "", size: 120)
VStack(alignment: .leading, spacing: 10) {
HStack {
Text(UserText.scanOrSeeCodeScanCodeInstructionsTitle)
.daxBodyBold()
.fixedSize()
.fixedSize(horizontal: false, vertical: true)
.multilineTextAlignment(.leading)
Spacer()
Image("SyncDeviceType_phone")
.padding(2)
Expand All @@ -107,24 +120,17 @@ public struct ScanOrSeeCode: View {
.fixedSize(horizontal: false, vertical: true)
.multilineTextAlignment(.leading)
}
.frame(maxWidth: maxWidth)
}
.frame(width: width)
.padding(20)
.background(
RoundedRectangle(cornerRadius: 8)
.fill(Color(designSystemColor: .panel))
.frame(width: width - 20)
)
.padding(20)
HStack {
Text(UserText.scanOrSeeCodeFooter)
HStack(alignment: .center) {
Text(UserText.scanOrSeeCodeShareCodeLink)
.foregroundColor(Color(designSystemColor: .accent))
.onTapGesture {
model.showShareCodeSheet()
}
Image("Arrow-Circle-Right-12")
}
}
cantScanView()
}
.padding(.bottom, 40)
.onAppear {
Expand All @@ -134,5 +140,21 @@ public struct ScanOrSeeCode: View {
self.qrCodeModel = model.startConnectMode()
}
}
.frame(width: width)
}

@ViewBuilder
func cantScanView() -> some View {
HStack {
Text(UserText.scanOrSeeCodeFooter)
HStack(alignment: .center) {
Text(UserText.scanOrSeeCodeShareCodeLink)
.foregroundColor(Color(designSystemColor: .accent))
.onTapGesture {
model.showShareCodeSheet()
}
Image("Arrow-Circle-Right-12")
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ public struct SyncWithServerView: View {
.buttonStyle(PrimaryButtonStyle())
.frame(maxWidth: 360)
.padding(.horizontal, 30)
.padding(.bottom, 8)
Text(UserText.connectWithServerSheetFooter)
.daxFootnoteRegular()
.foregroundColor(Color(designSystemColor: .textSecondary))
Expand Down
Loading