From 17ea7ea2ee9423f56b4bb5cd43e77cce6a86ed97 Mon Sep 17 00:00:00 2001 From: Fahim Date: Fri, 9 Jul 2021 17:12:47 +0600 Subject: [PATCH] 2834-Q-Dark-mode_implementation issue: https://gitlab.e.foundation/e/backlog/-/issues/2834 --- AndroidManifest.xml | 2 +- res/color/primary_text.xml | 12 +- res/drawable-night-hdpi/rounded_mask.9.png | Bin 0 -> 4115 bytes res/drawable-night-xhdpi/rounded_mask.9.png | Bin 0 -> 381 bytes res/drawable-night-xxhdpi/rounded_mask.9.png | Bin 0 -> 3917 bytes .../photopage_bottom_button_background.xml | 4 +- res/drawable-xxhdpi/rounded_mask.9.png | Bin 579 -> 722 bytes 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 | 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_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 | 2 +- res/drawable/multiselect_more.xml | 2 +- res/drawable/multiselect_share.xml | 2 +- res/drawable/multiselected_back.xml | 2 +- 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/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_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/gl_root_group.xml | 2 +- res/layout/ingest_date_tile.xml | 8 +- res/layout/movie_view.xml | 4 +- res/layout/photo_frame.xml | 2 +- res/layout/photo_module.xml | 2 +- res/layout/photo_set_item.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 | 101 ++++++------ 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 | 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 | 5 +- .../filtershow/FilterShowActivity.java | 16 +- .../filtershow/category/EditorCropPanel.java | 2 +- .../filtershow/imageshow/ImageDraw.java | 2 +- .../ingest/ui/MtpThumbnailTileView.java | 2 +- .../gallery3d/ui/DialogDetailsView.java | 2 +- src/com/android/gallery3d/ui/PopupList.java | 2 - .../gallery3d/video/BookmarkActivity.java | 2 +- 148 files changed, 597 insertions(+), 374 deletions(-) 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/values-night-v27/styles.xml create mode 100644 res/values-v27/styles.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bb731e2f7..0f854519d 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -247,7 +247,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-night-hdpi/rounded_mask.9.png b/res/drawable-night-hdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d107f54dc0e3dabe502fc50140b77ae9f0823fa5 GIT binary patch literal 4115 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 bMah9Lsr)2`$2hvB00000NkvXXu0mjf&>o|i 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..809050b7574bcd6fc3c3993af8578d776de2bbb3 GIT binary patch literal 3917 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 beRTQ)?*+Nfc - - + + diff --git a/res/drawable-xxhdpi/rounded_mask.9.png b/res/drawable-xxhdpi/rounded_mask.9.png index 987a1423590d8b3bf649c12c50cb51e62f4077b9..2f57d5fcb1ec1f6aa5fb574924818e699cb8e38c 100644 GIT binary patch delta 698 zcmV;r0!9791kweNB!8JnL_t(|UhSN_ic~=mh6gW+U?AcHn46gDBN&?a2>Jj%f?#YW z2%?EEV7{5TiD2Rz7^sPXaO`ikYM5&K>{QQXJ#*&&px|s*b#>Jr?6UM_v6vo%+4L9= z%eP`Lian^;-4$|LZq_&$EaeOCo8QIW7JC?5I~=TKYqIuUA%DFuvM+uXds*yGY~%7^ zZL5J=_5x`=`L6sa_Nv(JSoZ&eTC65&+X>Qn(p~se>|QK$I#8R{xHY8lWZS^+g6FZU z=|Zhmb2m))B)#xg=6)Lyzd>Jv8cCN41_=&f$HhAyjt#`N=n-mJ$_2=m}EJ{P+Y zQ_l~2v|gJK;(;xG6uTQ!&KG*Mp8o;22eo({Q_UZGu0;S`9#HckrZ^qwy%vLEcdqk& zn9x7Bmkqs}1}hkL=Q>a0)YAhE)&*h69nP0xSK_qO1Ah%nizN)X!+8>?oGxfFCe+s$ zD$t}Q)Uy~S(4-dXSFxKhOrQzc@aY5ZV~B7}o0U+HqFXqo%}S_i(JdU)=3FST5ebz< zLM4$NT?(dDv5+jBB7EHq)$ delta 554 zcmV+_0@eM}1;Yf8B!3D?L_t(|+U?vuP6AO7!0`!SV?tpF2e7xXg(FbXa0EGkM=-Ir zGchsJcmaDmdm9rPZa^V66eKv4Jalnc_5;>^yZfJHT6ps#EFo`ZMEr}jOAk+$Z_G4r zG&~$75o)D*r`hr7 zanf;TTKNL?rg}C{mNWQ$->T@xsc2Yj$AWs%Y*rYm>1sR(>Rt0xDjrs&t2GnU zr{=lTB&=3fbAM{6q0}s_=Cn}HQq!>7lS0jX`g2>*pXqrLs4J;?m_Z!Whh_t)b;DUi zLXCvjn2e&JrtpNYrn{iV(1f7If1$oK+t7rd+GZ1kn!pl?H3>ouAc=$;1fg1xL_)R1 z*PCk}y&wPzD4>7>3Mc}o>`-U{#a9m~pnw93017CefPX3z6qgHogo2j~TvzRd+Pbdd z0yG+G>jIQ3_1#FJD|MPQc0-M6`$+~hrI9QiX+&#cJW_0HBF(Ontl5?J=@jkLG~_el z5sNfrXeb^j^Ux4uXbd)PAsuC~kx^NOuk#tcW}H7I6bm9)Il>Z~O^t;tv0*I|i?&$Z s#xg)xLnEn{0akmxr2H-kC3mNM13z#YmILQmEdT%j07*qoM6N<$f+th}eE + 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..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..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..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_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 4be6b4b7e..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 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/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/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..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" /> + 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/movie_view.xml b/res/layout/movie_view.xml index 2679e38e8..b76ba9c6e 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" /> 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"/> 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-v27/styles.xml b/res/values-v27/styles.xml new file mode 100644 index 000000000..4cea28544 --- /dev/null +++ b/res/values-v27/styles.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + \ 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 4d84f0cda..2ab701cdc 100644 --- a/res/values/cm_colors.xml +++ b/res/values/cm_colors.xml @@ -15,27 +15,19 @@ --> - @lineageos.platform:color/color_default_foreground - @lineageos.platform:color/color_default_foreground + @lineageos.platform:color/color_default_primary + @lineageos.platform:color/color_default_primary_dark @lineageos.platform:color/color_default_primary_text + @lineageos.platform:color/color_default_secondary_text @lineageos.platform:color/color_default_accent - - #fafafa - #212121 - #CC000000 - - #424242 - - @color/primary - @color/primary - @color/primary - @color/white - @color/white - @color/white - - #1a000000 - #26000000 - #75000000 - #8A000000 - #C1000000 + @lineageos.platform:color/color_default_divider + @lineageos.platform:color/color_default_background + @lineageos.platform:color/color_default_foreground + + @lineageos.platform:color/color_default_red1 + @lineageos.platform:color/color_default_blue1 + @lineageos.platform:color/color_default_green1 + @lineageos.platform:color/color_default_orange1 + @lineageos.platform:color/color_default_gray1 + @lineageos.platform:color/color_default_gray2 diff --git a/res/values/colors.xml b/res/values/colors.xml index 6715375b2..9905bfe8d 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -15,83 +15,76 @@ --> - @lineageos.platform:color/color_default_foreground - @lineageos.platform:color/color_default_blue1 + @lineageos.platform:color/color_default_background @lineageos.platform:color/color_default_primary - @color/default_background - @color/default_background - @color/black_transparent_4 - @color/white - @color/white + @color/color_default_background + @color/color_default_foreground + @color/color_default_secondary_text + @color/color_default_primary_text + @color/color_default_primary_text @color/color_default_primary_text - @color/black_transparent_5 + @color/color_default_background - @color/default_background - @color/white + @color/color_default_background + @color/color_default_foreground - @color/black - @color/light_black - @color/default_background - #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 - #808080 + @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/default_background + @color/primaryDark @color/disable_tab_color - @lineageos.platform:color/color_default_accent + @color/accent 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 98d0287d8..25845a3ea 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,35 +15,91 @@ --> - + + + + + + + + + + - + + + + - + - + + + + + + + @@ -66,6 +139,8 @@ useLogo|showHome @drawable/actionbar_translucent @null + @color/color_default_primary_text + @color/color_default_primary_text @@ -87,23 +167,23 @@ @@ -197,7 +278,7 @@ - + +