From 1098c7308d00ab734754a7b9e542cce34a71c041 Mon Sep 17 00:00:00 2001
From: youlalala <reyoula@gmail.com>
Date: Wed, 15 Nov 2023 15:54:58 +0900
Subject: [PATCH] =?UTF-8?q?feat=20:=20toolbar=20style=20=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/res/drawable/ic_arrow_back.xml   |  9 +++++++
 .../ui/src/main/res/drawable/ic_upload.xml    |  4 +--
 .../core/ui/src/main/res/values/themes.xml    |  6 +++++
 .../src/main/res/layout/fragment_home.xml     |  6 ++---
 .../feature/login/NicknameFragment.kt         | 15 +++++++++++
 .../src/main/res/layout/fragment_nickname.xml | 26 +++++++++++++++++++
 6 files changed, 61 insertions(+), 5 deletions(-)
 create mode 100644 android/core/ui/src/main/res/drawable/ic_arrow_back.xml
 create mode 100644 android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt
 create mode 100644 android/feature/login/src/main/res/layout/fragment_nickname.xml

diff --git a/android/core/ui/src/main/res/drawable/ic_arrow_back.xml b/android/core/ui/src/main/res/drawable/ic_arrow_back.xml
new file mode 100644
index 0000000..8868e96
--- /dev/null
+++ b/android/core/ui/src/main/res/drawable/ic_arrow_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/on_surface"
+        android:pathData="M19,11H7.83L12.71,6.12C13.1,5.73 13.1,5.09 12.71,4.7C12.617,4.607 12.507,4.534 12.387,4.484C12.266,4.433 12.136,4.408 12.005,4.408C11.874,4.408 11.744,4.433 11.623,4.484C11.502,4.534 11.392,4.607 11.3,4.7L4.71,11.29C4.617,11.383 4.544,11.492 4.493,11.613C4.443,11.734 4.417,11.864 4.417,11.995C4.417,12.126 4.443,12.256 4.493,12.377C4.544,12.498 4.617,12.608 4.71,12.7L11.3,19.29C11.392,19.383 11.502,19.456 11.623,19.506C11.744,19.556 11.874,19.582 12.005,19.582C12.136,19.582 12.266,19.556 12.387,19.506C12.507,19.456 12.617,19.383 12.71,19.29C12.802,19.198 12.876,19.087 12.926,18.967C12.976,18.846 13.002,18.716 13.002,18.585C13.002,18.454 12.976,18.324 12.926,18.204C12.876,18.083 12.802,17.973 12.71,17.88L7.83,13H19C19.55,13 20,12.55 20,12C20,11.45 19.55,11 19,11Z" />
+</vector>
diff --git a/android/core/ui/src/main/res/drawable/ic_upload.xml b/android/core/ui/src/main/res/drawable/ic_upload.xml
index c5fdbd9..9a0f7a7 100644
--- a/android/core/ui/src/main/res/drawable/ic_upload.xml
+++ b/android/core/ui/src/main/res/drawable/ic_upload.xml
@@ -4,10 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/on_surface"
         android:fillType="evenOdd"
         android:pathData="M10.738,16.627C10.365,16.627 10.005,16.487 9.73,16.235C9.454,15.983 9.284,15.637 9.251,15.265C9.11,13.654 9.074,12.036 9.144,10.42C9.06,10.414 8.975,10.408 8.891,10.402L7.401,10.294C7.183,10.278 6.974,10.206 6.792,10.085C6.611,9.963 6.464,9.797 6.366,9.602C6.269,9.407 6.223,9.19 6.234,8.972C6.246,8.754 6.314,8.543 6.431,8.359C7.528,6.643 9.537,4.723 11.191,3.535C11.427,3.366 11.71,3.274 12,3.274C12.291,3.274 12.574,3.366 12.81,3.535C14.463,4.723 16.472,6.643 17.568,8.359C17.685,8.543 17.753,8.754 17.764,8.972C17.776,9.19 17.73,9.407 17.633,9.602C17.535,9.797 17.388,9.963 17.207,10.085C17.025,10.206 16.816,10.278 16.598,10.294L15.108,10.402L14.856,10.42C14.926,12.036 14.89,13.654 14.749,15.265C14.717,15.637 14.546,15.983 14.27,16.235C13.995,16.487 13.635,16.627 13.262,16.627H10.738ZM10.682,9.762C10.568,11.549 10.589,13.343 10.745,15.127H13.255C13.411,13.343 13.432,11.55 13.319,9.762C13.313,9.663 13.326,9.564 13.359,9.47C13.391,9.376 13.442,9.289 13.508,9.215C13.574,9.141 13.655,9.081 13.744,9.038C13.834,8.996 13.931,8.971 14.03,8.966C14.354,8.95 14.677,8.93 15,8.906L16.081,8.828C15.121,7.414 13.919,6.179 12.531,5.182L12,4.801L11.469,5.182C10.081,6.179 8.879,7.414 7.919,8.828L9,8.907C9.323,8.93 9.647,8.95 9.97,8.966C10.069,8.971 10.166,8.996 10.256,9.038C10.345,9.081 10.426,9.141 10.492,9.215C10.558,9.289 10.609,9.376 10.641,9.47C10.674,9.564 10.687,9.663 10.681,9.762H10.682Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/on_surface"
         android:pathData="M5.75,17C5.75,16.801 5.671,16.61 5.53,16.47C5.39,16.329 5.199,16.25 5,16.25C4.801,16.25 4.61,16.329 4.47,16.47C4.329,16.61 4.25,16.801 4.25,17V19C4.25,19.966 5.034,20.75 6,20.75H18C18.464,20.75 18.909,20.566 19.237,20.237C19.566,19.909 19.75,19.464 19.75,19V17C19.75,16.801 19.671,16.61 19.53,16.47C19.39,16.329 19.199,16.25 19,16.25C18.801,16.25 18.61,16.329 18.47,16.47C18.329,16.61 18.25,16.801 18.25,17V19C18.25,19.066 18.224,19.13 18.177,19.177C18.13,19.224 18.066,19.25 18,19.25H6C5.934,19.25 5.87,19.224 5.823,19.177C5.776,19.13 5.75,19.066 5.75,19V17Z" />
 </vector>
