diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3f49b4d..486dfbf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,7 +13,7 @@ android:theme="@style/Theme.NOWSOPTAndroid" tools:targetApi="31"> @@ -22,10 +22,10 @@ diff --git a/app/src/main/java/com/sopt/now/LoginActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt similarity index 94% rename from app/src/main/java/com/sopt/now/LoginActivity.kt rename to app/src/main/java/com/sopt/now/presentation/auth/login/LoginActivity.kt index b9dfa25..ee4a6d8 100644 --- a/app/src/main/java/com/sopt/now/LoginActivity.kt +++ b/app/src/main/java/com/sopt/now/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/app/src/main/java/com/sopt/now/SignupActivity.kt b/app/src/main/java/com/sopt/now/presentation/auth/signup/SignupActivity.kt similarity index 94% rename from app/src/main/java/com/sopt/now/SignupActivity.kt rename to app/src/main/java/com/sopt/now/presentation/auth/signup/SignupActivity.kt index 37fd6cb..2bd5836 100644 --- a/app/src/main/java/com/sopt/now/SignupActivity.kt +++ b/app/src/main/java/com/sopt/now/presentation/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/app/src/main/java/com/sopt/now/MainActivity.kt b/app/src/main/java/com/sopt/now/presentation/main/MainActivity.kt similarity index 87% rename from app/src/main/java/com/sopt/now/MainActivity.kt rename to app/src/main/java/com/sopt/now/presentation/main/MainActivity.kt index 12b7239..f0e3c42 100644 --- a/app/src/main/java/com/sopt/now/MainActivity.kt +++ b/app/src/main/java/com/sopt/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 b/app/src/main/java/com/sopt/now/presentation/main/home/Friend.kt similarity index 77% rename from app/src/main/java/com/sopt/now/Friend.kt rename to app/src/main/java/com/sopt/now/presentation/main/home/Friend.kt index 53f871d..53d977c 100644 --- a/app/src/main/java/com/sopt/now/Friend.kt +++ b/app/src/main/java/com/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/app/src/main/java/com/sopt/now/FriendListAdapter.kt b/app/src/main/java/com/sopt/now/presentation/main/home/FriendListAdapter.kt similarity index 97% rename from app/src/main/java/com/sopt/now/FriendListAdapter.kt rename to app/src/main/java/com/sopt/now/presentation/main/home/FriendListAdapter.kt index 2a15801..0ddccda 100644 --- a/app/src/main/java/com/sopt/now/FriendListAdapter.kt +++ b/app/src/main/java/com/sopt/now/presentation/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/app/src/main/java/com/sopt/now/FriendViewHolder.kt b/app/src/main/java/com/sopt/now/presentation/main/home/FriendViewHolder.kt similarity index 91% rename from app/src/main/java/com/sopt/now/FriendViewHolder.kt rename to app/src/main/java/com/sopt/now/presentation/main/home/FriendViewHolder.kt index 3c5d042..bc5ccba 100644 --- a/app/src/main/java/com/sopt/now/FriendViewHolder.kt +++ b/app/src/main/java/com/sopt/now/presentation/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/app/src/main/java/com/sopt/now/HomeFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt similarity index 96% rename from app/src/main/java/com/sopt/now/HomeFragment.kt rename to app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt index 038ac63..ea283c5 100644 --- a/app/src/main/java/com/sopt/now/HomeFragment.kt +++ b/app/src/main/java/com/sopt/now/presentation/main/home/HomeFragment.kt @@ -1,4 +1,4 @@ -package com.sopt.now +package com.sopt.now.presentation.main.home import android.os.Bundle import android.view.LayoutInflater @@ -6,9 +6,8 @@ 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 b/app/src/main/java/com/sopt/now/presentation/main/home/MyProfile.kt similarity index 77% rename from app/src/main/java/com/sopt/now/MyProfile.kt rename to app/src/main/java/com/sopt/now/presentation/main/home/MyProfile.kt index d5d23f8..be35804 100644 --- a/app/src/main/java/com/sopt/now/MyProfile.kt +++ b/app/src/main/java/com/sopt/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/app/src/main/java/com/sopt/now/MyProfileViewHolder.kt b/app/src/main/java/com/sopt/now/presentation/main/home/MyProfileViewHolder.kt similarity index 91% rename from app/src/main/java/com/sopt/now/MyProfileViewHolder.kt rename to app/src/main/java/com/sopt/now/presentation/main/home/MyProfileViewHolder.kt index cc7553c..d0d3eec 100644 --- a/app/src/main/java/com/sopt/now/MyProfileViewHolder.kt +++ b/app/src/main/java/com/sopt/now/presentation/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/app/src/main/java/com/sopt/now/MyPageFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt similarity index 90% rename from app/src/main/java/com/sopt/now/MyPageFragment.kt rename to app/src/main/java/com/sopt/now/presentation/main/mypage/MyPageFragment.kt index 54fdac1..d91032a 100644 --- a/app/src/main/java/com/sopt/now/MyPageFragment.kt +++ b/app/src/main/java/com/sopt/now/presentation/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/app/src/main/java/com/sopt/now/SearchFragment.kt b/app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt similarity index 91% rename from app/src/main/java/com/sopt/now/SearchFragment.kt rename to app/src/main/java/com/sopt/now/presentation/main/search/SearchFragment.kt index 5cef32f..3e828db 100644 --- a/app/src/main/java/com/sopt/now/SearchFragment.kt +++ b/app/src/main/java/com/sopt/now/presentation/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 index b6f598a..facfdde 100644 --- 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"> + tools:context=".presentation.auth.signup.SignupActivity">