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
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import com.afternote.core.common.reporting.ErrorReporter
import com.afternote.core.domain.error.CoreAuthFailure
import com.afternote.core.domain.repository.UserProfileRepository
import com.afternote.core.domain.repository.auth.AuthRepository
import com.afternote.core.model.MindRecordCategory
import com.afternote.core.model.Session
import com.afternote.core.ui.Route
import com.afternote.core.ui.theme.AfternoteTheme
Expand All @@ -49,6 +48,7 @@ import com.afternote.feature.afternote.domain.model.LeaveMessageBlock
import com.afternote.feature.home.presentation.HomeTabActions
import com.afternote.feature.mindrecord.domain.model.ReceiverMindRecords
import com.afternote.feature.mindrecord.domain.repository.MindRecordReceiverRepository
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import com.afternote.feature.receiver.domain.error.ReceiverFailure
import com.afternote.feature.receiver.domain.model.AfterNoteListItem
import com.afternote.feature.receiver.domain.model.AfterNotesListResult
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberUpdatedState
import androidx.navigation.NavController
import com.afternote.core.model.MindRecordCategory
import com.afternote.core.ui.Route
import com.afternote.core.ui.bottombar.BottomNavTab
import com.afternote.feature.afternote.presentation.author.editor.model.EditorCategory
import com.afternote.feature.afternote.presentation.author.navigation.AfternoteNavActions
import com.afternote.feature.afternote.presentation.author.navigation.model.AfternoteRoute
import com.afternote.feature.home.presentation.HomeTabActions
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import com.afternote.feature.mindrecord.presentation.navigation.MindRecordNavActions
import com.afternote.feature.mindrecord.presentation.navigation.MindRecordRoute
import com.afternote.feature.onboarding.presentation.navigation.OnboardingNavActions
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.afternote.core.model.MindRecordCategory
import com.afternote.core.ui.AfternoteOutlinedCard
import com.afternote.core.ui.AfternoteSectionHeader
import com.afternote.core.ui.badge.RecipientDesignationBadge
Expand All @@ -34,6 +33,7 @@ import com.afternote.core.ui.theme.AfternoteTheme
import com.afternote.core.ui.topbar.HomeTopBar
import com.afternote.feature.mindrecord.presentation.hometab.homeTabMindRecordMemoriesSection
import com.afternote.feature.mindrecord.presentation.hometab.homeTabMindRecordQuestionAndCategories
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import java.time.LocalDate
import java.time.format.DateTimeFormatter

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import androidx.lifecycle.viewModelScope
import com.afternote.core.common.reporting.ErrorReporter
import com.afternote.core.common.result.runCatchingCancellable
import com.afternote.core.domain.repository.UserProfileRepository
import com.afternote.core.model.HomeSummary
import com.afternote.core.model.MindRecordCategory
import com.afternote.feature.home.presentation.reporting.HomeFailureStage
import com.afternote.feature.home.presentation.reporting.recordHomeFailure
import com.afternote.feature.home.presentation.usecase.GetHomeSummaryUseCase
import com.afternote.feature.home.presentation.usecase.HomeSummary
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.afternote.feature.home.presentation.usecase

import com.afternote.core.common.result.runCatchingCancellable
import com.afternote.core.domain.repository.UserRepository
import com.afternote.core.model.HomeSummary
import com.afternote.feature.home.presentation.usecase.HomeSummary

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[normal] 이 파일의 package 가 com.afternote.feature.home.presentation.usecase 라 같은 패키지를 import 하고 있다. 지워도 컴파일된다.

HomeSummary.kt 를 같은 패키지로 옮겼으니 이 import 는 이관 과정에서 남은 흔적으로 보인다. ktlint 의 no-unused-imports 가 same-package import 는 잡지 않아 CI 로는 걸리지 않는다.

import com.afternote.feature.mindrecord.domain.repository.DailyQuestionRepository
import com.afternote.feature.mindrecord.domain.repository.DiaryRepository
import kotlinx.coroutines.async
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.afternote.core.model
package com.afternote.feature.home.presentation.usecase

data class HomeSummary(
val userName: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.afternote.feature.home.presentation

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.afternote.core.model.MindRecordCategory
import com.afternote.core.ui.theme.AfternoteTheme
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import com.android.tools.screenshot.PreviewTest

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.afternote.feature.home.presentation
import com.afternote.core.common.reporting.ErrorReporter
import com.afternote.core.domain.repository.UserProfileRepository
import com.afternote.core.domain.repository.UserRepository
import com.afternote.core.model.MindRecordCategory
import com.afternote.core.model.delivery.DeliveryConditionItem
import com.afternote.core.model.delivery.ReceiverDeliveryConditions
import com.afternote.core.model.user.Receiver
Expand All @@ -22,6 +21,7 @@ import com.afternote.feature.mindrecord.domain.model.DiaryUpdatePayload
import com.afternote.feature.mindrecord.domain.model.TodayDailyQuestion
import com.afternote.feature.mindrecord.domain.repository.DailyQuestionRepository
import com.afternote.feature.mindrecord.domain.repository.DiaryRepository
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.ExperimentalCoroutinesApi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.compose.LifecycleEventEffect
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.afternote.core.model.MindRecordCategory
import com.afternote.core.ui.AfternoteSectionHeader
import com.afternote.core.ui.theme.AfternoteTheme
import com.afternote.feature.mindrecord.presentation.R.string.mindrecord_home_tab_memories_section_click_label
import com.afternote.feature.mindrecord.presentation.R.string.mindrecord_home_tab_memories_section_title
import com.afternote.feature.mindrecord.presentation.component.MemoriesCard
import com.afternote.feature.mindrecord.presentation.component.TodayQuestionCard
import com.afternote.feature.mindrecord.presentation.component.hometab.RecordCategoryCard
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategoryUi
import com.afternote.feature.mindrecord.presentation.util.htmlToPlainText
import com.afternote.feature.mindrecord.presentation.viewmodel.MemoriesCardViewModel
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.afternote.feature.mindrecord.presentation.model

/**
* 마음의 기록 카테고리.
*
* 표시용 아이콘·문구는 같은 패키지의 [MindRecordCategoryUi] 가 들고 있다.
*
* 이 타입을 아는 모듈은 홈·마음의 기록·app 셋뿐이라 core:model(11개 모듈이 의존)에 두지
* 않는다. 셋 다 이미 이 모듈에 의존하고 있어 새 모듈 의존이 생기지 않는다 (#1085).
*/
enum class MindRecordCategory {
DAILY_QUESTION,
DIARY,
WEEKLY_REPORT,
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import com.afternote.core.model.MindRecordCategory
import com.afternote.feature.mindrecord.presentation.R
import com.afternote.feature.mindrecord.presentation.model.MindRecordCategory

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

[normal] 위와 같은 건이다 — 이 파일의 package 도 com.afternote.feature.mindrecord.presentation.model 이라 자기 패키지를 import 한다.

새로 만든 MindRecordCategory.kt 를 바로 옆에 뒀으니 이 줄은 필요 없다.

import com.afternote.core.ui.R as CoreUiR

sealed class MindRecordCategoryUi(
Expand Down
Loading