[feat] #70 subjectDetail graphic 적용

SOPT-all · Jan 24, 2025 · 5189687 · 5189687
1 parent e934aef
commit 5189687
Show file tree

Hide file tree

Showing 6 changed files with 161 additions and 16 deletions.
diff --git a/...ain/java/org/android/bbangzip/presentation/ui/my/mybadgecategory/MyBadgeCategoryScreen.kt b/...ain/java/org/android/bbangzip/presentation/ui/my/mybadgecategory/MyBadgeCategoryScreen.kt
@@ -89,7 +89,7 @@ fun MyBadgeCategoryScreen(
                     contentDescription = null,
                     modifier = Modifier
                         .fillMaxSize()
-                        .aspectRatio(360f / 161f)
+                        .aspectRatio(360f / 121f)
                 )
                 Column(
                     modifier =

diff --git a/...n/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetatilScreen.kt b/...n/java/org/android/bbangzip/presentation/ui/subject/subjectdetail/SubjectDetatilScreen.kt
@@ -1,5 +1,6 @@
 package org.android.bbangzip.presentation.ui.subject.subjectdetail
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
@@ -8,6 +9,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -32,8 +34,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.AnnotatedString
@@ -117,6 +121,15 @@ fun SubjectDetailScreen(
                                 shape = RoundedCornerShape(bottomStart = 32.dp, bottomEnd = 32.dp),
                             ),
                 ) {
+                    Image(
+                        painter = painterResource(R.drawable.img_subject_detail_header),
+                        contentDescription = null,
+                        modifier = Modifier
+                            .fillMaxSize()
+                            .aspectRatio(360f / 172f)
+                            .clip(shape = RoundedCornerShape(bottomStart = 40.dp, bottomEnd = 40.dp))
+                            .align(Alignment.BottomCenter),
+                    )
                     TwoLineTextWithWordWrap(motivationMessage)
 
                     Box(

diff --git a/app/src/main/java/org/android/bbangzip/presentation/ui/todo/TodoScreen.kt b/app/src/main/java/org/android/bbangzip/presentation/ui/todo/TodoScreen.kt
@@ -48,8 +48,6 @@ import org.android.bbangzip.presentation.type.BbangZipButtonSize
 import org.android.bbangzip.presentation.type.BbangZipButtonType
 import org.android.bbangzip.presentation.type.ToDoFilterType
 import org.android.bbangzip.presentation.type.ToDoScreenType
-import org.android.bbangzip.presentation.ui.subject.subjectdetail.RevertCompleteBottomSheet
-import org.android.bbangzip.presentation.ui.todo.component.ToDoFilterPickerBottomSheet
 import org.android.bbangzip.presentation.util.modifier.applyFilterOnClick
 import org.android.bbangzip.ui.theme.BbangZipTheme
 
@@ -294,7 +292,7 @@ fun DateMessageCard(
             ) {
                 if (pendingCount == 0) {
                     Image(
-                        painter = painterResource(R.drawable.img_pending_study_zero_header),
+                        painter = painterResource(R.drawable.img_pending_study_zero),
                         contentDescription = null,
                         modifier = Modifier
                             .fillMaxWidth()

diff --git a/app/src/main/res/drawable/img_mypage_header.xml b/app/src/main/res/drawable/img_mypage_header.xml
@@ -1,58 +1,58 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="360dp"
-    android:height="161dp"
+    android:height="132dp"
     android:viewportWidth="360"
-    android:viewportHeight="161">
+    android:viewportHeight="132">
   <path
-      android:pathData="M351.27,66.69C349.67,57.86 342.74,42.65 320.41,37.89C290.97,31.61 275.57,47.38 271.32,52.55C271.1,52.82 270.67,52.55 270.83,52.23C272.74,48.35 278.27,41.08 289.43,37.42C290.28,37.14 290.39,35.99 289.6,35.57C280.71,30.86 265.5,29.15 254.58,33.52C234.98,41.38 232.85,57.29 231.9,61.42C230.73,66.48 230.8,71.38 231.53,76.51C232.27,81.68 233.47,86.77 233.99,91.97C234.38,96 234.27,105.35 234.26,105.47C234.11,111.93 237.26,117.94 242.76,121.33C268.71,137.3 300.44,144.39 329.4,136.69C331.61,136.11 333.82,135.41 335.86,134.37C342.73,130.87 342.12,123.87 342.43,117.25C342.85,108.4 345.83,100.19 348.48,91.65C350.96,83.67 352.77,75.04 351.25,66.68L351.27,66.69Z"
+      android:pathData="M351.27,48.69C349.67,39.86 342.74,24.65 320.41,19.89C290.97,13.61 275.57,29.38 271.32,34.55C271.1,34.82 270.67,34.55 270.83,34.23C272.74,30.35 278.27,23.08 289.43,19.42C290.28,19.14 290.39,17.99 289.6,17.57C280.71,12.86 265.5,11.15 254.58,15.52C234.98,23.38 232.85,39.29 231.9,43.42C230.73,48.48 230.8,53.38 231.53,58.51C232.27,63.68 233.47,68.77 233.99,73.97C234.38,78 234.27,87.35 234.26,87.47C234.11,93.93 237.26,99.94 242.76,103.33C268.71,119.3 300.44,126.39 329.4,118.69C331.61,118.11 333.82,117.41 335.86,116.37C342.73,112.87 342.12,105.87 342.43,99.25C342.85,90.4 345.83,82.19 348.48,73.65C350.96,65.67 352.77,57.04 351.25,48.68L351.27,48.69Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFB45A"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M311.06,134.64C311.06,134.64 287.89,136.97 292.05,122.02C292.62,119.98 293.01,117.89 293.29,115.78C293.77,112.21 291.11,105.2 290.64,103.6C284.88,84.04 290.65,72.75 291.82,70.32C298.64,56.06 316.68,51.48 331.03,56.13C336.26,57.83 352.55,65.56 343.72,90.77C341.96,95.78 340.39,100.87 339.25,106.06C338.21,110.75 338.07,115.35 337.81,120.12C337.68,122.42 337.48,124.9 336.23,126.89C334.88,129.03 332.5,130.24 330.23,131.16C323.02,134.09 311.08,134.64 311.08,134.64H311.06Z"
+      android:pathData="M311.06,116.64C311.06,116.64 287.89,118.97 292.05,104.02C292.62,101.98 293.01,99.89 293.29,97.78C293.77,94.21 291.11,87.2 290.64,85.6C284.88,66.04 290.65,54.75 291.82,52.32C298.64,38.06 316.68,33.48 331.03,38.13C336.26,39.83 352.55,47.56 343.72,72.77C341.96,77.78 340.39,82.87 339.25,88.06C338.21,92.75 338.07,97.35 337.81,102.12C337.68,104.42 337.48,106.9 336.23,108.89C334.88,111.03 332.5,112.24 330.23,113.16C323.02,116.09 311.08,116.64 311.08,116.64H311.06Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFF7ED"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M255.74,84.83C255.74,84.83 250.26,81.31 244.83,85.25"
+      android:pathData="M255.74,66.83C255.74,66.83 250.26,63.31 244.83,67.25"
       android:strokeAlpha="0.4"
       android:strokeWidth="2"
       android:fillColor="#00000000"
       android:strokeColor="#FFB45A"
       android:fillAlpha="0.4"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M272.19,81.44C268.12,80.61 264.32,82.39 261.69,85.23C261.11,83.43 260.18,81.78 258.83,80.47C255.52,77.25 250.84,76.66 246.91,79.05C243.31,81.25 240.98,85.24 240.16,89.38C238.84,96.01 241.64,104.69 249.03,105.67C252.7,106.15 255.91,104.35 258.27,101.63C259.17,104.21 260.84,106.5 263.44,108.05C270.47,112.26 278.37,107.39 280.47,99.69C280.65,99.05 280.85,98.4 280.97,97.73C282.2,91.18 279.68,82.97 272.19,81.44Z"
+      android:pathData="M272.19,63.44C268.12,62.61 264.32,64.39 261.69,67.23C261.11,65.43 260.18,63.78 258.83,62.47C255.52,59.26 250.84,58.66 246.91,61.05C243.31,63.25 240.98,67.24 240.16,71.38C238.84,78.01 241.64,86.7 249.03,87.67C252.7,88.15 255.91,86.35 258.27,83.63C259.17,86.21 260.84,88.5 263.44,90.05C270.47,94.26 278.37,89.39 280.47,81.69C280.65,81.05 280.85,80.4 280.97,79.73C282.2,73.18 279.68,64.97 272.19,63.44Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFF7ED"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M274.92,96.19C274.37,98.97 272.87,101.77 270.4,103.29C267.91,104.83 264.69,104.34 262.84,102.03C260.94,99.64 260.58,96.29 261.17,93.38C261.67,90.83 263.04,88.26 265.14,86.67C267.65,84.8 270.97,84.93 273.06,87.34C275.12,89.71 275.51,93.22 274.92,96.2L274.92,96.19Z"
+      android:pathData="M274.92,78.19C274.37,80.97 272.87,83.77 270.4,85.29C267.91,86.83 264.69,86.34 262.85,84.03C260.95,81.64 260.58,78.29 261.17,75.38C261.67,72.83 263.04,70.26 265.15,68.67C267.65,66.8 270.97,66.93 273.06,69.34C275.13,71.71 275.51,75.22 274.92,78.2L274.92,78.19Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFB45A"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M255.66,91.95C255.33,93.56 254.69,95.1 253.79,96.45C252.68,98.11 251.07,99.52 249.18,99.8C246.55,100.21 243.98,98.23 242.96,95.66C241.04,90.88 243.37,82.59 248.92,81.67C250.97,81.33 253.08,82.4 254.32,84.13C255.57,85.85 256.03,88.12 255.88,90.32C255.84,90.87 255.76,91.42 255.66,91.95Z"
+      android:pathData="M255.66,73.95C255.33,75.56 254.69,77.1 253.79,78.45C252.68,80.11 251.07,81.52 249.18,81.8C246.55,82.2 243.98,80.23 242.96,77.66C241.04,72.88 243.37,64.59 248.92,63.67C250.97,63.33 253.08,64.4 254.32,66.13C255.57,67.85 256.03,70.12 255.88,72.32C255.84,72.87 255.76,73.42 255.66,73.95Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFB45A"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M269.35,90.9a2.86,4.29 69.76,1 0,8.06 -2.97a2.86,4.29 69.76,1 0,-8.06 2.97z"
+      android:pathData="M269.35,72.9a2.86,4.29 69.76,1 0,8.06 -2.97a2.86,4.29 69.76,1 0,-8.06 2.97z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFF9EF"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M258.08,84.92C258.63,86.41 257.26,88.28 255.04,89.1C252.81,89.92 250.57,89.38 250.02,87.9C249.47,86.41 250.83,84.55 253.06,83.72C255.28,82.9 257.53,83.44 258.08,84.92Z"
+      android:pathData="M258.08,66.92C258.63,68.41 257.26,70.28 255.04,71.1C252.81,71.92 250.57,71.38 250.02,69.9C249.47,68.41 250.83,66.54 253.06,65.72C255.28,64.9 257.53,65.44 258.08,66.92Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFF9EF"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M189.67,102.75L191.48,100.37L191.05,98.49L191.6,94.52L194.41,92.57L194.04,89.9L194.94,87.05L197.98,84.98L202.92,84.37L205.62,85.25L206.47,85.75L205.43,81.01L205.7,76.7L206.83,73.95L209.05,72.06L211.66,71.81L214.26,72.61L215.34,74.41L216.26,76.31L217.05,80.15L216.74,83.29L217.71,86.56L219.57,89.89L221.2,93.5L222.26,96.64L222.79,96.72L226.13,96.94L227.21,100.13L226.9,101.98L226.02,106.8L223.88,111.3L220.14,114.73L218.51,115.99L217.8,116.51L216.4,114.57L215.88,113.52L211.74,115.69L208.01,116.63L204.04,116.51L200.28,115.31L198.15,114.57L195.36,113.15L192.79,110.83L190.46,107.69L189.24,104.36L189.67,102.75Z"
+      android:pathData="M189.72,84.89L191.54,82.49L191.12,80.61L191.69,76.62L194.5,74.64L194.14,71.97L195.05,69.1L198.08,67.02L203,66.37L205.69,67.24L206.53,67.74L205.52,62.99L205.81,58.66L206.95,55.9L209.17,53.98L211.77,53.72L214.36,54.51L215.42,56.31L216.33,58.21L217.09,62.06L216.76,65.21L217.71,68.48L219.54,71.82L221.15,75.43L222.18,78.58L222.71,78.65L226.03,78.85L227.09,82.05L226.77,83.91L225.87,88.75L223.72,93.27L219.97,96.73L218.35,98.01L217.64,98.53L216.26,96.6L215.75,95.55L211.62,97.75L207.89,98.71L203.95,98.61L200.21,97.43L198.09,96.7L195.33,95.29L192.78,92.98L190.49,89.84L189.29,86.5L189.72,84.89Z"
       android:strokeAlpha="0.4"
       android:fillColor="#ffffff"
       android:fillAlpha="0.4"/>
   <path
-      android:pathData="M227.27,98.59C227.21,98.25 226.91,96.85 226.74,96.65C226.02,95.85 223.6,96.12 222.6,96.21C222.01,93.63 221.02,91.27 219.79,88.95L219.79,88.94C219.49,88.38 219.15,87.77 218.81,87.23C218.37,86.53 218.05,85.53 217.84,84.75C217.37,83.07 217.27,81.33 217.23,79.6C217.22,78.73 217.22,77.87 217.2,77C217.17,75.23 216.63,73.46 215.26,72.24C213.9,71.04 211.96,70.38 210.16,70.67C208.93,70.87 207.68,71.47 206.84,72.35C206.01,73.19 205.47,74.15 205.07,75.27C204.66,76.38 204.52,77.51 204.45,78.65C204.36,80.12 204.54,81.59 204.84,83.04L205.12,84.33C204.33,84.03 204.34,84.02 203.81,83.88C203.45,83.79 203.07,83.68 202.67,83.65C200.41,83.47 198.26,83.71 196.33,84.93C194.02,86.39 192.75,89.07 193.74,91.72C193.31,92.07 192.82,92.26 192.4,92.64C191.01,93.89 190.05,96.3 190.02,98.15C190.01,98.51 190.26,99.78 190.21,99.92C190.14,100.14 189.18,101.13 188.93,101.77C186.31,108.41 196.7,115.36 202.22,116.6C206.83,117.64 211.76,116.79 215.54,114.05C215.96,114.66 217.12,116.41 217.75,116.65C218.81,117.07 220.86,115.1 221.54,114.39C225.18,110.57 228.09,103.93 227.27,98.59L227.27,98.59ZM203.15,85.12L203.15,85.12C206.14,85.74 209.39,87.71 210.06,90.86C210.43,92.62 209.78,94.39 207.96,94.91C205.33,91.55 200.67,90.02 196.52,90.76C196.28,90.8 194.97,91.24 194.91,91.18C193.79,86.46 199.26,84.31 203.15,85.12L203.15,85.12ZM221.16,112.96C220.77,113.39 218.59,115.58 218.06,115.35C217.75,114.99 217.4,114.65 217.12,114.27C217.01,114.12 216.5,113.34 216.47,113.23C216.35,112.82 217.23,112.19 217.44,111.74C217.54,111.54 217.46,111.57 217.28,111.52C210.25,118.17 198.87,116.62 192.61,109.37C190.7,107.16 188.66,104.01 190.86,101.28C192.91,98.73 197.54,99.4 200.28,100.42C200.77,100.21 199.02,99.22 198.9,99.16C197.12,98.24 194.87,97.93 192.94,98.44C192.58,98.53 191.68,99.07 191.47,98.79C191.31,97.61 191.7,96.26 192.16,95.18C193.86,91.24 199.66,91.38 203.15,92.86C206.64,94.35 209.86,98.67 206.8,102.05C206.44,102.45 204.75,103.49 204.7,103.61C204.55,103.94 205.1,105.24 205.16,105.73C205.5,108.72 202.65,110.92 199.91,109.63C197.98,108.71 197.46,107.68 194.88,107.66C194.68,107.66 194.49,107.72 194.29,107.67C194.16,107.89 194.31,107.96 194.5,108.06C195.01,108.34 195.68,108.43 196.22,108.66C198.58,109.67 198.94,111.51 201.96,111.32C205.65,111.09 207.23,107.44 206.36,104.17C207.68,103.35 208.8,102.11 209.19,100.59C209.6,100.82 209.82,101.13 210.24,101.38C210.67,101.63 211.29,101.84 211.75,102.03L209.64,99.59C209.38,98.44 209.29,97.29 208.82,96.19C213.98,93.12 211.09,87.11 206.75,84.91C206.7,84.72 206.57,84.27 206.39,83.28L206.24,82.66C206.22,82.58 206.25,82.74 206.24,82.66C206.01,81.4 205.82,80.93 205.87,79.58C205.97,76.97 206.53,73.98 208.96,72.57C210.18,71.86 211.79,71.87 213.06,72.51C214.23,73.11 215.26,74.18 215.58,75.48C215.83,76.5 215.71,77.62 215.74,78.67C215.82,81.78 215.94,85.03 217.68,87.75C217.96,88.2 218.13,88.44 218.38,88.93L218.37,88.94C218.88,89.91 219.46,91.19 219.9,92.21C221.42,95.83 222.38,99.65 222.84,103.53C223.42,101.57 223.25,99.51 222.92,97.52C223.51,97.27 225.54,97 225.88,97.61C225.91,97.68 226.12,98.9 226.14,99.07C226.55,103.8 224.27,109.47 221.16,112.96L221.16,112.96Z"
+      android:pathData="M227.15,80.5C227.1,80.16 226.81,78.76 226.63,78.56C225.93,77.76 223.51,78.05 222.52,78.14C221.95,75.56 220.98,73.2 219.77,70.87L219.76,70.86C219.47,70.31 219.14,69.69 218.8,69.15C218.37,68.45 218.05,67.46 217.84,66.67C217.39,64.99 217.29,63.24 217.27,61.51C217.26,60.64 217.26,59.77 217.25,58.9C217.23,57.12 216.7,55.35 215.34,54.14C214,52.94 212.08,52.29 210.29,52.59C209.06,52.79 207.81,53.41 206.96,54.29C206.14,55.14 205.6,56.11 205.19,57.23C204.78,58.34 204.63,59.48 204.55,60.62C204.46,62.1 204.63,63.58 204.92,65.03L205.19,66.32C204.4,66.03 204.41,66.01 203.89,65.88C203.53,65.79 203.15,65.68 202.76,65.66C200.51,65.48 198.37,65.74 196.44,66.97C194.13,68.44 192.86,71.15 193.83,73.8C193.4,74.15 192.91,74.34 192.49,74.73C191.1,75.99 190.13,78.41 190.09,80.27C190.08,80.64 190.32,81.91 190.27,82.05C190.2,82.27 189.24,83.27 188.99,83.91C186.34,90.59 196.65,97.5 202.13,98.71C206.71,99.73 211.62,98.85 215.4,96.08C215.81,96.7 216.95,98.44 217.58,98.68C218.63,99.09 220.68,97.11 221.37,96.39C225.01,92.54 227.94,85.85 227.15,80.5L227.15,80.5ZM203.23,67.12L203.22,67.12C206.2,67.73 209.43,69.69 210.07,72.85C210.43,74.6 209.77,76.39 207.96,76.92C205.37,73.56 200.73,72.05 196.6,72.82C196.36,72.86 195.06,73.31 195,73.25C193.91,68.52 199.36,66.33 203.23,67.12L203.23,67.12ZM220.99,94.95C220.61,95.39 218.43,97.6 217.9,97.37C217.6,97.02 217.24,96.68 216.97,96.3C216.86,96.14 216.36,95.36 216.33,95.26C216.21,94.85 217.1,94.21 217.31,93.76C217.4,93.55 217.33,93.58 217.14,93.53C210.11,100.25 198.8,98.75 192.61,91.52C190.72,89.31 188.71,86.16 190.91,83.41C192.96,80.83 197.57,81.49 200.29,82.49C200.77,82.28 199.05,81.29 198.92,81.23C197.16,80.33 194.92,80.03 192.99,80.54C192.64,80.64 191.74,81.18 191.53,80.91C191.38,79.73 191.77,78.37 192.24,77.28C193.95,73.32 199.72,73.43 203.18,74.89C206.65,76.36 209.83,80.69 206.77,84.09C206.41,84.49 204.72,85.55 204.67,85.67C204.52,86 205.06,87.3 205.12,87.8C205.43,90.79 202.6,93.01 199.87,91.73C197.95,90.82 197.44,89.79 194.88,89.78C194.68,89.78 194.49,89.84 194.29,89.8C194.16,90.02 194.31,90.09 194.5,90.19C195.01,90.47 195.67,90.55 196.2,90.78C198.54,91.78 198.9,93.63 201.9,93.42C205.58,93.17 207.17,89.5 206.32,86.21C207.63,85.39 208.76,84.14 209.16,82.61C209.56,82.84 209.77,83.15 210.2,83.4C210.62,83.64 211.23,83.86 211.7,84.04L209.61,81.61C209.35,80.46 209.27,79.3 208.81,78.2C213.96,75.09 211.12,69.08 206.81,66.9C206.76,66.7 206.63,66.25 206.46,65.26L206.31,64.64C206.3,64.56 206.33,64.72 206.31,64.64C206.09,63.38 205.91,62.9 205.97,61.55C206.08,58.93 206.65,55.93 209.08,54.5C210.3,53.78 211.9,53.78 213.15,54.42C214.32,55.01 215.34,56.08 215.65,57.38C215.89,58.41 215.77,59.53 215.79,60.58C215.85,63.7 215.96,66.96 217.67,69.68C217.95,70.13 218.11,70.37 218.36,70.86L218.35,70.87C218.86,71.84 219.43,73.13 219.85,74.15C221.35,77.76 222.28,81.6 222.71,85.49C223.31,83.52 223.15,81.45 222.83,79.46C223.42,79.2 225.44,78.92 225.77,79.53C225.81,79.6 226.01,80.82 226.02,81C226.41,85.74 224.11,91.44 220.99,94.96L220.99,94.95Z"
       android:strokeAlpha="0.4"
       android:fillColor="#FFB45A"
       android:fillAlpha="0.4"/>