diff --git a/android/core/ui/src/main/res/values/themes.xml b/android/core/ui/src/main/res/values/themes.xml
index 6146536..608e4c5 100644
--- a/android/core/ui/src/main/res/values/themes.xml
+++ b/android/core/ui/src/main/res/values/themes.xml
@@ -32,4 +32,10 @@
     <style name="BodySmall">
         <item name="android:textSize">12sp</item>
     </style>
+
+    <style name="ToolBar" parent="Widget.Material3.Toolbar">
+        <item name="titleTextColor">@color/on_surface</item>
+        <item name="navigationIconTint">@color/on_surface</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/android/feature/home/src/main/res/layout/fragment_home.xml b/android/feature/home/src/main/res/layout/fragment_home.xml
index 3b21623..a35aacb 100644
--- a/android/feature/home/src/main/res/layout/fragment_home.xml
+++ b/android/feature/home/src/main/res/layout/fragment_home.xml
@@ -14,15 +14,15 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/tb_home"
+            style="@style/ToolBar"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:title="@string/home"
-            app:titleTextColor="@color/on_surface" />
+            app:title="@string/home" />
 
         <ImageButton
             android:layout_width="wrap_content"
diff --git a/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt
new file mode 100644
index 0000000..969ae33
--- /dev/null
+++ b/android/feature/login/src/main/java/com/ohdodok/catchytape/feature/login/NicknameFragment.kt
@@ -0,0 +1,15 @@
+package com.ohdodok.catchytape.feature.login
+
+import android.os.Bundle
+import android.view.View
+import com.ohdodok.catchytape.core.ui.BaseFragment
+import com.ohdodok.catchytape.feature.login.databinding.FragmentNicknameBinding
+import dagger.hilt.android.AndroidEntryPoint
+
+@AndroidEntryPoint
+class NicknameFragment : BaseFragment<FragmentNicknameBinding>(R.layout.fragment_nickname) {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/android/feature/login/src/main/res/layout/fragment_nickname.xml b/android/feature/login/src/main/res/layout/fragment_nickname.xml
new file mode 100644
index 0000000..80b7b4f
--- /dev/null
+++ b/android/feature/login/src/main/res/layout/fragment_nickname.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout 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">
+
+    <data>
+
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/tb_nickname"
+            style="@style/ToolBar"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navigationIcon="@drawable/ic_arrow_back" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</layout>
\ No newline at end of file