Week2

app/build.gradle

@@ -49,4 +49,14 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    // ConcatAdapter
+    implementation "androidx.recyclerview:recyclerview:1.3.0"
+
+    // ViewModel 사용하기
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
+
+    // ViewModel 생성함수를 편하게 사용하고 싶다면?
+    implementation "androidx.fragment:fragment-ktx:1.5.7"
+    implementation "androidx.activity:activity-ktx:1.7.1"
 }

app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".SoptApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/org/android/go/sopt/SoptApplication.kt

@@ -0,0 +1,15 @@
+package org.android.go.sopt
+
+import android.app.Application
+import org.android.go.sopt.util.UserSharedPreferences
+
+class SoptApplication : Application() {
+    override fun onCreate() {
+        prefs = UserSharedPreferences(this)
+        super.onCreate()
+    }
+
+    companion object {
+        lateinit var prefs: UserSharedPreferences
+    }
+}

app/src/main/java/org/android/go/sopt/data/Dog.kt

@@ -0,0 +1,9 @@
+package org.android.go.sopt.data
+
+import androidx.annotation.DrawableRes
+
+data class Dog(
+    val name: String,
+    @DrawableRes val image: Int,
+    val size: String
+)

app/src/main/java/org/android/go/sopt/presentation/login/LoginActivity.kt

@@ -2,22 +2,20 @@ package org.android.go.sopt.presentation.login
 
 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import org.android.go.sopt.R
-import org.android.go.sopt.data.User
 import org.android.go.sopt.presentation.main.MainActivity
 import org.android.go.sopt.presentation.signup.SignUpActivity
 import org.android.go.sopt.databinding.ActivityLoginBinding
+import org.android.go.sopt.SoptApplication
 import org.android.go.sopt.util.*
 
 
 class LoginActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityLoginBinding
