Renamed all AnimatedStateLists for consistency.

askxionghu · Aug 18, 2016 · 21c79ea · 21c79ea
1 parent 68cc1fe
commit 21c79ea
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 29 deletions.
diff --git a/app/src/main/res/drawable/ic_add_comment.xml → ...src/main/res/drawable/asl_add_comment.xml b/app/src/main/res/drawable/ic_add_comment.xml → ...src/main/res/drawable/asl_add_comment.xml
@@ -15,9 +15,7 @@
   limitations under the License.
   -->
 
-<animated-selector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:constantSize="true">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/focused"

diff --git a/app/src/main/res/drawable/comment_heart.xml → ...c/main/res/drawable/asl_comment_heart.xml b/app/src/main/res/drawable/comment_heart.xml → ...c/main/res/drawable/asl_comment_heart.xml
@@ -15,9 +15,7 @@
   limitations under the License.
   -->
 
-<animated-selector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:constantSize="true">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/liked"

diff --git a/app/src/main/res/drawable/fab_heart.xml → app/src/main/res/drawable/asl_fab_heart.xml b/app/src/main/res/drawable/fab_heart.xml → app/src/main/res/drawable/asl_fab_heart.xml
@@ -15,9 +15,7 @@
   limitations under the License.
   -->
 
-<animated-selector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:constantSize="true">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/liked"

diff --git a/app/src/main/res/drawable/ic_follow.xml → app/src/main/res/drawable/asl_follow.xml b/app/src/main/res/drawable/ic_follow.xml → app/src/main/res/drawable/asl_follow.xml
@@ -15,9 +15,7 @@
   limitations under the License.
   -->
 
-<animated-selector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:constantSize="true">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/following"

diff --git a/app/src/main/res/drawable/ic_upvote.xml → app/src/main/res/drawable/asl_upvote.xml b/app/src/main/res/drawable/ic_upvote.xml → app/src/main/res/drawable/asl_upvote.xml
@@ -15,9 +15,7 @@
   limitations under the License.
   -->
 
-<animated-selector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:constantSize="true">
+<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item
         android:id="@+id/upvoted"

diff --git a/app/src/main/res/drawable/avd_hide_password.xml b/app/src/main/res/drawable/avd_hide_password.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015 Google Inc.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -43,8 +43,8 @@
 
                 <path
                     android:name="eye"
-                    android:fillColor="@android:color/white"
-                    android:pathData="@string/path_password_eye" />
+                    android:pathData="@string/path_password_eye"
+                    android:fillColor="@android:color/white" />
 
             </group>
 

diff --git a/app/src/main/res/drawable/avd_show_password.xml b/app/src/main/res/drawable/avd_show_password.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright 2015 Google Inc.
+  Copyright 2016 Google Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -42,8 +42,8 @@
 
                 <path
                     android:name="eye"
-                    android:fillColor="@android:color/white"
-                    android:pathData="@string/path_password_eye" />
+                    android:pathData="@string/path_password_eye"
+                    android:fillColor="@android:color/white" />
 
             </group>
 

diff --git a/app/src/main/res/layout/activity_dribbble_player.xml b/app/src/main/res/layout/activity_dribbble_player.xml
@@ -86,7 +86,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="@dimen/padding_normal"
-            android:drawableStart="@drawable/ic_follow"
+            android:drawableStart="@drawable/asl_follow"
             android:drawablePadding="@dimen/spacing_normal"
             android:paddingStart="@dimen/padding_normal"
             android:paddingTop="@dimen/spacing_normal"

diff --git a/app/src/main/res/layout/activity_dribbble_shot.xml b/app/src/main/res/layout/activity_dribbble_shot.xml
@@ -90,6 +90,6 @@
         android:layout_gravity="end"
         android:layout_marginEnd="@dimen/padding_normal"
         android:stateListAnimator="@animator/raise"
-        android:src="@drawable/fab_heart" />
+        android:src="@drawable/asl_fab_heart" />
 
 </io.plaidapp.ui.widget.ElasticDragDismissFrameLayout>
diff --git a/app/src/main/res/layout/designer_news_comment_actions.xml b/app/src/main/res/layout/designer_news_comment_actions.xml
@@ -34,7 +34,7 @@
         android:layout_width="@dimen/fab_size"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:drawableTop="@drawable/ic_upvote"
+        android:drawableTop="@drawable/asl_upvote"
         android:textAppearance="@style/TextAppearance.CommentAuthor"
         tools:text="33 likes"
         style="?android:borderlessButtonStyle" />
@@ -66,7 +66,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end"
         android:padding="@dimen/spacing_normal"
-        android:src="@drawable/ic_add_comment"
+        android:src="@drawable/asl_add_comment"
         android:background="?android:selectableItemBackgroundBorderless"
         android:visibility="invisible" />
 

diff --git a/app/src/main/res/layout/designer_news_enter_comment.xml b/app/src/main/res/layout/designer_news_enter_comment.xml
@@ -55,7 +55,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:padding="@dimen/spacing_normal"
-        android:src="@drawable/ic_add_comment"
+        android:src="@drawable/asl_add_comment"
         android:background="?android:selectableItemBackgroundBorderless" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/designer_news_story_description.xml b/app/src/main/res/layout/designer_news_story_description.xml
@@ -57,7 +57,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="2"
-            android:drawableTop="@drawable/ic_upvote"
+            android:drawableTop="@drawable/asl_upvote"
             tools:text="33 likes"
             style="@style/Widget.Plaid.InlineActionButton" />
 

diff --git a/app/src/main/res/layout/dribbble_comment.xml b/app/src/main/res/layout/dribbble_comment.xml
@@ -99,7 +99,7 @@
         android:layout_marginEnd="@dimen/comment_like_margin_adjustment"
         android:layout_toStartOf="@id/comment_likes_count"
         android:layout_below="@id/comment_text"
-        android:src="@drawable/comment_heart"
+        android:src="@drawable/asl_comment_heart"
         android:background="?android:selectableItemBackgroundBorderless"
         android:visibility="gone" />
 

diff --git a/app/src/main/res/layout/dribbble_enter_comment.xml b/app/src/main/res/layout/dribbble_enter_comment.xml
@@ -61,7 +61,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="top"
         android:padding="@dimen/spacing_normal"
-        android:src="@drawable/ic_add_comment"
+        android:src="@drawable/asl_add_comment"
         android:background="?android:selectableItemBackgroundBorderless"
         android:onClick="postComment" />