diff options
author | Niedermann IT-Dienstleistungen <info@niedermann.it> | 2018-04-13 00:12:34 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <info@niedermann.it> | 2018-04-13 00:12:34 +0300 |
commit | 9ae9878ac92cc5fc42910c95ff6fce4ff0cc1916 (patch) | |
tree | 62ad77c686c6827fc0934549dfef05eedaac85aa | |
parent | cd7e7d445ad4517b204b0e6d7879e38bc3227154 (diff) |
Remove bitmap drawables and let Android Studio generate the at buildtime
Tested on virtual Android 8.1, 5.0 and an API Level 14. 14 showed some visual glitches (Some minor parts of the icons are black) - But i think it's a good trade-off. Everything still works.
21 files changed, 32 insertions, 12 deletions
diff --git a/app/src/main/res/drawable-hdpi/ic_action_new.png b/app/src/main/res/drawable-hdpi/ic_action_new.png Binary files differdeleted file mode 100644 index 0fdced8f..00000000 --- a/app/src/main/res/drawable-hdpi/ic_action_new.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/ic_action_new_theme.png b/app/src/main/res/drawable-hdpi/ic_action_new_theme.png Binary files differdeleted file mode 100644 index ad8f7365..00000000 --- a/app/src/main/res/drawable-hdpi/ic_action_new_theme.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_action_new.png b/app/src/main/res/drawable-mdpi/ic_action_new.png Binary files differdeleted file mode 100644 index 67bb598e..00000000 --- a/app/src/main/res/drawable-mdpi/ic_action_new.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_action_new_theme.png b/app/src/main/res/drawable-mdpi/ic_action_new_theme.png Binary files differdeleted file mode 100644 index 1130984a..00000000 --- a/app/src/main/res/drawable-mdpi/ic_action_new_theme.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new.png b/app/src/main/res/drawable-xhdpi/ic_action_new.png Binary files differdeleted file mode 100644 index d64c22e9..00000000 --- a/app/src/main/res/drawable-xhdpi/ic_action_new.png +++ /dev/null diff --git a/app/src/main/res/drawable-xhdpi/ic_action_new_theme.png b/app/src/main/res/drawable-xhdpi/ic_action_new_theme.png Binary files differdeleted file mode 100644 index 0ab1a5a4..00000000 --- a/app/src/main/res/drawable-xhdpi/ic_action_new_theme.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_new.png b/app/src/main/res/drawable-xxhdpi/ic_action_new.png Binary files differdeleted file mode 100644 index 7e699137..00000000 --- a/app/src/main/res/drawable-xxhdpi/ic_action_new.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_new_theme.png b/app/src/main/res/drawable-xxhdpi/ic_action_new_theme.png Binary files differdeleted file mode 100644 index 99b88117..00000000 --- a/app/src/main/res/drawable-xxhdpi/ic_action_new_theme.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_new.png b/app/src/main/res/drawable-xxxhdpi/ic_action_new.png Binary files differdeleted file mode 100644 index 165c907d..00000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_action_new.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_new_theme.png b/app/src/main/res/drawable-xxxhdpi/ic_action_new_theme.png Binary files differdeleted file mode 100644 index 9f2f56c4..00000000 --- a/app/src/main/res/drawable-xxxhdpi/ic_action_new_theme.png +++ /dev/null diff --git a/app/src/main/res/drawable/ic_add_blue_24dp.xml b/app/src/main/res/drawable/ic_add_blue_24dp.xml new file mode 100644 index 00000000..a12d38fa --- /dev/null +++ b/app/src/main/res/drawable/ic_add_blue_24dp.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="#0082C9" android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF0082C9" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml new file mode 100644 index 00000000..c5a76a4d --- /dev/null +++ b/app/src/main/res/drawable/ic_add_white_24dp.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="#FFFFFF" android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml new file mode 100644 index 00000000..4d020aff --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="#FFFFFF" android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> +</vector> diff --git a/app/src/main/res/drawable/ic_delete_white_32dp.xml b/app/src/main/res/drawable/ic_delete_white_32dp.xml new file mode 100644 index 00000000..5f0b86e3 --- /dev/null +++ b/app/src/main/res/drawable/ic_delete_white_32dp.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="32dp" + android:tint="#FFFFFF" android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FFFFFFFF" android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/> +</vector> diff --git a/app/src/main/res/layout/activity_notes_list_view.xml b/app/src/main/res/layout/activity_notes_list_view.xml index 4065705a..fdd1029f 100644 --- a/app/src/main/res/layout/activity_notes_list_view.xml +++ b/app/src/main/res/layout/activity_notes_list_view.xml @@ -39,7 +39,7 @@ <android.support.design.widget.FloatingActionButton android:id="@+id/fab_create" style="@style/fab" - android:src="@drawable/ic_action_new" + android:src="@drawable/ic_add_white_24dp" app:backgroundTint="@color/primary" app:rippleColor="@color/primary_dark" /> </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/fragment_notes_list_note_item.xml b/app/src/main/res/layout/fragment_notes_list_note_item.xml index c63b76fe..7b61e8ee 100644 --- a/app/src/main/res/layout/fragment_notes_list_note_item.xml +++ b/app/src/main/res/layout/fragment_notes_list_note_item.xml @@ -6,23 +6,23 @@ <ImageView android:id="@+id/noteDeleteLeft" - android:layout_width="32dp" - android:layout_height="32dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:layout_marginLeft="@dimen/button_padding" android:layout_marginStart="@dimen/button_padding" android:contentDescription="@string/menu_delete" - android:src="@drawable/ic_action_delete" /> + android:src="@drawable/ic_delete_white_32dp" /> <ImageView android:id="@+id/noteDeleteRight" - android:layout_width="32dp" - android:layout_height="32dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_gravity="end|center_vertical" android:layout_marginEnd="@dimen/button_padding" android:layout_marginRight="@dimen/button_padding" android:contentDescription="@string/menu_delete" - android:src="@drawable/ic_action_delete" /> + android:src="@drawable/ic_delete_white_32dp" /> <android.support.v7.widget.LinearLayoutCompat android:id="@+id/noteSwipeable" diff --git a/app/src/main/res/layout/widget_note_list.xml b/app/src/main/res/layout/widget_note_list.xml index be4cdeca..8ef362f0 100644 --- a/app/src/main/res/layout/widget_note_list.xml +++ b/app/src/main/res/layout/widget_note_list.xml @@ -46,7 +46,7 @@ android:id="@+id/widget_note_list_create_icon" android:layout_width="@dimen/widget_note_list_icon_width" android:layout_height="match_parent" - android:src="@drawable/ic_action_new" + android:src="@drawable/ic_add_white_24dp" android:layout_alignParentRight="true" android:layout_alignParentEnd="true" android:paddingStart="@dimen/widget_note_list_inner_padding" diff --git a/app/src/main/res/menu/menu_list_context_multiple.xml b/app/src/main/res/menu/menu_list_context_multiple.xml index 18dd3b90..584c311a 100644 --- a/app/src/main/res/menu/menu_list_context_multiple.xml +++ b/app/src/main/res/menu/menu_list_context_multiple.xml @@ -4,7 +4,7 @@ <item android:id="@+id/menu_delete" - android:icon="@drawable/ic_action_delete" + android:icon="@drawable/ic_delete_white_24dp" android:orderInCategory="100" android:title="@string/menu_delete" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/menu_list_context_single.xml b/app/src/main/res/menu/menu_list_context_single.xml index 6eb3ceed..bcac213e 100644 --- a/app/src/main/res/menu/menu_list_context_single.xml +++ b/app/src/main/res/menu/menu_list_context_single.xml @@ -16,7 +16,7 @@ app:showAsAction="ifRoom" /> <item android:id="@+id/menu_delete" - android:icon="@drawable/ic_action_delete" + android:icon="@drawable/ic_delete_white_24dp" android:orderInCategory="100" android:title="@string/menu_delete" app:showAsAction="ifRoom" /> diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml index 4325d302..337b8ff3 100644 --- a/app/src/main/res/menu/menu_note_fragment.xml +++ b/app/src/main/res/menu/menu_note_fragment.xml @@ -28,7 +28,7 @@ app:showAsAction="never" /> <item android:id="@+id/menu_delete" - android:icon="@drawable/ic_action_delete" + android:icon="@drawable/ic_delete_white_24dp" android:orderInCategory="120" android:title="@string/menu_delete" app:showAsAction="never" /> diff --git a/app/src/main/res/xml/shortcuts.xml b/app/src/main/res/xml/shortcuts.xml index 2746513a..af4ddc4d 100644 --- a/app/src/main/res/xml/shortcuts.xml +++ b/app/src/main/res/xml/shortcuts.xml @@ -3,7 +3,7 @@ <shortcut android:shortcutId="it.niedermann.owncloud.notes" android:enabled="true" - android:icon="@drawable/ic_action_new_theme" + android:icon="@drawable/ic_add_blue_24dp" android:shortcutShortLabel="@string/action_create" android:shortcutLongLabel="@string/shortcut_create_long"> <intent |