Skip to content

Commit 2089af8

Browse files
Design tweaks
1 parent 69ec53c commit 2089af8

File tree

3 files changed

+16
-14
lines changed

3 files changed

+16
-14
lines changed

Sources/SprenUI/UI/Screens/Flows/BodyComp/BodyCompResults/BodyCompResults.swift

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,19 @@ struct BodyCompResults: View {
3535
VStack(spacing: Autoscale.convert(16)) {
3636
HStack(spacing: Autoscale.convert(16)) {
3737
Box(title: "Body Fat", number: bodyCompResponse.bodyFat.value, metric: "%", status: bodyCompResponse.bodyFat.status, errorDescription: bodyCompResponse.bodyFat.errorDescription)
38-
39-
Box(title: "Gynoid Fat", number: UserData.default.convertToMetricIfNeeded(lbsOrKg: bodyCompResponse.gynoidFat.value), metric: weightLabel, status: bodyCompResponse.gynoidFat.status, errorDescription: bodyCompResponse.gynoidFat.errorDescription)
38+
39+
Box(title: "Lean Mass", number: UserData.default.convertToMetricIfNeeded(lbsOrKg:bodyCompResponse.leanMass.value), metric: weightLabel, status: bodyCompResponse.leanMass.status, errorDescription: bodyCompResponse.leanMass.errorDescription)
4040
}
4141

4242
HStack(spacing: Autoscale.convert(16)) {
4343
Box(title: "Fat Mass", number: UserData.default.convertToMetricIfNeeded(lbsOrKg: bodyCompResponse.fatMass.value), metric: weightLabel, status: bodyCompResponse.fatMass.status, errorDescription: bodyCompResponse.fatMass.errorDescription)
44+
45+
Box(title: "Weight", number: UserData.default.weight, metric: weightLabel, status: StatusValue.Status.complete, errorDescription: nil)
4446
}
4547

4648
HStack(spacing: Autoscale.convert(16)) {
4749
Box(title: "Android Fat", number: UserData.default.convertToMetricIfNeeded(lbsOrKg: bodyCompResponse.androidFat.value), metric: weightLabel, status: bodyCompResponse.androidFat.status, errorDescription: bodyCompResponse.androidFat.errorDescription)
48-
50+
4951
Box(title: "Gynoid Fat", number: UserData.default.convertToMetricIfNeeded(lbsOrKg: bodyCompResponse.gynoidFat.value), metric: weightLabel, status: bodyCompResponse.gynoidFat.status, errorDescription: bodyCompResponse.gynoidFat.errorDescription)
5052
}
5153

@@ -58,15 +60,15 @@ struct BodyCompResults: View {
5860

5961
Spacer().frame(height: Autoscale.convert(50))
6062

61-
ResultsTitle(text: "Additional metrics available to your users when demographic information is provided", lines: 3)
62-
63-
text
64-
65-
HStack(spacing: Autoscale.convert(16)) {
66-
Box(title: "Metabolic Rate", number: 1.168, metric: "kCal", status: StatusValue.Status.complete)
67-
68-
Box(title: "Body Fat", number: 25, metric: "%", status: StatusValue.Status.complete)
69-
}.padding(.top, Autoscale.convert(24))
63+
// ResultsTitle(text: "Additional metrics available to your users when demographic information is provided", lines: 3)
64+
//
65+
// text
66+
//
67+
// HStack(spacing: Autoscale.convert(16)) {
68+
// Box(title: "Metabolic Rate", number: 1.168, metric: "kCal", status: StatusValue.Status.complete)
69+
//
70+
// Box(title: "Body Fat", number: 25, metric: "%", status: StatusValue.Status.complete)
71+
// }.padding(.top, Autoscale.convert(24))
7072

7173
Spacer().frame(height: Autoscale.convert(80))
7274

Sources/SprenUI/UI/Screens/Flows/BodyComp/BodyCompResults/Box.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct Box: View {
4444

4545
HStack(alignment: .bottom) {
4646
if let number = self.number {
47-
Text(String(format: "%.2f", number))
47+
Text(String(format: "%.1f", number))
4848
.foregroundColor(getColor(colorScheme: colorScheme, light: .sprenBodyCompBlackLight, dark: .sprenBodyCompBlackDark))
4949
.font(.sprenBoldNumber)
5050
.lineLimit(1)

Sources/SprenUI/UI/Screens/Flows/BodyComp/CameraScreen/CameraScreen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ struct CameraScreen: View {
1616
@Environment(\.rootPresentationMode) private var rootPresentationMode: Binding<RootPresentationMode>
1717

1818
@State private var isTimerOpen = false
19-
@State private var infoTimer = 3
19+
@State private var infoTimer = 5
2020
@State private var navigateTo: String?
2121
@State private var selectedImage: UIImage?
2222
@State private var currentFrame: UIImage?

0 commit comments

Comments
 (0)