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

[iOS] 시작이 되지 않는 현상 수정 #310

Merged
merged 6 commits into from
Dec 13, 2023
Merged

[iOS] 시작이 되지 않는 현상 수정 #310

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
5845335
:bug: 앱 첫 실행이 아닐 시 유저가 없을때도 유저를 생성하지 않는 문제 수정
SwiftyJunnos Dec 12, 2023
a083b8c
:art: 유저 생성 조건 계산 프로퍼티화 & 키체인 유저 Key값 변경
SwiftyJunnos Dec 12, 2023
6152026
:bug: 유저 검사 AND ➡️ OR
SwiftyJunnos Dec 12, 2023
aabf715
Merge branch 'iOS/release' into iOS/task/UserStart-Fix
SwiftyJunnos Dec 12, 2023
f248475
:bug: 여정 목록 캐싱 버그 수정
SwiftyJunnos Dec 12, 2023
493d5de
Merge branch 'iOS/task/UserStart-Fix' of https://github.com/boostcamp…
SwiftyJunnos Dec 12, 2023
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
6 changes: 5 additions & 1 deletion iOS/Features/Home/Sources/Home/Presentation/HomeViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,12 @@ public final class HomeViewModel {

private extension HomeViewModel {

private var shouldSignIn: Bool {
return self.isFirstLaunch || self.userRepository.fetchUUID() == nil
}

func createNewUserWhenFirstLaunch() {
guard self.isFirstLaunch else { return }
guard self.shouldSignIn else { return }

Task {
let result = await self.userRepository.createUser()
Expand Down
6 changes: 1 addition & 5 deletions iOS/Features/Home/Sources/NavigateMap/Presentation/Common/MapViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,11 +250,7 @@ public final class MapViewController: UIViewController {
CLLocationCoordinate2D(latitude: $0.latitude,
longitude: $0.longitude)
}
let spotCoordinates = journey.spots.map {
CLLocationCoordinate2D(latitude: $0.coordinate.latitude,
longitude: $0.coordinate.longitude)
}
await self.drawPolylineToMap(using: coordinates+spotCoordinates)
await self.drawPolylineToMap(using: coordinates)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion iOS/MSCoreKit/Sources/MSKeychainStorage/MSKeychainStorage+Constants.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ extension MSKeychainStorage {

public enum Accounts: String, CaseIterable {

case userID
case userID = "MusicSpotUser.v1"

}

Expand Down
4 changes: 2 additions & 2 deletions iOS/MSUIKit/Sources/MSUIKit/Cells/JourneyCell/JourneyCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import UIKit

import MSDesignSystem
import MSExtension
import MSImageFetcher

public final class JourneyCell: UICollectionViewCell {
Expand Down Expand Up @@ -96,8 +97,7 @@ public final class JourneyCell: UICollectionViewCell {
return
}

let key = "\(indexPath.section)-\(indexPath.item)"
photoView.imageView.ms.setImage(with: imageURL, forKey: key)
photoView.imageView.ms.setImage(with: imageURL, forKey: imageURL.paath())
}

}
Expand Down
18 changes: 9 additions & 9 deletions iOS/MusicSpot/MusicSpot/SceneDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ import MSKeychainStorage
private extension SceneDelegate {

func prepareToDebug() {
// self.isFirstLaunch = true
// self.recordingJourneyID = nil
// self.isRecording = false
//
// do {
// try self.keychain.deleteAll()
// } catch {
// MSLogger.make(category: .keychain).error("키체인 초기화 실패")
// }
self.isFirstLaunch = true
self.recordingJourneyID = nil
self.isRecording = false

do {
try self.keychain.deleteAll()
} catch {
MSLogger.make(category: .keychain).error("키체인 초기화 실패")
}
}

}
Expand Down