[Merge] fix-history-remove-elevation -> develop

[fix] 마이페이지-러닝 기록 / 이미지뷰 elevation 제거
Runnect · Sep 23, 2023 · 85b515c · 85b515c
2 parents a6c3782 + 8442ec0
commit 85b515c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/app/src/main/res/layout/item_mypage_history.xml b/app/src/main/res/layout/item_mypage_history.xml
@@ -23,23 +23,28 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.cardview.widget.CardView
+        <com.google.android.material.card.MaterialCardView
             android:id="@+id/cv_my_page_history_course"
             android:layout_width="80dp"
             android:layout_height="0dp"
             android:layout_marginStart="18dp"
             android:layout_marginTop="10dp"
             app:cardCornerRadius="10dp"
+            app:cardElevation="0dp"
             app:layout_constraintDimensionRatio="1:1"
             app:layout_constraintStart_toStartOf="@id/iv_my_page_history_frame"
-            app:layout_constraintTop_toTopOf="@id/iv_my_page_history_frame">
+            app:layout_constraintTop_toTopOf="@id/iv_my_page_history_frame"
+            app:strokeColor="@color/G6"
+            app:strokeWidth="1dp">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/iv_my_page_history_course"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:scaleType="centerCrop" />
-        </androidx.cardview.widget.CardView>
+
+        </com.google.android.material.card.MaterialCardView>
+
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_my_page_history_course_name"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -23,6 +23,7 @@
     <color name="G3">#C1C1C1</color>
     <color name="G4">#ECECEC</color>
     <color name="G5">#F3F3F3</color>
+    <color name="G6">#D9D9D9</color>
 
 
     <color name="Y1">#F7D198</color>