Skip to content
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
26 changes: 26 additions & 0 deletions Application/DevLogApp/Sources/Resource/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleDisplayName</key>
<string>DevLog</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
Expand Down Expand Up @@ -42,13 +44,37 @@
<string>$(CLIENT_ID)</string>
<key>GITHUB_CLIENT_ID</key>
<string>$(GITHUB_CLIENT_ID)</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>
<string>public.app-category.productivity</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>PRIVACY_POLICY_URL</key>
<string>$(PRIVACY_POLICY_URL)</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<true/>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
<array>
<string>remote-notification</string>
</array>
<key>UILaunchScreen</key>
<dict/>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
</array>
</dict>
</plist>

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions Application/DevLogPresentation/Sources/Main/MainView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -359,13 +359,13 @@ struct MainView: View {
TodoDetailView(viewModel: profileViewCoordinator.makeTodoDetailViewModel(todoId: todoId))
.id(todoId)
case .settings:
SettingView(viewModel: profileViewCoordinator.settingViewModel)
SettingsView(viewModel: profileViewCoordinator.settingsViewModel)
.environment(profileViewCoordinator.router)
case .theme:
ThemeView(
theme: Binding(
get: { profileViewCoordinator.settingViewModel.state.theme },
set: { profileViewCoordinator.settingViewModel.send(.setTheme($0)) }
get: { profileViewCoordinator.settingsViewModel.state.theme },
set: { profileViewCoordinator.settingsViewModel.send(.setTheme($0)) }
)
)
case .pushNotification:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ struct ProfileView: View {
profileContentView
}
}
.toolbar { profileToolbarContent }
.onChange(of: focused) { _, newValue in
withAnimation {
coordinator.viewModel.send(.updateStatusTextFieldFocus(newValue))
Expand Down Expand Up @@ -127,6 +126,7 @@ struct ProfileView: View {
.refreshable { coordinator.viewModel.send(.refresh) }
.frame(maxWidth: .infinity)
.background(Color(.systemGroupedBackground))
.toolbar { profileToolbarContent }
}

@ToolbarContentBuilder
Expand All @@ -148,15 +148,15 @@ struct ProfileView: View {
private func profileDestinationView(_ route: ProfileRoute) -> some View {
switch route {
case .settings:
SettingView(viewModel: coordinator.settingViewModel)
SettingsView(viewModel: coordinator.settingsViewModel)
.environment(coordinator.router)
case .activity(let todoId):
TodoDetailView(viewModel: coordinator.makeTodoDetailViewModel(todoId: todoId))
case .theme:
ThemeView(
theme: Binding(
get: { coordinator.settingViewModel.state.theme },
set: { coordinator.settingViewModel.send(.setTheme($0)) }
get: { coordinator.settingsViewModel.state.theme },
set: { coordinator.settingsViewModel.send(.setTheme($0)) }
)
)
case .pushNotification:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import DevLogDomain
@Observable
final class ProfileViewCoordinator {
let viewModel: ProfileViewModel
let settingViewModel: SettingViewModel
let settingsViewModel: SettingsViewModel
var router = NavigationRouter<ProfileRoute>()
private let container: DIContainer

Expand All @@ -27,7 +27,7 @@ final class ProfileViewCoordinator {
fetchHeatmapActivityTypesUseCase: container.resolve(FetchHeatmapActivityTypesUseCase.self),
updateHeatmapActivityTypesUseCase: container.resolve(UpdateHeatmapActivityTypesUseCase.self)
)
self.settingViewModel = SettingViewModel(
self.settingsViewModel = SettingsViewModel(
deleteAuthUseCase: container.resolve(DeleteAuthUseCase.self),
signOutUseCase: container.resolve(SignOutUseCase.self),
networkConnectivityUseCase: container.resolve(ObserveNetworkConnectivityUseCase.self),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// SettingView.swift
// SettingsView.swift
// DevLogPresentation
//
// Created by opfic on 5/6/25.
Expand All @@ -8,9 +8,9 @@
import SwiftUI
import DevLogDomain

struct SettingView: View {
struct SettingsView: View {
@Environment(NavigationRouter<ProfileRoute>.self) private var router
@State var viewModel: SettingViewModel
@State var viewModel: SettingsViewModel

var body: some View {
let connected = viewModel.state.isNetworkConnected
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// SettingViewModel.swift
// SettingsViewModel.swift
// DevLogPresentation
//
// Created by 최윤진 on 11/22/25.
Expand All @@ -11,7 +11,7 @@ import DevLogCore
import DevLogDomain

@Observable
final class SettingViewModel: Store {
final class SettingsViewModel: Store {
struct State: Equatable {
var theme: SystemTheme = .automatic
var dirSize: Int64 = 0
Expand Down Expand Up @@ -158,7 +158,7 @@ final class SettingViewModel: Store {
}
}

private extension SettingViewModel {
private extension SettingsViewModel {
func setAlert(
_ state: inout State,
isPresented: Bool,
Expand Down