Merge pull request #217 from nowwater/feature-add-picture

fix : add profile image
now-water · Jun 2, 2021 · 7590b27 · 7590b27
2 parents 1bd4a1c + 2e08a53
commit 7590b27
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 12 deletions.
diff --git a/client/app/src/main/java/com/example/chattingapp/adapter/AddFriendAdapter.kt b/client/app/src/main/java/com/example/chattingapp/adapter/AddFriendAdapter.kt
@@ -5,9 +5,11 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
+import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
 import com.example.chattingapp.R
 import com.example.chattingapp.dto.User
 import com.example.chattingapp.service.FriendApiService
@@ -22,16 +24,22 @@ class AddFriendAdapter(val context: Context, val userList: ArrayList<User>) :
         val nameText = itemView?.findViewById<TextView>(R.id.nameText)
         val statusText = itemView?.findViewById<TextView>(R.id.statusText)
         val btn_addfriend_item = itemView?.findViewById<Button>(R.id.btn_add_friend_item)
+        val profileImage = itemView?.findViewById<ImageView>(R.id.friend_add_image)
 
         fun bind(friend: User, context: Context) {
-            nameText?.text = friend.name
+            nameText?.text = friend.nickName
             statusText?.text = friend.statusMessage
             btn_addfriend_item?.setOnClickListener {
                 FriendApiService.instance.addFriend(userList[adapterPosition].userId){
                     //Toast.makeText(getContext(), "친구추가 완료하였습니다.",Toast.LENGTH_SHORT)
                     Log.d("addFriend", "Success!")
                 }
             }
+            friend.profileImage?.let {
+                if (profileImage != null) {
+                    Glide.with(context).load(it).into(profileImage)
+                }
+            }
         }
     }
 

