selim/AutoCat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing VIN keyboard

Browse Source
This commit is contained in:
Selim Mustafaev 2025-05-27 22:31:59 +03:00
parent 8a875ab7a1
commit fe46f42fea
3 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AutoCat/Screens/MainScreen/MainTabScreen.swift
View File

@ -114,7 +114,7 @@ struct MainTabScreen: View {
) )
} }
} }
.presentationDetents([.height(350)]) .presentationDetents([.height(390)])
} }
func checkRecord(number: String, event: VehicleEventDto?) { func checkRecord(number: String, event: VehicleEventDto?) {

2
AutoCat/SwiftUI/NumberEditView/ACVinKeyboardView.swift
View File

@ -13,7 +13,7 @@ struct ACVinKeyboardView: View {
let buttonPressed: (PNButtonType) -> Void let buttonPressed: (PNButtonType) -> Void
var body: some View { var body: some View {
ProportionalHStack(widthWeights: [2/3, 1/3], spacing: 16) { ProportionalHStack(widthWeights: [2/3, 1/3], spacing: 8) {
Grid(horizontalSpacing: 0, verticalSpacing: 0) { Grid(horizontalSpacing: 0, verticalSpacing: 0) {
GridRow { GridRow {
ACKeyboardButton(type: .vin("A"), onTap: buttonPressed) ACKeyboardButton(type: .vin("A"), onTap: buttonPressed)

14
AutoCat/SwiftUI/ProportionalHStack.swift
View File

@ -18,19 +18,11 @@ struct ProportionalHStack: Layout {
} }
func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize { func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) -> CGSize {
let maxHeight = subviews
.map { proxy in return CGSize(width: proposal.width ?? .zero, height: proposal.height ?? .zero)
return proxy.sizeThatFits(.unspecified).height
}
.max() ?? .zero
return CGSize(width: proposal.width ?? .zero, height: maxHeight)
} }
func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) { func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout ()) {
let subviewSizes = subviews.map { proxy in
return proxy.sizeThatFits(.infinity)
}
var x = bounds.minX var x = bounds.minX
let y = bounds.minY let y = bounds.minY
@ -40,7 +32,7 @@ struct ProportionalHStack: Layout {
let widthWeight = widthWeights[index] let widthWeight = widthWeights[index]
let proposedWidth = widthWeight * parentTotalWith let proposedWidth = widthWeight * parentTotalWith
let sizeProposal = ProposedViewSize(width: proposedWidth, height: subviewSizes[index].height) let sizeProposal = ProposedViewSize(width: proposedWidth, height: proposal.height)
subviews[index] subviews[index]
.place( .place(