From 0dbbd7156e0965f233ba08cc3e870d9ad65899af Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Sun, 18 Sep 2022 22:21:47 +0530 Subject: [PATCH 1/8] Change app icon to our custom icon --- res/drawable/ic_launcher_background.xml | 48 ++++++++++------- res/drawable/ic_launcher_foreground.xml | 69 +++++++++++++++---------- res/drawable/ic_launcher_monochrome.xml | 28 ---------- res/mipmap-anydpi/ic_launcher.xml | 24 ++++++--- 4 files changed, 90 insertions(+), 79 deletions(-) delete mode 100644 res/drawable/ic_launcher_monochrome.xml diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index ea21fc001..5ec6d6298 100644 --- a/res/drawable/ic_launcher_background.xml +++ b/res/drawable/ic_launcher_background.xml @@ -1,27 +1,37 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - + + + + + + + + diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 665ce950f..37acb1199 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,34 +1,51 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - - - - - - + + + + + + + + + + diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index 599221209..000000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index b58c81ff9..d24a0f7ef 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -1,10 +1,22 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - + + + + -- GitLab From 5639411b9ab16c7cb13d93fb426a78d8f47ac37c Mon Sep 17 00:00:00 2001 From: Nishith Khanna Date: Tue, 11 Oct 2022 16:40:21 +0530 Subject: [PATCH 2/8] Theme app according to our palette --- Android.bp | 2 +- AndroidManifest.xml | 2 +- res/color/bottom_nav_color.xml | 5 + res/color/primary_text.xml | 12 +- res/drawable-hdpi/grid_pressed.9.png | Bin 238 -> 510 bytes res/drawable-hdpi/grid_selected.9.png | Bin 238 -> 510 bytes res/drawable-hdpi/rounded.9.png | Bin 0 -> 419 bytes res/drawable-hdpi/rounded_mask.9.png | Bin 0 -> 5620 bytes res/drawable-hdpi/rounded_overlay.9.png | Bin 0 -> 307 bytes res/drawable-mdpi/grid_pressed.9.png | Bin 234 -> 342 bytes res/drawable-mdpi/grid_selected.9.png | Bin 232 -> 342 bytes res/drawable-night-hdpi/rounded_mask.9.png | Bin 0 -> 3394 bytes res/drawable-night-xhdpi/rounded_mask.9.png | Bin 0 -> 2864 bytes res/drawable-night-xxhdpi/rounded_mask.9.png | Bin 0 -> 2994 bytes .../photopage_bottom_button_background.xml | 4 +- res/drawable-xhdpi/grid_pressed.9.png | Bin 246 -> 665 bytes res/drawable-xhdpi/grid_selected.9.png | Bin 246 -> 665 bytes res/drawable-xhdpi/rounded_mask.9.png | Bin 0 -> 446 bytes res/drawable-xhdpi/rounded_overlay.9.png | Bin 0 -> 414 bytes res/drawable-xxhdpi/rounded_mask.9.png | Bin 0 -> 5961 bytes res/drawable-xxhdpi/rounded_overlay.9.png | Bin 0 -> 621 bytes res/drawable/addspot.xml | 2 +- res/drawable/albums.xml | 5 +- res/drawable/back.xml | 2 +- res/drawable/beautify.xml | 2 +- res/drawable/beautify_select.xml | 2 +- res/drawable/bg_gallery_image.xml | 7 + res/drawable/bg_vidcontrol.xml | 2 +- res/drawable/camera.xml | 4 +- res/drawable/cancel.xml | 2 +- res/drawable/cancel2.xml | 5 +- res/drawable/color.xml | 2 +- res/drawable/color_select.xml | 2 +- res/drawable/comparison_after.xml | 4 +- res/drawable/comparison_before.xml | 4 +- res/drawable/crop.xml | 2 +- res/drawable/crop_1_1.xml | 2 +- res/drawable/crop_1_1_select.xml | 2 +- res/drawable/crop_crop.xml | 2 +- res/drawable/crop_free.xml | 2 +- res/drawable/crop_free_select.xml | 2 +- res/drawable/crop_original.xml | 2 +- res/drawable/crop_original_select.xml | 2 +- res/drawable/crop_rotate.xml | 2 +- res/drawable/crop_select.xml | 2 +- res/drawable/crop_straighten.xml | 2 +- res/drawable/delete.xml | 2 +- res/drawable/done.xml | 2 +- res/drawable/done2.xml | 5 +- res/drawable/drawer.xml | 2 +- .../dropdown_ic_arrow_normal_holo_dark.xml | 1 - res/drawable/dualcamera.xml | 10 +- res/drawable/dualcamera_select.xml | 10 +- res/drawable/e_ic_album.xml | 10 + res/drawable/e_ic_timeline.xml | 10 + res/drawable/e_ic_videos.xml | 10 + res/drawable/edit.xml | 2 +- res/drawable/exposure.xml | 2 +- res/drawable/exposure_select.xml | 2 +- res/drawable/filtershow_button_background.xml | 2 +- .../filtershow_color_picker_circle.xml | 4 +- res/drawable/frames.xml | 6 +- res/drawable/frames_select.xml | 6 +- res/drawable/hazebuster.xml | 10 +- res/drawable/ic_album.xml | 2 +- res/drawable/ic_media_bigscreen.xml | 2 +- res/drawable/ic_media_cropscreen.xml | 2 +- res/drawable/ic_media_fullscreen.xml | 2 +- res/drawable/ic_selection.xml | 2 +- res/drawable/ic_timeline.xml | 2 +- res/drawable/ic_vidcontrol_pause.xml | 2 +- res/drawable/ic_vidcontrol_play.xml | 2 +- res/drawable/ic_video.xml | 2 +- res/drawable/ic_videos.xml | 10 + res/drawable/ic_watermark.xml | 4 +- res/drawable/ic_watermark_emotion.xml | 8 +- res/drawable/ic_watermark_food.xml | 4 +- res/drawable/ic_watermark_location.xml | 4 +- res/drawable/ic_watermark_selected.xml | 4 +- res/drawable/ic_watermark_time.xml | 42 ++-- res/drawable/ic_watermark_weather.xml | 2 +- res/drawable/ingest_item_list_selector.xml | 6 +- res/drawable/more.xml | 2 +- res/drawable/more2.xml | 2 +- res/drawable/multiselect.xml | 4 +- res/drawable/multiselect_delete.xml | 3 +- res/drawable/multiselect_more.xml | 3 +- res/drawable/multiselect_share.xml | 3 +- res/drawable/multiselected_back.xml | 3 +- res/drawable/overflow.xml | 2 +- .../photopage_bottom_button_background.xml | 4 +- res/drawable/seestraight.xml | 16 +- res/drawable/share.xml | 2 +- res/drawable/sliderbg.xml | 2 +- res/drawable/sliderprogress.xml | 2 +- res/drawable/slideshow.xml | 2 +- res/drawable/spinner_triangle.xml | 2 +- res/drawable/squared_tick.xml | 11 ++ res/drawable/timeline.xml | 10 +- res/drawable/truescanner.xml | 12 +- res/drawable/truescanner_select.xml | 12 +- res/drawable/video_play.xml | 11 ++ res/drawable/videos.xml | 5 +- res/drawable/white_text_bg_gradient.xml | 4 +- .../filtershow_saturation_controls.xml | 2 +- res/layout-land/on_screen_hint.xml | 4 +- res/layout-port/on_screen_hint.xml | 4 +- res/layout/album_header.xml | 4 +- res/layout/album_set_item.xml | 5 +- res/layout/appwidget_drm_empty_item.xml | 2 +- res/layout/appwidget_loading_item.xml | 2 +- res/layout/appwidget_main.xml | 2 +- res/layout/bookmark_edit_dialog.xml | 4 + res/layout/camera_filmstrip.xml | 4 +- res/layout/count_down_to_capture.xml | 4 +- res/layout/countdown_setting_popup.xml | 4 +- res/layout/dialog_picker.xml | 1 + res/layout/drawer_list_item.xml | 2 +- res/layout/filtershow_actionbar.xml | 2 +- res/layout/filtershow_actionbar_effects.xml | 2 +- .../filtershow_category_geometry_panel.xml | 8 +- res/layout/filtershow_category_panel_two.xml | 2 +- res/layout/filtershow_default_edittext.xml | 2 + .../filtershow_editor_crop_landscape.xml | 6 +- res/layout/filtershow_editor_panel.xml | 2 +- res/layout/filtershow_export_dialog.xml | 4 + res/layout/filtershow_history_panel.xml | 2 +- .../filtershow_presets_management_dialog.xml | 2 + .../filtershow_presets_management_row.xml | 2 + res/layout/filtershow_state_panel.xml | 2 +- .../filtershow_trueportrait_editor_panel.xml | 2 +- res/layout/gallery_main.xml | 5 +- res/layout/gl_root_group.xml | 3 +- res/layout/ingest_date_tile.xml | 8 +- res/layout/main.xml | 1 + res/layout/movie_view.xml | 4 +- res/layout/photo_frame.xml | 2 +- res/layout/photo_module.xml | 2 +- res/layout/photo_set_item.xml | 3 +- res/layout/photopage_progress_bar.xml | 6 +- res/layout/popup_list_item.xml | 2 +- res/layout/rotate_text_toast.xml | 4 +- res/layout/toolbar.xml | 1 + res/layout/trim_menu.xml | 5 +- res/layout/trim_view.xml | 2 +- res/layout/video_module.xml | 4 +- res/menu/album.xml | 12 +- res/menu/albumset.xml | 10 +- res/menu/gallery_multiselect.xml | 2 +- res/menu/navigation_items.xml | 21 +- res/menu/operation.xml | 25 ++- res/values-land/styles.xml | 2 +- res/values-night-v27/styles.xml | 28 +++ res/values-night/colors.xml | 34 ---- res/values-night/styles.xml | 19 -- res/values-v27/styles.xml | 26 +++ res/values-xlarge/styles.xml | 1 + res/values/cm_colors.xml | 37 ++-- res/values/colors.xml | 120 ++++++------ res/values/dimens.xml | 2 +- res/values/filtershow_color.xml | 72 +++---- res/values/filtershow_styles.xml | 10 +- res/values/iconbutton_styles.xml | 4 +- res/values/mediapicker_colors.xml | 8 +- res/values/styles.xml | 180 +++++++++++++++--- src/com/android/gallery3d/app/AlbumPage.java | 16 +- .../android/gallery3d/app/AlbumSetPage.java | 17 +- src/com/android/gallery3d/app/PhotoPage.java | 10 + .../android/gallery3d/app/PickerActivity.java | 12 ++ .../android/gallery3d/app/TimeLinePage.java | 16 +- src/com/android/gallery3d/app/TrimVideo.java | 5 +- .../filtershow/FilterShowActivity.java | 16 +- .../filtershow/category/EditorCropPanel.java | 2 +- .../filtershow/imageshow/ImageCrop.java | 3 + .../filtershow/imageshow/ImageDraw.java | 2 +- .../glrenderer/NinePatchTexture.java | 2 +- .../ingest/ui/MtpThumbnailTileView.java | 2 +- .../gallery3d/ui/AbstractSlotRenderer.java | 14 +- .../gallery3d/ui/AlbumSetSlotRenderer.java | 6 + .../gallery3d/ui/AlbumSlotRenderer.java | 10 + .../gallery3d/ui/DialogDetailsView.java | 2 +- src/com/android/gallery3d/ui/PopupList.java | 2 - .../gallery3d/ui/TimeLineSlotRenderer.java | 4 + .../gallery3d/ui/TimeLineTitleMaker.java | 10 +- .../gallery3d/video/BookmarkActivity.java | 2 +- 185 files changed, 824 insertions(+), 483 deletions(-) create mode 100644 res/color/bottom_nav_color.xml create mode 100644 res/drawable-hdpi/rounded.9.png create mode 100644 res/drawable-hdpi/rounded_mask.9.png create mode 100644 res/drawable-hdpi/rounded_overlay.9.png create mode 100644 res/drawable-night-hdpi/rounded_mask.9.png create mode 100644 res/drawable-night-xhdpi/rounded_mask.9.png create mode 100644 res/drawable-night-xxhdpi/rounded_mask.9.png create mode 100644 res/drawable-xhdpi/rounded_mask.9.png create mode 100644 res/drawable-xhdpi/rounded_overlay.9.png create mode 100644 res/drawable-xxhdpi/rounded_mask.9.png create mode 100644 res/drawable-xxhdpi/rounded_overlay.9.png create mode 100644 res/drawable/bg_gallery_image.xml create mode 100644 res/drawable/e_ic_album.xml create mode 100644 res/drawable/e_ic_timeline.xml create mode 100644 res/drawable/e_ic_videos.xml create mode 100644 res/drawable/ic_videos.xml create mode 100644 res/drawable/squared_tick.xml create mode 100644 res/drawable/video_play.xml create mode 100644 res/values-night-v27/styles.xml delete mode 100644 res/values-night/colors.xml delete mode 100644 res/values-night/styles.xml create mode 100644 res/values-v27/styles.xml diff --git a/Android.bp b/Android.bp index 9446144e1..a4149cf0a 100644 --- a/Android.bp +++ b/Android.bp @@ -6,7 +6,6 @@ android_app { name: "Gallery2", static_libs: [ - "com.google.android.material_material", "androidx.annotation_annotation", "androidx.fragment_fragment", "androidx.heifwriter_heifwriter", @@ -16,6 +15,7 @@ android_app { "com.android.gallery3d.common2", "xmp_toolkit", "mp4parser", + "elib", ], srcs: [ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 68719102b..3965865f4 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -250,7 +250,7 @@ diff --git a/res/color/bottom_nav_color.xml b/res/color/bottom_nav_color.xml new file mode 100644 index 000000000..f6aec0b9a --- /dev/null +++ b/res/color/bottom_nav_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/color/primary_text.xml b/res/color/primary_text.xml index e9fdf7b8b..2f94489c5 100644 --- a/res/color/primary_text.xml +++ b/res/color/primary_text.xml @@ -16,11 +16,11 @@ - - - - - - + + + + + + diff --git a/res/drawable-hdpi/grid_pressed.9.png b/res/drawable-hdpi/grid_pressed.9.png index dff62c7ecb30ccc30ad4519f91e8e69e49aa05fb..02d5dd2d1128e8349c0c16b09fb1a39d50d60e41 100644 GIT binary patch literal 510 zcmeAS@N?(olHy`uVBq!ia0y~yU{C{L4mJh`h84Ci*D)|K9`$r_45_&FcE;PnW&@r! z$wom5Mdb~i#!UOGH79sZ;=RKwaZtH}#Vz1(X|LckL-w+}akb0iSH4|7X~L83tIkCy zyk)<}QTmlJ*7Sh$tO;h`%!jVz$4E`CURRXA`Sbjq2=k1mticRQ*JjwgHkk2gg4G)f zfo;dz*cDkyH$H4~QTrmh`@p*oVkhQ%%H4SBJk{O#o?Pk;x4Dz&u!NMmHcI*jI=pS< zU#_ZTP;J9rQT+Jsox>H6rrQc7uFW(EX1nCr`f!H)nH^TPAsp{Qy$*a8i{5GeHR}4Y zOwP2T?nVALJ+B2C?MyouaysH4j$tuyOgp=0{WRW?O9cm00ZdT2b;!>^xc1sNct5n-th-7`IP6zkOE4 zKHkoSER%Rnu)lwEx8_MR2dD9D{(ItgOcz)d#6Hja^;3Qt$GxYmZrf>UNWP{l4C+ z9g`T}aXpu~{o?qB8kia*7JYn UM5T8!FfcH9y85}Sb4q9e0FFlH^8f$< literal 238 zcmeAS@N?(olHy`uVBq!ia0y~yVBiB`4mJh`26+$Niwq15jKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ4kz`kwJ!{GU63X** zaSYKozje|<-UA9e%()4Z&s|tKqkW~7v%BLvZV^QR)~(-74yy1?X^~T5WteosRz7x) z;Htx=(e2mP?pyU)!P7EFh^=bg)mFc1Nr#+QLJaw=;g_OQtKH0RUG}mtiHhPp{-}QT i$7cQSMY^hI*drL^54_f2?83mnz~JfX=d#Wzp$PzZ@=ARG diff --git a/res/drawable-hdpi/grid_selected.9.png b/res/drawable-hdpi/grid_selected.9.png index d8867ace6ad6cb24f830c28eb11907e099c0c5ae..02d5dd2d1128e8349c0c16b09fb1a39d50d60e41 100644 GIT binary patch literal 510 zcmeAS@N?(olHy`uVBq!ia0y~yU{C{L4mJh`h84Ci*D)|K9`$r_45_&FcE;PnW&@r! z$wom5Mdb~i#!UOGH79sZ;=RKwaZtH}#Vz1(X|LckL-w+}akb0iSH4|7X~L83tIkCy zyk)<}QTmlJ*7Sh$tO;h`%!jVz$4E`CURRXA`Sbjq2=k1mticRQ*JjwgHkk2gg4G)f zfo;dz*cDkyH$H4~QTrmh`@p*oVkhQ%%H4SBJk{O#o?Pk;x4Dz&u!NMmHcI*jI=pS< zU#_ZTP;J9rQT+Jsox>H6rrQc7uFW(EX1nCr`f!H)nH^TPAsp{Qy$*a8i{5GeHR}4Y zOwP2T?nVALJ+B2C?MyouaysH4j$tuyOgp=0{WRW?O9cm00ZdT2b;!>^xc1sNct5n-th-7`IP6zkOE4 zKHkoSER%Rnu)lwEx8_MR2dD9D{(ItgOcz)d#6Hja^;3Qt$GxYmZrf>UNWP{l4C+ z9g`T}aXpu~{o?qB8kia*7JYn UM5T8!FfcH9y85}Sb4q9e0FFlH^8f$< literal 238 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 Q1_lNOPgg&ebxsLQ0Iu)9wEzGB literal 0 HcmV?d00001 diff --git a/res/drawable-hdpi/rounded_overlay.9.png b/res/drawable-hdpi/rounded_overlay.9.png new file mode 100644 index 0000000000000000000000000000000000000000..15460a343d1a17c5328b6fd5bba754500547e025 GIT binary patch literal 307 zcmeAS@N?(olHy`uVBq!ia0y~yU{C{L4mJh`h84Ci*D)|K{PJ{h45_&FcE(-a76pNp z?JQm!SiBZ7zvQsq#NxGpg-`$Y0YOo{KfTjur`(%Tqr);yF-!e?o>qK@curI31|Bi< zWUhbDew00~|0}M?wE3VFbCA-}x}lGC`qUY@k_p5~2vl3H!Iy$`-o zSP}Eo?!cXd6%yy}HfGLJuVqck-1kOu1{1?&%^Au(of+%*rgFGP^DJvP5W=I@cp!yG zt>J)6|F@N?(rw(&{wM6;H046VhU2Vn7`dxe6=NT%%DbiKe8$@J@Z8!b zpLxF>FVdQ&MBb@0LsIB-v9sr literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/grid_pressed.9.png b/res/drawable-mdpi/grid_pressed.9.png index 68a957f2168c0071ff19c618a941f26a554b4e85..bd4a00593be9936e52268530c6199612b4178a63 100644 GIT binary patch literal 342 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3mWj$RSLn?0Fopx97kOI$f z$%V=mPVNOQc?+apY!0957hwL9qvwG}kHF6tUlo?sOgYuO^S8a@C+?jN2|D)^uJv6z zJkd5Wq)OXU)nU@-TPN}^xJ^>-IqYc3tyJJM`J*orZ$Z>ayUO2;<^roZS6$bd`Egu@lvRL8Q!gEr>wFy37b|xRPnpZAeV-;2~B|74!#&^Yw=TB~7 yRJvrZZnt4>wEdsEm#TM27F>KU_9x;E^HwjGSr68)&thO;VDNPHb6Mw<&;$U0pOmKn literal 234 zcmeAS@N?(olHy`uVBq!ia0y~yVBiK}4mJh`hLvl|)fgBU7>k44ofy`glX=O&z`&N| z?e4)@C+cr>_RQ#BqVmz~ zedm0w_$%A2MKhTio^`5Bm5yNOyCBZK>a63AmYZ1&3-IqYc3tyJJM`J*orZ$Z>ayUO2;<^roZS6$bd`Egu@lvRL8Q!gEr>wFy37b|xRPnpZAeV-;2~B|74!#&^Yw=TB~7 yRJvrZZnt4>wEdsEm#TM27F>KU_9x;E^HwjGSr68)&thO;VDNPHb6Mw<&;$U0pOmKn literal 232 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 literal 0 HcmV?d00001 diff --git a/res/drawable-night-xhdpi/rounded_mask.9.png b/res/drawable-night-xhdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..e163625d33b582d80bca227bbecc6bf724dc8464 GIT binary patch literal 2864 zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLJNYE>Z-B|(Yh3I#>^X_+~x z3MG{VsS2qTnQ06R6}R5bh@AA;Ou*%TA(uR3bfP8SHIDlSj(^vl6y$9y)xXPD@L%C( z*C2%s)y>m%W`4as|Ms7Q@f$2>Y3y7wYtmEwYZ0}Nm)-chUM@ZTaiQJ6rv3AFJ})b- ze~`&_>+_#kx3BKMs3)&~=UKtuop-0a?$p2T@XqeTPNun$@1H+b>Ypn6RxghEYU#Zt zQJ)?M{WiU@!%EJ3r`^YWYd$Z!e>T{eZKx;{E)dYN}yUHf)zHLzQ#zC&{x{&)b>pO`nqXWR$IKvD%-vnc$d*&& z7*k|cJ%29qaVE#!sns=$4>t&Zob38b!s(OR??xoUb1-Tk74hgEwBbcCF;Cklz*?7VuuZrFB|SuIZYK z-?D7E)<@k=yOHhtlIPMZwoctkd2?0Pe)@Re&zFU537r@9_)zUF-ss(oJ`tA%Ym4t+JQ^EyPRn%KI<@|%rt@QB@8)iv zyEd`X`urYe;oY}Rh;`rbot*dj{o>SnY&+IO9PB zs$R>jD{WKqGq;?(rg-2~^~k{c`{Gr&YP{C z>m|Rm-Fn0qv4Jhc{*~8Vr#KDg56{_hj&1w=>~D6P!7}+pmxb@On@#TPdv@&3x(%y1 z#3i^Cc4jTTF*Pz=XUFDv!!L)lex>#6ExokpS@){troM0bIcyGXzvLWvLx0>)n5exvgLS zz41>+*2Qg`?{7UFp)Uw(f7ZTVhYHt9CTGd3b}PTn|mj6 z`tAC+^2Oj)Uc*)zUPisQ&?ne$KJ5zn$UM4bg`#P< zxAH2MJ<$JQv{OrWpOU>&P=GF1{CmSZ@hny48?k|WEm3P{$$k1*zW$lE{u-l`?l%|p z3Ec`mbxiZC^v+WYigQ=~$c;99yj|s5J=bqW-YYwiHr`{6%&9&*eX!4!J(v4{>-W|$+U4@cc@AGSZ@Z#8WqFP<*GlJ$63n-(vhGUv?J5t-own}Pd?v5c>KFRmxK~g2zgNQ`akp3N!v0xY zl1Wy#-4r=g-(J=Ck8|_Sw49)my5#dx8p~$-uzan(6Eu;OXoPYcVh|RLrTJXzOt}K%~__cxliozA^#9GXZmTIz$Vv zXo)OzS|J)$YEb!7-Xzl_C`N|$dQ-D~cPP7fdaP^=tK$duBWKTgUUc=^vtDyc$HzmD zYv+`of4KKI!@{_<-0{T zr+2?U|0=XtjJZbXqmHr9?26`!s>@~;?}ghV1H(GccOLiMrSMVty6E)#7UHvXKAhPw z)9u8-Trr~mBDAvs7drLM2uvwL}Q-v4h~o_%L7 zKV7u)-?4+BmKx4R3&e-K=-cll%n1_sUokH}&M25w;xW@MN(M}mQYfxX1j*OmP# z7atR=Quji=GYkw2zdT(WLo)8YofXK}qQK*Fx<$C)zi|=kpU6pP(_$UCw%j%Q=s%~@ zue;N0%f3^uBcd8RG?pGwno`WC{Ji+pvAfUSUpwb?^zJipM^TT42NxPt8YIuIOSES+ z+@$$r&h5@QZ7;quycF0Qw}5fcap5fvTlO^eh?p$>cv^Xj(R5yv!#9dYmHuXuGgE<4lb>D|rzyE6oQ-+p~5x>nf4 z;l_NylPm939)7{pDRB1MB$mscnr?D?G`x`eR<&?$z~WgC_Gqh5s@U`Q9YfV3!SvQ0 rcJ4AiSGI9?8Q;}f^H()?2Sez_y4h;4Bi1u8Ffe$!`njxgN@xNAhJ$aV literal 0 HcmV?d00001 diff --git a/res/drawable-night-xxhdpi/rounded_mask.9.png b/res/drawable-night-xxhdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..8f48eb4a20925df5b1dd113f3282bbdf05f2065a GIT binary patch literal 2994 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 - - + + diff --git a/res/drawable-xhdpi/grid_pressed.9.png b/res/drawable-xhdpi/grid_pressed.9.png index ea317b50d00c30b18755872ee46e4a6480cf04df..2cf12edbf04ad7088cffc31d92437b54f7a7f71a 100644 GIT binary patch literal 665 zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLJ-37#&FAr-gY&g#x>HV|mD zWl}a^QZ{gMdm$4z>jLKqwvy%&X15a@a*cxP%-Fl`OC%jqJ#@))>Z7FkJMRzgGfsYO zF40r4S|M3o<0flXqIqIWggTF!&$pf2**7Iu{gXVue+}zf!=E!ekI$+JJKPtrhQEm+ z_t44TYeeszyWH%-xsd(A(Xj8y>WmZf*|xr)enfKJ8|i&6_m#2|ZnFQDJM#aZpUr&t z3if4eI!vz}cJ23(u;637`KeB?+u@IZjb?*%hqdkd_QuMhNkUzh-+WGt?R(mG^07lf z;%Cm>yWfW{%d00V1GukiOeEOL$cNu2f%TT_v<80W8Y1OaU4r-(Z z$#cAYeX1ec;j5dl!m^7#M{QEpH@>*v(>1~TPuxqkm(A;$)vHSk;w?^bA6t>owxdm_ zL-Jri+=FX!u93aId48o6>_wmCHHf4*zIkyfRG@fadW)k`_Calhs+wi@-u$c+<9MU6 zdrR2_*(Yxu?4C8BxL?s-6z-UJtG_7OZR^}$d!|=1v|PA0M^(NuX)E}tD=o}_NsnxS!yoZ zR^7c&v+-YIN*zJmwO-qFZlQI+_8U* ZP8$|-PdxinnSp_U!PC{xWt~$(696K)HU|Iz literal 246 zcmeAS@N?(olHy`uVBq!ia0y~yU=Rdh4mJh`2J2k+UknTkjKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ4kz|)M{l=mi!N9;! z=IP=XVsU!!RTj~T^=Oa?>zl@hnSa>uZnk|(CS*< z6XC5+xBK&EU29c&ny}!)t`~2A?w#;ut9^)?2gA1MQ7jMU3-8?ByVxjl4eyevMHV|mD zWl}a^QZ{gMdm$4z>jLKqwvy%&X15a@a*cxP%-Fl`OC%jqJ#@))>Z7FkJMRzgGfsYO zF40r4S|M3o<0flXqIqIWggTF!&$pf2**7Iu{gXVue+}zf!=E!ekI$+JJKPtrhQEm+ z_t44TYeeszyWH%-xsd(A(Xj8y>WmZf*|xr)enfKJ8|i&6_m#2|ZnFQDJM#aZpUr&t z3if4eI!vz}cJ23(u;637`KeB?+u@IZjb?*%hqdkd_QuMhNkUzh-+WGt?R(mG^07lf z;%Cm>yWfW{%d00V1GukiOeEOL$cNu2f%TT_v<80W8Y1OaU4r-(Z z$#cAYeX1ec;j5dl!m^7#M{QEpH@>*v(>1~TPuxqkm(A;$)vHSk;w?^bA6t>owxdm_ zL-Jri+=FX!u93aId48o6>_wmCHHf4*zIkyfRG@fadW)k`_Calhs+wi@-u$c+<9MU6 zdrR2_*(Yxu?4C8BxL?s-6z-UJtG_7OZR^}$d!|=1v|PA0M^(NuX)E}tD=o}_NsnxS!yoZ zR^7c&v+-YIN*zJmwO-qFZlQI+_8U* ZP8$|-PdxinnSp_U!PC{xWt~$(696K)HU|Iz literal 246 zcmeAS@N?(olHy`uVBq!ia0y~yU=Rdh4mJh`2J2k+UknTkjKx9jP7LeL$-HD>U|>t~ zc6VX;4}uH!E}zW6z`$AH5n0T@z%2~Ij105pNH8!ku$OrHy0YJ4kz^Oue=&&_q_fP^ z#WBR77|LvLe4xBi_F&)HI_AC9tqbRoFfUkA!^pwm0W@{N685#XcPg=l~a4=oa z?EU1d6Y@GqYmP{LlFw?86Wi$>V5^~*OV diff --git a/res/drawable-xhdpi/rounded_mask.9.png b/res/drawable-xhdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..acbe31366c6cbdf811ae45abce054da8bb14439e GIT binary patch literal 446 zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLKot)4E9Ar*0NXIc9(8w#{d z?`!H~dUrrHL-WOomzEr|vaY}8G`AH86f$TC%J%o#8#UXUYs(2+Q)Y9^UrKY+^N;^y zua#Zy@z*xAds`3}Y_n{KUtz?zyR4=`-uzX(O<}hR;_uzw+90f*Yw=~$yf62-Pi^&# zzZY~TlJh^maY~rJ#>GQ+HcKqFDj#o-G%8kKl6^70X6cUUdzx!*%y^-b*4?&t!ZO#` zn&m%y3TN`qU^3|tGs$)6QY-s7@zJSmbNIG&EaSa#ZHdsG_#0uDo7FC+C3p*a<>hkQ zFIX#bdQ;vro!pi77iMs$d74j|E^>U^8Tky6we}m9NT2G}{m31)U9xi1%72c<(Ikv2lm81AH^ez+k_rPF&>Kf;?S|$oTFHB zRY<*UY|!84#yJB17DcP-LxLZ@o;mr?3d>od_xpv;Dar0!&cMLH;OXk;vd$@?2>@Ok B!5shq literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/rounded_overlay.9.png b/res/drawable-xhdpi/rounded_overlay.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cdea9186ef762a065b541955e0dad2a8881263c5 GIT binary patch literal 414 zcmeAS@N?(olHy`uVBq!ia0y~yU@!t<4mJh`208nVjSLKosh%#5Ar-gY-n!V^q9DNb zK(mprPe`XxNarBmG@&;=LK+8!G!7nS(VuL4-dSv-{M?j#JwF(;8WgSUpG|O0^7DCq z`NtKz>iL(JcVy)6T=scoP2WSg&+Ri=BIV;!-kfEDh&Ub-c%&d+b8D?9u6#CpRpJmcMtAHPvscYAy4L>N`6{ Us$>^2FfcH9y85}Sb4q9e0LmSz{r~^~ literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/rounded_mask.9.png b/res/drawable-xxhdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d63d090a69a71a2c85d1f699146efaf11e89f7a2 GIT binary patch literal 5961 zcmeAS@N?(olHy`uVBq!ia0y~yVDJKA4mJh`2AKPasDBVF|yD(yGy z-^+V!f6rpi*%S5u4s>eY*LnW)cJ!-zuh*?R-sAdNIPmz5ccwh?GBa%EoHp9uy8p=U zqB`mQSIevmcizZk-+$Tk`NpqidPeQQa`)f`g`v4y33*Obo$m;9Z%@6}O<+X0t5)`pVe9~#a+X*hjO?0t9fjg5~MoI6w7QTKpx`Xq6+m&qJAXFpnfy}H=9 z@cC}LpKrdJ+-Ok_I6J@f>lYrIm9=i^wOd*F`&bPOw%+kty>{!py)W;qFb;eEd#>@}euGCI%Kb*K zG8X$ENiNn`z?ujt!hAgO+$r-Zv*w;b@ok+C8UMtzNsYbE|CGoy_O4Wp{JG zo3FQx`}^#>e8pMYxX;Iff9?JB%=Fx>pg3oX*2zok4kz1L*~DF8X4w)x|K_WtFRv`W z&di;+#ABYP+Sgve<#LBx3oYkwtNwg<_w%~b`D$11f13S&>hqpm@A50oJ=m51_nYkc z&TBg>ZOS$Wo`2BOI%=#tOIs3=f$*Xr>*>_pUGt#Kd^U~bn!_yZD zYz=y8{#_}z{5w(U&yUt66LrYif~l64Lz%s+l<;=IDR z#Sy=y+PTkrT&t5ky=U3C<;KSASN^?t=2hIW_P0svoMOBq5_2>y>d#I*diu|nJpF)oqgt(uzYV!S$V2(dm=aEigPS>-*uW*muPO( z@s43@i#eToQ!_8UXi~`YSyw&z7JHvrRB3j?Q&rXMO61`?hZ`*ue+Fc6T+v$fV4F4X z#8_iTdmhDTj&7lLZsRvSQ#bKkPx`ooL$Nh<(fZ=!p((vlCtt^&e6lSz?#POqHDR-E z?(7en&dzcyZ(oc;)wb8QQGe%@AKAg!`g4on+*1+@78Yqfyj>Lh z^iG(vWy!nF`%4m!ZL1MAPm|hvW?5r8%ldD6vUgb6IB#CqJlm@>y&KDUS>5S6gJRULCM&wL<%1$%*+j$7Py$|mBdg)W!MGs|HrBI)$qNFzdoxj;;9Sy*E(Z)AsOm`HW*LS4<6c z6m%#w-1&S)6JzWO^QZ`SPi7Au&Qk_k^89ZYN(%j1Qo|=bed)H_Jdq7P=Y7Jwn_@%O ziKhQrHZ4&i=;V3T?(b()XFMplGsnQ%IP$gbd5 z(UE~_4X;~+&RHFEQqs7+?8D^iA^zMOo;p3X+vmGA@XtE^+Pi6YD>m+anCkj^&k0`F zn_f%#clH>waW_s4;F@!uS^~6vxhFs5?m?A zWmuUj!d9hTR}C}_6Hyl1aqXAcRPJND7(_)hg$!EcA1+|H*uj{zdBvpSGj}g>Sk8ZO zE|2Avntay1wT8SkYjtNB1=P$j{4ll1wrA7gx7s`T%CmLl!(XUWS+7%2;VPX`xaOK* z@x2@&i5%|f0-2AT+dVi=Ob}OfJ|$rAY2~k3F(D3HU!Qc$xm{%Hwdhvo()LiznY-4! z>J6To=+|~H@!X?*OIEx*e??(Y^NplGzPbm!c;$6At~{ymxT9i@|GL7+RVt4>cNP4c zsGQx?K2OCd_UdGlNxlVrXA8LYyjPQ)D!p}%Meo*U8n$Nk8}j#V(Pt~_E!yL|a)V@- z^g8a?ryJemE1UyMt`_r7nDEJCs)a;H+ni;}>gf&Z*d#4{3kz5ei?+l^?c=TRRQUOK zm-7#gh{?eVe8tv@9X%k}kTSv9Z~{;Ln?o1(-23zLVvFGkP625R9Rc|UDW15sDF-Z@ z{;zTGn!EgsaR2GWJgbs_30`@XD8dk%)39N6Z{N;NhfVRly*n?OUpv2K=j@`*8BzBa zcKqR&W!$XuF0;k{;YOjtj2Z5M-~4U9?^&&F+&anX(2~e^tAdr5tq^B%e;a&3O_p^_ z7+cEn{Ot8&6I;|W?;QQBUtDU!D#sh~`SO8!eXXe3aZ_JjQ(e1B{?(+PkvHmB`1r?K zRo1_{B>8Nm&xfZe5$qS)FN&Tlc&2gjbgR<|d%uoii~FBSj(j@FyF|=I((g!td{^Vo zDBimD5;5oOC$N3UZP*^7;?n8Iv?;TF;-L>tZ`-n>510yxo?++REjZt_)vNKym6+#~ zwke1{pTGEL)ua1z_Ix2CKb}Wg#I$zAGiinHu#VFL0UMk3-YP z{3IjW%M)KNXclY;WJ*)Azt=7{=};(fx1aCW*yVUaQOW(3M0UW0Cn>WszCPq%|26EP?3K)| z=e1-_LbI5zw#>-bD#2GFx=G$xBsZ^;$ueDJ=93k^i$c2QA9ufUcte%lmj~_&ng5th z)k$<5*t{t(^m3(;#QTzf*MHcpBHpB1{n#MUAr^S%YU7>~hZM&g^+$`9il-^uszZ(A*=3Jps&1I=FpN6b z%X}&C*@|4PoSm^Qch<@(IA%>+sN0@8EFs@m?IW;M`Y5X-W7t3zWrO4Pg~BreCZiuV<(P-?@tsy%01)!rT*=|{bKIl zS%j;U7_VexwTG)HEhHaarmx>gLY~!i=nWU^Pl9}J&TT5D15rCV*Z@%yyzXh zldCwtoVm?DV{$+5V|laHUxIgR4K%A>^TNS&{aj&*b>i#8zU)5Ys&#mE?VPPz8!D#? zGyPUNaGOcP^GxZDj$0p}=l0*Xnq@Eh;6M8>ef}kDHD2(jvUkkUy2iGoHAFjk!u1zv zPwpw)33r*5nav%@U>Lf|aN+Ug+e7>AU39vvX?aWD#ciMKZlTz${q>7vt9F@oJQjXC zC3QX5r?%bIho#JbuPf{{RtNpQ^wySTwN|jM z6_@FPuH0kH=C|Ia%S_sH&EslgVUjra?`5wVgv7J1{1AU3npGf@`uLGeP>%G!lOGwY z-uk_g`^s1)!S?ErxbAPa(3alY6M16TlB|E7+I96pLjE4J6=u_mpR`Fo;0*F-93Hn3lsg-hn$nI{80*x zSSNXX>-oiNPH8<~J3Ta1_xMEk>o-&-CS6x*__x0Kn$$LN-S zSY_|Dne#Wru6eQL?VNLdy+)x|7EkutSU=;{IY!q!{y^96%B4+nLrzCeqddog(_p>9sRgKc@c31`Z;u0Fx3iX%+jva+o;Rnq^s!H)RYk7#*~>jvwoxT_FU(b} zpXKNEKA@hl^VHvT^)-Sn(S>~eA1AKLSrB$7zx3-r*X!>~b(o9NRzGsnRbKg&q41^Y zadPA>XTZt^E@&yv^RWH)h&HKjkk65-ol-e0aL*ZAt5`$8KNdUHIbN z_r`SlTiwU8Kef7hy=y9uY>%3CBj(da{*@}>N4K+D%-o;tc9re%<9`?HmYy>4sk_o= z%>H`Mi@xvYmtM`DAg{3O=Z4cOZH3sRo-Umh2j-mI!!vU$tPd~MA)m$wx!f1GtW^Y+VomKm~E;#ueU z8fUm=y@+0s=k&9gZ!3HF%BZyYY1zH?QQOa&%j+;Wcz2{Xrgum0=3)t2WFUNX+au4K z3A|dy{$-VORq*sScigqpWEx*3i(`&6TgZYcK);IhW zWV1xwO0=%X{+P(hJ1y%tlc%}o8ndNkHfvwBU;Cr+X8wx*ciR8yXv#ZwTKs#u?_V|l zubZmB$|ifLC&!(;^juLadv~vVMc1uL``-EKrw`lq&Y!HVZhOm#-+NYirepEGLpE#9 zz5Vv5v|DGM+vUq&?H6!Q*Vz94y!qDspGy8FZj-fQ!{yOzA$8^7qWH?{~?* z&V8?}SmO9S{k`(RcE#j}d9?>}{j7X$PZc{Lm9Ej|u`YyZ68mC@9jmTnJ}WXzU6wb@-*JFORm#-$8t)yFc&*EA8zCGpmaccJ6``ey!G?)~9diL(Lqm%fz z8R_xon2Hr_=S=q6^zNL3=mTa}krhwaxn^uR{_RmifWzGom7TXXD_4F${HX4&M<3($ zD^(x%$)=s}dvcT4c$f8;lbh~eTe4h9GwtsVwVB^-7j5tQaz)wb{Yv-rj^#?4?Cjr5 zHaAYVx?D#?_{^O-XQ#|4j_&+Zox9B9ZfnQKyk!Yjrty6Ww0WmyTJs?|C zLw|cCCFfpik6g)h(S2#znO_Z@rNJEsrfm&0FFJbk;P*?vEsCq;IyorMZcSDXVhnPuV0pt?Q>O(iOrf;;;qE&m~rx^v=(2^Cf} z@7-~q(2qxIR;a%4luMRjJ>f5_^Z9PtagS9e19f)gbyypzYTE{CIBjW*dOl}Y-u&~% zJtdVIYtNQ=`2s-iJ;K7DnI}b8(t`6I6W;^%&=^L(%ntU!Ruf^M} z{kN@pZr=JMYx%ui{%8ET-aluni;Lt7SD!yz z2 z3S(ekY{_(X4)An#hK=ztFjUN`ooMTE*g@uKeDKnsRZVFEg(m{$>U4CySQe_`)Ec0@ z3AiTA>vy#j+e&v&}}?o#-ud^xrMzJz$pvk0~PWx=11*lY~Q zNZ#2ybn z?{n=Ni(X-cA3QNHb?cY%`P5H}%g(&0yr5iq$Bw+rPjUr2nR#p^Cu!~snxHoQJoEeX zFTRlr{)=&}uiR_;z3>;ql9j8U@D>zs^oVFw-+g{J_U+!k)yr<)=bt8DwDrtMy%!7& z3~Wi>?k)`fL2$v|<&zm07&r?&B8wRqxP?KOkzv*x2?hoR_7YEDSN5k|e8OC&llbbI z85kIoJY5_^DsH{Kvzzab0gppqvg_af@81SZ+ceSS{jrZ*kFaIdZ0OaR+ObCb`rjxm zJ0+#(m3}vG6w1t>_uBW)c9v|5ja%IpvvxbIeBH~$eXTLAu{E~At-1AXgInXva~`(e zSIJGNdK0-m^ywLce932W zt6yrCYpvS0$R<4al!N1`!;8M|Xq9Afy}k5yf7ha~9p;Y~Ey}Q6(7?o{v4CU2tA%Ry-C8GF2T#%@9z~+BTQw;0OLPXY@b98;{-YzTZ`kJ?G(ced6zrL_d$k_W$^6Ac1 zNjrlB*Y2;9Tdg&9^R>DQ!a-rLD-WDH8Cb2m#aQTY%@N%*eW9U~f>%V|_+|XkG=A5) zT@zB5ER#$XT%CIU*R@t%MbYyb-No56lP89;Mt@tdHuS(5nY-V_X52i?@Lx6IYlY{; j-!gs=8?U=B*Kb_7uk!DO2eTL$7#KWV{an^LB{Ts54SI}a literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/rounded_overlay.9.png b/res/drawable-xxhdpi/rounded_overlay.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4f40a2328b5edf49926b2a8960f1e6b93f5ea6bc GIT binary patch literal 621 zcmeAS@N?(olHy`uVBq!ia0y~yVDJKA4mJh`2AK~)o%42Lvw}d| z_Lh=@DG8j@Ch$42r?YQleyi|O;ku*O!j>ryGW&K4vZ{8SI{y32oAWhi9yfKo5&G$_ zeAs(duk)6|?8O<6@3>uKi~e9g^H0uq*;Hx%pLfslZJfDcxya$N9T)EA7yO*<*im&- zyVk0pq~y{&>6BT*fp#2HMUy0TYXn29)lN)FZ0~%vF2wKQfv~jeN`d>*FJ38F^Ia%3 z;K!8c?nfg0HQIraN8O)Ai7c;pxXxv&i2c#1K+~npdqbvhlyGiHd#Nz3BWa4<&*h8q zrs!>5t1&Ud>}&gj({3S-3+4zE}cP zPpq=vck)q4!K=ul9`Oeags!@_?mW5gi1P8de6G&hgm;umMtM1JSTwb@SJUQJ%*nu& zZ&Z^!#hpHW)j8L_KKaZV?%X>HkEC9ns-8SeS+w + android:fillColor="@color/accent"/> diff --git a/res/drawable/albums.xml b/res/drawable/albums.xml index 23630a579..1cbef0f46 100644 --- a/res/drawable/albums.xml +++ b/res/drawable/albums.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z" /> diff --git a/res/drawable/back.xml b/res/drawable/back.xml index 051e5b9c9..ed46a9fc8 100644 --- a/res/drawable/back.xml +++ b/res/drawable/back.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/beautify.xml b/res/drawable/beautify.xml index 6962bc649..275d225f9 100644 --- a/res/drawable/beautify.xml +++ b/res/drawable/beautify.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/beautify_select.xml b/res/drawable/beautify_select.xml index 68cff5887..27e6ed730 100644 --- a/res/drawable/beautify_select.xml +++ b/res/drawable/beautify_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/bg_gallery_image.xml b/res/drawable/bg_gallery_image.xml new file mode 100644 index 000000000..5ffa21624 --- /dev/null +++ b/res/drawable/bg_gallery_image.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_vidcontrol.xml b/res/drawable/bg_vidcontrol.xml index 9ce9f6ad0..419425c87 100644 --- a/res/drawable/bg_vidcontrol.xml +++ b/res/drawable/bg_vidcontrol.xml @@ -34,7 +34,7 @@ android:viewportHeight="48.0" android:viewportWidth="48.0"> diff --git a/res/drawable/camera.xml b/res/drawable/camera.xml index 6249f8968..e26b05c5f 100644 --- a/res/drawable/camera.xml +++ b/res/drawable/camera.xml @@ -37,10 +37,10 @@ \ No newline at end of file diff --git a/res/drawable/cancel.xml b/res/drawable/cancel.xml index 335e60930..dd87ea013 100644 --- a/res/drawable/cancel.xml +++ b/res/drawable/cancel.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/cancel2.xml b/res/drawable/cancel2.xml index 82eaec1ed..4303539fa 100644 --- a/res/drawable/cancel2.xml +++ b/res/drawable/cancel2.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z" /> diff --git a/res/drawable/color.xml b/res/drawable/color.xml index d2dc37e26..072f892fd 100644 --- a/res/drawable/color.xml +++ b/res/drawable/color.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/color_select.xml b/res/drawable/color_select.xml index 79d107021..43a49b886 100644 --- a/res/drawable/color_select.xml +++ b/res/drawable/color_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/comparison_after.xml b/res/drawable/comparison_after.xml index 262aa4155..5c51a022c 100644 --- a/res/drawable/comparison_after.xml +++ b/res/drawable/comparison_after.xml @@ -33,10 +33,10 @@ android:viewportWidth="36.0" android:viewportHeight="36.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/comparison_before.xml b/res/drawable/comparison_before.xml index 5066cd987..840523bbf 100644 --- a/res/drawable/comparison_before.xml +++ b/res/drawable/comparison_before.xml @@ -35,8 +35,8 @@ + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> diff --git a/res/drawable/crop.xml b/res/drawable/crop.xml index 25ff64968..d0ce475e9 100644 --- a/res/drawable/crop.xml +++ b/res/drawable/crop.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml index 332eff7e7..be3c39176 100644 --- a/res/drawable/crop_1_1.xml +++ b/res/drawable/crop_1_1.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_1_1_select.xml b/res/drawable/crop_1_1_select.xml index 892870714..5d605b971 100644 --- a/res/drawable/crop_1_1_select.xml +++ b/res/drawable/crop_1_1_select.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_crop.xml b/res/drawable/crop_crop.xml index 0272da20d..ec0d3d59f 100644 --- a/res/drawable/crop_crop.xml +++ b/res/drawable/crop_crop.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_free.xml b/res/drawable/crop_free.xml index eac62fb24..a04c854d8 100644 --- a/res/drawable/crop_free.xml +++ b/res/drawable/crop_free.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_free_select.xml b/res/drawable/crop_free_select.xml index f24699731..d6084e013 100644 --- a/res/drawable/crop_free_select.xml +++ b/res/drawable/crop_free_select.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_original.xml b/res/drawable/crop_original.xml index 91eef6c0c..dce12c276 100644 --- a/res/drawable/crop_original.xml +++ b/res/drawable/crop_original.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_original_select.xml b/res/drawable/crop_original_select.xml index 3bb0f7694..189a24755 100644 --- a/res/drawable/crop_original_select.xml +++ b/res/drawable/crop_original_select.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_rotate.xml b/res/drawable/crop_rotate.xml index 8caf459e4..801339dd1 100644 --- a/res/drawable/crop_rotate.xml +++ b/res/drawable/crop_rotate.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/crop_select.xml b/res/drawable/crop_select.xml index f2a8269f9..f06a4ea10 100644 --- a/res/drawable/crop_select.xml +++ b/res/drawable/crop_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/crop_straighten.xml b/res/drawable/crop_straighten.xml index 9fda1f484..c66441ffb 100644 --- a/res/drawable/crop_straighten.xml +++ b/res/drawable/crop_straighten.xml @@ -30,5 +30,5 @@ - + diff --git a/res/drawable/delete.xml b/res/drawable/delete.xml index 1285cb916..55c8ecd45 100644 --- a/res/drawable/delete.xml +++ b/res/drawable/delete.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/done.xml b/res/drawable/done.xml index 439357c61..6eb431bb3 100644 --- a/res/drawable/done.xml +++ b/res/drawable/done.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/done2.xml b/res/drawable/done2.xml index 76d5f561b..0c95d7504 100644 --- a/res/drawable/done2.xml +++ b/res/drawable/done2.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z" /> diff --git a/res/drawable/drawer.xml b/res/drawable/drawer.xml index e0a8061c8..9ec65c43e 100644 --- a/res/drawable/drawer.xml +++ b/res/drawable/drawer.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml index f3dee7696..d5c938c07 100644 --- a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml +++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml @@ -34,7 +34,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/dualcamera.xml b/res/drawable/dualcamera.xml index 7bfdc46be..255181f44 100644 --- a/res/drawable/dualcamera.xml +++ b/res/drawable/dualcamera.xml @@ -5,17 +5,17 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_primary_text"/> + android:fillColor="@color/color_default_primary_text"/> + android:fillColor="@color/color_default_primary_text"/> + android:fillColor="@color/color_default_primary_text"/> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/dualcamera_select.xml b/res/drawable/dualcamera_select.xml index 9835120b3..85976538d 100644 --- a/res/drawable/dualcamera_select.xml +++ b/res/drawable/dualcamera_select.xml @@ -35,17 +35,17 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> diff --git a/res/drawable/e_ic_album.xml b/res/drawable/e_ic_album.xml new file mode 100644 index 000000000..4ff968a9f --- /dev/null +++ b/res/drawable/e_ic_album.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/e_ic_timeline.xml b/res/drawable/e_ic_timeline.xml new file mode 100644 index 000000000..ba272ae05 --- /dev/null +++ b/res/drawable/e_ic_timeline.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/e_ic_videos.xml b/res/drawable/e_ic_videos.xml new file mode 100644 index 000000000..98f9f3b6e --- /dev/null +++ b/res/drawable/e_ic_videos.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/edit.xml b/res/drawable/edit.xml index b28d23ef2..cd8fe38c7 100644 --- a/res/drawable/edit.xml +++ b/res/drawable/edit.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml index ad0a64f4f..1c9353d3f 100644 --- a/res/drawable/exposure.xml +++ b/res/drawable/exposure.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/exposure_select.xml b/res/drawable/exposure_select.xml index 7386e4c01..47630d8b0 100644 --- a/res/drawable/exposure_select.xml +++ b/res/drawable/exposure_select.xml @@ -35,5 +35,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/filtershow_button_background.xml b/res/drawable/filtershow_button_background.xml index ee8a92dd9..dcf85bb7c 100644 --- a/res/drawable/filtershow_button_background.xml +++ b/res/drawable/filtershow_button_background.xml @@ -1,7 +1,7 @@ - + diff --git a/res/drawable/filtershow_color_picker_circle.xml b/res/drawable/filtershow_color_picker_circle.xml index 1457a68eb..1057a2a27 100644 --- a/res/drawable/filtershow_color_picker_circle.xml +++ b/res/drawable/filtershow_color_picker_circle.xml @@ -19,8 +19,8 @@ - + + android:color="@color/color_default_divider"/> diff --git a/res/drawable/frames.xml b/res/drawable/frames.xml index f668e4dce..1c9975c31 100644 --- a/res/drawable/frames.xml +++ b/res/drawable/frames.xml @@ -34,11 +34,11 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_primary_text"/> + android:fillColor="@color/color_default_primary_text"/> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/frames_select.xml b/res/drawable/frames_select.xml index 6fa77e7cc..85c52df5f 100644 --- a/res/drawable/frames_select.xml +++ b/res/drawable/frames_select.xml @@ -35,11 +35,11 @@ android:viewportHeight="32.0"> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> diff --git a/res/drawable/hazebuster.xml b/res/drawable/hazebuster.xml index 0b157ac8a..097904859 100644 --- a/res/drawable/hazebuster.xml +++ b/res/drawable/hazebuster.xml @@ -34,26 +34,26 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_media_bigscreen.xml b/res/drawable/ic_media_bigscreen.xml index aaab4e40e..a21bf2227 100644 --- a/res/drawable/ic_media_bigscreen.xml +++ b/res/drawable/ic_media_bigscreen.xml @@ -34,6 +34,6 @@ android:viewportHeight="180.0" android:viewportWidth="180.0"> diff --git a/res/drawable/ic_media_cropscreen.xml b/res/drawable/ic_media_cropscreen.xml index a867cace4..8191c9b5f 100644 --- a/res/drawable/ic_media_cropscreen.xml +++ b/res/drawable/ic_media_cropscreen.xml @@ -34,6 +34,6 @@ android:viewportHeight="180.0" android:viewportWidth="180.0"> diff --git a/res/drawable/ic_media_fullscreen.xml b/res/drawable/ic_media_fullscreen.xml index 51e024b42..34668a2fd 100644 --- a/res/drawable/ic_media_fullscreen.xml +++ b/res/drawable/ic_media_fullscreen.xml @@ -34,6 +34,6 @@ android:viewportHeight="180.0" android:viewportWidth="180.0"> diff --git a/res/drawable/ic_selection.xml b/res/drawable/ic_selection.xml index 1493b49b1..64948ac70 100644 --- a/res/drawable/ic_selection.xml +++ b/res/drawable/ic_selection.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_vidcontrol_play.xml b/res/drawable/ic_vidcontrol_play.xml index d58c6d742..e58e93283 100644 --- a/res/drawable/ic_vidcontrol_play.xml +++ b/res/drawable/ic_vidcontrol_play.xml @@ -34,6 +34,6 @@ android:viewportHeight="180.0" android:viewportWidth="180.0"> diff --git a/res/drawable/ic_video.xml b/res/drawable/ic_video.xml index 1904d8b68..773face4d 100644 --- a/res/drawable/ic_video.xml +++ b/res/drawable/ic_video.xml @@ -6,7 +6,7 @@ android:viewportHeight="24"> diff --git a/res/drawable/ic_videos.xml b/res/drawable/ic_videos.xml new file mode 100644 index 000000000..98f9f3b6e --- /dev/null +++ b/res/drawable/ic_videos.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_watermark.xml b/res/drawable/ic_watermark.xml index 1c579413f..40f4d0b1f 100644 --- a/res/drawable/ic_watermark.xml +++ b/res/drawable/ic_watermark.xml @@ -34,7 +34,7 @@ android:viewportHeight="27"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_emotion.xml b/res/drawable/ic_watermark_emotion.xml index bed9457cd..bf1b2eba7 100644 --- a/res/drawable/ic_watermark_emotion.xml +++ b/res/drawable/ic_watermark_emotion.xml @@ -34,26 +34,26 @@ android:viewportHeight="1008"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_location.xml b/res/drawable/ic_watermark_location.xml index d430b6060..1ff7d8d62 100644 --- a/res/drawable/ic_watermark_location.xml +++ b/res/drawable/ic_watermark_location.xml @@ -29,6 +29,6 @@ --> - - + + diff --git a/res/drawable/ic_watermark_selected.xml b/res/drawable/ic_watermark_selected.xml index 736c66bc4..49c1989fd 100644 --- a/res/drawable/ic_watermark_selected.xml +++ b/res/drawable/ic_watermark_selected.xml @@ -34,7 +34,7 @@ android:viewportHeight="27"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_time.xml b/res/drawable/ic_watermark_time.xml index 9a0b9d8c5..4bd3a2a25 100644 --- a/res/drawable/ic_watermark_time.xml +++ b/res/drawable/ic_watermark_time.xml @@ -34,109 +34,109 @@ android:viewportHeight="360"> \ No newline at end of file diff --git a/res/drawable/ic_watermark_weather.xml b/res/drawable/ic_watermark_weather.xml index d1477ab88..ebda354aa 100644 --- a/res/drawable/ic_watermark_weather.xml +++ b/res/drawable/ic_watermark_weather.xml @@ -34,7 +34,7 @@ android:viewportHeight="1008"> - - - \ No newline at end of file diff --git a/res/drawable/more.xml b/res/drawable/more.xml index d33979f10..c64abf3db 100644 --- a/res/drawable/more.xml +++ b/res/drawable/more.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/more2.xml b/res/drawable/more2.xml index 8675d8fdf..1337277ee 100644 --- a/res/drawable/more2.xml +++ b/res/drawable/more2.xml @@ -34,5 +34,5 @@ android:viewportHeight="36.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/multiselect.xml b/res/drawable/multiselect.xml index 053507d86..da17ec46d 100644 --- a/res/drawable/multiselect.xml +++ b/res/drawable/multiselect.xml @@ -34,8 +34,8 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> + android:fillColor="@color/accent"/> diff --git a/res/drawable/multiselect_delete.xml b/res/drawable/multiselect_delete.xml index 209575ea2..efcf13878 100644 --- a/res/drawable/multiselect_delete.xml +++ b/res/drawable/multiselect_delete.xml @@ -34,6 +34,5 @@ android:viewportHeight="72.0"> + android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z" /> diff --git a/res/drawable/multiselect_more.xml b/res/drawable/multiselect_more.xml index 4b5950019..c02c535a0 100644 --- a/res/drawable/multiselect_more.xml +++ b/res/drawable/multiselect_more.xml @@ -34,6 +34,5 @@ android:viewportHeight="24.0"> + android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z" /> diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml index 6a426b1bc..b2e522f2c 100644 --- a/res/drawable/multiselect_share.xml +++ b/res/drawable/multiselect_share.xml @@ -34,6 +34,5 @@ android:viewportHeight="72.0"> + android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z" /> diff --git a/res/drawable/multiselected_back.xml b/res/drawable/multiselected_back.xml index 37c846a10..5d76beba0 100644 --- a/res/drawable/multiselected_back.xml +++ b/res/drawable/multiselected_back.xml @@ -34,6 +34,5 @@ android:viewportHeight="24.0"> + android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z" /> diff --git a/res/drawable/overflow.xml b/res/drawable/overflow.xml index 15d6b5312..387bd43f7 100644 --- a/res/drawable/overflow.xml +++ b/res/drawable/overflow.xml @@ -37,7 +37,7 @@ diff --git a/res/drawable/photopage_bottom_button_background.xml b/res/drawable/photopage_bottom_button_background.xml index 0c772ad21..5fa542712 100644 --- a/res/drawable/photopage_bottom_button_background.xml +++ b/res/drawable/photopage_bottom_button_background.xml @@ -1,5 +1,5 @@ - - + + diff --git a/res/drawable/seestraight.xml b/res/drawable/seestraight.xml index 317fa4ede..74dc30997 100644 --- a/res/drawable/seestraight.xml +++ b/res/drawable/seestraight.xml @@ -34,29 +34,29 @@ android:viewportHeight="32"> diff --git a/res/drawable/share.xml b/res/drawable/share.xml index 0ce3de878..f7d435ec3 100644 --- a/res/drawable/share.xml +++ b/res/drawable/share.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/sliderbg.xml b/res/drawable/sliderbg.xml index 204c9259e..5abe20b8f 100644 --- a/res/drawable/sliderbg.xml +++ b/res/drawable/sliderbg.xml @@ -35,5 +35,5 @@ + android:fillColor="@color/accent"/> diff --git a/res/drawable/sliderprogress.xml b/res/drawable/sliderprogress.xml index 5c2b541ab..382467051 100644 --- a/res/drawable/sliderprogress.xml +++ b/res/drawable/sliderprogress.xml @@ -34,5 +34,5 @@ android:viewportHeight="4.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/slideshow.xml b/res/drawable/slideshow.xml index dfe8c9c69..95d361f5a 100644 --- a/res/drawable/slideshow.xml +++ b/res/drawable/slideshow.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/spinner_triangle.xml b/res/drawable/spinner_triangle.xml index 100005962..77c550f3d 100644 --- a/res/drawable/spinner_triangle.xml +++ b/res/drawable/spinner_triangle.xml @@ -31,5 +31,5 @@ - + diff --git a/res/drawable/squared_tick.xml b/res/drawable/squared_tick.xml new file mode 100644 index 000000000..f89d7d0ea --- /dev/null +++ b/res/drawable/squared_tick.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/timeline.xml b/res/drawable/timeline.xml index 8d6dc37da..29b87efc4 100644 --- a/res/drawable/timeline.xml +++ b/res/drawable/timeline.xml @@ -33,11 +33,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19.057,4.034h-1.01V2.059h-2.016v1.976H7.969V2.059H5.951v1.976H4.902c-1.115,0 -1.967,0.943 -1.967,2.058l-0.01,13.832c0,1.114 0.902,2.017 2.016,2.017h14.115c1.113,0 2.016,-0.902 2.016,-2.017V6.092C21.072,4.978 20.17,4.034 19.057,4.034zM19.098,19.965H4.941V9.015h14.156V19.965z" /> + android:fillColor="@color/accent" + android:pathData="M6.184,16.241l3.738,-4.984l2.908,3.742l2.076,-2.496l2.907,3.738H6.184z" /> diff --git a/res/drawable/truescanner.xml b/res/drawable/truescanner.xml index c79f58501..23f7792e0 100644 --- a/res/drawable/truescanner.xml +++ b/res/drawable/truescanner.xml @@ -33,31 +33,31 @@ android:viewportHeight="32"> diff --git a/res/drawable/truescanner_select.xml b/res/drawable/truescanner_select.xml index 382c14e55..630188624 100644 --- a/res/drawable/truescanner_select.xml +++ b/res/drawable/truescanner_select.xml @@ -33,31 +33,31 @@ android:viewportHeight="32"> diff --git a/res/drawable/video_play.xml b/res/drawable/video_play.xml new file mode 100644 index 000000000..a058b6004 --- /dev/null +++ b/res/drawable/video_play.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/videos.xml b/res/drawable/videos.xml index 406d41dee..1654415f2 100644 --- a/res/drawable/videos.xml +++ b/res/drawable/videos.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M3.999,6h-2v14c0,1.1 0.9,2 2,2h14v-2h-14V6zM19.999,2h-12c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C21.999,2.9 21.099,2 19.999,2zM11.999,14.5v-9l6,4.5L11.999,14.5z" /> diff --git a/res/drawable/white_text_bg_gradient.xml b/res/drawable/white_text_bg_gradient.xml index c355ce52f..1fc626650 100644 --- a/res/drawable/white_text_bg_gradient.xml +++ b/res/drawable/white_text_bg_gradient.xml @@ -15,8 +15,8 @@ --> \ No newline at end of file diff --git a/res/layout-land/filtershow_saturation_controls.xml b/res/layout-land/filtershow_saturation_controls.xml index 6003b7389..ce23c15a6 100644 --- a/res/layout-land/filtershow_saturation_controls.xml +++ b/res/layout-land/filtershow_saturation_controls.xml @@ -41,7 +41,7 @@ android:layout_gravity="left|center_vertical" android:text="@string/editor_chan_sat_yellow" android:textStyle="bold" - android:textColor="#ffff80" + android:textColor="@color/yellow" android:layout_marginStart="8dp"/> diff --git a/res/layout-port/on_screen_hint.xml b/res/layout-port/on_screen_hint.xml index 7a24f7dc7..81d8b1b49 100644 --- a/res/layout-port/on_screen_hint.xml +++ b/res/layout-port/on_screen_hint.xml @@ -23,8 +23,8 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:textAppearance="@style/OnScreenHintTextAppearance.Small" - android:textColor="@color/white" - android:shadowColor="#BB000000" + android:textColor="@color/color_default_primary_text" + android:shadowColor="@color/color_default_secondary_text" android:shadowRadius="2.75" /> diff --git a/res/layout/album_header.xml b/res/layout/album_header.xml index caae962b3..c737d40a7 100644 --- a/res/layout/album_header.xml +++ b/res/layout/album_header.xml @@ -39,14 +39,14 @@ android:id="@+id/album_header_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/white" + android:textColor="@color/color_default_primary_text" android:textAppearance="?android:attr/textAppearanceLarge" /> diff --git a/res/layout/album_set_item.xml b/res/layout/album_set_item.xml index ad0e0db20..37793c2d6 100644 --- a/res/layout/album_set_item.xml +++ b/res/layout/album_set_item.xml @@ -11,7 +11,7 @@ android:layout_width="match_parent" android:orientation="vertical" android:padding="10dp" - android:background="#FFF" > + android:background="@color/color_default_foreground" > + android:textColor="@color/color_default_secondary_text" /> + android:background="@color/gray2" > + android:background="@color/gray2"> diff --git a/res/layout/bookmark_edit_dialog.xml b/res/layout/bookmark_edit_dialog.xml index 8282d39af..23507f9de 100644 --- a/res/layout/bookmark_edit_dialog.xml +++ b/res/layout/bookmark_edit_dialog.xml @@ -20,6 +20,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="2dip" + android:textColor="@color/color_default_primary_text" + android:textColorHint="@color/color_default_secondary_text" android:inputType="text" android:scrollHorizontally="true" android:singleLine="true" /> @@ -36,6 +38,8 @@ android:layout_height="wrap_content" android:layout_marginTop="2dip" android:inputType="textUri" + android:textColor="@color/color_default_primary_text" + android:textColorHint="@color/color_default_secondary_text" android:scrollHorizontally="true" android:singleLine="true" /> diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index 7230addd7..78c4ba65c 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -53,9 +53,9 @@ \ No newline at end of file diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml index 1a314ad56..160802d15 100644 --- a/res/layout/countdown_setting_popup.xml +++ b/res/layout/countdown_setting_popup.xml @@ -66,7 +66,7 @@ android:orientation="vertical" > diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml index fc5f2877a..a8220df2c 100644 --- a/res/layout/dialog_picker.xml +++ b/res/layout/dialog_picker.xml @@ -34,5 +34,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@android:string/cancel" + android:textColor="@color/accent" android:visibility="gone" /> diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml index bee765604..4173ae45b 100644 --- a/res/layout/drawer_list_item.xml +++ b/res/layout/drawer_list_item.xml @@ -48,7 +48,7 @@ android:textSize="12sp" android:layout_centerVertical="true" android:fontFamily="sans-serif-medium" - android:textColor="@color/black" + android:textColor="@color/color_default_primary_text" android:alpha="0.87" android:layout_marginStart="64dp" /> diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml index a71e933ab..4406bc8ee 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -40,6 +40,6 @@ android:text="@string/save" android:textAllCaps="true" android:layout_gravity="center_vertical|right" - android:textColor="@color/white" /> + android:textColor="@color/color_default_primary_text" /> diff --git a/res/layout/filtershow_actionbar_effects.xml b/res/layout/filtershow_actionbar_effects.xml index 48ed3b397..fa2624aa5 100644 --- a/res/layout/filtershow_actionbar_effects.xml +++ b/res/layout/filtershow_actionbar_effects.xml @@ -53,7 +53,7 @@ android:drawableEnd="@drawable/spinner_triangle" android:gravity="center" android:text="@string/apply_effect" - android:textColor="@color/white" + android:textColor="@color/color_default_primary_text" android:textSize="16sp" /> diff --git a/res/layout/filtershow_category_geometry_panel.xml b/res/layout/filtershow_category_geometry_panel.xml index 50515d6ac..7f6183a62 100644 --- a/res/layout/filtershow_category_geometry_panel.xml +++ b/res/layout/filtershow_category_geometry_panel.xml @@ -66,7 +66,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/color_default_primary_text" android:textSize="12sp" /> @@ -95,7 +95,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/color_default_primary_text" android:textSize="12sp" /> @@ -124,7 +124,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/color_default_primary_text" android:textSize="12sp" /> @@ -149,7 +149,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16sp" - android:textColor="#fff" + android:textColor="@color/color_default_primary_text" android:layout_gravity="center"/> diff --git a/res/layout/filtershow_editor_crop_landscape.xml b/res/layout/filtershow_editor_crop_landscape.xml index 65be04263..70532cce9 100755 --- a/res/layout/filtershow_editor_crop_landscape.xml +++ b/res/layout/filtershow_editor_crop_landscape.xml @@ -91,7 +91,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/color_default_primary_text" android:textSize="12sp" /> @@ -120,7 +120,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/color_default_primary_text" android:textSize="12sp" /> @@ -149,7 +149,7 @@ android:clickable="true" android:background="@android:color/transparent" android:layout_marginTop="@dimen/crop_text_margin_padding" - android:textColor="#ffffff" + android:textColor="@color/color_default_primary_text" android:textSize="12sp" /> diff --git a/res/layout/filtershow_editor_panel.xml b/res/layout/filtershow_editor_panel.xml index 4f3177051..dcb1b38c3 100644 --- a/res/layout/filtershow_editor_panel.xml +++ b/res/layout/filtershow_editor_panel.xml @@ -57,7 +57,7 @@ - + diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml index 971260bdf..1a688d589 100644 --- a/res/layout/filtershow_export_dialog.xml +++ b/res/layout/filtershow_export_dialog.xml @@ -51,6 +51,8 @@ android:id="@+id/editableWidth" android:layout_width="70dp" android:layout_gravity="right|center_vertical" + android:textColor="@color/color_default_primary_text" + android:textColorHint="@color/color_default_secondary_text" android:gravity="center" android:inputType="number" /> @@ -63,6 +65,8 @@ android:id="@+id/editableHeight" android:layout_width="70dp" android:layout_gravity="left|center_vertical" + android:textColor="@color/color_default_primary_text" + android:textColorHint="@color/color_default_secondary_text" android:gravity="center" android:inputType="number" /> diff --git a/res/layout/filtershow_history_panel.xml b/res/layout/filtershow_history_panel.xml index 992d05a85..fbc2ad0ff 100644 --- a/res/layout/filtershow_history_panel.xml +++ b/res/layout/filtershow_history_panel.xml @@ -31,7 +31,7 @@ android:gravity="center" android:padding="2dip" android:text="@string/history" - android:textColor="@android:color/white" + android:textColor="@color/color_default_primary_text" android:textSize="24sp" android:textStyle="bold" /> diff --git a/res/layout/filtershow_presets_management_dialog.xml b/res/layout/filtershow_presets_management_dialog.xml index 68754e2ba..faa68a464 100644 --- a/res/layout/filtershow_presets_management_dialog.xml +++ b/res/layout/filtershow_presets_management_dialog.xml @@ -43,6 +43,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:focusable="true" + android:textColor="@color/color_default_primary_text" + android:textColorHint="@color/color_default_secondary_text" android:imeOptions="actionDone" android:singleLine="true"/> diff --git a/res/layout/filtershow_presets_management_row.xml b/res/layout/filtershow_presets_management_row.xml index bd3e47928..b1f147f42 100644 --- a/res/layout/filtershow_presets_management_row.xml +++ b/res/layout/filtershow_presets_management_row.xml @@ -37,6 +37,8 @@ android:layout_height="match_parent" android:focusable="true" android:imeOptions="actionDone" + android:textColor="@color/color_default_primary_text" + android:textColorHint="@color/color_default_secondary_text" android:singleLine="true"/> diff --git a/res/layout/filtershow_trueportrait_editor_panel.xml b/res/layout/filtershow_trueportrait_editor_panel.xml index 13b8212ac..b10fff98b 100644 --- a/res/layout/filtershow_trueportrait_editor_panel.xml +++ b/res/layout/filtershow_trueportrait_editor_panel.xml @@ -59,7 +59,7 @@ android:layout_gravity="center" android:padding="3dp" android:text="@string/brush_size" - android:textColor="#fff" + android:textColor="@color/color_default_primary_text" android:textSize="16sp" /> @@ -63,8 +64,8 @@ android:background="@color/primary" android:layout_alignParentBottom="true" app:menu="@menu/navigation_items" - app:itemIconTint="@drawable/item_bg" - app:itemTextColor="@drawable/item_bg" /> + app:itemIconTint="@color/bottom_nav_color" + app:itemTextColor="@color/bottom_nav_color" /> diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml index 630217153..f080adedb 100644 --- a/res/layout/gl_root_group.xml +++ b/res/layout/gl_root_group.xml @@ -22,11 +22,12 @@ android:layout_height="match_parent"> + android:background="@color/color_default_foreground" /> diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml index b04221361..8f627846d 100644 --- a/res/layout/ingest_date_tile.xml +++ b/res/layout/ingest_date_tile.xml @@ -16,7 +16,7 @@ + android:background="@color/color_default_background" > + android:textColor="@color/color_default_primary_text" /> + android:textColor="@color/color_default_primary_text" /> + android:textColor="@color/color_default_primary_text" /> diff --git a/res/layout/main.xml b/res/layout/main.xml index e26e0fc6b..a97caceab 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -2,6 +2,7 @@ diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml index 0d15e8fe8..4d5a7b73e 100644 --- a/res/layout/movie_view.xml +++ b/res/layout/movie_view.xml @@ -16,7 +16,7 @@ @@ -29,7 +29,7 @@ android:id="@+id/surface_view_cover" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/black"/> + android:background="@color/color_default_background"/> + android:textColor="@color/color_default_primary_text" /> \ No newline at end of file diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml index 1acbd77cb..1b52e79c2 100644 --- a/res/layout/photopage_progress_bar.xml +++ b/res/layout/photopage_progress_bar.xml @@ -9,7 +9,7 @@ android:visibility="invisible"> diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml index 00270e3a1..b2ccac5ac 100755 --- a/res/layout/toolbar.xml +++ b/res/layout/toolbar.xml @@ -39,6 +39,7 @@ android:layout_height="?android:attr/actionBarSize" android:background="@color/primary" android:elevation="8dp" + android:theme="@style/ToolbarTheme" android:titleTextAppearance="@style/ToolbarTitleStyle" android:popupTheme="@style/ToolbarPopUpTheme" /> diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml index 79a0f8808..712094dfe 100644 --- a/res/layout/trim_menu.xml +++ b/res/layout/trim_menu.xml @@ -17,10 +17,11 @@ + android:layout_centerVertical="true" + android:background="@color/toolbar_theme"> diff --git a/res/layout/trim_view.xml b/res/layout/trim_view.xml index c95c719c1..4a837fc64 100644 --- a/res/layout/trim_view.xml +++ b/res/layout/trim_view.xml @@ -16,7 +16,7 @@ + android:background="@color/color_default_background"/> - + + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml index b21bf3d38..a6cda04a3 100644 --- a/res/menu/albumset.xml +++ b/res/menu/albumset.xml @@ -16,15 +16,19 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + diff --git a/res/menu/navigation_items.xml b/res/menu/navigation_items.xml index b4f39dc1c..8758d9b83 100644 --- a/res/menu/navigation_items.xml +++ b/res/menu/navigation_items.xml @@ -1,11 +1,14 @@ - - - + + + diff --git a/res/menu/operation.xml b/res/menu/operation.xml index dccb2efde..195f5763e 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -13,10 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index cee058d86..f0b74bfbd 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -57,7 +57,7 @@ 13dp + + + + + + + + + diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml deleted file mode 100644 index 67bceb0a8..000000000 --- a/res/values-night/colors.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - #212121 - #DEFFFFFF - - @color/default_background - @color/primary_text - @color/default_background - - @color/primary_text - @color/primary_text - - @color/primary_text - @color/primary - @color/white - - @color/default_background - #99FFFFFF - @color/primary_text - diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml deleted file mode 100644 index fd287692e..000000000 --- a/res/values-night/styles.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - + + + + + + + + + \ No newline at end of file diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index 55b29b1fa..3e95e934d 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -15,6 +15,7 @@ --> true diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml index 4eb65aead..d8849581e 100644 --- a/res/values/cm_colors.xml +++ b/res/values/cm_colors.xml @@ -15,25 +15,20 @@ --> - #333333 - #000000 - #33b5e5 - - #fafafa - #212121 - - #424242 - - @color/primary - @color/primary - @color/primary - @color/white - @color/white - @color/white - - #1a000000 - #26000000 - #75000000 - #8A000000 - #C1000000 + @color/e_action_bar + @color/e_action_bar + @color/e_primary_text_color + @color/e_secondary_text_color + @color/e_accent + @color/e_divider_color + @color/e_background + @color/e_floating_background + @color/e_background + + #FB3846 + #0086FF + #38D874 + #FC7222 + #C8CED0 + #848484 diff --git a/res/values/colors.xml b/res/values/colors.xml index 35aefa5d3..ba6543239 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -15,86 +15,80 @@ --> - @color/white + @color/e_background + @color/e_action_bar - @color/white - @color/black_transparent_3 - @color/black_transparent_4 - @color/white - @color/white - @color/black_transparent_4 + @color/color_default_background + @color/color_default_foreground + #8A000000 + @color/color_default_view_on_accent + @color/color_default_view_on_accent + @color/color_default_primary_text - @color/black_transparent_5 + @color/color_default_background - @color/white - @color/white + @color/color_default_background + @color/color_default_foreground - @color/black - @color/light_black - #8A000000 - #8A000000 + @color/color_default_background + @color/color_default_foreground + @color/color_default_background + @color/primaryDark @color/primary - @color/light_black + @color/color_default_foreground - @color/light_black + @color/color_default_foreground - @color/light_black - - #6000 - - #8833b5e5 - @color/accent + @color/color_default_foreground - @color/white - #FFFF0033 - #77333333 + @color/color_default_primary_text + @color/color_default_secondary_text + @color/color_default_foreground @color/accent - #3F33B5E5 - @color/black - #DD777777 - #FFC5C5C5 - #40000000 + @color/accent + @color/color_default_foreground + @color/gray2 + @color/gray1 + @color/color_default_foreground @color/accent - #ff282828 - #FF2E2E2E - #FF33525E - #FF0099CC - #FFFF2222 + @color/color_default_background + @color/gray2 + @color/accent + @color/accent + @color/red1 @color/accent @color/accent - #ff4c4c4c - #fff3f3f3 - #80ffffff - #8050d060 - #80d05060 - #FFAAAAAA - - #f41e26 - #650101 - #e7e7e7 - #575757 - @color/primary - @color/white - @color/black - @color/black - #009688 - @color/black_transparent_4 - @color/black_transparent_3 - @color/white - - #747474 - @color/white - - @color/black_transparent_4 - @color/black_transparent_4 - - @color/black_transparent_4 - @color/black + @color/gray1 + @color/color_default_foreground + @color/color_default_background + @color/green1 + @color/red1 + + @color/red1 + @color/orange1 + @color/gray1 + @color/gray2 + @color/primaryDark + @color/primaryDark + @color/color_default_background + @color/primaryDark + @color/accent + @color/gray1 + @color/color_default_primary_text + @color/color_default_primary_text + @color/color_default_background + + @color/disable_tab_color + @color/accent + + @color/color_default_primary_text + @color/color_default_primary_text + @color/accent diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 49aa5d599..07b72f3d9 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -185,7 +185,7 @@ 3dp 174dp 174dp - 80dp + 56dp 116dp 116dp 30dp diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index f9b05d9f3..17cf39d6d 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -16,39 +16,39 @@ #FFFF00 - #00FF00 - #FF0000 - #0000FF - @color/white - #212121 - #363949 - #232323 - #333333 - #646464 - #888888 - #232323 - #333333 - #717171 - #232323 - #a7a7a7 - #464646 - @color/white - #c8c8c8 - @color/black - #1a1a1a - @color/white - #4592F9 - @color/white - @color/white - #888888 - #BBBBBB + @color/green1 + @color/red1 + @color/blue1 + @color/color_default_primary_text + @color/color_default_background + @color/primaryDark + @color/primaryDark + @color/primaryDark + @color/color_default_secondary_text + @color/color_default_secondary_text + @color/color_default_divider + @color/color_default_background + @color/color_default_secondary_text + @color/color_default_foreground + @color/color_default_secondary_text + @color/color_default_background + @color/color_default_primary_text + @color/accent + @color/color_default_primary_text + @color/color_default_foreground + @color/color_default_primary_text + @color/accent + @color/color_default_primary_text + @color/color_default_primary_text + @color/gray2 + @color/gray1 #66000000 @android:color/transparent - @color/white - @color/black - #888888 - #3d4040 - #a7a7a7 + @color/accent + @color/color_default_secondary_text + @color/gray1 + @color/gray1 + @color/accent #4d000000 #DE000000 #00FF0000 @@ -65,9 +65,9 @@ #80000000 #80000000 - #A5000000 - #A5000000 - #4f92e9 - #80ffffff - #4592F9 + @color/primaryDark + @color/primaryDark + @color/color_default_primary_text + @color/color_default_primary_text + @color/accent diff --git a/res/values/filtershow_styles.xml b/res/values/filtershow_styles.xml index 6fa76a2af..c3a78b665 100644 --- a/res/values/filtershow_styles.xml +++ b/res/values/filtershow_styles.xml @@ -23,7 +23,7 @@ @drawable/filtershow_button_background center 2dip - @android:color/white + @color/color_default_primary_text 18dip bold @@ -34,7 +34,7 @@ @drawable/filtershow_button_background center 8dip - @android:color/white + @color/color_default_primary_text 18dip bold centerInside @@ -46,7 +46,7 @@ @drawable/filtershow_button_background center 16dip - @android:color/white + @color/color_default_primary_text 18dip bold centerInside @@ -65,11 +65,11 @@ \ No newline at end of file diff --git a/res/values/iconbutton_styles.xml b/res/values/iconbutton_styles.xml index 5e34063c1..0c5f3f373 100644 --- a/res/values/iconbutton_styles.xml +++ b/res/values/iconbutton_styles.xml @@ -19,7 +19,7 @@ 96dp match_parent @drawable/filtershow_button_background - @android:color/white + @color/color_default_primary_text 14dp centerInside center @@ -34,7 +34,7 @@ 70dp match_parent @drawable/filtershow_button_background - @android:color/white + @color/color_default_primary_text 13dp centerInside center diff --git a/res/values/mediapicker_colors.xml b/res/values/mediapicker_colors.xml index 765e8b168..fcf8ecd78 100644 --- a/res/values/mediapicker_colors.xml +++ b/res/values/mediapicker_colors.xml @@ -30,9 +30,9 @@ - #252528 - #DC007aff - #DC007aff - #007aff + @color/color_default_secondary_text + @color/accent + @color/accent + @color/accent diff --git a/res/values/styles.xml b/res/values/styles.xml index d71483025..2a7cfde74 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,30 +15,91 @@ --> - + + + + + + + + + + - + + + + - + - + + + + + + + @@ -61,6 +139,8 @@ useLogo|showHome @drawable/actionbar_translucent @null + @color/color_default_primary_text + @color/color_default_primary_text @@ -82,23 +167,23 @@ @@ -192,7 +278,7 @@ - - + + -