-    private var user: User? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -36,10 +34,15 @@ class LoginActivity : AppCompatActivity() {
     private fun onClickLogin() {
         with(binding) {
             btMainLogin.setOnClickListener {
-                if (user !== null && user?.id == etMainId.text.toString() && user?.password == etMainPassword.text.toString()) {
+                if (SoptApplication.prefs.getString(
+                        KEY_ID,
+                        null
+                    ) == etMainId.text.toString() && SoptApplication.prefs.getString(
+                        KEY_PASSWORD, null
+                    ) == etMainPassword.text.toString()
+                ) {
                     val intent = Intent(this@LoginActivity, MainActivity::class.java)
-                    intent.putExtra(IntentKey.USER_DATA, user)
-                    saveUserInformation()
+                    SoptApplication.prefs.setBoolean(KEY_ISLOGIN, true)
                     startActivity(intent)
                     showShortToast(getString(R.string.login_success_login_msg))
                     if (!isFinishing) finish()
@@ -50,13 +53,10 @@ class LoginActivity : AppCompatActivity() {
         }
     }
 
-
     private val getResultSignUp = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { result: ActivityResult ->
         if (result.resultCode == RESULT_OK) {
-            user = result.data?.getParcelable(IntentKey.USER_DATA, User::class.java)
-            Log.d("user", "---------\n$user")
             showShortSnackbar(binding.root, getString(R.string.login_success_sign_up_msg))
         }
     }
@@ -68,39 +68,18 @@ class LoginActivity : AppCompatActivity() {
         }
     }
 
-    private fun saveUserInformation() {
-        val sharedPreference = getSharedPreferences(KEY_PREFS, 0)
-        val editor = sharedPreference.edit()
-        editor.putString(KEY_ID, user?.id)
-        editor.putString(KEY_PASSWORD, user?.password)
-        editor.putString(KEY_NAME, user?.name)
-        editor.putString(KEY_SPECIALTY, user?.specialty)
-        editor.apply()
-    }
-
     private fun autoLogin() {
-        val sharedPreferences = getSharedPreferences(KEY_PREFS, 0)
-
-        if (sharedPreferences.contains(KEY_ID) || sharedPreferences.contains(KEY_PASSWORD)) {
-            user = User(
-                sharedPreferences.getString(KEY_ID, ""),
-                sharedPreferences.getString(KEY_PASSWORD, ""),
-                sharedPreferences.getString(KEY_NAME, ""),
-                sharedPreferences.getString(KEY_SPECIALTY, "")
-            )
+        if (SoptApplication.prefs.getBoolean(KEY_ISLOGIN, false)) {
             val intent = Intent(this, MainActivity::class.java)
-            intent.putExtra(IntentKey.USER_DATA, user)
             startActivity(intent)
             showShortToast(getString(R.string.login_success_login_msg))
             if (!isFinishing) finish()
         }
     }
 
     companion object {
-        private const val KEY_PREFS = "autoLogin"
+        private const val KEY_ISLOGIN = "isLogin"
         private const val KEY_ID = "id"
         private const val KEY_PASSWORD = "password"
-        private const val KEY_NAME = "name"
-        private const val KEY_SPECIALTY = "specialty"
     }
 }

app/src/main/java/org/android/go/sopt/presentation/main/MainActivity.kt

@@ -1,17 +1,14 @@
 package org.android.go.sopt.presentation.main
 
-import android.os.Build
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.fragment.app.Fragment
-import org.android.go.sopt.GalleryFragment
-import org.android.go.sopt.HomeFragment
 import org.android.go.sopt.R
-import org.android.go.sopt.SearchFragment
-import org.android.go.sopt.data.User
 import org.android.go.sopt.databinding.ActivityMainBinding
-import org.android.go.sopt.util.IntentKey
-import org.android.go.sopt.util.getParcelable
+import org.android.go.sopt.presentation.main.gallery.GalleryFragment
+import org.android.go.sopt.presentation.main.home.HomeFragment
+import org.android.go.sopt.presentation.main.mypage.MyPageFragment
+import org.android.go.sopt.presentation.main.search.SearchFragment
 
 
 class MainActivity : AppCompatActivity() {
@@ -21,41 +18,54 @@ class MainActivity : AppCompatActivity() {
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-//        val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_main)
-//        if (currentFragment == null) {
-//            supportFragmentManager.beginTransaction().add(R.id.fcv_main, HomeFragment()).commit()
-//        }
-//        binding.bnvMain.setOnItemSelectedListener { item ->
-//            when (item.itemId) {
-//                R.id.menu_home -> {
-//                    HomeFragment()
-//                    return@setOnItemSelectedListener true
-//                }
-//                R.id.menu_search -> {
-//                    SearchFragment()
-//                    return@setOnItemSelectedListener true
-//                }
-//                else -> {
-//                    GalleryFragment()
-//                    return@setOnItemSelectedListener true
-//
-//                }
-//            }
-//        }
-
-        this.getUserData()
+        this.initLayout()
+        this.goToTop()
     }
 
-    private fun getUserData() {
-        val user: User? = intent.getParcelable(IntentKey.USER_DATA, User::class.java)
-        binding.tvMainName.text = "이름 : ${user?.name}"
-        binding.tvMainSpecialty.text = "특기 : ${user?.specialty}"
+
+
+    private fun initLayout() {
+        val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_main)
+        if (currentFragment == null) {
+            supportFragmentManager.beginTransaction().add(R.id.fcv_main, HomeFragment()).commit()
+        }
+        binding.bnvMain.setOnItemSelectedListener { item ->
+            when (item.itemId) {
+                R.id.menu_home -> {
+                    this.changeFragment(HomeFragment())
+                }
+                R.id.menu_search -> {
+                    this.changeFragment(SearchFragment())
+                }
+                R.id.menu_gallery -> {
+                    this.changeFragment(GalleryFragment())
+                }
+                else -> {
+                    this.changeFragment(MyPageFragment())
+                }
+            }
+            return@setOnItemSelectedListener true
+        }
+    }
+
+
+    private fun changeFragment(fragment: Fragment) {
+        supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.fcv_main, fragment)
+            .commit()
     }
 
-//    private fun changeFragment(fragment: Fragment) {
-//        supportFragmentManager
-//            .beginTransaction()
-//            .replace(R.id.fcv_main, fragment)
-//            .commit()
-//    }
+    private fun goToTop(){
+        binding.bnvMain.setOnItemReselectedListener {
+            when(it.itemId){
+                R.id.menu_home -> {
+                    val currentFragment = supportFragmentManager.findFragmentById(R.id.fcv_main)
+                    if(currentFragment is HomeFragment){
+                        currentFragment.scrollToTop()
+                    }
+                }
+            }
+        }
+    }
 }

app/src/main/java/org/android/go/sopt/presentation/main/gallery/GalleryFragment.kt

@@ -0,0 +1,32 @@
+package org.android.go.sopt.presentation.main.gallery
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import org.android.go.sopt.databinding.FragmentGalleryBinding
+
+class GalleryFragment : Fragment() {
+    private var _binding: FragmentGalleryBinding? = null
+    private val binding: FragmentGalleryBinding
+        get() = requireNotNull(_binding) { "앗!_binding이 null이다!" }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentGalleryBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+}

app/src/main/java/org/android/go/sopt/presentation/main/home/DogAdapter.kt

@@ -0,0 +1,42 @@
+package org.android.go.sopt.presentation.main.home
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import androidx.recyclerview.widget.RecyclerView
+import org.android.go.sopt.data.Dog
+import org.android.go.sopt.databinding.ItemDogBinding
+
+class DogAdapter(context: Context) : ListAdapter<Dog, DogAdapter.DogViewHolder>(DogDiffCallback()) {
+    private val inflater by lazy { LayoutInflater.from(context) }
+
+    class DogViewHolder(private val binding: ItemDogBinding) :
+        RecyclerView.ViewHolder(binding.root) {
+        fun onBind(dog: Dog) {
+            binding.ivDogImage.setImageDrawable(binding.root.context.getDrawable(dog.image))
+            binding.tvDogName.text = dog.name
+            binding.tvDogSize.text = dog.size
+        }
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DogViewHolder {
+        val binding = ItemDogBinding.inflate(inflater, parent, false)
+        return DogViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: DogViewHolder, position: Int) {
+        holder.onBind(getItem(position))
+    }
+}
+
+class DogDiffCallback : DiffUtil.ItemCallback<Dog>() {
+    override fun areItemsTheSame(oldItem: Dog, newItem: Dog): Boolean {
+        return oldItem.name == newItem.name
+    }
+
+    override fun areContentsTheSame(oldItem: Dog, newItem: Dog): Boolean {
+        return oldItem == newItem
+    }
+}

app/src/main/java/org/android/go/sopt/presentation/main/home/HomeFragment.kt

@@ -0,0 +1,44 @@
+package org.android.go.sopt.presentation.main.home
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.ConcatAdapter
+import org.android.go.sopt.databinding.FragmentHomeBinding
+
+class HomeFragment : Fragment() {
+    private var _binding: FragmentHomeBinding? = null
+    private val binding: FragmentHomeBinding
+        get() = requireNotNull(_binding) { "앗!_binding이 null이다!" }
+
+    private val viewModel by viewModels<HomeViewModel>()
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = FragmentHomeBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val titleAdapter = TitleAdapter(requireContext())
+        val dogAdapter = DogAdapter(requireContext())
+        dogAdapter.submitList(viewModel.mockDogList)
+        binding.rvHomeDog.adapter = ConcatAdapter(titleAdapter, dogAdapter)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        _binding = null
+    }
+
+    fun scrollToTop() {
+        binding.rvHomeDog.smoothScrollToPosition(0)
+    }
+}