Skip to content

Streak design ex #36

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

Draft
sumnii wants to merge 2 commits into
base: dev
Choose a base branch
from
Draft

Streak design ex #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c3e7ca
[EX] make streak design example in DictView
sumnii May 17, 2022
62d9641
[EX] add streak bubble on header
sumnii May 19, 2022
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
23 changes: 23 additions & 0 deletions kWordle/Assets.xcassets/StreakBubble.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "StreakBubble1x.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "StreakBubble2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "StreakBubble3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added kWordle/Assets.xcassets/StreakBubble.imageset/StreakBubble1x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kWordle/Assets.xcassets/StreakBubble.imageset/StreakBubble2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added kWordle/Assets.xcassets/StreakBubble.imageset/StreakBubble3x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 25 additions & 7 deletions kWordle/View/DictView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ struct DictView: View {
VStack(spacing: 24) {
VStack(spacing: 8) {
HStack {
Text(answer)
.font(.custom("EBSHMJESaeronR", size: 28))
HStack(spacing: 4) {
Text(answer)
.font(.custom("EBSHMJESaeronR", size: 28))
streakButton()
}
Spacer()
Button {
actionSheet()
Expand Down Expand Up @@ -77,18 +80,33 @@ struct DictView: View {
.frame(minHeight: 35)
}

private func streakButton() -> some View {
return ZStack {
Rectangle()
.frame(width: 80, height: 28)
.foregroundColor(.hBlack)
HStack(spacing: 0) {
Text("연승끝..")
.foregroundColor(.hWhite)
.font(.custom("EBSHMJESaeronR", size: 14))
Text("🤯")
.font(.system(size: 12))
}
}
}

private func copyButton() -> some View {
return ZStack {
RoundedRectangle(cornerRadius: 5)
.frame(width: 72, height: 36)
.foregroundColor(.hLigthGray)
HStack {
RoundedRectangle(cornerRadius: 5)
.frame(width: 72, height: 36)
.foregroundColor(.hLigthGray)
HStack(spacing: 4) {
Text("공유")
.foregroundColor(.hBlack)
.font(.custom("EBSHMJESaeronR", size: 17))
Image(systemName: "arrowshape.turn.up.left")
.resizable()
.frame(width: 19, height: 15)
.frame(width: 15, height: 12)
.foregroundColor(.hBlack)
}
}
Expand Down
41 changes: 33 additions & 8 deletions kWordle/View/MainView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,41 @@ struct MainView: View {

var mainView: some View {
VStack(spacing: 0) {
TitleView()
.padding(.top, 35 * currentScreenRatio())
.padding(.bottom, 8 * currentHeightRatio())
HStack {
SettingButtonView(isSettingPresented: $isSettingPresented)
Spacer()
GameCountView
ZStack(alignment: .bottomTrailing) {
VStack {
TitleView()
.padding(.top, 35 * currentScreenRatio())
.padding(.bottom, 8 * currentHeightRatio())
HStack {
SettingButtonView(isSettingPresented: $isSettingPresented)
Spacer()
GameCountView
}
}
ZStack {
Image("StreakBubble")
.resizable()
.frame(width: 80, height: 55)
VStack {
HStack(spacing: 0) {
Text("1000")
.foregroundColor(.hBlack)
.font(.system(size: 14, weight: .medium))
Text("번째")
.foregroundColor(.hBlack)
.font(.custom("EBSHMJESaeronSB", size: 14))
}
Text("연승중")
.foregroundColor(.hBlack)
.font(.custom("EBSHMJESaeronSB", size: 14))
}
.padding(.bottom, 6)
}
.padding(.trailing, 35)
.padding(.bottom, 25)
}
.padding(.horizontal, 20)
.padding(.vertical, 8)
.padding(.bottom, 8)
AnswerBoardView()
Spacer()
if !mainViewModel.game.isGameFinished {
Expand Down