diff --git a/client/app/src/main/java/com/example/chattingapp/adapter/AddRoomAdapter.kt b/client/app/src/main/java/com/example/chattingapp/adapter/AddRoomAdapter.kt
@@ -5,24 +5,34 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.CheckBox
+import android.widget.ImageView
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import com.bumptech.glide.Glide
 import com.example.chattingapp.R
 import com.example.chattingapp.dto.Friend
 
 // Main Userlist type Adapter
 class AddRoomAdapter(val context: Context, val friendList: ArrayList<Friend>, val inviteList: ArrayList<Friend>) :
     RecyclerView.Adapter<AddRoomAdapter.Holder>() {
+    private var friends: ArrayList<Friend>? = friendList
 
     inner class Holder(itemView: View?) : RecyclerView.ViewHolder(itemView!!) {
         val nameText = itemView?.findViewById<TextView>(R.id.nameText)
         val statusText = itemView?.findViewById<TextView>(R.id.statusText)
         val checkbox = itemView?.findViewById<CheckBox>(R.id.checkBox)
+        val profileImage = itemView?.findViewById<ImageView>(R.id.friend_room_image)
 
         fun bind(friend: Friend, context: Context) {
             nameText?.text = friend.name
             statusText?.text = friend.statusMessage
 
+            friend.profileImage?.let {
+                if (profileImage != null) {
+                    Glide.with(context).load(it).into(profileImage)
+                }
+            }
+
             checkbox?.setOnCheckedChangeListener { compoundButton, isChecked ->
                 if(isChecked){
                     Log.d("체크됨", "체크됨")

diff --git a/client/app/src/main/java/com/example/chattingapp/adapter/FriendlistAdapter.kt b/client/app/src/main/java/com/example/chattingapp/adapter/FriendlistAdapter.kt
@@ -26,7 +26,7 @@ class FriendlistAdapter(val context: Context, var friendList: ArrayList<Friend>)
         val profileImage = itemView?.findViewById<ImageView>(R.id.friend_image)
 
         fun bind(friend: Friend, context: Context) {
-            nameText?.text = friend.name
+            nameText?.text = friend.nickName
             statusText?.text = friend.statusMessage
 
             friend.profileImage?.let {

diff --git a/client/app/src/main/java/com/example/chattingapp/dto/User.kt b/client/app/src/main/java/com/example/chattingapp/dto/User.kt
@@ -32,5 +32,5 @@ data class User (
     val statusMessage : String?,
 
     @SerializedName("profileImage")
-    val profileImageUrl : String?,
+    val profileImage : String?,
 ) : Parcelable
diff --git a/client/app/src/main/java/com/example/chattingapp/view/ProfileChangeActivity.kt b/client/app/src/main/java/com/example/chattingapp/view/ProfileChangeActivity.kt
@@ -35,7 +35,7 @@ class ProfileChangeActivity : AppCompatActivity() {
                 et_profile_name.setText(user.nickName)
                 et_profile_status_msg.setText(user.statusMessage)
 
-                user.profileImageUrl?.let { Glide.with(this).load(it).into(et_profile_image) }
+                user.profileImage?.let { Glide.with(this).load(it).into(et_profile_image) }
 
                 btn_change_nickname.setOnClickListener {
                         UserApiService.instance.updateNickName(et_profile_name.text.toString()) {
@@ -84,7 +84,7 @@ class ProfileChangeActivity : AppCompatActivity() {
         private fun sendImageChangedAndSetImageView(uri: Uri) {
                 val file = ImageService.toFile(this, uri)!!
                 UserApiService.instance.uploadProfileImage(file, {
-                        Glide.with(this).load(it.profileImageUrl).into(et_profile_image)
+                        Glide.with(this).load(it.profileImage).into(et_profile_image)
                         Thread() {
                                 AppDatabase.getInstance(applicationContext).userDao().insert(it)
                         }.start()

diff --git a/client/app/src/main/java/com/example/chattingapp/view/fragment/FriendSearchFragment.kt b/client/app/src/main/java/com/example/chattingapp/view/fragment/FriendSearchFragment.kt
@@ -64,7 +64,7 @@ class FriendSearchFragment(val user : User) : Fragment(), SimpleTextWatcher {
         val et_search_friend: EditText = view.findViewById(R.id.et_search_friend)
 
 
-        user.profileImageUrl?.let { Glide.with(this).load(it).into(my_image) }
+        user.profileImage?.let { Glide.with(this).load(it).into(my_image) }
 
         my_name.setText(user.name)
         my_status_msg.setText(user.statusMessage)   // 상태메세지 항목없어서 임의로 시현때 보여주려고 암거나 넣음

diff --git a/client/app/src/main/java/com/example/chattingapp/view/fragment/FriendlistFragment.kt b/client/app/src/main/java/com/example/chattingapp/view/fragment/FriendlistFragment.kt
@@ -71,7 +71,7 @@ class FriendlistFragment(var userId : Int) : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         AppDatabase.getInstance(context!!).userDao().getLiveData(userId).observe(this){ user ->
-            user.profileImageUrl?.let { Glide.with(this).load(it).into(my_image) }
+            user.profileImage?.let { Glide.with(this).load(it).into(my_image) }
             my_name.setText(user.name)
             my_status_msg.setText(user.statusMessage)   // 상태메세지 항목없어서 임의로 시현때 보여주려고 암거나 넣음
 

diff --git a/client/app/src/main/java/com/example/chattingapp/view/fragment/SettingFragment.kt b/client/app/src/main/java/com/example/chattingapp/view/fragment/SettingFragment.kt
@@ -45,7 +45,7 @@ class SettingFragment(var user: User) : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         setting_myname.setText(user.name)
-        user.profileImageUrl?.let { Glide.with(this).load(it).into(profile_photo) }
+        user.profileImage?.let { Glide.with(this).load(it).into(profile_photo) }
 
         // for test
         view.findViewById<ImageView>(R.id.profile_photo).setOnClickListener { view ->
@@ -72,8 +72,8 @@ class SettingFragment(var user: User) : Fragment() {
         logger.info("이미지 파일 만들기 성공!")
         UserApiService.instance.uploadProfileImage(file,{
             logger.info("프로필 이미지 업로드 성공!")
-            logger.info(it.profileImageUrl)
-            Glide.with(this).load(it.profileImageUrl).into(profile_photo)
+            logger.info(it.profileImage)
+            Glide.with(this).load(it.profileImage).into(profile_photo)
 
             Thread() {
                 AppDatabase.getInstance(context!!).userDao().insert(it)

diff --git a/client/app/src/main/res/layout/widget_addfriend_item.xml b/client/app/src/main/res/layout/widget_addfriend_item.xml
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:id="@+id/my_image"
+            android:id="@+id/friend_add_image"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_weight="1"

diff --git a/client/app/src/main/res/layout/widget_addroom_item.xml b/client/app/src/main/res/layout/widget_addroom_item.xml
@@ -18,7 +18,7 @@
         app:layout_constraintTop_toTopOf="parent">
 
         <ImageView
-            android:id="@+id/my_image"
+            android:id="@+id/friend_room_image"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_weight="1"