From 4a4211f58374a4aa0c1945011ecb378619d41a66 Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Wed, 22 May 2024 21:22:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=2010=E5=95=8F=E5=9B=9E=E7=AD=94?= =?UTF-8?q?=E5=BE=8C=E3=81=AB=E3=82=A2=E3=83=A9=E3=83=BC=E3=83=88=E3=82=92?= =?UTF-8?q?=E5=87=BA=E3=81=99=E3=82=88=E3=81=86=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrimePickApp/QuizButtonView.swift | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/PrimePickApp/QuizButtonView.swift b/PrimePickApp/QuizButtonView.swift index c91ccee..dbad860 100644 --- a/PrimePickApp/QuizButtonView.swift +++ b/PrimePickApp/QuizButtonView.swift @@ -10,6 +10,7 @@ import SwiftUI struct QuizButtonView: View { var quizData: [PrimeQuizEntity] @Binding var quizNumber: Int + @State private var showAlert = false var body: some View { ZStack { @@ -37,6 +38,8 @@ struct QuizButtonView: View { if quizNumber < 9 { quizNumber += 1 } + } else { + showAlert = true } } @@ -63,11 +66,19 @@ struct QuizButtonView: View { if quizNumber < 9 { quizNumber += 1 } + } else { + showAlert = true } } Spacer() } } + .alert(isPresented: $showAlert) { + Alert( + title: Text("アラート"), + dismissButton: .default(Text("OK")) + ) + } } } From eeefabff64b9995ce06ef29c9d00933936eeadec Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Wed, 22 May 2024 21:26:58 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[feat]=20=E3=82=B9=E3=82=B3=E3=82=A2?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE?= =?UTF-8?q?=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrimePickApp/QuizButtonView.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PrimePickApp/QuizButtonView.swift b/PrimePickApp/QuizButtonView.swift index dbad860..62fdba9 100644 --- a/PrimePickApp/QuizButtonView.swift +++ b/PrimePickApp/QuizButtonView.swift @@ -9,6 +9,7 @@ import SwiftUI struct QuizButtonView: View { var quizData: [PrimeQuizEntity] + @State private var correctQuizNumber: Int = 0 @Binding var quizNumber: Int @State private var showAlert = false @@ -31,6 +32,7 @@ struct QuizButtonView: View { print("❌") if !quizData[quizNumber].isCorrect { print("正解") + correctQuizNumber += 1 } else { print("不正解") } @@ -59,6 +61,7 @@ struct QuizButtonView: View { print("✅") if quizData[quizNumber].isCorrect { print("正解") + correctQuizNumber += 1 } else { print("不正解") } @@ -76,7 +79,7 @@ struct QuizButtonView: View { } .alert(isPresented: $showAlert) { Alert( - title: Text("アラート"), + title: Text("You Score is \(correctQuizNumber) points!"), dismissButton: .default(Text("OK")) ) } From 22c9772b39ad414f2ea8117ed14761f62c4b052f Mon Sep 17 00:00:00 2001 From: Takumi Muraishi Date: Wed, 22 May 2024 21:50:35 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[feat]=20=E5=95=8F=E9=A1=8C=E7=B5=82?= =?UTF-8?q?=E4=BA=86=E3=81=AEdismiss=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PrimePickApp/QuizButtonView.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PrimePickApp/QuizButtonView.swift b/PrimePickApp/QuizButtonView.swift index 62fdba9..0109288 100644 --- a/PrimePickApp/QuizButtonView.swift +++ b/PrimePickApp/QuizButtonView.swift @@ -12,6 +12,7 @@ struct QuizButtonView: View { @State private var correctQuizNumber: Int = 0 @Binding var quizNumber: Int @State private var showAlert = false + @Environment(\.dismiss) private var dismiss var body: some View { ZStack { @@ -80,7 +81,9 @@ struct QuizButtonView: View { .alert(isPresented: $showAlert) { Alert( title: Text("You Score is \(correctQuizNumber) points!"), - dismissButton: .default(Text("OK")) + dismissButton: .default(Text("OK!")) { + dismiss() + } ) } }