[MOD]#6 상단 바 로고 크기 일관화

COM-MA · Feb 14, 2024 · 8e3aa5c · 8e3aa5c
1 parent 35ba9b0
commit 8e3aa5c
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 26 deletions.
diff --git a/app/src/main/res/layout/activity_card_detail.xml b/app/src/main/res/layout/activity_card_detail.xml
@@ -26,7 +26,7 @@
                 android:src="@drawable/ic_arrow_left" />
 
             <ImageView
-                android:layout_width="83dp"
+                android:layout_width="@dimen/app_bar_logo_width"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:src="@drawable/ic_logo_lavender" />

diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml
@@ -20,7 +20,7 @@
             android:paddingHorizontal="@dimen/horizontal_padding">
 
             <ImageView
-                android:layout_width="83dp"
+                android:layout_width="@dimen/app_bar_logo_width"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:src="@drawable/ic_logo_lavender" />

diff --git a/app/src/main/res/layout/fragment_content.xml b/app/src/main/res/layout/fragment_content.xml
@@ -32,7 +32,7 @@
             android:layout_height="match_parent"
             android:paddingHorizontal="@dimen/horizontal_padding">
             <ImageView
-                android:layout_width="83dp"
+                android:layout_width="@dimen/app_bar_logo_width"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:src="@drawable/ic_logo_lavender" />
@@ -44,22 +44,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+        android:paddingTop="15dp"
         app:layout_constraintTop_toBottomOf="@+id/toolbar">
 
-        <TextView
-            android:id="@+id/text_dashboard"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:textAlignment="center"
-            android:textSize="20sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -79,14 +66,15 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/pretendard_medium"
-                android:paddingVertical="10dp"
+                android:paddingTop="10dp"
+                android:paddingBottom="15dp"
                 android:text="@string/content_list_description"
                 android:textColor="@color/gray_700"
                 android:textSize="16sp" />
 
         </LinearLayout>
         <androidx.compose.ui.platform.ComposeView
-            android:id="@+id/compose_view_word_card"
+            android:id="@+id/compose_view_fairytale"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </LinearLayout>

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -10,15 +10,20 @@
         android:id="@+id/toolbar_home"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
+        app:contentInsetStart="0dp"
         app:layout_constraintBottom_toTopOf="@+id/coordinator_layout_home"
-        android:paddingHorizontal="@dimen/horizontal_padding"
-        android:paddingVertical="@dimen/vertical_padding"
         android:background="@color/lavender_500">
-        <ImageView
-            android:layout_width="83dp"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_logo_white"
-            android:alpha="0.4" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:paddingHorizontal="@dimen/horizontal_padding">
+            <ImageView
+                android:layout_width="@dimen/app_bar_logo_width"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
+                android:src="@drawable/ic_logo_white"
+                android:alpha="0.4" />
+        </FrameLayout>
     </androidx.appcompat.widget.Toolbar>
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -4,4 +4,7 @@
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="horizontal_padding">30dp</dimen>
     <dimen name="vertical_padding">16dp</dimen>
+
+    <dimen name="main_list_bottom_padding">150dp</dimen>
+    <dimen name="app_bar_logo_width">100dp</dimen>
 </resources>