#6 onboarding/온보딩 화면 : 디자인 포맷 설정 📰

- 이전에 구현한 화면에 설정한 디자인 값들 설정 - 상태바 글자색 변경 (검정색으로)
hometerview · Jul 31, 2022 · 8176762 · 8176762
1 parent e619f54
commit 8176762
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 64 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -3,6 +3,7 @@ plugins {
     id 'org.jetbrains.kotlin.android'
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
+    id 'kotlin-parcelize'
 }
 
 android {

diff --git a/app/src/main/java/com/ftw/hometerview/ui/main/MainActivity.kt b/app/src/main/java/com/ftw/hometerview/ui/main/MainActivity.kt
@@ -1,17 +1,40 @@
 package com.ftw.hometerview.ui.main
 
+import android.content.Context
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.os.Parcelable
 import android.util.Log
 import com.ftw.domain.usecase.login.LoginUseCase
 import com.ftw.domain.usecase.login.LoginUseCaseImpl
 import com.ftw.hometerview.R
+import kotlinx.parcelize.Parcelize
 
 class MainActivity : AppCompatActivity() {
+
+    companion object {
+        val ARGUMENT_KEY = "ARGUMENT_KEY"
+        fun newIntent(context: Context, a: String, b: Int): Intent {
+            return Intent(context, MainActivity::class.java)
+                .putExtra(ARGUMENT_KEY, Argument(a, b))
+        }
+    }
+
+
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        intent.getParcelableExtra<Argument>(ARGUMENT_KEY)?.let {
 
+        } ?: finish()
 
     }
+
+    @Parcelize
+    private data class Argument(
+        val a: String,
+        val b: Int
+    ) : Parcelable
 }
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -14,8 +14,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_size_32"
             android:layout_marginEnd="@dimen/dp_size_16"
-            android:text="건너뛰기"
-            android:textStyle="bold"
+            android:text="@string/skip_text"
+            android:fontFamily="@font/pretendard_regular"
             android:textColor="@color/black"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -37,8 +37,8 @@
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/dp_size_24"
             app:dampingRatio="0.5"
-            app:dotsColor="@color/blue01"
-            app:dotsStrokeColor="@color/blue01"
+            app:dotsColor="@color/blue_300"
+            app:dotsStrokeColor="@color/blue_300"
             app:dotsCornerRadius="@dimen/dp_size_20"
             app:dotsSize="@dimen/dp_size_10"
             app:dotsSpacing="@dimen/dp_size_6"
@@ -68,4 +68,3 @@
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </layout>
-
diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml
@@ -15,7 +15,7 @@
             android:layout_marginTop="@dimen/dp_size_32"
             android:layout_marginEnd="@dimen/dp_size_16"
             android:text="@string/skip_text"
-            android:textStyle="bold"
+            android:fontFamily="@font/pretendard_regular"
             android:textColor="@color/black"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -30,8 +30,8 @@
             android:text="@string/onboarding_text"
             android:textAlignment="center"
             android:textColor="@color/black"
+            android:fontFamily="@font/pretendard_medium"
             android:textSize="@dimen/guide_text_size"
-            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/go_to_next" />
@@ -48,7 +48,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/guide_text"
             app:startIconDrawable="@drawable/ic_baseline_search_24"
-            app:startIconTint="@color/blue01">
+            app:startIconTint="@color/blue_300">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/search_button"

diff --git a/app/src/main/res/layout/activity_onboarding_non_result.xml b/app/src/main/res/layout/activity_onboarding_non_result.xml
@@ -16,21 +16,21 @@
             android:layout_marginTop="@dimen/dp_size_16"
             android:src="@drawable/ic_baseline_navigate_before_24"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <TextView
             android:id="@+id/textView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/direct_text"
             android:textColor="@color/black"
-            android:textStyle="bold"
+            android:fontFamily="@font/pretendard_medium"
             android:textSize="@dimen/sp_size_20"
             app:layout_constraintBottom_toBottomOf="@+id/back_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/back_button" />
 
-
     </androidx.constraintlayout.widget.ConstraintLayout>
+
 </layout>
diff --git a/app/src/main/res/layout/activity_onboarding_result.xml b/app/src/main/res/layout/activity_onboarding_result.xml
@@ -29,7 +29,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:startIconDrawable="@drawable/ic_baseline_search_24"
-            app:startIconTint="@color/blue01">
+            app:startIconTint="@color/blue_300">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/search_button"
@@ -47,42 +47,33 @@
             android:layout_marginStart="@dimen/dp_size_16"
             android:layout_marginTop="@dimen/dp_size_8"
             android:text="@string/search_result_guide_text"
-            android:textColor="@color/blue01"
+            android:fontFamily="@font/pretendard_semibold"
+            android:textColor="@color/blue_300"
             android:textSize="@dimen/sp_size_11"
             app:layout_constraintStart_toStartOf="@+id/textInputLayout"
             app:layout_constraintTop_toBottomOf="@+id/textInputLayout" />
 
         <TextView
-            android:id="@+id/textInputLayout1"
+            android:id="@+id/non_company_here"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_size_16"
             android:layout_marginTop="@dimen/dp_size_8"
             android:layout_marginEnd="@dimen/dp_size_16"
