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
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## 🔗 연관된 이슈
> 이슈 번호를 입력해주세요. (예: #12)
> 이슈가 완전히 해결되었다면 아래에 예약어를 남겨주세요.
<!-- 이슈 번호를 입력해주세요. (예: #12) -->
<!-- 이슈가 완전히 해결되었다면 아래에 예약어를 남겨주세요. -->
- closed #이슈번호

## 📝 작업 내용
Expand Down
8 changes: 4 additions & 4 deletions DevLog/App/Assembler/DomainAssembler.swift
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,12 @@ private extension DomainAssembler {
UpdatePushNotificationQueryUseCaseImpl(container.resolve(UserPreferencesRepository.self))
}

container.register(FetchProfileHeatmapActivityTypesUseCase.self) {
FetchProfileHeatmapActivityTypesUseCaseImpl(container.resolve(UserPreferencesRepository.self))
container.register(FetchHeatmapActivityTypesUseCase.self) {
FetchHeatmapActivityTypesUseCaseImpl(container.resolve(UserPreferencesRepository.self))
}

container.register(UpdateProfileHeatmapActivityTypesUseCase.self) {
UpdateProfileHeatmapActivityTypesUseCaseImpl(container.resolve(UserPreferencesRepository.self))
container.register(UpdateHeatmapActivityTypesUseCase.self) {
UpdateHeatmapActivityTypesUseCaseImpl(container.resolve(UserPreferencesRepository.self))
}

container.register(FetchTodayDisplayOptionsUseCase.self) {
Expand Down
10 changes: 5 additions & 5 deletions DevLog/Data/Repository/UserPreferencesRepositoryImpl.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ final class UserPreferencesRepositoryImpl: UserPreferencesRepository {
static let pushSortOrder = "PushNotification.sortOption"
static let pushTimeFilter = "PushNotification.timeFilter"
static let pushUnreadOnly = "PushNotification.showUnreadOnly"
static let profileHeatmapActivityTypes = "Profile.heatmap.activityTypes"
static let heatmapActivityTypes = "Profile.heatmap.activityTypes"
static let todayDueDateVisibility = "Today.dueDateVisibility"
static let todayFocusVisibility = "Today.focusVisibility"
}
Expand Down Expand Up @@ -84,12 +84,12 @@ final class UserPreferencesRepositoryImpl: UserPreferencesRepository {
store.setBool(value, forKey: Key.pushUnreadOnly)
}

func profileHeatmapActivityTypes() -> [String] {
store.stringArray(forKey: Key.profileHeatmapActivityTypes)
func heatmapActivityTypes() -> [String] {
store.stringArray(forKey: Key.heatmapActivityTypes)
}

func setProfileHeatmapActivityTypes(_ activityTypes: [String]) {
store.setStringArray(activityTypes, forKey: Key.profileHeatmapActivityTypes)
func setHeatmapActivityTypes(_ activityTypes: [String]) {
store.setStringArray(activityTypes, forKey: Key.heatmapActivityTypes)
}

func todayDisplayOptions() -> TodayDisplayOptions {
Expand Down
4 changes: 2 additions & 2 deletions DevLog/Domain/Protocol/UserPreferencesRepository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ protocol UserPreferencesRepository {
func pushNotificationUnreadOnly() -> Bool
func setPushNotificationUnreadOnly(_ value: Bool)

func profileHeatmapActivityTypes() -> [String]
func setProfileHeatmapActivityTypes(_ activityTypes: [String])
func heatmapActivityTypes() -> [String]
func setHeatmapActivityTypes(_ activityTypes: [String])

func todayDisplayOptions() -> TodayDisplayOptions
func setTodayDisplayOptions(_ options: TodayDisplayOptions)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
//
// FetchHeatmapActivityTypesUseCase.swift
// DevLog
//
// Created by 최윤진 on 3/2/26.
//

protocol FetchHeatmapActivityTypesUseCase {
func execute() -> [String]
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
//
// FetchProfileHeatmapActivityTypesUseCaseImpl.swift
// FetchHeatmapActivityTypesUseCaseImpl.swift
// DevLog
//
// Created by 최윤진 on 3/2/26.
//

final class FetchProfileHeatmapActivityTypesUseCaseImpl: FetchProfileHeatmapActivityTypesUseCase {
final class FetchHeatmapActivityTypesUseCaseImpl: FetchHeatmapActivityTypesUseCase {
private let repository: UserPreferencesRepository

init(_ repository: UserPreferencesRepository) {
self.repository = repository
}

func execute() -> [String] {
repository.profileHeatmapActivityTypes()
repository.heatmapActivityTypes()
}
}

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
//
// UpdateProfileHeatmapActivityTypesUseCase.swift
// UpdateHeatmapActivityTypesUseCase.swift
// DevLog
//
// Created by 최윤진 on 3/2/26.
//

protocol UpdateProfileHeatmapActivityTypesUseCase {
protocol UpdateHeatmapActivityTypesUseCase {
func execute(_ activityTypes: [String])
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
//
// UpdateProfileHeatmapActivityTypesUseCaseImpl.swift
// UpdateHeatmapActivityTypesUseCaseImpl.swift
// DevLog
//
// Created by 최윤진 on 3/2/26.
//

final class UpdateProfileHeatmapActivityTypesUseCaseImpl: UpdateProfileHeatmapActivityTypesUseCase {
final class UpdateHeatmapActivityTypesUseCaseImpl: UpdateHeatmapActivityTypesUseCase {
private let repository: UserPreferencesRepository

init(_ repository: UserPreferencesRepository) {
self.repository = repository
}

func execute(_ activityTypes: [String]) {
repository.setProfileHeatmapActivityTypes(activityTypes)
repository.setHeatmapActivityTypes(activityTypes)
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//
// ProfileActivityItem.swift
// HeatmapActivityItem.swift
// DevLog
//
// Created by opfic on 3/2/26.
//

import Foundation

struct ProfileActivityItem: Identifiable, Hashable, Comparable {
struct HeatmapActivityItem: Identifiable, Hashable, Comparable {
var id: String { todoId }
let todoId: String
let title: String
Expand Down Expand Up @@ -36,7 +36,7 @@ struct ProfileActivityItem: Identifiable, Hashable, Comparable {
self.isDeleted = todo.deletedAt != nil
}

static func < (lhs: ProfileActivityItem, rhs: ProfileActivityItem) -> Bool {
static func < (lhs: HeatmapActivityItem, rhs: HeatmapActivityItem) -> Bool {
lhs.number < rhs.number
}
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//
// ProfileActivityDay.swift
// HeatmapDay.swift
// DevLog
//
// Created by opfic on 3/2/26.
//

import Foundation

struct ProfileActivityDay: Hashable {
struct HeatmapDay: Hashable {
let date: Date
let createdCount: Int
let completedCount: Int
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//
// ProfileActivityMonth.swift
// HeatmapMonth.swift
// DevLog
//
// Created by opfic on 3/2/26.
//

import Foundation

struct ProfileActivityMonth: Identifiable, Hashable {
struct HeatmapMonth: Identifiable, Hashable {
var id: Date { monthStart }
let monthStart: Date
let weeks: [[ProfileActivityDay]]
let weeks: [[HeatmapDay]]
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
//
// ProfileActivityQuarter.swift
// HeatmapQuarter.swift
// DevLog
//
// Created by opfic on 3/2/26.
//

import Foundation

struct ProfileActivityQuarter: Identifiable, Hashable {
struct HeatmapQuarter: Identifiable, Hashable {
var id: Date { quarterStart }
let quarterStart: Date
let months: [ProfileActivityMonth]
let months: [HeatmapMonth]
}
Loading