Przeglądaj źródła

Revert "[공통][Common] 이미지 로딩 일괄 적용 및 플래그, 포인트 색상 변경"

This reverts commit 9981baa9ee6a059219c5293507859b7ff31de6ef.
Hasemi 6 lat temu
rodzic
commit
1632c2169a

+ 0 - 9
app/src/main/res/drawable/circle_cff0053.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="oval">
-  <size
-    android:width="35dp"
-    android:height="35dp"/>
-  <solid
-    android:color="@color/CFF0053"/>
-</shape>

Plik diff jest za duży
+ 3 - 9
app/src/main/res/drawable/ic_bi_default_image_full_module.xml


Plik diff jest za duży
+ 3 - 9
app/src/main/res/drawable/ic_bi_default_image_small_module.xml


+ 1 - 1
app/src/main/res/drawable/image_loading_full.xml

@@ -13,7 +13,7 @@
   </item>
   <item
     android:bottom="337dp"
-    android:drawable="@drawable/zumo_full_module"
+    android:drawable="@drawable/ic_bi_default_image_full_module"
     android:gravity="center"
     android:left="323dp"
     android:right="323dp"

+ 1 - 1
app/src/main/res/drawable/image_loading_list.xml

@@ -11,7 +11,7 @@
   </item>
   <item
     android:bottom="37dp"
-    android:drawable="@drawable/zumo_middle_module"
+    android:drawable="@drawable/ic_bi_default_image_middle_module"
     android:gravity="center"
     android:left="44dp"
     android:right="44dp"

+ 1 - 1
app/src/main/res/drawable/image_loading_main.xml

@@ -12,7 +12,7 @@
   </item>
   <item
     android:bottom="151dp"
-    android:drawable="@drawable/zumo_full_module"
+    android:drawable="@drawable/ic_bi_default_image_full_module"
     android:gravity="center"
     android:left="115dp"
     android:right="115dp"

+ 1 - 1
app/src/main/res/drawable/image_loading_middle.xml

@@ -11,7 +11,7 @@
   </item>
   <item
     android:bottom="94dp"
-    android:drawable="@drawable/zumo_middle_module"
+    android:drawable="@drawable/ic_bi_default_image_middle_module"
     android:gravity="center"
     android:left="59dp"
     android:right="59dp"

+ 1 - 1
app/src/main/res/drawable/image_loading_small.xml

@@ -12,7 +12,7 @@
   </item>
   <item
     android:bottom="118dp"
-    android:drawable="@drawable/zumo_small_module"
+    android:drawable="@drawable/ic_bi_default_image_small_module"
     android:gravity="center"
     android:left="111dp"
     android:right="111dp"

+ 2 - 2
app/src/main/res/drawable/view_graph_gradation.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
-  <gradient android:startColor="#eb652b"
+  <gradient android:startColor="#ff9423"
             android:angle="270"
-            android:endColor="#e25163"/>
+            android:endColor="#ff8d8d"/>
 </shape>

Plik diff jest za duży
+ 0 - 10
app/src/main/res/drawable/zumo_full_module.xml


Plik diff jest za duży
+ 0 - 10
app/src/main/res/drawable/zumo_middle_module.xml


Plik diff jest za duży
+ 0 - 10
app/src/main/res/drawable/zumo_small_module.xml


+ 1 - 1
app/src/main/res/layout/event_chart_view_item.xml

@@ -40,7 +40,7 @@
       android:id="@+id/view_circle"
       android:layout_width="38dp"
       android:layout_height="38dp"
-      android:background="@drawable/circle_cff0053"/>
+      android:background="@drawable/circle_c000000"/>
 
     <TextView
       android:layout_width="wrap_content"

+ 9 - 9
app/src/main/res/layout/my_event_view.xml

@@ -19,12 +19,12 @@
   <View
     android:id="@+id/end_dim"
     android:layout_width="124dp"
-    android:layout_height="93dp"
-    android:background="@color/C99ebebeb"
-    app:layout_constraintBottom_toBottomOf="@+id/image_view_my_event"
     app:layout_constraintEnd_toEndOf="@+id/image_view_my_event"
     app:layout_constraintStart_toStartOf="@+id/image_view_my_event"
-    app:layout_constraintTop_toTopOf="@+id/image_view_my_event"/>
+    app:layout_constraintTop_toTopOf="@+id/image_view_my_event"
+    android:layout_height="93dp"
+    app:layout_constraintBottom_toBottomOf="@+id/image_view_my_event"
+    android:background="@color/C99ebebeb"/>
 
   <TextView
     android:id="@+id/text_view_title"
@@ -35,13 +35,13 @@
     android:layout_marginEnd="2dp"
     android:layout_marginBottom="3dp"
     android:lineSpacingExtra="5.5sp"
-    android:maxLines="2"
     android:textColor="@color/C000000"
     android:textSize="14sp"
+    android:maxLines="2"
     app:layout_constrainedWidth="true"
+    app:layout_constraintHorizontal_bias="0"
     app:layout_constraintBottom_toTopOf="@+id/text_view_date"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintHorizontal_bias="0"
     app:layout_constraintStart_toEndOf="@+id/image_view_my_event"
     app:layout_constraintTop_toTopOf="parent"
     tools:text="샤갈 러브 앤 라이프\n전시회 티켓 증정 샤갈 러브 앤 라이프 샤갈 러브 앤 라이프\n전시회 티켓 증정"/>
@@ -53,12 +53,12 @@
     android:layout_marginTop="3dp"
     android:layout_marginBottom="3dp"
     android:lineSpacingExtra="4sp"
+    tools:text="@string/event_date_to"
     android:textColor="@color/C999999"
     android:textSize="11sp"
     app:layout_constraintBottom_toTopOf="@+id/text_view_winner"
     app:layout_constraintStart_toStartOf="@+id/text_view_title"
-    app:layout_constraintTop_toBottomOf="@+id/text_view_title"
-    tools:text="@string/event_date_to"/>
+    app:layout_constraintTop_toBottomOf="@+id/text_view_title"/>
 
   <TextView
     android:id="@+id/text_view_winner"
@@ -93,7 +93,7 @@
     android:layout_height="16dp"
     android:layout_marginStart="6dp"
     android:layout_marginTop="6dp"
-    android:background="@color/CFF0053"
+    android:background="@color/C000000"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">