-            android:elevation="@dimen/sp_size_11"
+            android:layout_marginBottom="@dimen/dp_size_8"
+            android:background="@drawable/button_non_company"
+            android:elevation="@dimen/dp_size_10"
+            android:gravity="center_vertical"
+            android:text="@string/non_result_text"
+            android:onClick="@{() -> searchResultViewModel.noResultRecycleModel()}"
+            android:padding="@dimen/dp_size_14"
+            android:fontFamily="@font/pretendard_semibold"
+            android:textColor="@color/black"
+            app:drawableEndCompat="@drawable/ic_baseline_navigate_next_24"
+            app:layout_constraintBottom_toTopOf="@+id/recycler_view"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            android:background="@color/white"
-            android:padding="4dp"
-
-            android:text="@string/non_result_text"
-            app:drawableEndCompat="@drawable/ic_baseline_navigate_before_24"
-            app:layout_constraintTop_toBottomOf="@+id/textView"
-            />
-
-<!--            <com.google.android.material.textfield.TextInputEditText-->
-<!--                android:id="@+id/non_result_button"-->
-<!--                android:layout_width="match_parent"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:text="@string/non_result_text"-->
-<!--                android:textSize="@dimen/sp_size_16"-->
-<!--                android:textStyle="bold"-->
-<!--                android:textColor="@color/black"-->
-<!--                android:focusable="false"-->
-<!--                android:focusableInTouchMode="false"-->
-<!--                android:onClick="@{() -> searchResultViewModel.noResultRecycleModel()}"/>-->
-
-<!--        </com.google.android.material.textfield.TextInputLayout>-->
+            app:layout_constraintTop_toBottomOf="@+id/textView" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
@@ -97,10 +88,9 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/textInputLayout1"
+            app:layout_constraintTop_toBottomOf="@+id/non_company_here"
             tools:listitem="@layout/list_item_search_result" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-</layout>
+</layout>
diff --git a/app/src/main/res/layout/list_item_guide.xml b/app/src/main/res/layout/list_item_guide.xml
@@ -1,7 +1,6 @@
 <?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">
 
@@ -17,16 +16,17 @@
 
     <TextView
         android:id="@+id/guide_text"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/dp_size_24"
         android:layout_marginEnd="@dimen/dp_size_24"
         android:textAlignment="center"
         android:textSize="@dimen/guide_text_size"
-        android:textStyle="bold"
+        android:fontFamily="@font/pretendard_medium"
         android:textColor="@color/black"
         app:layout_constraintBottom_toTopOf="@+id/imageView_icon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/list_item_search_result.xml b/app/src/main/res/layout/list_item_search_result.xml
@@ -25,9 +25,9 @@
             android:layout_marginTop="@dimen/dp_size_16"
             android:layout_marginEnd="@dimen/dp_size_16"
             android:text="@{searchResult.result.company}"
-            android:textColor="@android:color/black"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_size_16"
-            android:textStyle="bold"
+            android:fontFamily="@font/pretendard_semibold"
             app:layout_constraintEnd_toStartOf="@+id/destination_textview"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
@@ -38,8 +38,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@{searchResult.result.address}"
-            android:textColor="@android:color/black"
+            android:textColor="@color/black"
             android:textSize="@dimen/sp_size_13"
+            android:fontFamily="@font/pretendard_medium"
             app:layout_constraintEnd_toEndOf="@id/company_textview"
             app:layout_constraintStart_toStartOf="@id/company_textview"
             app:layout_constraintTop_toBottomOf="@id/company_textview"
@@ -50,9 +51,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@{searchResult.result.destination}"
-            android:textColor="@color/blue01"
+            android:textColor="@color/blue_300"
             android:textSize="@dimen/sp_size_11"
-            android:textStyle="bold"
+            android:fontFamily="@font/pretendard_semibold"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/for_textview"
             app:layout_constraintTop_toTopOf="parent"
@@ -65,7 +66,8 @@
             android:layout_marginEnd="@dimen/dp_size_8"
             android:text="@string/to_detail_text"
             android:textSize="@dimen/sp_size_11"
-            android:textColor="@color/blue01"
+            android:fontFamily="@font/pretendard_medium"
+            android:textColor="@color/blue_300"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,15 +2,16 @@
     <!-- Base application theme. -->
     <style name="Theme.Hometerview" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/blue01</item>
-        <item name="colorPrimaryVariant">@color/blue01</item>
-        <item name="colorOnPrimary">@color/blue01</item>
+        <item name="colorPrimary">@color/blue_300</item>
+        <item name="colorPrimaryVariant">@color/blue_100</item>
+        <item name="colorOnPrimary">@color/blue_600</item>
         <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/blue01</item>
-        <item name="colorSecondaryVariant">@color/blue01</item>
-        <item name="colorOnSecondary">@color/blue01</item>
+        <item name="colorSecondary">@color/blue_300</item>
+        <item name="colorSecondaryVariant">@color/blue_100</item>
+        <item name="colorOnSecondary">@color/blue_600</item>
         <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">@color/blue01</item>
-        <!-- Customize your theme here. -->
+        <item name="android:statusBarColor" >@color/blue_100</item>
+        <!-- Status bar text color. -->
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
     </style>
 </resources>
diff --git a/design/src/main/res/values/colors.xml b/design/src/main/res/values/colors.xml
@@ -9,9 +9,10 @@
     <color name="gray_800">#505866</color>
     <color name="gray_900">#505866</color>
     <color name="white">#FFFFFF</color>
+    <color name="black">#000000</color>
     <color name="blue_100">#EAF3FE</color>
     <color name="blue_300">#4880EE</color>
     <color name="blue_600">#2B5FC3</color>
-    <color name="yellow_500">#2B5FC3</color>
+    <color name="yellow_500">#F7CF6C</color>
     <color name="red_500">#E25848</color>
 </resources>