[PC-217] 줄 정리

YAPP-Github · Jan 2, 2025 · 7ab9374 · 7ab9374
1 parent 05d69ae
commit 7ab9374
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/core/designsystem/src/main/res/drawable/ic_image_default.xml b/core/designsystem/src/main/res/drawable/ic_image_default.xml
@@ -4,27 +4,31 @@
     android:height="120dp"
     android:viewportWidth="120"
     android:viewportHeight="120">
-  <path
-      android:pathData="M60,0L60,0A60,60 0,0 1,120 60L120,60A60,60 0,0 1,60 120L60,120A60,60 0,0 1,0 60L0,60A60,60 0,0 1,60 0z"
-      android:fillColor="#F4F6FA"/>
-  <path
-      android:pathData="M57.48,18C51.03,18 45.8,22.9 45.8,28.95C45.8,29.85 45.91,30.71 46.12,31.54C46.53,33.12 45.5,35.04 43.88,35.04H36C31.58,35.04 28,38.62 28,43.04V50.16C28,51.79 29.92,52.81 31.5,52.41C32.33,52.19 33.19,52.08 34.09,52.08C40.14,52.08 45.04,57.31 45.04,63.76C45.04,70.22 40.14,75.45 34.09,75.45C33.19,75.45 32.33,75.33 31.5,75.12C29.92,74.71 28,75.74 28,77.37V84C28,88.42 31.58,92 36,92H42.88C44.5,92 45.53,90.08 45.12,88.5C44.91,87.67 44.8,86.81 44.8,85.91C44.8,79.86 50.03,74.96 56.48,74.96C62.93,74.96 68.16,79.86 68.16,85.91C68.16,86.81 68.05,87.67 67.84,88.5C67.43,90.08 68.46,92 70.08,92H76.96C81.38,92 84.96,88.42 84.96,84V76.37C84.96,74.74 86.88,73.71 88.46,74.12C89.29,74.33 90.15,74.45 91.05,74.45C97.1,74.45 102,69.22 102,62.76C102,56.31 97.1,51.08 91.05,51.08C90.15,51.08 89.29,51.19 88.46,51.41C86.88,51.81 84.96,50.79 84.96,49.16V43.04C84.96,38.62 81.38,35.04 76.96,35.04H71.08C69.46,35.04 68.43,33.12 68.84,31.54C69.05,30.71 69.16,29.85 69.16,28.95C69.16,22.9 63.93,18 57.48,18Z"
-      android:fillColor="#CBD1D9"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M57.48,18C51.03,18 45.8,22.9 45.8,28.95C45.8,29.85 45.91,30.71 46.12,31.54C46.53,33.12 45.5,35.04 43.88,35.04H36C31.58,35.04 28,38.62 28,43.04V50.16C28,51.79 29.92,52.81 31.5,52.41C32.33,52.19 33.19,52.08 34.09,52.08C40.14,52.08 45.04,57.31 45.04,63.76C45.04,70.22 40.14,75.45 34.09,75.45C33.19,75.45 32.33,75.33 31.5,75.12C29.92,74.71 28,75.74 28,77.37V84C28,88.42 31.58,92 36,92H42.88C44.5,92 45.53,90.08 45.12,88.5C44.91,87.67 44.8,86.81 44.8,85.91C44.8,79.86 50.03,74.96 56.48,74.96C62.93,74.96 68.16,79.86 68.16,85.91C68.16,86.81 68.05,87.67 67.84,88.5C67.43,90.08 68.46,92 70.08,92H76.96C81.38,92 84.96,88.42 84.96,84V76.37C84.96,74.74 86.88,73.71 88.46,74.12C89.29,74.33 90.15,74.45 91.05,74.45C97.1,74.45 102,69.22 102,62.76C102,56.31 97.1,51.08 91.05,51.08C90.15,51.08 89.29,51.19 88.46,51.41C86.88,51.81 84.96,50.79 84.96,49.16V43.04C84.96,38.62 81.38,35.04 76.96,35.04H71.08C69.46,35.04 68.43,33.12 68.84,31.54C69.05,30.71 69.16,29.85 69.16,28.95C69.16,22.9 63.93,18 57.48,18Z"
-      android:fillAlpha="0.2"
-      android:fillType="evenOdd">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startX="65"
-          android:startY="18"
-          android:endX="65"
-          android:endY="92"
-          android:type="linear">
-        <item android:offset="0" android:color="#006F00FB"/>
-        <item android:offset="1" android:color="#FF6F00FB"/>
-      </gradient>
-    </aapt:attr>
-  </path>
+    <path
+        android:pathData="M60,0L60,0A60,60 0,0 1,120 60L120,60A60,60 0,0 1,60 120L60,120A60,60 0,0 1,0 60L0,60A60,60 0,0 1,60 0z"
+        android:fillColor="#F4F6FA" />
+    <path
+        android:pathData="M57.48,18C51.03,18 45.8,22.9 45.8,28.95C45.8,29.85 45.91,30.71 46.12,31.54C46.53,33.12 45.5,35.04 43.88,35.04H36C31.58,35.04 28,38.62 28,43.04V50.16C28,51.79 29.92,52.81 31.5,52.41C32.33,52.19 33.19,52.08 34.09,52.08C40.14,52.08 45.04,57.31 45.04,63.76C45.04,70.22 40.14,75.45 34.09,75.45C33.19,75.45 32.33,75.33 31.5,75.12C29.92,74.71 28,75.74 28,77.37V84C28,88.42 31.58,92 36,92H42.88C44.5,92 45.53,90.08 45.12,88.5C44.91,87.67 44.8,86.81 44.8,85.91C44.8,79.86 50.03,74.96 56.48,74.96C62.93,74.96 68.16,79.86 68.16,85.91C68.16,86.81 68.05,87.67 67.84,88.5C67.43,90.08 68.46,92 70.08,92H76.96C81.38,92 84.96,88.42 84.96,84V76.37C84.96,74.74 86.88,73.71 88.46,74.12C89.29,74.33 90.15,74.45 91.05,74.45C97.1,74.45 102,69.22 102,62.76C102,56.31 97.1,51.08 91.05,51.08C90.15,51.08 89.29,51.19 88.46,51.41C86.88,51.81 84.96,50.79 84.96,49.16V43.04C84.96,38.62 81.38,35.04 76.96,35.04H71.08C69.46,35.04 68.43,33.12 68.84,31.54C69.05,30.71 69.16,29.85 69.16,28.95C69.16,22.9 63.93,18 57.48,18Z"
+        android:fillColor="#CBD1D9"
+        android:fillType="evenOdd" />
+    <path
+        android:pathData="M57.48,18C51.03,18 45.8,22.9 45.8,28.95C45.8,29.85 45.91,30.71 46.12,31.54C46.53,33.12 45.5,35.04 43.88,35.04H36C31.58,35.04 28,38.62 28,43.04V50.16C28,51.79 29.92,52.81 31.5,52.41C32.33,52.19 33.19,52.08 34.09,52.08C40.14,52.08 45.04,57.31 45.04,63.76C45.04,70.22 40.14,75.45 34.09,75.45C33.19,75.45 32.33,75.33 31.5,75.12C29.92,74.71 28,75.74 28,77.37V84C28,88.42 31.58,92 36,92H42.88C44.5,92 45.53,90.08 45.12,88.5C44.91,87.67 44.8,86.81 44.8,85.91C44.8,79.86 50.03,74.96 56.48,74.96C62.93,74.96 68.16,79.86 68.16,85.91C68.16,86.81 68.05,87.67 67.84,88.5C67.43,90.08 68.46,92 70.08,92H76.96C81.38,92 84.96,88.42 84.96,84V76.37C84.96,74.74 86.88,73.71 88.46,74.12C89.29,74.33 90.15,74.45 91.05,74.45C97.1,74.45 102,69.22 102,62.76C102,56.31 97.1,51.08 91.05,51.08C90.15,51.08 89.29,51.19 88.46,51.41C86.88,51.81 84.96,50.79 84.96,49.16V43.04C84.96,38.62 81.38,35.04 76.96,35.04H71.08C69.46,35.04 68.43,33.12 68.84,31.54C69.05,30.71 69.16,29.85 69.16,28.95C69.16,22.9 63.93,18 57.48,18Z"
+        android:fillAlpha="0.2"
+        android:fillType="evenOdd">
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:startX="65"
+                android:startY="18"
+                android:endX="65"
+                android:endY="92"
+                android:type="linear">
+                <item
+                    android:offset="0"
+                    android:color="#006F00FB" />
+                <item
+                    android:offset="1"
+                    android:color="#FF6F00FB" />
+            </gradient>
+        </aapt:attr>
+    </path>
 </vector>
diff --git a/feature/matching/src/main/java/com/puzzle/matching/detail/MatchingDetailRoute.kt b/feature/matching/src/main/java/com/puzzle/matching/detail/MatchingDetailRoute.kt
@@ -178,9 +178,7 @@ private fun MatchingDetailScreen(
         PieceSubCloseTopBar(
             title = state.currentPage.title,
             onCloseClick = onCloseClick,
-            showCloseButton = if (showDialog && dialogType == DialogType.PROFILE_IMAGE_DETAIL) {
-                false
-            } else true,
+            showCloseButton = !(showDialog && dialogType == DialogType.PROFILE_IMAGE_DETAIL),
             modifier = Modifier
                 .fillMaxWidth()
                 .height(topBarHeight)