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.

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

Release/1.0.10 -> develop #362

Merged
merged 9 commits into from
Nov 11, 2024
Merged

Release/1.0.10 -> develop #362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2531eb0
chore: 연락처 접근 권한 요청 문구 수정
JongHoooon Nov 5, 2024
dbd1c0b
feat: 문답 이후 상태 업데이트
leemhyungyu Nov 6, 2024
640a23c
chore: 빌드 넘버 업데이트(36)
JongHoooon Nov 9, 2024
24b7771
chore: profile setup interface에 base webview interface 의존성 주입
JongHoooon Nov 9, 2024
49dc891
fix: 모래사장 바로가기 버튼 클릭 시 보틀 리스트로 넘어가지 않게 수정
JongHoooon Nov 9, 2024
0bd61c7
Merge branch 'release/1.0.10' of https://github.com/Nexters/Bottles_i…
leemhyungyu Nov 9, 2024
a8cf272
fix: feat: 모래사장 화면 자기소개 작성 및 보틀 보여주기 로직 수정
leemhyungyu Nov 9, 2024
9efce44
chore: 빌드 넘버 업데이트(37)
leemhyungyu Nov 9, 2024
a351a98
fix: 모래사장 바로가기 버튼 클릭 시 보틀 리스트로 넘어가게 수정
leemhyungyu Nov 9, 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
3 changes: 2 additions & 1 deletion Projects/Feature/ProfileSetup/Project.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ let project = Project.makeModule(
interface: .ProfileSetup,
factory: .init(
dependencies: [
.domain
.domain,
.feature(interface: .BaseWebView)
]
)
),
Expand Down
15 changes: 6 additions & 9 deletions Projects/Feature/SandBeach/Interface/Sources/SandBeach/SandBeachFeatureInterface.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,26 +123,23 @@ extension SandBeachFeature {
return
}

if userProfileStatus == .doneProfileImage {
await send(.userStateFetchCompleted(
userState: .noBottle(time: nextBottleLeftHours ?? 0),
isDisableButton: false))
return
}

if newBottlesCount > 0 {
if userProfileStatus == .doneProfileImage && newBottlesCount > 0 {
await send(.userStateFetchCompleted(
userState: .hasNewBottle(bottleCount: newBottlesCount),
isDisableButton: false))
return
}

if activeBottlesCount > 0 {
if userProfileStatus == .doneProfileImage && activeBottlesCount > 0 {
await send(.userStateFetchCompleted(
userState: .hasActiveBottle(bottleCount: activeBottlesCount),
isDisableButton: false))
return
}

await send(.userStateFetchCompleted(
userState: .noBottle(time: nextBottleLeftHours ?? 0),
isDisableButton: false))
} catch: { error, send in
// TODO: 에러 핸들링
Log.error(error)
Expand Down
4 changes: 2 additions & 2 deletions Tuist/ProjectDescriptionHelpers/InfoPlist+Templates.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public extension InfoPlist {
static var app: InfoPlist {
return .extendingDefault(with: [
"CFBundleShortVersionString": "1.0.10",
"CFBundleVersion": "34",
"CFBundleVersion": "37",
"UIUserInterfaceStyle": "Light",
"CFBundleName": "보틀",
"UILaunchScreen": [
Expand Down Expand Up @@ -46,7 +46,7 @@ public extension InfoPlist {
static var example: InfoPlist {
return .extendingDefault(with: [
"CFBundleShortVersionString": "1.0.10",
"CFBundleVersion": "34",
"CFBundleVersion": "37",
"UIUserInterfaceStyle": "Light",
"UILaunchScreen": [:],
"UISupportedInterfaceOrientations": [
Expand Down