app-compose/build.gradle.kts

@@ -19,14 +19,12 @@ android {
 }
 
 dependencies {
-  implementation(projects.core.designsystem)
-  implementation(projects.feature.navigator)
+  implementation(projects.presentation.common.designsystem)
+  implementation(projects.presentation.navigator)
 
   implementation(projects.remote.openmajor)
   implementation(projects.remote.timetable)
-  implementation(projects.remote.lectureevaluation.viewerreporter)
-  implementation(projects.remote.lectureevaluation.my)
-  implementation(projects.remote.lectureevaluation.editor)
+  implementation(projects.remote.lectureevaluation)
   implementation(projects.remote.signup)
   implementation(projects.remote.notice)
   implementation(projects.remote.user)
@@ -39,9 +37,7 @@ dependencies {
 
   implementation(projects.data.openmajor)
   implementation(projects.data.timetable)
-  implementation(projects.data.lectureevaluation.viewerreporter)
-  implementation(projects.data.lectureevaluation.editor)
-  implementation(projects.data.lectureevaluation.my)
+  implementation(projects.data.lectureevaluation)
   implementation(projects.data.user)
   implementation(projects.data.notice)
   implementation(projects.data.signup)

build-logic/convention/build.gradle.kts

@@ -41,9 +41,9 @@ gradlePlugin {
       id = "suwiki.java.library"
       implementationClass = "JavaLibraryConventionPlugin"
     }
-    register("featureCompose") {
-      id = "suwiki.android.feature.compose"
-      implementationClass = "FeatureComposeConventionPlugin"
+    register("presentationCompose") {
+      id = "suwiki.android.presentation.compose"
+      implementationClass = "PresentationComposeConventionPlugin"
     }
     register("remote") {
       id = "suwiki.android.remote"

build-logic/convention/src/main/java/DataConventionPlugin.kt

@@ -14,7 +14,7 @@ internal class DataConventionPlugin : Plugin<Project> {
       }
 
       dependencies {
-        "implementation"(project(":core:model"))
+        "implementation"(project(":common:model"))
 
         "implementation"(libs.findBundle("coroutine").get())
 

build-logic/convention/src/main/java/FeatureComposeConventionPlugin.kt → build-logic/convention/src/main/java/PresentationComposeConventionPlugin.kt

@@ -4,7 +4,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.project
 
-internal class FeatureComposeConventionPlugin : Plugin<Project> {
+internal class PresentationComposeConventionPlugin : Plugin<Project> {
 
   override fun apply(target: Project) {
     with(target) {
@@ -15,10 +15,10 @@ internal class FeatureComposeConventionPlugin : Plugin<Project> {
       }
 
       dependencies {
-        "implementation"(project(":core:model"))
-        "implementation"(project(":core:android"))
-        "implementation"(project(":core:ui"))
-        "implementation"(project(":core:designsystem"))
+        "implementation"(project(":common:model"))
+        "implementation"(project(":common:android"))
+        "implementation"(project(":presentation:common:ui"))
+        "implementation"(project(":presentation:common:designsystem"))
 
         "implementation"(libs.findBundle("orbit").get())
 

build-logic/convention/src/main/java/RemoteConventionPlugin.kt

@@ -14,8 +14,8 @@ internal class RemoteConventionPlugin : Plugin<Project> {
       }
 
       dependencies {
-        "implementation"(project(":core:model"))
-        "implementation"(project(":core:network"))
+        "implementation"(project(":common:model"))
+        "implementation"(project(":remote:common"))
 
         "implementation"(libs.findBundle("coroutine").get())
 

build-logic/convention/src/main/java/com/kunize/convention/AndroidCompose.kt

@@ -5,7 +5,7 @@ import org.gradle.api.Project
 import org.gradle.kotlin.dsl.dependencies
 
 internal fun Project.configureAndroidCompose(
-  commonExtension: CommonExtension<*, *, *, *, *>,
+  commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
   commonExtension.apply {
     buildFeatures {

build-logic/convention/src/main/java/com/kunize/convention/KotlinAndroid.kt

@@ -6,7 +6,7 @@ import org.gradle.api.plugins.ExtensionAware
 import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions
 
 internal fun Project.configureKotlinAndroid(
-  commonExtension: CommonExtension<*, *, *, *, *>,
+  commonExtension: CommonExtension<*, *, *, *, *, *>,
 ) {
   commonExtension.apply {
     compileSdk = Const.compileSdk
@@ -48,7 +48,7 @@ internal fun Project.configureKotlinAndroid(
   }
 }
 
-internal fun CommonExtension<*, *, *, *, *>.kotlinOptions(
+internal fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(
   block: KotlinJvmOptions.() -> Unit,
 ) {
   (this as ExtensionAware).extensions.configure("kotlinOptions", block)

core/android/build.gradle.kts → common/android/build.gradle.kts

@@ -5,11 +5,11 @@ plugins {
 }
 
 android {
-  namespace = "com.suwiki.core.android"
+  namespace = "com.suwiki.common.android"
 }
 
 dependencies {
-  implementation(projects.core.model)
+  implementation(projects.common.model)
 
   implementation(platform(libs.firebase.bom))
   implementation(libs.firebase.crashlytics)

core/android/src/main/java/com/suwiki/core/android/Dispatcher.kt → common/android/src/main/java/com/suwiki/common/android/Dispatcher.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.android
+package com.suwiki.common.android
 
 import javax.inject.Qualifier
 

core/android/src/main/java/com/suwiki/core/android/DispatchersModule.kt → common/android/src/main/java/com/suwiki/common/android/DispatchersModule.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.android
+package com.suwiki.common.android
 
 import dagger.Module
 import dagger.Provides

core/android/src/main/java/com/suwiki/core/android/ThrowUnknownException.kt → common/android/src/main/java/com/suwiki/common/android/ThrowUnknownException.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.android
+package com.suwiki.common.android
 
 import com.google.firebase.crashlytics.ktx.crashlytics
 import com.google.firebase.ktx.Firebase

core/model/src/main/java/com/suwiki/core/model/enums/EvaluationLevel.kt → common/model/src/main/java/com/suwiki/common/model/enums/EvaluationLevel.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.enums
+package com.suwiki.common.model.enums
 
 import androidx.compose.runtime.Stable
 

core/model/src/main/java/com/suwiki/core/model/enums/LectureAlign.kt → common/model/src/main/java/com/suwiki/common/model/enums/LectureAlign.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.enums
+package com.suwiki.common.model.enums
 
 import androidx.compose.runtime.Stable
 

core/model/src/main/java/com/suwiki/core/model/exception/CommonExceptions.kt → common/model/src/main/java/com/suwiki/common/model/exception/CommonExceptions.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.exception
+package com.suwiki.common.model.exception
 
 class RequestFailException(
   override val message: String = "요청을 처리하지 못했어요.",

core/model/src/main/java/com/suwiki/core/model/exception/SuwikiServerExceptions.kt → common/model/src/main/java/com/suwiki/common/model/exception/SuwikiServerExceptions.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.exception
+package com.suwiki.common.model.exception
 
 enum class SuwikiServerError(val exception: Exception) {
   USER003(IncorrectEmailFormException()),

core/model/src/main/java/com/suwiki/core/model/exception/TimetableExceptions.kt → common/model/src/main/java/com/suwiki/common/model/exception/TimetableExceptions.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.exception
+package com.suwiki.common.model.exception
 
 class TimetableCellOverlapException(
   val name: String,

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/PurchaseHistory.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/PurchaseHistory.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation
+package com.suwiki.common.model.lectureevaluation
 
 import java.time.LocalDateTime
 

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/exam/ExamEvaluationList.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/exam/ExamEvaluationList.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation.exam
+package com.suwiki.common.model.lectureevaluation.exam
 
 import androidx.compose.runtime.Stable
 

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/exam/MyExamEvaluation.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/exam/MyExamEvaluation.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation.exam
+package com.suwiki.common.model.lectureevaluation.exam
 
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/lecture/LectureEvaluationAverage.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/lecture/LectureEvaluationAverage.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation.lecture
+package com.suwiki.common.model.lectureevaluation.lecture
 
 data class LectureEvaluationAverage(
   val id: Long,

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/lecture/LectureEvaluationExtraAverage.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/lecture/LectureEvaluationExtraAverage.kt

@@ -1,9 +1,9 @@
-package com.suwiki.core.model.lectureevaluation.lecture
+package com.suwiki.common.model.lectureevaluation.lecture
 
 import androidx.compose.runtime.Stable
-import com.suwiki.core.model.enums.GradeLevel
-import com.suwiki.core.model.enums.HomeworkLevel
-import com.suwiki.core.model.enums.TeamLevel
+import com.suwiki.common.model.enums.GradeLevel
+import com.suwiki.common.model.enums.HomeworkLevel
+import com.suwiki.common.model.enums.TeamLevel
 
 @Stable
 data class LectureEvaluationExtraAverage(

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/lecture/LectureEvaluationList.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/lecture/LectureEvaluationList.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation.lecture
+package com.suwiki.common.model.lectureevaluation.lecture
 
 import androidx.compose.runtime.Stable
 

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/lecture/LectureInfo.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/lecture/LectureInfo.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation.lecture
+package com.suwiki.common.model.lectureevaluation.lecture
 
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable

core/model/src/main/java/com/suwiki/core/model/lectureevaluation/lecture/MyLectureEvaluation.kt → common/model/src/main/java/com/suwiki/common/model/lectureevaluation/lecture/MyLectureEvaluation.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.lectureevaluation.lecture
+package com.suwiki.common.model.lectureevaluation.lecture
 
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable

core/model/src/main/java/com/suwiki/core/model/notice/Notice.kt → common/model/src/main/java/com/suwiki/common/model/notice/Notice.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.notice
+package com.suwiki.common.model.notice
 
 import java.time.LocalDateTime
 

core/model/src/main/java/com/suwiki/core/model/notice/NoticeDetail.kt → common/model/src/main/java/com/suwiki/common/model/notice/NoticeDetail.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.notice
+package com.suwiki.common.model.notice
 
 import androidx.compose.runtime.Stable
 import java.time.LocalDateTime

core/model/src/main/java/com/suwiki/core/model/openmajor/OpenMajor.kt → common/model/src/main/java/com/suwiki/common/model/openmajor/OpenMajor.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.openmajor
+package com.suwiki.common.model.openmajor
 
 data class OpenMajor(
   val id: Int,

core/model/src/main/java/com/suwiki/core/model/openmajor/OpenMajorVersion.kt → common/model/src/main/java/com/suwiki/common/model/openmajor/OpenMajorVersion.kt

@@ -1,3 +1,3 @@
-package com.suwiki.core.model.openmajor
+package com.suwiki.common.model.openmajor
 
 data class OpenMajorVersion(val version: Float)

core/model/src/main/java/com/suwiki/core/model/timetable/Enums.kt → common/model/src/main/java/com/suwiki/common/model/timetable/Enums.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.timetable
+package com.suwiki.common.model.timetable
 
 enum class TimetableCellColor {
   BROWN,

core/model/src/main/java/com/suwiki/core/model/timetable/OpenLecture.kt → common/model/src/main/java/com/suwiki/common/model/timetable/OpenLecture.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.timetable
+package com.suwiki.common.model.timetable
 
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable

core/model/src/main/java/com/suwiki/core/model/timetable/Timetable.kt → common/model/src/main/java/com/suwiki/common/model/timetable/Timetable.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.timetable
+package com.suwiki.common.model.timetable
 
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable

core/model/src/main/java/com/suwiki/core/model/timetable/TimetableCell.kt → common/model/src/main/java/com/suwiki/common/model/timetable/TimetableCell.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.timetable
+package com.suwiki.common.model.timetable
 
 import androidx.compose.runtime.Stable
 import kotlinx.serialization.Serializable

core/model/src/main/java/com/suwiki/core/model/user/Suspension.kt → common/model/src/main/java/com/suwiki/common/model/user/Suspension.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.user
+package com.suwiki.common.model.user
 
 import java.time.LocalDateTime
 

core/model/src/main/java/com/suwiki/core/model/user/Token.kt → common/model/src/main/java/com/suwiki/common/model/user/Token.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.user
+package com.suwiki.common.model.user
 
 data class Token(
   val accessToken: String,

core/model/src/main/java/com/suwiki/core/model/user/User.kt → common/model/src/main/java/com/suwiki/common/model/user/User.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.model.user
+package com.suwiki.common.model.user
 
 const val DEFAULT_USER_ID = ""
 const val DEFAULT_USER_EMAIL = ""

core/security/build.gradle.kts → common/security/build.gradle.kts

@@ -7,11 +7,11 @@ plugins {
 }
 
 android {
-  namespace = "com.suwiki.core.security"
+  namespace = "com.suwiki.common.security"
 }
 
 dependencies {
-  implementation(projects.core.model)
+  implementation(projects.common.model)
 
   implementation(libs.bundles.coroutine)
 

core/security/src/main/java/com/suwiki/core/security/SecurityPreferences.kt → common/security/src/main/java/com/suwiki/common/security/SecurityPreferences.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.security
+package com.suwiki.common.security
 
 import kotlinx.coroutines.flow.Flow
 import tech.thdev.useful.encrypted.data.store.preferences.ksp.annotations.UsefulPreferences

core/security/src/main/java/com/suwiki/core/security/di/DataStoreModule.kt → common/security/src/main/java/com/suwiki/common/security/di/DataStoreModule.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.security.di
+package com.suwiki.common.security.di
 
 import android.content.Context
 import androidx.datastore.core.DataStore
@@ -7,8 +7,8 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.emptyPreferences
 import androidx.datastore.preferences.preferencesDataStoreFile
-import com.suwiki.core.security.SecurityPreferences
-import com.suwiki.core.security.generateSecurityPreferences
+import com.suwiki.common.security.SecurityPreferences
+import com.suwiki.common.security.generateSecurityPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

core/security/src/main/java/com/suwiki/core/security/di/SecureDataStore.kt → common/security/src/main/java/com/suwiki/common/security/di/SecureDataStore.kt

@@ -1,4 +1,4 @@
-package com.suwiki.core.security.di
+package com.suwiki.common.security.di
 
 import javax.inject.Qualifier