From fe7ee86e17bf5e28c9da28013633d37fd9898d8e Mon Sep 17 00:00:00 2001
From: easyhooon <51016231+easyhooon@users.noreply.github.com>
Date: Sun, 20 Jun 2021 19:38:04 +0900
Subject: [PATCH 1/2] ui fix and Chat Adapter ViewBinding implementation

---
 .../java/kr/ac/konkuk/koogle/Adapter/CardAdapter.kt   |  3 ---
 .../java/kr/ac/konkuk/koogle/Adapter/ChatAdapter.kt   | 11 ++++-------
 app/src/main/res/layout/activity_article.xml          |  2 ++
 app/src/main/res/layout/activity_image_view.xml       |  4 ++--
 app/src/main/res/layout/activity_map.xml              |  1 +
 app/src/main/res/layout/item_right_chat.xml           |  2 +-
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Adapter/CardAdapter.kt b/app/src/main/java/kr/ac/konkuk/koogle/Adapter/CardAdapter.kt
index 4e97165..a3e22dc 100644
--- a/app/src/main/java/kr/ac/konkuk/koogle/Adapter/CardAdapter.kt
+++ b/app/src/main/java/kr/ac/konkuk/koogle/Adapter/CardAdapter.kt
@@ -82,9 +82,6 @@ class CardAdapter(val context: Context?): ListAdapter<CardModel, CardAdapter.Vie
                 binding.recruitmentNumberTextView.setTextColor(Color.RED)
             }
 
-            //todo 썸네일 이미지 뷰를 글라이드를 통해 로드
-            //todo 사진이 존재하지 않는다면 해당 이미지뷰가 보이지 않게
-
             binding.checkImageView.setOnClickListener {
                 itemClickListener?.onItemChecked(
                     this,
diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Adapter/ChatAdapter.kt b/app/src/main/java/kr/ac/konkuk/koogle/Adapter/ChatAdapter.kt
index 84f3536..0d66445 100644
--- a/app/src/main/java/kr/ac/konkuk/koogle/Adapter/ChatAdapter.kt
+++ b/app/src/main/java/kr/ac/konkuk/koogle/Adapter/ChatAdapter.kt
@@ -5,15 +5,12 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
+import androidx.viewbinding.ViewBinding
 import com.bumptech.glide.Glide
-import de.hdodenhof.circleimageview.CircleImageView
 import kr.ac.konkuk.koogle.DBKeys.Companion.LEFT_CHAT
 import kr.ac.konkuk.koogle.DBKeys.Companion.RIGHT_CHAT
 import kr.ac.konkuk.koogle.Model.ChatModel
-import kr.ac.konkuk.koogle.R
-import kr.ac.konkuk.koogle.databinding.ItemCardBinding
 import kr.ac.konkuk.koogle.databinding.ItemLeftChatBinding
 import kr.ac.konkuk.koogle.databinding.ItemRightChatBinding
 import java.text.SimpleDateFormat
@@ -22,11 +19,11 @@ import java.util.*
 class ChatAdapter(val context: Context, private val chatList: MutableList<ChatModel>) :
     RecyclerView.Adapter<ChatAdapter.BaseViewHolder<*>>() {
 
-    abstract class BaseViewHolder<T>(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    abstract class BaseViewHolder<T>(private val binding: ViewBinding) : RecyclerView.ViewHolder(binding.root) {
         abstract fun bind(item: T)
     }
 
-    inner class LeftViewHolder(private val binding: ItemLeftChatBinding) : BaseViewHolder<ChatModel>(binding.root) {
+    inner class LeftViewHolder(private val binding: ItemLeftChatBinding) : BaseViewHolder<ChatModel>(binding) {
 
         @SuppressLint("SimpleDateFormat")
         val format = SimpleDateFormat("a HH:mm", Locale.KOREA)
@@ -46,7 +43,7 @@ class ChatAdapter(val context: Context, private val chatList: MutableList<ChatMo
         }
     }
 
-    inner class RightViewHolder(private val binding: ItemRightChatBinding) : BaseViewHolder<ChatModel>(binding.root) {
+    inner class RightViewHolder(private val binding: ItemRightChatBinding) : BaseViewHolder<ChatModel>(binding) {
 
         @SuppressLint("SimpleDateFormat")
         val format = SimpleDateFormat("a HH:mm", Locale.KOREA)
diff --git a/app/src/main/res/layout/activity_article.xml b/app/src/main/res/layout/activity_article.xml
index 99fec0f..9478083 100644
--- a/app/src/main/res/layout/activity_article.xml
+++ b/app/src/main/res/layout/activity_article.xml
@@ -201,10 +201,12 @@
                         android:id="@+id/tagRecyclerView"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:background="@drawable/borderline_top_bottom"
                         android:layout_gravity="center"
                         android:padding="16dp" />
 
                     <androidx.recyclerview.widget.RecyclerView
+                        android:layout_marginTop="12dp"
                         android:id="@+id/photoImageRecyclerView"
                         android:layout_width="match_parent"
                         android:layout_height="140dp"
diff --git a/app/src/main/res/layout/activity_image_view.xml b/app/src/main/res/layout/activity_image_view.xml
index 25c1e01..ed0942e 100644
--- a/app/src/main/res/layout/activity_image_view.xml
+++ b/app/src/main/res/layout/activity_image_view.xml
@@ -15,8 +15,8 @@
 
     <ImageView
         android:id="@+id/cancelImageView"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="25dp"
+        android:layout_height="25dp"
         android:layout_gravity="right|top"
         android:layout_margin="20dp"
         app:srcCompat="@drawable/cancel"
diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml
index 97125d9..1d2d72b 100644
--- a/app/src/main/res/layout/activity_map.xml
+++ b/app/src/main/res/layout/activity_map.xml
@@ -51,6 +51,7 @@
         app:layout_constraintBottom_toBottomOf="@id/mapFragment"
         android:layout_marginEnd="32dp"
         android:layout_marginBottom="32dp"
+        app:borderWidth="0dp"
         android:contentDescription="현재 위치" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_right_chat.xml b/app/src/main/res/layout/item_right_chat.xml
index 50ffaf9..a7d63df 100644
--- a/app/src/main/res/layout/item_right_chat.xml
+++ b/app/src/main/res/layout/item_right_chat.xml
@@ -36,7 +36,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:maxWidth="280dp"
+                android:maxWidth="240dp"
                 android:text="@string/content"
                 android:textColor="@color/black"
                 android:textSize="16sp"

From d073c7b78522dc320797d67504c84ef2e7ea65a7 Mon Sep 17 00:00:00 2001
From: easyhooon <51016231+easyhooon@users.noreply.github.com>
Date: Sun, 20 Jun 2021 19:46:02 +0900
Subject: [PATCH 2/2] group item UI Fix

---
 app/src/main/res/layout/item_group.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/layout/item_group.xml b/app/src/main/res/layout/item_group.xml
index ebd8ddd..82364e6 100644
--- a/app/src/main/res/layout/item_group.xml
+++ b/app/src/main/res/layout/item_group.xml
@@ -20,6 +20,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:maxLines="1"
+        android:maxWidth="210dp"
         android:ellipsize="end"
         android:text="title"
         android:textColor="@color/black"