Browse Source

[공통][Bug] 에니메이션 아이콘들 크기 조절

hyodong.min 6 years ago
parent
commit
b61283f6d8

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/helper/NavigationBar.java

@@ -476,11 +476,11 @@ public class NavigationBar {
         bucketListCheckAnimation.show(buttonConfirm);
       }
       else {
-        buttonConfirm.setImageResource(R.drawable.ic_icon_bucket_complet_on);
+        buttonConfirm.setImageResource(R.drawable.ic_icon_bucket_complete_on);
       }
     }
     else {
-      buttonConfirm.setImageResource(R.drawable.ic_icon_bucket_complet_default);
+      buttonConfirm.setImageResource(R.drawable.ic_icon_bucket_complete_default);
     }
   }
 

+ 16 - 16
app/src/main/res/drawable/animation_bucket.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:oneshot="true">
-  <item android:drawable="@drawable/check_00000" android:duration="20"/>
-  <item android:drawable="@drawable/check_00001" android:duration="20"/>
-  <item android:drawable="@drawable/check_00002" android:duration="20"/>
-  <item android:drawable="@drawable/check_00003" android:duration="20"/>
-  <item android:drawable="@drawable/check_00004" android:duration="20"/>
-  <item android:drawable="@drawable/check_00005" android:duration="20"/>
-  <item android:drawable="@drawable/check_00006" android:duration="20"/>
-  <item android:drawable="@drawable/check_00007" android:duration="20"/>
-  <item android:drawable="@drawable/check_00008" android:duration="20"/>
-  <item android:drawable="@drawable/check_00009" android:duration="20"/>
-  <item android:drawable="@drawable/check_00010" android:duration="20"/>
-  <item android:drawable="@drawable/check_00011" android:duration="20"/>
-  <item android:drawable="@drawable/check_00012" android:duration="20"/>
-  <item android:drawable="@drawable/check_00013" android:duration="20"/>
-  <item android:drawable="@drawable/check_00014" android:duration="20"/>
-  <item android:drawable="@drawable/ic_icon_bucket_complet_on" android:duration="20"/>
+  <item android:drawable="@drawable/check_00000" android:duration="40"/>
+  <item android:drawable="@drawable/check_00001" android:duration="40"/>
+  <item android:drawable="@drawable/check_00002" android:duration="40"/>
+  <item android:drawable="@drawable/check_00003" android:duration="40"/>
+  <item android:drawable="@drawable/check_00004" android:duration="40"/>
+  <item android:drawable="@drawable/check_00005" android:duration="40"/>
+  <item android:drawable="@drawable/check_00006" android:duration="40"/>
+  <item android:drawable="@drawable/check_00007" android:duration="40"/>
+  <item android:drawable="@drawable/check_00008" android:duration="40"/>
+  <item android:drawable="@drawable/check_00009" android:duration="40"/>
+  <item android:drawable="@drawable/check_00010" android:duration="40"/>
+  <item android:drawable="@drawable/check_00011" android:duration="40"/>
+  <item android:drawable="@drawable/check_00012" android:duration="40"/>
+  <item android:drawable="@drawable/check_00013" android:duration="40"/>
+  <item android:drawable="@drawable/check_00014" android:duration="40"/>
+  <item android:drawable="@drawable/ic_icon_bucket_complete_on" android:duration="40"/>
 </animation-list>

+ 4 - 4
app/src/main/res/drawable/ic_icon_bucket_complet_default.xml

@@ -1,14 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="19dp"
-        android:height="19dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="76"
         android:viewportHeight="77">
 
   <group
     android:pivotX="38"
     android:pivotY="39"
-    android:scaleX="0.89"
-    android:scaleY="0.89">
+    android:scaleX="0.92"
+    android:scaleY="0.92">
 
     <path
       android:fillAlpha="0.5"

+ 4 - 5
app/src/main/res/drawable/ic_icon_bucket_complet_on.xml

@@ -1,15 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="19dp"
-        android:height="19dp"
-        android:alpha="0.99"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="76"
         android:viewportHeight="77">
 
   <group
     android:pivotX="38"
     android:pivotY="39"
-    android:scaleX="0.89"
-    android:scaleY="0.89">
+    android:scaleX="0.92"
+    android:scaleY="0.92">
 
     <path
       android:fillColor="#FFFFFF"

+ 11 - 5
app/src/main/res/drawable/ic_icon_header_close.xml

@@ -1,6 +1,12 @@
-<vector android:height="24dp" android:viewportHeight="70"
-    android:viewportWidth="70" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M10.167,8.167l50.27,54.304M8.167,60.437l54.304,-50.27"
-        android:strokeColor="#222" android:strokeWidth="6"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="70"
+        android:viewportHeight="70">
+  <path
+    android:fillColor="#00000000"
+    android:fillType="evenOdd"
+    android:pathData="M10.167,8.167l50.27,54.304M8.167,60.437l54.304,-50.27"
+    android:strokeWidth="6"
+    android:strokeColor="#222"/>
 </vector>

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="70"
         android:viewportHeight="70">
   <path

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="60"
         android:viewportHeight="60">
   <path

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="60"
         android:viewportHeight="60">
   <path

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="70dp"
-        android:height="70dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="70"
         android:viewportHeight="70">
   <path

