Merge pull request #10 from GO-SOPT-ANDROID/feature/week6-2

Feature/week6 2

app/src/main/AndroidManifest.xml

@@ -3,6 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
 
     <application
         android:allowBackup="true"
@@ -19,10 +22,7 @@
             android:exported="true"
             android:windowSoftInputMode="adjustPan"></activity>
         <activity
-            android:name=".myPage.IntroduceActivity"
-            android:exported="false" />
-        <activity
-            android:name=".myPage.LoginActivity"
+            android:name=".present.loginPage.LoginActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -31,7 +31,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".myPage.SignUpActivity"
+            android:name=".present.loginPage.SignUpActivity"
             android:exported="false" />
     </application>
 

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

@@ -4,9 +4,10 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import org.android.go.sopt.databinding.ActivityMainBinding
-import org.android.go.sopt.present.GalleryFragment
-import org.android.go.sopt.present.HomeFragment
-import org.android.go.sopt.present.SearchFragment
+import org.android.go.sopt.present.menuFragment.GalleryFragment
+import org.android.go.sopt.present.menuFragment.HomeFragment
+import org.android.go.sopt.present.menuFragment.MyProfileFragment
+import org.android.go.sopt.present.menuFragment.SearchFragment
 
 class MainActivity : AppCompatActivity() {
     private lateinit var binding: ActivityMainBinding
@@ -44,6 +45,10 @@ class MainActivity : AppCompatActivity() {
                     changeFragment(GalleryFragment())
                     return@setOnItemSelectedListener true
                 }
+                R.id.menu_profile -> {
+                    changeFragment(MyProfileFragment())
+                    return@setOnItemSelectedListener true
+                }
                 else -> {
                     false
                 }

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

@@ -17,7 +17,7 @@ import org.android.go.sopt.data.*
 import org.android.go.sopt.databinding.ItemBottomBinding
 import org.android.go.sopt.databinding.ItemTopBinding
 import org.android.go.sopt.databinding.ItemUsersBinding
-import org.android.go.sopt.remote.model.ResponseListUsersDto
+import org.android.go.sopt.remote.remoteData.model.ResponseListUsersDto
 
 
 
@@ -31,8 +31,6 @@ class MultiViewAdapter(context: Context) :
 
     private val inflater by lazy { LayoutInflater.from(context) }
     private lateinit var selectionTracker: SelectionTracker<Long>
-    private val context = context
-
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         return when (viewType) {
@@ -114,7 +112,7 @@ class MultiViewAdapter(context: Context) :
 
             binding.tvUserName.text = item.first_name + item.last_name
             binding.tvUserEmail.text = item.email
-            Glide.with(context).load(item.avatar).into(binding.ivAvatar)
+            Glide.with(binding.root).load(item.avatar).into(binding.ivAvatar)
 
             if (selectionTracker != null && selectionTracker.isSelected(absoluteAdapterPosition.toLong())) {
                 binding.ivSelect.setImageResource(R.drawable.ic_home)

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

@@ -0,0 +1,12 @@
+package org.android.go.sopt.data
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class User(
+    val id : String,
+    val pw : String,
+    val name : String,
+    val feature : String
+):Parcelable