From 81fbf275e6de3e300753884aed566abbcd784379 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=BCnghj=C3=B6p=20Nam?= <moollyska@gmail.com>
Date: Thu, 17 Jun 2021 14:28:20 +0900
Subject: [PATCH 1/3] Design has been changed

---
 .../koogle/Fragment/CommunityFragment.kt      | 53 ++++++++++++++-
 app/src/main/res/layout/activity_log_in.xml   | 64 ++++++++++++-------
 app/src/main/res/layout/activity_splash.xml   |  2 +-
 .../main/res/layout/fragment_community.xml    | 40 ++++++------
 app/src/main/res/layout/row_user_tag.xml      |  2 +-
 app/src/main/res/values/colors.xml            |  6 +-
 6 files changed, 120 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/kr/ac/konkuk/koogle/Fragment/CommunityFragment.kt b/app/src/main/java/kr/ac/konkuk/koogle/Fragment/CommunityFragment.kt
index 76d51fc..8b54b8f 100644
--- a/app/src/main/java/kr/ac/konkuk/koogle/Fragment/CommunityFragment.kt
+++ b/app/src/main/java/kr/ac/konkuk/koogle/Fragment/CommunityFragment.kt
@@ -1,5 +1,6 @@
 package kr.ac.konkuk.koogle.Fragment
 
+import android.R
 import android.content.Intent
 import android.os.Bundle
 import android.util.Log
