diff --git a/Android.bp b/Android.bp index 9446144e155af28233e3b4a88d6f7a328dfa96cf..a4149cf0a3ab63ea3204bd3bde4fedc65b4c742f 100644 --- a/Android.bp +++ b/Android.bp @@ -6,7 +6,6 @@ android_app { name: "Gallery2", static_libs: [ - "com.google.android.material_material", "androidx.annotation_annotation", "androidx.fragment_fragment", "androidx.heifwriter_heifwriter", @@ -16,6 +15,7 @@ android_app { "com.android.gallery3d.common2", "xmp_toolkit", "mp4parser", + "elib", ], srcs: [ diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 68719102b5d0f11ddee9eed3afe1392050ef3bc3..3965865f4f7f9cc8d8c7e5647666a695b49993e5 100755 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -250,7 +250,7 @@ diff --git a/res/color/bottom_nav_color.xml b/res/color/bottom_nav_color.xml new file mode 100644 index 0000000000000000000000000000000000000000..f6aec0b9a1d4d3a0292967e941bde2cb62df2313 --- /dev/null +++ b/res/color/bottom_nav_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/res/color/primary_text.xml b/res/color/primary_text.xml index e9fdf7b8b0630091c4629bfb1185b4fcf7f2c653..2f94489c54c1cc62460407c9adf7ed4f823e8143 100644 --- a/res/color/primary_text.xml +++ b/res/color/primary_text.xml @@ -16,11 +16,11 @@ - - - - - - + + + + + + diff --git a/res/drawable-hdpi/grid_pressed.9.png b/res/drawable-hdpi/grid_pressed.9.png index dff62c7ecb30ccc30ad4519f91e8e69e49aa05fb..02d5dd2d1128e8349c0c16b09fb1a39d50d60e41 100644 Binary files a/res/drawable-hdpi/grid_pressed.9.png and b/res/drawable-hdpi/grid_pressed.9.png differ diff --git a/res/drawable-hdpi/grid_selected.9.png b/res/drawable-hdpi/grid_selected.9.png index d8867ace6ad6cb24f830c28eb11907e099c0c5ae..02d5dd2d1128e8349c0c16b09fb1a39d50d60e41 100644 Binary files a/res/drawable-hdpi/grid_selected.9.png and b/res/drawable-hdpi/grid_selected.9.png differ diff --git a/res/drawable-hdpi/rounded.9.png b/res/drawable-hdpi/rounded.9.png new file mode 100644 index 0000000000000000000000000000000000000000..503ffe083a8fc8a7762c0979d806a7254b06a346 Binary files /dev/null and b/res/drawable-hdpi/rounded.9.png differ diff --git a/res/drawable-hdpi/rounded_mask.9.png b/res/drawable-hdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..9cd8ee44659f97ad294c195c981a957c18eb5935 Binary files /dev/null and b/res/drawable-hdpi/rounded_mask.9.png differ diff --git a/res/drawable-hdpi/rounded_overlay.9.png b/res/drawable-hdpi/rounded_overlay.9.png new file mode 100644 index 0000000000000000000000000000000000000000..15460a343d1a17c5328b6fd5bba754500547e025 Binary files /dev/null and b/res/drawable-hdpi/rounded_overlay.9.png differ diff --git a/res/drawable-mdpi/grid_pressed.9.png b/res/drawable-mdpi/grid_pressed.9.png index 68a957f2168c0071ff19c618a941f26a554b4e85..bd4a00593be9936e52268530c6199612b4178a63 100644 Binary files a/res/drawable-mdpi/grid_pressed.9.png and b/res/drawable-mdpi/grid_pressed.9.png differ diff --git a/res/drawable-mdpi/grid_selected.9.png b/res/drawable-mdpi/grid_selected.9.png index a7296363296c6acd68013b978f5fa27f3f2d6e1f..bd4a00593be9936e52268530c6199612b4178a63 100644 Binary files a/res/drawable-mdpi/grid_selected.9.png and b/res/drawable-mdpi/grid_selected.9.png differ 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..6ab5002b6cad9d298765537e33e7f79b36a861a7 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..e163625d33b582d80bca227bbecc6bf724dc8464 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..8f48eb4a20925df5b1dd113f3282bbdf05f2065a 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-xhdpi/grid_pressed.9.png b/res/drawable-xhdpi/grid_pressed.9.png index ea317b50d00c30b18755872ee46e4a6480cf04df..2cf12edbf04ad7088cffc31d92437b54f7a7f71a 100644 Binary files a/res/drawable-xhdpi/grid_pressed.9.png and b/res/drawable-xhdpi/grid_pressed.9.png differ diff --git a/res/drawable-xhdpi/grid_selected.9.png b/res/drawable-xhdpi/grid_selected.9.png index dec94ce081492bb3d98528b0971161d74f6e4e63..2cf12edbf04ad7088cffc31d92437b54f7a7f71a 100644 Binary files a/res/drawable-xhdpi/grid_selected.9.png and b/res/drawable-xhdpi/grid_selected.9.png differ diff --git a/res/drawable-xhdpi/rounded_mask.9.png b/res/drawable-xhdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..acbe31366c6cbdf811ae45abce054da8bb14439e Binary files /dev/null and b/res/drawable-xhdpi/rounded_mask.9.png differ diff --git a/res/drawable-xhdpi/rounded_overlay.9.png b/res/drawable-xhdpi/rounded_overlay.9.png new file mode 100644 index 0000000000000000000000000000000000000000..cdea9186ef762a065b541955e0dad2a8881263c5 Binary files /dev/null and b/res/drawable-xhdpi/rounded_overlay.9.png differ diff --git a/res/drawable-xxhdpi/rounded_mask.9.png b/res/drawable-xxhdpi/rounded_mask.9.png new file mode 100644 index 0000000000000000000000000000000000000000..d63d090a69a71a2c85d1f699146efaf11e89f7a2 Binary files /dev/null and b/res/drawable-xxhdpi/rounded_mask.9.png differ diff --git a/res/drawable-xxhdpi/rounded_overlay.9.png b/res/drawable-xxhdpi/rounded_overlay.9.png new file mode 100644 index 0000000000000000000000000000000000000000..4f40a2328b5edf49926b2a8960f1e6b93f5ea6bc Binary files /dev/null and b/res/drawable-xxhdpi/rounded_overlay.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..1cbef0f4695b509bcba3d570e29cbbbd42fcbab3 100644 --- a/res/drawable/albums.xml +++ b/res/drawable/albums.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z" /> diff --git a/res/drawable/back.xml b/res/drawable/back.xml index 051e5b9c9c29d08300b0237ebd3c6656dc2b5da9..7c43a9e80241c70fa5254871b6492de51d6653f8 100644 --- a/res/drawable/back.xml +++ b/res/drawable/back.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/beautify.xml b/res/drawable/beautify.xml index 6962bc649cdbb37de0979c5bfc4da34ce5439e04..9453d6d8c211f5612b8d9266da8a3c319839972a 100644 --- a/res/drawable/beautify.xml +++ b/res/drawable/beautify.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_secondary_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_gallery_image.xml b/res/drawable/bg_gallery_image.xml new file mode 100644 index 0000000000000000000000000000000000000000..5ffa21624b75124c2a9c9dd0fb206a1f1af99b83 --- /dev/null +++ b/res/drawable/bg_gallery_image.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/res/drawable/bg_vidcontrol.xml b/res/drawable/bg_vidcontrol.xml index 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..a142ebffed705deea896f29902c81c735d7190c1 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..4f8aae7c222d451bd71252b6a1455b6fc0da1c54 100644 --- a/res/drawable/cancel.xml +++ b/res/drawable/cancel.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_primary_text"/> diff --git a/res/drawable/cancel2.xml b/res/drawable/cancel2.xml index 82eaec1edfea6d69d94da2c70c3e4cdf9e8c9f34..4303539fad49afe04e46afff77f040abc2c3ce95 100644 --- a/res/drawable/cancel2.xml +++ b/res/drawable/cancel2.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z" /> diff --git a/res/drawable/color.xml b/res/drawable/color.xml index d2dc37e26287a4b0efbecf314f7929d27e247077..65a139fd73e2daaf5d42f296b21df783aa0b4f47 100644 --- a/res/drawable/color.xml +++ b/res/drawable/color.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_secondary_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..53dbd3ee6d0aac3baf27e666a4cf5476eecd8d7e 100644 --- a/res/drawable/crop.xml +++ b/res/drawable/crop.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_secondary_text"/> diff --git a/res/drawable/crop_1_1.xml b/res/drawable/crop_1_1.xml index 332eff7e7753f6a0d5527de7a393c072f3f0136c..78aa893f06699cc130656a88a2c3b484419908cb 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..7ad3c523e9ef9d5652e537ea9c25f40472670b88 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..c21948468b13cb4f90c1d2efa8871af69cddb044 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..eb6ae9bdc4ce4b22470b6b6d0ebd3077257727af 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..6d924bdbd850b9c910241d3f37d623aaa120a5f8 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..22d6f4017cc04f46aeba6746b03e56df2f78d8f3 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..665b95415424774020eb7b5e15934128d0ba0e9e 100644 --- a/res/drawable/delete.xml +++ b/res/drawable/delete.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_secondary_text"/> diff --git a/res/drawable/done.xml b/res/drawable/done.xml index 439357c61b79d85b021e818503ecb4e48b882265..7c7de6cdd7b8ef6b661b89ba49afd69d9bac51ea 100644 --- a/res/drawable/done.xml +++ b/res/drawable/done.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_secondary_text"/> diff --git a/res/drawable/done2.xml b/res/drawable/done2.xml index 76d5f561b9e312ffc8c3fd82f8833db6fe463050..0c95d7504a48db97e7e74e866c26c7b65a9f2c44 100644 --- a/res/drawable/done2.xml +++ b/res/drawable/done2.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z" /> diff --git a/res/drawable/drawer.xml b/res/drawable/drawer.xml index 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 f3dee7696c4ea9fab587e71cc0d5a9860c85a097..d5c938c07acbf4c767c4889b9e000b76fb74006f 100644 --- a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml +++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml @@ -34,7 +34,6 @@ android:viewportHeight="24.0" android:viewportWidth="24.0"> diff --git a/res/drawable/dualcamera.xml b/res/drawable/dualcamera.xml index 7bfdc46be6230eb8b3548891d8dc00dffb7b490c..5ccb8fbd1ed6856ee8f3c3e645231e06c1b0a3b8 100644 --- a/res/drawable/dualcamera.xml +++ b/res/drawable/dualcamera.xml @@ -5,17 +5,17 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_secondary_text"/> + android:fillColor="@color/color_default_secondary_text"/> + android:fillColor="@color/color_default_secondary_text"/> + android:fillColor="@color/color_default_secondary_text"/> + android:fillColor="@color/color_default_secondary_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/e_ic_album.xml b/res/drawable/e_ic_album.xml new file mode 100644 index 0000000000000000000000000000000000000000..4ff968a9f8c8a59e27284cbb893c45f56004e500 --- /dev/null +++ b/res/drawable/e_ic_album.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/e_ic_timeline.xml b/res/drawable/e_ic_timeline.xml new file mode 100644 index 0000000000000000000000000000000000000000..ba272ae05abd7a099290398e303bea132e104f7c --- /dev/null +++ b/res/drawable/e_ic_timeline.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/e_ic_videos.xml b/res/drawable/e_ic_videos.xml new file mode 100644 index 0000000000000000000000000000000000000000..98f9f3b6e2ecf0748f988b51097919abc74dfbfc --- /dev/null +++ b/res/drawable/e_ic_videos.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/edit.xml b/res/drawable/edit.xml index b28d23ef285e3152044f7fa777d37e4078b0ee05..56151dbd7d06ae3fb6caebd8550d85624492099a 100644 --- a/res/drawable/edit.xml +++ b/res/drawable/edit.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_secondary_text"/> diff --git a/res/drawable/exposure.xml b/res/drawable/exposure.xml index ad0a64f4f5bb3512a4c28d3d7efa9f1243a93e29..a08e12b6a729480992b4e70b9b8175fe8bdcb5be 100644 --- a/res/drawable/exposure.xml +++ b/res/drawable/exposure.xml @@ -34,5 +34,5 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_secondary_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..e4962622192a6fec2096c58594dd479aaf05da01 100644 --- a/res/drawable/frames.xml +++ b/res/drawable/frames.xml @@ -34,11 +34,11 @@ android:viewportHeight="32.0"> + android:fillColor="@color/color_default_secondary_text"/> + android:fillColor="@color/color_default_secondary_text"/> + android:fillColor="@color/color_default_secondary_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..914a5c72270c81f849bb8240f2ae93911da32436 100644 --- a/res/drawable/hazebuster.xml +++ b/res/drawable/hazebuster.xml @@ -34,26 +34,26 @@ android:viewportHeight="32"> diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml index ea21fc00125f3e1a51e7409ab482eb5738ca427a..5ec6d62982ea4e84e37531e8eacabbb9e1b05d22 100644 --- a/res/drawable/ic_launcher_background.xml +++ b/res/drawable/ic_launcher_background.xml @@ -1,27 +1,37 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - + + + + + + + + diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml index 665ce950f573182c14ce6202fbf6ce2fad3c4230..37acb11994561ee867bbc4e171a25493cfea30e4 100644 --- a/res/drawable/ic_launcher_foreground.xml +++ b/res/drawable/ic_launcher_foreground.xml @@ -1,34 +1,51 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - - - - - - - - - - + + + + + + + + + + diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index 5992212094c4716a68a0775f63ffd1fdc49e82a0..0000000000000000000000000000000000000000 --- a/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - 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..aa8cfb0a9be59c1f33bb3d39176d0828e6efbde8 100644 --- a/res/drawable/ic_selection.xml +++ b/res/drawable/ic_selection.xml @@ -1,19 +1,9 @@ - - - + diff --git a/res/drawable/ic_timeline.xml b/res/drawable/ic_timeline.xml index 7c30ffa4e360ecef4cdd030810dc1a16340f8a44..e2af60edc6fbc4bcb0843028f5e4027729b00e52 100644 --- a/res/drawable/ic_timeline.xml +++ b/res/drawable/ic_timeline.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_videos.xml b/res/drawable/ic_videos.xml new file mode 100644 index 0000000000000000000000000000000000000000..98f9f3b6e2ecf0748f988b51097919abc74dfbfc --- /dev/null +++ b/res/drawable/ic_videos.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_watermark.xml b/res/drawable/ic_watermark.xml index 1c579413ff77398ce3e082180bfb6b0653c90e4b..f73dd555cee802f41995cd2a7e9767d42e26911f 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 d33979f10bb2b360613a7b33a85127bfecf4c9c4..84301579d088cbae850720299eb7ec5ef93d6b49 100644 --- a/res/drawable/more.xml +++ b/res/drawable/more.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_secondary_text"/> diff --git a/res/drawable/more2.xml b/res/drawable/more2.xml index 8675d8fdf5940bbd3f59e855aba216a4fcd750bd..854a679bb4f30d2b083009eb824d6831bc2d3c34 100644 --- a/res/drawable/more2.xml +++ b/res/drawable/more2.xml @@ -34,5 +34,5 @@ android:viewportHeight="36.0"> + android:fillColor="@color/color_default_secondary_text"/> 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 209575ea2eaa4029de2a9a2bd99890f7b258ff09..efcf13878631ca17652a31fb430f5a0dfc663a59 100644 --- a/res/drawable/multiselect_delete.xml +++ b/res/drawable/multiselect_delete.xml @@ -34,6 +34,5 @@ android:viewportHeight="72.0"> + android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z" /> diff --git a/res/drawable/multiselect_more.xml b/res/drawable/multiselect_more.xml index 4b5950019961206c9db9bc1d6b7d819c8dd57866..c02c535a0884cbaf07c5c8e1d047f0559f87a88c 100644 --- a/res/drawable/multiselect_more.xml +++ b/res/drawable/multiselect_more.xml @@ -34,6 +34,5 @@ android:viewportHeight="24.0"> + android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z" /> diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml index 6a426b1bcd8239e686ab270b293b6a7dc831d6ea..b2e522f2c008f8737f7bdb95a471889b1aecfadb 100644 --- a/res/drawable/multiselect_share.xml +++ b/res/drawable/multiselect_share.xml @@ -34,6 +34,5 @@ android:viewportHeight="72.0"> + android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z" /> diff --git a/res/drawable/multiselected_back.xml b/res/drawable/multiselected_back.xml index 37c846a109b97df7b4ba9b2a093c1cf8143e734e..5d76beba0a4f1fffeb9d3fc2f3c2c68667f71411 100644 --- a/res/drawable/multiselected_back.xml +++ b/res/drawable/multiselected_back.xml @@ -34,6 +34,5 @@ android:viewportHeight="24.0"> + android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z" /> diff --git a/res/drawable/overflow.xml b/res/drawable/overflow.xml index 15d6b53124bf400803fc4e4593a2849a26e3a5e4..f6bd30d1fb41db0148eff180872d837775e5b977 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..d44d5b22e092f1aa3845c61372c3f5fd6b36f540 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..c4aea7b29809066f4606227c2ef70f8a6b3abdc2 100644 --- a/res/drawable/share.xml +++ b/res/drawable/share.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_secondary_text"/> 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..59027ad3024d29f44c3ee6e26c2f53c714f589b3 100644 --- a/res/drawable/slideshow.xml +++ b/res/drawable/slideshow.xml @@ -34,5 +34,5 @@ android:viewportHeight="24.0"> + android:fillColor="@color/color_default_secondary_text"/> 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/squared_tick.xml b/res/drawable/squared_tick.xml new file mode 100644 index 0000000000000000000000000000000000000000..f89d7d0ea0485ec06f9cdbd29bf6f7af1db6df75 --- /dev/null +++ b/res/drawable/squared_tick.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/timeline.xml b/res/drawable/timeline.xml index 8d6dc37dabd4befc6b911a6527fbbf4f60529574..29b87efc448480c2cfb064c422aacc9f24f745e6 100644 --- a/res/drawable/timeline.xml +++ b/res/drawable/timeline.xml @@ -33,11 +33,9 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M19.057,4.034h-1.01V2.059h-2.016v1.976H7.969V2.059H5.951v1.976H4.902c-1.115,0 -1.967,0.943 -1.967,2.058l-0.01,13.832c0,1.114 0.902,2.017 2.016,2.017h14.115c1.113,0 2.016,-0.902 2.016,-2.017V6.092C21.072,4.978 20.17,4.034 19.057,4.034zM19.098,19.965H4.941V9.015h14.156V19.965z" /> + android:fillColor="@color/accent" + android:pathData="M6.184,16.241l3.738,-4.984l2.908,3.742l2.076,-2.496l2.907,3.738H6.184z" /> diff --git a/res/drawable/truescanner.xml b/res/drawable/truescanner.xml index c79f585011d570934c928bc35352e7d0fd966dea..93cf52df68f47054eb872eb05cd3f8b151c9876c 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/video_play.xml b/res/drawable/video_play.xml new file mode 100644 index 0000000000000000000000000000000000000000..a058b6004d43ef8cb0ca699e7dab97b5661522cd --- /dev/null +++ b/res/drawable/video_play.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/res/drawable/videos.xml b/res/drawable/videos.xml index 406d41dee3456ca4514c01b76025ed247a1766ba..1654415f2b61669e4c8090764978bb62f47038f2 100644 --- a/res/drawable/videos.xml +++ b/res/drawable/videos.xml @@ -33,7 +33,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> + android:fillColor="@color/accent" + android:pathData="M3.999,6h-2v14c0,1.1 0.9,2 2,2h14v-2h-14V6zM19.999,2h-12c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C21.999,2.9 21.099,2 19.999,2zM11.999,14.5v-9l6,4.5L11.999,14.5z" /> diff --git a/res/drawable/white_text_bg_gradient.xml b/res/drawable/white_text_bg_gradient.xml index 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/album_header.xml b/res/layout/album_header.xml index caae962b3fc2553ab384731f5ef64cd374af3451..595b5580a70a55c9ae385eab914644782f49f01f 100644 --- a/res/layout/album_header.xml +++ b/res/layout/album_header.xml @@ -46,7 +46,7 @@ android:id="@+id/album_header_subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@android:color/white" + android:textColor="@color/color_default_secondary_text" android:textAppearance="?android:attr/textAppearanceSmall" /> 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" /> @@ -63,8 +64,8 @@ android:background="@color/primary" android:layout_alignParentBottom="true" app:menu="@menu/navigation_items" - app:itemIconTint="@drawable/item_bg" - app:itemTextColor="@drawable/item_bg" /> + app:itemIconTint="@color/bottom_nav_color" + app:itemTextColor="@color/bottom_nav_color" /> diff --git a/res/layout/gl_root_group.xml b/res/layout/gl_root_group.xml index 6302171535f153a4c050aec07cc7cee9b10ab600..f080adedb2b456256ee8f8783a457908248c8e0a 100644 --- a/res/layout/gl_root_group.xml +++ b/res/layout/gl_root_group.xml @@ -22,11 +22,12 @@ android:layout_height="match_parent"> + android:background="@color/color_default_foreground" /> diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml index 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/main.xml b/res/layout/main.xml index e26e0fc6b4884b4d64ed6c84ab2282a63b0d8a3d..a97caceabb32aa5b5badd1ac4d1c8dbd8e16c673 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -2,6 +2,7 @@ diff --git a/res/layout/movie_view.xml b/res/layout/movie_view.xml index 0d15e8fe835a3d7f47efa503c38ddb770b6bf598..4d5a7b73effb91960d324ffb9965e4d749676da6 100644 --- a/res/layout/movie_view.xml +++ b/res/layout/movie_view.xml @@ -16,7 +16,7 @@ @@ -29,7 +29,7 @@ android:id="@+id/surface_view_cover" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@android:color/black"/> + android:background="@color/color_default_background"/> + android:textColor="@color/color_default_primary_text" /> \ No newline at end of file diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml index 1acbd77cb976157acb3acc9c2d181ce4c7874b13..1b52e79c2bffaf6b5f301c614f434ba0fc3fe5b0 100644 --- a/res/layout/photopage_progress_bar.xml +++ b/res/layout/photopage_progress_bar.xml @@ -9,7 +9,7 @@ android:visibility="invisible"> diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml index 00270e3a1f9eb46989bb168c2b3b38d0c752b945..b2ccac5ac09b103b886ead80e4da3a78a6ec3733 100755 --- a/res/layout/toolbar.xml +++ b/res/layout/toolbar.xml @@ -39,6 +39,7 @@ android:layout_height="?android:attr/actionBarSize" android:background="@color/primary" android:elevation="8dp" + android:theme="@style/ToolbarTheme" android:titleTextAppearance="@style/ToolbarTitleStyle" android:popupTheme="@style/ToolbarPopUpTheme" /> diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml index 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"/> - + + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml index b21bf3d3836c0a49069e0018cb0f6b87acab23f2..a6cda04a3ce9ea3d064a5b1be371c4f152025771 100644 --- a/res/menu/albumset.xml +++ b/res/menu/albumset.xml @@ -16,15 +16,19 @@ See the License for the specific language governing permissions and limitations under the License. --> - + + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + android:showAsAction="ifRoom" + app:iconTint="@color/color_default_primary"/> + diff --git a/res/menu/navigation_items.xml b/res/menu/navigation_items.xml index b4f39dc1c97596c2a773ee2fb11aa25583e4431c..8758d9b83695954acbb14f33485be958931135cb 100644 --- a/res/menu/navigation_items.xml +++ b/res/menu/navigation_items.xml @@ -1,11 +1,14 @@ - - - + + + diff --git a/res/menu/operation.xml b/res/menu/operation.xml index dccb2efde606984558fb17c2c94aba3cf671ecae..b5af3154f3ed0b5945ba7db9a41a13616875f07b 100644 --- a/res/menu/operation.xml +++ b/res/menu/operation.xml @@ -13,10 +13,13 @@ See the License for the specific language governing permissions and limitations under the License. --> - + @@ -41,31 +46,45 @@ android:showAsAction="ifRoom" /> diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml index b58c81ff94fc2cd9353409539d491f43b91966a5..d24a0f7ef73d22200f720bb1a1d78bd9d4d90850 100644 --- a/res/mipmap-anydpi/ic_launcher.xml +++ b/res/mipmap-anydpi/ic_launcher.xml @@ -1,10 +1,22 @@ + ~ Copyright ECORP SAS 2022 + ~ This program is free software: you can redistribute it and/or modify + ~ it under the terms of the GNU General Public License as published by + ~ the Free Software Foundation, either version 3 of the License, or + ~ (at your option) any later version. + ~ + ~ This program is distributed in the hope that it will be useful, + ~ but WITHOUT ANY WARRANTY; without even the implied warranty of + ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + ~ GNU General Public License for more details. + ~ + ~ You should have received a copy of the GNU General Public License + ~ along with this program. If not, see . + --> - - - + + + + diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml index 88a708fdc258a9ace6e26c8bfb0638562c79fc71..252a76d25dc85a173bac1d15fd0a364b41d1c3cb 100644 --- a/res/values-cy/strings.xml +++ b/res/values-cy/strings.xml @@ -220,8 +220,6 @@ Methwyd â thocio: mae\'r fideo targed yn rhy fyr Yn rendro panorama Cadw - @string/Import - @string/import_complete Yn sganio cynnwys... %1$d eitemau wedi\'u sganio @@ -244,8 +242,6 @@ Yn mewnforio... Does dim cynnwys ar gael i\'w mewnforio ar y ddyfais hon. Does dim dyfais MTP wedi\'i chysylltu. - @string/switch_photo_grid - @string/switch_photo_fullscreen Gwall camera Methu â chysylltu â\'r camera. Mae\'r camera wedi\'i analluogi oherwydd polisïau diogelwch. @@ -274,7 +270,6 @@ %d eiliad %d eiliad - @string/setting_on_value Bipio wrth gyfrif i lawr I ffwrdd Ymlaen @@ -344,7 +339,6 @@ Nid yw\'n bosib ei ddewis mewn modd golygfa. Amlygiad AMLYGIAD - @string/setting_off_value HDR CAMERA BLAEN CAMERA CEFN diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index c48dd088c5e16f557964a6d48fe2c518470a188d..2381f4139b99066121422c4f9f03d6247f67bb02 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + - - + --> "Galerie" "Bildrahmen" "%1$02d:%2$02d" "%1$d:%2$02d:%3$02d" - "Google Video Player" - "Video wird geladen..." - "Bild wird geladen…" - "Konto wird geladen..." + Video-Spieler + Video wird geladen … + Bild wird geladen … + Konto wird geladen … "Mit Video fortfahren" "Mit Wiedergabe fortfahren ab %s ?" "Mit Wiedergabe fortfahren" - "Wird geladen..." - "Konnte nicht geladen werden." + Wird geladen … + Konnte nicht geladen werden "Bild konnte nicht geladen werden." "Keine Miniaturansicht" "Starten" "OK" "OK" "Zum Beginnen auf ein Gesicht tippen" - "Bild wird gespeichert..." + Bild wird gespeichert … "Bild wird in %1$s gespeichert…" "Zugeschnittenes Bild nicht gespeichert" "Bild zuschneiden" @@ -47,13 +44,13 @@ "Gruppe auswählen" "Bild festlegen als" "Hintergrund wählen" - "Hintergrund wird festgelegt..." + Hintergrund wird festgelegt … "Hintergrund" "Löschen" - - "Ausgewähltes Element löschen?" - "Ausgewählte Elemente löschen?" - + + "Ausgewähltes Element löschen?" + "Ausgewählte Elemente löschen?" + "Bestätigen" "Abbrechen" "Teilen" @@ -68,34 +65,34 @@ "Element %1$d von %2$d:" "Schließen" "Zu Kamera wechseln" - - "%1$d ausgewählt" - "%1$d ausgewählt" - "%1$d ausgewählt" - - - "%1$d ausgewählt" - "%1$d ausgewählt" - "%1$d ausgewählt" - - - "%1$d ausgewählt" - "%1$d ausgewählt" - "%1$d ausgewählt" - + + "%1$d ausgewählt" + "%1$d ausgewählt" + "%1$d ausgewählt" + + + "%1$d ausgewählt" + "%1$d ausgewählt" + "%1$d ausgewählt" + + + "%1$d ausgewählt" + "%1$d ausgewählt" + "%1$d ausgewählt" + "Auf Karte anzeigen" "Nach links drehen" "Nach rechts drehen" "Bild wurde nicht gefunden." "Bearbeiten" "Einfache Bearbeitung" - "Caching-Anfragen werden verarbeitet." - "Caching läuft..." + Zwischenspeicherungs-Anfragen werden verarbeitet. + Zwischenspeicherung läuft … "Zuschneiden" "Zuschneiden" "Ton aus" "Festlegen als" - "Ton aus nicht möglich" + Stummschaltung nicht möglich "Video kann nicht wiedergegeben werden." "Nach Standort" "Nach Zeit" @@ -110,9 +107,9 @@ "Nur Bilder" "Nur Videos" "Bilder und Videos" - "Fotogalerie" + Fotogalerie "Keine Fotos vorhanden" - "Zugeschnittenes Bild gespeichert in %s" + Zugeschnittenes Bild gespeichert in %s. "Keine Alben verfügbar" "Keine Bilder oder Videos vorhanden" "Posts" @@ -148,17 +145,17 @@ "Original" "Vintage" "Instant" - "Bleach" + Ausgebleicht "Blau" "Schwarzweiß" - "Punch" + Punsch "X Process" "Latte" "Litho" - - "Album wird offline bereitgestellt." - "Alben werden offline bereitgestellt." - + + "Album wird offline bereitgestellt." + "Alben werden offline bereitgestellt." + "Dieses Element ist lokal gespeichert und offline verfügbar." "Alle Alben" "Lokale Alben" @@ -185,7 +182,7 @@ "Personen" "Tags" "Gruppieren nach" - "Einstellungen" + Einstellungen "Konto hinzufügen" "Kamera" "Downloads" @@ -199,18 +196,18 @@ "Rasteransicht" "Vollbildansicht" "Wird zugeschnitten" - "Ton wird ausgeschaltet..." + Stummschaltung "Bitte warten" "Video wird in %1$s gespeichert…" "Zuschneiden nicht möglich: Ziel-Video zu kurz" - "Panorama wird gerendert..." + Panorama wird gerendert … "Speichern" "Inhalt wird gescannt..." - - "%1$d Elemente gescannt" - "%1$d Element gescannt" - "%1$d Elemente gescannt" - + + "%1$d Elemente gescannt" + "%1$d Element gescannt" + "%1$d Elemente gescannt" + "Wird sortiert..." "Scan abgeschlossen" "Wird importiert..." @@ -220,11 +217,11 @@ "Keine Verbindung zur Kamera möglich" "Die Kamera wurde aufgrund von Sicherheitsrichtlinien deaktiviert." "Kamera" - "Bitte warten..." + Bitte warten … "Stellen Sie vor Verwendung der Kamera einen USB-Speicher bereit." "Legen Sie vor Verwendung der Kamera eine SD-Karte ein." "USB-Speicher wird vorbereitet" - "SD-Karte wird vorbereitet..." + SD-Karte wird vorbereitet … "Kein Zugriff auf USB-Speicher möglich" "Kein Zugriff auf SD-Karte möglich" "Abbrechen" @@ -236,12 +233,12 @@ "Ort speichern" "Standort" "Countdown-Timer" - - "1 Sekunde" - "%d Sekunden" - + + "1 Sekunde" + "%d Sekunden" + - + "Piepton während Countdown" "Aus" "An" @@ -312,7 +309,7 @@ "Belichtung" "Belichtung" - + "HDR; High Dynamic Range" "Frontkamera" "Kamera auf der Rückseite" @@ -321,13 +318,13 @@ "Auf Ihrer SD-Karte ist nicht mehr genügend Speicherplatz vorhanden. Ändern Sie die Qualitätseinstellung oder löschen Sie Bilder oder andere Dateien." "Maximale Größe erreicht" "Zu schnell" - "Panorama wird vorbereitet..." + Panorama wird vorbereitet … "Panorama konnte nicht gespeichert werden." "Panorama" - "Panorama wird aufgenommen..." + Panorama wird aufgenommen "Warten auf vorheriges Panorama" - "Speichern..." - "Panorama wird gerendert..." + Speichern … + Panorama wird verarbeitet "Zum Fokussieren tippen" "Effekte" "Effekt löschen" @@ -432,8 +429,12 @@ "Alben" "Weitere Optionen" "Einstellungen" - - "%1$d Foto" - "%1$d Fotos" - - + + "%1$d Foto" + "%1$d Fotos" + + + %1$d Element ausgewählt + %1$d Elemente ausgewählt + + \ No newline at end of file diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 79f8742d9c782156797ba297c66ae46a230aa327..781b295e3b162f2a1c29ebb330a4d29b19fd892c 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -110,7 +110,7 @@ "Images only" "Videos only" "Images & videos" - "Photo Gallery" + "Photo gallery" "No photos." "Cropped image saved to %s." "No albums available." diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 79f8742d9c782156797ba297c66ae46a230aa327..781b295e3b162f2a1c29ebb330a4d29b19fd892c 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -110,7 +110,7 @@ "Images only" "Videos only" "Images & videos" - "Photo Gallery" + "Photo gallery" "No photos." "Cropped image saved to %s." "No albums available." diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 729db93f013abb4aa722925679a8be05d101b07d..29f33d8dbf6d4f335a6fa78e5ced2f2e04ec91db 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1,4 +1,4 @@ - + - - + --> "Galería" "Picture frame" "%1$02d:%2$02d" @@ -33,7 +30,7 @@ "No hay miniaturas." "Volver a reproducir" "Aceptar" - "Aceptar" + Ok "Toca una cara para comenzar." "Guardando imagen..." "Guardando imagen en %1$s …" @@ -50,13 +47,13 @@ "Estableciendo fondo de pantalla..." "Fondo de pantalla" "Borrar" - - "¿Eliminar elemento seleccionado?" - "¿Eliminar elementos seleccionados?" - + + "¿Eliminar elemento seleccionado?" + "¿Eliminar elementos seleccionados?" + "Confirmar" "Cancelar" - "Compartir" + Compartir "Compartir panorámica" "Compartir como foto" "Eliminada" @@ -68,21 +65,21 @@ "Elemento: %1$d de %2$d" "Cerrar" "Cambiar a la cámara" - - "%1$d seleccionados" - "%1$d seleccionados" - "%1$d seleccionados" - - - "%1$d seleccionados" - "%1$d seleccionados" - "%1$d seleccionados" - - - "%1$d seleccionados" - "%1$d seleccionados" - "%1$d seleccionados" - + + "%1$d seleccionados" + "%1$d seleccionados" + "%1$d seleccionados" + + + "%1$d seleccionados" + "%1$d seleccionados" + "%1$d seleccionados" + + + "%1$d seleccionados" + "%1$d seleccionados" + "%1$d seleccionados" + "Mostrar en el mapa" "Girar a la izquierda" "Girar a la derecha" @@ -155,10 +152,10 @@ "Proceso X" "Latte" "Litho" - - "Haciendo que el álbum pueda verse sin conexión" - "Haciendo que los álbumes puedan verse sin conexión..." - + + "Haciendo que el álbum pueda verse sin conexión" + "Haciendo que los álbumes puedan verse sin conexión..." + "El elemento se ha almacenado de forma local y está disponible sin conexión." "Todos los álbumes" "Álbumes locales" @@ -206,11 +203,11 @@ "Creando panorámica..." "Guardar" "Analizando contenido..." - - "%1$d elementos analizados" - "%1$d elemento analizado" - "%1$d elementos analizados" - + + "%1$d elementos analizados" + "%1$d elemento analizado" + "%1$d elementos analizados" + "Ordenando..." "Análisis completo" "Importando..." @@ -236,12 +233,12 @@ "Añadir ubicación" "UBICACIÓN" "Temporizador de cuenta atrás" - - "1 segundo" - "%d segundos" - + + "1 segundo" + "%d segundos" + - + "Utilizar pitido" "No" "Sí" @@ -312,7 +309,7 @@ "Exposición" "EXPOSICIÓN" - + "HDR" "CÁMARA FRONTAL" "CÁMARA TRASERA" @@ -432,8 +429,19 @@ "Álbumes" "MÁS OPCIONES" "AJUSTES" - - "%1$d foto" - "%1$d fotos" - - + + "%1$d foto" + "%1$d fotos" + + \@cadena/valor_de_desconexión + \@cadena/valor_on_de_ajuste + \@cadena/cambiar_foto_pantalla_completa + \@cadena/cambiar_rejilla_de_fotos + + %1$d elemento seleccionado + %1$d elementos seleccionados + + + \@cadena/importar_completado + \@cadena/Importar + \ No newline at end of file diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index a9dcebe615569ecc48804f78511a9c57d61a313f..013aabab5738a2220e37cf983471ef46ddbb78e0 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -1,4 +1,4 @@ - + - - + --> "Galerie" "Cadre d\'image" "%1$02d:%2$02d" "%1$d:%2$02d:%3$02d" - "Lecteur Google Vidéos" + Lecteur vidéos "Chargement de la vidéo..." "Chargement de l\'image..." "Chargement infos compte..." @@ -50,10 +47,10 @@ "Définition du fond d\'écran…" "Fond d\'écran" "Supprimer" - - "Supprimer élément sélectionné?" - "Suppr. éléments sélectionnés?" - + + "Supprimer élément sélectionné?" + "Suppr. éléments sélectionnés?" + "Confirmer" "Annuler" "Partager" @@ -68,21 +65,21 @@ "%1$d élément(s) sur %2$d :" "Fermer" "Passer en mode Appareil photo" - - "%1$d sélectionnés" - "%1$d sélectionnés" - "%1$d sélectionnés" - - - "%1$d sélectionnés" - "%1$d sélectionnés" - "%1$d sélectionnés" - - - "%1$d sélectionnés" - "%1$d sélectionnés" - "%1$d sélectionnés" - + + "%1$d sélectionnés" + "%1$d sélectionnés" + "%1$d sélectionnés" + + + "%1$d sélectionnés" + "%1$d sélectionnés" + "%1$d sélectionnés" + + + "%1$d sélectionnés" + "%1$d sélectionnés" + "%1$d sélectionnés" + "Afficher sur la carte" "Rotation vers la gauche" "Faire pivoter vers la droite" @@ -155,10 +152,10 @@ "X Process" "Latte" "Lithographie" - - "Activation de consultation d\'album hors connexion." - "Activation consultation d\'albums hors connexion." - + + "Activation de consultation d\'album hors connexion." + "Activation consultation d\'albums hors connexion." + "Cet élément est stocké localement et disponible hors connexion." "Tous les albums" "Albums locaux" @@ -206,11 +203,11 @@ "Rendu de vue panoramique…" "Enregistrer" "Analyse du contenu en cours..." - - "%1$d éléments analysés" - "%1$d élément analysé" - "%1$d éléments analysés" - + + "%1$d éléments analysés" + "%1$d élément analysé" + "%1$d éléments analysés" + "Tri en cours..." "Analyse terminée." "Importation en cours..." @@ -236,12 +233,12 @@ "Enregistrer la position" "POSITION" "Compte à rebours" - - "1 seconde" - "%d secondes" - + + "1 seconde" + "%d secondes" + - + "Compte à rebours sonore" "DÉSACTIVÉE" "ACTIVÉE" @@ -312,7 +309,7 @@ "Exposition" "EXPOSITION" - + "HDR" "CAMÉRA FRONTALE" "CAMÉRA ARRIÈRE" @@ -432,8 +429,8 @@ "Albums" "PLUS D\'OPTIONS" "Paramètres" - - "%1$d photo" - "%1$d photos" - - + + "%1$d photo" + "%1$d photos" + + \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index fad76498f6152bb5e1f4cb022f9c8581c1880373..1c469b07028694ef1e1ef8a6016316c09f66318c 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1,4 +1,4 @@ - + - - + --> "Galerie" "Cadre d\'image" "%1$02d:%2$02d" "%1$d:%2$02d:%3$02d" - "Lecteur Google Vidéos" + Lecteur vidéos "Chargement de la vidéo..." "Chargement de l\'image..." "Chargement infos compte..." @@ -49,11 +46,11 @@ "Définir fond d\'écran" "Définition du fond d\'écran…" "Fond d\'écran" - "Supprimer" - - "Supprimer élément sélectionné ?" - "Suppr. éléments sélectionnés ?" - + Supprimer + + "Supprimer élément sélectionné ?" + "Suppr. éléments sélectionnés ?" + "Confirmer" "Annuler" "Partager" @@ -68,21 +65,21 @@ "%1$d élément(s) sur %2$d :" "Fermer" "Passer en mode Appareil photo" - - "%1$d sélectionné" - "%1$d sélectionné" - "%1$d sélectionnés" - - - "%1$d sélectionné" - "%1$d sélectionné" - "%1$d sélectionnés" - - - "%1$d sélectionné" - "%1$d sélectionné" - "%1$d sélectionnés" - + + "%1$d sélectionné" + "%1$d sélectionné" + "%1$d sélectionnés" + + + "%1$d sélectionné" + "%1$d sélectionné" + "%1$d sélectionnés" + + + "%1$d sélectionné" + "%1$d sélectionné" + "%1$d sélectionnés" + "Afficher sur la carte" "Faire pivoter à gauche" "Faire pivoter à droite" @@ -134,7 +131,7 @@ "Auteur" "Modèle" "Flash" - "Ouverture" + Ouverture "Longueur focale" "Balance blancs" "Durée d\'expo" @@ -155,10 +152,10 @@ "Rayons X" "Latte" "Lithographie" - - "Activation de consultation d\'album hors connexion." - "Activation consultation d\'albums hors connexion." - + + "Activation de consultation d\'album hors connexion." + "Activation consultation d\'albums hors connexion." + "Cet élément est stocké localement et disponible hors connexion." "Tous les albums" "Albums en local" @@ -206,11 +203,11 @@ "Rendu de la vue panoramique en cours…" "Enregistrer" "Analyse du contenu en cours..." - - "%1$d éléments analysés" - "%1$d élément analysé" - "%1$d éléments analysés" - + + "%1$d éléments analysés" + "%1$d élément analysé" + "%1$d éléments analysés" + "Tri en cours..." "Analyse terminée." "Importation en cours..." @@ -236,12 +233,12 @@ "Enregist. position" "POSITION" "Retardateur" - - "1 seconde" - "%d secondes" - + + "1 seconde" + "%d secondes" + - + "Compte à rebours sonore" "Désactivé" "Activé" @@ -312,7 +309,7 @@ "Exposition" "EXPOSITION" - + "HDR" "CAMÉRA FRONTALE" "CAMÉRA ARRIÈRE" @@ -432,8 +429,12 @@ "Albums" "PLUS D\'OPTIONS" "PARAMÈTRES" - - "%1$d photo" - "%1$d photos" - - + + "%1$d photo" + "%1$d photos" + + + %1$d élément sélectionné + %1$d éléments sélectionnés + + \ No newline at end of file diff --git a/res/values-gd/strings.xml b/res/values-gd/strings.xml index ce08d238091da046852034b89c80f7b946dcd6ec..47d72678e99df634b95e3de121af8fd09f0ee3d0 100644 --- a/res/values-gd/strings.xml +++ b/res/values-gd/strings.xml @@ -210,8 +210,6 @@ Cha ghabh a bhearradh: Tha a’ video-amais ro ghoirid A’ reandaradh a’ chuairt-sheallaidh Sàbhail - @string/Import - @string/import_complete A’ sganadh na susbaint… Chaidh %1$d nì a sganadh @@ -230,8 +228,6 @@ ’Ga ion-phortadh… Chan eil susbaint air an uidheam seo airson ion-phortadh. Cha deach uidheam MTP a cheangal ris - @string/switch_photo_grid - @string/switch_photo_fullscreen Mearachd a’ chamara Cha ghabh ceangal a dhèanamh ris a’ chamara. Chaidh an camara a chur à comas ri linn poileasaidhean tèarainteachd. @@ -258,7 +254,6 @@ %d diogan %d diog - @string/setting_on_value Dèan bìd rè a’ chunntaidh sìos Dheth Air @@ -328,7 +323,6 @@ Cha ghabh a thaghadh sa mhodh seallaidh. Deisearas DEISEARAS - @string/setting_off_value HDR CAMARA BEÒIL CAMARA CÙIL diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 0e50227441522e3f80435b68889c8dc9f507c6f2..12e3f6571f973c08daae88ff75ec6b0aa8fcf948 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1,4 +1,4 @@ - + - - + --> "Galleria" "Cornice immagine" "%1$02d:%2$02d" "%1$d:%2$02d:%3$02d" "Video player" - "Caricamento video..." - "Caricamento immagine..." - "Caricamento account..." + Caricamento video… + Caricamento immagine… + Caricamento account… "Riprendi video" "Riprendi riproduzione da %s ?" "Riprendi riproduzione" - "Caricamento..." + Caricamento… "Impossibile caricare" "Impossibile caricare l\'immagine" "Nessuna miniatura" @@ -35,7 +32,7 @@ "OK" "OK" "Tocca un viso per iniziare." - "Salvataggio foto..." + Salvataggio foto… "Salvataggio immagine in %1$s …" "Impossibile salvare immagine ritagliata." "Ritaglia foto" @@ -47,16 +44,16 @@ "Seleziona gruppo" "Imposta foto come" "Imposta sfondo" - "Impostazione sfondo..." + Impostazione sfondo… "Sfondo" "Elimina" - - "Eliminare elemento selezionato?" - "Eliminare elementi selezionati?" - + + "Eliminare elemento selezionato?" + "Eliminare elementi selezionati?" + "Conferma" - "Annulla" - "Condividi" + Annulla + Condividi "Condividi panorama" "Condividi come foto" "Eliminata" @@ -66,23 +63,23 @@ "Presentazione" "Dettagli" "%1$d elementi su %2$d:" - "Chiudi" + Chiudi "Passa a Fotocamera" - - "%1$d selezionati" - "%1$d selezionato" - "%1$d selezionati" - - - "%1$d selezionati" - "%1$d selezionato" - "%1$d selezionati" - - - "%1$d selezionati" - "%1$d selezionato" - "%1$d selezionati" - + + "%1$d selezionati" + "%1$d selezionato" + "%1$d selezionati" + + + "%1$d selezionati" + "%1$d selezionato" + "%1$d selezionati" + + + "%1$d selezionati" + "%1$d selezionato" + "%1$d selezionati" + "Mostra sulla mappa" "Ruota a sinistra" "Ruota a destra" @@ -90,7 +87,7 @@ "Modifica" "Modifica semplice" "Elaborazione richieste memorizzazione cache" - "Memorizzazione..." + Memorizzazione… "Ritaglia" "Ritaglia" "Disattiva audio" @@ -112,7 +109,7 @@ "Immagini e video" "Galleria fotografica" "Nessuna foto." - "Immagine ritagliata salvata in %s." + Immagine ritagliata salvata in %s. "Nessun album disponibile." "Nessun video/immagine disponibile." "Post" @@ -137,7 +134,7 @@ "Diaframma" "Lungh. focale" "Bilanc. bianco" - "Tempo esposiz." + Tempo esposizione "ISO" "mm" "Manuale" @@ -146,19 +143,20 @@ "Senza flash" "Sconosciuta" "Originale" - "Vintage" - "Instant" - "Bleach" + Vintage + Instant + Bleach "Blu" "Bianco e nero" - "Punch" + Punch "X Process" - "Latte" + Latte "Litografia" - - "Attivazione album offline." - "Attivazione album offline." - + + Attivazione album offline. + Attivazione album offline. + + "Questo elemento è memorizzato localmente e disponibile offline." "Tutti gli album" "Album locali" @@ -185,14 +183,14 @@ "Persone" "Tag" "Raggruppa per" - "Impostazioni" + Impostazioni "Aggiungi account" "Fotocamera" "Download" "Foto online modificate" "Importate" "Screenshot" - "Guida" + Aiuto "Nessun archivio" "Nessun archivio esterno disponibile" "Visualizzazione sequenza" @@ -206,11 +204,11 @@ "Creazione panorama in corso" "Salva" "Scansione dei contenuti..." - - "%1$d elementi sottoposti a scansione" - "%1$d elemento sottoposto a scansione" - "%1$d elementi sottoposti a scansione" - + + "%1$d elementi sottoposti a scansione" + "%1$d elemento sottoposto a scansione" + "%1$d elementi sottoposti a scansione" + "Ordinamento..." "Scansione eseguita" "Importazione..." @@ -220,7 +218,7 @@ "Impossibile collegarsi alla fotocamera." "La fotocamera è stata disattivata in base a norme di sicurezza." "Fotocamera" - "Attendere..." + Attendere… "Monta l\'archivio USB prima di utilizzare la fotocamera." "Per usare la fotocamera devi inserire una scheda SD." "Preparazione archivio USB…" @@ -236,19 +234,19 @@ "Registra località" "LOCALITÀ" "Timer conto alla rovescia" - - "1 secondo" - "%d secondi" - + + "1 secondo" + "%d secondi" + - - "Bip conto alla rov." + + Bip conto alla rovescia "OFF" "ON" "Qualità video" "Alta" "Bassa" - "Time lapse" + Intervallo "Impostazioni fotocamera" "Impostazioni videocamera" "Dimensioni foto" @@ -266,7 +264,7 @@ "Messa a fuoco" "Automatica" "Infinito" - "Macro" + Macro "AUTO" "INFINITO" "MACRO" @@ -312,7 +310,7 @@ "Esposizione" "ESPOSIZIONE" - + "HDR" "FOTOCAMERA ANTERIORE" "FOTOCAMERA POSTERIORE" @@ -326,7 +324,7 @@ "Panoramica" "Acquisizione panorama" "In attesa di panorama precedente" - "Salvataggio..." + Salvataggio… "Creazione panorama" "Tocca per mettere a fuoco." "Effetti" @@ -432,8 +430,14 @@ "Album" "ALTRE OPZIONI" "IMPOSTAZIONI" - - "%1$d foto" - "%1$d foto" - - + + %1$d foto + %1$d foto + + + + %1$d selezionato + %1$d selezionati + + + \ No newline at end of file diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml index 1455c3d98f3fa06eded7aab7d1fe14cbfe28ba5d..d5810d554a4237b8e5b3b81828cd3d1f38ef550c 100644 --- a/res/values-ku/strings.xml +++ b/res/values-ku/strings.xml @@ -234,7 +234,6 @@ ١ چرکە %d چرکە - @string/setting_on_value توتە لە ماوەی ژماردنی بەرەوژێر کوژاندن هەڵکردن @@ -304,7 +303,6 @@ لە شیوازی دیمەندا دیارینەکراوەیە. ڕووناکیپێدان ڕۆشنایی پێدان - @string/setting_off_value HDR کامێرای پێشەوە کامێرای دواوە 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-night/colors.xml b/res/values-night/colors.xml deleted file mode 100644 index 67bceb0a838398e5b0fd46ff04508c88a435dbcf..0000000000000000000000000000000000000000 --- a/res/values-night/colors.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - #212121 - #DEFFFFFF - - @color/default_background - @color/primary_text - @color/default_background - - @color/primary_text - @color/primary_text - - @color/primary_text - @color/primary - @color/white - - @color/default_background - #99FFFFFF - @color/primary_text - diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml deleted file mode 100644 index fd287692ef5ec9052aad2b870e3a01ba2d281f8e..0000000000000000000000000000000000000000 --- a/res/values-night/styles.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - + + + + + + + + + \ No newline at end of file diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index 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 4eb65aeadf27e93051c83fd91a8081257ed9f656..d8849581e449cd5fd0ccf5e39a9243ec36efeb4d 100644 --- a/res/values/cm_colors.xml +++ b/res/values/cm_colors.xml @@ -15,25 +15,20 @@ --> - #333333 - #000000 - #33b5e5 - - #fafafa - #212121 - - #424242 - - @color/primary - @color/primary - @color/primary - @color/white - @color/white - @color/white - - #1a000000 - #26000000 - #75000000 - #8A000000 - #C1000000 + @color/e_action_bar + @color/e_action_bar + @color/e_primary_text_color + @color/e_secondary_text_color + @color/e_accent + @color/e_divider_color + @color/e_background + @color/e_floating_background + @color/e_background + + #FB3846 + #0086FF + #38D874 + #FC7222 + #C8CED0 + #848484 diff --git a/res/values/colors.xml b/res/values/colors.xml index 35aefa5d3280241af9252b0dbce30f54776da64b..265c63f3c6d1a2b5a9b49505e56ac164800a6281 100755 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -15,86 +15,80 @@ --> - @color/white + @color/e_background + @color/e_action_bar - @color/white - @color/black_transparent_3 - @color/black_transparent_4 - @color/white - @color/white - @color/black_transparent_4 + @color/color_default_background + @color/color_default_foreground + #8A000000 + @android:color/white + @android:color/white + @color/color_default_primary_text - @color/black_transparent_5 + @color/color_default_background - @color/white - @color/white + @color/color_default_background + @color/color_default_foreground - @color/black - @color/light_black - #8A000000 - #8A000000 + @color/color_default_background + @color/color_default_foreground + @color/color_default_background + @color/primaryDark @color/primary - @color/light_black + @color/color_default_foreground - @color/light_black + @color/color_default_foreground - @color/light_black - - #6000 - - #8833b5e5 - @color/accent + @color/color_default_foreground - @color/white - #FFFF0033 - #77333333 + @color/color_default_primary_text + @color/color_default_secondary_text + @color/color_default_foreground @color/accent - #3F33B5E5 - @color/black - #DD777777 - #FFC5C5C5 - #40000000 + @color/accent + @color/color_default_foreground + @color/gray2 + @color/gray1 + @color/color_default_foreground @color/accent - #ff282828 - #FF2E2E2E - #FF33525E - #FF0099CC - #FFFF2222 + @color/color_default_background + @color/gray2 + @color/accent + @color/accent + @color/red1 @color/accent @color/accent - #ff4c4c4c - #fff3f3f3 - #80ffffff - #8050d060 - #80d05060 - #FFAAAAAA - - #f41e26 - #650101 - #e7e7e7 - #575757 - @color/primary - @color/white - @color/black - @color/black - #009688 - @color/black_transparent_4 - @color/black_transparent_3 - @color/white - - #747474 - @color/white - - @color/black_transparent_4 - @color/black_transparent_4 - - @color/black_transparent_4 - @color/black + @color/gray1 + @color/color_default_foreground + @color/color_default_background + @color/green1 + @color/red1 + + @color/red1 + @color/orange1 + @color/gray1 + @color/gray2 + @color/primaryDark + @color/primaryDark + @color/color_default_background + @color/primaryDark + @color/accent + @color/gray1 + @color/color_default_primary_text + @color/color_default_primary_text + @color/color_default_background + + @color/color_default_secondary_text + @color/accent + + @color/color_default_primary_text + @color/color_default_primary_text + @color/color_default_secondary_text diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 49aa5d59931dfc288c1ff3ad9a76189f028c3421..07b72f3d971b31c8a605d8d83ad081f4d2bd9890 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -185,7 +185,7 @@ 3dp 174dp 174dp - 80dp + 56dp 116dp 116dp 30dp diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index f9b05d9f3939d0a11f2dd2258dd085142cb54a71..891f9dc7a0d0f2fa1859efb22d97d81e95351497 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 + @android:color/white + @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/strings.xml b/res/values/strings.xml index 570014e3e85597e492f040d47db6136c1697b0b2..cfd87acd4c8a3cd9df2ce0ea200e3aa82e729462 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -254,7 +254,7 @@ Images & videos - Photo Gallery + Photo gallery No photos. @@ -529,10 +529,10 @@ Save - @string/Import + @string/Import - @string/import_complete + @string/import_complete Scanning content... @@ -567,10 +567,10 @@ There is no MTP device connected - @string/switch_photo_grid + @string/switch_photo_grid - @string/switch_photo_fullscreen + @string/switch_photo_fullscreen @@ -642,7 +642,7 @@ 1 second %d seconds - @string/setting_on_value + @string/setting_on_value Beep during countdown @@ -820,7 +820,7 @@ EXPOSURE - @string/setting_off_value + @string/setting_off_value HDR diff --git a/res/values/styles.xml b/res/values/styles.xml index d714830252fdca0b406bb3a4c63ca59f5cbd1558..2a7cfde7440df4ba39363dd67f7b95651e444c46 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -15,30 +15,91 @@ --> - + + + + + + + + + + - + + + + - + - + + + + + + + @@ -61,6 +139,8 @@ useLogo|showHome @drawable/actionbar_translucent @null + @color/color_default_primary_text + @color/color_default_primary_text @@ -82,23 +167,23 @@ @@ -192,7 +278,7 @@ - - + + -