feat: #6 Toolbar 추가

codesquad-members-2022 · May 24, 2022 · 6c49776 · 6c49776
1 parent 865b385
commit 6c49776
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 12 deletions.
diff --git a/android/app/src/main/res/layout/fragment_search.xml b/android/app/src/main/res/layout/fragment_search.xml
@@ -12,16 +12,38 @@
         android:layout_height="match_parent"
         tools:context=".SearchFragment">
 
-        <!-- TODO: Update blank fragment layout -->
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/hello_blank_fragment"
-            android:textSize="30sp"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/tb_search"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent" >
 
+            <TextView
+                android:id="@+id/tv_search_title"
+                style="@style/TextHeadline5.bold.20.black"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="40dp"
+                android:text="@string/label_search_title"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="어디로 여행하세요?" />
+
+            <ImageButton
+                android:id="@+id/btn_search_icon"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:layout_gravity="end"
+                android:background="@android:color/transparent"
+                android:layout_marginTop="30dp"
+                android:src="@drawable/ic_baseline_search_24"
+                app:tint="@color/primary"
+                android:contentDescription="@string/label_btn_search_icon" />
+
+
+        </com.google.android.material.appbar.MaterialToolbar>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/android/app/src/main/res/values-night/strings.xml b/android/app/src/main/res/values-night/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="label_search_title">어디로 여행하세요?</string>
+    <string name="label_btn_search_icon">btn_search_icon</string>
+</resources>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <color name="primary">#E84C60</color>
     <color name="purple_200">#FFBB86FC</color>
     <color name="purple_500">#FF6200EE</color>
     <color name="purple_700">#FF3700B3</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
+    <color name="black">#010101</color>
+    <color name="gray">#4F4F4F</color>
     <color name="white">#FFFFFFFF</color>
 </resources>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
@@ -5,4 +5,6 @@
     <string name="title_menu_search">검색</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="label_search_title">어디로 여행하세요?</string>
+    <string name="label_btn_search_icon">btn_search_icon</string>
 </resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="TextHeadline4.Black01" parent="TextAppearance.MaterialComponents.Headline4">
+        <item name="android:textColor">@color/black</item>
+        <item name="android:textSize">32sp</item>
+    </style>
+
+    <style name="TextHeadline5" parent="TextAppearance.MaterialComponents.Headline5" />
+
+    <style name="TextHeadline5.bold">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextHeadline5.bold.20">
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="TextHeadline5.bold.20.black">
+        <item name="android:textColor">@color/black</item>
+    </style>
+
+    <style name="Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" />
+
+    <style name="Subtitle1.14">
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="Subtitle1.white">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="Subtitle1.bold">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="Subtitle1.bold.18">
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2" />
+
+    <style name="Subtitle2.bold">
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="Subtitle2.grey03">
+        <item name="android:textColor">@color/gray</item>
+    </style>
+</resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
@@ -1,9 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.Airbnb" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+    <style name="Theme.Airbnb" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryVariant">@color/primary</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>