Browse Source

Replaced some icons by Material ones to (removed useless icons)

Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
Signed-off-by: Kilian Périsset <kilian.perisset@infomaniak.com>
Kilian Périsset 5 years ago
parent
commit
d5b9b3e55d

+ 1 - 1
src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -166,7 +166,7 @@ public class ActivitiesActivity extends FileActivity implements ActivityListInte
      * sets up the UI elements and loads all activity items.
      */
     private void setupContent() {
-        emptyContentIcon.setImageResource(R.drawable.ic_activity_light_grey);
+        emptyContentIcon.setImageResource(R.drawable.ic_activity);
         emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(this),
                                                                           PorterDuff.Mode.SRC_IN);
 

+ 2 - 2
src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -234,7 +234,7 @@ public class NotificationsActivity extends FileActivity implements Notifications
      * sets up the UI elements and loads all notification items.
      */
     private void setupContent() {
-        emptyContentIcon.setImageResource(R.drawable.ic_notification_light_grey);
+        emptyContentIcon.setImageResource(R.drawable.ic_notification);
         emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(this),
                 PorterDuff.Mode.SRC_IN);
         setLoadingMessage();
@@ -348,7 +348,7 @@ public class NotificationsActivity extends FileActivity implements Notifications
             emptyContentMessage.setVisibility(View.VISIBLE);
 
             emptyContentProgressBar.setVisibility(View.GONE);
-            emptyContentIcon.setImageResource(R.drawable.ic_notification_light_grey);
+            emptyContentIcon.setImageResource(R.drawable.ic_notification);
             emptyContentIcon.setVisibility(View.VISIBLE);
         }
     }

+ 2 - 2
src/main/java/com/owncloud/android/ui/fragment/FileDetailActivitiesFragment.java

@@ -254,7 +254,7 @@ public class FileDetailActivitiesFragment extends Fragment implements
 
         emptyContentProgressBar.getIndeterminateDrawable().setColorFilter(ThemeUtils.primaryAccentColor(getContext()),
                 PorterDuff.Mode.SRC_IN);
-        emptyContentIcon.setImageDrawable(getResources().getDrawable(R.drawable.ic_activity_light_grey));
+        emptyContentIcon.setImageDrawable(getResources().getDrawable(R.drawable.ic_activity));
 
         adapter = new ActivityAndVersionListAdapter(getContext(),
                                                     accountManager,
@@ -414,7 +414,7 @@ public class FileDetailActivitiesFragment extends Fragment implements
 
     private void setEmptyContent(String headline, String message) {
         if (emptyContentContainer != null && emptyContentMessage != null) {
-            emptyContentIcon.setImageDrawable(requireContext().getResources().getDrawable(R.drawable.ic_activity_light_grey));
+            emptyContentIcon.setImageDrawable(requireContext().getResources().getDrawable(R.drawable.ic_activity));
             emptyContentHeadline.setText(headline);
             emptyContentMessage.setText(message);
 

+ 4 - 22
src/main/res/drawable/all_files.xml

@@ -1,23 +1,5 @@
-<!--
-    @author Google LLC
-    Copyright (C) 2019 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="#757575" android:pathData="M10,4H4C2.89,4 2,4.89 2,6V18A2,2 0 0,0 4,20H20A2,2 0 0,0 22,18V8C22,6.89 21.1,6 20,6H12L10,4Z" />
+<vector android:height="24dp" android:tint="#333333"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
 </vector>

+ 4 - 12
src/main/res/drawable/favorite.xml

@@ -1,13 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="16dp"
-        android:height="16dp"
-        android:viewportWidth="16"
-        android:viewportHeight="16">
-
-    <path
-        android:fillColor="#ffcc00"
-        android:strokeColor="#ffffff"
-        android:strokeWidth="0.46367699"
-        android:pathData="M 7.9999993,1.0934068 10.040178,6.0083827 15.418832,6.4256921 11.245738,9.9032694 12.636769,15.003716 7.9999993,12.128919 3.3632295,15.003716 4.7542604,9.9032694 0.5811676,6.4256921 5.9598206,6.0083827 Z"/>
+<vector android:height="24dp" android:tint="#F7CD46"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z"/>
 </vector>

+ 1 - 1
src/main/res/drawable/ic_activity.xml

@@ -6,7 +6,7 @@
         android:viewportHeight="32">
 
     <path
-        android:fillColor="#757575"
+        android:fillColor="#333333"
         android:strokeWidth="0.96784461"
         android:pathData="M 16,1.9491526 6,18.810169 H 17 L 16,30.050847 26,13.189831 H 15 Z"/>
 </vector>

+ 0 - 6
src/main/res/drawable/ic_activity_light_grey.xml

@@ -1,6 +0,0 @@
-<vector android:alpha="0.5" android:height="72dp"
-    android:viewportHeight="32" android:viewportWidth="32"
-    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF969696"
-        android:pathData="M16,1.9492 L6,18.8102H17L16,30.0508 26,13.1898H15Z"/>
-</vector>

+ 5 - 0
src/main/res/drawable/ic_folder_black_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#333333"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z"/>
+</vector>

+ 4 - 22
src/main/res/drawable/ic_notification.xml

@@ -1,23 +1,5 @@
-<!--
-    @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:viewportHeight="16"
-    android:viewportWidth="16"
-    android:width="24dp">
-    <path android:fillColor="#757575" android:fillType="nonZero" android:pathData="M8,2C7.448,2 7,2.448 7,3C7,3.047 7.021,3.087 7.027,3.133C5.291,3.569 4,5.128 4,7L4,9L3,10L3,11L13,11L13,10L12,9L12,7C12,5.128 10.709,3.569 8.973,3.133C8.979,3.087 9,3.047 9,3C9,2.448 8.552,2 8,2ZM6,12C6,13.105 6.895,14 8,14C9.105,14 10,13.105 10,12L6,12Z"/>
+<vector android:height="24dp" android:tint="#333333"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 </vector>

+ 0 - 5
src/main/res/drawable/ic_notification_light_grey.xml

@@ -1,5 +0,0 @@
-<vector android:alpha="0.5" android:height="72dp"
-    android:viewportHeight="16" android:viewportWidth="16"
-    android:width="72dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF969696" android:pathData="M8,2C7.448,2 7,2.448 7,3C7,3.047 7.021,3.087 7.027,3.133C5.291,3.569 4,5.128 4,7L4,9L3,10L3,11L13,11L13,10L12,9L12,7C12,5.128 10.709,3.569 8.973,3.133C8.979,3.087 9,3.047 9,3C9,2.448 8.552,2 8,2ZM6,12C6,13.105 6.895,14 8,14C9.105,14 10,13.105 10,12L6,12Z"/>
-</vector>