diff options
21 files changed, 24 insertions, 11 deletions
diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index b57e347ba..3d9043caa 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -84,16 +84,16 @@ <ImageView android:layout_width="16dp" android:layout_height="16dp" - app:srcCompat="?attr/ic_unfav" - tools:srcCompat="@drawable/ic_star_grey600_24dp" - android:id="@+id/isFavorite"/> + app:srcCompat="?attr/type_video" + tools:srcCompat="@drawable/ic_videocam_grey600_24dp" + android:id="@+id/ivIsVideo"/> <ImageView android:layout_width="16dp" android:layout_height="16dp" - app:srcCompat="?attr/type_video" - tools:srcCompat="@drawable/ic_remove_red_eye_grey600_18dp" - android:id="@+id/ivIsVideo"/> + app:srcCompat="?attr/ic_unfav" + tools:srcCompat="@drawable/ic_star_grey600_24dp" + android:id="@+id/isFavorite"/> <ImageView android:layout_width="20dp" diff --git a/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png Binary files differdeleted file mode 100644 index 2452cfa92..000000000 --- a/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png Binary files differdeleted file mode 100644 index 96a06141a..000000000 --- a/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png Binary files differdeleted file mode 100644 index 4f1af39ab..000000000 --- a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png Binary files differdeleted file mode 100644 index abc338d51..000000000 --- a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png Binary files differdeleted file mode 100644 index ea44e3f07..000000000 --- a/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png Binary files differdeleted file mode 100644 index 78e98fe8d..000000000 --- a/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png Binary files differdeleted file mode 100644 index daa8e568e..000000000 --- a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png Binary files differdeleted file mode 100644 index a6b4ff0da..000000000 --- a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png Binary files differdeleted file mode 100644 index d014684e1..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png Binary files differdeleted file mode 100644 index 91adb4437..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png Binary files differdeleted file mode 100644 index 2039d9ce8..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png Binary files differdeleted file mode 100644 index 6dd240bca..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png Binary files differdeleted file mode 100644 index 19456de04..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png Binary files differdeleted file mode 100644 index 82de8bb65..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png Binary files differdeleted file mode 100644 index 16cdc31c1..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png Binary files differdeleted file mode 100644 index 695eb950e..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png +++ /dev/null diff --git a/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml b/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml new file mode 100644 index 000000000..40c893883 --- /dev/null +++ b/core/src/main/res/drawable/ic_videocam_grey600_24dp.xml @@ -0,0 +1,8 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FF757575" + android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/> +</vector> diff --git a/core/src/main/res/drawable/ic_videocam_white_24dp.xml b/core/src/main/res/drawable/ic_videocam_white_24dp.xml new file mode 100644 index 000000000..a8cfd71e3 --- /dev/null +++ b/core/src/main/res/drawable/ic_videocam_white_24dp.xml @@ -0,0 +1,8 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:height="24dp" + android:width="24dp" + android:viewportHeight="24.0" + android:viewportWidth="24.0"> + <path android:fillColor="#FFFFFFFF" + android:pathData="M17,10.5V7c0,-0.55 -0.45,-1 -1,-1H4c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h12c0.55,0 1,-0.45 1,-1v-3.5l4,4v-11l-4,4z"/> +</vector> diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 53cf7b211..066594f3d 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -26,7 +26,6 @@ <attr name="social_share" format="reference"/> <attr name="stat_playlist" format="reference"/> <attr name="ic_folder" format="reference"/> - <attr name="type_audio" format="reference"/> <attr name="type_video" format="reference"/> <attr name="overlay_drawable" format="reference"/> <attr name="dragview_background" format="reference"/> diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index f5b43629c..d341048ff 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -38,8 +38,7 @@ <item name="navigation_up">@drawable/navigation_up</item> <item name="social_share">@drawable/ic_share_grey600_24dp</item> <item name="stat_playlist">@drawable/ic_list_grey600_24dp</item> - <item name="type_audio">@drawable/ic_hearing_grey600_18dp</item> - <item name="type_video">@drawable/ic_remove_red_eye_grey600_18dp</item> + <item name="type_video">@drawable/ic_videocam_grey600_24dp</item> <item name="non_transparent_background">@color/white</item> <item name="overlay_background">@color/overlay_light</item> <item name="overlay_drawable">@drawable/overlay_drawable</item> @@ -127,8 +126,7 @@ <item name="navigation_up">@drawable/navigation_up_dark</item> <item name="social_share">@drawable/ic_share_white_24dp</item> <item name="stat_playlist">@drawable/ic_list_white_24dp</item> - <item name="type_audio">@drawable/ic_hearing_white_18dp</item> - <item name="type_video">@drawable/ic_remove_red_eye_white_18dp</item> + <item name="type_video">@drawable/ic_videocam_white_24dp</item> <item name="non_transparent_background">@color/black</item> <item name="overlay_background">@color/overlay_dark</item> <item name="overlay_drawable">@drawable/overlay_drawable_dark</item> |
