diff --git a/Shapy.xcodeproj/project.xcworkspace/xcuserdata/damienrifflart.xcuserdatad/UserInterfaceState.xcuserstate b/Shapy.xcodeproj/project.xcworkspace/xcuserdata/damienrifflart.xcuserdatad/UserInterfaceState.xcuserstate index 8b889b0..f8f48c1 100644 Binary files a/Shapy.xcodeproj/project.xcworkspace/xcuserdata/damienrifflart.xcuserdatad/UserInterfaceState.xcuserstate and b/Shapy.xcodeproj/project.xcworkspace/xcuserdata/damienrifflart.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Shapy/LandingView.swift b/Shapy/LandingView.swift index aa7b612..16d2775 100644 --- a/Shapy/LandingView.swift +++ b/Shapy/LandingView.swift @@ -27,10 +27,23 @@ struct LandingView: View { Spacer() // Title Text - Text("Bienvenue") - .foregroundColor(Color.white) - .font(.system(size: 50)) - .padding(.top, 150) + HStack{ + Spacer() + Text("v0.8") + .foregroundColor(Color.gray.opacity(0.5)) + .font(.system(size:25)) + .padding(.top,150) + Spacer() + + Text("Bienvenue") + .foregroundColor(Color.white) + .font(.system(size: 50)) + .padding(.top, 150) + .padding(.trailing, 60) + + Spacer() + + } Text("Damien") .foregroundColor(Color(hex: 0xE6D2F7)) diff --git a/Shapy/SettingsView.swift b/Shapy/SettingsView.swift index b44ff99..6e747a9 100644 --- a/Shapy/SettingsView.swift +++ b/Shapy/SettingsView.swift @@ -28,7 +28,7 @@ struct SettingsView: View { // Back Button Button(action: { isLandingViewActive.toggle() }) { Text("Retour") - .font(.system(size: 30, weight: .bold)) + .font(.system(size: 27, weight: .semibold)) .foregroundColor(Color(hex: 0x0E0215)) .padding() .frame(width: 130, height:60) @@ -42,7 +42,7 @@ struct SettingsView: View { // Save Button Button(action: { saveButton() }) { Text("Enregistrer") - .font(.system(size: 30, weight: .bold)) + .font(.system(size: 27, weight: .semibold)) .foregroundColor(Color(hex: 0x0E0215)) .padding() .frame(width: 188, height:60) @@ -82,7 +82,7 @@ struct SettingsView: View { .padding(.leading, 40.0) .frame(maxWidth: .infinity, alignment: .leading) - TextField(" 15 Pompes", text: $exerciceTwoInput) + TextField(" 25 Abdos", text: $exerciceTwoInput) .background(Color.gray.opacity(0.2)) .foregroundColor(Color(hex: 0xE6D2F7)) .frame(width: 300) @@ -99,7 +99,7 @@ struct SettingsView: View { .padding(.leading, 40.0) .frame(maxWidth: .infinity, alignment: .leading) - TextField(" 15 Pompes", text: $exerciceThreeInput) + TextField(" 10 Fentes", text: $exerciceThreeInput) .background(Color.gray.opacity(0.2)) .foregroundColor(Color(hex: 0xE6D2F7)) .frame(width: 300) @@ -116,7 +116,7 @@ struct SettingsView: View { .padding(.leading, 40.0) .frame(maxWidth: .infinity, alignment: .leading) - TextField(" 15 Pompes", text: $exerciceFourInput) + TextField(" 5 Squats", text: $exerciceFourInput) .background(Color.gray.opacity(0.2)) .foregroundColor(Color(hex: 0xE6D2F7)) .frame(width: 300)