ui: 로고 및 아이콘 리소스 변경

CatchMate/presentation/src/main/java/com/catchmate/presentation/util/DateUtils.kt

@@ -43,7 +43,7 @@ object DateUtils {
     fun formatISODateTime(dateTime: String): Pair<String, String> {
         val (date, time) = dateTime.split("T")
 
-        val inputDateFormat = SimpleDateFormat("yyyy-mm-dd")
+        val inputDateFormat = SimpleDateFormat("yyyy-MM-dd")
 
         val formattedDate = inputDateFormat.parse(date)
 
@@ -55,11 +55,11 @@ object DateUtils {
     fun formatISODateTimeToDateTime(dateTime: String): Pair<String, String> {
         val (date, time) = dateTime.split("T")
 
-        val inputDateFormat = SimpleDateFormat("yyyy-mm-dd")
+        val inputDateFormat = SimpleDateFormat("yyyy-MM-dd")
 
         val formattedDate = inputDateFormat.parse(date)
 
-        val outputDateFormat = SimpleDateFormat("mm.dd", Locale.KOREAN)
+        val outputDateFormat = SimpleDateFormat("MM.dd", Locale.KOREAN)
 
         return Pair(outputDateFormat.format(formattedDate), time.substring(0, 5))
     }

CatchMate/presentation/src/main/java/com/catchmate/presentation/view/home/HomeDateFilterBottomSheetFragment.kt

@@ -1,19 +1,45 @@
 package com.catchmate.presentation.view.home
 
+import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.catchmate.presentation.R
+import com.catchmate.presentation.databinding.FragmentHomeDateFilterBottomSheetBinding
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class HomeDateFilterBottomSheetFragment : BottomSheetDialogFragment() {
+    private var _binding: FragmentHomeDateFilterBottomSheetBinding? = null
+    val binding get() = _binding!!
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState) as BottomSheetDialog
+        val behavior = dialog.behavior
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        return dialog
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
         savedInstanceState: Bundle?,
     ): View? {
-        // Inflate the layout for this fragment
-        return inflater.inflate(R.layout.fragment_home_date_filter_bottom_sheet, container, false)
+        _binding = FragmentHomeDateFilterBottomSheetBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(
+        view: View,
+        savedInstanceState: Bundle?,
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
     }
 }

CatchMate/presentation/src/main/java/com/catchmate/presentation/view/home/HomeHeadCountFilterBottomSheetFragment.kt

@@ -1,16 +1,27 @@
 package com.catchmate.presentation.view.home
 
+import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.catchmate.presentation.databinding.FragmentHomeHeadCountFilterBottomSheetBinding
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class HomeHeadCountFilterBottomSheetFragment : BottomSheetDialogFragment() {
     private var _binding: FragmentHomeHeadCountFilterBottomSheetBinding? = null
     val binding get() = _binding!!
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState) as BottomSheetDialog
+        val behavior = dialog.behavior
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        return dialog
+    }
+
     private val headCountArray =
         arrayOf(
             "1명",

CatchMate/presentation/src/main/java/com/catchmate/presentation/view/home/HomeTeamFilterBottomSheetFragment.kt

@@ -1,16 +1,27 @@
 package com.catchmate.presentation.view.home
 
+import android.app.Dialog
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.catchmate.presentation.databinding.FragmentHomeTeamFilterBottomSheetBinding
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 
 class HomeTeamFilterBottomSheetFragment : BottomSheetDialogFragment() {
     private var _binding: FragmentHomeTeamFilterBottomSheetBinding? = null
     val binding get() = _binding!!
 
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState) as BottomSheetDialog
+        val behavior = dialog.behavior
+        behavior.state = BottomSheetBehavior.STATE_EXPANDED
+
+        return dialog
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

CatchMate/presentation/src/main/java/com/catchmate/presentation/view/login/LoginFragment.kt

@@ -98,19 +98,19 @@ class LoginFragment : Fragment() {
     }
 
     private fun initKakaoLoginBtn() {
-        binding.btnLoginKakao.setOnClickListener {
+        binding.cvLoginKakao.setOnClickListener {
             loginViewModel.kakaoLogin()
         }
     }
 
     private fun initNaverLoginBtn() {
-        binding.imgbtnLoginNaver.setOnClickListener {
+        binding.ivLoginNaver.setOnClickListener {
             loginViewModel.naverLogin()
         }
     }
 
     private fun initGoogleLoginBtn() {
-        binding.imgbtnLoginGoogle.setOnClickListener {
+        binding.ivLoginGoogle.setOnClickListener {
             loginViewModel.googleLogin()
         }
     }

CatchMate/presentation/src/main/java/com/catchmate/presentation/view/onboarding/CheerStyleOnboardingFragment.kt

@@ -48,6 +48,7 @@ class CheerStyleOnboardingFragment : Fragment() {
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
+        initTitle()
         initHeader()
         initFooterButton()
         initCheerStyleButtons()
@@ -65,6 +66,11 @@ class CheerStyleOnboardingFragment : Fragment() {
             arguments?.getSerializable("userInfo") as UserAdditionalInfoRequest
         }
 
+    private fun initTitle() {
+        val title = getString(R.string.team_onboarding_title1)
+        binding.tvCheerStyleOnboardingTitle1.text = title.format(userInfo.nickName)
+    }
+
     private fun initFooterButton() {
         binding.layoutCheerStyleOnboardingNext.btnFooterOne.apply {
             setText(R.string.next)

CatchMate/presentation/src/main/java/com/catchmate/presentation/view/onboarding/TeamOnboardingFragment.kt

@@ -38,6 +38,7 @@ class TeamOnboardingFragment : Fragment() {
         savedInstanceState: Bundle?,
     ) {
         super.onViewCreated(view, savedInstanceState)
+        initTitle()
         initHeader()
         initFooterBtn()
         initTeamButtons()
@@ -48,6 +49,11 @@ class TeamOnboardingFragment : Fragment() {
         _binding = null
     }
 
+    private fun initTitle() {
+        val title = getString(R.string.team_onboarding_title1)
+        binding.tvTeamOnboardingTitle1.text = title.format(userInfo.nickName)
+    }
+
     private fun initTeamButtons() {
         val teamButtons: List<TeamButtonView> =
             listOf(

CatchMate/presentation/src/main/res/drawable/shape_kakao_login_button.xml → CatchMate/presentation/src/main/res/drawable/shape_all_login_logo_circle.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp"/>
-    <solid android:color="#FDDC3F"/>
+    android:shape="oval">
+    <stroke android:color="@color/grey100"
+        android:width="1dp"/>
 </shape>

CatchMate/presentation/src/main/res/drawable/vec_colored_logo.xml

@@ -0,0 +1,42 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="96dp"
+    android:height="119dp"
+    android:viewportWidth="96"
+    android:viewportHeight="119">
+  <path
+      android:pathData="M3.6,112.51a45.54,5.52 0,1 0,91.08 0a45.54,5.52 0,1 0,-91.08 0z"
+      android:fillColor="#F2F2F5"/>
+  <path
+      android:pathData="M74.34,61.47C79.74,54.35 83.26,47.29 83.26,39.55C83.26,25.38 75.72,12.98 64.44,6.13C64.53,6.18 64.6,6.23 64.68,6.28C59.75,12.49 56.75,20.74 56.75,29.78C56.75,43.77 63.94,55.84 74.34,61.47ZM71.59,64.9C67.86,69.38 63.48,73.92 58.86,78.72C53.69,84.1 48.22,89.78 43,96.04L43.44,96.38C44.69,97.34 44.93,99.12 43.97,100.37L34.38,112.92C32.15,115.83 27.98,116.39 25.07,114.16L5.21,98.98C-0.34,94.74 -1.4,86.8 2.84,81.26C6.98,75.84 14.64,74.7 20.17,78.6C20.69,77.83 21.16,77.14 21.6,76.51L21.6,76.5C22.66,74.96 23.54,73.67 24.57,72.01C13.48,65.12 5.11,53.56 5.11,39.55C5.11,25.85 12.15,13.81 22.81,6.83C27.49,12.98 30.32,21 30.32,29.78C30.32,43.75 23.15,55.81 12.78,61.44C13.67,62.61 14.64,63.73 15.66,64.79C27.08,58.17 34.63,44.72 34.63,29.78C34.63,20.37 31.64,11.55 26.57,4.66C31.86,1.98 37.85,0.47 44.18,0.47C50.14,0.47 55.79,1.81 60.85,4.19C55.57,11.15 52.44,20.15 52.44,29.78C52.44,44.8 60.07,58.31 71.59,64.9Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="72.94"
+          android:startY="12.8"
+          android:endX="7.74"
+          android:endY="99.74"
+          android:type="linear">
+        <item android:offset="0.52" android:color="#FFFD5E5E"/>
+        <item android:offset="0.77" android:color="#FFDB5456"/>
+        <item android:offset="0.78" android:color="#FFFD5E5E"/>
+        <item android:offset="1" android:color="#FFDB5456"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M54.72,89.62L58.87,92.51C54.4,97.82 55.06,105.76 60.35,110.26C65.67,114.79 73.64,114.15 78.17,108.84L94.38,89.8C96.76,87.01 96.42,82.82 93.63,80.44L81.6,70.2C80.41,69.18 78.61,69.32 77.59,70.52L77.37,70.78C76.4,69.91 75.45,69.04 74.52,68.16L54.72,89.62Z"
+      android:fillType="evenOdd">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="64.5"
+          android:startY="80.5"
+          android:endX="86.5"
+          android:endY="101.5"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFD5E5E"/>
+        <item android:offset="1" android:color="#FFDB5456"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

CatchMate/presentation/src/main/res/drawable/vec_login_google.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M489.5,261.7c0,-16.1 -1.6,-32.7 -4.2,-48.3h-224.7v91.9h128.7c-5.2,29.6 -22.3,55.5 -47.7,72.1l76.8,59.7c45.1,-42 71.1,-103.3 71.1,-175.4Z"
+      android:fillColor="#4280ef"/>
+  <path
+      android:pathData="M260.6,494.2c64.3,0 118.3,-20.8 157.8,-57.1l-76.8,-59.7c-21.3,14.5 -48.8,22.8 -81,22.8 -62.3,0 -114.7,-42 -133.9,-98.1l-78.9,60.7c40.5,80.4 122.5,131.3 212.8,131.3Z"
+      android:fillColor="#34a353"/>
+  <path
+      android:pathData="M126.7,302.2c-9.9,-29.6 -9.9,-62.3 0,-91.9l-78.9,-61.2c-33.7,67.5 -33.7,146.9 0,213.8l78.9,-60.7Z"
+      android:fillColor="#f6b704"/>
+  <path
+      android:pathData="M260.6,112.3c33.7,-0.5 66.9,12.5 91.3,35.8l68,-68.5c-43.1,-40.5 -100.2,-62.3 -159.3,-61.8 -90.3,0 -172.3,50.9 -212.8,131.3l78.9,61.2c19.2,-56.6 71.6,-98.1 133.9,-98.1Z"
+      android:fillColor="#e54335"/>
+</vector>

CatchMate/presentation/src/main/res/drawable/vec_login_kakao.xml

@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="m12,1c-6.627,0 -12,4.208 -12,9.399 0,3.356 2.246,6.301 5.625,7.963 -1.678,5.749 -2.664,6.123 4.244,1.287 0.692,0.097 1.404,0.148 2.131,0.148 6.627,0 12,-4.208 12,-9.399 0,-5.19 -5.373,-9.398 -12,-9.398z"
+      android:fillColor="#3e2723"/>
+  <path
+      android:pathData="m10.384,8.27c-0.317,-0.893 -1.529,-0.894 -1.845,-0.001 -0.984,3.052 -2.302,4.935 -1.492,5.306 1.078,0.489 1.101,-0.611 1.359,-1.1h2.111c0.257,0.487 0.282,1.588 1.359,1.1 0.813,-0.371 -0.489,-2.195 -1.492,-5.305zM8.77,11.257 L9.462,9.306 10.153,11.257z"
+      android:fillColor="#ffeb3b"/>
+  <path
+      android:pathData="m5.365,13.68c-1.198,0 -0.49,-1.657 -0.692,-4.742 -0.429,-0.074 -1.76,0.297 -1.76,-0.673 0,-0.371 0.305,-0.673 0.679,-0.673 2.518,0.18 4.224,-0.47 4.224,0.673 0,0.987 -1.275,0.59 -1.76,0.673 -0.2,3.075 0.505,4.742 -0.691,4.742z"
+      android:fillColor="#ffeb3b"/>
+  <path
+      android:pathData="m13.154,13.579c-1.159,0 -0.454,-1.565 -0.663,-5.301 0,-0.91 1.413,-0.909 1.413,0v4.04c0.669,0.089 2.135,-0.33 2.135,0.63 -0.001,1.007 -1.576,0.503 -2.885,0.631z"
+      android:fillColor="#ffeb3b"/>
+  <path
+      android:pathData="m19.556,13.38 l-1.624,-2.137 -0.24,0.239v1.5c0,0.38 -0.31,0.688 -0.693,0.688 -1.203,0 -0.482,-1.732 -0.692,-5.392 0,-0.379 0.31,-0.688 0.692,-0.688 1.045,0 0.594,1.478 0.692,2.166 1.96,-1.873 1.913,-2.072 2.316,-2.072 0.556,0 0.897,0.691 0.527,1.058l-1.578,1.567 1.704,2.243c0.556,0.725 -0.555,1.556 -1.104,0.828z"
+      android:fillColor="#ffeb3b"/>
+</vector>

CatchMate/presentation/src/main/res/drawable/vec_login_naver.xml

@@ -1,14 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
+    android:width="18dp"
+    android:height="16dp"
+    android:viewportWidth="18"
+    android:viewportHeight="16">
   <path
-      android:strokeWidth="1"
-      android:pathData="M24,24m-23.5,0a23.5,23.5 0,1 1,47 0a23.5,23.5 0,1 1,-47 0"
-      android:fillColor="#00000000"
-      android:strokeColor="#E3E3E3"/>
-  <path
-      android:pathData="M15,32V16H21L27,24.421V16H33V32H27L21,24V32H15Z"
+      android:pathData="M0,16V0H6L12,8.421V0H18V16H12L6,8V16H0Z"
       android:fillColor="#1DC800"/>
 </vector>

CatchMate/presentation/src/main/res/layout/fragment_cheer_style_onboarding.xml

@@ -81,7 +81,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:cheerStyleExplainText="@string/cheer_style_director_explain"
-                app:cheerStyleImage="@drawable/shape_all_rect_r6"
+                app:cheerStyleImage="@drawable/img_director_icon"
                 app:cheerStyleNameText="@string/cheer_style_director"
                 app:cheerStyleToggleBg="@drawable/selector_all_team_toggle"
                 app:layout_constraintHorizontal_chainStyle="spread_inside"
@@ -94,7 +94,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:cheerStyleExplainText="@string/cheer_style_mother_bird_explain"
-                app:cheerStyleImage="@drawable/shape_all_rect_r6"
+                app:cheerStyleImage="@drawable/img_mother_bird_icon"
                 app:cheerStyleNameText="@string/cheer_style_mother_bird"
                 app:cheerStyleToggleBg="@drawable/selector_all_team_toggle"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -108,7 +108,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/xsmall"
                 app:cheerStyleExplainText="@string/cheer_style_cheer_leader_explain"
-                app:cheerStyleImage="@drawable/shape_all_rect_r6"
+                app:cheerStyleImage="@drawable/img_cheer_leader_icon"
                 app:cheerStyleNameText="@string/cheer_style_cheer_leader"
                 app:cheerStyleToggleBg="@drawable/selector_all_team_toggle"
                 app:layout_constraintEnd_toStartOf="@+id/csbv_cheer_style_onboarding_glutton"
@@ -121,7 +121,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:cheerStyleExplainText="@string/cheer_style_glutton_explain"
-                app:cheerStyleImage="@drawable/shape_all_rect_r6"
+                app:cheerStyleImage="@drawable/img_glutton_icon"
                 app:cheerStyleNameText="@string/cheer_style_glutton"
                 app:cheerStyleToggleBg="@drawable/selector_all_team_toggle"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -136,7 +136,7 @@
                 android:layout_marginTop="@dimen/xsmall"
                 android:layout_marginBottom="@dimen/xlarge"
                 app:cheerStyleExplainText="@string/cheer_style_stone_explain"
-                app:cheerStyleImage="@drawable/shape_all_rect_r6"
+                app:cheerStyleImage="@drawable/img_stone_icon"
                 app:cheerStyleNameText="@string/cheer_style_stone"
                 app:cheerStyleToggleBg="@drawable/selector_all_team_toggle"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -150,7 +150,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 app:cheerStyleExplainText="@string/cheer_style_bodhisattva_explain"
-                app:cheerStyleImage="@drawable/shape_all_rect_r6"
+                app:cheerStyleImage="@drawable/img_bodhisattva_icon"
                 app:cheerStyleNameText="@string/cheer_style_bodhisattva"
                 app:cheerStyleToggleBg="@drawable/selector_all_team_toggle"
                 app:layout_constraintEnd_toEndOf="parent"

CatchMate/presentation/src/main/res/layout/fragment_home_date_filter_bottom_sheet.xml

@@ -1,9 +1,10 @@
 <?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"
+    android:id="@+id/layout_home_date_filter_bottom_sheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/grey0">
+    android:background="@drawable/shape_all_bottom_sheet_bg">
 
     <com.google.android.material.bottomsheet.BottomSheetDragHandleView
         android:id="@+id/draghandleview_datebottomsheet"

CatchMate/presentation/src/main/res/layout/fragment_home_head_count_filter_bottom_sheet.xml

@@ -2,9 +2,10 @@
 <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:id="@+id/layout_home_head_count_filter_bottom_sheet"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/grey0"
+    android:background="@drawable/shape_all_bottom_sheet_bg"
     tools:context=".view.home.HomeHeadCountFilterBottomSheetFragment">
 
     <ImageView