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

【FEAT】デザイン無視でクイズを10問といて終わるフローの作成 #47

Merged
merged 5 commits into from
May 17, 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
8 changes: 8 additions & 0 deletions PrimePickApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
4F02A57D2BF62F61003DF310 /* PrimeQuizEntity.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F02A57C2BF62F61003DF310 /* PrimeQuizEntity.swift */; };
4F02A57F2BF63A43003DF310 /* QuizDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F02A57E2BF63A43003DF310 /* QuizDataManager.swift */; };
4F0C82822BC8247500E1480E /* PrimePickApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F0C82812BC8247500E1480E /* PrimePickApp.swift */; };
4F0C82842BC8247500E1480E /* MainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F0C82832BC8247500E1480E /* MainView.swift */; };
4F0C82862BC8247600E1480E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4F0C82852BC8247600E1480E /* Assets.xcassets */; };
Expand All @@ -16,6 +18,8 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
4F02A57C2BF62F61003DF310 /* PrimeQuizEntity.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimeQuizEntity.swift; sourceTree = "<group>"; };
4F02A57E2BF63A43003DF310 /* QuizDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QuizDataManager.swift; sourceTree = "<group>"; };
4F0C827E2BC8247500E1480E /* PrimePickApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PrimePickApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
4F0C82812BC8247500E1480E /* PrimePickApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimePickApp.swift; sourceTree = "<group>"; };
4F0C82832BC8247500E1480E /* MainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -81,6 +85,8 @@
isa = PBXGroup;
children = (
4F8BE16B2BF4FFB000D7CF0E /* PrimeData.swift */,
4F02A57E2BF63A43003DF310 /* QuizDataManager.swift */,
4F02A57C2BF62F61003DF310 /* PrimeQuizEntity.swift */,
);
path = QuizData;
sourceTree = "<group>";
Expand Down Expand Up @@ -155,9 +161,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4F02A57D2BF62F61003DF310 /* PrimeQuizEntity.swift in Sources */,
4F0C82842BC8247500E1480E /* MainView.swift in Sources */,
4F8BE16E2BF504BB00D7CF0E /* QuizView.swift in Sources */,
4F0C82822BC8247500E1480E /* PrimePickApp.swift in Sources */,
4F02A57F2BF63A43003DF310 /* QuizDataManager.swift in Sources */,
4F8BE16C2BF4FFB000D7CF0E /* PrimeData.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion PrimePickApp/QuizData/PrimeData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ final class PrimeData {
init() {}

public func generateOneOrTwoDigitPrimes() -> [Int] {
var twoDigitPrimes = [Int]()
var twoDigitPrimes: [Int] = [2]
outerLoop: for num in 3..<100 {
for i in 2..<num {
if num % i == 0 {
Expand Down
20 changes: 20 additions & 0 deletions PrimePickApp/QuizData/PrimeQuizEntity.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
//
// PrimeQuizEntity.swift
// PrimePickApp
//
// Created by 村石 拓海 on 2024/05/16.
//

import Foundation

struct PrimeQuizEntity {
var quizId: Int
var number: Int
var isCorrect: Bool

init(quizId: Int, number: Int, isCorrect: Bool) {
self.quizId = quizId
self.number = number
self.isCorrect = isCorrect
}
}
23 changes: 23 additions & 0 deletions PrimePickApp/QuizData/QuizDataManager.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
//
// QuizDataManager.swift
// PrimePickApp
//
// Created by 村石 拓海 on 2024/05/16.
//

import Foundation

class QuizDataManager {
func makeQuizData() -> [PrimeQuizEntity] {
let primeData = PrimeData()
var quizData: [PrimeQuizEntity] = []
let primeNumbers = primeData.generateOneOrTwoDigitPrimes()
for i in 1...10 {
let randomInt = Int.random(in: 1...99)
let isCorrect = primeNumbers.contains(randomInt)
let primeQuizEntity = PrimeQuizEntity(quizId: i, number: randomInt, isCorrect: isCorrect)
quizData.append(primeQuizEntity)
}
return quizData
}
}
42 changes: 39 additions & 3 deletions PrimePickApp/QuizView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@
import SwiftUI

struct QuizView: View {
@Environment(\.dismiss) private var dismiss

let primeData = PrimeData()
var primes: [Int]
let difficulty: String
let manager = QuizDataManager()
let quizData: [PrimeQuizEntity]

@State private var quizNumber: Int = 0

init(difficulty: String) {
self.difficulty = difficulty
Expand All @@ -23,13 +29,43 @@ struct QuizView: View {
} else {
primes = []
}
quizData = manager.makeQuizData()
}

var body: some View {
List(primes, id: \.self) { prime in
Text("\(prime)")
VStack {
Text(quizData[quizNumber].number.description)
HStack {
if quizNumber < 9 {
Button {
print("正解")
if quizNumber < 9 {
quizNumber += 1
} else {
// dismiss()
}
} label: {
Text("正解")
}

Button {
print("不正解")
if quizNumber < 9 {
quizNumber += 1
} else {
// dismiss()
}
} label: {
Text("不正解")
}
} else {
Text("終わり")
}
}
}
.onAppear {
print(quizData)
}
.navigationTitle("Primes")
}
}

Expand Down