Skip to content

Seong #51

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.

Sign up for GitHub

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

Open
mo-si-dev wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Seong #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
69320c2
회원가입 alert추가
mo-si-dev May 4, 2024
393ad5e
회원가입 완료 alert 수정
mo-si-dev May 4, 2024
34f36ab
.??
mo-si-dev May 5, 2024
b256e26
뷰 수정
mo-si-dev May 5, 2024
e0e4101
프로필설정 추가
mo-si-dev May 6, 2024
c500e0f
프로필 사진섹션 삭제및 사진크기,위치조정
mo-si-dev May 6, 2024
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
32 changes: 21 additions & 11 deletions EngAttack.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,12 @@
CDC208852BE3AFA200105E63 /* SignViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDC2087F2BE3AFA200105E63 /* SignViewModel.swift */; };
CDC208872BE3AFC500105E63 /* RootView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDC208862BE3AFC500105E63 /* RootView.swift */; };
CDC2088B2BE3BEB800105E63 /* CountDownView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDC2088A2BE3BEB800105E63 /* CountDownView.swift */; };
D875BD092BE7DDD200B254CD /* StorageManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = D875BD082BE7DDD200B254CD /* StorageManager.swift */; };
D875BD0C2BE7E00D00B254CD /* ProfoleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = D875BD0B2BE7E00D00B254CD /* ProfoleViewModel.swift */; };
D875BD102BE7ED1000B254CD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D875BD0F2BE7ED1000B254CD /* GoogleService-Info.plist */; };
D8BE454C2BE496FD00C9BD40 /* BookMark.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8BE454B2BE496FD00C9BD40 /* BookMark.swift */; };
D8BE455B2BE4BD2B00C9BD40 /* SignInState.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8BE455A2BE4BD2B00C9BD40 /* SignInState.swift */; };
D8FEE2F82BE538D5001FC45C /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D8FEE2F72BE538D5001FC45C /* GoogleService-Info.plist */; };
D8FEE2FB2BE5BF1D001FC45C /* ProfileSettingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8FEE2FA2BE5BF1D001FC45C /* ProfileSettingView.swift */; };
D8FEE2FD2BE5F2F3001FC45C /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = D8FEE2FC2BE5F2F3001FC45C /* ImagePicker.swift */; };
D8FEE3002BE60F21001FC45C /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = D8FEE2FF2BE60F21001FC45C /* FirebaseAuth */; };
D8FEE3022BE60F21001FC45C /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = D8FEE3012BE60F21001FC45C /* FirebaseFirestore */; };
D8FEE3042BE60F21001FC45C /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = D8FEE3032BE60F21001FC45C /* FirebaseFirestoreSwift */; };
Expand Down Expand Up @@ -77,12 +78,12 @@
CDC2087F2BE3AFA200105E63 /* SignViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SignViewModel.swift; sourceTree = "<group>"; };
CDC208862BE3AFC500105E63 /* RootView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RootView.swift; sourceTree = "<group>"; };
CDC2088A2BE3BEB800105E63 /* CountDownView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CountDownView.swift; sourceTree = "<group>"; };
D875BD082BE7DDD200B254CD /* StorageManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageManager.swift; sourceTree = "<group>"; };
D875BD0B2BE7E00D00B254CD /* ProfoleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfoleViewModel.swift; sourceTree = "<group>"; };
D875BD0F2BE7ED1000B254CD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
D8BE454B2BE496FD00C9BD40 /* BookMark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookMark.swift; sourceTree = "<group>"; };
D8BE455A2BE4BD2B00C9BD40 /* SignInState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInState.swift; sourceTree = "<group>"; };
D8FEE2F72BE538D5001FC45C /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "../../Downloads/GoogleService-Info.plist"; sourceTree = "<group>"; };
D8FEE2F92BE538DA001FC45C /* GoogleService-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
D8FEE2FA2BE5BF1D001FC45C /* ProfileSettingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProfileSettingView.swift; sourceTree = "<group>"; };
D8FEE2FC2BE5F2F3001FC45C /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
D8FEE3072BE61F91001FC45C /* Rank.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Rank.swift; sourceTree = "<group>"; };
F7A23E552BE1DB7E00A044BD /* TabViewSetting.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewSetting.swift; sourceTree = "<group>"; };
F7A23E572BE1DE1200A044BD /* RankingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RankingView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -120,7 +121,6 @@
AFBC3A232BE0D5E400CE7542 = {
isa = PBXGroup;
children = (
D8FEE2F72BE538D5001FC45C /* GoogleService-Info.plist */,
AFBC3A2E2BE0D5E500CE7542 /* EngAttack */,
AFBC3A2D2BE0D5E500CE7542 /* Products */,
);
Expand All @@ -140,18 +140,17 @@
AFBC3A332BE0D5E700CE7542 /* Assets.xcassets */,
AF9552D72BE1D08E0019A124 /* Sounds */,
F7A23E552BE1DB7E00A044BD /* TabViewSetting.swift */,
D875BD0F2BE7ED1000B254CD /* GoogleService-Info.plist */,
F7F07C842BE0DF96009A75A9 /* GameStartView.swift */,
D8FEE2F92BE538DA001FC45C /* GoogleService-Info.plist */,
CD37DEF82BE0D7E000F7CB39 /* ContentViewViewModel.swift */,
CDC2088A2BE3BEB800105E63 /* CountDownView.swift */,
BFD6A8DF2BE207E10009BFE2 /* ContentView.swift */,
CDC208862BE3AFC500105E63 /* RootView.swift */,
BF755ADD2BE1D792007DD8AE /* Launch Screen.swift */,
BF36CBE32BE118E90089D070 /* EngAttackApp.swift */,
AF62BD442BE0DDF700A88EDE /* SettingView.swift */,
D8FEE2FA2BE5BF1D001FC45C /* ProfileSettingView.swift */,
AFB5BF0A2BE3D7A80005932D /* SettingViewModel.swift */,
D8FEE2FC2BE5F2F3001FC45C /* ImagePicker.swift */,
D875BD0A2BE7DFF000B254CD /* Profile */,
D8BE454F2BE4976400C9BD40 /* Rank */,
CDC208802BE3AFA200105E63 /* Sign */,
BF0C51612BE325D700A10946 /* Dictionary */,
Expand Down Expand Up @@ -214,6 +213,16 @@
path = Sign;
sourceTree = "<group>";
};
D875BD0A2BE7DFF000B254CD /* Profile */ = {
isa = PBXGroup;
children = (
D875BD082BE7DDD200B254CD /* StorageManager.swift */,
D8FEE2FA2BE5BF1D001FC45C /* ProfileSettingView.swift */,
D875BD0B2BE7E00D00B254CD /* ProfoleViewModel.swift */,
);
path = Profile;
sourceTree = "<group>";
};
D8BE454F2BE4976400C9BD40 /* Rank */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -300,7 +309,7 @@
buildActionMask = 2147483647;
files = (
F7A23E5D2BE1DF8500A044BD /* SOYO Maple Regular.otf in Resources */,
D8FEE2F82BE538D5001FC45C /* GoogleService-Info.plist in Resources */,
D875BD102BE7ED1000B254CD /* GoogleService-Info.plist in Resources */,
F7A23E5C2BE1DF8500A044BD /* SOYO Maple Bold.otf in Resources */,
AFBC3A372BE0D5E700CE7542 /* Preview Assets.xcassets in Resources */,
AF9552DD2BE1D09F0019A124 /* background.wav in Resources */,
Expand All @@ -322,6 +331,8 @@
AF05DFF42BE28C7D005625E0 /* WordManager.swift in Sources */,
CDC208812BE3AFA200105E63 /* AuthenticationManager.swift in Sources */,
D8BE455B2BE4BD2B00C9BD40 /* SignInState.swift in Sources */,
D875BD092BE7DDD200B254CD /* StorageManager.swift in Sources */,
D875BD0C2BE7E00D00B254CD /* ProfoleViewModel.swift in Sources */,
BFD6A8E12BE209CF0009BFE2 /* Launch Screen.swift in Sources */,
CDA4363E2BE28E9B0047E2C0 /* WordDictionaryViewModel.swift in Sources */,
D8FEE3082BE61F91001FC45C /* Rank.swift in Sources */,
Expand All @@ -334,7 +345,6 @@
CDC2088B2BE3BEB800105E63 /* CountDownView.swift in Sources */,
CDC208822BE3AFA200105E63 /* Field.swift in Sources */,
CDA4363D2BE28E9B0047E2C0 /* WordBookmarkView.swift in Sources */,
D8FEE2FD2BE5F2F3001FC45C /* ImagePicker.swift in Sources */,
CD1DCC042BE52AFB0061357B /* WordBookmarkViewModel.swift in Sources */,
F7A23E582BE1DE1200A044BD /* RankingView.swift in Sources */,
D8BE454C2BE496FD00C9BD40 /* BookMark.swift in Sources */,
Expand Down
1 change: 0 additions & 1 deletion EngAttack/Bookmark/WordBookmarkView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ struct WordBookmarkView: View {
guard let document = doc else { return }
if document.exists {
guard let words = document.data(), let list = words["List"] as? [[String: Any]] else { return }

for item in list {
guard let word = item["word"] as? String else { continue }
guard let description = item["description"] as? String else { continue }
Expand Down
2 changes: 1 addition & 1 deletion EngAttack/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ struct ContentView: View {
SoundSetting.instance.playSound(sound: .background)
}
.onDisappear {
addRank(names:singViewModel.name, scores:contentViewModel.score)
// addRank(names:singViewModel.name, scores:contentViewModel.score)
contentViewModel.stopTimer()
SoundSetting.instance.stopMusic()
}
Expand Down
2 changes: 1 addition & 1 deletion EngAttack/GameStartView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ struct GameStartView: View {
.foregroundStyle(.green)
Picker(contentViewModel.isKR ? "Choose time" : "선택 시간", selection: $selectedTime) {
ForEach(times, id: \.self) { time in
Text(String(format: "%.0f", Double(time)) + "\(contentViewModel.isKR ? "S" : "초")").tag(time)
Text(String(format: "%.0f", Double(time)) + "\(contentViewModel.isKR ? "s" : "초")").tag(time)
.foregroundStyle(Color("PickerFontColor"))
}
}
Expand Down
45 changes: 0 additions & 45 deletions EngAttack/ImagePicker.swift
View file
Open in desktop

This file was deleted.

Loading