From bdbc746fd2cc47dd98dfb86a8638ab9e78752f7c Mon Sep 17 00:00:00 2001 From: Fahim Date: Sat, 12 Jun 2021 13:13:30 +0600 Subject: [PATCH 01/26] 2834-P-Fix Colors for dark-mode Issue: https://gitlab.e.foundation/e/backlog/-/issues/2834 --- AndroidManifest.xml | 2 +- res/color/primary_text.xml | 12 +- res/drawable/addspot.xml | 2 +- res/drawable/albums.xml | 2 +- res/drawable/back.xml | 2 +- res/drawable/beautify.xml | 2 +- res/drawable/beautify_select.xml | 2 +- res/drawable/bg_vidcontrol.xml | 2 +- res/drawable/camera.xml | 4 +- res/drawable/cancel.xml | 2 +- res/drawable/cancel2.xml | 2 +- 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 | 2 +- res/drawable/drawer.xml | 2 +- .../dropdown_ic_arrow_normal_holo_dark.xml | 2 +- res/drawable/dualcamera.xml | 10 +- res/drawable/dualcamera_select.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 | 2 +- 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_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/more.xml | 2 +- res/drawable/more2.xml | 2 +- res/drawable/multiselect.xml | 2 +- res/drawable/multiselect_delete.xml | 2 +- res/drawable/multiselect_more.xml | 2 +- res/drawable/multiselect_share.xml | 2 +- res/drawable/multiselected_back.xml | 2 +- res/drawable/overflow.xml | 2 +- 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 | 17 +- res/drawable/timeline.xml | 4 +- res/drawable/truescanner.xml | 12 +- res/drawable/truescanner_select.xml | 12 +- res/drawable/videos.xml | 2 +- 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/action_mode.xml | 2 +- res/layout/album_header.xml | 4 +- res/layout/album_set_item.xml | 5 +- 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 | 44 ++--- 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 | 59 +++---- res/layout/filtershow_state_panel.xml | 2 +- .../filtershow_trueportrait_editor_panel.xml | 2 +- res/layout/gl_root_group.xml | 2 +- res/layout/ingest_date_tile.xml | 2 +- res/layout/movie_view.xml | 4 +- res/layout/photo_frame.xml | 2 +- res/layout/photo_module.xml | 2 +- res/layout/photopage_progress_bar.xml | 6 +- res/layout/popup_list_item.xml | 2 +- res/layout/rotate_text_toast.xml | 4 +- res/layout/trim_menu.xml | 5 +- res/layout/trim_view.xml | 2 +- res/layout/video_module.xml | 4 +- res/menu/gallery_multiselect.xml | 2 +- res/values-land/styles.xml | 2 +- res/values-night-v27/styles.xml | 28 ++++ res/values-v27/styles.xml | 26 +++ res/values-xlarge/styles.xml | 1 + res/values/cm_colors.xml | 34 ++-- res/values/colors.xml | 84 +++++----- res/values/filtershow_color.xml | 50 +++--- res/values/filtershow_styles.xml | 8 +- res/values/styles.xml | 156 ++++++++++++++---- src/com/android/gallery3d/app/AlbumPage.java | 12 ++ .../android/gallery3d/app/AlbumSetPage.java | 12 ++ src/com/android/gallery3d/app/PhotoPage.java | 10 ++ .../android/gallery3d/app/PickerActivity.java | 12 ++ .../android/gallery3d/app/TimeLinePage.java | 11 ++ src/com/android/gallery3d/app/TrimVideo.java | 6 +- .../filtershow/FilterShowActivity.java | 12 +- .../filtershow/category/EditorCropPanel.java | 2 +- .../filtershow/imageshow/ImageDraw.java | 2 +- .../gallery3d/ui/DialogDetailsView.java | 2 +- src/com/android/gallery3d/ui/PopupList.java | 2 - .../gallery3d/video/BookmarkActivity.java | 2 +- 135 files changed, 616 insertions(+), 382 deletions(-) create mode 100644 res/values-night-v27/styles.xml create mode 100644 res/values-v27/styles.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index a6be881c1..bd599f63b 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -244,7 +244,7 @@ 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/addspot.xml b/res/drawable/addspot.xml index 5e3064e5e..932400386 100644 --- a/res/drawable/addspot.xml +++ b/res/drawable/addspot.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/accent"/> diff --git a/res/drawable/albums.xml b/res/drawable/albums.xml index 23630a579..079adc759 100644 --- a/res/drawable/albums.xml +++ b/res/drawable/albums.xml @@ -33,7 +33,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> 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_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..76dcf076d 100644 --- a/res/drawable/cancel2.xml +++ b/res/drawable/cancel2.xml @@ -33,7 +33,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> 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..6c324cae8 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..55c1c6f8c 100644 --- a/res/drawable/comparison_before.xml +++ b/res/drawable/comparison_before.xml @@ -35,8 +35,8 @@ + android:fillColor="@color/color_default_primary_text"/> + 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..80405d555 100644 --- a/res/drawable/done2.xml +++ b/res/drawable/done2.xml @@ -33,7 +33,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> 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 49788bf9b..9cb078ace 100644 --- a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml +++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml @@ -35,6 +35,6 @@ android:viewportWidth="24.0"> \ No newline at end of file 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/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..fd9b479de 100644 --- a/res/drawable/filtershow_color_picker_circle.xml +++ b/res/drawable/filtershow_color_picker_circle.xml @@ -21,6 +21,6 @@ android:radius="0dp" /> + 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_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..4643d439b 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"> + 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..4390b8ea5 100644 --- a/res/drawable/multiselect.xml +++ b/res/drawable/multiselect.xml @@ -37,5 +37,5 @@ android:fillColor="#2196F3"/> + android:fillColor="@color/accent"/> diff --git a/res/drawable/multiselect_delete.xml b/res/drawable/multiselect_delete.xml index b3faf7b28..a09691cd7 100644 --- a/res/drawable/multiselect_delete.xml +++ b/res/drawable/multiselect_delete.xml @@ -33,7 +33,7 @@ android:viewportWidth="72.0" android:viewportHeight="72.0"> diff --git a/res/drawable/multiselect_more.xml b/res/drawable/multiselect_more.xml index a8a23dec3..e19f7d49c 100644 --- a/res/drawable/multiselect_more.xml +++ b/res/drawable/multiselect_more.xml @@ -33,7 +33,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml index 5c265c02c..4ee9258a9 100644 --- a/res/drawable/multiselect_share.xml +++ b/res/drawable/multiselect_share.xml @@ -33,7 +33,7 @@ android:viewportWidth="72.0" android:viewportHeight="72.0"> diff --git a/res/drawable/multiselected_back.xml b/res/drawable/multiselected_back.xml index 0e237bfc2..df6c28772 100644 --- a/res/drawable/multiselected_back.xml +++ b/res/drawable/multiselected_back.xml @@ -33,7 +33,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> 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/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..5a862ae1e 100644 --- a/res/drawable/spinner_triangle.xml +++ b/res/drawable/spinner_triangle.xml @@ -1,5 +1,4 @@ - - - - + + diff --git a/res/drawable/timeline.xml b/res/drawable/timeline.xml index 8d6dc37da..21178b0c6 100644 --- a/res/drawable/timeline.xml +++ b/res/drawable/timeline.xml @@ -33,11 +33,11 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> 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/videos.xml b/res/drawable/videos.xml index 406d41dee..1c00962a4 100644 --- a/res/drawable/videos.xml +++ b/res/drawable/videos.xml @@ -33,7 +33,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> 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/action_mode.xml b/res/layout/action_mode.xml index 186ce5ba6..9526f1a17 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -33,7 +33,7 @@ style="?android:attr/actionButtonStyle" android:divider="?android:attr/listDividerAlertDialog" android:textAppearance="?android:attr/textAppearanceLargePopupMenu" - android:textColor="@color/black_transparent_4" + android:textColor="@color/color_default_primary_text" android:textSize="18sp" android:singleLine="true" android:gravity="start|center_vertical" diff --git a/res/layout/album_header.xml b/res/layout/album_header.xml index caae962b3..214bd3ed4 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" /> 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..3804c4900 100644 --- a/res/layout/dialog_picker.xml +++ b/res/layout/dialog_picker.xml @@ -1,5 +1,4 @@ - - + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + - -