diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bb731e2f7e3c18dae7cb75b6a0dd734a6f051f07..0f854519da63369817bc529ab7ccb6ab67458ef8 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 e9fdf7b8b0630091c4629bfb1185b4fcf7f2c653..2f94489c54c1cc62460407c9adf7ed4f823e8143 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 Binary files /dev/null and b/res/drawable-night-hdpi/rounded_mask.9.png differ 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..37ac9b53cbb2556540a4fadff125629d120dca80 Binary files /dev/null and b/res/drawable-night-xhdpi/rounded_mask.9.png differ 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 Binary files /dev/null and b/res/drawable-night-xxhdpi/rounded_mask.9.png differ diff --git a/res/drawable-v19/photopage_bottom_button_background.xml b/res/drawable-v19/photopage_bottom_button_background.xml index 78571dafeaef421adca17b0657863c721072bb57..5fa542712832779319d9124b0704cd7e8de10ccc 100644 --- a/res/drawable-v19/photopage_bottom_button_background.xml +++ b/res/drawable-v19/photopage_bottom_button_background.xml @@ -1,5 +1,5 @@ - - + + diff --git a/res/drawable-xxhdpi/rounded_mask.9.png b/res/drawable-xxhdpi/rounded_mask.9.png index 987a1423590d8b3bf649c12c50cb51e62f4077b9..2f57d5fcb1ec1f6aa5fb574924818e699cb8e38c 100644 Binary files a/res/drawable-xxhdpi/rounded_mask.9.png and b/res/drawable-xxhdpi/rounded_mask.9.png differ diff --git a/res/drawable/addspot.xml b/res/drawable/addspot.xml index 5e3064e5e031903a16b739d8fd935257c6b0aad6..9324003866586283cc4dfcf281324f6f82b76ab5 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 23630a5793edc7546ec4b3bec99d31d0b3bfe382..079adc75942231df78e45c69c5b4c116b233504d 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 051e5b9c9c29d08300b0237ebd3c6656dc2b5da9..ed46a9fc855bce5f16fe3d3695da8990b77721fa 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 6962bc649cdbb37de0979c5bfc4da34ce5439e04..275d225f9708f2b99f29b98bdd65be3fa13bd0d5 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 68cff5887237f538cf5b8f434a85ed7debb04cb4..27e6ed730127766382ff2c001e9cc7e22bf99be0 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 9ce9f6ad09349a3fb5b9cec40ee2e84c8a5d5928..419425c870766dcef0722c1a7f8e3865bcac6bdd 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 6249f89681b57f7293ff54839ad8c71d5c542e5f..e26b05c5f2f8ea6af482fa7f0d1f14e91fb78488 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 335e609303aed335d044a3b5d8b3fc335b562f7f..dd87ea0131ceb6fc7df13896ca83f9d298469ec8 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 82eaec1edfea6d69d94da2c70c3e4cdf9e8c9f34..76dcf076d06bc97a0a66ae410281e228ef25dda3 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 d2dc37e26287a4b0efbecf314f7929d27e247077..072f892fdd1c65790d1d5fb51d2c987a089d101a 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 79d107021a7ceaa12386a530c75757aaa1542178..43a49b88677fae55eb1ef323685dffb668212901 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 262aa4155c9c15c4b7c1023cecbefc3499f82b0a..5c51a022c3597f79b8ddd765cf519b847ce08445 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 5066cd987bacb8c4103267268e4fb8d60285f0ee..840523bbf9486e6a358a799147f474fac7648719 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 25ff649680d1fba3824f378b9a3dc62f33f7161f..d0ce475e94a9313989347978c72bc725a5fcd56f 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 332eff7e7753f6a0d5527de7a393c072f3f0136c..be3c39176381bed7f61b0cd0970eb112b1e82b7d 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 89287071413b77097ea5b5e282610fd0a60de6ad..5d605b97173d8afd605d0599c7dedf9aabda372e 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 0272da20dc78f9d1a174370c56d942b1230b6716..ec0d3d59f1e8c29ed019f1f5d5301408a8af7347 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 eac62fb247dbaafb503582b8429c65b184e1e487..a04c854d88743c14aaea270a87a029538222057d 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 f24699731c789d132123c0ac9ef8b0ac29766e02..d6084e013b460a8d1dc064f4c5ca663679f69b99 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 91eef6c0c41ba5af62280d71a3864bf903fa0dea..dce12c276f876cea3b4c9bd74299941027d882e2 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 3bb0f7694d2681c91cce78bbcd663d6cdc114a9d..189a24755b485ba4b123621062bea5117fce098a 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 8caf459e463efabda7fdfe6d35a59c7d7431cbf0..801339dd14df6e76673dddea1dab502e42084c62 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 f2a8269f9e6871fbdf5a9470e81036299b46e6b8..f06a4ea102fd82507cd220e02faf5f13ebf34cdc 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 9fda1f4840844391cb0c6165493db45a90d70572..c66441ffb7a08ffd756ff7759f63e6e8da0be301 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 1285cb91638d9db6ba3a1efa50dcbecb581d471b..55c8ecd453668716ce5c14e9e7b3b9bc3c9a18c2 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 439357c61b79d85b021e818503ecb4e48b882265..6eb431bb347607749a88af9ff35a1d4f0808fc10 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 76d5f561b9e312ffc8c3fd82f8833db6fe463050..80405d55530b2eac63c8b16b78b1e88bee0587e0 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 e0a8061c8df7995a1cfd53082a08d63a151c84a0..9ec65c43ea86ade747ab5ab751fbff23e3a11b8d 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 49788bf9bce75a22567a70f044fb7972de93569e..9cb078aced12961d67433b63c5c1180ab8cf6a4b 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 7bfdc46be6230eb8b3548891d8dc00dffb7b490c..255181f44084cb76d44c45de7a598c41426bc98f 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 9835120b3390c20ef0dcdb04a45b1d0a3207025a..85976538d16c9f0d6136125eee20267c0f41a702 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 b28d23ef285e3152044f7fa777d37e4078b0ee05..cd8fe38c79120bb9abceaa7071652931942ac8a2 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 ad0a64f4f5bb3512a4c28d3d7efa9f1243a93e29..1c9353d3f663c5f5221d65209f45d02ca4c8c3e8 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 7386e4c0185e8e65a233abb892dd7bd1505e4758..47630d8b0ab07f018e4e76ce27b3dc89d3964dd8 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 ee8a92dd9ea898aafac30b63e5a66f5026dac435..dcf85bb7c847532f3478b0f9e2ee1a2968ae817c 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 1457a68ebbf8220ce06b010bc15653c90fc4df5d..1057a2a2735bc76948446d3120225f9489a29b8c 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 f668e4dcecb7dd53d923f0d46f85dd5274047bf9..1c9975c31b7045e636b3180ff174bc9aca222de2 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 6fa77e7ccd790bedbb7fb856c71d3b9fb93f6ad6..85c52df5f20383092aab1a242541542acdbac21f 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 0b157ac8a53029a5a5d10cd6971bafb7d138198e..0979048590e9a8cfbccbca48566a6f116dbf3be5 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 aaab4e40ef01b3e65293404c173a161ba8be808a..a21bf22278f6d3f1c2868196fe41fbc400cc6a84 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 a867cace49d1f6663e0b130c139c0dfcb1fa18cc..8191c9b5f14d89f443c7a7ab6c58797e8ea90067 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 51e024b425ecd1e9115fc708d3264aae60966a42..34668a2fd0f15a3bcf49ff01ab543cd8c8cdcba7 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 1493b49b1aac8b548d8c37f06956169ee0de20af..64948ac708d6ab1fee0314d6e9f2750aa2ac7494 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 d58c6d7425cbd13b87508c04cf6f6873904710f8..e58e93283095598ceb85c8bb8c51f2059764607e 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 1904d8b6847df1bcba6d9aed56f297a5c3816445..773face4d7e5c483b765ade6c625ce9ea0dc095f 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 1c579413ff77398ce3e082180bfb6b0653c90e4b..40f4d0b1f66d7d1c52655b7361ccfd8e0805d9f7 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 bed9457cd7bdcb044867c43dd81d6915655c49fa..bf1b2eba7220305817e8566c984cd98e820156c0 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 d430b60606b26fb4deaf47a753ef1e9775ce142e..1ff7d8d62732765d5052a4e2a0bc25a0748a1514 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 736c66bc485cc22aea2f02775ec4c987fd66363c..49c1989fd131ba0d2c7ec73c4269b8aea7bcd24e 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 9a0b9d8c5c55d38b3afdea4161019ed592e8ad91..4bd3a2a25694afea6f094ff8949b73c976224326 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 d1477ab8886ee5121514a02a38c5757863be9210..ebda354aa95c4192ca03d20242ecf5850aa61822 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 4be6b4b7e30c9d08c21f17fe1acb2d8f1135ba47..c64abf3dba458f22420689cdf097300439fd5237 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 8675d8fdf5940bbd3f59e855aba216a4fcd750bd..1337277ee3aafc5b82b9c9c56a3987161a7efb30 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 053507d8676d5f5484f9c211f15c1c430e7d7740..da17ec46d610eb9208898fc26db31db9a69425cf 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 b3faf7b287a4ecc5395bfe598704057f35347cef..a09691cd7c964acf105aab75eca7e946e4509d8b 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 a8a23dec32857181bc218b114a237c3fadf0ae5d..e19f7d49c40d9a7a5a8d3f52a6a99582ae26c32b 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 5c265c02c3ecfb4c63dc53582a6befdcbb526b6b..4ee9258a9e296c6dd35d3252fe29e27556afe78c 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 0e237bfc216d5556795e348970736643306a7d10..df6c287721194299fd093b484a5c4631cd2eb8b0 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 15d6b53124bf400803fc4e4593a2849a26e3a5e4..387bd43f7132d08a814d84bb0a018be69d13754b 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 0c772ad215cb254057b397e2408a0efa69ef459c..5fa542712832779319d9124b0704cd7e8de10ccc 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 317fa4edeeeae617423f0881697de3ca0e6d1c8d..74dc30997d460514fcd8c1545abbcc41a4f141bf 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 0ce3de8783ce6dbcd2178d8d9baad7addadacdf0..f7d435ec3095fb00aebec3e5cc433f56257a2e60 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 204c9259e3e4a8e79bf9c2584c4388a2d2884486..5abe20b8f04469bc216e572b1375dcbc3a72943a 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 5c2b541ab908c6380f3a018dad3412efa7cd1427..3824670511fed5a9705064f39b20af055971cb3e 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 dfe8c9c6980643c2ddf9d86c5acfa408f20be637..95d361f5a32e419327155c211e8aa3d16da09bb1 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 100005962bd0a8b807991239edb0dbfb750bc3e0..77c550f3d013c6d429a06afcf1baf4e342520970 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 8d6dc37dabd4befc6b911a6527fbbf4f60529574..21178b0c68679e16e30ae7c0a813858756e321e4 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 c79f585011d570934c928bc35352e7d0fd966dea..23f7792e080839e2f2b32f5cfda7114943e49680 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 382c14e553e481d9c2df6bd4813e28722b24edc8..63018862476a3dbf74f04fd06ab6e79f5251ccee 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 406d41dee3456ca4514c01b76025ed247a1766ba..1c00962a4accb8ba520aa5596255b7456c10ffec 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 c355ce52f3c02d2b4dc3e820fd625fa8d724febf..1fc62665047b1780ebcb4e5aa4fd59460c0c1aeb 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 6003b73893ce8bbbd0d6bf1c4985815938d9e9f2..ce23c15a61b278796c0d5adf3d2cfdfa87da2ca5 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 7a24f7dc78f2b65eff322cd53062dee3c7812769..81d8b1b49d59c960a1f96dd89817c3e27121576f 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 186ce5ba67ad6b584efda8a788554abd5b3ac2d8..9526f1a17eb23ac8ac25561fb8856f851aaddbfd 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 caae962b3fc2553ab384731f5ef64cd374af3451..c737d40a716b9c965411298b6f7b9046be098e76 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 ad0e0db2070578f0d43b068e98ad015dea988e25..37793c2d6284fa383a3a907997e8d1670fce43eb 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 8282d39af7362fb92cd02e4ba328840c9043a3c1..23507f9deb3e7ae9bf3f1eebad72f8e4cd4eb354 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 7230addd741dd03ec58a2e18f63a542816f7dbd0..78c4ba65cc8925723a062605bd4d218b5d571614 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 1a314ad563df1cf64ace305178d6ca57c22e977c..160802d151a80b1834058a2064ee3ea94056aee6 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 fc5f2877aba08b99dccb7cc5c3c15da4a6f4bbaa..a8220df2cf277116032d612620417a84eb88ada6 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 bee76560437cef5e89d9faa290a613afad6475da..4173ae45b4a00d099475b042ba9b6303dbe0485e 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 a71e933abf558d87ec0b0a8061b455b0e39d80a5..4406bc8eea8089bdfb02ed063483653aa9ab514c 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 48ed3b3979aa86e2d698e781c1657081935ae968..fa2624aa5bb267df7d1fe4dfaf69043a82052e3a 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 50515d6ac5d2caa5b109c265f79b3c202cacc964..7f6183a622660fdde7990aa61331d7fba29bbed2 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 65be0426337ccc7074b52f29274b7e630d71f072..70532cce9f54070d4a6fc95b03d002e02700ba52 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 4f3177051e53604675a99da84536352924e75e2a..dcb1b38c3b9ea8ae017023a6a7dc8027aed87bc6 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 971260bdf01ff2fa2c27aba34ee847e0d2698438..1a688d589c5dc770582f65b39dcc287295978146 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 992d05a853ab8b4d76302a327af1ea56e059dfac..fbc2ad0ff960b2455670f2c15df3263c5fd1ef16 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 68754e2ba63cd02185a3ea9170154438f30265c8..faa68a4644b551bc68dda1d01211707151965caf 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 bd3e47928bf1cb5fc507485243c79b6085a7be20..b1f147f42a7c646eeb0d845ac01ccc6f12b5bedf 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 13b8212acf13994f39e8766a836e2bc08e255208..b10fff98bfb0e754e7fc36c32a7f2278dcf5ac33 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 b042213616a6e21630198bec8feaf44eaef980ba..8f627846d2749fc167c57a881b00c5e9314984a6 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 2679e38e857066a3514fc1b151d2ea0af93b1f14..b76ba9c6ed2fff578a2d8f16b7a0c092adaa4f58 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 79a0f880806cc068c015be02b8e72f23ff76b75d..712094dfe3c8df5a6d9bf39143f737c4f06f9899 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 c95c719c1cf2d07a3e31c3e839e538668f4476e1..4a837fc64eccd4a23bfc0740c4a80f0c8c487470 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 cee058d860e5d9ab767e6be8dc967ca0e54bbf4e..f0b74bfbd8b131f762d4ea0f685811015407a779 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 0000000000000000000000000000000000000000..4cea2854436104f100646a652da88d774f0b3b2f --- /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 55b29b1faf7441915987de0c15475752962993bb..3e95e934d88e65107f6a4d4c99bca470354b1c62 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 4d84f0cda6ede18e8cecb0902e2db844fc7c4d96..2ab701cdc64a1de9429d8edf857ad460e8c12047 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 6715375b2562f2901e44d7c83fe8d53975df0a61..9905bfe8d9ce900859938cd3d4e11c7627320808 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 f9b05d9f3939d0a11f2dd2258dd085142cb54a71..17cf39d6d270accd3bc4ecadb9a61d1e2608ebab 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 6fa76a2af9ca5a70a920bd3218d6bdf255db99e2..c3a78b6650ec61e1bc0b2968852f9bcb2dcf6f45 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 5e34063c1c2f20e5011a14313c62b6397cf3c8fa..0c5f3f373ba8aafe9ed953eefc5dd070693f1f5c 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 765e8b168d4fb3ab74373b5794201c4f19ad0ddc..fcf8ecd7842d3a7e695602805b945d7a6df9fca3 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 98d0287d856e23582d038faa2c839e4c510f1922..25845a3ea6c81386ee9e04e436a21ec49b0ba9e6 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 @@ - + +