+ 20 - 9
app/src/main/res/drawable/icon_delete_bucket.xml

@@ -1,10 +1,21 @@
-<vector android:height="19dp" android:viewportHeight="77"
-    android:viewportWidth="76" android:width="19dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M61.195,22.15v46.389H15.792v-46.39M32.078,32.02v25.662M45.896,32.02v25.662M26.65,20.175V8.331h22.7v11.844"
-        android:strokeColor="#FFF" android:strokeLineCap="round"
-        android:strokeLineJoin="round" android:strokeWidth="6.957"/>
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M9.87,20.17l57.247,0.01"
-        android:strokeColor="#FFF" android:strokeLineCap="round" android:strokeWidth="6.957"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="76"
+        android:viewportHeight="77">
+  <path
+    android:fillColor="#00000000"
+    android:fillType="evenOdd"
+    android:pathData="M61.195,22.15v46.389H15.792v-46.39M32.078,32.02v25.662M45.896,32.02v25.662M26.65,20.175V8.331h22.7v11.844"
+    android:strokeWidth="6.957"
+    android:strokeColor="#FFF"
+    android:strokeLineCap="round"
+    android:strokeLineJoin="round"/>
+  <path
+    android:fillColor="#00000000"
+    android:fillType="nonZero"
+    android:pathData="M9.87,20.17l57.247,0.01"
+    android:strokeWidth="6.957"
+    android:strokeColor="#FFF"
+    android:strokeLineCap="round"/>
 </vector>

+ 19 - 7
app/src/main/res/drawable/icon_edit_copy.xml

@@ -1,8 +1,20 @@
-<vector android:height="19dp" android:viewportHeight="77"
-    android:viewportWidth="76" android:width="19dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M13.478,64.435L60.522,64.435A3.478,3.478 0,0 1,64 67.913L64,67.957A3.478,3.478 0,0 1,60.522 71.435L13.478,71.435A3.478,3.478 0,0 1,10 67.957L10,67.913A3.478,3.478 0,0 1,13.478 64.435z"/>
-    <path android:fillColor="#00000000" android:fillType="nonZero"
-        android:pathData="M51.27,10.425L15.324,43.445c0.223,5.257 0.39,9.155 0.488,11.363 0.437,0.003 0.932,0.004 1.482,0.004 2.367,0 5.754,-0.023 10.157,-0.07l34.967,-32.033L51.27,10.425z"
-        android:strokeColor="#FFF" android:strokeWidth="6.957"/>
-    <path android:fillColor="#FFF" android:fillType="nonZero" android:pathData="M42.202,13.435l14.721,16.35 -5.202,4.683 -14.72,-16.349z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="76"
+        android:viewportHeight="77">
+  <path
+    android:fillColor="#FFF"
+    android:fillType="nonZero"
+    android:pathData="M13.478,64.435L60.522,64.435A3.478,3.478 0,0 1,64 67.913L64,67.957A3.478,3.478 0,0 1,60.522 71.435L13.478,71.435A3.478,3.478 0,0 1,10 67.957L10,67.913A3.478,3.478 0,0 1,13.478 64.435z"/>
+  <path
+    android:fillColor="#00000000"
+    android:fillType="nonZero"
+    android:pathData="M51.27,10.425L15.324,43.445c0.223,5.257 0.39,9.155 0.488,11.363 0.437,0.003 0.932,0.004 1.482,0.004 2.367,0 5.754,-0.023 10.157,-0.07l34.967,-32.033L51.27,10.425z"
+    android:strokeWidth="6.957"
+    android:strokeColor="#FFF"/>
+  <path
+    android:fillColor="#FFF"
+    android:fillType="nonZero"
+    android:pathData="M42.202,13.435l14.721,16.35 -5.202,4.683 -14.72,-16.349z"/>
 </vector>

+ 12 - 5
app/src/main/res/drawable/icon_header_back.xml

@@ -1,6 +1,13 @@
-<vector android:height="15dp" android:viewportHeight="60"
-    android:viewportWidth="60" android:width="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M29,54.042L4.958,30 29,5.958"
-        android:strokeColor="#000" android:strokeLineCap="square" android:strokeWidth="6"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="60"
+        android:viewportHeight="60">
+  <path
+    android:fillColor="#00000000"
+    android:fillType="evenOdd"
+    android:pathData="M29,54.042L4.958,30 29,5.958"
+    android:strokeWidth="6"
+    android:strokeColor="#000"
+    android:strokeLineCap="square"/>
 </vector>

+ 2 - 3
app/src/main/res/drawable/icon_header_notice.xml

@@ -1,14 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
         android:height="18dp"
-        android:alpha="0.99"
         android:viewportWidth="70"
         android:viewportHeight="70">
   <group
     android:pivotX="35"
     android:pivotY="35"