@@ -7,6 +8,8 @@ import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
 import android.widget.Toast
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -71,7 +74,7 @@ class CommunityFragment : Fragment() {
         initDB()
         initRecyclerView()
         initButton()
-
+        initSpinner()
 
         //데이터를 가져옴
         //addSingleValueListener -> 즉시성, 1회만 호출
@@ -84,6 +87,54 @@ class CommunityFragment : Fragment() {
         return binding!!.root
     }
 
+    private fun initSpinner() {
+        val adapter = ArrayAdapter<String>(requireActivity(), R.layout.simple_spinner_dropdown_item, ArrayList<String>())
+        adapter.add("전체")
+        adapter.add("게임")
+        adapter.add("스터디")
+        adapter.add("공모전")
+        adapter.add("운동")
+        adapter.add("여행")
+
+        binding!!.apply{
+            spinner2.adapter = adapter
+            spinner2.onItemSelectedListener = object : AdapterView.OnItemSelectedListener{
+                override fun onItemSelected(
+                    parent: AdapterView<*>?,
+                    view: View?,
+                    position: Int,
+                    id: Long
+                ) {
+                    when(position){
+                        0 -> {
+                            // TODO
+                        }
+                        1 -> {
+                            // TODO
+                        }
+                        2 -> {
+                            // TODO
+                        }
+                        3 -> {
+                            // TODO
+                        }
+                        4 -> {
+                            // TODO
+                        }
+                        5 -> {
+                            // TODO
+                        }
+                    }
+                }
+
+                override fun onNothingSelected(parent: AdapterView<*>?) {
+                    TODO("Not yet implemented")
+                }
+
+            }
+        }
+    }
+
     private fun initRecyclerView() {
         articleList.clear()
         //초기화 코드
diff --git a/app/src/main/res/layout/activity_log_in.xml b/app/src/main/res/layout/activity_log_in.xml
index a71198c..363dcab 100644
--- a/app/src/main/res/layout/activity_log_in.xml
+++ b/app/src/main/res/layout/activity_log_in.xml
@@ -9,53 +9,66 @@
         android:id="@+id/loginButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="24dp"
+        android:layout_marginTop="10dp"
+        android:layout_marginEnd="63dp"
         android:text="@string/log_in"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/passwordEditTextLayout" />
+        app:layout_constraintHorizontal_bias="0.342"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/passwordEditTextLayout"
+        app:layout_constraintVertical_bias="0.0" />
 
     <Button
         android:id="@+id/signUpButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginTop="8dp"
         android:text="@string/sign_up"
-        app:layout_constraintEnd_toStartOf="@+id/loginButton"
-        app:layout_constraintTop_toBottomOf="@+id/passwordEditTextLayout" />
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.726"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/passwordEditTextLayout"
+        app:layout_constraintVertical_bias="0.01" />
 
     <ImageView
         android:id="@+id/imageView"
-        android:layout_width="224dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="77dp"
-        android:layout_marginBottom="24dp"
+        android:layout_width="234dp"
+        android:layout_height="227dp"
         app:layout_constraintBottom_toTopOf="@+id/emailEditTextLayout"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.502"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0"
         app:srcCompat="@drawable/app_logo" />
 
     <com.facebook.login.widget.LoginButton
         android:id="@+id/facebookLoginButton"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp"
-        android:layout_width="0dp"
+        android:layout_width="163dp"
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="124dp"
-        android:layout_marginTop="12dp"
+        android:paddingTop="12dp"
+        android:paddingBottom="12dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.495"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/googleLoginButton" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.947" />
 
     <com.google.android.gms.common.SignInButton
         android:id="@+id/googleLoginButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
+        android:layout_width="160dp"
+        android:layout_height="46dp"
         android:layout_marginHorizontal="120dp"
-        android:layout_marginTop="24dp"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/loginButton" />
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.865" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/emailEditTextLayout"
@@ -66,8 +79,10 @@
         android:layout_marginEnd="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.474">
 
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/emailEditText"
@@ -80,13 +95,18 @@
         android:id="@+id/passwordEditTextLayout"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
         android:layout_marginHorizontal="24dp"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="24dp"
         app:counterEnabled="true"
         app:counterMaxLength="15"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/emailEditTextLayout"
+        app:layout_constraintVertical_bias="0.0"
         app:passwordToggleEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index a28b450..6c42a0a 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#92A8D1"
+    android:background="#F8B737"
     tools:context=".Activity.SplashActivity">
 
     <ImageView
diff --git a/app/src/main/res/layout/fragment_community.xml b/app/src/main/res/layout/fragment_community.xml
index ba6cdfe..5cafb9d 100644
--- a/app/src/main/res/layout/fragment_community.xml
+++ b/app/src/main/res/layout/fragment_community.xml
@@ -1,44 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <ImageView
         android:id="@+id/searchImageView"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
-        android:src="@drawable/ic_baseline_search_24"
+        android:layout_width="30dp"
+        android:layout_height="30dp"
         android:layout_margin="16dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintStart_toStartOf="parent"/>
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="28dp"
+        android:src="@drawable/ic_baseline_search_24"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <EditText
         android:id="@+id/searchEditText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
         android:layout_marginTop="16dp"
+        app:layout_constraintEnd_toStartOf="@+id/spinner2"
         app:layout_constraintStart_toEndOf="@id/searchImageView"
-        app:layout_constraintEnd_toStartOf="@id/settingImageView"/>
-
-    <ImageView
-        android:id="@+id/settingImageView"
-        android:layout_width="45dp"
-        android:layout_height="45dp"
-        android:src="@drawable/ic_baseline_settings_24"
-        android:layout_margin="16dp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"/>
+        app:layout_constraintTop_toTopOf="parent" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/articleRecyclerView"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        app:layout_constraintTop_toBottomOf="@id/searchEditText"
-        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/searchEditText" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/btn_addArticle"
@@ -53,6 +47,14 @@
         android:layout_marginBottom="24dp"
         app:tint="@color/white"/>
 
+    <Spinner
+        android:id="@+id/spinner2"
+        android:layout_width="106dp"
+        android:layout_height="44dp"
+        app:layout_constraintBottom_toTopOf="@+id/articleRecyclerView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.941" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_user_tag.xml b/app/src/main/res/layout/row_user_tag.xml
index b798c8a..408b081 100644
--- a/app/src/main/res/layout/row_user_tag.xml
+++ b/app/src/main/res/layout/row_user_tag.xml
@@ -14,7 +14,7 @@
         android:layout_weight="2"
         android:gravity="center"
         android:text="TextView"
-        android:textColor="@color/black" />
+        android:textColor="#FFFFFF"/>
 
     <LinearLayout
         android:id="@+id/subTagView"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bc23dd8..842bea0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,10 +7,10 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="test_gray">#E6E0DC</color>
-    <color name="test_dark_gray">#CDC4BD</color>
+    <color name="test_gray">#387385</color>
+    <color name="test_dark_gray">#599DAE</color>
     <color name="gray_cc">#CCCCCC</color>
     <color name="gray_ec">#ECECEC</color>
-    <color name="colorMain">#92A8D1</color>
+    <color name="colorMain">#F8B737</color>
     <color name="tint">#F7CAC9</color>
 </resources>
\ No newline at end of file

From df9f17e383525a56f7f9d7f4110cdbc3f234cb37 Mon Sep 17 00:00:00 2001
From: easyhooon <51016231+easyhooon@users.noreply.github.com>
Date: Sun, 20 Jun 2021 16:09:03 +0900
Subject: [PATCH 2/3] ChatAdapter viewBinding implementation

---
 .../ac/konkuk/koogle/Adapter/ChatAdapter.kt   | 49 ++++++-------------
 1 file changed, 14 insertions(+), 35 deletions(-)

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 2b23e16..84f3536 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
@@ -13,6 +13,9 @@ 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
 import java.util.*
 
@@ -23,45 +26,36 @@ class ChatAdapter(val context: Context, private val chatList: MutableList<ChatMo
         abstract fun bind(item: T)
     }
 
-    inner class LeftViewHolder(itemView: View) : BaseViewHolder<ChatModel>(itemView) {
+    inner class LeftViewHolder(private val binding: ItemLeftChatBinding) : BaseViewHolder<ChatModel>(binding.root) {
 
         @SuppressLint("SimpleDateFormat")
         val format = SimpleDateFormat("a HH:mm", Locale.KOREA)
 
-        val tv_writerName = itemView.findViewById<TextView>(R.id.writerNameTextView)
-        val tv_chatContent = itemView.findViewById<TextView>(R.id.contentTextView)
-        val tv_createTime = itemView.findViewById<TextView>(R.id.timeTextView)
-        val iv_writerProfileImage = itemView.findViewById<CircleImageView>(R.id.writerProfileImage)
-
-
         override fun bind(chatModel: ChatModel) {
             val time = Date(chatModel.chatCreatedAt)
 
-            tv_writerName.text = chatModel.writerName
-            tv_chatContent.text = chatModel.chatContent
-            tv_createTime.text = format.format(time).toString()
+            binding.writerNameTextView.text = chatModel.writerName
+            binding.contentTextView.text = chatModel.chatContent
+            binding.timeTextView.text = format.format(time).toString()
 
             if (chatModel.writerProfileImageUrl.isNotEmpty()) {
-                Glide.with(iv_writerProfileImage)
+                Glide.with(binding.writerProfileImage)
                     .load(chatModel.writerProfileImageUrl)
-                    .into(iv_writerProfileImage)
+                    .into(binding.writerProfileImage)
             }
         }
     }
 
-    inner class RightViewHolder(itemView: View) : BaseViewHolder<ChatModel>(itemView) {
+    inner class RightViewHolder(private val binding: ItemRightChatBinding) : BaseViewHolder<ChatModel>(binding.root) {
 
         @SuppressLint("SimpleDateFormat")
         val format = SimpleDateFormat("a HH:mm", Locale.KOREA)
 
-
-        val tv_chatContent = itemView.findViewById<TextView>(R.id.contentTextView)
-        val tv_createTime = itemView.findViewById<TextView>(R.id.timeTextView)
         override fun bind(chatModel: ChatModel) {
             val time = Date(chatModel.chatCreatedAt)
 
-            tv_chatContent.text = chatModel.chatContent
-            tv_createTime.text = format.format(time).toString()
+            binding.contentTextView.text = chatModel.chatContent
+            binding.timeTextView.text = format.format(time).toString()
         }
     }
 
@@ -70,14 +64,10 @@ class ChatAdapter(val context: Context, private val chatList: MutableList<ChatMo
         //context 는 parent 에 있다
         return when (viewType) {
             LEFT_CHAT -> {
-                val view =
-                    LayoutInflater.from(context).inflate(R.layout.item_left_chat, parent, false)
-                LeftViewHolder(view)
+                LeftViewHolder(ItemLeftChatBinding.inflate(LayoutInflater.from(parent.context),parent,false))
             }
             RIGHT_CHAT -> {
-                val view =
-                    LayoutInflater.from(context).inflate(R.layout.item_right_chat, parent, false)
-                RightViewHolder(view)
+                RightViewHolder(ItemRightChatBinding.inflate(LayoutInflater.from(parent.context),parent,false))
             }
             else -> throw IllegalArgumentException("Invalid view type")
         }
@@ -103,17 +93,6 @@ class ChatAdapter(val context: Context, private val chatList: MutableList<ChatMo
         return chatList[position].viewType
     }
 
-//    companion object {
-//        val diffUtil = object : DiffUtil.ItemCallback<ChatModel>() {
-//            override fun areItemsTheSame(oldModel: ChatModel, newModel: ChatModel): Boolean {
-//                return oldModel.chatCreatedAt == newModel.chatCreatedAt
-//            }
-//
-//            override fun areContentsTheSame(oldModel: ChatModel, newModel: ChatModel): Boolean {
-//                return oldModel == newModel
-//            }
-//        }
-//    }
 
     override fun getItemCount(): Int {
         return chatList.size

From 917c2e96aff5bc11a3b26a0be9c6aec56c37a2d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=BCnghj=C3=B6p=20Nam?= <moollyska@gmail.com>
Date: Sun, 20 Jun 2021 16:20:36 +0900
Subject: [PATCH 3/3] tag bug fixed

---
 app/src/main/res/{values-night => values}/tag_style.xml | 2 +-
 app/src/main/res/values/tag_style_selected.xml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename app/src/main/res/{values-night => values}/tag_style.xml (78%)

diff --git a/app/src/main/res/values-night/tag_style.xml b/app/src/main/res/values/tag_style.xml
similarity index 78%
rename from app/src/main/res/values-night/tag_style.xml
rename to app/src/main/res/values/tag_style.xml
index 149bd8b..461fbae 100644
--- a/app/src/main/res/values-night/tag_style.xml
+++ b/app/src/main/res/values/tag_style.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="TAG_STYLE">
-        <item name="android:textSize">10sp</item>
+        <item name="android:textSize">15sp</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:background">@drawable/layout_tag_background</item>
     </style>
diff --git a/app/src/main/res/values/tag_style_selected.xml b/app/src/main/res/values/tag_style_selected.xml
index 5a58dce..5f96ae8 100644
--- a/app/src/main/res/values/tag_style_selected.xml
+++ b/app/src/main/res/values/tag_style_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="TAG_STYLE_SELECTED">
-        <item name="android:textSize">10sp</item>
+        <item name="android:textSize">15sp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:background">@drawable/layout_tag_selected_background</item>
     </style>