Przeglądaj źródła

lint: fix the image ic_account_circle.png varies significantly in its density-independent (dip) size across the various density versions

AndyScherzinger 7 lat temu
rodzic
commit
34e9b55632

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/ManageAccountsActivity.java

@@ -100,7 +100,7 @@ public class ManageAccountsActivity extends FileActivity
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(this, R.drawable.ic_account_circle_white_18dp));
+        mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(this, R.drawable.account_circle_white));
         int tint = ThemeUtils.primaryColor(this);
         DrawableCompat.setTint(mTintedCheck, tint);
 

+ 1 - 1
src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -290,7 +290,7 @@ public class ReceiveExternalFilesActivity extends FileActivity
             AlertDialog.Builder builder = new Builder(parent);
 
             mTintedCheck = DrawableCompat.wrap(ContextCompat.getDrawable(parent,
-                    R.drawable.ic_account_circle_white_18dp));
+                    R.drawable.account_circle_white));
             int tint = ThemeUtils.primaryColor(getContext());
             DrawableCompat.setTint(mTintedCheck, tint);
 

+ 1 - 1
src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -462,7 +462,7 @@ public class DisplayUtils {
                     avatar = TextDrawable.createAvatar(account.name, avatarRadius);
                 } catch (Exception e) {
                     Log_OC.e(TAG, "Error calculating RGB value for active account icon.", e);
-                    avatar = resources.getDrawable(R.drawable.ic_account_circle);
+                    avatar = resources.getDrawable(R.drawable.account_circle_white);
                 }
             }
 

BIN
src/main/res/drawable-hdpi/ic_account_circle.png


BIN
src/main/res/drawable-hdpi/ic_account_circle_white_18dp.png


BIN
src/main/res/drawable-mdpi/ic_account_circle_white_18dp.png


BIN
src/main/res/drawable-xhdpi/ic_account_circle.png


BIN
src/main/res/drawable-xhdpi/ic_account_circle_white_18dp.png


BIN
src/main/res/drawable-xxhdpi/ic_account_circle.png


BIN
src/main/res/drawable-xxhdpi/ic_account_circle_white_18dp.png


BIN
src/main/res/drawable-xxxhdpi/ic_account_circle_white_18dp.png


+ 23 - 0
src/main/res/drawable/account_circle_white.xml

@@ -0,0 +1,23 @@
+<!--
+    @author Google LLC
+    Copyright (C) 2018 Google LLC
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M12,19.2C9.5,19.2 7.29,17.92 6,16C6.03,14 10,12.9 12,12.9C14,12.9 17.97,14 18,16C16.71,17.92 14.5,19.2 12,19.2M12,5A3,3 0 0,1 15,8A3,3 0 0,1 12,11A3,3 0 0,1 9,8A3,3 0 0,1 12,5M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12C22,6.47 17.5,2 12,2Z" />
+</vector>

+ 3 - 3
src/main/res/layout/account_item.xml

@@ -50,11 +50,11 @@
 
         <ImageView
             android:id="@+id/ticker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="18dp"
+            android:layout_height="18dp"
             android:layout_gravity="bottom|end"
             android:background="@drawable/round_bgnd"
-            android:src="@drawable/ic_account_circle_white_18dp"
+            android:src="@drawable/account_circle_white"
             android:contentDescription="@string/active_user"/>
     </FrameLayout>
 

+ 3 - 3
src/main/res/layout/drawer_header.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/drawer_current_account"
                 android:layout_width="@dimen/nav_drawer_header_avatar"
                 android:layout_height="@dimen/nav_drawer_header_avatar"
-                android:src="@drawable/ic_account_circle"
+                android:src="@drawable/account_circle_white"
                 android:contentDescription="@string/drawer_current_account"/>
 
             <ImageView
@@ -60,7 +60,7 @@
                 android:layout_gravity="end"
                 android:layout_marginEnd="@dimen/nav_drawer_header_avatar_second_account_margin"
                 android:layout_marginRight="@dimen/nav_drawer_header_avatar_second_account_margin"
-                android:src="@drawable/ic_account_circle"
+                android:src="@drawable/account_circle_white"
                 android:onClick="onAccountDrawerClick"
                 android:contentDescription="@string/drawer_middle_account"/>
 
@@ -69,7 +69,7 @@
                 android:layout_width="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_height="@dimen/nav_drawer_header_avatar_other_accounts_size"
                 android:layout_gravity="end"
-                android:src="@drawable/ic_account_circle"
+                android:src="@drawable/account_circle_white"
                 android:onClick="onAccountDrawerClick"
                 android:contentDescription="@string/drawer_end_account"/>
 

+ 1 - 1
src/main/res/layout/toolbar_user_information.xml

@@ -71,7 +71,7 @@
                         android:layout_width="@dimen/nav_drawer_header_avatar"
                         android:layout_height="@dimen/nav_drawer_header_avatar"
                         android:contentDescription="@string/avatar"
-                        android:src="@drawable/ic_account_circle"/>
+                        android:src="@drawable/account_circle_white"/>
                 </FrameLayout>
 
                 <LinearLayout