-    android:scaleX="0.86"
-    android:scaleY="0.86">
+    android:scaleX="0.78"
+    android:scaleY="0.78">
 
     <path
       android:fillColor="#000"

+ 0 - 1
app/src/main/res/drawable/icon_header_notice2.xml

@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
         android:height="18dp"
-        android:alpha="0.99"
         android:viewportWidth="70"
         android:viewportHeight="70">
   <path

+ 2 - 3
app/src/main/res/drawable/icon_header_notice_marker.xml

@@ -1,14 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
         android:width="18dp"
         android:height="18dp"
-        android:alpha="0.99"
         android:viewportWidth="70"
         android:viewportHeight="70">
   <group
     android:pivotX="35"
     android:pivotY="35"
-    android:scaleX="0.86"
-    android:scaleY="0.86">
+    android:scaleX="0.78"
+    android:scaleY="0.78">
 
     <path
       android:fillColor="#000"

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

@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="19dp"
-        android:height="19dp"
+        android:width="18dp"
+        android:height="18dp"
         android:viewportWidth="70"
         android:viewportHeight="70">
   <path

+ 12 - 5
app/src/main/res/drawable/icon_header_share_wh.xml

@@ -1,6 +1,13 @@
-<vector android:height="18dp" android:viewportHeight="70"
-    android:viewportWidth="70" android:width="18dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#00000000" android:fillType="evenOdd"
-        android:pathData="M58,12L36.787,33.213M61,41v20H9V9h20M47,9h14v14"
-        android:strokeColor="#FFF" android:strokeLineCap="square" android:strokeWidth="6"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="18dp"
+        android:height="18dp"
+        android:viewportWidth="70"
+        android:viewportHeight="70">
+  <path
+    android:fillColor="#00000000"
+    android:fillType="evenOdd"
+    android:pathData="M58,12L36.787,33.213M61,41v20H9V9h20M47,9h14v14"
+    android:strokeWidth="6"
+    android:strokeColor="#FFF"
+    android:strokeLineCap="square"/>
 </vector>

+ 4 - 3
app/src/main/res/drawable/noti_animation.xml

@@ -28,7 +28,8 @@
   <item android:drawable="@drawable/notice_black_00025" android:duration="40"/>
   <item android:drawable="@drawable/notice_black_00026" android:duration="40"/>
   <item android:drawable="@drawable/notice_black_00027" android:duration="40"/>
-  <item android:drawable="@drawable/notice_black_00028" android:duration="40"/>
-  <item android:drawable="@drawable/notice_black_00029" android:duration="40"/>
-  <item android:drawable="@drawable/icon_header_notice_marker" android:duration="40"/>
+  <!-- 마지막 같은 모양이 겹쳐서 부자연스러워보여 제거-->
+  <!--<item android:drawable="@drawable/notice_black_00028" android:duration="40"/>-->
+  <!--<item android:drawable="@drawable/notice_black_00029" android:duration="40"/>-->
+  <!--<item android:drawable="@drawable/icon_header_notice_marker" android:duration="40"/>-->
 </animation-list>

+ 3 - 2
app/src/main/res/layout/action_bar.xml

@@ -46,6 +46,7 @@
       android:layout_width="36dp"
       android:layout_height="36dp"
       android:padding="7dp"
+      android:scaleType="centerCrop"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintStart_toEndOf="@+id/image_view_home"
       app:layout_constraintTop_toTopOf="parent"
@@ -206,12 +207,12 @@
       android:id="@+id/image_view_confirm"
       android:layout_width="36dp"
       android:layout_height="36dp"
-      android:padding="7dp"
+      android:padding="7.5dp"
       android:scaleType="centerCrop"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toStartOf="@+id/image_view_edit"
       app:layout_constraintTop_toTopOf="parent"
-      app:srcCompat="@drawable/ic_icon_bucket_complet_default"
+      app:srcCompat="@drawable/ic_icon_bucket_complete_default"
       />
 
     <ImageView

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

@@ -14,7 +14,7 @@
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent"
-    app:srcCompat="@drawable/ic_icon_bucket_complet_default"
+    app:srcCompat="@drawable/ic_icon_bucket_complete_default"
     />
 
 </android.support.constraint.ConstraintLayout>

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

@@ -37,7 +37,7 @@
     android:layout_marginEnd="14dp"
     app:layout_constraintEnd_toStartOf="@+id/imageView7"
     app:layout_constraintTop_toTopOf="@+id/imageView7"
-    app:srcCompat="@drawable/ic_icon_bucket_complet_default"/>
+    app:srcCompat="@drawable/ic_icon_bucket_complete_default"/>
 
   <ImageView
     android:id="@+id/imageView7"

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

@@ -14,7 +14,7 @@
     android:layout_marginEnd="14dp"
     app:layout_constraintEnd_toStartOf="@+id/imageView7"
     app:layout_constraintTop_toTopOf="@+id/imageView7"
-    app:srcCompat="@drawable/ic_icon_bucket_complet_default"/>
+    app:srcCompat="@drawable/ic_icon_bucket_complete_default"/>
 
   <ImageView
     android:id="@+id/imageView7"