[fix]: devInfo 모듈 삭제 - 순환참조 오류 해결

SSU-Plector · Apr 1, 2024 · 6b50884 · 6b50884
1 parent 451689a
commit 6b50884
Show file tree

Hide file tree

Showing 20 changed files with 36 additions and 30 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -76,7 +76,6 @@ dependencies {
     implementation(project(":core:designsystem"))
     implementation(project(":core:common"))
     implementation(project(":feature:projects"))
-    implementation(project(":feature:devInfo"))
     implementation(project(":feature:mypage"))
 
     KotlinDependencies.run {

diff --git a/feature/devInfo/build.gradle.kts b/feature/devInfo/build.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
     implementation(project(":domain"))
     implementation(project(":core:designsystem"))
     implementation(project(":core:common"))
-    implementation(project(":feature:projects"))
 
 
     KotlinDependencies.run {
@@ -73,9 +72,6 @@ dependencies {
     }
 
     implementation(MaterialDesignDependencies.materialDesign)
-    implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
 
     TestDependencies.run {
         testImplementation(jUnit)

diff --git a/feature/devInfo/src/main/AndroidManifest.xml b/feature/devInfo/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
 
     <application>
         <activity
-            android:name=".DevDetailActivity"
+            android:name="com.zucchini.projects.DevDetailActivity"
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>

diff --git a/feature/projects/build.gradle.kts b/feature/projects/build.gradle.kts
@@ -40,7 +40,6 @@ dependencies {
     implementation(project(":domain"))
     implementation(project(":core:designsystem"))
     implementation(project(":core:common"))
-    implementation(project(":feature:devInfo"))
     implementation(project(":feature:mypage"))
 
     KotlinDependencies.run {

diff --git a/feature/projects/src/main/AndroidManifest.xml b/feature/projects/src/main/AndroidManifest.xml
@@ -8,6 +8,12 @@
             android:exported="false"
             android:screenOrientation="portrait"
             android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+
+        <activity
+            android:name="com.zucchini.projects.DevDetailActivity"
+            android:exported="false"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
     </application>
 
 </manifest>
diff --git a/...hini/feature/devInfo/DevDetailActivity.kt → ...om/zucchini/projects/DevDetailActivity.kt b/...hini/feature/devInfo/DevDetailActivity.kt → ...om/zucchini/projects/DevDetailActivity.kt
@@ -1,10 +1,10 @@
-package com.zucchini.feature.devInfo
+package com.zucchini.projects
 
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
-import com.zucchini.feature.devInfo.adapter.DevDetailProjectAdapter
-import com.zucchini.feature.devInfo.databinding.ActivityDevDetailBinding
+import com.zucchini.feature.projects.databinding.ActivityDevDetailBinding
+import com.zucchini.projects.adapter.DevDetailProjectAdapter
 
 class DevDetailActivity : AppCompatActivity() {
     private lateinit var binding: ActivityDevDetailBinding

diff --git a/...cchini/feature/devInfo/DevInfoFragment.kt → .../com/zucchini/projects/DevInfoFragment.kt b/...cchini/feature/devInfo/DevInfoFragment.kt → .../com/zucchini/projects/DevInfoFragment.kt
@@ -1,15 +1,13 @@
-package com.zucchini.feature.devInfo
+package com.zucchini.projects
 
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
-import com.zucchini.common.NavigationProvider
-import com.zucchini.feature.devInfo.adapter.DeveloperInfoAdapter
-import com.zucchini.feature.devInfo.databinding.FragmentDevInfoBinding
-import javax.inject.Inject
+import com.zucchini.feature.projects.databinding.FragmentDevInfoBinding
+import com.zucchini.projects.adapter.DeveloperInfoAdapter
 
 class DevInfoFragment : Fragment() {
     private var _binding: FragmentDevInfoBinding? = null

diff --git a/...chini/feature/devInfo/DevProjectsDummy.kt → ...com/zucchini/projects/DevProjectsDummy.kt b/...chini/feature/devInfo/DevProjectsDummy.kt → ...com/zucchini/projects/DevProjectsDummy.kt
@@ -1,6 +1,7 @@
-package com.zucchini.feature.devInfo
+package com.zucchini.projects
 
 import com.zucchini.domain.model.DevDetailProjectInfo
+import com.zucchini.feature.projects.R
 
 object DevProjectsDummy {
     val devProjectsInfoList = listOf(

diff --git a/...ini/feature/devInfo/DeveloperInfoDummy.kt → ...m/zucchini/projects/DeveloperInfoDummy.kt b/...ini/feature/devInfo/DeveloperInfoDummy.kt → ...m/zucchini/projects/DeveloperInfoDummy.kt
@@ -1,6 +1,7 @@
-package com.zucchini.feature.devInfo
+package com.zucchini.projects
 
 import com.zucchini.domain.model.DeveloperInfo
+import com.zucchini.feature.projects.R
 
 object DeveloperInfoDummy {
     val developerInfoList = listOf(

diff --git a/...evInfo/adapter/DevDetailProjectAdapter.kt → ...ojects/adapter/DevDetailProjectAdapter.kt b/...evInfo/adapter/DevDetailProjectAdapter.kt → ...ojects/adapter/DevDetailProjectAdapter.kt
@@ -1,4 +1,4 @@
-package com.zucchini.feature.devInfo.adapter
+package com.zucchini.projects.adapter
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.zucchini.domain.model.DevDetailProjectInfo
-import com.zucchini.feature.devInfo.DevDetailActivity
-import com.zucchini.feature.devInfo.R
-import com.zucchini.feature.devInfo.databinding.ItemDevDetailProjectsBinding
+import com.zucchini.feature.projects.R
+import com.zucchini.feature.projects.databinding.ItemDevDetailProjectsBinding
+import com.zucchini.projects.DevDetailActivity
 import com.zucchini.view.ItemDiffCallback
 
 class DevDetailProjectAdapter :

diff --git a/...e/devInfo/adapter/DeveloperInfoAdapter.kt → .../projects/adapter/DeveloperInfoAdapter.kt b/...e/devInfo/adapter/DeveloperInfoAdapter.kt → .../projects/adapter/DeveloperInfoAdapter.kt
@@ -1,4 +1,4 @@
-package com.zucchini.feature.devInfo.adapter
+package com.zucchini.projects.adapter
 
 import android.content.Intent
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import androidx.core.content.ContextCompat.startActivity
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
 import com.zucchini.domain.model.DeveloperInfo
-import com.zucchini.feature.devInfo.DevDetailActivity
-import com.zucchini.feature.devInfo.R
-import com.zucchini.feature.devInfo.databinding.ItemDeveloperBinding
+import com.zucchini.feature.projects.R
+import com.zucchini.feature.projects.databinding.ItemDeveloperBinding
+import com.zucchini.projects.DevDetailActivity
 import com.zucchini.view.ItemDiffCallback
 
 class DeveloperInfoAdapter :
@@ -38,7 +38,8 @@ class DeveloperInfoAdapter :
         fun bind(developerInfo: DeveloperInfo) {
             binding.run {
                 ivProjectProfile.setImageResource(
-                    developerInfo.image ?: R.drawable.developer_default_image,
+                    developerInfo.image
+                        ?: R.drawable.developer_default_image,
                 )
                 tvDeveloperName.text = developerInfo.name
                 tvDeveloperField.text = developerInfo.field

diff --git a/.../res/drawable/developer_default_image.xml → .../res/drawable/developer_default_image.xml b/.../res/drawable/developer_default_image.xml → .../res/drawable/developer_default_image.xml
diff --git a/.../main/res/drawable/devinfo_background.xml → .../main/res/drawable/devinfo_background.xml b/.../main/res/drawable/devinfo_background.xml → .../main/res/drawable/devinfo_background.xml
diff --git a/...c/main/res/layout/activity_dev_detail.xml → ...c/main/res/layout/activity_dev_detail.xml b/...c/main/res/layout/activity_dev_detail.xml → ...c/main/res/layout/activity_dev_detail.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DevDetailActivity">
+    tools:context="com.zucchini.projects.DevDetailActivity">
 
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"

diff --git a/...src/main/res/layout/fragment_dev_info.xml → ...src/main/res/layout/fragment_dev_info.xml b/...src/main/res/layout/fragment_dev_info.xml → ...src/main/res/layout/fragment_dev_info.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".DevInfoFragment">
+    tools:context="com.zucchini.projects.DevInfoFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cl_top_app_bar"

diff --git a/...n/res/layout/item_dev_detail_projects.xml → ...n/res/layout/item_dev_detail_projects.xml b/...n/res/layout/item_dev_detail_projects.xml → ...n/res/layout/item_dev_detail_projects.xml
diff --git a/...fo/src/main/res/layout/item_developer.xml → ...ts/src/main/res/layout/item_developer.xml b/...fo/src/main/res/layout/item_developer.xml → ...ts/src/main/res/layout/item_developer.xml
diff --git a/feature/projects/src/main/res/navigation/nav_graph.xml b/feature/projects/src/main/res/navigation/nav_graph.xml
@@ -5,7 +5,7 @@
 
     <fragment
         android:id="@+id/devinfo_dest"
-        android:name="com.zucchini.feature.devInfo.DevInfoFragment"
+        android:name="com.zucchini.projects.DevInfoFragment"
         android:label="DevInfo Fragment" />
     <fragment
         android:id="@+id/projects_dest"

diff --git a/feature/projects/src/main/res/values/strings.xml b/feature/projects/src/main/res/values/strings.xml
@@ -7,4 +7,10 @@
     <string name="tv_sort_recent">최신순</string>
     <string name="tv_sort_high_check">조회수 높은순</string>
     <string name="tv_sort_low_check">조회수 낮은순</string>
+    <string name="top_app_bar_developer">개발자 찾기</string>
+    <string name="dev_detail_top_bar">개발자 상세 페이지</string>
+    <string name="github">Github</string>
+    <string name="kakao_id">카카오톡 아이디</string>
+    <string name="email">이메일</string>
+    <string name="tv_navigate_to_project"><u>프로젝트 보러가기&#8599;</u></string>
 </resources>
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -20,7 +20,6 @@ include(":app")
 include(":domain")
 include(":data")
 include(":feature")
-include(":feature:devInfo")
 include(":feature:mypage")
 include(":feature:projects")
 include(":core:designsystem")