[feat/#7] 대략적인 폴더링

NOW-SOPT-ANDROID · Apr 27, 2024 · 0a91abb · 0a91abb
1 parent f9864a1
commit 0a91abb
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 32 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
         android:theme="@style/Theme.NOWSOPTAndroid"
         tools:targetApi="31">
         <activity
-            android:name=".LoginActivity"
+            android:name=".presentation.auth.login.LoginActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -22,10 +22,10 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MainActivity"
+            android:name=".presentation.main.MainActivity"
             android:exported="false"></activity>
         <activity
-            android:name=".SignupActivity"
+            android:name=".presentation.auth.signup.SignupActivity"
             android:exported="false"></activity>
     </application>
 

diff --git a/...c/main/java/com/sopt/now/LoginActivity.kt → .../presentation/auth/login/LoginActivity.kt b/...c/main/java/com/sopt/now/LoginActivity.kt → .../presentation/auth/login/LoginActivity.kt
@@ -1,14 +1,13 @@
-package com.sopt.now
+package com.sopt.now.presentation.auth.login
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.google.android.material.snackbar.Snackbar
+import com.sopt.now.presentation.main.MainActivity
 import com.sopt.now.databinding.ActivityLoginBinding
+import com.sopt.now.presentation.auth.signup.SignupActivity
 
 class LoginActivity : AppCompatActivity() {
     private lateinit var binding: ActivityLoginBinding

diff --git a/.../main/java/com/sopt/now/SignupActivity.kt → ...resentation/auth/signup/SignupActivity.kt b/.../main/java/com/sopt/now/SignupActivity.kt → ...resentation/auth/signup/SignupActivity.kt
@@ -1,13 +1,10 @@
-package com.sopt.now
+package com.sopt.now.presentation.auth.signup
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import com.google.android.material.snackbar.Snackbar
 import com.sopt.now.databinding.ActivitySignupBinding
 

diff --git a/...rc/main/java/com/sopt/now/MainActivity.kt → ...opt/now/presentation/main/MainActivity.kt b/...rc/main/java/com/sopt/now/MainActivity.kt → ...opt/now/presentation/main/MainActivity.kt
@@ -1,12 +1,13 @@
-package com.sopt.now
+package com.sopt.now.presentation.main
 
 import android.os.Bundle
-import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
 import androidx.fragment.app.Fragment
+import com.sopt.now.presentation.main.mypage.MyPageFragment
+import com.sopt.now.R
 import com.sopt.now.databinding.ActivityMainBinding
+import com.sopt.now.presentation.main.home.HomeFragment
+import com.sopt.now.presentation.main.search.SearchFragment
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -27,12 +28,12 @@ class MainActivity : AppCompatActivity() {
     private fun setBottomNavigation() {
         binding.bnvHome.setOnItemSelectedListener{
             when (it.itemId) {
-                R.id.menu_home-> {
+                R.id.menu_home -> {
                     replaceFragment(HomeFragment())
                     true
                 }
 
-                R.id.menu_search-> {
+                R.id.menu_search -> {
                     replaceFragment(SearchFragment())
                     true
                 }

diff --git a/app/src/main/java/com/sopt/now/Friend.kt → ...sopt/now/presentation/main/home/Friend.kt b/app/src/main/java/com/sopt/now/Friend.kt → ...sopt/now/presentation/main/home/Friend.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.annotation.DrawableRes
 data class Friend(

diff --git a/...in/java/com/sopt/now/FriendListAdapter.kt → ...esentation/main/home/FriendListAdapter.kt b/...in/java/com/sopt/now/FriendListAdapter.kt → ...esentation/main/home/FriendListAdapter.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

diff --git a/...ain/java/com/sopt/now/FriendViewHolder.kt → ...resentation/main/home/FriendViewHolder.kt b/...ain/java/com/sopt/now/FriendViewHolder.kt → ...resentation/main/home/FriendViewHolder.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.now.databinding.ItemFriendBinding

diff --git a/...rc/main/java/com/sopt/now/HomeFragment.kt → ...ow/presentation/main/home/HomeFragment.kt b/...rc/main/java/com/sopt/now/HomeFragment.kt → ...ow/presentation/main/home/HomeFragment.kt
@@ -1,14 +1,13 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 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.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
+import com.sopt.now.R
 import com.sopt.now.databinding.FragmentHomeBinding
-import com.sopt.now.databinding.ItemFriendBinding
 
 class HomeFragment: Fragment() {
     private var _binding: FragmentHomeBinding? = null

diff --git a/app/src/main/java/com/sopt/now/MyProfile.kt → ...t/now/presentation/main/home/MyProfile.kt b/app/src/main/java/com/sopt/now/MyProfile.kt → ...t/now/presentation/main/home/MyProfile.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.annotation.DrawableRes
 data class MyProfile(

diff --git a/.../java/com/sopt/now/MyProfileViewHolder.kt → ...entation/main/home/MyProfileViewHolder.kt b/.../java/com/sopt/now/MyProfileViewHolder.kt → ...entation/main/home/MyProfileViewHolder.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.home
 
 import androidx.recyclerview.widget.RecyclerView
 import com.sopt.now.databinding.ItemMyprofileBinding

diff --git a/.../main/java/com/sopt/now/MyPageFragment.kt → ...resentation/main/mypage/MyPageFragment.kt b/.../main/java/com/sopt/now/MyPageFragment.kt → ...resentation/main/mypage/MyPageFragment.kt
@@ -1,13 +1,11 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.mypage
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
+import com.sopt.now.presentation.main.home.FriendListAdapter
 import com.sopt.now.databinding.FragmentMypageBinding
 class MyPageFragment: Fragment() {
     private var _binding: FragmentMypageBinding? = null

diff --git a/.../main/java/com/sopt/now/SearchFragment.kt → ...resentation/main/search/SearchFragment.kt b/.../main/java/com/sopt/now/SearchFragment.kt → ...resentation/main/search/SearchFragment.kt
@@ -1,4 +1,4 @@
-package com.sopt.now
+package com.sopt.now.presentation.main.search
 
 import android.os.Bundle
 import android.view.LayoutInflater

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -5,7 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".LoginActivity">
+    tools:context=".presentation.auth.login.LoginActivity">
 
     <TextView
         android:layout_width="wrap_content"

diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
@@ -5,7 +5,7 @@
     android:id="@+id/signup"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SignupActivity">
+    tools:context=".presentation.auth.signup.SignupActivity">
 
     <TextView
         android:layout_width="wrap_content"