From 6b1111fae9faed7bd290441290479ef75455d7f4 Mon Sep 17 00:00:00 2001
From: JSPark <48265129+pknujsp@users.noreply.github.com>
Date: Tue, 25 Jul 2023 02:58:14 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=98=EC=95=BD=ED=92=88=20=EC=83=81?=
 =?UTF-8?q?=EC=84=B8=20=EC=A0=95=EB=B3=B4=20=ED=99=94=EB=A9=B4=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=88=B4=EB=B0=94=20=EC=A0=91=ED=9E=88=EB=8A=94=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medicine/main/MedicineInfoFragment.kt     | 21 ++++++++-----------
 .../res/layout/fragment_medicine_info.xml     |  9 +++++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/feature/medicine/src/main/java/com/android/mediproject/feature/medicine/main/MedicineInfoFragment.kt b/feature/medicine/src/main/java/com/android/mediproject/feature/medicine/main/MedicineInfoFragment.kt
index 5b79bd7b6..890476cfb 100644
--- a/feature/medicine/src/main/java/com/android/mediproject/feature/medicine/main/MedicineInfoFragment.kt
+++ b/feature/medicine/src/main/java/com/android/mediproject/feature/medicine/main/MedicineInfoFragment.kt
@@ -1,11 +1,10 @@
 package com.android.mediproject.feature.medicine.main
 
+import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
-import androidx.core.view.doOnPreDraw
 import androidx.fragment.app.viewModels
-import androidx.navigation.fragment.findNavController
 import com.android.mediproject.core.common.dialog.LoadingDialog
 import com.android.mediproject.core.common.uiutil.SystemBarColorAnalyzer
 import com.android.mediproject.core.common.uiutil.SystemBarController
@@ -46,14 +45,9 @@ class MedicineInfoFragment : BaseFragment<FragmentMedicineInfoBinding, MedicineI
             viewModel = fragmentViewModel
             medicineInfoArgs = navArgs
 
-            toolbar.setNavigationOnClickListener {
-                findNavController().popBackStack()
-            }
-
-            root.doOnPreDraw {
-                topAppBar.addOnOffsetChangedListener { appBarLayout, verticalOffset ->
-                    SystemBarColorAnalyzer.convert()
-                }
+            toolbar.bar.setBackgroundColor(Color.TRANSPARENT)
+            topAppBar.addOnOffsetChangedListener { _, _ ->
+                SystemBarColorAnalyzer.convert()
             }
         }
 
@@ -98,11 +92,14 @@ class MedicineInfoFragment : BaseFragment<FragmentMedicineInfoBinding, MedicineI
 
             launch {
                 SystemBarColorAnalyzer.statusBarColor.collect {
-                    binding.toolbar.setNavigationIconTint(if (it == SystemBarStyler.SystemBarColor.WHITE) Color.WHITE else Color.BLACK)
+                    (if (it == SystemBarStyler.SystemBarColor.WHITE) Color.WHITE else Color.BLACK).also { color ->
+                        binding.toolbar.backButton.imageTintList =
+                            ColorStateList.valueOf(color)
+                        binding.toolbar.title.setTextColor(color)
+                    }
                 }
             }
         }
-        androidx.appcompat.R.style.Base_Widget_AppCompat_Toolbar_Button_Navigation
     }
 
     private fun setBarStyle() = binding.apply {
diff --git a/feature/medicine/src/main/res/layout/fragment_medicine_info.xml b/feature/medicine/src/main/res/layout/fragment_medicine_info.xml
index 865570ed8..bdabed3b0 100644
--- a/feature/medicine/src/main/res/layout/fragment_medicine_info.xml
+++ b/feature/medicine/src/main/res/layout/fragment_medicine_info.xml
@@ -51,7 +51,7 @@
                 app:layout_scrollFlags="scroll|exitUntilCollapsed"
                 app:title="@string/medicineInfo"
                 app:titleCollapseMode="scale"
-                app:titleEnabled="true"
+                app:titleEnabled="false"
                 app:toolbarId="@id/toolbar">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
@@ -142,12 +142,15 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <com.google.android.material.appbar.MaterialToolbar
+                <com.android.mediproject.core.ui.base.view.Bar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     app:layout_collapseMode="pin"
-                    app:navigationIcon="@drawable/left_arrow_black" />
+                    app:navigationIcon="@drawable/left_arrow_black"
+                    app:setTheme="white"
+                    app:showBackButton="true"
+                    app:title="@string/medicineInfo" />
 
             </com.google.android.material.appbar.CollapsingToolbarLayout>