diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 6ffa45aa0fce..1d0e382b2a01 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,10 @@ +12.3 +----- + 12.2 ----- +* Updated color scheme to Classic Bright +* Adds support for .blog subdomains for the new site creation flow 12.1 ----- @@ -10,6 +15,7 @@ * Visual update to Today's stats, All-time stats and Most popular stats blocks * Now sharing pictures to WordPress opens the Block editor * Fixed crash when inserting text right before an Image +* Now sharing pictures to WordPress opens the block editor 12.0 ----- diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 8a2dcdd68248..6308830109b6 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -47,8 +47,8 @@ android { defaultConfig { applicationId "org.wordpress.android" - versionName "12.1.2" - versionCode 708 + versionName "12.2-rc-2" + versionCode 709 minSdkVersion 21 targetSdkVersion 26 diff --git a/WordPress/lint-baseline.xml b/WordPress/lint-baseline.xml index 85bb280879ba..5ab05f2f6802 100644 --- a/WordPress/lint-baseline.xml +++ b/WordPress/lint-baseline.xml @@ -108,7 +108,7 @@ priority="6" summary="Attribute unused on older versions" explanation="This check finds attributes set in XML files that were introduced in a version newer than the oldest version targeted by your application (with the `minSdkVersion` attribute). This is not an error; the application will simply ignore the attribute. However, if the attribute is important to the appearance or functionality of your application, you should consider finding an alternative way to achieve the same result with only available attributes, and then you can optionally create a copy of the layout in a layout-vNN folder which will be used on API NN or higher where you can take advantage of the newer attribute. Note: This check does not only apply to attributes. For example, some tags can be unused too, such as the new `<tag>` element in layouts introduced in API 21." - errorLine1=" android:drawableTint="@color/blue_wordpress"" + errorLine1=" android:drawableTint="@color/primary_500"" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~" quickfix="studio"> - - - - Create beautiful\n" -"posts and pages" +"Create beautiful\n" +"posts and pages\n" msgstr "" #. translators: This is a promo message that will be attached on top of an enhanced screenshot in the App Store. #. No specified character limit here, but try to keep it as short as the source one. Please leave emphasis and line break tags in place, unless they don't make sense in the target language. -msgctxt "enhanced_app_store_screenshot-2" +msgctxt "enhanced_app_store_screenshot_2" msgid "" -"Track what your\n" -"visitors love" +"Track what your\n" +"visitors love\n" msgstr "" #. translators: This is a promo message that will be attached on top of an enhanced screenshot in the App Store. #. No specified character limit here, but try to keep it as short as the source one. Please leave emphasis and line break tags in place, unless they don't make sense in the target language. -msgctxt "enhanced_app_store_screenshot-3" +msgctxt "enhanced_app_store_screenshot_3" msgid "" -"Check what's\n" -"happening in real time" +"Check what's\n" +"happening in real time\n" msgstr "" #. translators: This is a promo message that will be attached on top of an enhanced screenshot in the App Store. #. No specified character limit here, but try to keep it as short as the source one. Please leave emphasis and line break tags in place, unless they don't make sense in the target language. -msgctxt "enhanced_app_store_screenshot-4" +msgctxt "enhanced_app_store_screenshot_4" msgid "" -"Share from\n" -"anywhere" +"Share \n" +"from anywhere\n" msgstr "" #. translators: This is a promo message that will be attached on top of an enhanced screenshot in the App Store. #. No specified character limit here, but try to keep it as short as the source one. Please leave emphasis and line break tags in place, unless they don't make sense in the target language. -msgctxt "enhanced_app_store_screenshot-5" -msgid "Capture ideas\n" -"on the go" +msgctxt "enhanced_app_store_screenshot_5" +msgid "" +"Capture ideas\n" +"on the go\n" msgstr "" #. translators: This is a promo message that will be attached on top of an enhanced screenshot in the App Store. #. No specified character limit here, but try to keep it as short as the source one. Please leave emphasis and line break tags in place, unless they don't make sense in the target language. -msgctxt "enhanced_app_store_screenshot-6" -msgid "" -"Write without compromises" +msgctxt "enhanced_app_store_screenshot_6" +msgid "Write without compromises" msgstr "" + diff --git a/WordPress/metadata/enhanced_screenshot_1.html b/WordPress/metadata/enhanced_screenshot_1.html new file mode 100644 index 000000000000..f1d41f313a99 --- /dev/null +++ b/WordPress/metadata/enhanced_screenshot_1.html @@ -0,0 +1,2 @@ +Create beautiful +posts and pages \ No newline at end of file diff --git a/WordPress/metadata/enhanced_screenshot_2.html b/WordPress/metadata/enhanced_screenshot_2.html new file mode 100644 index 000000000000..b393114cab20 --- /dev/null +++ b/WordPress/metadata/enhanced_screenshot_2.html @@ -0,0 +1,2 @@ +Track what your +visitors love \ No newline at end of file diff --git a/WordPress/metadata/enhanced_screenshot_3.html b/WordPress/metadata/enhanced_screenshot_3.html new file mode 100644 index 000000000000..3fe7910111dc --- /dev/null +++ b/WordPress/metadata/enhanced_screenshot_3.html @@ -0,0 +1,2 @@ +Check what's +happening in real time \ No newline at end of file diff --git a/WordPress/metadata/enhanced_screenshot_4.html b/WordPress/metadata/enhanced_screenshot_4.html new file mode 100644 index 000000000000..936f02605362 --- /dev/null +++ b/WordPress/metadata/enhanced_screenshot_4.html @@ -0,0 +1,2 @@ +Share +from anywhere \ No newline at end of file diff --git a/WordPress/metadata/enhanced_screenshot_5.html b/WordPress/metadata/enhanced_screenshot_5.html new file mode 100644 index 000000000000..68a932f96705 --- /dev/null +++ b/WordPress/metadata/enhanced_screenshot_5.html @@ -0,0 +1,2 @@ +Capture ideas +on the go \ No newline at end of file diff --git a/WordPress/metadata/screenshot_6.html b/WordPress/metadata/enhanced_screenshot_6.html similarity index 100% rename from WordPress/metadata/screenshot_6.html rename to WordPress/metadata/enhanced_screenshot_6.html diff --git a/WordPress/metadata/release_notes.txt b/WordPress/metadata/release_notes.txt index aeda0f43c38e..d3e3e69a0c2b 100644 --- a/WordPress/metadata/release_notes.txt +++ b/WordPress/metadata/release_notes.txt @@ -1,4 +1,3 @@ -* Navigating notifications: now you can swipe between tabs. -* Design details: seemingly-small visual tweaks make site creation smoother. -* Clearer data: changes and visual updates to Stats make most stats easier to understand. -* Speedy posting: sharing pictures to WordPress automatically opens the Block editor. \ No newline at end of file +* You can now create a site with .blog subdomain right from the app. +* The whole app has a fresh, updated color scheme. Modern! +* We fixed a bug that caused the “unread” badge to stick around when you swiped between notifications to read them. \ No newline at end of file diff --git a/WordPress/metadata/screenshot_1.html b/WordPress/metadata/screenshot_1.html deleted file mode 100644 index b8bb4453abf5..000000000000 --- a/WordPress/metadata/screenshot_1.html +++ /dev/null @@ -1 +0,0 @@ -Create beautiful
posts and pages \ No newline at end of file diff --git a/WordPress/metadata/screenshot_2.html b/WordPress/metadata/screenshot_2.html deleted file mode 100644 index c6c70204c0d8..000000000000 --- a/WordPress/metadata/screenshot_2.html +++ /dev/null @@ -1 +0,0 @@ -Track what your
visitors love diff --git a/WordPress/metadata/screenshot_3.html b/WordPress/metadata/screenshot_3.html deleted file mode 100644 index 16e7b0f0aa62..000000000000 --- a/WordPress/metadata/screenshot_3.html +++ /dev/null @@ -1 +0,0 @@ -Check what's
happening in real time diff --git a/WordPress/metadata/screenshot_4.html b/WordPress/metadata/screenshot_4.html deleted file mode 100644 index 7d2cdcf6f52e..000000000000 --- a/WordPress/metadata/screenshot_4.html +++ /dev/null @@ -1 +0,0 @@ -Share from
anywhere diff --git a/WordPress/metadata/screenshot_5.html b/WordPress/metadata/screenshot_5.html deleted file mode 100644 index f5460b432773..000000000000 --- a/WordPress/metadata/screenshot_5.html +++ /dev/null @@ -1 +0,0 @@ -Capture ideas
on the go diff --git a/WordPress/src/main/assets/login_anims/jetpack.json b/WordPress/src/main/assets/login_anims/jetpack.json index 382d6fb532bb..091d451c7361 100644 --- a/WordPress/src/main/assets/login_anims/jetpack.json +++ b/WordPress/src/main/assets/login_anims/jetpack.json @@ -1 +1 @@ -{"v":"4.10.1","fr":30,"ip":0,"op":95,"w":310,"h":464,"nm":"Jetpack","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Jetpack Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.344],"y":[1]},"o":{"x":[0.655],"y":[0]},"n":["0p344_1_0p655_0"],"t":20,"s":[0],"e":[1800]},{"t":50}],"ix":10},"p":{"a":0,"k":[155,291,0],"ix":2},"a":{"a":0,"k":[68,68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-14.126,-27.274],[-14.126,37.664],[19.293,-27.274]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[85.523,84.065],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[14.124,27.282],[14.124,-37.658],[-19.296,27.282]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[50.476,51.935],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[37.556,0],[0,-37.556],[-37.556,0],[0,37.556]],"o":[[-37.556,0],[0,37.556],[37.556,0],[0,-37.556]],"v":[[0,-68],[-68,0],[0,68],[68,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.783999992819,0.842999985639,0.882000014361,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[68,68],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.663000009574,0.870999983245,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0,0.310000011968,0.517999985639,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}]} +{"v":"5.3.4","fr":30,"ip":0,"op":95,"w":310,"h":464,"nm":"Jetpack","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Jetpack Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.344],"y":[1]},"o":{"x":[0.655],"y":[0]},"n":["0p344_1_0p655_0"],"t":20,"s":[0],"e":[1800]},{"t":50}],"ix":10},"p":{"a":0,"k":[155,291,0],"ix":2},"a":{"a":0,"k":[68,68,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[-14.126,-27.274],[-14.126,37.664],[19.293,-27.274]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[85.523,84.065],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0]],"v":[[14.124,27.282],[14.124,-37.658],[-19.296,27.282]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[50.476,51.935],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[37.556,0],[0,-37.556],[-37.556,0],[0,37.556]],"o":[[-37.556,0],[0,37.556],[37.556,0],[0,-37.556]],"v":[[0,-68],[-68,0],[0,68],[68,0]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.807843137255,0.81568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[68,68],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.003921568627,0.376470588235,0.529411764706,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/notifications.json b/WordPress/src/main/assets/login_anims/notifications.json index a86a9ed0ca01..51e757825516 100644 --- a/WordPress/src/main/assets/login_anims/notifications.json +++ b/WordPress/src/main/assets/login_anims/notifications.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":47,"w":310,"h":464,"nm":"Notifications","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"notification-01 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":7,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[100],"e":[100]},{"t":17}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,222.086,0]},"a":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":7,"s":[115,73,0],"e":[115,83,0],"to":[0,1.66666662693024,0],"ti":[0,-1.66666662693024,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[115,83,0],"e":[115,83,0],"to":[0,0,0],"ti":[0,0,0]},{"t":17}]},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":7,"s":[75,75,100],"e":[103,103,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[103,103,100],"e":[100,100,100]},{"t":17}]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.81,0.213],[3.849,-0.037],[3.849,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.064],[-3.849,1.004],[0.332,1.285]],"o":[[-3.849,-1.005],[-3.849,0.064],[-1.278,0.278],[0.203,0.942],[3.849,0.836],[3.849,0.038],[1.277,-0.334],[-0.225,-0.872]],"v":[[-54.525,-12.412],[-66.074,-13.557],[-77.622,-12.412],[-79.436,-9.584],[-77.622,-7.761],[-66.074,-6.617],[-54.525,-7.761],[-52.812,-10.691]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.162,0.067],[9.639,0.219],[9.64,-0.071],[9.64,-0.253],[9.639,-0.434],[-0.056,-1.284],[-1.181,-0.057],[-9.639,-0.168],[-9.639,-0.106],[-9.64,0.075],[-9.639,0.528],[0.07,1.285]],"o":[[-9.639,-0.53],[-9.64,-0.075],[-9.639,0.107],[-9.639,0.17],[-1.278,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.256],[9.64,0.071],[9.639,-0.219],[1.279,-0.07],[-0.064,-1.194]],"v":[[77.454,-12.377],[48.536,-13.335],[19.616,-13.505],[-9.303,-13.218],[-38.223,-12.377],[-40.434,-9.949],[-38.223,-7.727],[-9.303,-6.889],[19.616,-6.6],[48.536,-6.77],[77.454,-7.727],[79.643,-10.18]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.81,0.212],[3.85,-0.037],[3.851,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.063],[-3.85,1.005],[0.333,1.284]],"o":[[-3.85,-1.005],[-3.849,0.063],[-1.277,0.278],[0.203,0.941],[3.851,0.837],[3.85,0.038],[1.278,-0.333],[-0.224,-0.872]],"v":[[53.143,7.742],[41.594,6.597],[30.045,7.742],[28.232,10.569],[30.045,12.392],[41.594,13.536],[53.143,12.392],[54.855,9.463]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-0.097,-1.15],[1.277,-0.109],[6.212,-0.219],[6.212,0.074],[6.212,0.254],[6.212,0.434],[0.081,1.174],[-1.278,0.088],[-6.211,0.169],[-6.212,0.107],[-6.211,-0.151],[-6.212,-0.529]],"o":[[0.108,1.284],[-6.212,0.529],[-6.211,0.15],[-6.212,-0.107],[-6.211,-0.17],[-1.137,-0.078],[-0.089,-1.286],[6.212,-0.434],[6.212,-0.254],[6.212,-0.075],[6.212,0.219],[1.108,0.093]],"v":[[11.233,9.87],[9.116,12.392],[-9.521,13.349],[-28.156,13.52],[-46.791,13.232],[-65.426,12.392],[-67.579,10.229],[-65.426,7.742],[-46.791,6.902],[-28.156,6.614],[-9.521,6.785],[9.116,7.742]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[113.584,60.612],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":5,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,5.545],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[5.525,0]],"v":[[39.855,3.918],[39.855,-13.956],[-39.855,-13.956],[-39.855,13.956],[29.851,13.956]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.667,0.8629999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[113.857,108.956],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-95.5,54.501],[95.5,54.501],[95.5,-54.501],[-95.5,-54.501]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[114.5,80.501],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,305,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.6666667,0.8627451,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9137255,0.9372549,0.9529412,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"5.3.4","fr":30,"ip":0,"op":47,"w":310,"h":464,"nm":"Notifications","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"notification-01 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":7,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":14,"s":[100],"e":[100]},{"t":17}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,222.086,0],"ix":2},"a":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":7,"s":[115,73,0],"e":[115,83,0],"to":[0,1.66666662693024,0],"ti":[0,-1.66666662693024,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":14,"s":[115,83,0],"e":[115,83,0],"to":[0,0,0],"ti":[0,0,0]},{"t":17}],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":7,"s":[75,75,100],"e":[103,103,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"n":["0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167","0p833_0p833_0p167_0p167"],"t":14,"s":[103,103,100],"e":[100,100,100]},{"t":17}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.81,0.213],[3.849,-0.037],[3.849,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.064],[-3.849,1.004],[0.332,1.285]],"o":[[-3.849,-1.005],[-3.849,0.064],[-1.278,0.278],[0.203,0.942],[3.849,0.836],[3.849,0.038],[1.277,-0.334],[-0.225,-0.872]],"v":[[-54.525,-12.412],[-66.074,-13.557],[-77.622,-12.412],[-79.436,-9.584],[-77.622,-7.761],[-66.074,-6.617],[-54.525,-7.761],[-52.812,-10.691]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[1.162,0.067],[9.639,0.219],[9.64,-0.071],[9.64,-0.253],[9.639,-0.434],[-0.056,-1.284],[-1.181,-0.057],[-9.639,-0.168],[-9.639,-0.106],[-9.64,0.075],[-9.639,0.528],[0.07,1.285]],"o":[[-9.639,-0.53],[-9.64,-0.075],[-9.639,0.107],[-9.639,0.17],[-1.278,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.256],[9.64,0.071],[9.639,-0.219],[1.279,-0.07],[-0.064,-1.194]],"v":[[77.454,-12.377],[48.536,-13.335],[19.616,-13.505],[-9.303,-13.218],[-38.223,-12.377],[-40.434,-9.949],[-38.223,-7.727],[-9.303,-6.889],[19.616,-6.6],[48.536,-6.77],[77.454,-7.727],[79.643,-10.18]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.81,0.212],[3.85,-0.037],[3.851,-0.838],[-0.276,-1.284],[-0.879,-0.193],[-3.849,-0.063],[-3.85,1.005],[0.333,1.284]],"o":[[-3.85,-1.005],[-3.849,0.063],[-1.277,0.278],[0.203,0.941],[3.851,0.837],[3.85,0.038],[1.278,-0.333],[-0.224,-0.872]],"v":[[53.143,7.742],[41.594,6.597],[30.045,7.742],[28.232,10.569],[30.045,12.392],[41.594,13.536],[53.143,12.392],[54.855,9.463]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[-0.097,-1.15],[1.277,-0.109],[6.212,-0.219],[6.212,0.074],[6.212,0.254],[6.212,0.434],[0.081,1.174],[-1.278,0.088],[-6.211,0.169],[-6.212,0.107],[-6.211,-0.151],[-6.212,-0.529]],"o":[[0.108,1.284],[-6.212,0.529],[-6.211,0.15],[-6.212,-0.107],[-6.211,-0.17],[-1.137,-0.078],[-0.089,-1.286],[6.212,-0.434],[6.212,-0.254],[6.212,-0.075],[6.212,0.219],[1.108,0.093]],"v":[[11.233,9.87],[9.116,12.392],[-9.521,13.349],[-28.156,13.52],[-46.791,13.232],[-65.426,12.392],[-67.579,10.229],[-65.426,7.742],[-46.791,6.902],[-28.156,6.614],[-9.521,6.785],[9.116,7.742]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.882352941176,0.886274509804,0.886274509804,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[113.584,60.612],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":5,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,5.545],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[5.525,0]],"v":[[39.855,3.918],[39.855,-13.956],[-39.855,-13.956],[-39.855,13.956],[29.851,13.956]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.003921568627,0.376470588235,0.529411764706,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[113.857,108.956],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-95.5,54.501],[95.5,54.501],[95.5,-54.501],[-95.5,-54.501]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[114.5,80.501],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.003921568627,0.376470588235,0.529411764706,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.964705882353,0.964705882353,0.964705882353,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/post.json b/WordPress/src/main/assets/login_anims/post.json index 2b47826b9df9..69b51fbdd20e 100644 --- a/WordPress/src/main/assets/login_anims/post.json +++ b/WordPress/src/main/assets/login_anims/post.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":135,"w":310,"h":464,"nm":"post-on-the-go","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":34,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":36,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":82,"s":[100],"e":[0]},{"t":84}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,0.228],[-4.59,0.075],[-4.589,-1.191],[0.396,-1.524],[0.966,-0.253],[4.589,0.044],[4.59,0.992],[-0.329,1.524]],"o":[[4.59,-0.993],[4.589,-0.045],[1.524,0.395],[-0.267,1.034],[-4.589,1.191],[-4.59,-0.075],[-1.522,-0.329],[0.241,-1.116]],"v":[[-13.742,-2.757],[0.027,-4.115],[13.794,-2.757],[15.836,0.717],[13.794,2.758],[0.027,4.116],[-13.742,2.758],[-15.903,-0.596]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[169.994,185.684],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":22,"op":84,"st":22,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 5 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":28,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[100],"e":[0]},{"t":86}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,0.228],[-4.589,0.075],[-4.589,-1.191],[0.395,-1.524],[0.965,-0.253],[4.59,0.044],[4.589,0.992],[-0.329,1.524]],"o":[[4.589,-0.993],[4.59,-0.045],[1.523,0.395],[-0.268,1.034],[-4.589,1.191],[-4.589,-0.075],[-1.523,-0.329],[0.242,-1.116]],"v":[[-13.741,-2.757],[0.027,-4.115],[13.795,-2.757],[15.837,0.717],[13.795,2.758],[0.027,4.116],[-13.741,2.758],[-15.903,-0.596]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[126.146,185.684],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":20,"op":86,"st":20,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":25,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":27,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":87,"s":[100],"e":[0]},{"t":89}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.2],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.13,-1.524],[1.323,-0.111],[7.415,-0.26],[7.416,0.088],[7.415,0.301],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.515],[7.415,-0.303],[7.416,-0.089],[7.415,0.259],[1.525,0.129],[-0.115,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.202],[-1.525,-0.106],[0.097,-1.396]],"v":[[-44.611,-2.761],[-22.365,-3.757],[-0.12,-4.1],[22.126,-3.897],[44.372,-2.761],[46.899,0.234],[44.372,2.762],[22.126,3.898],[-0.12,4.101],[-22.365,3.759],[-44.611,2.762],[-47.181,-0.191]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[47.029,185.684],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":17,"op":89,"st":17,"bm":0,"sr":1},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 3 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":16,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":93,"s":[100],"e":[0]},{"t":95}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.302,0.067],[-10.625,0.201],[-10.625,0.127],[-10.625,-0.089],[-10.625,-0.629],[0.077,-1.525],[1.279,-0.081],[10.624,-0.259],[10.624,0.084],[10.624,0.302],[10.624,0.515],[-0.063,1.525]],"o":[[10.624,-0.515],[10.624,-0.302],[10.624,-0.084],[10.624,0.26],[1.408,0.083],[-0.071,1.419],[-10.625,0.628],[-10.625,0.09],[-10.625,-0.127],[-10.625,-0.201],[-1.409,-0.068],[0.06,-1.439]],"v":[[-63.704,-2.761],[-31.83,-3.758],[0.043,-4.1],[31.917,-3.898],[63.79,-2.761],[66.2,0.151],[63.79,2.761],[31.917,3.897],[0.043,4.1],[-31.83,3.758],[-63.704,2.761],[-66.14,-0.123]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[163.797,162.199],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":11,"op":95,"st":11,"bm":0,"sr":1},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 7 Outlines","ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":9,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":95,"s":[100],"e":[0]},{"t":97}]},"r":{"a":0,"k":0},"p":{"a":0,"k":[155.028,232.392,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.33,0.107],[-6.293,0.2],[-6.293,0.127],[-6.294,-0.179],[-6.293,-0.628],[0.153,-1.525],[1.288,-0.126],[6.292,-0.26],[6.293,0.089],[6.293,0.301],[6.292,0.515],[-0.125,1.525]],"o":[[6.292,-0.515],[6.293,-0.303],[6.293,-0.089],[6.292,0.259],[1.525,0.152],[-0.133,1.338],[-6.293,0.629],[-6.294,0.179],[-6.293,-0.127],[-6.293,-0.202],[-1.525,-0.124],[0.112,-1.373]],"v":[[-37.884,-2.761],[-19.005,-3.757],[-0.126,-4.1],[18.754,-3.897],[37.633,-2.761],[40.118,0.276],[37.633,2.761],[18.754,3.898],[-0.126,4.1],[-19.005,3.759],[-37.884,2.761],[-40.42,-0.225]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[40.271,162.189],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":9,"op":97,"st":9,"bm":0,"sr":1},{"ddd":0,"ind":6,"ty":4,"nm":"text-bodymovin Outlines 2","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,232.087,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.076],[-4.594,1.193],[-0.268,1.037],[1.526,0.396],[4.595,-0.044],[4.595,-0.993]],"o":[[-0.33,1.524],[4.595,0.995],[4.595,0.044],[0.967,-0.254],[0.396,-1.525],[-4.594,-1.192],[-4.596,0.076],[-1.049,0.228]],"v":[[-114.981,28.062],[-112.816,31.42],[-99.03,32.78],[-85.245,31.42],[-83.2,29.375],[-85.245,25.897],[-99.03,24.538],[-112.816,25.897]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.084],[10.624,0.259],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.514],[10.624,0.302],[10.624,0.085],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-28.749],[-14.908,-25.863],[16.966,-24.867],[48.839,-24.525],[80.713,-24.728],[112.586,-25.863],[114.996,-28.474],[112.586,-31.387],[80.713,-32.522],[48.839,-32.725],[16.966,-32.383],[-14.908,-31.387]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.293,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.26],[6.293,-0.088],[6.294,-0.302],[6.293,-0.515]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.302],[6.293,0.088],[6.292,-0.26],[1.288,-0.128],[0.152,-1.525],[-6.293,-0.628],[-6.294,-0.179],[-6.293,0.127],[-6.293,0.201],[-1.329,0.107]],"v":[[-115.149,-28.861],[-112.613,-25.874],[-93.734,-24.878],[-74.855,-24.535],[-55.975,-24.738],[-37.096,-25.874],[-34.61,-28.36],[-37.096,-31.397],[-55.975,-32.533],[-74.855,-32.736],[-93.734,-32.393],[-112.613,-31.397]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.065,-1.438],[-1.526,-0.067],[-11.508,-0.201],[-11.508,-0.127],[-11.508,0.089],[-11.508,0.629],[-0.077,1.419],[1.525,0.083],[11.507,0.259],[11.507,-0.084],[11.507,-0.303],[11.507,-0.515]],"o":[[-0.068,1.525],[11.507,0.515],[11.507,0.302],[11.507,0.084],[11.507,-0.26],[1.385,-0.08],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.09],[-11.508,0.127],[-11.508,0.2],[-1.41,0.067]],"v":[[-68.421,28.495],[-65.783,31.379],[-31.26,32.376],[3.262,32.718],[37.785,32.516],[72.308,31.379],[74.918,28.769],[72.308,25.857],[37.785,24.721],[3.262,24.518],[-31.26,24.861],[-65.783,25.857]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.396],[4.596,-0.044],[4.595,-0.994]],"o":[[-0.329,1.526],[4.595,0.994],[4.596,0.044],[0.967,-0.253],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.075],[-1.049,0.229]],"v":[[-0.778,-0.621],[1.387,2.738],[15.173,4.097],[28.959,2.738],[31.003,0.693],[28.959,-2.785],[15.173,-4.144],[1.387,-2.785]],"c":true}},"nm":"Path 5","mn":"ADBE Vector Shape - Group"},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.629],[0.129,-1.525],[1.323,-0.111],[7.415,-0.259],[7.415,0.089],[7.416,0.303],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.514],[7.416,-0.302],[7.415,-0.088],[7.415,0.259],[1.526,0.129],[-0.116,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.2],[-1.525,-0.106],[0.096,-1.396]],"v":[[-112.582,-2.785],[-90.336,-3.782],[-68.09,-4.124],[-45.844,-3.921],[-23.599,-2.785],[-21.071,0.21],[-23.599,2.738],[-45.844,3.874],[-68.09,4.077],[-90.336,3.734],[-112.582,2.738],[-115.151,-0.215]],"c":true}},"nm":"Path 6","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,104.848],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":7,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":7,"ty":4,"nm":"text-bodymovin Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,232.087,0]},"a":{"a":0,"k":[115,100,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[12.516,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,-12.516],[0,0],[0,0],[0,0]],"v":[[-96.144,18.343],[115.035,18.343],[115.035,4.32],[92.373,-18.343],[-115,-18.343],[-115,18.343]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,18.343],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":8,"ty":4,"nm":"Image Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10,"s":[155,374,0],"e":[155,402,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":12,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":25,"s":[155,402,0],"e":[155,430,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":27,"s":[155,430,0],"e":[155,430,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":87,"s":[155,430,0],"e":[155,402,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":89,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":94,"s":[155,402,0],"e":[155,374,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"t":96}]},"a":{"a":0,"k":[115,70,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.881],[44.378,51.841],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.112],[-48.045,-6.995],[0,0],[0,0],[1.83,0]],"v":[[115,46.772],[115,19.79],[56.449,-6.075],[-115,-50.085],[-115,50.085],[111.687,50.085]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,89.771],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-115,-70.001],[115,-70.001],[115,69.999],[-115,69.999]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ty":"mm","mm":4,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,70.001],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":4,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":9,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,305,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"5.3.4","fr":30,"ip":0,"op":135,"w":310,"h":464,"nm":"post-on-the-go","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 4 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":34,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":36,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":82,"s":[100],"e":[0]},{"t":84}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,0.228],[-4.59,0.075],[-4.589,-1.191],[0.396,-1.524],[0.966,-0.253],[4.589,0.044],[4.59,0.992],[-0.329,1.524]],"o":[[4.59,-0.993],[4.589,-0.045],[1.524,0.395],[-0.267,1.034],[-4.589,1.191],[-4.59,-0.075],[-1.522,-0.329],[0.241,-1.116]],"v":[[-13.742,-2.757],[0.027,-4.115],[13.794,-2.757],[15.836,0.717],[13.794,2.758],[0.027,4.116],[-13.742,2.758],[-15.903,-0.596]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[169.994,185.684],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":22,"op":84,"st":22,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Layer 5 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":28,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":30,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":84,"s":[100],"e":[0]},{"t":86}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,0.228],[-4.589,0.075],[-4.589,-1.191],[0.395,-1.524],[0.965,-0.253],[4.59,0.044],[4.589,0.992],[-0.329,1.524]],"o":[[4.589,-0.993],[4.59,-0.045],[1.523,0.395],[-0.268,1.034],[-4.589,1.191],[-4.589,-0.075],[-1.523,-0.329],[0.242,-1.116]],"v":[[-13.741,-2.757],[0.027,-4.115],[13.795,-2.757],[15.837,0.717],[13.795,2.758],[0.027,4.116],[-13.741,2.758],[-15.903,-0.596]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[126.146,185.684],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":20,"op":86,"st":20,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Layer 6 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":25,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":27,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":87,"s":[100],"e":[0]},{"t":89}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.2],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.13,-1.524],[1.323,-0.111],[7.415,-0.26],[7.416,0.088],[7.415,0.301],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.515],[7.415,-0.303],[7.416,-0.089],[7.415,0.259],[1.525,0.129],[-0.115,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.202],[-1.525,-0.106],[0.097,-1.396]],"v":[[-44.611,-2.761],[-22.365,-3.757],[-0.12,-4.1],[22.126,-3.897],[44.372,-2.761],[46.899,0.234],[44.372,2.762],[22.126,3.898],[-0.12,4.101],[-22.365,3.759],[-44.611,2.762],[-47.181,-0.191]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[47.029,185.684],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":17,"op":89,"st":17,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Layer 3 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":16,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":18,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":93,"s":[100],"e":[0]},{"t":95}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.302,0.067],[-10.625,0.201],[-10.625,0.127],[-10.625,-0.089],[-10.625,-0.629],[0.077,-1.525],[1.279,-0.081],[10.624,-0.259],[10.624,0.084],[10.624,0.302],[10.624,0.515],[-0.063,1.525]],"o":[[10.624,-0.515],[10.624,-0.302],[10.624,-0.084],[10.624,0.26],[1.408,0.083],[-0.071,1.419],[-10.625,0.628],[-10.625,0.09],[-10.625,-0.127],[-10.625,-0.201],[-1.409,-0.068],[0.06,-1.439]],"v":[[-63.704,-2.761],[-31.83,-3.758],[0.043,-4.1],[31.917,-3.898],[63.79,-2.761],[66.2,0.151],[63.79,2.761],[31.917,3.897],[0.043,4.1],[-31.83,3.758],[-63.704,2.761],[-66.14,-0.123]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[163.797,162.199],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":11,"op":95,"st":11,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Layer 7 Outlines","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":9,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":11,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"n":["0p833_0p833_0p167_0p167"],"t":95,"s":[100],"e":[0]},{"t":97}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155.028,232.392,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.33,0.107],[-6.293,0.2],[-6.293,0.127],[-6.294,-0.179],[-6.293,-0.628],[0.153,-1.525],[1.288,-0.126],[6.292,-0.26],[6.293,0.089],[6.293,0.301],[6.292,0.515],[-0.125,1.525]],"o":[[6.292,-0.515],[6.293,-0.303],[6.293,-0.089],[6.292,0.259],[1.525,0.152],[-0.133,1.338],[-6.293,0.629],[-6.294,0.179],[-6.293,-0.127],[-6.293,-0.202],[-1.525,-0.124],[0.112,-1.373]],"v":[[-37.884,-2.761],[-19.005,-3.757],[-0.126,-4.1],[18.754,-3.897],[37.633,-2.761],[40.118,0.276],[37.633,2.761],[18.754,3.898],[-0.126,4.1],[-19.005,3.759],[-37.884,2.761],[-40.42,-0.225]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[40.271,162.189],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":9,"op":97,"st":9,"bm":0},{"ddd":0,"ind":6,"ty":4,"nm":"text-bodymovin Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,232.087,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.076],[-4.594,1.193],[-0.268,1.037],[1.526,0.396],[4.595,-0.044],[4.595,-0.993]],"o":[[-0.33,1.524],[4.595,0.995],[4.595,0.044],[0.967,-0.254],[0.396,-1.525],[-4.594,-1.192],[-4.596,0.076],[-1.049,0.228]],"v":[[-114.981,28.062],[-112.816,31.42],[-99.03,32.78],[-85.245,31.42],[-83.2,29.375],[-85.245,25.897],[-99.03,24.538],[-112.816,25.897]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.084],[10.624,0.259],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.514],[10.624,0.302],[10.624,0.085],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-28.749],[-14.908,-25.863],[16.966,-24.867],[48.839,-24.525],[80.713,-24.728],[112.586,-25.863],[114.996,-28.474],[112.586,-31.387],[80.713,-32.522],[48.839,-32.725],[16.966,-32.383],[-14.908,-31.387]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.293,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.26],[6.293,-0.088],[6.294,-0.302],[6.293,-0.515]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.302],[6.293,0.088],[6.292,-0.26],[1.288,-0.128],[0.152,-1.525],[-6.293,-0.628],[-6.294,-0.179],[-6.293,0.127],[-6.293,0.201],[-1.329,0.107]],"v":[[-115.149,-28.861],[-112.613,-25.874],[-93.734,-24.878],[-74.855,-24.535],[-55.975,-24.738],[-37.096,-25.874],[-34.61,-28.36],[-37.096,-31.397],[-55.975,-32.533],[-74.855,-32.736],[-93.734,-32.393],[-112.613,-31.397]],"c":true},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.065,-1.438],[-1.526,-0.067],[-11.508,-0.201],[-11.508,-0.127],[-11.508,0.089],[-11.508,0.629],[-0.077,1.419],[1.525,0.083],[11.507,0.259],[11.507,-0.084],[11.507,-0.303],[11.507,-0.515]],"o":[[-0.068,1.525],[11.507,0.515],[11.507,0.302],[11.507,0.084],[11.507,-0.26],[1.385,-0.08],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.09],[-11.508,0.127],[-11.508,0.2],[-1.41,0.067]],"v":[[-68.421,28.495],[-65.783,31.379],[-31.26,32.376],[3.262,32.718],[37.785,32.516],[72.308,31.379],[74.918,28.769],[72.308,25.857],[37.785,24.721],[3.262,24.518],[-31.26,24.861],[-65.783,25.857]],"c":true},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.396],[4.596,-0.044],[4.595,-0.994]],"o":[[-0.329,1.526],[4.595,0.994],[4.596,0.044],[0.967,-0.253],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.075],[-1.049,0.229]],"v":[[-0.778,-0.621],[1.387,2.738],[15.173,4.097],[28.959,2.738],[31.003,0.693],[28.959,-2.785],[15.173,-4.144],[1.387,-2.785]],"c":true},"ix":2},"nm":"Path 5","mn":"ADBE Vector Shape - Group","hd":false},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[-1.357,0.093],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.629],[0.129,-1.525],[1.323,-0.111],[7.415,-0.259],[7.415,0.089],[7.416,0.303],[7.415,0.514],[-0.106,1.525]],"o":[[7.415,-0.514],[7.416,-0.302],[7.415,-0.088],[7.415,0.259],[1.526,0.129],[-0.116,1.367],[-7.415,0.628],[-7.415,0.179],[-7.415,-0.127],[-7.415,-0.2],[-1.525,-0.106],[0.096,-1.396]],"v":[[-112.582,-2.785],[-90.336,-3.782],[-68.09,-4.124],[-45.844,-3.921],[-23.599,-2.785],[-21.071,0.21],[-23.599,2.738],[-45.844,3.874],[-68.09,4.077],[-90.336,3.734],[-112.582,2.738],[-115.151,-0.215]],"c":true},"ix":2},"nm":"Path 6","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.847058823529,0.870588235294,0.894117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[115,104.848],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":7,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"text-bodymovin Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,232.087,0],"ix":2},"a":{"a":0,"k":[115,100,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[12.516,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,-12.516],[0,0],[0,0],[0,0]],"v":[[-96.144,18.343],[115.035,18.343],[115.035,4.32],[92.373,-18.343],[-115,-18.343],[-115,18.343]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294117647,0.576470588235,0.678431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[115,18.343],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":4,"nm":"Image Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":10,"s":[155,374,0],"e":[155,402,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":12,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":25,"s":[155,402,0],"e":[155,430,0],"to":[0,4.66666650772095,0],"ti":[0,-4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":27,"s":[155,430,0],"e":[155,430,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":87,"s":[155,430,0],"e":[155,402,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":89,"s":[155,402,0],"e":[155,402,0],"to":[0,0,0],"ti":[0,0,0]},{"i":{"x":0.833,"y":0.833},"o":{"x":0.167,"y":0.167},"n":"0p833_0p833_0p167_0p167","t":94,"s":[155,402,0],"e":[155,374,0],"to":[0,-4.66666650772095,0],"ti":[0,4.66666650772095,0]},{"t":96}],"ix":2},"a":{"a":0,"k":[115,70,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.881],[44.378,51.841],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.112],[-48.045,-6.995],[0,0],[0,0],[1.83,0]],"v":[[115,46.772],[115,19.79],[56.449,-6.075],[-115,-50.085],[-115,50.085],[111.687,50.085]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.435294117647,0.576470588235,0.678431372549,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[115,89.771],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.733333333333,0.788235294118,0.835294117647,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[115,70.001],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":4,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.003921568627,0.376470588235,0.529411764706,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153.328,303.21],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/reader.json b/WordPress/src/main/assets/login_anims/reader.json index 900748778ed3..0b8560c5c9e6 100644 --- a/WordPress/src/main/assets/login_anims/reader.json +++ b/WordPress/src/main/assets/login_anims/reader.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":150,"w":306,"h":462,"nm":"Reader","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"iphone-outline Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[153,303,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,2.5],[135,2.5],[135,-2.5],[-135,-2.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,113.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[135,-192],[135,-187],[135,243],[-135,243],[-135,-187],[-135,-192],[-135,-246],[135,-246]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[23.1,0],[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0]],"o":[[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1]],"v":[[111,-303],[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":4,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Cards Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.967],"y":[1]},"o":{"x":[0.158],"y":[0]},"n":["0p967_1_0p158_0"],"t":10,"s":[153],"e":[153]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0]},"n":["0p833_1_0p205_0"],"t":46,"s":[153],"e":[153]},{"i":{"x":[0.985],"y":[1]},"o":{"x":[0.015],"y":[0]},"n":["0p985_1_0p015_0"],"t":90,"s":[153],"e":[153]},{"t":110}]},"y":{"a":1,"k":[{"i":{"x":[0.069],"y":[1]},"o":{"x":[0.216],"y":[0]},"n":["0p069_1_0p216_0"],"t":10,"s":[431],"e":[97]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0.185]},"n":["0p833_1_0p205_0p185"],"t":44,"s":[97],"e":[97]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0_1_0p301_0"],"t":90,"s":[97],"e":[431]},{"t":118}]}},"a":{"a":0,"k":[115,300,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,-0.229],[-4.59,-0.075],[-4.589,1.191],[0.396,1.524],[0.966,0.253],[4.589,-0.044],[4.59,-0.992],[-0.329,-1.524]],"o":[[4.59,0.992],[4.589,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.589,-1.191],[-4.59,0.075],[-1.522,0.329],[0.241,1.115]],"v":[[41.252,-80.641],[55.021,-79.284],[68.788,-80.641],[70.83,-84.115],[68.788,-86.157],[55.021,-87.514],[41.252,-86.157],[39.091,-82.802]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.048,-0.229],[-4.589,-0.075],[-4.588,1.191],[0.396,1.524],[0.966,0.253],[4.59,-0.044],[4.589,-0.992],[-0.329,-1.524]],"o":[[4.589,0.992],[4.59,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.588,-1.191],[-4.589,0.075],[-1.523,0.329],[0.241,1.115]],"v":[[-2.595,-80.641],[11.173,-79.284],[24.94,-80.641],[26.982,-84.115],[24.94,-86.157],[11.173,-87.514],[-2.595,-86.157],[-4.757,-82.802]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-1.358,-0.093],[-7.415,-0.201],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[0.129,1.525],[1.323,0.112],[7.415,0.259],[7.415,-0.088],[7.416,-0.301],[7.415,-0.514],[-0.106,-1.526]],"o":[[7.415,0.515],[7.416,0.302],[7.415,0.088],[7.415,-0.26],[1.526,-0.129],[-0.116,-1.366],[-7.415,-0.627],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.526,0.107],[0.096,1.395]],"v":[[-112.581,-80.637],[-90.336,-79.641],[-68.09,-79.298],[-45.844,-79.501],[-23.599,-80.637],[-21.071,-83.633],[-23.599,-86.161],[-45.844,-87.296],[-68.09,-87.499],[-90.336,-87.157],[-112.581,-86.161],[-115.151,-83.207]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.522,-0.329],[-4.59,-0.076],[-4.589,1.191],[-0.267,1.035],[1.524,0.396],[4.589,-0.044],[4.59,-0.992]],"o":[[-0.329,1.523],[4.59,0.993],[4.589,0.044],[0.966,-0.253],[0.396,-1.523],[-4.589,-1.191],[-4.59,0.075],[-1.047,0.229]],"v":[[39.091,177.251],[41.252,180.605],[55.021,181.963],[68.788,180.605],[70.83,178.563],[68.788,175.089],[55.021,173.732],[41.252,175.089]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.523,-0.329],[-4.589,-0.076],[-4.588,1.191],[-0.267,1.035],[1.524,0.396],[4.59,-0.044],[4.589,-0.992]],"o":[[-0.329,1.523],[4.589,0.993],[4.59,0.044],[0.966,-0.253],[0.396,-1.523],[-4.588,-1.191],[-4.589,0.075],[-1.048,0.229]],"v":[[-4.757,177.251],[-2.595,180.605],[11.173,181.963],[24.94,180.605],[26.982,178.563],[24.94,175.089],[11.173,173.732],[-2.595,175.089]],"c":true}},"nm":"Path 5","mn":"ADBE Vector Shape - Group"},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.096,-1.396],[-1.526,-0.105],[-7.415,-0.2],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[-0.116,1.366],[1.526,0.129],[7.415,0.26],[7.415,-0.088],[7.416,-0.301],[7.415,-0.515]],"o":[[-0.106,1.525],[7.415,0.515],[7.416,0.303],[7.415,0.089],[7.415,-0.259],[1.323,-0.111],[0.129,-1.526],[-7.415,-0.628],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.358,0.092]],"v":[[-115.151,177.656],[-112.581,180.609],[-90.336,181.605],[-68.09,181.948],[-45.844,181.745],[-23.599,180.609],[-21.071,178.082],[-23.599,175.086],[-45.844,173.95],[-68.09,173.747],[-90.336,174.089],[-112.581,175.086]],"c":true}},"nm":"Path 6","mn":"ADBE Vector Shape - Group"},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.259],[10.624,-0.084],[10.624,-0.303],[10.624,-0.514]],"o":[[-0.063,1.525],[10.624,0.513],[10.624,0.301],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.525],[-10.625,-0.628],[-10.625,-0.089],[-10.625,0.127],[-10.625,0.2],[-1.302,0.068]],"v":[[-17.344,154.239],[-14.908,157.125],[16.966,158.121],[48.839,158.463],[80.713,158.26],[112.586,157.125],[114.996,154.513],[112.586,151.601],[80.713,150.465],[48.839,150.262],[16.966,150.605],[-14.908,151.601]],"c":true}},"nm":"Path 7","mn":"ADBE Vector Shape - Group"},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.178],[-6.293,0.628],[-0.134,1.337],[1.525,0.153],[6.292,0.259],[6.294,-0.088],[6.294,-0.301],[6.293,-0.514]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.303],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.627],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.202],[-1.329,0.108]],"v":[[-115.149,154.127],[-112.613,157.114],[-93.734,158.11],[-74.855,158.453],[-55.975,158.25],[-37.096,157.114],[-34.61,154.628],[-37.096,151.59],[-55.975,150.455],[-74.855,150.252],[-93.734,150.594],[-112.613,151.59]],"c":true}},"nm":"Path 8","mn":"ADBE Vector Shape - Group"},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.329],[-4.595,-0.075],[-4.594,1.193],[-0.268,1.036],[1.526,0.396],[4.595,-0.045],[4.595,-0.994]],"o":[[-0.33,1.526],[4.595,0.994],[4.595,0.045],[0.967,-0.253],[0.396,-1.525],[-4.594,-1.193],[-4.595,0.075],[-1.049,0.229]],"v":[[-114.981,-121.151],[-112.816,-117.792],[-99.03,-116.433],[-85.245,-117.792],[-83.2,-119.837],[-85.245,-123.315],[-99.03,-124.674],[-112.816,-123.315]],"c":true}},"nm":"Path 9","mn":"ADBE Vector Shape - Group"},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.068],[-10.625,-0.201],[-10.625,-0.127],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.26],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.515],[10.624,0.302],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-177.961],[-14.908,-175.076],[16.966,-174.079],[48.839,-173.737],[80.713,-173.94],[112.586,-175.076],[114.996,-177.686],[112.586,-180.599],[80.713,-181.735],[48.839,-181.937],[16.966,-181.595],[-14.908,-180.599]],"c":true}},"nm":"Path 10","mn":"ADBE Vector Shape - Group"},{"ind":10,"ty":"sh","ix":11,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.259],[6.294,-0.089],[6.294,-0.303],[6.293,-0.515]],"o":[[-0.125,1.526],[6.293,0.514],[6.294,0.302],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.628],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.2],[-1.329,0.107]],"v":[[-115.149,-178.074],[-112.613,-175.086],[-93.734,-174.09],[-74.855,-173.747],[-55.975,-173.95],[-37.096,-175.086],[-34.61,-177.572],[-37.096,-180.609],[-55.975,-181.745],[-74.855,-181.948],[-93.734,-181.605],[-112.613,-180.609]],"c":true}},"nm":"Path 11","mn":"ADBE Vector Shape - Group"},{"ind":11,"ty":"sh","ix":12,"ks":{"a":0,"k":{"i":[[0.065,-1.439],[-1.526,-0.069],[-11.508,-0.201],[-11.508,-0.126],[-11.508,0.09],[-11.508,0.628],[-0.077,1.418],[1.525,0.084],[11.507,0.26],[11.508,-0.084],[11.507,-0.302],[11.507,-0.514]],"o":[[-0.068,1.525],[11.507,0.514],[11.507,0.302],[11.508,0.084],[11.507,-0.258],[1.385,-0.081],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.089],[-11.508,0.127],[-11.508,0.201],[-1.41,0.068]],"v":[[-68.421,-120.717],[-65.783,-117.832],[-31.26,-116.836],[3.262,-116.494],[37.785,-116.697],[72.308,-117.832],[74.918,-120.443],[72.308,-123.356],[37.785,-124.492],[3.262,-124.695],[-31.26,-124.352],[-65.783,-123.356]],"c":true}},"nm":"Path 12","mn":"ADBE Vector Shape - Group"},{"ind":12,"ty":"sh","ix":13,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.395],[4.596,-0.044],[4.595,-0.995]],"o":[[-0.329,1.525],[4.595,0.993],[4.596,0.045],[0.967,-0.254],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.076],[-1.049,0.228]],"v":[[-0.778,-149.833],[1.387,-146.474],[15.173,-145.116],[28.959,-146.474],[31.003,-148.519],[28.959,-151.997],[15.173,-153.357],[1.387,-151.997]],"c":true}},"nm":"Path 13","mn":"ADBE Vector Shape - Group"},{"ind":13,"ty":"sh","ix":14,"ks":{"a":0,"k":{"i":[[-1.358,0.092],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.129,-1.525],[1.323,-0.111],[7.415,-0.26],[7.415,0.088],[7.416,0.302],[7.415,0.515],[-0.106,1.524]],"o":[[7.415,-0.515],[7.416,-0.302],[7.415,-0.089],[7.415,0.259],[1.526,0.128],[-0.116,1.367],[-7.415,0.628],[-7.415,0.178],[-7.415,-0.127],[-7.415,-0.201],[-1.526,-0.106],[0.096,-1.396]],"v":[[-112.581,-151.997],[-90.336,-152.994],[-68.09,-153.336],[-45.844,-153.133],[-23.599,-151.997],[-21.071,-149.002],[-23.599,-146.474],[-45.844,-145.338],[-68.09,-145.135],[-90.336,-145.478],[-112.581,-146.474],[-115.151,-149.427]],"c":true}},"nm":"Path 14","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,354.135],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":15,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.464,-1.615],[-2.528,5.622]],"o":[[-3.106,3.428],[1.811,-4.028]],"v":[[-1.597,-3.845],[2.892,-0.161]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[126.659,443.744],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.818,2.02],[3.963,-4.719]],"o":[[1.736,-4.288],[-2.84,3.382]],"v":[[-4.207,-0.767],[1.062,1.673]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[201.302,439.586],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.817,2.02],[2.556,-3.602]],"o":[[1.737,-4.288],[-2.555,3.602]],"v":[[-2.993,-1.016],[1.254,1.702]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[177.04,420.634],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.178,-0.091],[-4.251,1.194]],"o":[[-4.622,0.192],[4.252,-1.194]],"v":[[-0.38,-3.009],[0.751,1.905]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[198.404,379.927],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.456,-1.241],[-4.251,1.194]],"o":[[-4.456,1.241],[4.252,-1.194]],"v":[[-0.463,-2.434],[0.668,2.48]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.761,0.957,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[154.751,386.841],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.397,-1.477],[-0.458,-0.982],[-0.423,-0.219],[-0.108,-0.053],[-0.159,-0.008],[-0.338,0.02],[-1.422,0.465],[-2.715,1.657],[-2.597,1.948],[-4.737,4.567],[-4.492,4.831],[-4.051,5.145],[-2.962,5.657],[-0.774,2.887],[-0.142,0.714],[-0.036,0.346],[0,0],[0,0],[0.596,0.653],[1.319,0.095],[0.711,-0.06],[0.74,-0.225],[2.825,-1.639],[0,0],[0.339,0.585],[-0.445,0.375],[-3.349,1.406],[-2.038,0.076],[-0.261,-0.012],[0,0],[-0.268,-0.043],[0,0],[-0.267,-0.12],[0,0],[-0.462,-0.401],[-0.379,-0.473],[-0.265,-0.522],[-0.075,-1.012],[0.365,-1.807],[1.474,-3.168],[4.036,-5.49],[4.542,-5.015],[4.979,-4.615],[5.628,-3.936],[3.109,-1.6],[1.665,-0.631],[0.844,-0.289],[0.913,-0.167],[2.069,0.423],[0.509,0.181],[0.25,0.137],[0.223,0.216],[0.332,1.105],[-0.788,1.626],[-1.188,1.25],[-0.246,-0.233],[0.132,-0.239]],"o":[[-0.795,1.435],[-0.403,1.458],[0.264,0.452],[0.081,0.076],[0.129,0.035],[0.297,0.03],[1.236,0.071],[2.852,-0.899],[2.757,-1.605],[5.206,-3.894],[4.799,-4.498],[4.516,-4.81],[4.032,-5.149],[1.473,-2.818],[0.229,-0.729],[0.063,-0.355],[0,0],[0,0],[-0.028,-1.302],[-0.571,-0.67],[-0.644,-0.077],[-0.722,0.14],[-2.974,0.781],[0,0],[-0.584,0.338],[-0.302,-0.52],[2.62,-2.218],[1.671,-0.705],[0.255,-0.007],[0,0],[0.267,0.03],[0,0],[0.272,0.088],[0,0],[0.544,0.251],[0.496,0.378],[0.367,0.485],[0.404,1.042],[0.202,2.043],[-0.705,3.637],[-3.008,6.314],[-4.055,5.482],[-4.58,4.981],[-5.027,4.557],[-2.822,1.957],[-1.561,0.785],[-0.811,0.344],[-0.874,0.25],[-1.813,0.335],[-0.504,-0.07],[-0.256,-0.078],[-0.247,-0.163],[-0.96,-0.749],[-0.497,-2.26],[0.819,-1.639],[0.233,-0.245],[0.207,0.197],[0,0]],"v":[[-38.758,32.822],[-40.631,37.209],[-40.629,41.168],[-39.655,42.181],[-39.309,42.323],[-38.941,42.447],[-38.075,42.566],[-33.98,41.953],[-25.566,37.936],[-17.577,32.487],[-2.702,19.679],[11.171,5.569],[24.045,-9.373],[34.8,-25.553],[38.298,-34.177],[38.743,-36.321],[38.834,-37.353],[38.876,-37.867],[38.848,-38.345],[37.918,-41.382],[35.012,-42.575],[32.942,-42.502],[30.75,-42.031],[22.038,-38.12],[22.031,-38.116],[20.359,-38.561],[20.627,-40.108],[29.515,-45.652],[35.053,-46.937],[35.818,-46.957],[36.617,-46.881],[37.418,-46.784],[38.238,-46.552],[39.051,-46.281],[39.845,-45.866],[41.305,-44.798],[42.474,-43.421],[43.288,-41.882],[44.039,-38.76],[43.681,-32.991],[40.156,-22.894],[29.27,-5.393],[16.249,10.255],[1.924,24.636],[-13.991,37.469],[-22.864,42.84],[-27.696,44.975],[-30.238,45.846],[-32.911,46.478],[-38.747,46.546],[-40.302,46.046],[-41.065,45.639],[-41.794,45.148],[-43.744,42.192],[-42.832,36.36],[-39.729,32.085],[-38.862,32.063],[-38.748,32.804]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.518,0.753,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[76.621,402.73],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.953,-21.002],[21.895,7.258],[-2.144,21.472],[-21.188,-4.084]],"o":[[-4.953,21.002],[-20.482,-6.789],[2.407,-24.099],[22.139,4.268]],"v":[[36.814,8.758],[-9.791,35.815],[-39.622,-7.907],[6.122,-38.989]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[77.475,404.954],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[115,69.859],[-115.538,69.859],[-115.538,-69.859],[115,-69.859]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,403.141],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.882],[44.378,51.842],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.111],[-48.045,-6.994],[0,0],[0,0],[1.83,0]],"v":[[115,46.771],[115,19.788],[56.449,-6.074],[-115,-50.084],[-115,50.084],[111.687,50.084]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,89.771],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,70],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"Background","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[153,303,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,244.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"4.7.0","fr":30,"ip":0,"op":150,"w":306,"h":462,"nm":"Reader","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Mask Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[152.724,28.147,0]},"a":{"a":0,"k":[135,217.5,0]},"s":{"a":0,"k":[84.074,13.103,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0]],"o":[[0,0]],"v":[[185.879,-169.017]],"c":false}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"st","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"w":{"a":0,"k":2},"lc":1,"lj":1,"ml":4,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke"},{"ty":"fl","c":{"a":0,"k":[0.1372549,0.2078431,0.2941176,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Shape 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-134.937,27.126],[135.188,27.06],[135.25,-27.016],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.0039216,0.3764706,0.5294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[135.174,643.654],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[118.777,759.676],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,0]],"v":[[-141.244,223.056],[146.374,223.056],[136.711,-211.481],[-136.783,-210.554],[-140.45,-160.256]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.1372549,0.2078431,0.2941177,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[135,217.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100.332,103.011],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"Cards Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"s":true,"x":{"a":1,"k":[{"i":{"x":[0.967],"y":[1]},"o":{"x":[0.158],"y":[0]},"n":["0p967_1_0p158_0"],"t":10,"s":[153],"e":[153]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0]},"n":["0p833_1_0p205_0"],"t":46,"s":[153],"e":[153]},{"i":{"x":[0.985],"y":[1]},"o":{"x":[0.015],"y":[0]},"n":["0p985_1_0p015_0"],"t":90,"s":[153],"e":[153]},{"t":110}]},"y":{"a":1,"k":[{"i":{"x":[1],"y":[1]},"o":{"x":[0.167],"y":[0]},"n":["1_1_0p167_0"],"t":0,"s":[431],"e":[432]},{"i":{"x":[0.069],"y":[1]},"o":{"x":[0.216],"y":[0]},"n":["0p069_1_0p216_0"],"t":10,"s":[432],"e":[98]},{"i":{"x":[0.833],"y":[1]},"o":{"x":[0.205],"y":[0.185]},"n":["0p833_1_0p205_0p185"],"t":44,"s":[98],"e":[98]},{"i":{"x":[0],"y":[1]},"o":{"x":[0.301],"y":[0]},"n":["0_1_0p301_0"],"t":90,"s":[98],"e":[432]},{"t":118}]}},"a":{"a":0,"k":[115,300,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-1.047,-0.229],[-4.59,-0.075],[-4.589,1.191],[0.396,1.524],[0.966,0.253],[4.589,-0.044],[4.59,-0.992],[-0.329,-1.524]],"o":[[4.59,0.992],[4.589,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.589,-1.191],[-4.59,0.075],[-1.522,0.329],[0.241,1.115]],"v":[[41.252,-80.641],[55.021,-79.284],[68.788,-80.641],[70.83,-84.115],[68.788,-86.157],[55.021,-87.514],[41.252,-86.157],[39.091,-82.802]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-1.048,-0.229],[-4.589,-0.075],[-4.588,1.191],[0.396,1.524],[0.966,0.253],[4.59,-0.044],[4.589,-0.992],[-0.329,-1.524]],"o":[[4.589,0.992],[4.59,0.044],[1.524,-0.396],[-0.267,-1.035],[-4.588,-1.191],[-4.589,0.075],[-1.523,0.329],[0.241,1.115]],"v":[[-2.595,-80.641],[11.173,-79.284],[24.94,-80.641],[26.982,-84.115],[24.94,-86.157],[11.173,-87.514],[-2.595,-86.157],[-4.757,-82.802]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[-1.358,-0.093],[-7.415,-0.201],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[0.129,1.525],[1.323,0.112],[7.415,0.259],[7.415,-0.088],[7.416,-0.301],[7.415,-0.514],[-0.106,-1.526]],"o":[[7.415,0.515],[7.416,0.302],[7.415,0.088],[7.415,-0.26],[1.526,-0.129],[-0.116,-1.366],[-7.415,-0.627],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.526,0.107],[0.096,1.395]],"v":[[-112.581,-80.637],[-90.336,-79.641],[-68.09,-79.298],[-45.844,-79.501],[-23.599,-80.637],[-21.071,-83.633],[-23.599,-86.161],[-45.844,-87.296],[-68.09,-87.499],[-90.336,-87.157],[-112.581,-86.161],[-115.151,-83.207]],"c":true}},"nm":"Path 3","mn":"ADBE Vector Shape - Group"},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.522,-0.329],[-4.59,-0.076],[-4.589,1.191],[-0.267,1.035],[1.524,0.396],[4.589,-0.044],[4.59,-0.992]],"o":[[-0.329,1.523],[4.59,0.993],[4.589,0.044],[0.966,-0.253],[0.396,-1.523],[-4.589,-1.191],[-4.59,0.075],[-1.047,0.229]],"v":[[39.091,177.251],[41.252,180.605],[55.021,181.963],[68.788,180.605],[70.83,178.563],[68.788,175.089],[55.021,173.732],[41.252,175.089]],"c":true}},"nm":"Path 4","mn":"ADBE Vector Shape - Group"},{"ind":4,"ty":"sh","ix":5,"ks":{"a":0,"k":{"i":[[0.241,-1.116],[-1.523,-0.329],[-4.589,-0.076],[-4.588,1.191],[-0.267,1.035],[1.524,0.396],[4.59,-0.044],[4.589,-0.992]],"o":[[-0.329,1.523],[4.589,0.993],[4.59,0.044],[0.966,-0.253],[0.396,-1.523],[-4.588,-1.191],[-4.589,0.075],[-1.048,0.229]],"v":[[-4.757,177.251],[-2.595,180.605],[11.173,181.963],[24.94,180.605],[26.982,178.563],[24.94,175.089],[11.173,173.732],[-2.595,175.089]],"c":true}},"nm":"Path 5","mn":"ADBE Vector Shape - Group"},{"ind":5,"ty":"sh","ix":6,"ks":{"a":0,"k":{"i":[[0.096,-1.396],[-1.526,-0.105],[-7.415,-0.2],[-7.415,-0.127],[-7.415,0.178],[-7.415,0.628],[-0.116,1.366],[1.526,0.129],[7.415,0.26],[7.415,-0.088],[7.416,-0.301],[7.415,-0.515]],"o":[[-0.106,1.525],[7.415,0.515],[7.416,0.303],[7.415,0.089],[7.415,-0.259],[1.323,-0.111],[0.129,-1.526],[-7.415,-0.628],[-7.415,-0.179],[-7.415,0.127],[-7.415,0.202],[-1.358,0.092]],"v":[[-115.151,177.656],[-112.581,180.609],[-90.336,181.605],[-68.09,181.948],[-45.844,181.745],[-23.599,180.609],[-21.071,178.082],[-23.599,175.086],[-45.844,173.95],[-68.09,173.747],[-90.336,174.089],[-112.581,175.086]],"c":true}},"nm":"Path 6","mn":"ADBE Vector Shape - Group"},{"ind":6,"ty":"sh","ix":7,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.069],[-10.625,-0.201],[-10.625,-0.126],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.259],[10.624,-0.084],[10.624,-0.303],[10.624,-0.514]],"o":[[-0.063,1.525],[10.624,0.513],[10.624,0.301],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.525],[-10.625,-0.628],[-10.625,-0.089],[-10.625,0.127],[-10.625,0.2],[-1.302,0.068]],"v":[[-17.344,154.239],[-14.908,157.125],[16.966,158.121],[48.839,158.463],[80.713,158.26],[112.586,157.125],[114.996,154.513],[112.586,151.601],[80.713,150.465],[48.839,150.262],[16.966,150.605],[-14.908,151.601]],"c":true}},"nm":"Path 7","mn":"ADBE Vector Shape - Group"},{"ind":7,"ty":"sh","ix":8,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.178],[-6.293,0.628],[-0.134,1.337],[1.525,0.153],[6.292,0.259],[6.294,-0.088],[6.294,-0.301],[6.293,-0.514]],"o":[[-0.125,1.525],[6.293,0.515],[6.294,0.303],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.627],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.202],[-1.329,0.108]],"v":[[-115.149,154.127],[-112.613,157.114],[-93.734,158.11],[-74.855,158.453],[-55.975,158.25],[-37.096,157.114],[-34.61,154.628],[-37.096,151.59],[-55.975,150.455],[-74.855,150.252],[-93.734,150.594],[-112.613,151.59]],"c":true}},"nm":"Path 8","mn":"ADBE Vector Shape - Group"},{"ind":8,"ty":"sh","ix":9,"ks":{"a":0,"k":{"i":[[0.242,-1.117],[-1.525,-0.329],[-4.595,-0.075],[-4.594,1.193],[-0.268,1.036],[1.526,0.396],[4.595,-0.045],[4.595,-0.994]],"o":[[-0.33,1.526],[4.595,0.994],[4.595,0.045],[0.967,-0.253],[0.396,-1.525],[-4.594,-1.193],[-4.595,0.075],[-1.049,0.229]],"v":[[-114.981,-121.151],[-112.816,-117.792],[-99.03,-116.433],[-85.245,-117.792],[-83.2,-119.837],[-85.245,-123.315],[-99.03,-124.674],[-112.816,-123.315]],"c":true}},"nm":"Path 9","mn":"ADBE Vector Shape - Group"},{"ind":9,"ty":"sh","ix":10,"ks":{"a":0,"k":{"i":[[0.06,-1.438],[-1.408,-0.068],[-10.625,-0.201],[-10.625,-0.127],[-10.625,0.09],[-10.625,0.628],[-0.071,1.419],[1.408,0.083],[10.624,0.26],[10.624,-0.085],[10.624,-0.302],[10.624,-0.514]],"o":[[-0.063,1.526],[10.624,0.515],[10.624,0.302],[10.624,0.084],[10.624,-0.259],[1.279,-0.081],[0.077,-1.526],[-10.625,-0.628],[-10.625,-0.09],[-10.625,0.127],[-10.625,0.201],[-1.302,0.068]],"v":[[-17.344,-177.961],[-14.908,-175.076],[16.966,-174.079],[48.839,-173.737],[80.713,-173.94],[112.586,-175.076],[114.996,-177.686],[112.586,-180.599],[80.713,-181.735],[48.839,-181.937],[16.966,-181.595],[-14.908,-180.599]],"c":true}},"nm":"Path 10","mn":"ADBE Vector Shape - Group"},{"ind":10,"ty":"sh","ix":11,"ks":{"a":0,"k":{"i":[[0.112,-1.372],[-1.525,-0.125],[-6.293,-0.201],[-6.292,-0.127],[-6.294,0.179],[-6.293,0.628],[-0.134,1.338],[1.525,0.152],[6.292,0.259],[6.294,-0.089],[6.294,-0.303],[6.293,-0.515]],"o":[[-0.125,1.526],[6.293,0.514],[6.294,0.302],[6.294,0.088],[6.292,-0.26],[1.288,-0.128],[0.153,-1.526],[-6.293,-0.628],[-6.294,-0.179],[-6.292,0.127],[-6.293,0.2],[-1.329,0.107]],"v":[[-115.149,-178.074],[-112.613,-175.086],[-93.734,-174.09],[-74.855,-173.747],[-55.975,-173.95],[-37.096,-175.086],[-34.61,-177.572],[-37.096,-180.609],[-55.975,-181.745],[-74.855,-181.948],[-93.734,-181.605],[-112.613,-180.609]],"c":true}},"nm":"Path 11","mn":"ADBE Vector Shape - Group"},{"ind":11,"ty":"sh","ix":12,"ks":{"a":0,"k":{"i":[[0.065,-1.439],[-1.526,-0.069],[-11.508,-0.201],[-11.508,-0.126],[-11.508,0.09],[-11.508,0.628],[-0.077,1.418],[1.525,0.084],[11.507,0.26],[11.508,-0.084],[11.507,-0.302],[11.507,-0.514]],"o":[[-0.068,1.525],[11.507,0.514],[11.507,0.302],[11.508,0.084],[11.507,-0.258],[1.385,-0.081],[0.084,-1.525],[-11.508,-0.628],[-11.508,-0.089],[-11.508,0.127],[-11.508,0.201],[-1.41,0.068]],"v":[[-68.421,-120.717],[-65.783,-117.832],[-31.26,-116.836],[3.262,-116.494],[37.785,-116.697],[72.308,-117.832],[74.918,-120.443],[72.308,-123.356],[37.785,-124.492],[3.262,-124.695],[-31.26,-124.352],[-65.783,-123.356]],"c":true}},"nm":"Path 12","mn":"ADBE Vector Shape - Group"},{"ind":12,"ty":"sh","ix":13,"ks":{"a":0,"k":{"i":[[0.242,-1.118],[-1.525,-0.33],[-4.596,-0.075],[-4.596,1.192],[-0.268,1.036],[1.525,0.395],[4.596,-0.044],[4.595,-0.995]],"o":[[-0.329,1.525],[4.595,0.993],[4.596,0.045],[0.967,-0.254],[0.396,-1.525],[-4.596,-1.193],[-4.596,0.076],[-1.049,0.228]],"v":[[-0.778,-149.833],[1.387,-146.474],[15.173,-145.116],[28.959,-146.474],[31.003,-148.519],[28.959,-151.997],[15.173,-153.357],[1.387,-151.997]],"c":true}},"nm":"Path 13","mn":"ADBE Vector Shape - Group"},{"ind":13,"ty":"sh","ix":14,"ks":{"a":0,"k":{"i":[[-1.358,0.092],[-7.415,0.201],[-7.415,0.127],[-7.415,-0.179],[-7.415,-0.628],[0.129,-1.525],[1.323,-0.111],[7.415,-0.26],[7.415,0.088],[7.416,0.302],[7.415,0.515],[-0.106,1.524]],"o":[[7.415,-0.515],[7.416,-0.302],[7.415,-0.089],[7.415,0.259],[1.526,0.128],[-0.116,1.367],[-7.415,0.628],[-7.415,0.178],[-7.415,-0.127],[-7.415,-0.201],[-1.526,-0.106],[0.096,-1.396]],"v":[[-112.581,-151.997],[-90.336,-152.994],[-68.09,-153.336],[-45.844,-153.133],[-23.599,-151.997],[-21.071,-149.002],[-23.599,-146.474],[-45.844,-145.338],[-68.09,-145.135],[-90.336,-145.478],[-112.581,-146.474],[-115.151,-149.427]],"c":true}},"nm":"Path 14","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.8470588,0.8705882,0.8941176,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,354.135],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":15,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.464,-1.615],[-2.528,5.622]],"o":[[-3.106,3.428],[1.811,-4.028]],"v":[[-1.597,-3.845],[2.892,-0.161]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[126.659,443.744],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.818,2.02],[3.963,-4.719]],"o":[[1.736,-4.288],[-2.84,3.382]],"v":[[-4.207,-0.767],[1.062,1.673]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[201.302,439.586],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[-0.817,2.02],[2.556,-3.602]],"o":[[1.737,-4.288],[-2.555,3.602]],"v":[[-2.993,-1.016],[1.254,1.702]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[177.04,420.634],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 4","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[2.178,-0.091],[-4.251,1.194]],"o":[[-4.622,0.192],[4.252,-1.194]],"v":[[-0.38,-3.009],[0.751,1.905]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[198.404,379.927],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 5","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.456,-1.241],[-4.251,1.194]],"o":[[-4.456,1.241],[4.252,-1.194]],"v":[[-0.463,-2.434],[0.668,2.48]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.9529412,0.9607843,0.9647059,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[154.751,386.841],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 6","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0.397,-1.477],[-0.458,-0.982],[-0.423,-0.219],[-0.108,-0.053],[-0.159,-0.008],[-0.338,0.02],[-1.422,0.465],[-2.715,1.657],[-2.597,1.948],[-4.737,4.567],[-4.492,4.831],[-4.051,5.145],[-2.962,5.657],[-0.774,2.887],[-0.142,0.714],[-0.036,0.346],[0,0],[0,0],[0.596,0.653],[1.319,0.095],[0.711,-0.06],[0.74,-0.225],[2.825,-1.639],[0,0],[0.339,0.585],[-0.445,0.375],[-3.349,1.406],[-2.038,0.076],[-0.261,-0.012],[0,0],[-0.268,-0.043],[0,0],[-0.267,-0.12],[0,0],[-0.462,-0.401],[-0.379,-0.473],[-0.265,-0.522],[-0.075,-1.012],[0.365,-1.807],[1.474,-3.168],[4.036,-5.49],[4.542,-5.015],[4.979,-4.615],[5.628,-3.936],[3.109,-1.6],[1.665,-0.631],[0.844,-0.289],[0.913,-0.167],[2.069,0.423],[0.509,0.181],[0.25,0.137],[0.223,0.216],[0.332,1.105],[-0.788,1.626],[-1.188,1.25],[-0.246,-0.233],[0.132,-0.239]],"o":[[-0.795,1.435],[-0.403,1.458],[0.264,0.452],[0.081,0.076],[0.129,0.035],[0.297,0.03],[1.236,0.071],[2.852,-0.899],[2.757,-1.605],[5.206,-3.894],[4.799,-4.498],[4.516,-4.81],[4.032,-5.149],[1.473,-2.818],[0.229,-0.729],[0.063,-0.355],[0,0],[0,0],[-0.028,-1.302],[-0.571,-0.67],[-0.644,-0.077],[-0.722,0.14],[-2.974,0.781],[0,0],[-0.584,0.338],[-0.302,-0.52],[2.62,-2.218],[1.671,-0.705],[0.255,-0.007],[0,0],[0.267,0.03],[0,0],[0.272,0.088],[0,0],[0.544,0.251],[0.496,0.378],[0.367,0.485],[0.404,1.042],[0.202,2.043],[-0.705,3.637],[-3.008,6.314],[-4.055,5.482],[-4.58,4.981],[-5.027,4.557],[-2.822,1.957],[-1.561,0.785],[-0.811,0.344],[-0.874,0.25],[-1.813,0.335],[-0.504,-0.07],[-0.256,-0.078],[-0.247,-0.163],[-0.96,-0.749],[-0.497,-2.26],[0.819,-1.639],[0.233,-0.245],[0.207,0.197],[0,0]],"v":[[-38.758,32.822],[-40.631,37.209],[-40.629,41.168],[-39.655,42.181],[-39.309,42.323],[-38.941,42.447],[-38.075,42.566],[-33.98,41.953],[-25.566,37.936],[-17.577,32.487],[-2.702,19.679],[11.171,5.569],[24.045,-9.373],[34.8,-25.553],[38.298,-34.177],[38.743,-36.321],[38.834,-37.353],[38.876,-37.867],[38.848,-38.345],[37.918,-41.382],[35.012,-42.575],[32.942,-42.502],[30.75,-42.031],[22.038,-38.12],[22.031,-38.116],[20.359,-38.561],[20.627,-40.108],[29.515,-45.652],[35.053,-46.937],[35.818,-46.957],[36.617,-46.881],[37.418,-46.784],[38.238,-46.552],[39.051,-46.281],[39.845,-45.866],[41.305,-44.798],[42.474,-43.421],[43.288,-41.882],[44.039,-38.76],[43.681,-32.991],[40.156,-22.894],[29.27,-5.393],[16.249,10.255],[1.924,24.636],[-13.991,37.469],[-22.864,42.84],[-27.696,44.975],[-30.238,45.846],[-32.911,46.478],[-38.747,46.546],[-40.302,46.046],[-41.065,45.639],[-41.794,45.148],[-43.744,42.192],[-42.832,36.36],[-39.729,32.085],[-38.862,32.063],[-38.748,32.804]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.0039216,0.3764706,0.5294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[76.621,402.73],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 7","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[4.953,-21.002],[21.895,7.258],[-2.144,21.472],[-21.188,-4.084]],"o":[[-4.953,21.002],[-20.482,-6.789],[2.407,-24.099],[22.139,4.268]],"v":[[36.814,8.758],[-9.791,35.815],[-39.622,-7.907],[6.122,-38.989]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[77.475,404.954],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 8","np":2,"cix":2,"ix":8,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[115,69.859],[-115.538,69.859],[-115.538,-69.859],[115,-69.859]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.7333333,0.7882353,0.8352941,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,403.141],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 9","np":2,"cix":2,"ix":9,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,-12.15],[12.15,0],[0,12.15],[-12.15,0]],"o":[[0,12.15],[-12.15,0],[0,-12.15],[12.15,0]],"v":[[22,0],[0,22],[-22,0],[0,-22]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[191.039,37.805],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 10","np":2,"cix":2,"ix":10,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,1.83],[0,0],[26.664,3.882],[44.378,51.842],[0,0],[0,0]],"o":[[0,0],[-11.598,-14.111],[-48.045,-6.994],[0,0],[0,0],[1.83,0]],"v":[[115,46.771],[115,19.788],[56.449,-6.074],[-115,-50.084],[-115,50.084],[111.687,50.084]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.4352941,0.5764706,0.6784314,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,89.771],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 11","np":2,"cix":2,"ix":11,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.83,0],[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0],[0,1.83]],"v":[[111.687,69.855],[-115,69.855],[-115,-69.855],[115,-69.855],[115,66.542]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.7333333,0.7882353,0.8352941,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,70],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 12","np":2,"cix":2,"ix":12,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":3,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[153,303,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.0039216,0.3764706,0.5294118,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.1372549,0.2078431,0.2941176,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153.134,303.104],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file diff --git a/WordPress/src/main/assets/login_anims/stats.json b/WordPress/src/main/assets/login_anims/stats.json index 286a334973bc..d4f4ba1fd61c 100644 --- a/WordPress/src/main/assets/login_anims/stats.json +++ b/WordPress/src/main/assets/login_anims/stats.json @@ -1 +1 @@ -{"v":"4.7.0","fr":30,"ip":0,"op":67,"w":310,"h":464,"nm":"Stats","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"stats-01 Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,274.891,0]},"a":{"a":0,"k":[115,117,0]},"s":{"a":0,"k":[144.195,144.195,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.161,0.067],[9.64,0.219],[9.64,-0.071],[9.64,-0.254],[9.639,-0.434],[-0.057,-1.284],[-1.181,-0.056],[-9.64,-0.169],[-9.64,-0.107],[-9.64,0.076],[-9.64,0.529],[0.07,1.284]],"o":[[-9.64,-0.53],[-9.64,-0.075],[-9.64,0.106],[-9.64,0.17],[-1.279,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.255],[9.64,0.071],[9.64,-0.218],[1.278,-0.07],[-0.065,-1.195]],"v":[[57.921,-14.887],[29.002,-15.845],[0.082,-16.014],[-28.837,-15.727],[-57.756,-14.887],[-59.967,-12.458],[-57.756,-10.237],[-28.837,-9.398],[0.082,-9.109],[29.002,-9.28],[57.921,-10.237],[60.109,-12.689]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.071,-1.15],[0.94,-0.109],[4.57,-0.218],[4.571,0.075],[4.571,0.254],[4.571,0.433],[0.06,1.175],[-0.94,0.089],[-4.57,0.169],[-4.571,0.107],[-4.571,-0.152],[-4.57,-0.529]],"o":[[0.08,1.284],[-4.57,0.529],[-4.571,0.15],[-4.571,-0.107],[-4.57,-0.17],[-0.836,-0.079],[-0.065,-1.285],[4.571,-0.433],[4.571,-0.255],[4.571,-0.075],[4.57,0.218],[0.815,0.093]],"v":[[-2.124,12.36],[-3.682,14.883],[-17.394,15.839],[-31.106,16.01],[-44.818,15.722],[-58.53,14.883],[-60.114,12.719],[-58.53,10.232],[-44.818,9.393],[-31.106,9.105],[-17.394,9.276],[-3.682,10.232]],"c":true}},"nm":"Path 2","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.784,0.843,0.886,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[112.118,59.122],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[162.101,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":21,"s":[100,0],"e":[100,100]},{"t":35}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 3-2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,51.566],[15.628,51.566],[15.628,-51.567],[-15.628,-51.567]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[162.101,209.9],"ix":2},"a":{"a":0,"k":[0,51.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":16,"s":[100,0],"e":[100,100]},{"t":30}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 3-1","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,14.665],[15.628,14.665],[15.628,-14.665],[-15.628,-14.665]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,209.7],"ix":2},"a":{"a":0,"k":[0,14.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":14,"s":[100,0],"e":[100,100]},{"t":29}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 2-2","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,34.178],[15.628,34.178],[15.628,-34.178],[-15.628,-34.178]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[115,209.736],"ix":2},"a":{"a":0,"k":[0,34],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":9,"s":[100,0],"e":[100,100]},{"t":20}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 2-1","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,9.493],[15.628,9.493],[15.628,-9.493],[-15.628,-9.493]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[67.899,209.9],"ix":2},"a":{"a":0,"k":[0,9.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":8,"s":[100,0],"e":[100,100]},{"t":19}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 1-2","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0.455,0.8629999,0.9879999,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[67.899,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":4,"s":[100,0],"e":[100,100]},{"t":13}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 1-1","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","ks":{"o":{"a":0,"k":100},"r":{"a":0,"k":0},"p":{"a":0,"k":[155,305,0]},"a":{"a":0,"k":[153,303,0]},"s":{"a":0,"k":[100,100,100]}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.663,0.871,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[1,1,1,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group"},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true}},"nm":"Path 1","mn":"ADBE Vector Shape - Group"},{"ty":"fl","c":{"a":0,"k":[0,0.31,0.518,1]},"o":{"a":0,"k":100},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill"},{"ty":"tr","p":{"a":0,"k":[153,303],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group"}],"ip":0,"op":419,"st":0,"bm":0,"sr":1}]} \ No newline at end of file +{"v":"5.3.4","fr":30,"ip":0,"op":67,"w":310,"h":464,"nm":"Stats","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"stats-01 Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,274.891,0],"ix":2},"a":{"a":0,"k":[115,117,0],"ix":1},"s":{"a":0,"k":[144.195,144.195,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[1.161,0.067],[9.64,0.219],[9.64,-0.071],[9.64,-0.254],[9.639,-0.434],[-0.057,-1.284],[-1.181,-0.056],[-9.64,-0.169],[-9.64,-0.107],[-9.64,0.076],[-9.64,0.529],[0.07,1.284]],"o":[[-9.64,-0.53],[-9.64,-0.075],[-9.64,0.106],[-9.64,0.17],[-1.279,0.056],[0.055,1.211],[9.639,0.434],[9.64,0.255],[9.64,0.071],[9.64,-0.218],[1.278,-0.07],[-0.065,-1.195]],"v":[[57.921,-14.887],[29.002,-15.845],[0.082,-16.014],[-28.837,-15.727],[-57.756,-14.887],[-59.967,-12.458],[-57.756,-10.237],[-28.837,-9.398],[0.082,-9.109],[29.002,-9.28],[57.921,-10.237],[60.109,-12.689]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[-0.071,-1.15],[0.94,-0.109],[4.57,-0.218],[4.571,0.075],[4.571,0.254],[4.571,0.433],[0.06,1.175],[-0.94,0.089],[-4.57,0.169],[-4.571,0.107],[-4.571,-0.152],[-4.57,-0.529]],"o":[[0.08,1.284],[-4.57,0.529],[-4.571,0.15],[-4.571,-0.107],[-4.57,-0.17],[-0.836,-0.079],[-0.065,-1.285],[4.571,-0.433],[4.571,-0.255],[4.571,-0.075],[4.57,0.218],[0.815,0.093]],"v":[[-2.124,12.36],[-3.682,14.883],[-17.394,15.839],[-31.106,16.01],[-44.818,15.722],[-58.53,14.883],[-60.114,12.719],[-58.53,10.232],[-44.818,9.393],[-31.106,9.105],[-17.394,9.276],[-3.682,10.232]],"c":true},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.8,0.807843137255,0.81568627451,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[112.118,59.122],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":3,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[162.101,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":21,"s":[100,0],"e":[100,100]},{"t":35}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 3-2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,51.566],[15.628,51.566],[15.628,-51.567],[-15.628,-51.567]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.274509803922,0.474509803922,0.603921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[162.101,209.9],"ix":2},"a":{"a":0,"k":[0,51.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":16,"s":[100,0],"e":[100,100]},{"t":30}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 3-1","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,14.665],[15.628,14.665],[15.628,-14.665],[-15.628,-14.665]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[115.079,209.776],"ix":2},"a":{"a":0,"k":[0,14.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":14,"s":[100,0],"e":[100,100]},{"t":29}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 2-2","np":2,"cix":2,"ix":4,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,34.178],[15.628,34.178],[15.628,-34.178],[-15.628,-34.178]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.274509803922,0.474509803922,0.603921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[115,209.736],"ix":2},"a":{"a":0,"k":[0,34],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":9,"s":[100,0],"e":[100,100]},{"t":20}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 2-1","np":2,"cix":2,"ix":5,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,9.493],[15.628,9.493],[15.628,-9.493],[-15.628,-9.493]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[67.823,210.07],"ix":2},"a":{"a":0,"k":[0,9.5],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":8,"s":[100,0],"e":[100,100]},{"t":19}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 1-2","np":2,"cix":2,"ix":6,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-15.628,22.126],[15.628,22.126],[15.628,-22.126],[-15.628,-22.126]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.274509803922,0.474509803922,0.603921568627,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[67.899,209.788],"ix":2},"a":{"a":0,"k":[0,22],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"n":["0p667_1_0p333_0","0p667_1_0p333_0"],"t":4,"s":[100,0],"e":[100,100]},{"t":13}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"bar 1-1","np":2,"cix":2,"ix":7,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"iPhone Outlines","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[155,305,0],"ix":2},"a":{"a":0,"k":[153,303,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,27],[135,27],[135,-27],[-135,-27]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.003921568627,0.376470588235,0.529411764706,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,84],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,0],[0,0]],"o":[[0,0],[0,0],[0,0],[0,0]],"v":[[-135,217.5],[135,217.5],[135,-217.5],[-135,-217.5]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[1,1,1,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153,328.5],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 2","np":2,"cix":2,"ix":2,"mn":"ADBE Vector Group","hd":false},{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,-23.1],[0,0],[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0]],"o":[[-23.1,0],[0,0],[0,23.1],[0,0],[23.1,0],[0,0],[0,-23.1],[0,0]],"v":[[-111,-303],[-153,-261],[-153,261],[-111,303],[111,303],[153,261],[153,-261],[111,-303]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":0,"k":[0.137254901961,0.207843137255,0.294117647059,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"nm":"Fill 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[153.242,303.477],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 3","np":2,"cix":2,"ix":3,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":419,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/WordPress/src/main/java/org/wordpress/android/JobServiceId.java b/WordPress/src/main/java/org/wordpress/android/JobServiceId.java index cc462d98c5fa..c31a86193164 100644 --- a/WordPress/src/main/java/org/wordpress/android/JobServiceId.java +++ b/WordPress/src/main/java/org/wordpress/android/JobServiceId.java @@ -22,7 +22,7 @@ public class JobServiceId { public static final int JOB_GCM_REG_SERVICE_ID = 1000; /* - * This method checks that a spefic bundle for a given JobServie matches perfectly (all extras and all of its + * This method checks that a bundle for a given JobService matches perfectly (all extras and all of its * values match) to check if it is already scheduled or not. * TODO IMPORTANT: note that this particular method checks for int[] and compares within the array, as that's * a case we needed to implement. In the future, if you need to compare other kind of arrays, you'll need to diff --git a/WordPress/src/main/java/org/wordpress/android/WordPress.java b/WordPress/src/main/java/org/wordpress/android/WordPress.java index 2bb92227a3e6..33e71a2d59d7 100644 --- a/WordPress/src/main/java/org/wordpress/android/WordPress.java +++ b/WordPress/src/main/java/org/wordpress/android/WordPress.java @@ -170,7 +170,7 @@ protected boolean run() { }; /** - * Update site infos in a background task. + * Update site information in a background task. */ public RateLimitedTask mUpdateSelectedSite = new RateLimitedTask(SECONDS_BETWEEN_SITE_UPDATE) { protected boolean run() { @@ -188,7 +188,7 @@ protected boolean run() { */ public static RateLimitedTask sDeleteExpiredStats = new RateLimitedTask(SECONDS_BETWEEN_DELETE_STATS) { protected boolean run() { - // Offload to a separate thread. We don't want to slown down the app on startup/resume. + // Offload to a separate thread. We don't want to slow down the app on startup/resume. new Thread(new Runnable() { public void run() { // subtracts to the current time the cache TTL @@ -230,7 +230,7 @@ public void onCreate() { component().inject(this); mDispatcher.register(this); - // Init static fields from dagger injected singletons, for legacy Actions/Utils + // Init static fields from dagger injected singletons, for legacy Actions and Utilities sRequestQueue = mRequestQueue; sImageLoader = mImageLoader; sOAuthAuthenticator = mOAuthAuthenticator; @@ -285,7 +285,7 @@ public void onLog(T tag, LogLevel logLevel, String message) { createNotificationChannelsOnSdk26(); // Allows vector drawable from resources (in selectors for instance) on Android < 21 (can cause issues - // with memory usage and the use of Configuration). More informations: http://bit.ly/2H1KTQo + // with memory usage and the use of Configuration). More information: http://bit.ly/2H1KTQo // Note: if removed, this will cause crashes on Android < 21 AppCompatDelegate.setCompatVectorFromResourcesEnabled(true); @@ -617,7 +617,7 @@ public static String getDefaultUserAgent() { // Catch IllegalArgumentException that could be raised by WebSettings.getDefaultUserAgent() // See https://github.com/wordpress-mobile/WordPress-Android/issues/9015 - // init with the empty string, it's a rare issue + // initialize with the empty string, it's a rare issue mDefaultUserAgent = ""; } } @@ -757,7 +757,7 @@ private boolean isPushNotificationPingNeeded() { } /** - * Check if user has valid credentials, and that at least 2 minutes are passed + * Check if user has valid credentials, and at least 2 minutes have passed * since the last ping, then try to update the PN token. */ private void updatePushNotificationTokenIfNotLimited() { @@ -786,8 +786,8 @@ public void onAppGoesToBackground() { } AnalyticsTracker.track(AnalyticsTracker.Stat.APPLICATION_CLOSED, properties); AnalyticsTracker.endSession(false); - // Methods onAppComesFromBackground / onAppGoesToBackground are only workarounds to track when the - // app goes to or comes from background, but they are not 100% reliable, we should avoid unregistering + // Methods onAppComesFromBackground and onAppGoesToBackground are only workarounds to track when the + // app goes to or comes from background. The workarounds are not 100% reliable, so avoid unregistering // the receiver twice. if (mConnectionReceiverRegistered) { mConnectionReceiverRegistered = false; @@ -814,9 +814,9 @@ public void onAppComesFromBackground() { sAppIsInTheBackground = false; // https://developer.android.com/reference/android/net/ConnectivityManager.html - // Apps targeting Android 7.0 (API level 24) and higher do not receive this broadcast if they - // declare the broadcast receiver in their manifest. Apps will still receive broadcasts if they - // register their BroadcastReceiver with Context.registerReceiver() and that context is still valid. + // Apps targeting Android 7.0 (API level 24) and higher do not receive this broadcast if + // the broadcast receiver is declared in their manifest. Apps will still receive broadcasts if + // BroadcastReceiver is registered with Context.registerReceiver() and that context is still valid. if (!mConnectionReceiverRegistered) { mConnectionReceiverRegistered = true; registerReceiver(ConnectionChangeReceiver.getInstance(), @@ -840,7 +840,7 @@ public void onAppComesFromBackground() { // Rate limited WPCom blog list update mUpdateSiteList.runIfNotLimited(); - // Rate limited Site informations and options update + // Rate limited Site information and options update mUpdateSelectedSite.runIfNotLimited(); } sDeleteExpiredStats.runIfNotLimited(); diff --git a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java index d9cde803df80..0208f10a64b6 100755 --- a/WordPress/src/main/java/org/wordpress/android/WordPressDB.java +++ b/WordPress/src/main/java/org/wordpress/android/WordPressDB.java @@ -25,7 +25,7 @@ public class WordPressDB { private static final int DATABASE_VERSION = 66; - // Warning if you rename DATABASE_NAME, that could break previous App backups (see: xml/backup_scheme.xml) + // Warning renaming DATABASE_NAME could break previous App backups (see: xml/backup_scheme.xml) private static final String DATABASE_NAME = "wordpress"; private static final String NOTES_TABLE = "notes"; private static final String THEMES_TABLE = "themes"; diff --git a/WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java b/WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java index ab05ffcb3267..1ab6819fbdec 100644 --- a/WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java +++ b/WordPress/src/main/java/org/wordpress/android/push/GCMMessageService.java @@ -656,7 +656,7 @@ private NotificationCompat.Builder getNotificationBuilder(Context context, Strin return new NotificationCompat.Builder(context, context.getString(R.string.notification_channel_normal_id)) .setSmallIcon(R.drawable.ic_my_sites_white_24dp) - .setColor(context.getResources().getColor(R.color.blue_wordpress)) + .setColor(context.getResources().getColor(R.color.primary_500)) .setContentTitle(title) .setContentText(message) .setTicker(message) @@ -711,7 +711,7 @@ private void showGroupNotificationForBuilder(Context context, NotificationCompat context.getString(R.string.notification_channel_normal_id)) .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN) .setSmallIcon(R.drawable.ic_my_sites_white_24dp) - .setColor(context.getResources().getColor(R.color.blue_wordpress)) + .setColor(context.getResources().getColor(R.color.primary_500)) .setGroup(NOTIFICATION_GROUP_KEY) .setGroupSummary(true) .setAutoCancel(true) @@ -987,7 +987,7 @@ private void handlePushAuth(Context context, Bundle data) { NotificationCompat.Builder builder = new NotificationCompat.Builder(context, context.getString(R.string.notification_channel_important_id)) .setSmallIcon(R.drawable.ic_my_sites_white_24dp) - .setColor(context.getResources().getColor(R.color.blue_wordpress)) + .setColor(context.getResources().getColor(R.color.primary_500)) .setContentTitle(title) .setContentText(message) .setAutoCancel(true) diff --git a/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java b/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java index a690c454b868..c998e1a99322 100644 --- a/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/push/NativeNotificationsUtils.java @@ -40,7 +40,7 @@ public static void showMessageToUserWithBuilder(NotificationCompat.Builder build public static NotificationCompat.Builder getBuilder(Context context, String channelId) { return new NotificationCompat.Builder(context, channelId) .setSmallIcon(R.drawable.ic_my_sites_white_24dp) - .setColor(context.getResources().getColor(R.color.blue_wordpress)) + .setColor(context.getResources().getColor(R.color.primary_500)) .setContentTitle(context.getString(R.string.app_name)) .setAutoCancel(true); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java index e54b8b3556fb..c1309a2154f6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/AddQuickPressShortcutActivity.java @@ -218,7 +218,7 @@ public View getView(int position, View convertView, ViewGroup parent) { StringEscapeUtils.unescapeHtml4(blogNames[position])); blogUsername.setText( StringEscapeUtils.unescapeHtml4(username)); - blavatar.setErrorImageResId(R.drawable.bg_rectangle_grey_lighten_20_globe_32dp); + blavatar.setErrorImageResId(R.drawable.bg_rectangle_neutral_100_globe_32dp); blavatar.setImageUrl(blavatars[position], mImageLoader); return view; diff --git a/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java index da626ba324a0..e88528d149cf 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/FullScreenDialogFragment.java @@ -410,7 +410,7 @@ public static class Builder { String mSubtitle = ""; String mTitle = ""; boolean mHideActivityBar = false; - int mToolbarColor = R.color.color_primary; + int mToolbarColor = R.color.primary; /** * Builder to construct {@link FullScreenDialogFragment}. diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java index f75392175054..91e50ef9cc32 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverActivity.java @@ -23,12 +23,12 @@ import org.wordpress.android.ui.main.WPMainActivity; import org.wordpress.android.ui.media.MediaBrowserActivity; import org.wordpress.android.ui.media.MediaBrowserType; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.FluxCUtils; import org.wordpress.android.util.LocaleManager; import org.wordpress.android.util.PermissionUtils; import org.wordpress.android.util.ToastUtils; import org.wordpress.android.util.WPPermissionUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import java.util.ArrayList; import java.util.HashMap; @@ -85,7 +85,7 @@ protected void onResume() { super.onResume(); // keep setBackground in the onResume, otherwise the transition between activities is visible to the user when // sharing text with an account with one visible site - findViewById(R.id.main_view).setBackgroundResource(R.color.login_background_color); + findViewById(R.id.main_view).setBackgroundResource(R.color.background_default); } private void refreshContent() { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java index 029e697de6de..e57704d347ea 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/ShareIntentReceiverFragment.java @@ -169,15 +169,15 @@ public void run() { if (mRecyclerView.computeVerticalScrollRange() > mRecyclerView.getHeight()) { mBottomButtonsShadow.setVisibility(View.VISIBLE); - mBottomButtonsContainer.setBackgroundResource(R.color.white); - mShareMediaBtn.setTextColor(getResources().getColor(R.color.blue_wordpress)); + mBottomButtonsContainer.setBackgroundResource(android.R.color.white); + mShareMediaBtn.setTextColor(getResources().getColor(R.color.primary_500)); ViewUtils.setButtonBackgroundColor(getContext(), mShareMediaBtn, R.style.WordPress_Button_Grey, R.attr.colorButtonNormal); } else { mBottomButtonsShadow.setVisibility(View.GONE); mBottomButtonsContainer.setBackground(null); - mShareMediaBtn.setTextColor(getResources().getColor(R.color.grey_dark)); + mShareMediaBtn.setTextColor(getResources().getColor(R.color.neutral_700)); ViewUtils.setButtonBackgroundColor(getContext(), mShareMediaBtn, R.style.WordPress_Button, R.attr.colorButtonNormal); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java index 22faf7601643..521bdb8635b3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/WPNumberPicker.java @@ -89,7 +89,7 @@ protected void onDraw(Canvas canvas) { Paint paint = mInputView.getPaint(); paint.setTextAlign(Paint.Align.CENTER); //noinspection deprecation - paint.setColor(getResources().getColor(R.color.blue_wordpress)); + paint.setColor(getResources().getColor(R.color.primary_500)); int alpha = isEnabled() ? 255 : 96; paint.setAlpha(alpha); mPaint.setAlpha(alpha); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java index eaa0a484c34a..8ae81c47e4b6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java @@ -21,10 +21,10 @@ import org.wordpress.android.login.LoginBaseFormFragment; import org.wordpress.android.ui.main.SitePickerAdapter; import org.wordpress.android.ui.main.SitePickerAdapter.SiteList; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.GravatarUtils; import org.wordpress.android.util.StringUtils; import org.wordpress.android.util.ViewUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.image.ImageManager; import java.util.ArrayList; @@ -169,7 +169,7 @@ public void run() { if (mSitesList.computeVerticalScrollRange() > mSitesList.getHeight()) { mBottomShadow.setVisibility(View.VISIBLE); - mBottomButtonsContainer.setBackgroundResource(R.color.white); + mBottomButtonsContainer.setBackgroundResource(android.R.color.white); ViewUtils.setButtonBackgroundColor(getContext(), mConnectMore, R.style.WordPress_Button_Grey, R.attr.colorButtonNormal); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java index 9082e9a2e369..72b082fe2e82 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginPrologueAnimationFragment.java @@ -44,15 +44,13 @@ public void onCreate(Bundle savedInstanceState) { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle - savedInstanceState) { + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { ViewGroup rootView = (ViewGroup) inflater.inflate(R.layout.login_intro_template_view, container, false); - rootView.setBackgroundColor( - getResources().getColor(mLightBackground ? R.color.blue_light : R.color.blue_medium)); + rootView.setBackgroundColor(getResources().getColor(R.color.primary)); TextView promoText = (TextView) rootView.findViewById(R.id.promo_text); promoText.setText(mPromoText); - promoText.setTextColor(getResources().getColor(mLightBackground ? R.color.blue_dark : R.color.white)); + promoText.setTextColor(getResources().getColor(android.R.color.white)); mLottieAnimationView = (LottieAnimationView) rootView.findViewById(R.id.animation_view); mLottieAnimationView.setAnimation(mAnimationFilename, LottieAnimationView.CacheStrategy.Weak); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java index 45e9c66c22cc..86155b8fc267 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SignupEpilogueFragment.java @@ -642,8 +642,8 @@ protected void startCropActivity(Uri uri) { if (context != null) { UCrop.Options options = new UCrop.Options(); options.setShowCropGrid(false); - options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar_tint)); - options.setToolbarColor(ContextCompat.getColor(context, R.color.color_primary)); + options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar)); + options.setToolbarColor(ContextCompat.getColor(context, R.color.primary)); options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE); options.setHideBottomControls(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java index 58192e4e387a..24a3bf470795 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationCreatingFragment.java @@ -295,8 +295,8 @@ private void configureBackButton() { } private void configureImage(boolean hasFailure) { - mImageView.setImageResource(hasFailure ? R.drawable.img_site_error_camera_pencils_226dp - : R.drawable.img_site_wordpress_camera_pencils_226dp); + mImageView.setImageResource(hasFailure ? R.drawable.img_illustration_site_error_camera_pencils_226dp + : R.drawable.img_illustration_site_wordpress_camera_pencils_226dp); } private void handleFailure(final SiteCreationState failedState) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java index 4dd624c8af80..80c98752e40c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/accounts/signup/SiteCreationService.java @@ -131,7 +131,7 @@ static Notification progress(Context context, int progress, @StringRes int title titleString, stepString, R.drawable.ic_my_sites_white_24dp, - R.color.blue_wordpress); + R.color.primary_500); } static Notification success(Context context) { @@ -140,7 +140,7 @@ static Notification success(Context context) { R.string.notification_site_creation_title_success, R.string.notification_site_creation_created, R.drawable.ic_my_sites_white_24dp, - R.color.blue_wordpress); + R.color.primary_500); } static Notification failure(Context context, @StringRes int content) { @@ -149,7 +149,7 @@ static Notification failure(Context context, @StringRes int content) { R.string.notification_site_creation_title_stopped, content, R.drawable.ic_my_sites_white_24dp, - R.color.blue_wordpress); + R.color.primary_500); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt index 589d734e3ad1..078878aae858 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/detail/ActivityLogDetailFragment.kt @@ -6,11 +6,9 @@ import android.arch.lifecycle.ViewModelProvider import android.arch.lifecycle.ViewModelProviders import android.os.Bundle import android.support.v4.app.Fragment -import android.text.Spannable import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.TextView import kotlinx.android.synthetic.main.activity_log_item_detail.* import org.wordpress.android.R import org.wordpress.android.WordPress @@ -19,6 +17,7 @@ import org.wordpress.android.fluxc.tools.FormattableRange import org.wordpress.android.ui.notifications.utils.FormattableContentClickHandler import org.wordpress.android.ui.notifications.utils.NotificationsUtilsWrapper import org.wordpress.android.ui.posts.BasicFragmentDialog +import org.wordpress.android.ui.utils.UiHelpers import org.wordpress.android.util.image.ImageManager import org.wordpress.android.util.image.ImageType.AVATAR_WITH_BACKGROUND import org.wordpress.android.viewmodel.activitylog.ACTIVITY_LOG_ID_KEY @@ -31,6 +30,7 @@ class ActivityLogDetailFragment : Fragment() { @Inject lateinit var imageManager: ImageManager @Inject lateinit var notificationsUtilsWrapper: NotificationsUtilsWrapper @Inject lateinit var formattableContentClickHandler: FormattableContentClickHandler + @Inject lateinit var uiHelpers: UiHelpers private lateinit var viewModel: ActivityLogDetailViewModel @@ -68,8 +68,8 @@ class ActivityLogDetailFragment : Fragment() { viewModel.activityLogItem.observe(this, Observer { activityLogModel -> setActorIcon(activityLogModel?.actorIconUrl, activityLogModel?.showJetpackIcon) - activityActorName.setTextOrHide(activityLogModel?.actorName) - activityActorRole.setTextOrHide(activityLogModel?.actorRole) + uiHelpers.setTextOrHide(activityActorName, activityLogModel?.actorName) + uiHelpers.setTextOrHide(activityActorRole, activityLogModel?.actorRole) val spannable = activityLogModel?.content?.let { notificationsUtilsWrapper.getSpannableContentForRanges(it, activityMessage, { range -> @@ -77,8 +77,8 @@ class ActivityLogDetailFragment : Fragment() { }, false) } - activityMessage.setTextOrHide(spannable) - activityType.setTextOrHide(activityLogModel?.summary) + uiHelpers.setTextOrHide(activityMessage, spannable) + uiHelpers.setTextOrHide(activityType, activityLogModel?.summary) activityCreatedDate.text = activityLogModel?.createdDate activityCreatedTime.text = activityLogModel?.createdTime @@ -143,24 +143,6 @@ class ActivityLogDetailFragment : Fragment() { } } - private fun TextView.setTextOrHide(text: String?) { - if (text != null) { - this.text = text - this.visibility = View.VISIBLE - } else { - this.visibility = View.GONE - } - } - - private fun TextView.setTextOrHide(text: Spannable?) { - if (text != null) { - this.text = text - this.visibility = View.VISIBLE - } else { - this.visibility = View.GONE - } - } - private fun onRewindButtonClicked(item: ActivityLogDetailModel) { val dialog = BasicFragmentDialog() item.rewindId?.let { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt index 5b08722b3de5..0008301bd4f3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/ActivityLogListItem.kt @@ -72,10 +72,10 @@ sealed class ActivityLogListItem(val type: ViewType) { } enum class Status(val value: String, @DrawableRes val color: Int) { - NEGATIVE("error", R.drawable.shape_oval_red), - INFO("warning", R.drawable.shape_oval_blue_wordpress), - POSITIVE("success", R.drawable.shape_oval_green), - NEUTRAL("", R.drawable.shape_oval_grey); + NEGATIVE("error", R.drawable.bg_oval_error_500), + INFO("warning", R.drawable.bg_oval_primary_500), + POSITIVE("success", R.drawable.bg_oval_success_500), + NEUTRAL("", R.drawable.bg_oval_neutral_300); companion object { private val map = Status.values().associateBy(Status::value) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt index 175e5dbb198a..f7c89dc22631 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/activitylog/list/EventItemViewHolder.kt @@ -38,7 +38,7 @@ class EventItemViewHolder( if (activity.isButtonVisible) { ContextCompat.getDrawable(container.context, activity.buttonIcon.drawable)?.let { buttonIcon -> val wrapDrawable = DrawableCompat.wrap(buttonIcon).mutate() - DrawableCompat.setTint(wrapDrawable, ContextCompat.getColor(container.context, R.color.blue_medium)) + DrawableCompat.setTint(wrapDrawable, ContextCompat.getColor(container.context, R.color.primary_400)) actionButton.setImageDrawable(DrawableCompat.unwrap(wrapDrawable)) actionButton.visibility = View.VISIBLE } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java index b3a7d6122798..2f57aeb4c511 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentAdapter.java @@ -131,11 +131,11 @@ public boolean onLongClick(View v) { mSite = site; - mStatusColorSpam = ContextCompat.getColor(context, R.color.comment_status_spam); - mStatusColorUnapproved = ContextCompat.getColor(context, R.color.comment_status_unapproved); + mStatusColorSpam = ContextCompat.getColor(context, R.color.error); + mStatusColorUnapproved = ContextCompat.getColor(context, R.color.accent); - mUnselectedColor = ContextCompat.getColor(context, R.color.white); - mSelectedColor = ContextCompat.getColor(context, R.color.grey_lighten_20_translucent_50); + mUnselectedColor = ContextCompat.getColor(context, android.R.color.white); + mSelectedColor = ContextCompat.getColor(context, R.color.gray_50); mStatusTextSpam = context.getResources().getString(R.string.comment_status_spam); mStatusTextUnapproved = context.getResources().getString(R.string.comment_status_unapproved); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java index a2e4cd415cfa..baf72b4ad0c9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentDetailFragment.java @@ -660,9 +660,9 @@ public void onClick(View v) { }; imgAvatar.setOnClickListener(authorListener); txtName.setOnClickListener(authorListener); - txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.reader_hyperlink)); + txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.link_reader)); } else { - txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.grey_darken_30)); + txtName.setTextColor(ContextCompat.getColor(getActivity(), R.color.neutral_600)); } showPostTitle(mSite, mComment.getRemotePostId()); @@ -700,7 +700,7 @@ private void setPostTitle(TextView txtTitle, String postTitle, boolean isHyperli // display "on [Post Title]..." if (isHyperlink) { String html = getString(R.string.on) - + " " + postTitle.trim() + ""; @@ -905,20 +905,20 @@ private void updateStatusViews() { switch (commentStatus) { case APPROVED: statusTextResId = R.string.comment_status_approved; - statusColor = ContextCompat.getColor(getActivity(), R.color.notification_status_unapproved_dark); + statusColor = ContextCompat.getColor(getActivity(), R.color.warning_600); break; case UNAPPROVED: statusTextResId = R.string.comment_status_unapproved; - statusColor = ContextCompat.getColor(getActivity(), R.color.notification_status_unapproved_dark); + statusColor = ContextCompat.getColor(getActivity(), R.color.warning_600); break; case SPAM: statusTextResId = R.string.comment_status_spam; - statusColor = ContextCompat.getColor(getActivity(), R.color.comment_status_spam); + statusColor = ContextCompat.getColor(getActivity(), R.color.error); break; case TRASH: default: statusTextResId = R.string.comment_status_trash; - statusColor = ContextCompat.getColor(getActivity(), R.color.comment_status_spam); + statusColor = ContextCompat.getColor(getActivity(), R.color.error); break; } @@ -972,7 +972,7 @@ public void onClick(View v) { mBtnTrashComment.setVisibility(View.VISIBLE); if (commentStatus == CommentStatus.TRASH) { ColorUtils.INSTANCE.setImageResourceWithTint(mBtnModerateIcon, R.drawable.ic_undo_white_24dp, - R.color.grey_text_min); + R.color.neutral); mBtnModerateTextView.setText(R.string.mnu_comment_untrash); mBtnTrashCommentText.setText(R.string.mnu_comment_delete_permanently); } else { @@ -1012,10 +1012,10 @@ private void setModerateButtonForStatus(CommentStatus status) { int color; if (status == CommentStatus.APPROVED) { - color = R.color.orange_jazzy; + color = R.color.accent; mBtnModerateTextView.setText(R.string.comment_status_approved); } else { - color = R.color.grey_text_min; + color = R.color.neutral; mBtnModerateTextView.setText(R.string.mnu_comment_approve); } @@ -1142,12 +1142,12 @@ private void toggleLikeButton(boolean isLiked) { int drawable; if (isLiked) { - color = R.color.orange_jazzy; + color = R.color.accent; drawable = R.drawable.ic_star_white_24dp; mBtnLikeTextView.setText(getResources().getString(R.string.mnu_comment_liked)); mBtnLikeComment.setActivated(true); } else { - color = R.color.grey_text_min; + color = R.color.neutral; drawable = R.drawable.ic_star_outline_white_24dp; mBtnLikeTextView.setText(getResources().getString(R.string.reader_label_like)); mBtnLikeComment.setActivated(false); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java index 21385eaa6e2a..fcb029e8f751 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/comments/CommentsListFragment.java @@ -377,8 +377,8 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) { }); // the following will change the look and feel of the toolbar to match the current design - mFilteredCommentsView.setToolbarBackgroundColor(ContextCompat.getColor(getActivity(), R.color.blue_medium)); - mFilteredCommentsView.setToolbarSpinnerTextColor(ContextCompat.getColor(getActivity(), R.color.white)); + mFilteredCommentsView.setToolbarBackgroundColor(ContextCompat.getColor(getActivity(), R.color.primary_400)); + mFilteredCommentsView.setToolbarSpinnerTextColor(ContextCompat.getColor(getActivity(), android.R.color.white)); mFilteredCommentsView.setToolbarSpinnerDrawable(R.drawable.ic_dropdown_blue_light_24dp); mFilteredCommentsView.setToolbarLeftAndRightPadding( getResources().getDimensionPixelSize(R.dimen.margin_filter_spinner), diff --git a/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt index 03ebe4309911..87107e6c0c65 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/giphy/GiphyPickerActivity.kt @@ -199,7 +199,7 @@ class GiphyPickerActivity : AppCompatActivity() { val emptyView: ActionableEmptyView = actionable_empty_view emptyView.run { image.setImageResource(R.drawable.img_illustration_media_105dp) - bottomImage.setImageResource(R.drawable.giphy_attribution_100dp) + bottomImage.setImageResource(R.drawable.img_giphy_100dp) bottomImage.contentDescription = getString(string.giphy_powered_by_giphy) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java index 4b4b101cfd3a..95025623b5b2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.java @@ -472,8 +472,8 @@ private void startCropActivity(Uri uri) { UCrop.Options options = new UCrop.Options(); options.setShowCropGrid(false); - options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar_tint)); - options.setToolbarColor(ContextCompat.getColor(context, R.color.color_primary)); + options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar)); + options.setToolbarColor(ContextCompat.getColor(context, R.color.primary)); options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE); options.setHideBottomControls(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java index ad944b67a821..fee7d1e86c63 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.java @@ -579,7 +579,7 @@ private void updateQuickStartContainer() { mQuickStartGrowTitle.setPaintFlags( mQuickStartGrowTitle.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); } else { - mQuickStartGrowIcon.setBackgroundResource(R.drawable.bg_oval_grey_multiple_users_white_40dp); + mQuickStartGrowIcon.setBackgroundResource(R.drawable.bg_oval_neutral_300_multiple_users_white_40dp); mQuickStartGrowTitle.setEnabled(false); mQuickStartGrowTitle.setPaintFlags( mQuickStartGrowTitle.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); @@ -851,8 +851,8 @@ private void startCropActivity(Uri uri) { UCrop.Options options = new UCrop.Options(); options.setShowCropGrid(false); - options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar_tint)); - options.setToolbarColor(ContextCompat.getColor(context, R.color.color_primary)); + options.setStatusBarColor(ContextCompat.getColor(context, R.color.status_bar)); + options.setToolbarColor(ContextCompat.getColor(context, R.color.primary)); options.setAllowedGestures(UCropActivity.SCALE, UCropActivity.NONE, UCropActivity.NONE); options.setHideBottomControls(true); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java index 38447d3b4352..6be51e5ec6b5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/main/SitePickerAdapter.java @@ -155,11 +155,11 @@ public SitePickerAdapter(Context context, mDataLoadedListener = dataLoadedListener; mBlavatarSz = context.getResources().getDimensionPixelSize(R.dimen.blavatar_sz); - mTextColorNormal = context.getResources().getColor(R.color.grey_dark); - mTextColorHidden = context.getResources().getColor(R.color.grey); + mTextColorNormal = context.getResources().getColor(R.color.neutral_700); + mTextColorHidden = context.getResources().getColor(R.color.neutral_300); mSelectedItemBackground = - new ColorDrawable(context.getResources().getColor(R.color.grey_lighten_20_translucent_50)); + new ColorDrawable(context.getResources().getColor(R.color.gray_50)); mHeaderHandler = headerHandler; mSelectedItemPos = getPositionOffset(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java index c6cfd712b3e2..5f1e0068bd18 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java @@ -241,7 +241,7 @@ private void formatQuotaDiskSpace() { mQuotaText.setText(getString(R.string.media_space_used, quota)); mQuotaText.setTextColor( - getResources().getColor(mSite.getSpacePercentUsed() > 90 ? R.color.alert_red : R.color.grey_text_min)); + getResources().getColor(mSite.getSpacePercentUsed() > 90 ? R.color.error_500 : R.color.neutral)); } private void showQuota(boolean show) { @@ -281,8 +281,8 @@ private void enableTabs(boolean enable) { private void setupTabs() { if (shouldShowTabs()) { - int normalColor = ContextCompat.getColor(this, R.color.blue_light); - int selectedColor = ContextCompat.getColor(this, R.color.white); + int normalColor = ContextCompat.getColor(this, R.color.primary_300); + int selectedColor = ContextCompat.getColor(this, android.R.color.white); mTabLayout.setTabTextColors(normalColor, selectedColor); mTabLayout.removeAllTabs(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java index 7f2632aca419..cce8d3e91027 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridAdapter.java @@ -189,7 +189,8 @@ public void onBindViewHolder(GridViewHolder holder, int position) { holder.mTitleView.setText(TextUtils.isEmpty(title) ? fileName : title); holder.mFileTypeView.setText(fileExtension.toUpperCase(Locale.ROOT)); int placeholderResId = WPMediaUtils.getPlaceholder(fileName); - ColorUtils.INSTANCE.setImageResourceWithTint(holder.mFileTypeImageView, placeholderResId, R.color.grey); + ColorUtils.INSTANCE.setImageResourceWithTint(holder.mFileTypeImageView, placeholderResId, + R.color.neutral_300); mImageManager.cancelRequestAndClearImageView(holder.mImageView); } holder.mImageView.setContentDescription(mContext.getString(R.string.media_grid_item_image_desc, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java index 911347c2f534..ff86f2f73439 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java @@ -791,7 +791,7 @@ public boolean onCreateActionMode(ActionMode mode, Menu menu) { inflater.inflate(R.menu.media_multiselect, menu); setSwipeToRefreshEnabled(false); getAdapter().setInMultiSelect(true); - WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.grey_darken_30); + WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.neutral_600); updateActionModeTitle(selectCount); return true; } @@ -815,7 +815,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) { public void onDestroyActionMode(ActionMode mode) { setSwipeToRefreshEnabled(true); getAdapter().setInMultiSelect(false); - WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.status_bar_tint); + WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.status_bar); mActionMode = null; } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java index 3cec1e05d1ab..d916abfda177 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaSettingsActivity.java @@ -364,7 +364,7 @@ private boolean loadMedia(MediaModel media) { int padding = getResources().getDimensionPixelSize(R.dimen.margin_extra_extra_large); @DrawableRes int imageRes = WPMediaUtils.getPlaceholder(mMedia.getUrl()); ColorUtils.INSTANCE.setImageResourceWithTint(mImageView, - imageRes != 0 ? imageRes : R.drawable.ic_pages_white_24dp, R.color.grey); + imageRes != 0 ? imageRes : R.drawable.ic_pages_white_24dp, R.color.neutral_300); mImageView.setPadding(padding, padding * 2, padding, padding); mImageView.setImageResource(imageRes); } else { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java index f2cf2c6844d9..e4a0423bb5d0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailActivity.java @@ -200,6 +200,7 @@ public void onPageSelected(int position) { if (currentNote != null) { setActionBarTitleForNote(currentNote); markNoteAsRead(currentNote); + NotificationsActions.updateSeenTimestamp(currentNote); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java index 459d637f2f37..91fdcbd2db9c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/NotificationsDetailListFragment.java @@ -107,7 +107,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, public void onActivityCreated(Bundle bundle) { super.onActivityCreated(bundle); - mBackgroundColor = getResources().getColor(R.color.white); + mBackgroundColor = getResources().getColor(android.R.color.white); ListView listView = getListView(); listView.setDivider(null); @@ -415,7 +415,7 @@ protected List doInBackground(Void... params) { // Badge notifications apply different colors and formatting if (isAdded() && noteBlock.containsBadgeMediaType()) { mIsBadgeView = true; - mBackgroundColor = getActivity().getResources().getColor(R.color.transparent); + mBackgroundColor = getActivity().getResources().getColor(android.R.color.transparent); } if (mIsBadgeView) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java index ade62290af9d..8df6a2f9c6de 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/adapters/NotesAdapter.java @@ -96,8 +96,8 @@ public NotesAdapter(Context context, DataLoadedListener dataLoadedListener, OnLo setHasStableIds(false); mAvatarSz = (int) context.getResources().getDimension(R.dimen.notifications_avatar_sz); - mColorRead = context.getResources().getColor(R.color.white); - mColorUnread = context.getResources().getColor(R.color.grey_light); + mColorRead = context.getResources().getColor(android.R.color.white); + mColorUnread = context.getResources().getColor(R.color.background_notification_unread); mTextIndentSize = context.getResources().getDimensionPixelSize(R.dimen.notifications_text_indent_sz); } @@ -285,11 +285,11 @@ public void onBindViewHolder(NoteViewHolder noteViewHolder, int position) { String noticonCharacter = note.getNoticonCharacter(); noteViewHolder.mNoteIcon.setText(noticonCharacter); if (commentStatus == CommentStatus.UNAPPROVED) { - noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.shape_oval_orange); + noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.bg_oval_warning_stroke_white); } else if (isUnread) { - noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.shape_oval_blue_white_stroke); + noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.bg_oval_primary_400_stroke_notification_unread); } else { - noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.shape_oval_grey_lighten_10); + noteViewHolder.mNoteIcon.setBackgroundResource(R.drawable.bg_oval_neutral_200_stroke_white); } if (isUnread) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java index 6067aeba68ee..1a66e50dd384 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/CommentUserNoteBlock.java @@ -133,9 +133,9 @@ public void onClick(View v) { if (mCommentStatus == CommentStatus.UNAPPROVED) { if (hasCommentNestingLevel()) { paddingStart = mIndentedLeftPadding; - view.setBackgroundResource(R.drawable.comment_reply_unapproved_background); + view.setBackgroundResource(R.drawable.bg_rectangle_warning_0_warning_white); } else { - view.setBackgroundResource(R.drawable.comment_unapproved_background); + view.setBackgroundResource(R.drawable.bg_rectangle_warning_0_warning); } noteBlockHolder.mDividerView.setVisibility(View.INVISIBLE); @@ -249,10 +249,10 @@ public void configureResources(Context context) { return; } - mNormalTextColor = context.getResources().getColor(R.color.grey_dark); - mNormalBackgroundColor = context.getResources().getColor(R.color.white); - mAgoTextColor = context.getResources().getColor(R.color.grey_text_min); - mUnapprovedTextColor = context.getResources().getColor(R.color.notification_status_unapproved_dark); + mNormalTextColor = context.getResources().getColor(R.color.neutral_700); + mNormalBackgroundColor = context.getResources().getColor(android.R.color.white); + mAgoTextColor = context.getResources().getColor(R.color.neutral); + mUnapprovedTextColor = context.getResources().getColor(R.color.warning_600); // Double margin_extra_large for increased indent in comment replies mIndentedLeftPadding = context.getResources().getDimensionPixelSize(R.dimen.margin_extra_large) * 2; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java index 03752a3df0d6..b9c92f05cdf3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/notifications/blocks/NoteBlockClickableSpan.java @@ -42,10 +42,10 @@ public NoteBlockClickableSpan(Context context, FormattableRange range, boolean s mIsFooter = isFooter; // Text/background colors - mTextColor = context.getResources().getColor(R.color.grey_dark); - mBackgroundColor = context.getResources().getColor(R.color.pressed_wordpress); - mLinkColor = context.getResources().getColor(R.color.blue_medium); - mLightTextColor = context.getResources().getColor(R.color.grey_dark); + mTextColor = context.getResources().getColor(R.color.neutral_700); + mBackgroundColor = context.getResources().getColor(R.color.primary_50); + mLinkColor = context.getResources().getColor(R.color.primary_400); + mLightTextColor = context.getResources().getColor(R.color.neutral_700); processRangeData(range); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt index 7687a5251fa5..1ddfd6643ab7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/pages/PageItemViewHolder.kt @@ -144,7 +144,7 @@ sealed class PageItemViewHolder(internal val parent: ViewGroup, @LayoutRes layou @Suppress("DEPRECATION") CompoundButtonCompat.setButtonTintList(radioButton, - radioButton.resources.getColorStateList(R.color.dialog_compound_button_thumb)) + radioButton.resources.getColorStateList(R.color.primary_400_gray_200_gray_400_selector)) } } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java index 98b69973953f..aac09848e405 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleInviteFragment.java @@ -512,9 +512,8 @@ private void styleButton(String username, @Nullable String validationResultMessa TextView textView = (TextView) mUsernameButtons.get(username).findViewById(R.id.username); textView.setTextColor(ContextCompat.getColor(getActivity(), - validationResultMessage == null ? R.color.grey_dark - : (validationResultMessage.equals(FLAG_SUCCESS) - ? R.color.blue_wordpress : R.color.alert_red))); + validationResultMessage == null ? R.color.neutral_700 + : (validationResultMessage.equals(FLAG_SUCCESS) ? R.color.primary_500 : R.color.error_500))); } private diff --git a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java index 67cd3b6762fb..0fa3f58f4226 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/people/PeopleListFragment.java @@ -111,8 +111,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mFilteredRecyclerView.setSwipeToRefreshEnabled(false); // the following will change the look and feel of the toolbar to match the current design - mFilteredRecyclerView.setToolbarBackgroundColor(ContextCompat.getColor(getActivity(), R.color.blue_medium)); - mFilteredRecyclerView.setToolbarSpinnerTextColor(ContextCompat.getColor(getActivity(), R.color.white)); + mFilteredRecyclerView.setToolbarBackgroundColor(ContextCompat.getColor(getActivity(), R.color.primary_400)); + mFilteredRecyclerView.setToolbarSpinnerTextColor(ContextCompat.getColor(getActivity(), android.R.color.white)); mFilteredRecyclerView.setToolbarSpinnerDrawable(R.drawable.ic_dropdown_blue_light_24dp); mFilteredRecyclerView.setToolbarLeftAndRightPadding( getResources().getDimensionPixelSize(R.dimen.margin_filter_spinner), diff --git a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java index 3617e7a6567e..78c218575b56 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java @@ -30,7 +30,6 @@ import org.wordpress.android.ui.media.MediaBrowserType; import org.wordpress.android.ui.photopicker.PhotoPickerAdapter.PhotoPickerAdapterListener; import org.wordpress.android.ui.prefs.EmptyViewRecyclerView; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AniUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.DisplayUtils; @@ -38,6 +37,7 @@ import org.wordpress.android.util.WPActivityUtils; import org.wordpress.android.util.WPMediaUtils; import org.wordpress.android.util.WPPermissionUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import java.util.ArrayList; import java.util.HashMap; @@ -451,7 +451,7 @@ private final class ActionModeCallback implements ActionMode.Callback { @Override public boolean onCreateActionMode(ActionMode actionMode, Menu menu) { mActionMode = actionMode; - WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.grey_darken_30); + WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.neutral_600); MenuInflater inflater = actionMode.getMenuInflater(); inflater.inflate(R.menu.photo_picker_action_mode, menu); hideBottomBar(); @@ -476,7 +476,7 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) { @Override public void onDestroyActionMode(ActionMode mode) { - WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.status_bar_tint); + WPActivityUtils.setStatusBarColor(getActivity().getWindow(), R.color.status_bar); mActionMode = null; showBottomBar(); getAdapter().clearSelection(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java index 99fbc5b73e82..8dad0181d185 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginBrowserActivity.java @@ -422,19 +422,19 @@ public void onBindViewHolder(ViewHolder viewHolder, int position) { boolean isAutoManaged = PluginUtils.isAutoManaged(mViewModel.getSite(), plugin); if (isAutoManaged) { textResId = R.string.plugin_auto_managed; - colorResId = R.color.alert_green; - drawableResId = R.color.transparent; + colorResId = R.color.success_500; + drawableResId = android.R.color.transparent; } else if (PluginUtils.isUpdateAvailable(plugin)) { textResId = R.string.plugin_needs_update; - colorResId = R.color.alert_yellow; + colorResId = R.color.warning_500; drawableResId = R.drawable.ic_sync_white_24dp; } else if (plugin.isActive()) { textResId = R.string.plugin_active; - colorResId = R.color.alert_green; + colorResId = R.color.success_500; drawableResId = R.drawable.ic_checkmark_white_24dp; } else { textResId = R.string.plugin_inactive; - colorResId = R.color.grey; + colorResId = R.color.neutral_300; drawableResId = R.drawable.ic_cross_white_24dp; } holder.mStatusText.setText(textResId); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java index 562a1dfd86bb..3368214fb33d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginDetailActivity.java @@ -1,6 +1,7 @@ package org.wordpress.android.ui.plugins; import android.animation.ObjectAnimator; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import android.content.DialogInterface; @@ -10,6 +11,8 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import android.support.design.widget.Snackbar; +import android.support.v4.app.DialogFragment; +import android.support.v4.app.FragmentTransaction; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; @@ -19,6 +22,7 @@ import android.support.v7.widget.Toolbar; import android.text.Html; import android.text.TextUtils; +import android.view.ContextThemeWrapper; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -35,12 +39,14 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import org.wordpress.android.BuildConfig; import org.wordpress.android.R; import org.wordpress.android.WordPress; import org.wordpress.android.analytics.AnalyticsTracker.Stat; import org.wordpress.android.fluxc.Dispatcher; import org.wordpress.android.fluxc.generated.PluginActionBuilder; import org.wordpress.android.fluxc.generated.SiteActionBuilder; +import org.wordpress.android.fluxc.model.PlanModel; import org.wordpress.android.fluxc.model.SiteModel; import org.wordpress.android.fluxc.model.plugin.ImmutablePluginModel; import org.wordpress.android.fluxc.model.plugin.PluginDirectoryType; @@ -60,6 +66,7 @@ import org.wordpress.android.fluxc.store.SiteStore.OnAutomatedTransferEligibilityChecked; import org.wordpress.android.fluxc.store.SiteStore.OnAutomatedTransferInitiated; import org.wordpress.android.fluxc.store.SiteStore.OnAutomatedTransferStatusChecked; +import org.wordpress.android.fluxc.store.SiteStore.OnPlansFetched; import org.wordpress.android.fluxc.store.SiteStore.OnSiteChanged; import org.wordpress.android.ui.ActivityLauncher; import org.wordpress.android.util.AccessibilityUtils; @@ -108,6 +115,8 @@ public class PluginDetailActivity extends AppCompatActivity { = "KEY_IS_SHOWING_INSTALL_FIRST_PLUGIN_CONFIRMATION_DIALOG"; private static final String KEY_IS_SHOWING_AUTOMATED_TRANSFER_PROGRESS = "KEY_IS_SHOWING_AUTOMATED_TRANSFER_PROGRESS"; + private static final String KEY_IS_SHOWING_DOMAIN_CREDIT_CHECK_PROGRESS + = "KEY_IS_SHOWING_DOMAIN_CREDIT_CHECK_PROGRESS"; private SiteModel mSite; private String mSlug; @@ -126,6 +135,7 @@ public class PluginDetailActivity extends AppCompatActivity { private SwitchCompat mSwitchAutoupdates; private ProgressDialog mRemovePluginProgressDialog; private ProgressDialog mAutomatedTransferProgressDialog; + private ProgressDialog mCheckingDomainCreditsProgressDialog; private CardView mWPOrgPluginDetailsContainer; private RelativeLayout mRatingsSectionContainer; @@ -192,6 +202,8 @@ public void onCreate(Bundle savedInstanceState) { return; } + boolean isShowingDomainCreditCheckProgress = false; + if (savedInstanceState == null) { mIsActive = mPlugin.isActive(); mIsAutoUpdateEnabled = mPlugin.isAutoUpdateEnabled(); @@ -210,6 +222,8 @@ public void onCreate(Bundle savedInstanceState) { .getBoolean(KEY_IS_SHOWING_INSTALL_FIRST_PLUGIN_CONFIRMATION_DIALOG); mIsShowingAutomatedTransferProgress = savedInstanceState .getBoolean(KEY_IS_SHOWING_AUTOMATED_TRANSFER_PROGRESS); + isShowingDomainCreditCheckProgress = savedInstanceState + .getBoolean(KEY_IS_SHOWING_DOMAIN_CREDIT_CHECK_PROGRESS); } setContentView(R.layout.plugin_detail_activity); @@ -239,18 +253,103 @@ public void onCreate(Bundle savedInstanceState) { confirmInstallPluginForAutomatedTransfer(); } + if (isShowingDomainCreditCheckProgress) { + showDomainCreditsCheckProgressDialog(); + } + if (mIsShowingAutomatedTransferProgress) { showAutomatedTransferProgressDialog(); } } + @SuppressWarnings("unused") + @Subscribe(threadMode = ThreadMode.MAIN) + public void onPlansFetched(OnPlansFetched event) { + if (mCheckingDomainCreditsProgressDialog == null || !mCheckingDomainCreditsProgressDialog.isShowing()) { + AppLog.w(T.PLANS, "User cancelled domain credit checking. Ignoring the result."); + return; + } + + cancelDomainCreditsCheckProgressDialog(); + if (event.isError()) { + AppLog.e(T.PLANS, PluginDetailActivity.class.getSimpleName() + ".onPlansFetched: " + + event.error.type + " - " + event.error.message); + Snackbar.make(mContainer, getString(R.string.plugin_check_domain_credit_error), + AccessibilityUtils.getSnackbarDuration(this)).show(); + } else { + // This should not happen + if (event.plans == null) { + String errorMessage = "Failed to fetch user Plans. The result is null."; + if (BuildConfig.DEBUG) { + throw new IllegalStateException(errorMessage); + } + Snackbar.make(mContainer, getString(R.string.plugin_check_domain_credit_error), + AccessibilityUtils.getSnackbarDuration(this)).show(); + AppLog.e(T.PLANS, errorMessage); + return; + } + + PlanModel currentPlan = null; + for (PlanModel plan : event.plans) { + if (plan.isCurrentPlan()) { + currentPlan = plan; + break; + } + } + + boolean isDomainCreditAvailable = currentPlan != null && currentPlan.getHasDomainCredit(); + if (isDomainCreditAvailable) { + showDomainRegistrationDialog(); + } else { + dispatchInstallPluginAction(); + } + } + } + + public static class DomainRegistrationPromptDialog extends DialogFragment { + static final String DOMAIN_REGISTRATION_PROMPT_DIALOG_TAG = "DOMAIN_REGISTRATION_PROMPT_DIALOG"; + + @NonNull + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + AlertDialog.Builder builder = new AlertDialog.Builder( + new ContextThemeWrapper(getActivity(), R.style.Calypso_Dialog_Alert)); + builder.setTitle(R.string.plugin_install_custom_domain_required_dialog_title); + builder.setMessage(R.string.plugin_install_custom_domain_required_dialog_message); + builder.setPositiveButton(R.string.plugin_install_custom_domain_required_dialog_register_btn, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + // TODO navigate to domain registration flow + } + }); + builder.setNegativeButton(R.string.cancel, + new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialogInterface, int i) { + } + }); + + builder.setCancelable(true); + return builder.create(); + } + } + + private void showDomainRegistrationDialog() { + DialogFragment dialogFragment = new DomainRegistrationPromptDialog(); + FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); + ft.add(dialogFragment, DomainRegistrationPromptDialog.DOMAIN_REGISTRATION_PROMPT_DIALOG_TAG); + ft.commitAllowingStateLoss(); + } + @Override protected void onDestroy() { // Even though the progress dialog will be destroyed, when it's re-created sometimes the spinner // would get stuck. This seems to be helping with that. - if (mRemovePluginProgressDialog != null && mRemovePluginProgressDialog.isShowing()) { - mRemovePluginProgressDialog.cancel(); - } + cancelRemovePluginProgressDialog(); + + cancelDomainCreditsCheckProgressDialog(); + mDispatcher.unregister(this); super.onDestroy(); } @@ -302,6 +401,8 @@ public void onSaveInstanceState(Bundle outState) { outState.putBoolean(KEY_IS_SHOWING_INSTALL_FIRST_PLUGIN_CONFIRMATION_DIALOG, mIsShowingInstallFirstPluginConfirmationDialog); outState.putBoolean(KEY_IS_SHOWING_AUTOMATED_TRANSFER_PROGRESS, mIsShowingAutomatedTransferProgress); + outState.putBoolean(KEY_IS_SHOWING_DOMAIN_CREDIT_CHECK_PROGRESS, + mCheckingDomainCreditsProgressDialog != null && mCheckingDomainCreditsProgressDialog.isShowing()); } // UI Helpers @@ -412,7 +513,12 @@ public void onClick(View view) { mInstallButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - dispatchInstallPluginAction(); + if (isCustomDomainRequired()) { + showDomainCreditsCheckProgressDialog(); + mDispatcher.dispatch(SiteActionBuilder.newFetchPlansAction(mSite)); + } else { + dispatchInstallPluginAction(); + } } }); @@ -458,6 +564,10 @@ public void onClick(View view) { refreshViews(); } + private boolean isCustomDomainRequired() { + return mSite.getUrl().contains(".wordpress.com") && BuildConfig.DOMAIN_REGISTRATION_ENABLED; + } + private void refreshViews() { View scrollView = findViewById(R.id.scroll_view); if (scrollView.getVisibility() != View.VISIBLE) { @@ -508,11 +618,11 @@ private void refreshViews() { private void setCollapsibleHtmlText(@NonNull TextView textView, @Nullable String htmlText) { if (!TextUtils.isEmpty(htmlText)) { - textView.setTextColor(getResources().getColor(R.color.grey_dark)); + textView.setTextColor(getResources().getColor(R.color.neutral_700)); textView.setMovementMethod(WPLinkMovementMethod.getInstance()); textView.setText(Html.fromHtml(htmlText)); } else { - textView.setTextColor(getResources().getColor(R.color.grey_lighten_10)); + textView.setTextColor(getResources().getColor(R.color.neutral_200)); textView.setText(R.string.plugin_empty_text); } } @@ -776,6 +886,26 @@ private void showPluginRemoveFailedSnackbar() { .show(); } + private void showDomainCreditsCheckProgressDialog() { + if (mCheckingDomainCreditsProgressDialog == null) { + mCheckingDomainCreditsProgressDialog = new ProgressDialog(this); + mCheckingDomainCreditsProgressDialog.setCancelable(true); + mCheckingDomainCreditsProgressDialog.setIndeterminate(true); + + mCheckingDomainCreditsProgressDialog + .setMessage(getString(R.string.plugin_check_domain_credits_progress_dialog_message)); + } + if (!mCheckingDomainCreditsProgressDialog.isShowing()) { + mCheckingDomainCreditsProgressDialog.show(); + } + } + + private void cancelDomainCreditsCheckProgressDialog() { + if (mCheckingDomainCreditsProgressDialog != null && mCheckingDomainCreditsProgressDialog.isShowing()) { + mCheckingDomainCreditsProgressDialog.cancel(); + } + } + private void showRemovePluginProgressDialog() { if (mRemovePluginProgressDialog == null) { mRemovePluginProgressDialog = new ProgressDialog(this); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java index ae8ab0edccc5..b5178eea4f41 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/plugins/PluginListFragment.java @@ -266,19 +266,19 @@ public void onBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { @DrawableRes int drawableResId; if (PluginUtils.isAutoManaged(mViewModel.getSite(), plugin)) { textResId = R.string.plugin_auto_managed; - colorResId = R.color.alert_green; - drawableResId = R.color.transparent; + colorResId = R.color.success_500; + drawableResId = android.R.color.transparent; } else if (PluginUtils.isUpdateAvailable(plugin)) { textResId = R.string.plugin_needs_update; - colorResId = R.color.alert_yellow; + colorResId = R.color.warning_500; drawableResId = R.drawable.ic_sync_white_24dp; } else if (plugin.isActive()) { textResId = R.string.plugin_active; - colorResId = R.color.alert_green; + colorResId = R.color.success_500; drawableResId = R.drawable.ic_checkmark_white_24dp; } else { textResId = R.string.plugin_inactive; - colorResId = R.color.grey; + colorResId = R.color.neutral_300; drawableResId = R.drawable.ic_cross_white_24dp; } int color = getResources().getColor(colorResId); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index 5ee94077447a..6522959f0fac 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -1741,9 +1741,7 @@ public void onPositiveClicked(@NonNull String instanceTag) { mZendeskHelper.createNewTicket(this, Origin.DISCARD_CHANGES, mSite); break; case TAG_PUBLISH_CONFIRMATION_DIALOG: - mPost.setStatus(PostStatus.PUBLISHED.toString()); - mPostEditorAnalyticsSession.setOutcome(Outcome.PUBLISH); - publishPost(); + publishPost(PostStatus.fromPost(mPost) == PostStatus.DRAFT); AppRatingDialog.INSTANCE .incrementInteractions(APP_REVIEWS_EVENT_INCREMENTED_BY_PUBLISHING_POST_OR_PAGE); break; @@ -1752,7 +1750,7 @@ public void onPositiveClicked(@NonNull String instanceTag) { mEditorFragment.removeAllFailedMediaUploads(); break; case ASYNC_PROMO_DIALOG_TAG: - publishPost(); + publishPost(PostStatus.fromPost(mPost) == PostStatus.DRAFT); break; case TAG_GB_INFORMATIVE_DIALOG: // no op @@ -1972,6 +1970,10 @@ private void saveResult(boolean saved, boolean discardable, boolean savedLocally } private void publishPost() { + publishPost(false); + } + + private void publishPost(final boolean isDraftToPublish) { AccountModel account = mAccountStore.getAccount(); // prompt user to verify e-mail before publishing if (!account.getEmailVerified()) { @@ -2015,6 +2017,12 @@ public void onClick(DialogInterface dialog, int id) { @Override public void run() { boolean isFirstTimePublish = isFirstTimePublish(); + if (isDraftToPublish) { + // now set status to PUBLISHED - only do this AFTER we have run the isFirstTimePublish() check, + // otherwise we'd have an incorrect value + mPost.setStatus(PostStatus.PUBLISHED.toString()); + mPostEditorAnalyticsSession.setOutcome(Outcome.PUBLISH); + } boolean postUpdateSuccessful = updatePostObject(); if (!postUpdateSuccessful) { @@ -3953,7 +3961,7 @@ private void showAsyncPromoDialog(boolean isPage, boolean isScheduled) { getString(title), getString(description), getString(button), - R.drawable.img_publish_button_124dp, + R.drawable.img_illustration_hand_checkmark_button_124dp, getString(R.string.keep_editing), getString(R.string.async_promo_link)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt index edd4d1ad1f55..bef900b052a9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/PostViewHolder.kt @@ -151,7 +151,7 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC } else { var statusTextResId = 0 var statusIconResId = 0 - var statusColorResId = R.color.grey_darken_10 + var statusColorResId = R.color.neutral_400 var errorMessage: String? = null val uploadError = postAdapterItem.uploadStatus.uploadError @@ -162,7 +162,7 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC errorMessage = UploadUtils.getErrorMessageFromPostError(context, false, uploadError.postError) } statusIconResId = R.drawable.ic_cloud_upload_white_24dp - statusColorResId = R.color.alert_red + statusColorResId = R.color.error_500 } else if (postAdapterItem.uploadStatus.isUploading) { statusTextResId = R.string.post_uploading statusIconResId = R.drawable.ic_cloud_upload_white_24dp @@ -176,37 +176,37 @@ class PostViewHolder(private val view: View, private val config: PostViewHolderC } else if (postAdapterItem.isConflicted) { statusTextResId = R.string.local_post_is_conflicted statusIconResId = R.drawable.ic_notice_white_24dp - statusColorResId = R.color.alert_red + statusColorResId = R.color.error_500 } else if (postAdapterItem.isLocalDraft) { statusTextResId = R.string.local_draft statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } else if (postAdapterItem.isLocallyChanged) { statusTextResId = R.string.local_changes statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } else { when (postAdapterItem.postStatus) { PostStatus.DRAFT -> { statusTextResId = R.string.post_status_draft statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } PostStatus.PRIVATE -> statusTextResId = R.string.post_status_post_private PostStatus.PENDING -> { statusTextResId = R.string.post_status_pending_review statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_yellow_dark + statusColorResId = R.color.warning_700 } PostStatus.SCHEDULED -> { statusTextResId = R.string.post_status_scheduled statusIconResId = R.drawable.ic_calendar_white_24dp - statusColorResId = R.color.blue_medium + statusColorResId = R.color.primary_400 } PostStatus.TRASHED -> { statusTextResId = R.string.post_status_trashed statusIconResId = R.drawable.ic_pages_white_24dp - statusColorResId = R.color.alert_red + statusColorResId = R.color.error_500 } PostStatus.UNKNOWN -> { } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java index 83a7e22113da..e50f184b7318 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/DetailListPreference.java @@ -65,9 +65,9 @@ protected void onBindView(@NonNull View view) { super.onBindView(view); setupView((TextView) view.findViewById(android.R.id.title), - R.dimen.text_sz_large, R.color.grey_dark, R.color.grey_lighten_10); + R.dimen.text_sz_large, R.color.neutral_700, R.color.neutral_200); setupView((TextView) view.findViewById(android.R.id.summary), - R.dimen.text_sz_medium, R.color.grey_text_min, R.color.grey_lighten_10); + R.dimen.text_sz_medium, R.color.neutral, R.color.neutral_200); } @Override @@ -141,12 +141,12 @@ public void onClick(DialogInterface dialog, int which) { if (positive != null) { //noinspection deprecation - positive.setTextColor(res.getColor(R.color.blue_medium)); + positive.setTextColor(res.getColor(R.color.primary_400)); } if (negative != null) { //noinspection deprecation - negative.setTextColor(res.getColor(R.color.blue_medium)); + negative.setTextColor(res.getColor(R.color.primary_400)); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/EditTextPreferenceWithValidation.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/EditTextPreferenceWithValidation.java index a2794953ee50..9046fd8c6fb6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/EditTextPreferenceWithValidation.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/EditTextPreferenceWithValidation.java @@ -47,7 +47,8 @@ public void onClick(View v) { } }); - positiveButton.setTextColor(ContextCompat.getColorStateList(getContext(), R.color.dialog_button_selector)); + positiveButton.setTextColor(ContextCompat.getColorStateList(getContext(), + R.color.primary_400_neutral_400_selector)); getEditText().addTextChangedListener(new TextWatcher() { @Override diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectRecyclerViewAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectRecyclerViewAdapter.java index 933f68336fc0..ad9b25b79924 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectRecyclerViewAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/MultiSelectRecyclerViewAdapter.java @@ -24,8 +24,8 @@ public class MultiSelectRecyclerViewAdapter extends RecyclerView.Adapter items) { - this.mSelectedColor = ContextCompat.getColor(context, R.color.white); - this.mUnselectedColor = ContextCompat.getColor(context, R.color.transparent); + this.mSelectedColor = ContextCompat.getColor(context, android.R.color.white); + this.mUnselectedColor = ContextCompat.getColor(context, android.R.color.transparent); this.mItems = items; this.mItemsSelected = new SparseBooleanArray(); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java index 17cd3f0b199f..e523198c9973 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFormatDialog.java @@ -125,7 +125,7 @@ private void createRadioButtons() { for (int i = 0; i < mEntries.length; i++) { RadioButton radio = new RadioButton(getActivity()); CompoundButtonCompat.setButtonTintList(radio, - getResources().getColorStateList(R.color.dialog_compound_button_thumb)); + getResources().getColorStateList(R.color.primary_400_gray_200_gray_400_selector)); radio.setText(mEntries[i]); radio.setId(i); mRadioGroup.addView(radio); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java index e4c65db95b1e..a9f8e339c22a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java @@ -65,7 +65,6 @@ import org.wordpress.android.ui.WPWebViewActivity; import org.wordpress.android.ui.accounts.HelpActivity.Origin; import org.wordpress.android.ui.prefs.SiteSettingsFormatDialog.FormatType; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.HtmlUtils; import org.wordpress.android.util.LocaleManager; @@ -77,6 +76,7 @@ import org.wordpress.android.util.ValidationUtils; import org.wordpress.android.util.WPActivityUtils; import org.wordpress.android.util.WPPrefUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import java.util.HashMap; import java.util.List; @@ -822,7 +822,7 @@ private void setupPreferenceList(ListView prefList, Resources res) { // customize list dividers //noinspection deprecation - prefList.setDivider(res.getDrawable(R.drawable.preferences_divider)); + prefList.setDivider(res.getDrawable(R.drawable.bg_rectangle_divider)); prefList.setDividerHeight(res.getDimensionPixelSize(R.dimen.site_settings_divider_height)); // handle long clicks on preferences to display hints prefList.setOnItemLongClickListener(this); @@ -831,7 +831,7 @@ private void setupPreferenceList(ListView prefList, Resources res) { // remove footer divider bar prefList.setFooterDividersEnabled(false); //noinspection deprecation - prefList.setOverscrollFooter(res.getDrawable(R.color.transparent)); + prefList.setOverscrollFooter(res.getDrawable(android.R.color.transparent)); } /** @@ -1841,7 +1841,7 @@ public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) { @Override public boolean onCreateActionMode(ActionMode actionMode, Menu menu) { - WPActivityUtils.setStatusBarColor(mDialog.getWindow(), R.color.action_mode_status_bar_tint); + WPActivityUtils.setStatusBarColor(mDialog.getWindow(), R.color.status_bar_action_mode); mActionMode = actionMode; MenuInflater inflater = actionMode.getMenuInflater(); inflater.inflate(R.menu.list_editor, menu); @@ -1850,7 +1850,7 @@ public boolean onCreateActionMode(ActionMode actionMode, Menu menu) { @Override public void onDestroyActionMode(ActionMode mode) { - WPActivityUtils.setStatusBarColor(mDialog.getWindow(), R.color.status_bar_tint); + WPActivityUtils.setStatusBarColor(mDialog.getWindow(), R.color.status_bar); getAdapter().removeItemsSelected(); mActionMode = null; } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java index f76707d7a31a..b5c6cb602764 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsTimezoneDialog.java @@ -326,7 +326,7 @@ public View getView(int position, View convertView, ViewGroup parent) { boolean isSelected = mSelectedTimezone != null && mSelectedTimezone.equals(mFilteredTimezones.get(position).mValue); - int colorRes = isSelected ? R.color.color_control_activated : R.color.transparent; + int colorRes = isSelected ? R.color.primary_300 : android.R.color.transparent; holder.mTxtLabel.setBackgroundColor(getResources().getColor(colorRes)); holder.mTxtLabel.setText(mFilteredTimezones.get(position).mLabel); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPPreference.java index dd57c655ff2f..6f345fb829e0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPPreference.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPPreference.java @@ -40,11 +40,11 @@ protected void onBindView(@NonNull View view) { TextView summaryView = (TextView) view.findViewById(android.R.id.summary); if (titleView != null) { titleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, res.getDimensionPixelSize(R.dimen.text_sz_large)); - titleView.setTextColor(res.getColor(isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10)); + titleView.setTextColor(res.getColor(isEnabled() ? R.color.neutral_700 : R.color.neutral_200)); } if (summaryView != null) { summaryView.setTextSize(TypedValue.COMPLEX_UNIT_PX, res.getDimensionPixelSize(R.dimen.text_sz_medium)); - summaryView.setTextColor(res.getColor(isEnabled() ? R.color.grey_text_min : R.color.grey_lighten_10)); + summaryView.setTextColor(res.getColor(isEnabled() ? R.color.neutral : R.color.neutral_200)); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPStartOverPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPStartOverPreference.java index bbc5db86edb0..cae73a56f77b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPStartOverPreference.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPStartOverPreference.java @@ -35,7 +35,7 @@ public WPStartOverPreference(Context context, AttributeSet attrs) { if (index == R.styleable.WPStartOverPreference_buttonText) { mButtonText = array.getString(index); } else if (index == R.styleable.WPStartOverPreference_buttonTextColor) { - mButtonTextColor = array.getColor(index, ContextCompat.getColor(context, R.color.black)); + mButtonTextColor = array.getColor(index, ContextCompat.getColor(context, android.R.color.black)); } else if (index == R.styleable.WPStartOverPreference_buttonTextAllCaps) { mButtonTextAllCaps = array.getBoolean(index, false); } else if (index == R.styleable.WPStartOverPreference_preficon) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java index f6d40b67d09f..ce416cb0b34c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/WPSwitchPreference.java @@ -34,7 +34,7 @@ public WPSwitchPreference(Context context, AttributeSet attrs) { if (index == R.styleable.SummaryEditTextPreference_longClickHint) { mHint = array.getString(index); } else if (index == R.styleable.SummaryEditTextPreference_iconTint) { - mTint = array.getResourceId(index, R.color.grey_text_min); + mTint = array.getResourceId(index, R.color.neutral); } } @@ -54,7 +54,7 @@ protected void onBindView(@NonNull View view) { if (titleView != null) { Resources res = getContext().getResources(); titleView.setTextSize(TypedValue.COMPLEX_UNIT_PX, res.getDimensionPixelSize(R.dimen.text_sz_large)); - titleView.setTextColor(res.getColor(isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10)); + titleView.setTextColor(res.getColor(isEnabled() ? R.color.neutral_700 : R.color.neutral_200)); // add padding to the start of nested preferences if (!TextUtils.isEmpty(getDependency())) { @@ -67,9 +67,9 @@ protected void onBindView(@NonNull View view) { Switch switchControl = getSwitch((ViewGroup) view); if (switchControl != null) { switchControl.setThumbTintList(ContextCompat.getColorStateList(this.getContext(), - R.color.dialog_compound_button_thumb)); + R.color.primary_400_gray_200_gray_400_selector)); switchControl.setTrackTintList(ContextCompat.getColorStateList(this.getContext(), - R.color.dialog_compound_button_track)); + R.color.primary_400_gray_900_gray_500_selector)); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java index a9768972bf26..4e0825cda252 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/notifications/NotificationsSettingsFragment.java @@ -715,7 +715,7 @@ private void addPreferencesForPreferenceScreen(PreferenceScreen preferenceScreen ); timelinePreference.setIcon(ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_bell_white_24dp, - R.color.grey_darken_30)); + R.color.neutral_600)); timelinePreference.setTitle(R.string.notifications_tab); timelinePreference.setDialogTitle(R.string.notifications_tab); timelinePreference.setSummary(R.string.notifications_tab_summary); @@ -727,7 +727,7 @@ private void addPreferencesForPreferenceScreen(PreferenceScreen preferenceScreen ); emailPreference.setIcon(ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_mail_white_24dp, - R.color.grey_darken_30)); + R.color.neutral_600)); emailPreference.setTitle(R.string.email); emailPreference.setDialogTitle(R.string.email); emailPreference.setSummary(R.string.notifications_email_summary); @@ -742,7 +742,7 @@ private void addPreferencesForPreferenceScreen(PreferenceScreen preferenceScreen ); devicePreference.setIcon(ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_phone_white_24dp, - R.color.grey_darken_30)); + R.color.neutral_600)); devicePreference.setTitle(R.string.app_notifications); devicePreference.setDialogTitle(R.string.app_notifications); devicePreference.setSummary(R.string.notifications_push_summary); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartAdapter.java index cc28bbd23b09..f1a579f3352d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/quickstart/QuickStartAdapter.java @@ -84,12 +84,12 @@ public void onBindViewHolder(@NonNull ViewHolder viewHolder, int position) { mTaskCompleted.size())); if (mIsCompletedTaskListExpanded) { - headerViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_rounded_top_white_card); + headerViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_white_radius_top_card); headerViewHolder.mChevron.setRotation(EXPANDED_CHEVRON_ROTATION); headerViewHolder.mChevron.setContentDescription( mContext.getString(R.string.quick_start_completed_tasks_header_chevron_collapse_desc)); } else { - headerViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_rounded_white_card); + headerViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_white_radius_card); headerViewHolder.mChevron.setRotation(COLLAPSED_CHEVRON_ROTATION); headerViewHolder.mChevron.setContentDescription( mContext.getString(R.string.quick_start_completed_tasks_header_chevron_expand_desc)); @@ -110,14 +110,14 @@ public void onBindViewHolder(@NonNull ViewHolder viewHolder, int position) { if (position == 0) { // Use rounded background when next item is header. if (getItemViewType(position + 1) == VIEW_TYPE_COMPLETED_TASKS_HEADER) { - taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_rounded_white_card); + taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_white_radius_card); // Use top rounded background when next item is not header (i.e. middle or bottom). } else { - taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_rounded_top_white_card); + taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_white_radius_top_card); } // When last list item or next item is header, use bottom rounded background. } else if (position == mTasks.size() - 1 || getItemViewType(position + 1) == VIEW_TYPE_COMPLETED_TASKS_HEADER) { - taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_rounded_bottom_white_card); + taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_white_radius_bottom_card); // Otherwise, use middle unrounded background. } else { taskViewHolder.itemView.setBackgroundResource(R.drawable.bg_rectangle_white); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java index c967131aec41..25e7d1222a84 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostDetailFragment.java @@ -458,7 +458,7 @@ public void onFollowTapped(View view, String blogName, final long blogId) { ReaderBlogTable.setNotificationsEnabledByBlogId(blogId, true); } }) - .setActionTextColor(getResources().getColor(R.color.color_accent)) + .setActionTextColor(getResources().getColor(R.color.accent)) .show(); } } @@ -1211,7 +1211,7 @@ protected void onPostExecute(Boolean result) { excerptFooter.setVisibility(View.VISIBLE); String blogName = "" + mPost.getBlogName() + ""; + .link_reader) + "'>" + mPost.getBlogName() + ""; String linkText = String.format(WordPress.getContext(). getString(R.string.reader_excerpt_link), blogName); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java index 218cec0b7946..ea9fa67a8e20 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPostListFragment.java @@ -704,8 +704,8 @@ public void onShowCustomEmptyView(EmptyViewMessageType emptyViewMsgType) { mRecyclerView.addItemDecoration(new RecyclerItemDecoration(spacingHorizontal, spacingVertical, false)); // the following will change the look and feel of the toolbar to match the current design - mRecyclerView.setToolbarBackgroundColor(ContextCompat.getColor(context, R.color.color_primary)); - mRecyclerView.setToolbarSpinnerTextColor(ContextCompat.getColor(context, R.color.white)); + mRecyclerView.setToolbarBackgroundColor(ContextCompat.getColor(context, R.color.primary)); + mRecyclerView.setToolbarSpinnerTextColor(ContextCompat.getColor(context, android.R.color.white)); mRecyclerView.setToolbarSpinnerDrawable(R.drawable.ic_dropdown_blue_light_24dp); mRecyclerView.setToolbarLeftAndRightPadding( getResources().getDimensionPixelSize(R.dimen.margin_medium), @@ -2220,7 +2220,7 @@ public void onFollowTapped(View view, String blogName, final long blogId) { ReaderBlogTable.setNotificationsEnabledByBlogId(blogId, true); } }) - .setActionTextColor(getResources().getColor(R.color.color_accent)) + .setActionTextColor(getResources().getColor(R.color.accent)) .show(); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java index 92c3075968a2..d3d59a633154 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderResourceVars.java @@ -39,10 +39,10 @@ class ReaderResourceVars { mFeaturedImageHeightPx = resources.getDimensionPixelSize(R.dimen.reader_featured_image_height); mMarginMediumPx = resources.getDimensionPixelSize(R.dimen.margin_medium); - mLinkColorStr = HtmlUtils.colorResToHtmlColor(context, R.color.reader_hyperlink); - mGreyMediumDarkStr = HtmlUtils.colorResToHtmlColor(context, R.color.grey_darken_30); - mGreyLightStr = HtmlUtils.colorResToHtmlColor(context, R.color.grey_light); - mGreyExtraLightStr = HtmlUtils.colorResToHtmlColor(context, R.color.grey_lighten_30); + mLinkColorStr = HtmlUtils.colorResToHtmlColor(context, R.color.link_reader); + mGreyMediumDarkStr = HtmlUtils.colorResToHtmlColor(context, R.color.neutral_600); + mGreyLightStr = HtmlUtils.colorResToHtmlColor(context, R.color.neutral_0); + mGreyExtraLightStr = HtmlUtils.colorResToHtmlColor(context, R.color.neutral_0); // full-size image width must take margin into account mFullSizeImageWidthPx = displayWidthPx - (detailMarginWidthPx * 2); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java index c0aaca74b3aa..b749456dd2c9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderSubsActivity.java @@ -95,8 +95,8 @@ protected void onCreate(Bundle savedInstanceState) { TabLayout tabLayout = (TabLayout) findViewById(R.id.tab_layout); tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); - int normalColor = ContextCompat.getColor(this, R.color.blue_light); - int selectedColor = ContextCompat.getColor(this, R.color.white); + int normalColor = ContextCompat.getColor(this, R.color.primary_300); + int selectedColor = ContextCompat.getColor(this, android.R.color.white); tabLayout.setTabTextColors(normalColor, selectedColor); tabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); tabLayout.setupWithViewPager(mViewPager); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java index fcb5164106e6..a54013360d58 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderCommentAdapter.java @@ -34,7 +34,6 @@ import org.wordpress.android.ui.reader.utils.ReaderUtils; import org.wordpress.android.ui.reader.views.ReaderCommentsPostHeaderView; import org.wordpress.android.ui.reader.views.ReaderIconCountView; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.AppLog.T; import org.wordpress.android.util.DateTimeUtils; @@ -42,6 +41,7 @@ import org.wordpress.android.util.GravatarUtils; import org.wordpress.android.util.NetworkUtils; import org.wordpress.android.util.ToastUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.image.ImageManager; import org.wordpress.android.util.image.ImageType; @@ -149,9 +149,9 @@ public ReaderCommentAdapter(Context context, ReaderPost post) { int mediumMargin = context.getResources().getDimensionPixelSize(R.dimen.margin_medium); mContentWidth = displayWidth - (cardMargin * 2) - (contentPadding * 2) - (mediumMargin * 2); - mColorAuthor = ContextCompat.getColor(context, R.color.blue_medium); - mColorNotAuthor = ContextCompat.getColor(context, R.color.grey_dark); - mColorHighlight = ContextCompat.getColor(context, R.color.grey_lighten_30); + mColorAuthor = ContextCompat.getColor(context, R.color.primary_400); + mColorNotAuthor = ContextCompat.getColor(context, R.color.neutral_700); + mColorHighlight = ContextCompat.getColor(context, R.color.neutral_0); setHasStableIds(true); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java index 5ac6fea15a73..b62bc2dc4d3c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderMenuAdapter.java @@ -67,32 +67,32 @@ public View getView(int position, View convertView, ViewGroup parent) { switch (mMenuItems.get(position)) { case ITEM_FOLLOW: textRes = R.string.reader_btn_follow; - colorRes = R.color.reader_follow; + colorRes = R.color.primary; iconRes = R.drawable.ic_reader_follow_white_24dp; break; case ITEM_UNFOLLOW: textRes = R.string.reader_btn_unfollow; - colorRes = R.color.reader_following; + colorRes = R.color.success; iconRes = R.drawable.ic_reader_following_white_24dp; break; case ITEM_BLOCK: textRes = R.string.reader_menu_block_blog; - colorRes = R.color.grey_dark; + colorRes = R.color.neutral_700; iconRes = R.drawable.ic_block_white_24dp; break; case ITEM_NOTIFICATIONS_OFF: textRes = R.string.reader_btn_notifications_off; - colorRes = R.color.reader_notifications_off; + colorRes = R.color.success; iconRes = R.drawable.ic_bell_white_24dp; break; case ITEM_NOTIFICATIONS_ON: textRes = R.string.reader_btn_notifications_on; - colorRes = R.color.reader_notifications_on; + colorRes = R.color.neutral_800; iconRes = R.drawable.ic_bell_white_24dp; break; case ITEM_SHARE: textRes = R.string.reader_btn_share; - colorRes = R.color.grey_dark; + colorRes = R.color.neutral_700; iconRes = R.drawable.ic_share_white_24dp; break; default: diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java index 3e87f498b5fa..d226b615124a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderPostAdapter.java @@ -252,7 +252,7 @@ public void onClick(View view) { // show author/blog link as disabled if we're previewing a blog, otherwise show // blog preview when the post header is clicked if (getPostListType() == ReaderTypes.ReaderPostListType.BLOG_PREVIEW) { - int color = itemView.getContext().getResources().getColor(R.color.grey_dark); + int color = itemView.getContext().getResources().getColor(R.color.neutral_700); mTxtAuthorAndBlogName.setTextColor(color); // remove the ripple background postHeaderView.setBackground(null); @@ -419,7 +419,7 @@ private void renderRemovedPost(final int position, final ReaderRemovedPostViewHo final Context context = holder.mRemovedPostContainer.getContext(); holder.mTxtRemovedPostTitle.setText(createTextForRemovedPostContainer(post, context)); Drawable drawable = - ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_undo_white_24dp, R.color.blue_medium); + ColorUtils.INSTANCE.applyTintToDrawable(context, R.drawable.ic_undo_white_24dp, R.color.primary_400); holder.mUndoRemoveAction.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null); holder.mCardView.setOnClickListener(new View.OnClickListener() { @Override diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderSearchSuggestionAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderSearchSuggestionAdapter.java index 6685f77ba330..c93b9b0f9ecc 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderSearchSuggestionAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/adapters/ReaderSearchSuggestionAdapter.java @@ -35,8 +35,8 @@ public ReaderSearchSuggestionAdapter(Context context) { super(context, null, false); String clearAllText = context.getString(R.string.label_clear_search_history); mClearAllRow = new Object[]{CLEAR_ALL_ROW_ID, clearAllText}; - mClearAllBgColor = ContextCompat.getColor(context, R.color.grey_lighten_30); - mSuggestionBgColor = ContextCompat.getColor(context, R.color.filtered_list_suggestions); + mClearAllBgColor = ContextCompat.getColor(context, R.color.neutral_0); + mSuggestionBgColor = ContextCompat.getColor(context, R.color.neutral_0); } public void setFilter(String filter) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java index ce446fdcedc1..d5252defbd12 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderFollowButton.java @@ -77,10 +77,10 @@ private void updateFollowText() { int colorId; if (mIsFollowed) { drawableId = R.drawable.ic_reader_following_white_24dp; - colorId = R.color.alert_green; + colorId = R.color.success_500; } else { drawableId = R.drawable.ic_reader_follow_white_24dp; - colorId = R.color.blue_medium; + colorId = R.color.primary_400; } ColorUtils.INSTANCE.setImageResourceWithTint(mImageFollow, drawableId, colorId); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java index 9f7a0e47e77e..5d0386d94601 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderIconCountView.java @@ -55,13 +55,13 @@ private void initView(Context context, AttributeSet attrs) { mImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.reader_button_like)); mImageView.setImageTintList(getResources().getColorStateList( - R.color.grey_min_orange_jazzy_grey_disabled_selector)); + R.color.neutral_accent_neutral_400_selector)); break; case ICON_COMMENT: mImageView.setImageDrawable(ContextCompat.getDrawable(context, R.drawable.ic_comment_white_24dp)); mImageView.setImageTintList(getResources().getColorStateList( - R.color.grey_min_blue_medium_grey_disabled_selector)); + R.color.neutral_primary_400_neutral_400_selector)); break; } } finally { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.java b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.java index d057f0005daf..1621096b1036 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPostDetailHeaderView.java @@ -95,7 +95,7 @@ public void setPost(@NonNull ReaderPost post, boolean isSignedInWPCom) { txtTitle.setOnClickListener(mClickListener); txtSubtitle.setOnClickListener(mClickListener); } else { - int color = getContext().getResources().getColor(R.color.grey_dark); + int color = getContext().getResources().getColor(R.color.neutral_700); txtTitle.setTextColor(color); txtSubtitle.setTextColor(color); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt index 9cf78bb2c8a9..55ca90fceba5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/NewSiteCreationActivity.kt @@ -159,7 +159,11 @@ class NewSiteCreationActivity : AppCompatActivity(), screenTitle, target.wizardState.segmentId!! ) - DOMAINS -> NewSiteCreationDomainsFragment.newInstance(screenTitle, target.wizardState.siteTitle) + DOMAINS -> NewSiteCreationDomainsFragment.newInstance( + screenTitle, + target.wizardState.siteTitle, + target.wizardState.segmentId!! + ) SITE_INFO -> NewSiteCreationSiteInfoFragment.newInstance(screenTitle) SITE_PREVIEW -> NewSiteCreationPreviewFragment.newInstance(screenTitle, target.wizardState) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt index 951d5923c2a0..55bd2b9db2d7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainViewHolder.kt @@ -28,7 +28,7 @@ sealed class NewSiteCreationDomainViewHolder(internal val parent: ViewGroup, @La init { suggestion.buttonTintList = ContextCompat.getColorStateList( parentView.context, - R.color.grey_blue_radio_button_state_list + R.color.neutral_100_primary_400_selector ) container.setOnClickListener { onDomainSelected?.invoke() @@ -55,7 +55,7 @@ sealed class NewSiteCreationDomainViewHolder(internal val parent: ViewGroup, @La private fun addRetryCompoundDrawable() { val drawable = itemView.context.getDrawable(drawable.retry_icon) - drawable.setTint(ContextCompat.getColor(itemView.context, color.wp_blue)) + drawable.setTint(ContextCompat.getColor(itemView.context, color.primary)) retry.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsFragment.kt index b67265628bed..382483c123a3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsFragment.kt @@ -136,7 +136,7 @@ class NewSiteCreationDomainsFragment : NewSiteCreationBaseFormFragment() { viewModel.onHelpClicked.observe(this, Observer { helpClickedListener.onHelpClicked(HelpActivity.Origin.NEW_SITE_CREATION_DOMAINS) }) - viewModel.start(getSiteTitleFromArguments()) + viewModel.start(getSiteTitleFromArguments(), getSegmentIdFromArguments()) } private fun updateContentUiState(contentState: DomainsUiContentState) { @@ -151,14 +151,22 @@ class NewSiteCreationDomainsFragment : NewSiteCreationBaseFormFragment() { return arguments?.getString(EXTRA_SITE_TITLE) } + private fun getSegmentIdFromArguments(): Long { + return requireNotNull(arguments?.getLong(EXTRA_SEGMENT_ID)) { + "SegmentId is missing. Have you created the fragment using NewSiteCreationDomainsFragment.newInstance(..)?" + } + } + companion object { const val TAG = "site_creation_domains_fragment_tag" const val EXTRA_SITE_TITLE = "extra_site_title" + private const val EXTRA_SEGMENT_ID = "extra_segment_id" - fun newInstance(screenTitle: String, siteTitle: String?): NewSiteCreationDomainsFragment { + fun newInstance(screenTitle: String, siteTitle: String?, segmentId: Long): NewSiteCreationDomainsFragment { val fragment = NewSiteCreationDomainsFragment() val bundle = Bundle() bundle.putString(NewSiteCreationBaseFormFragment.EXTRA_SCREEN_TITLE, screenTitle) + bundle.putLong(EXTRA_SEGMENT_ID, segmentId) siteTitle?.let { bundle.putString(EXTRA_SITE_TITLE, siteTitle) } fragment.arguments = bundle return fragment diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsViewModel.kt index 159bbc50c0dc..2b3aaa3b2749 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/NewSiteCreationDomainsViewModel.kt @@ -56,6 +56,7 @@ class NewSiteCreationDomainsViewModel @Inject constructor( override val coroutineContext: CoroutineContext get() = bgDispatcher + job private var isStarted = false + private var segmentId by Delegates.notNull() private val _uiState: MutableLiveData = MutableLiveData() val uiState: LiveData = _uiState @@ -86,10 +87,11 @@ class NewSiteCreationDomainsViewModel @Inject constructor( dispatcher.unregister(fetchDomainsUseCase) } - fun start(siteTitle: String?) { + fun start(siteTitle: String?, segmentId: Long) { if (isStarted) { return } + this.segmentId = segmentId isStarted = true tracker.trackDomainsAccessed() // isNullOrBlank not smart-casting for some reason.. @@ -140,7 +142,7 @@ class NewSiteCreationDomainsViewModel @Inject constructor( updateUiStateToContent(query, Loading(Ready(emptyList()), false)) fetchDomainsJob = launch { delay(THROTTLE_DELAY) - val onSuggestedDomains = fetchDomainsUseCase.fetchDomains(query.value) + val onSuggestedDomains = fetchDomainsUseCase.fetchDomains(query.value, segmentId) withContext(mainDispatcher) { onDomainsFetched(query, onSuggestedDomains) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt index 9637711d9b43..fab513afa149 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/misc/SearchInputWithHeader.kt @@ -26,7 +26,7 @@ class SearchInputWithHeader(private val uiHelpers: UiHelpers, rootView: View, on init { val context = rootView.context - val greyColor = ContextCompat.getColor(context, R.color.grey) + val greyColor = ContextCompat.getColor(context, R.color.neutral_300) val inputDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_search_white_24dp) inputDrawable?.setTint(greyColor) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt index 7f4c52d65999..c4232149ead2 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSiteCreationPreviewFragment.kt @@ -208,14 +208,14 @@ class NewSiteCreationPreviewFragment : NewSiteCreationBaseFormFragment(), private fun updateLoadingLayout(progressUiState: SitePreviewFullscreenProgressUiState) { progressUiState.apply { - setTextOrHide(fullscreenProgressLayout.findViewById(R.id.progress_text), loadingTextResId) + uiHelpers.setTextOrHide(fullscreenProgressLayout.findViewById(R.id.progress_text), loadingTextResId) } } private fun updateErrorLayout(errorUiStateState: SitePreviewFullscreenErrorUiState) { errorUiStateState.apply { - setTextOrHide(fullscreenErrorLayout.findViewById(R.id.error_title), titleResId) - setTextOrHide(fullscreenErrorLayout.findViewById(R.id.error_subtitle), subtitleResId) + uiHelpers.setTextOrHide(fullscreenErrorLayout.findViewById(R.id.error_title), titleResId) + uiHelpers.setTextOrHide(fullscreenErrorLayout.findViewById(R.id.error_subtitle), subtitleResId) uiHelpers.updateVisibility( fullscreenErrorLayout.findViewById(R.id.contact_support), errorUiStateState.showContactSupport @@ -227,13 +227,6 @@ class NewSiteCreationPreviewFragment : NewSiteCreationBaseFormFragment(), } } - private fun setTextOrHide(textView: TextView, resId: Int?) { - textView.visibility = if (resId == null) View.GONE else View.VISIBLE - resId?.let { - textView.text = resources.getString(resId) - } - } - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) (requireNotNull(activity).application as WordPress).component().inject(this) @@ -262,13 +255,13 @@ class NewSiteCreationPreviewFragment : NewSiteCreationBaseFormFragment(), ): Spannable { val spannableTitle = SpannableString(url) spannableTitle.setSpan( - ForegroundColorSpan(ContextCompat.getColor(context, R.color.wp_grey_dark)), + ForegroundColorSpan(ContextCompat.getColor(context, R.color.neutral_800)), subdomainSpan.first, subdomainSpan.second, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) spannableTitle.setSpan( - ForegroundColorSpan(ContextCompat.getColor(context, R.color.wp_grey_darken_20)), + ForegroundColorSpan(ContextCompat.getColor(context, R.color.neutral_500)), domainSpan.first, domainSpan.second, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSitePreviewViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSitePreviewViewModel.kt index 57cf3855d578..9ece840d2f54 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSitePreviewViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/previews/NewSitePreviewViewModel.kt @@ -33,6 +33,9 @@ import org.wordpress.android.ui.sitecreation.services.NewSiteCreationServiceStat import org.wordpress.android.ui.sitecreation.services.NewSiteCreationServiceState.NewSiteCreationStep.FAILURE import org.wordpress.android.ui.sitecreation.services.NewSiteCreationServiceState.NewSiteCreationStep.IDLE import org.wordpress.android.ui.sitecreation.services.NewSiteCreationServiceState.NewSiteCreationStep.SUCCESS +import org.wordpress.android.ui.sitecreation.usecases.isWordPressComSubDomain +import org.wordpress.android.util.AppLog +import org.wordpress.android.util.AppLog.T import org.wordpress.android.util.NetworkUtilsWrapper import org.wordpress.android.util.UrlUtilsWrapper import org.wordpress.android.viewmodel.SingleLiveEvent @@ -120,7 +123,7 @@ class NewSitePreviewViewModel @Inject constructor( verticalId, siteTitle, siteTagLine, - urlUtils.extractSubDomain(urlWithoutScheme) + urlWithoutScheme ) _startCreateSiteService.value = SitePreviewStartServiceData(serviceData, previousState) } @@ -230,7 +233,12 @@ class NewSitePreviewViewModel @Inject constructor( } } // Load the newly created site in the webview - _preloadPreview.postValue(urlUtils.addUrlSchemeIfNeeded(urlWithoutScheme, true)) + val urlToLoad = urlUtils.addUrlSchemeIfNeeded( + url = urlWithoutScheme, + addHttps = isWordPressComSubDomain(urlWithoutScheme) + ) + AppLog.v(T.SITE_CREATION, "Site preview will load for url: $urlToLoad") + _preloadPreview.postValue(urlToLoad) } fun onUrlLoaded() { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/NewSiteCreationSegmentsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/NewSiteCreationSegmentsFragment.kt index 5eb290a70d53..c6cb0504163f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/NewSiteCreationSegmentsFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/segments/NewSiteCreationSegmentsFragment.kt @@ -20,6 +20,7 @@ import org.wordpress.android.ui.sitecreation.NewSiteCreationBaseFormFragment import org.wordpress.android.ui.sitecreation.misc.OnHelpClickedListener import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsContentUiState import org.wordpress.android.ui.sitecreation.segments.SegmentsUiState.SegmentsErrorUiState +import org.wordpress.android.ui.utils.UiHelpers import org.wordpress.android.util.image.ImageManager import javax.inject.Inject @@ -36,6 +37,7 @@ class NewSiteCreationSegmentsFragment : NewSiteCreationBaseFormFragment() { @Inject internal lateinit var imageManager: ImageManager @Inject internal lateinit var viewModelFactory: ViewModelProvider.Factory + @Inject internal lateinit var uiHelpers: UiHelpers private lateinit var helpClickedListener: OnHelpClickedListener private lateinit var segmentsScreenListener: SegmentsScreenListener @@ -113,15 +115,8 @@ class NewSiteCreationSegmentsFragment : NewSiteCreationBaseFormFragment() { } private fun updateErrorLayout(errorUiStateState: SegmentsErrorUiState) { - setTextOrHide(errorTitle, errorUiStateState.titleResId) - setTextOrHide(errorSubtitle, errorUiStateState.subtitleResId) - } - - private fun setTextOrHide(textView: TextView, resId: Int?) { - textView.visibility = if (resId == null) View.GONE else View.VISIBLE - resId?.let { - textView.text = resources.getString(resId) - } + uiHelpers.setTextOrHide(errorTitle, errorUiStateState.titleResId) + uiHelpers.setTextOrHide(errorSubtitle, errorUiStateState.subtitleResId) } private fun initRetryButton(rootView: ViewGroup) { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/NewSiteCreationServiceNotification.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/NewSiteCreationServiceNotification.kt index c5bac74fc5dd..9f141137c34f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/NewSiteCreationServiceNotification.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/NewSiteCreationServiceNotification.kt @@ -7,7 +7,7 @@ import org.wordpress.android.util.AutoForegroundNotification object NewSiteCreationServiceNotification { private const val channelResId = R.string.notification_channel_normal_id - private const val colorResId = R.color.blue_wordpress + private const val colorResId = R.color.primary_500 private const val drawableResId = R.drawable.ic_my_sites_white_24dp fun createCreatingSiteNotification(context: Context): Notification { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt index 3960e7a67557..47f23c69cefe 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/CreateSiteUseCase.kt @@ -10,6 +10,7 @@ import org.wordpress.android.fluxc.store.SiteStore.OnNewSiteCreated import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility import org.wordpress.android.fluxc.store.SiteStore.SiteVisibility.PUBLIC import org.wordpress.android.ui.sitecreation.services.NewSiteCreationServiceData +import org.wordpress.android.util.UrlUtilsWrapper import javax.inject.Inject import kotlin.coroutines.Continuation import kotlin.coroutines.resume @@ -20,7 +21,8 @@ import kotlin.coroutines.suspendCoroutine */ class CreateSiteUseCase @Inject constructor( private val dispatcher: Dispatcher, - @Suppress("unused") private val siteStore: SiteStore + @Suppress("unused") private val siteStore: SiteStore, + private val urlUtilsWrapper: UrlUtilsWrapper ) { private var continuation: Continuation? = null @@ -33,9 +35,21 @@ class CreateSiteUseCase @Inject constructor( if (continuation != null) { throw IllegalStateException("Create site request has already been sent.") } + /* + * To create a site with WordPress.com sub-domain, we need to pass the domain name without the "wordpress.com" + * whereas to create a site with other domains, we need to pass the full url. This issue is addressed + * in this use case since it's closest to the network layer. + * + * Ideally API wouldn't work like this or if it does FluxC is the one that handles the issue. However, at the + * time of this comment, changing FluxC's Payload might end up affecting the old site creation flow, + * so the workaround is applied here instead. + */ + val domain = if (isWordPressComSubDomain(siteData.domain)) { + urlUtilsWrapper.extractSubDomain(siteData.domain) + } else siteData.domain return suspendCoroutine { cont -> val newSitePayload = NewSitePayload( - siteData.domain, + domain, siteData.siteTitle ?: "", languageWordPressId, siteVisibility, @@ -56,3 +70,5 @@ class CreateSiteUseCase @Inject constructor( continuation = null } } + +fun isWordPressComSubDomain(url: String) = url.endsWith(".wordpress.com") diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt index 1c48d5c60428..58eb4e6a2a47 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt @@ -12,9 +12,6 @@ import javax.inject.Inject import kotlin.coroutines.Continuation import kotlin.coroutines.resume -private const val FETCH_DOMAINS_SHOULD_ONLY_FETCH_WORDPRESS_COM_DOMAINS = true -private const val FETCH_DOMAINS_SHOULD_INCLUDE_WORDPRESS_COM_DOMAINS = true -private const val FETCH_DOMAINS_SHOULD_INCLUDE_DOT_BLOG_SUB_DOMAINS = false private const val FETCH_DOMAINS_SHOULD_INCLUDE_DOT_BLOG_VENDOR = false private const val FETCH_DOMAINS_SIZE = 20 @@ -36,17 +33,13 @@ class FetchDomainsUseCase @Inject constructor( suspend fun fetchDomains( query: String, - onlyWordPressCom: Boolean = FETCH_DOMAINS_SHOULD_ONLY_FETCH_WORDPRESS_COM_DOMAINS, - includeWordPressCom: Boolean = FETCH_DOMAINS_SHOULD_INCLUDE_WORDPRESS_COM_DOMAINS, - includeDotBlogSubdomain: Boolean = FETCH_DOMAINS_SHOULD_INCLUDE_DOT_BLOG_SUB_DOMAINS, + segmentId: Long, includeVendorDot: Boolean = FETCH_DOMAINS_SHOULD_INCLUDE_DOT_BLOG_VENDOR, size: Int = FETCH_DOMAINS_SIZE ): OnSuggestedDomains { val payload = SuggestDomainsPayload( query, - onlyWordPressCom, - includeWordPressCom, - includeDotBlogSubdomain, + segmentId, size, includeVendorDot ) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt index ef5c2d9644be..4d26247df1b5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationSiteInfoViewModel.kt @@ -101,13 +101,13 @@ class NewSiteCreationSiteInfoViewModel @Inject constructor( ) { SKIP( text = R.string.new_site_creation_button_skip, - textColor = R.color.wp_grey_dark, - backgroundColor = R.color.white + textColor = R.color.neutral_800, + backgroundColor = android.R.color.white ), NEXT( text = R.string.next, - textColor = R.color.white, - backgroundColor = R.color.wp_blue_medium + textColor = android.R.color.white, + backgroundColor = R.color.primary_400 ) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsFragment.kt index c1e16e5ce5a4..351c1c95beca 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsFragment.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsFragment.kt @@ -10,10 +10,8 @@ import android.support.annotation.LayoutRes import android.support.v4.app.FragmentActivity import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.RecyclerView -import android.view.View import android.view.ViewGroup import android.widget.Button -import android.widget.TextView import kotlinx.android.synthetic.main.site_creation_error_with_retry.view.* import org.wordpress.android.R import org.wordpress.android.WordPress @@ -179,15 +177,8 @@ class NewSiteCreationVerticalsFragment : NewSiteCreationBaseFormFragment() { } private fun updateErrorLayout(errorLayout: ViewGroup, errorUiStateState: VerticalsFullscreenErrorUiState) { - setTextOrHide(errorLayout.error_title, errorUiStateState.titleResId) - setTextOrHide(errorLayout.error_subtitle, errorUiStateState.subtitleResId) - } - - private fun setTextOrHide(textView: TextView, resId: Int?) { - textView.visibility = if (resId == null) View.GONE else View.VISIBLE - resId?.let { - textView.text = resources.getString(resId) - } + uiHelpers.setTextOrHide(errorLayout.error_title, errorUiStateState.titleResId) + uiHelpers.setTextOrHide(errorLayout.error_subtitle, errorUiStateState.subtitleResId) } override fun onHelp() { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt index 10d7229c3838..a3d369c007d6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/verticals/NewSiteCreationVerticalsViewHolder.kt @@ -67,7 +67,7 @@ sealed class NewSiteCreationVerticalsViewHolder(internal val parent: ViewGroup, private fun addRetryCompoundDrawable() { val drawable = itemView.context.getDrawable(drawable.retry_icon) - drawable?.setTint(ContextCompat.getColor(itemView.context, color.wp_blue)) + drawable?.setTint(ContextCompat.getColor(itemView.context, color.primary)) retry.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/OldStatsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/OldStatsActivity.java index 741c9a4bcda8..335cc25917a6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/OldStatsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/OldStatsActivity.java @@ -36,7 +36,6 @@ import org.wordpress.android.ui.Shortcut; import org.wordpress.android.ui.posts.PromoDialog; import org.wordpress.android.ui.prefs.AppPrefs; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.AppLog.T; import org.wordpress.android.util.DeviceUtils; @@ -46,6 +45,7 @@ import org.wordpress.android.util.ShortcutUtils; import org.wordpress.android.util.SiteUtils; import org.wordpress.android.util.ToastUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.helpers.SwipeToRefreshHelper; import org.wordpress.android.util.helpers.SwipeToRefreshHelper.RefreshListener; import org.wordpress.android.util.widgets.CustomSwipeRefreshLayout; @@ -255,7 +255,7 @@ public void onNothingSelected(AdapterView parent) { }); Toolbar spinnerToolbar = findViewById(R.id.toolbar_filter); - spinnerToolbar.setBackgroundColor(getResources().getColor(R.color.blue_medium)); + spinnerToolbar.setBackgroundColor(getResources().getColor(R.color.primary_400)); } selectCurrentTimeframeInActionBar(); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java index 0a1a99bc12e9..bf0aee08b031 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsAuthorsFragment.java @@ -240,7 +240,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, String icon = group.getAvatar(); int children = getChildrenCount(groupPosition); - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); // totals holder.totalsTextView.setText(FormatUtils.formatDecimal(total)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java index c85301715e5d..0bd5e6897cc9 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsBarGraph.java @@ -142,9 +142,9 @@ public boolean onTouchEvent(MotionEvent event) { private class HorizontalLabelsColor implements IndexDependentColor { public int get(int index) { if (mBarPositionToHighlight == index) { - return getResources().getColor(R.color.orange_jazzy); + return getResources().getColor(R.color.accent); } else { - return getResources().getColor(R.color.grey_darken_30); + return getResources().getColor(R.color.neutral_600); } } } @@ -152,11 +152,11 @@ public int get(int index) { private void setProperties() { GraphViewStyle gStyle = getGraphViewStyle(); gStyle.setHorizontalLabelsIndexDependentColor(new HorizontalLabelsColor()); - gStyle.setHorizontalLabelsColor(getResources().getColor(R.color.grey_darken_30)); - gStyle.setVerticalLabelsColor(getResources().getColor(R.color.grey_darken_10)); + gStyle.setHorizontalLabelsColor(getResources().getColor(R.color.neutral_600)); + gStyle.setVerticalLabelsColor(getResources().getColor(R.color.neutral_400)); gStyle.setTextSize(getResources().getDimensionPixelSize(R.dimen.text_sz_extra_small)); gStyle.setGridXColor(Color.TRANSPARENT); - gStyle.setGridYColor(getResources().getColor(R.color.grey_lighten_30)); + gStyle.setGridYColor(getResources().getColor(R.color.neutral_0)); gStyle.setNumVerticalLabels(3); setCustomLabelFormatter(new CustomLabelFormatter() { diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java index d9ecc91a3dab..10b6016f4419 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsClicksFragment.java @@ -229,7 +229,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, int children = getChildrenCount(groupPosition); if (children > 0) { - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); } else { holder.setEntryTextOrLink(url, name); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java index 50cd0c373eb5..7718314c270a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsCommentsFragment.java @@ -220,7 +220,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) { final StatsViewHolder holder = (StatsViewHolder) rowView.getTag(); // entries - holder.setEntryText(currentRowData.getName(), getResources().getColor(R.color.stats_text_color)); + holder.setEntryText(currentRowData.getName(), getResources().getColor(R.color.text)); // totals holder.totalsTextView.setText(FormatUtils.formatDecimal(currentRowData.getViews())); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java index 860eb32a9295..e84656428690 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsFollowersFragment.java @@ -332,7 +332,7 @@ public View getView(int position, View convertView, ViewGroup parent) { final FollowerModel currentRowData = mList.get(position); final StatsViewHolder holder = (StatsViewHolder) rowView.getTag(); - holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.stats_text_color)); + holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.text)); holder.rowContent.setClickable(false); final FollowDataModel followData = currentRowData.getFollowData(); @@ -367,7 +367,7 @@ public void onClick(View view) { // Open the in-app web browser holder.setEntryTextOrLink(currentRowData.getURL(), currentRowData.getLabel()); } - holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.stats_link_text_color)); + holder.entryTextView.setTextColor(mContext.getResources().getColor(R.color.link_stats)); } else { // Email followers, or wpcom followers with empty URL and no blogID holder.setEntryText(currentRowData.getLabel()); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java index 6bf9a9edc35a..c8c9b17825b3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsLatestPostSummaryFragment.java @@ -136,7 +136,7 @@ protected void updateUI() { TextView moduleTitle = (TextView) getView().findViewById(R.id.stats_module_title); moduleTitle.setOnClickListener(mViewsTabOnClickListener); - moduleTitle.setTextColor(getResources().getColor(R.color.stats_link_text_color)); + moduleTitle.setTextColor(getResources().getColor(R.color.link_stats)); // update the tabs and the text now LinearLayout ll = (LinearLayout) getActivity().getLayoutInflater() @@ -161,7 +161,7 @@ protected void updateUI() { endIndex = startIndex + postTitle.length() + 1; Spannable descriptionTextToSpan = new SpannableString(trendLabelFormatted); - descriptionTextToSpan.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.stats_link_text_color)), + descriptionTextToSpan.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.link_stats)), startIndex, endIndex, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); TextView trendLabelTextField = ll.findViewById(R.id.stats_post_trend_label); trendLabelTextField.setText(descriptionTextToSpan); @@ -218,19 +218,19 @@ private void setupTab(LinearLayout currentTab, String total, value = currentTab.findViewById(R.id.stats_visitors_and_views_tab_value); value.setText(total); if (total.equals("0")) { - value.setTextColor(getResources().getColor(R.color.grey_text_min)); + value.setTextColor(getResources().getColor(R.color.neutral)); } else { // Only Views is clickable here. // Likes and Comments shouldn't link anywhere because they don't have summaries // so their color should be Gray Darken 30 or #3d596d if (itemType == StatsVisitorsAndViewsFragment.OverviewLabel.VIEWS) { - value.setTextColor(getResources().getColor(R.color.blue_wordpress)); + value.setTextColor(getResources().getColor(R.color.primary_500)); } else { - value.setTextColor(getResources().getColor(R.color.grey_darken_30)); + value.setTextColor(getResources().getColor(R.color.neutral_600)); } } icon = currentTab.findViewById(R.id.stats_visitors_and_views_tab_icon); - ColorUtils.INSTANCE.setImageResourceWithTint(icon, getTabIcon(itemType), R.color.grey_dark); + ColorUtils.INSTANCE.setImageResourceWithTint(icon, getTabIcon(itemType), R.color.neutral_700); if (itemType == StatsVisitorsAndViewsFragment.OverviewLabel.COMMENTS) { currentTab.setBackgroundResource(R.drawable.stats_visitors_and_views_button_latest_white); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java index 3471920e986c..17f60c302962 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsInsightsTodayFragment.java @@ -46,7 +46,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa TextView moduleTitle = view.findViewById(R.id.stats_module_title); moduleTitle.setTag(StatsVisitorsAndViewsFragment.OverviewLabel.VIEWS); moduleTitle.setOnClickListener(mButtonsOnClickListener); - moduleTitle.setTextColor(getResources().getColor(R.color.stats_link_text_color)); + moduleTitle.setTextColor(getResources().getColor(R.color.link_stats)); return view; } @@ -152,12 +152,12 @@ private void setupTab(LinearLayout currentTab, String total, value = currentTab.findViewById(R.id.stats_visitors_and_views_tab_value); value.setText(total); if (total.equals("0")) { - value.setTextColor(getResources().getColor(R.color.grey_text_min)); + value.setTextColor(getResources().getColor(R.color.neutral)); } else { - value.setTextColor(getResources().getColor(R.color.blue_wordpress)); + value.setTextColor(getResources().getColor(R.color.primary_500)); } icon = currentTab.findViewById(R.id.stats_visitors_and_views_tab_icon); - ColorUtils.INSTANCE.setImageResourceWithTint(icon, getTabIcon(itemType), R.color.grey_dark); + ColorUtils.INSTANCE.setImageResourceWithTint(icon, getTabIcon(itemType), R.color.neutral_700); if (itemType == StatsVisitorsAndViewsFragment.OverviewLabel.COMMENTS) { currentTab.setBackgroundResource(R.drawable.stats_visitors_and_views_button_latest_white); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java index f0eae1812a26..0cce2633b366 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsReferrersFragment.java @@ -285,7 +285,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, int children = getChildrenCount(groupPosition); if (children > 0) { - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); } else { holder.setEntryTextOrLink(url, name); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java index f4952355b795..a297a6177c67 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSearchTermsFragment.java @@ -196,7 +196,7 @@ public View getView(int position, View convertView, @NonNull ViewGroup parent) { holder.setEntryTextOrLink(UNKNOWN_SEARCH_TERMS_HELP_PAGE, getString(R.string.stats_search_terms_unknown_search_terms)); } else { - holder.setEntryText(term, getResources().getColor(R.color.stats_text_color)); + holder.setEntryText(term, getResources().getColor(R.color.text)); } // totals diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java index f234015bb845..8da57cf1828f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsSingleItemDetailsActivity.java @@ -219,7 +219,7 @@ public void run() { mStatsForLabel.setText(mItemTitle != null ? mItemTitle : mItemURL); // make the label clickable if the URL is available if (mItemURL != null) { - mStatsForLabel.setTextColor(getResources().getColor(R.color.stats_link_text_color)); + mStatsForLabel.setTextColor(getResources().getColor(R.color.link_stats)); mStatsForLabel.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -232,7 +232,7 @@ public void onClick(View v) { } }); } else { - mStatsForLabel.setTextColor(getResources().getColor(R.color.grey_darken_20)); + mStatsForLabel.setTextColor(getResources().getColor(R.color.neutral_500)); } } else { mStatsForLabel.setVisibility(View.GONE); @@ -442,11 +442,11 @@ private void updateUI() { } GraphViewSeries mCurrentSeriesOnScreen = new GraphViewSeries(views); - mCurrentSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_main_series); + mCurrentSeriesOnScreen.getStyle().color = getResources().getColor(R.color.primary); mCurrentSeriesOnScreen.getStyle().highlightColor = - getResources().getColor(R.color.stats_bar_graph_main_series_highlight); + getResources().getColor(R.color.accent); mCurrentSeriesOnScreen.getStyle().outerhighlightColor = - getResources().getColor(R.color.stats_bar_graph_outer_highlight); + getResources().getColor(R.color.accent_100); mCurrentSeriesOnScreen.getStyle().padding = DisplayUtils.dpToPx(this, 5); StatsBarGraph mGraphView; @@ -463,7 +463,7 @@ private void updateUI() { mGraphView.addSeries(mCurrentSeriesOnScreen); // mGraphView.getGraphViewStyle().setNumHorizontalLabels(getNumOfHorizontalLabels(dataToShowOnGraph.length)); mGraphView.getGraphViewStyle().setNumHorizontalLabels(dataToShowOnGraph.length); - mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.grey_darken_30)); + mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.neutral_600)); mGraphView.getGraphViewStyle().setMaxColumnWidth( DisplayUtils.dpToPx(this, StatsConstants.STATS_GRAPH_BAR_MAX_COLUMN_WIDTH_DP)); mGraphView.getGraphViewStyle().setTextSize( @@ -597,7 +597,7 @@ public void onClick(View view) { if (currentDay.getCount() == maxReachedValue && maxReachedValue > 0) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); @@ -674,7 +674,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, StatsConstants.STATS_INPUT_DATE_FORMAT, GROUP_DATE_FORMAT); } - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); holder.networkImageView.setVisibility(View.GONE); @@ -690,7 +690,7 @@ public View getGroupView(final int groupPosition, boolean isExpanded, if (shouldShowTheTrophyIcon) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); @@ -782,7 +782,7 @@ public void onClick(View view) { if (currentMonth.getCount() == maxReachedValue && maxReachedValue > 0) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); @@ -846,12 +846,12 @@ public View getGroupView(final int groupPosition, boolean isExpanded, } } - holder.setEntryText(name, getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(name, getResources().getColor(R.color.link_stats)); if (shouldShowTheTrophyIcon) { holder.imgMore.setVisibility(View.VISIBLE); ColorUtils.INSTANCE.setImageResourceWithTint(holder.imgMore, R.drawable.ic_trophy_white_24dp, - R.color.alert_yellow); + R.color.warning_500); holder.imgMore.setBackgroundColor(Color.TRANSPARENT); // Hide the default click indicator } else { holder.imgMore.setVisibility(View.GONE); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java index 185023ebc29d..5d41f01955d5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsTagsAndCategoriesFragment.java @@ -243,7 +243,7 @@ public View getGroupView(int groupPosition, boolean isExpanded, int children = getChildrenCount(groupPosition); if (children > 0) { - holder.setEntryText(groupName.toString(), getResources().getColor(R.color.stats_link_text_color)); + holder.setEntryText(groupName.toString(), getResources().getColor(R.color.link_stats)); } else { holder.setEntryTextOrLink(tags.get(0).getLink(), groupName.toString()); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUIHelper.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUIHelper.java index cbf45867ea1d..76f63cc55ede 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUIHelper.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsUIHelper.java @@ -173,7 +173,7 @@ public static void reloadGroupViews(final Context ctx, if (chevron != null) { chevron.clearAnimation(); ColorUtils.INSTANCE.setImageResourceWithTint(chevron, R.drawable.ic_chevron_right_white_24dp, - R.color.blue_wordpress); + R.color.primary_500); } // add children if this group is expanded @@ -282,7 +282,7 @@ private static void setGroupChevron(final boolean isGroupExpanded, View groupVie : R.drawable.ic_chevron_right_white_24dp); } - chevron.setImageTintList(ColorStateList.valueOf(context.getResources().getColor(R.color.blue_wordpress))); + chevron.setImageTintList(ColorStateList.valueOf(context.getResources().getColor(R.color.primary_500))); } private static void showChildViews(ExpandableListAdapter mAdapter, LinearLayout mLinearLayout, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java index 45832d6a374c..ea2ea9bf7e42 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsViewHolder.java @@ -51,7 +51,7 @@ public void setEntryTextOrLink(final String linkURL, String linkName) { entryTextView.setText(linkName); if (TextUtils.isEmpty(linkURL)) { - entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.stats_text_color)); + entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.text)); rowContent.setClickable(false); return; } @@ -85,7 +85,7 @@ public void onClick(View view) { } ); - entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.stats_link_text_color)); + entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.link_stats)); } public void setEntryText(String text) { @@ -116,7 +116,7 @@ public void onClick(View view) { ActivityLauncher.viewStatsSinglePostDetails(view.getContext(), currentItem); } }); - entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.stats_link_text_color)); + entryTextView.setTextColor(entryTextView.getContext().getResources().getColor(R.color.link_stats)); } /* diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java index 44a64c2088ed..ab184cd0212b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsVisitorsAndViewsFragment.java @@ -184,16 +184,16 @@ private class TabViewHolder { public void updateBackGroundAndIcon(int currentValue) { if (mIsChecked) { - mValue.setTextColor(getResources().getColor(R.color.orange_jazzy)); + mValue.setTextColor(getResources().getColor(R.color.accent)); } else { if (currentValue == 0) { - mValue.setTextColor(getResources().getColor(R.color.grey_text_min)); + mValue.setTextColor(getResources().getColor(R.color.neutral)); } else { - mValue.setTextColor(getResources().getColor(R.color.blue_wordpress)); + mValue.setTextColor(getResources().getColor(R.color.primary_500)); } } - ColorUtils.INSTANCE.setImageResourceWithTint(mIcon, getTabIcon(), R.color.grey_dark); + ColorUtils.INSTANCE.setImageResourceWithTint(mIcon, getTabIcon(), R.color.neutral_700); if (mIsLastItem) { if (mIsChecked) { @@ -449,12 +449,12 @@ protected void updateUI() { mGraphView.removeAllSeries(); GraphViewSeries mainSeriesOnScreen = new GraphViewSeries(mainSeriesItems); - mainSeriesOnScreen.getStyle().color = getResources().getColor(R.color.stats_bar_graph_main_series); + mainSeriesOnScreen.getStyle().color = getResources().getColor(R.color.primary); mainSeriesOnScreen.getStyle().outerColor = getResources().getColor(R.color.grey_lighten_30_translucent_50); mainSeriesOnScreen.getStyle().highlightColor = - getResources().getColor(R.color.stats_bar_graph_main_series_highlight); + getResources().getColor(R.color.accent); mainSeriesOnScreen.getStyle().outerhighlightColor = - getResources().getColor(R.color.stats_bar_graph_outer_highlight); + getResources().getColor(R.color.accent_100); mainSeriesOnScreen.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 5); mGraphView.addSeries(mainSeriesOnScreen); @@ -462,8 +462,8 @@ protected void updateUI() { if (mIsCheckboxChecked && secondarySeriesItems != null && selectedStatsType == OverviewLabel.VIEWS) { GraphViewSeries secondarySeries = new GraphViewSeries(secondarySeriesItems); secondarySeries.getStyle().padding = DisplayUtils.dpToPx(getActivity(), 10); - secondarySeries.getStyle().color = getResources().getColor(R.color.stats_bar_graph_secondary_series); - secondarySeries.getStyle().highlightColor = getResources().getColor(R.color.orange_fire); + secondarySeries.getStyle().color = getResources().getColor(R.color.primary_dark); + secondarySeries.getStyle().highlightColor = getResources().getColor(R.color.accent_600); mGraphView.addSeries(secondarySeries); } @@ -487,7 +487,7 @@ protected void updateUI() { DisplayUtils.dpToPx(getActivity(), StatsConstants.STATS_GRAPH_BAR_MAX_COLUMN_WIDTH_DP)); mGraphView.getGraphViewStyle().setTextSize( getResources().getDimensionPixelOffset(R.dimen.stats_legent_text_size)); - mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.grey_darken_30)); + mGraphView.getGraphViewStyle().setVerticalLabelsColor(getResources().getColor(R.color.neutral_600)); mGraphView.setHorizontalLabels(horLabels); mGraphView.setAccessibleHorizontalLabels(makeAccessibleHorizontalLabels(horLabels, mainSeriesItems, selectedStatsType)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetConfigureAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetConfigureAdapter.java index 4741f6629992..7284b723d2a8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetConfigureAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetConfigureAdapter.java @@ -91,11 +91,11 @@ public StatsWidgetConfigureAdapter(Context context, long primarySiteId) { mInflater = LayoutInflater.from(context); mBlavatarSz = context.getResources().getDimensionPixelSize(R.dimen.blavatar_sz); - mTextColorNormal = context.getResources().getColor(R.color.grey_dark); - mTextColorHidden = context.getResources().getColor(R.color.grey); + mTextColorNormal = context.getResources().getColor(R.color.neutral_700); + mTextColorHidden = context.getResources().getColor(R.color.neutral_300); mSelectedItemBackground = - new ColorDrawable(context.getResources().getColor(R.color.grey_lighten_20_translucent_50)); + new ColorDrawable(context.getResources().getColor(R.color.gray_50)); loadSites(); } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetProvider.java b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetProvider.java index 1a6b241c2030..4f51fb05c652 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetProvider.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/StatsWidgetProvider.java @@ -31,12 +31,12 @@ import org.wordpress.android.ui.stats.service.StatsService; import org.wordpress.android.ui.stats.service.StatsServiceLogic; import org.wordpress.android.ui.stats.service.StatsServiceStarter; -import org.wordpress.android.util.analytics.AnalyticsUtils; import org.wordpress.android.util.AppLog; import org.wordpress.android.util.AppLog.T; import org.wordpress.android.util.FormatUtils; import org.wordpress.android.util.NetworkUtils; import org.wordpress.android.util.SiteUtils; +import org.wordpress.android.util.analytics.AnalyticsUtils; import java.util.ArrayList; @@ -95,7 +95,7 @@ private static void updateTabValue(Context context, RemoteViews remoteViews, int } remoteViews.setTextViewText(viewId, FormatUtils.formatDecimal(value)); if (text.equals("0")) { - remoteViews.setTextColor(viewId, context.getResources().getColor(R.color.grey)); + remoteViews.setTextColor(viewId, context.getResources().getColor(R.color.neutral_300)); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt index e985af962c57..2baa43105912 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BarChartViewHolder.kt @@ -85,11 +85,11 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( data = BarData(dataSets) val greyColor = ContextCompat.getColor( context, - color.wp_grey + color.neutral_300 ) val lightGreyColor = ContextCompat.getColor( context, - color.wp_grey_lighten_30 + color.neutral_50 ) axisLeft.apply { valueFormatter = object : LargeValueFormatter() { @@ -203,10 +203,10 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( dataSet.setGradientColor( ContextCompat.getColor( context, - R.color.stats_bar_chart_gradient_start_color + R.color.primary_50 ), ContextCompat.getColor( context, - R.color.transparent + android.R.color.transparent ) ) dataSet.formLineWidth = 0f @@ -218,14 +218,14 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( private fun buildDataSet(context: Context, cut: List): BarDataSet { val dataSet = BarDataSet(cut, "Data") - dataSet.color = ContextCompat.getColor(context, R.color.blue_wordpress) + dataSet.color = ContextCompat.getColor(context, R.color.blue_400) dataSet.setGradientColor( ContextCompat.getColor( context, - R.color.blue_wordpress + R.color.blue_400 ), ContextCompat.getColor( context, - R.color.blue_wordpress + R.color.blue_400 ) ) dataSet.formLineWidth = 0f @@ -233,7 +233,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( dataSet.isHighlightEnabled = true dataSet.highLightColor = ContextCompat.getColor( context, - color.orange_active + color.accent_400 ) dataSet.highLightAlpha = 255 return dataSet @@ -241,14 +241,14 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( private fun buildOverlappingDataSet(context: Context, cut: List): BarDataSet { val dataSet = BarDataSet(cut, "Overlapping data") - dataSet.color = ContextCompat.getColor(context, R.color.blue_dark) + dataSet.color = ContextCompat.getColor(context, R.color.primary_700) dataSet.setGradientColor( ContextCompat.getColor( context, - R.color.blue_dark + R.color.primary_700 ), ContextCompat.getColor( context, - R.color.blue_dark + R.color.primary_700 ) ) dataSet.formLineWidth = 0f @@ -256,7 +256,7 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( dataSet.isHighlightEnabled = true dataSet.highLightColor = ContextCompat.getColor( context, - color.orange_dark_active + color.accent_700 ) dataSet.highLightAlpha = 255 return dataSet @@ -268,21 +268,21 @@ class BarChartViewHolder(parent: ViewGroup) : BlockListItemViewHolder( BarEntry(it.x, maxEntry.y, it.data) } val dataSet = BarDataSet(highlightedDataSet, "Highlight") - dataSet.color = ContextCompat.getColor(context, R.color.transparent) + dataSet.color = ContextCompat.getColor(context, android.R.color.transparent) dataSet.setGradientColor( ContextCompat.getColor( context, - R.color.transparent + android.R.color.transparent ), ContextCompat.getColor( context, - R.color.transparent + android.R.color.transparent ) ) dataSet.formLineWidth = 0f dataSet.isHighlightEnabled = true dataSet.highLightColor = ContextCompat.getColor( context, - color.orange_active + color.accent_400 ) dataSet.setDrawValues(false) dataSet.highLightAlpha = 51 diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt index 6af39b83c7b9..0f6a77f07859 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/BlockListItemViewHolder.kt @@ -45,7 +45,7 @@ open class BlockListItemViewHolder( ) { when { item.icon != null -> { - this.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(this.context, R.color.grey_dark)) + this.imageTintList = ColorStateList.valueOf(ContextCompat.getColor(this.context, R.color.neutral_700)) this.visibility = View.VISIBLE imageManager.load(this, item.icon) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt index 050cdd12edba..5ab183f5ad6a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/DayViewHolder.kt @@ -23,12 +23,12 @@ class DayViewHolder(parent: ViewGroup) : ViewHolder( ) { fun bind(box: Box) { val color = when (box) { - INVISIBLE -> R.color.transparent - VERY_LOW -> R.color.grey_lighten_20 - LOW -> R.color.stats_low_activity - MEDIUM -> R.color.stats_medium_activity - HIGH -> R.color.stats_high_activity - VERY_HIGH -> R.color.grey_dark + INVISIBLE -> android.R.color.transparent + VERY_LOW -> R.color.neutral_100 + LOW -> R.color.stats_activity_low + MEDIUM -> R.color.stats_activity_medium + HIGH -> R.color.stats_activity_high + VERY_HIGH -> R.color.neutral_700 } itemView.setBackgroundColor(ContextCompat.getColor(itemView.context, color)) } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkViewHolder.kt index a96fd32279e2..74fc5c18f746 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/LinkViewHolder.kt @@ -18,7 +18,7 @@ class LinkViewHolder(parent: ViewGroup) : BlockListItemViewHolder( fun bind(item: Link) { if (item.icon != null) { - val drawable = ColorUtils.applyTintToDrawable(text.context, item.icon, R.color.blue_medium) + val drawable = ColorUtils.applyTintToDrawable(text.context, item.icon, R.color.primary_400) text.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null) } else { text.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt index 9548b75a8737..85a01526859c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/ListItemWithIconViewHolder.kt @@ -27,8 +27,8 @@ class ListItemWithIconViewHolder(parent: ViewGroup, val imageManager: ImageManag iconContainer.setIconOrAvatar(item, imageManager) text.setTextOrHide(item.textResource, item.text) val textColor = when (item.textStyle) { - TextStyle.NORMAL -> R.color.grey_dark - LIGHT -> R.color.grey_darken_20 + TextStyle.NORMAL -> R.color.neutral_700 + LIGHT -> R.color.neutral_500 } text.setTextColor(ContextCompat.getColor(text.context, textColor)) subtext.setTextOrHide(item.subTextResource, item.subText) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt index b1f682d6a2e2..0333202db2c0 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/MapViewHolder.kt @@ -1,6 +1,7 @@ package org.wordpress.android.ui.stats.refresh.lists.sections.viewholders import android.net.http.SslError +import android.support.v4.content.ContextCompat import android.support.v7.widget.RecyclerView import android.view.View import android.view.ViewGroup @@ -15,6 +16,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import org.wordpress.android.R.color import org.wordpress.android.R.id import org.wordpress.android.R.layout import org.wordpress.android.ui.stats.refresh.lists.sections.BlockListItem.MapItem @@ -31,6 +33,8 @@ class MapViewHolder(parent: ViewGroup) : BlockListItemViewHolder( // Loading the v42 of the Google Charts API, since the latest stable version has a problem with // the legend. https://github.com/wordpress-mobile/WordPress-Android/issues/4131 // https://developers.google.com/chart/interactive/docs/release_notes#release-candidate-details + val colorLow = Integer.toHexString(ContextCompat.getColor(itemView.context, color.accent_50) and 0xffffff) + val colorHigh = Integer.toHexString(ContextCompat.getColor(itemView.context, color.accent) and 0xffffff) val htmlPage = ("" + "" + "" + @@ -43,7 +47,8 @@ class MapViewHolder(parent: ViewGroup) : BlockListItemViewHolder( " [" + " ['Country', '${itemView.resources.getString(item.label)}'],${item.mapData}]);" + " var options = {keepAspectRatio: true, region: 'world', colorAxis:" + - " { colors: [ '#FFF088', '#F24606' ] }, enableRegionInteractivity: false};" + + " { colors: [ '#" + colorLow + "', '#" + colorHigh + "' ] }," + + " enableRegionInteractivity: false};" + " var chart = new google.visualization.GeoChart(document.getElementById('regions_div'));" + " chart.draw(data, options);" + " }" + diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TextViewHolder.kt b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TextViewHolder.kt index 66134ba478a4..270bab61680c 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TextViewHolder.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stats/refresh/lists/sections/viewholders/TextViewHolder.kt @@ -48,7 +48,7 @@ class TextViewHolder(parent: ViewGroup) : BlockListItemViewHolder( override fun updateDrawState(ds: TextPaint?) { ds?.color = ContextCompat.getColor( context, - color.blue_wordpress + color.primary_500 ) ds?.typeface = Typeface.create( Typeface.DEFAULT_BOLD, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java index ec71539d9ac9..e758f52121ad 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/stockmedia/StockMediaPickerActivity.java @@ -316,8 +316,7 @@ private void showEmptyView(boolean show) { if (isEmpty) { actionableEmptyView.title.setText(R.string.stock_media_picker_initial_empty_text); - // Leave span with hard-coded #0087be to override jazzy orange until accent color is blue_wordpress. - String link = "Pexels"; + String link = "Pexels"; Spanned html = Html.fromHtml(getString(R.string.stock_media_picker_initial_empty_subtext, link)); actionableEmptyView.subtitle.setText(html); actionableEmptyView.getSubtitle().setMovementMethod(WPLinkMovementMethod.getInstance()); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java index acdc627aedd4..8ca965b8165e 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/themes/ThemeBrowserAdapter.java @@ -159,18 +159,18 @@ public View getView(int position, View convertView, ViewGroup parent) { private void configureCardView(ThemeViewHolder themeViewHolder, boolean isCurrent) { Resources resources = mContext.getResources(); if (isCurrent) { - ColorStateList color = ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.white)); - themeViewHolder.mDetailsView.setBackgroundColor(resources.getColor(R.color.blue_wordpress)); + ColorStateList color = ColorStateList.valueOf(ContextCompat.getColor(mContext, android.R.color.white)); + themeViewHolder.mDetailsView.setBackgroundColor(resources.getColor(R.color.primary_500)); themeViewHolder.mNameView.setTextColor(color); themeViewHolder.mActiveView.setVisibility(View.VISIBLE); - themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(R.color.blue_wordpress)); + themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(R.color.primary_500)); themeViewHolder.mImageButton.setImageTintList(color); } else { - ColorStateList color = ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.black)); - themeViewHolder.mDetailsView.setBackgroundColor(resources.getColor(R.color.white)); + ColorStateList color = ColorStateList.valueOf(ContextCompat.getColor(mContext, android.R.color.black)); + themeViewHolder.mDetailsView.setBackgroundColor(resources.getColor(android.R.color.white)); themeViewHolder.mNameView.setTextColor(color); themeViewHolder.mActiveView.setVisibility(View.GONE); - themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(R.color.white)); + themeViewHolder.mCardView.setCardBackgroundColor(resources.getColor(android.R.color.white)); themeViewHolder.mImageButton.setImageTintList(color); } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java index 5e418d6cb9d6..d7a86a97f0ff 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/PostUploadNotifier.java @@ -80,7 +80,7 @@ private class NotificationData { mNotificationBuilder = new NotificationCompat.Builder(mContext.getApplicationContext(), context.getString(R.string.notification_channel_transient_id)); mNotificationBuilder.setSmallIcon(android.R.drawable.stat_sys_upload) - .setColor(context.getResources().getColor(R.color.blue_wordpress)) + .setColor(context.getResources().getColor(R.color.primary_500)) .setOnlyAlertOnce(true); } @@ -319,7 +319,7 @@ void updateNotificationSuccessForPost(@NonNull PostModel post, @NonNull SiteMode } notificationBuilder.setSmallIcon(R.drawable.ic_my_sites_white_24dp); - notificationBuilder.setColor(mContext.getResources().getColor(R.color.blue_wordpress)); + notificationBuilder.setColor(mContext.getResources().getColor(R.color.primary_500)); notificationBuilder.setContentTitle(notificationTitle); notificationBuilder.setContentText(notificationMessage); @@ -390,7 +390,7 @@ void updateNotificationSuccessForMedia(@NonNull List mediaList, @Non notificationIntent, PendingIntent.FLAG_ONE_SHOT); notificationBuilder.setSmallIcon(R.drawable.ic_my_sites_white_24dp); - notificationBuilder.setColor(mContext.getResources().getColor(R.color.blue_wordpress)); + notificationBuilder.setColor(mContext.getResources().getColor(R.color.primary_500)); String notificationTitle = buildSuccessMessageForMedia(mediaList.size()); String notificationMessage = @@ -502,7 +502,7 @@ void updateNotificationErrorForPost(@NonNull PostModel post, @NonNull SiteModel PendingIntent.FLAG_CANCEL_CURRENT); notificationBuilder.addAction(0, mContext.getString(R.string.retry), actionPendingIntent) - .setColor(mContext.getResources().getColor(R.color.orange_jazzy)); + .setColor(mContext.getResources().getColor(R.color.accent)); } EventBus.getDefault().postSticky(new UploadService.UploadErrorEvent(post, snackbarMessage)); @@ -571,7 +571,7 @@ void updateNotificationErrorForMedia(@NonNull List mediaList, @NonNu PendingIntent.FLAG_CANCEL_CURRENT); notificationBuilder.addAction(0, mContext.getString(R.string.retry), actionPendingIntent) - .setColor(mContext.getResources().getColor(R.color.orange_jazzy)); + .setColor(mContext.getResources().getColor(R.color.accent)); } EventBus.getDefault().postSticky(new UploadService.UploadErrorEvent(mediaList, snackbarMessage)); diff --git a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java index fbbe30c70a7e..0911241aaedb 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/uploads/UploadUtils.java @@ -211,15 +211,15 @@ public static void showSnackbarSuccessAction(View view, int messageRes, int butt Snackbar.make(view, messageRes, AccessibilityUtils.getSnackbarDuration(view.getContext(), K_SNACKBAR_WAIT_TIME_MS)) .setAction(buttonTitleRes, onClickListener). - setActionTextColor(view.getResources().getColor(R.color.blue_medium)) + setActionTextColor(view.getResources().getColor(R.color.primary_400)) .show(); } private static void showSnackbarSuccessAction(View view, String message, int buttonTitleRes, View.OnClickListener onClickListener) { Snackbar.make(view, message, AccessibilityUtils.getSnackbarDuration(view.getContext(), K_SNACKBAR_WAIT_TIME_MS)) - .setAction(buttonTitleRes, onClickListener). - setActionTextColor(view.getResources().getColor(R.color.blue_medium)) + .setAction(buttonTitleRes, onClickListener) + .setActionTextColor(view.getResources().getColor(R.color.primary_400)) .show(); } @@ -227,7 +227,7 @@ public static void showSnackbarSuccessActionOrange(View view, int messageRes, in View.OnClickListener onClickListener) { Snackbar.make(view, messageRes, Snackbar.LENGTH_LONG) .setAction(buttonTitleRes, onClickListener). - setActionTextColor(view.getResources().getColor(R.color.orange_jazzy)) + setActionTextColor(view.getResources().getColor(R.color.accent)) .show(); } @@ -252,8 +252,7 @@ public static void publishPost(Activity activity, final PostModel post, SiteMode } PostUtils.updatePublishDateIfShouldBePublishedImmediately(post); - boolean isFirstTimePublish = PostStatus.fromPost(post) == PostStatus.DRAFT - || (PostStatus.fromPost(post) == PostStatus.PUBLISHED && post.isLocalDraft()); + boolean isFirstTimePublish = PostUtils.isFirstTimePublish(post); post.setStatus(PostStatus.PUBLISHED.toString()); // save the post in the DB so the UploadService will get the latest change diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/UiDimen.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/UiDimen.kt new file mode 100644 index 000000000000..e0d4bc478fa0 --- /dev/null +++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/UiDimen.kt @@ -0,0 +1,13 @@ +package org.wordpress.android.ui.utils + +import android.support.annotation.DimenRes + +/** + * [UiDimen] is a utility sealed class that represents a dimension to be used in the UI. It allows a dimension to be + * represented as both dimen resource and integer. + */ + +sealed class UiDimen { + data class UIDimenRes(@DimenRes val dimenRes: Int) : UiDimen() + data class UIDimenDPInt(val dimensionDP: Int) : UiDimen() +} diff --git a/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt b/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt index f7d3c7b2bc89..ea687b0e90b7 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/utils/UiHelpers.kt @@ -1,12 +1,23 @@ package org.wordpress.android.ui.utils import android.content.Context +import android.support.annotation.StringRes import android.view.View +import android.widget.TextView +import org.wordpress.android.ui.utils.UiDimen.UIDimenDPInt +import org.wordpress.android.ui.utils.UiDimen.UIDimenRes import org.wordpress.android.ui.utils.UiString.UiStringRes import org.wordpress.android.ui.utils.UiString.UiStringText +import org.wordpress.android.util.DisplayUtils import javax.inject.Inject class UiHelpers @Inject constructor() { + fun getPxOfUiDimen(context: Context, uiDimen: UiDimen): Int = + when (uiDimen) { + is UIDimenRes -> context.resources.getDimensionPixelSize(uiDimen.dimenRes) + is UIDimenDPInt -> DisplayUtils.dpToPx(context, uiDimen.dimensionDP) + } + fun getTextOfUiString(context: Context, uiString: UiString): String = when (uiString) { is UiStringRes -> context.getString(uiString.stringRes) @@ -16,4 +27,16 @@ class UiHelpers @Inject constructor() { fun updateVisibility(view: View, visible: Boolean) { view.visibility = if (visible) View.VISIBLE else View.GONE } + + fun setTextOrHide(view: TextView, @StringRes resId: Int?) { + val text = resId?.let { view.context.getString(resId) } + setTextOrHide(view, text) + } + + fun setTextOrHide(view: TextView, text: CharSequence?) { + updateVisibility(view, text != null) + text?.let { + view.text = text + } + } } diff --git a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt index 986baabc5f7e..0585a5744c13 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/QuickStartUtils.kt @@ -73,7 +73,7 @@ class QuickStartUtils { Html.fromHtml(formattedMessage) } - val highlightColor = ContextCompat.getColor(context, R.color.blue_light) + val highlightColor = ContextCompat.getColor(context, R.color.accent_300) val mutableSpannedMessage = SpannableStringBuilder(spannedMessage) val foregroundColorSpan = mutableSpannedMessage diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java index 874cf83cc1bb..d223bd6087d6 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPPrefUtils.java @@ -60,7 +60,7 @@ public static void removePreference(PreferenceFragment prefFrag, int parentKey, */ public static void layoutAsLightTitle(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_extra_large); - setTextViewAttributes(view, size, R.color.white); + setTextViewAttributes(view, size, android.R.color.white); } /** @@ -68,14 +68,14 @@ public static void layoutAsLightTitle(TextView view) { */ public static void layoutAsDarkTitle(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_extra_large); - setTextViewAttributes(view, size, R.color.grey_dark); + setTextViewAttributes(view, size, R.color.neutral_700); } /** * Styles a {@link TextView} to display medium sized text as a header with sub-elements. */ public static void layoutAsSubhead(TextView view) { - int color = view.isEnabled() ? R.color.grey_dark : R.color.grey_lighten_10; + int color = view.isEnabled() ? R.color.neutral_700 : R.color.neutral_200; int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large); setTextViewAttributes(view, size, color); } @@ -84,7 +84,7 @@ public static void layoutAsSubhead(TextView view) { * Styles a {@link TextView} to display smaller text. */ public static void layoutAsBody1(TextView view) { - int color = view.isEnabled() ? R.color.grey_text_min : R.color.grey_lighten_10; + int color = view.isEnabled() ? R.color.neutral : R.color.neutral_200; int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium); setTextViewAttributes(view, size, color); } @@ -94,7 +94,7 @@ public static void layoutAsBody1(TextView view) { */ public static void layoutAsBody2(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium); - setTextViewAttributes(view, size, R.color.grey_text_min); + setTextViewAttributes(view, size, R.color.neutral); } /** @@ -102,7 +102,7 @@ public static void layoutAsBody2(TextView view) { */ public static void layoutAsCaption(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_small); - setTextViewAttributes(view, size, R.color.grey_darken_10); + setTextViewAttributes(view, size, R.color.neutral_400); } /** @@ -110,7 +110,7 @@ public static void layoutAsCaption(TextView view) { */ public static void layoutAsFlatButton(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium); - setTextViewAttributes(view, size, R.color.blue_medium); + setTextViewAttributes(view, size, R.color.primary_400); } /** @@ -118,7 +118,7 @@ public static void layoutAsFlatButton(TextView view) { */ public static void layoutAsRaisedButton(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_medium); - setTextViewAttributes(view, size, R.color.white); + setTextViewAttributes(view, size, android.R.color.white); } /** @@ -126,9 +126,9 @@ public static void layoutAsRaisedButton(TextView view) { */ public static void layoutAsInput(EditText view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large); - setTextViewAttributes(view, size, R.color.grey_dark); - view.setHintTextColor(view.getResources().getColor(R.color.grey_lighten_10)); - view.setTextColor(view.getResources().getColor(R.color.grey_dark)); + setTextViewAttributes(view, size, R.color.neutral_700); + view.setHintTextColor(view.getResources().getColor(R.color.neutral_200)); + view.setTextColor(view.getResources().getColor(R.color.neutral_700)); view.setSingleLine(true); } @@ -137,7 +137,7 @@ public static void layoutAsInput(EditText view) { */ public static void layoutAsNumberPickerSelected(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_triple_extra_large); - setTextViewAttributes(view, size, R.color.blue_medium); + setTextViewAttributes(view, size, R.color.primary_400); } /** @@ -145,7 +145,7 @@ public static void layoutAsNumberPickerSelected(TextView view) { */ public static void layoutAsNumberPickerPeek(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_large); - setTextViewAttributes(view, size, R.color.grey_dark); + setTextViewAttributes(view, size, R.color.neutral_700); } /** @@ -153,7 +153,7 @@ public static void layoutAsNumberPickerPeek(TextView view) { */ public static void layoutAsDialogMessage(TextView view) { int size = view.getResources().getDimensionPixelSize(R.dimen.text_sz_small); - setTextViewAttributes(view, size, R.color.grey_text_min); + setTextViewAttributes(view, size, R.color.neutral); } public static void setTextViewAttributes(TextView textView, int size, int colorRes) { diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java b/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java index 9f9caa248dd1..b1069eb94f0c 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPSwipeToRefreshHelper.java @@ -17,6 +17,6 @@ public class WPSwipeToRefreshHelper { */ public static SwipeToRefreshHelper buildSwipeToRefreshHelper(CustomSwipeRefreshLayout swipeRefreshLayout, RefreshListener listener) { - return new SwipeToRefreshHelper(swipeRefreshLayout, listener, R.color.color_primary, R.color.color_accent); + return new SwipeToRefreshHelper(swipeRefreshLayout, listener, R.color.primary, R.color.accent); } } diff --git a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt index b4db8b27c0c6..a247d42be0c7 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/image/ImagePlaceholderManager.kt @@ -8,35 +8,35 @@ import javax.inject.Singleton class ImagePlaceholderManager @Inject constructor() { fun getErrorResource(imgType: ImageType): Int? { return when (imgType) { - ImageType.AVATAR -> R.drawable.bg_rectangle_grey_lighten_20_user_32dp - ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp + ImageType.AVATAR -> R.drawable.bg_rectangle_neutral_100_user_32dp + ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_neutral_300_user_32dp ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp - ImageType.BLAVATAR -> R.drawable.bg_rectangle_grey_lighten_20_globe_32dp + ImageType.BLAVATAR -> R.drawable.bg_rectangle_neutral_100_globe_32dp ImageType.IMAGE -> null // don't display any error drawable - ImageType.PHOTO -> R.color.grey_lighten_30 - ImageType.PLAN -> R.drawable.bg_oval_grey_plans_32dp + ImageType.PHOTO -> R.color.neutral_0 + ImageType.PLAN -> R.drawable.bg_oval_neutral_300_plans_32dp ImageType.PLUGIN -> R.drawable.plugin_placeholder - ImageType.THEME -> R.color.grey_lighten_30 + ImageType.THEME -> R.color.neutral_0 ImageType.UNKNOWN -> R.drawable.ic_notice_white_24dp - ImageType.VIDEO -> R.color.grey_lighten_30 - ImageType.ICON -> R.drawable.bg_grey_lighten_30_with_radius + ImageType.VIDEO -> R.color.neutral_0 + ImageType.ICON -> R.drawable.bg_rectangle_neutral_0_radius_2dp } } fun getPlaceholderResource(imgType: ImageType): Int? { return when (imgType) { - ImageType.AVATAR -> R.drawable.shape_oval_grey_light - ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_grey_user_32dp + ImageType.AVATAR -> R.drawable.bg_oval_neutral_0 + ImageType.AVATAR_WITH_BACKGROUND -> R.drawable.bg_oval_neutral_300_user_32dp ImageType.AVATAR_WITHOUT_BACKGROUND -> R.drawable.ic_user_circle_grey_24dp - ImageType.BLAVATAR -> R.color.grey_light + ImageType.BLAVATAR -> R.color.neutral_0 ImageType.IMAGE -> null // don't display any placeholder - ImageType.PHOTO -> R.color.grey_light - ImageType.PLAN -> R.drawable.bg_oval_grey_plans_32dp + ImageType.PHOTO -> R.color.neutral_0 + ImageType.PLAN -> R.drawable.bg_oval_neutral_300_plans_32dp ImageType.PLUGIN -> R.drawable.plugin_placeholder - ImageType.THEME -> R.drawable.bg_rectangle_grey_lighten_20_themes_100dp + ImageType.THEME -> R.drawable.bg_rectangle_neutral_100_themes_100dp ImageType.UNKNOWN -> R.drawable.legacy_dashicon_format_image_big_grey - ImageType.VIDEO -> R.color.grey_light - ImageType.ICON -> R.drawable.bg_grey_light_with_radius + ImageType.VIDEO -> R.color.neutral_0 + ImageType.ICON -> R.drawable.bg_rectangle_neutral_0_radius_2dp } } } diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt index 1babcce84190..47a6da506174 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt +++ b/WordPress/src/main/java/org/wordpress/android/widgets/DiffView.kt @@ -35,7 +35,7 @@ class DiffView : AppCompatTextView { ColorUnderlineSpan( ContextCompat.getColor( context, - R.color.revision_diff_add_action_underline + R.color.primary ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) @@ -43,7 +43,7 @@ class DiffView : AppCompatTextView { BackgroundColorSpan( ContextCompat.getColor( context, - R.color.revision_diff_add_action_background + R.color.primary_0 ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) @@ -53,7 +53,7 @@ class DiffView : AppCompatTextView { ColorUnderlineSpan( ContextCompat.getColor( context, - R.color.revision_diff_del_action_underline + R.color.error ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) @@ -61,7 +61,7 @@ class DiffView : AppCompatTextView { BackgroundColorSpan( ContextCompat.getColor( context, - R.color.revision_diff_del_action_background + R.color.error_0 ) ), 0, diffContent.length, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE ) diff --git a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java index 24b8ae8904e0..16f60dca6cf7 100644 --- a/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java +++ b/WordPress/src/main/java/org/wordpress/android/widgets/PostListButton.java @@ -154,9 +154,9 @@ int getButtonIconResId(int buttonType) { int getTextColorResId(int buttonType) { switch (buttonType) { case BUTTON_RETRY: - return R.color.alert_red; + return R.color.error_500; default: - return R.color.blue_wordpress; + return R.color.primary_500; } } } diff --git a/WordPress/src/main/res/color-v23/dialog_button_selector.xml b/WordPress/src/main/res/color-v23/dialog_button_selector.xml deleted file mode 100644 index 0a959ef4b8fc..000000000000 --- a/WordPress/src/main/res/color-v23/dialog_button_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/WordPress/src/main/res/color/related_posts_list_header.xml b/WordPress/src/main/res/color/black_translucent_50_neutral_700_selector.xml similarity index 65% rename from WordPress/src/main/res/color/related_posts_list_header.xml rename to WordPress/src/main/res/color/black_translucent_50_neutral_700_selector.xml index 3c2cbb36e167..c6d1934d78d9 100644 --- a/WordPress/src/main/res/color/related_posts_list_header.xml +++ b/WordPress/src/main/res/color/black_translucent_50_neutral_700_selector.xml @@ -4,10 +4,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:color="@color/black_translucent_50" /> diff --git a/WordPress/src/main/res/color/calypso_subtitle_text.xml b/WordPress/src/main/res/color/calypso_subtitle_text.xml deleted file mode 100644 index 474ebc2d9cf5..000000000000 --- a/WordPress/src/main/res/color/calypso_subtitle_text.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/WordPress/src/main/res/color/calypso_title_text.xml b/WordPress/src/main/res/color/calypso_title_text.xml deleted file mode 100644 index ad850970ea5e..000000000000 --- a/WordPress/src/main/res/color/calypso_title_text.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/WordPress/src/main/res/color/dialog_button_selector.xml b/WordPress/src/main/res/color/dialog_button_selector.xml deleted file mode 100644 index 1d6ac3d43c99..000000000000 --- a/WordPress/src/main/res/color/dialog_button_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/WordPress/src/main/res/color/dialog_compound_button_thumb.xml b/WordPress/src/main/res/color/dialog_compound_button_thumb.xml deleted file mode 100644 index cd29e01baa92..000000000000 --- a/WordPress/src/main/res/color/dialog_compound_button_thumb.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/WordPress/src/main/res/color/dialog_compound_button_track.xml b/WordPress/src/main/res/color/dialog_compound_button_track.xml deleted file mode 100644 index 5d72e1879f9b..000000000000 --- a/WordPress/src/main/res/color/dialog_compound_button_track.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml b/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml deleted file mode 100644 index e093c87bfe8c..000000000000 --- a/WordPress/src/main/res/color/grey_blue_radio_button_state_list.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/color/grey_min_blue_medium_grey_disabled_selector.xml b/WordPress/src/main/res/color/grey_min_blue_medium_grey_disabled_selector.xml deleted file mode 100644 index 86e3281d40a1..000000000000 --- a/WordPress/src/main/res/color/grey_min_blue_medium_grey_disabled_selector.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/WordPress/src/main/res/color/grey_min_orange_jazzy_grey_disabled_selector.xml b/WordPress/src/main/res/color/grey_min_orange_jazzy_grey_disabled_selector.xml deleted file mode 100644 index add1d354fbf9..000000000000 --- a/WordPress/src/main/res/color/grey_min_orange_jazzy_grey_disabled_selector.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - diff --git a/WordPress/src/main/res/color/neutral_100_neutral_0_selector.xml b/WordPress/src/main/res/color/neutral_100_neutral_0_selector.xml new file mode 100644 index 000000000000..f7f208a04aaa --- /dev/null +++ b/WordPress/src/main/res/color/neutral_100_neutral_0_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/WordPress/src/main/res/color/neutral_100_primary_400_selector.xml b/WordPress/src/main/res/color/neutral_100_primary_400_selector.xml new file mode 100644 index 000000000000..05503ff1ab91 --- /dev/null +++ b/WordPress/src/main/res/color/neutral_100_primary_400_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml b/WordPress/src/main/res/color/neutral_700_neutral_200_selector.xml similarity index 50% rename from WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml rename to WordPress/src/main/res/color/neutral_700_neutral_200_selector.xml index 2e06b0224456..630b527023df 100644 --- a/WordPress/src/main/res/color/grey_dark_grey_lighten_10_selector.xml +++ b/WordPress/src/main/res/color/neutral_700_neutral_200_selector.xml @@ -3,7 +3,7 @@ - - + + diff --git a/WordPress/src/main/res/color/neutral_accent_neutral_400_selector.xml b/WordPress/src/main/res/color/neutral_accent_neutral_400_selector.xml new file mode 100644 index 000000000000..4248f6a9d3fa --- /dev/null +++ b/WordPress/src/main/res/color/neutral_accent_neutral_400_selector.xml @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/WordPress/src/main/res/color/neutral_neutral_200_selector.xml b/WordPress/src/main/res/color/neutral_neutral_200_selector.xml new file mode 100644 index 000000000000..95a280471d9e --- /dev/null +++ b/WordPress/src/main/res/color/neutral_neutral_200_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/WordPress/src/main/res/color/neutral_primary_400_neutral_400_selector.xml b/WordPress/src/main/res/color/neutral_primary_400_neutral_400_selector.xml new file mode 100644 index 000000000000..d2e316574c3a --- /dev/null +++ b/WordPress/src/main/res/color/neutral_primary_400_neutral_400_selector.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/WordPress/src/main/res/color/primary_400_gray_200_gray_400_selector.xml b/WordPress/src/main/res/color/primary_400_gray_200_gray_400_selector.xml new file mode 100644 index 000000000000..f712833b1c86 --- /dev/null +++ b/WordPress/src/main/res/color/primary_400_gray_200_gray_400_selector.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/WordPress/src/main/res/color/primary_400_gray_900_gray_500_selector.xml b/WordPress/src/main/res/color/primary_400_gray_900_gray_500_selector.xml new file mode 100644 index 000000000000..54e62a8943eb --- /dev/null +++ b/WordPress/src/main/res/color/primary_400_gray_900_gray_500_selector.xml @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/WordPress/src/main/res/color/primary_400_neutral_400_selector.xml b/WordPress/src/main/res/color/primary_400_neutral_400_selector.xml new file mode 100644 index 000000000000..7c3c02fe6f42 --- /dev/null +++ b/WordPress/src/main/res/color/primary_400_neutral_400_selector.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/WordPress/src/main/res/color/nux_primary_button.xml b/WordPress/src/main/res/color/primary_success_selector.xml similarity index 50% rename from WordPress/src/main/res/color/nux_primary_button.xml rename to WordPress/src/main/res/color/primary_success_selector.xml index 01ba6006fe73..9ae6ce709521 100644 --- a/WordPress/src/main/res/color/nux_primary_button.xml +++ b/WordPress/src/main/res/color/primary_success_selector.xml @@ -1,5 +1,5 @@ - - + + diff --git a/WordPress/src/main/res/color/quick_start_icon_selector.xml b/WordPress/src/main/res/color/quick_start_icon_selector.xml index 2e06b0224456..630b527023df 100644 --- a/WordPress/src/main/res/color/quick_start_icon_selector.xml +++ b/WordPress/src/main/res/color/quick_start_icon_selector.xml @@ -3,7 +3,7 @@ - - + + diff --git a/WordPress/src/main/res/color/quick_start_title_selector.xml b/WordPress/src/main/res/color/quick_start_title_selector.xml index bafda1a37c92..e98497486ade 100644 --- a/WordPress/src/main/res/color/quick_start_title_selector.xml +++ b/WordPress/src/main/res/color/quick_start_title_selector.xml @@ -3,7 +3,7 @@ - - + + diff --git a/WordPress/src/main/res/color/reader_count_text.xml b/WordPress/src/main/res/color/reader_count_text.xml deleted file mode 100644 index 13354a469e7c..000000000000 --- a/WordPress/src/main/res/color/reader_count_text.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - diff --git a/WordPress/src/main/res/color/reader_follow_button_text.xml b/WordPress/src/main/res/color/reader_follow_button_text.xml deleted file mode 100644 index b47e86d0a5a5..000000000000 --- a/WordPress/src/main/res/color/reader_follow_button_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/color/related_posts_preview_header.xml b/WordPress/src/main/res/color/related_posts_preview_header.xml index 908d6534ca60..fd2228af3fc3 100644 --- a/WordPress/src/main/res/color/related_posts_preview_header.xml +++ b/WordPress/src/main/res/color/related_posts_preview_header.xml @@ -4,10 +4,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:color="@color/neutral_100" /> diff --git a/WordPress/src/main/res/color/stats_block_column.xml b/WordPress/src/main/res/color/stats_block_column.xml index bfb89c4dfd10..77e6e1bf4ee6 100644 --- a/WordPress/src/main/res/color/stats_block_column.xml +++ b/WordPress/src/main/res/color/stats_block_column.xml @@ -4,13 +4,13 @@ xmlns:android="http://schemas.android.com/apk/res/android"> - + diff --git a/WordPress/src/main/res/color/white_neutral_100_selector.xml b/WordPress/src/main/res/color/white_neutral_100_selector.xml new file mode 100644 index 000000000000..0cff67e58b1c --- /dev/null +++ b/WordPress/src/main/res/color/white_neutral_100_selector.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/WordPress/src/main/res/drawable-anydpi-v26/ic_shortcut_create_post.xml b/WordPress/src/main/res/drawable-anydpi-v26/ic_shortcut_create_post.xml index 4db19f3678eb..fbeb4bcb192e 100644 --- a/WordPress/src/main/res/drawable-anydpi-v26/ic_shortcut_create_post.xml +++ b/WordPress/src/main/res/drawable-anydpi-v26/ic_shortcut_create_post.xml @@ -1,6 +1,6 @@ - + - + - + - + diff --git a/WordPress/src/main/res/drawable-anydpi/ic_shortcut_notifications.xml b/WordPress/src/main/res/drawable-anydpi/ic_shortcut_notifications.xml index e076709b6e81..70029b3b5daa 100644 --- a/WordPress/src/main/res/drawable-anydpi/ic_shortcut_notifications.xml +++ b/WordPress/src/main/res/drawable-anydpi/ic_shortcut_notifications.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/drawable-anydpi/ic_shortcut_stats.xml b/WordPress/src/main/res/drawable-anydpi/ic_shortcut_stats.xml index de191dee4097..755760d69284 100644 --- a/WordPress/src/main/res/drawable-anydpi/ic_shortcut_stats.xml +++ b/WordPress/src/main/res/drawable-anydpi/ic_shortcut_stats.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/drawable-hdpi/ic_time_grey_darken_10_16dp.png b/WordPress/src/main/res/drawable-hdpi/ic_time_neutral_400_16dp.png similarity index 100% rename from WordPress/src/main/res/drawable-hdpi/ic_time_grey_darken_10_16dp.png rename to WordPress/src/main/res/drawable-hdpi/ic_time_neutral_400_16dp.png diff --git a/WordPress/src/main/res/drawable-hdpi/list_focused_wordpress.9.png b/WordPress/src/main/res/drawable-hdpi/list_focused_wordpress.9.png deleted file mode 100644 index 130a206d3bff..000000000000 Binary files a/WordPress/src/main/res/drawable-hdpi/list_focused_wordpress.9.png and /dev/null differ diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_unapproved_background.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning.xml similarity index 70% rename from WordPress/src/main/res/drawable-ldrtl/comment_unapproved_background.xml rename to WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning.xml index 81bbe08909bd..debb65578fa9 100644 --- a/WordPress/src/main/res/drawable-ldrtl/comment_unapproved_background.xml +++ b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_reply_unapproved_background.xml b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning_white.xml similarity index 70% rename from WordPress/src/main/res/drawable-ldrtl/comment_reply_unapproved_background.xml rename to WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning_white.xml index 13ccbbbb7f18..d106e2129ed2 100644 --- a/WordPress/src/main/res/drawable-ldrtl/comment_reply_unapproved_background.xml +++ b/WordPress/src/main/res/drawable-ldrtl/bg_rectangle_warning_0_warning_white.xml @@ -2,13 +2,13 @@ - + - + @@ -16,7 +16,7 @@ - + diff --git a/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml b/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml index 17c2d114e7fe..74289e26f9ab 100644 --- a/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml +++ b/WordPress/src/main/res/drawable-ldrtl/comment_reply_background.xml @@ -2,7 +2,7 @@ - + - + @@ -18,7 +18,7 @@ - + diff --git a/WordPress/src/main/res/drawable-ldrtl/ic_arrow_left_white_24dp.xml b/WordPress/src/main/res/drawable-ldrtl/ic_arrow_left_white_24dp.xml index 18715c22b73e..9c581d45733c 100644 --- a/WordPress/src/main/res/drawable-ldrtl/ic_arrow_left_white_24dp.xml +++ b/WordPress/src/main/res/drawable-ldrtl/ic_arrow_left_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable-ldrtl/ic_chevron_left_white_24dp.xml b/WordPress/src/main/res/drawable-ldrtl/ic_chevron_left_white_24dp.xml index af49cbde66ed..8c197ca7e1b2 100644 --- a/WordPress/src/main/res/drawable-ldrtl/ic_chevron_left_white_24dp.xml +++ b/WordPress/src/main/res/drawable-ldrtl/ic_chevron_left_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable-ldrtl/ic_chevron_right_white_24dp.xml b/WordPress/src/main/res/drawable-ldrtl/ic_chevron_right_white_24dp.xml index 58d574ed26a7..c42944068bec 100644 --- a/WordPress/src/main/res/drawable-ldrtl/ic_chevron_right_white_24dp.xml +++ b/WordPress/src/main/res/drawable-ldrtl/ic_chevron_right_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable-ldrtl/ic_reply_white_24dp.xml b/WordPress/src/main/res/drawable-ldrtl/ic_reply_white_24dp.xml index 8fa692294e1c..ebef374c11c3 100644 --- a/WordPress/src/main/res/drawable-ldrtl/ic_reply_white_24dp.xml +++ b/WordPress/src/main/res/drawable-ldrtl/ic_reply_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable-ldrtl/ic_undo_white_24dp.xml b/WordPress/src/main/res/drawable-ldrtl/ic_undo_white_24dp.xml index 9770241f2bf8..4244e5a1ef5e 100644 --- a/WordPress/src/main/res/drawable-ldrtl/ic_undo_white_24dp.xml +++ b/WordPress/src/main/res/drawable-ldrtl/ic_undo_white_24dp.xml @@ -10,7 +10,7 @@ android:pivotY="12" android:scaleX="-1"> diff --git a/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml b/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml index 5af33981017e..aa02aa3fbfc9 100644 --- a/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml +++ b/WordPress/src/main/res/drawable-ldrtl/people_list_divider.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable-sw600dp/bg_rectangle_rounded_bottom_white_card.xml b/WordPress/src/main/res/drawable-sw600dp/bg_rectangle_white_radius_bottom_card.xml similarity index 89% rename from WordPress/src/main/res/drawable-sw600dp/bg_rectangle_rounded_bottom_white_card.xml rename to WordPress/src/main/res/drawable-sw600dp/bg_rectangle_white_radius_bottom_card.xml index 7b4e303ada36..3664d1d06a50 100644 --- a/WordPress/src/main/res/drawable-sw600dp/bg_rectangle_rounded_bottom_white_card.xml +++ b/WordPress/src/main/res/drawable-sw600dp/bg_rectangle_white_radius_bottom_card.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" > + android:color="@android:color/white" > + android:color="@android:color/white" > + android:color="@android:color/white" > diff --git a/WordPress/src/main/res/drawable/app_icon_foreground.xml b/WordPress/src/main/res/drawable/app_icon_foreground.xml index 4f7cae1c8881..dba705ac48a1 100644 --- a/WordPress/src/main/res/drawable/app_icon_foreground.xml +++ b/WordPress/src/main/res/drawable/app_icon_foreground.xml @@ -4,6 +4,6 @@ android:viewportHeight="108.0" android:viewportWidth="108.0"> diff --git a/WordPress/src/main/res/drawable/bg_grey_light_with_radius.xml b/WordPress/src/main/res/drawable/bg_grey_light_with_radius.xml deleted file mode 100644 index 289717836a27..000000000000 --- a/WordPress/src/main/res/drawable/bg_grey_light_with_radius.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml b/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml deleted file mode 100644 index 197a95719f16..000000000000 --- a/WordPress/src/main/res/drawable/bg_grey_lighten_30_with_radius.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/notification_badge.xml b/WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml similarity index 67% rename from WordPress/src/main/res/drawable/notification_badge.xml rename to WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml index 4bd6a713c000..ea489eac9742 100644 --- a/WordPress/src/main/res/drawable/notification_badge.xml +++ b/WordPress/src/main/res/drawable/bg_oval_accent_stroke_white.xml @@ -1,8 +1,8 @@ - + + android:color="@android:color/white"/> diff --git a/WordPress/src/main/res/drawable/bg_oval_grey_100_44dp.xml b/WordPress/src/main/res/drawable/bg_oval_background_shortcut_44dp.xml similarity index 82% rename from WordPress/src/main/res/drawable/bg_oval_grey_100_44dp.xml rename to WordPress/src/main/res/drawable/bg_oval_background_shortcut_44dp.xml index d9da101e1c8e..0d9e93e8320b 100644 --- a/WordPress/src/main/res/drawable/bg_oval_grey_100_44dp.xml +++ b/WordPress/src/main/res/drawable/bg_oval_background_shortcut_44dp.xml @@ -5,7 +5,7 @@ android:shape="oval" > + android:color="@color/background_shortcut" > - + + android:color="@android:color/white"/> diff --git a/WordPress/src/main/res/drawable/bg_oval_blue_medium_customize_white_40dp_selector.xml b/WordPress/src/main/res/drawable/bg_oval_blue_medium_customize_white_40dp_selector.xml deleted file mode 100644 index c53e387f2179..000000000000 --- a/WordPress/src/main/res/drawable/bg_oval_blue_medium_customize_white_40dp_selector.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - diff --git a/WordPress/src/main/res/drawable/shape_oval_grey.xml b/WordPress/src/main/res/drawable/bg_oval_error_500.xml similarity index 83% rename from WordPress/src/main/res/drawable/shape_oval_grey.xml rename to WordPress/src/main/res/drawable/bg_oval_error_500.xml index 202c7da817f9..0565b056e0a4 100644 --- a/WordPress/src/main/res/drawable/shape_oval_grey.xml +++ b/WordPress/src/main/res/drawable/bg_oval_error_500.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="oval" tools:ignore="UnusedResources"> - + diff --git a/WordPress/src/main/res/drawable/bg_oval_alert_red_minus_white_16dp.xml b/WordPress/src/main/res/drawable/bg_oval_error_500_minus_white_16dp.xml similarity index 91% rename from WordPress/src/main/res/drawable/bg_oval_alert_red_minus_white_16dp.xml rename to WordPress/src/main/res/drawable/bg_oval_error_500_minus_white_16dp.xml index 66b6761ac98b..cb879b5ba7bd 100644 --- a/WordPress/src/main/res/drawable/bg_oval_alert_red_minus_white_16dp.xml +++ b/WordPress/src/main/res/drawable/bg_oval_error_500_minus_white_16dp.xml @@ -10,7 +10,7 @@ android:shape="oval" > + android:color="@color/error_500" > - + diff --git a/WordPress/src/main/res/drawable/shape_oval_white.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_0_stroke_white.xml similarity index 65% rename from WordPress/src/main/res/drawable/shape_oval_white.xml rename to WordPress/src/main/res/drawable/bg_oval_neutral_0_stroke_white.xml index a4593b885b7e..2060ab7390c9 100644 --- a/WordPress/src/main/res/drawable/shape_oval_white.xml +++ b/WordPress/src/main/res/drawable/bg_oval_neutral_0_stroke_white.xml @@ -3,6 +3,6 @@ android:shape="oval"> - + android:color="@android:color/white" /> + diff --git a/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml new file mode 100644 index 000000000000..4e8a358c86ea --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_oval_neutral_200_stroke_white.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/shape_oval_green.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_300.xml similarity index 82% rename from WordPress/src/main/res/drawable/shape_oval_green.xml rename to WordPress/src/main/res/drawable/bg_oval_neutral_300.xml index 2bcc2a307cd2..72b5eeaf5b13 100644 --- a/WordPress/src/main/res/drawable/shape_oval_green.xml +++ b/WordPress/src/main/res/drawable/bg_oval_neutral_300.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="oval" tools:ignore="UnusedResources"> - + diff --git a/WordPress/src/main/res/drawable/bg_oval_grey_customize_white_40dp.xml b/WordPress/src/main/res/drawable/bg_oval_neutral_300_customize_white_40dp.xml similarity index 91% rename from WordPress/src/main/res/drawable/bg_oval_grey_customize_white_40dp.xml rename to WordPress/src/main/res/drawable/bg_oval_neutral_300_customize_white_40dp.xml index 3a9925285dae..36838dec4e1d 100644 --- a/WordPress/src/main/res/drawable/bg_oval_grey_customize_white_40dp.xml +++ b/WordPress/src/main/res/drawable/bg_oval_neutral_300_customize_white_40dp.xml @@ -10,7 +10,7 @@ android:shape="oval" > + android:color="@color/neutral_300" > + android:color="@color/neutral_300" > + android:color="@color/neutral_300" > + android:color="@color/neutral_300" > - + diff --git a/WordPress/src/main/res/drawable/quick_start_focus_inner_circle.xml b/WordPress/src/main/res/drawable/bg_oval_primary.xml similarity index 70% rename from WordPress/src/main/res/drawable/quick_start_focus_inner_circle.xml rename to WordPress/src/main/res/drawable/bg_oval_primary.xml index f4d6515478b3..11123c08e037 100644 --- a/WordPress/src/main/res/drawable/quick_start_focus_inner_circle.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary.xml @@ -2,5 +2,5 @@ + android:color="@color/primary"/> diff --git a/WordPress/src/main/res/drawable/quick_start_focus_outer_circle.xml b/WordPress/src/main/res/drawable/bg_oval_primary_100.xml similarity index 70% rename from WordPress/src/main/res/drawable/quick_start_focus_outer_circle.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_100.xml index 2a4d6e578e28..e2b6e3a65c0b 100644 --- a/WordPress/src/main/res/drawable/quick_start_focus_outer_circle.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary_100.xml @@ -2,5 +2,5 @@ + android:color="@color/primary_100"/> diff --git a/WordPress/src/main/res/drawable/shape_oval_blue.xml b/WordPress/src/main/res/drawable/bg_oval_primary_400.xml similarity index 73% rename from WordPress/src/main/res/drawable/shape_oval_blue.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_400.xml index 7740e129aee1..ef3990854c92 100644 --- a/WordPress/src/main/res/drawable/shape_oval_blue.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary_400.xml @@ -1,4 +1,4 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_oval_blue_medium_customize_white_40dp.xml b/WordPress/src/main/res/drawable/bg_oval_primary_400_customize_white_40dp.xml similarity index 91% rename from WordPress/src/main/res/drawable/bg_oval_blue_medium_customize_white_40dp.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_400_customize_white_40dp.xml index 906c2463a1cd..5db21e6d57e6 100644 --- a/WordPress/src/main/res/drawable/bg_oval_blue_medium_customize_white_40dp.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary_400_customize_white_40dp.xml @@ -10,7 +10,7 @@ android:shape="oval" > + android:color="@color/primary_400" > + + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_oval_primary_400_stroke_notification_unread.xml b/WordPress/src/main/res/drawable/bg_oval_primary_400_stroke_notification_unread.xml new file mode 100644 index 000000000000..e4bb6103b72a --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_oval_primary_400_stroke_notification_unread.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/shape_oval_red.xml b/WordPress/src/main/res/drawable/bg_oval_primary_500.xml similarity index 82% rename from WordPress/src/main/res/drawable/shape_oval_red.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_500.xml index 51b98c10f824..1481523c541b 100644 --- a/WordPress/src/main/res/drawable/shape_oval_red.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary_500.xml @@ -3,5 +3,5 @@ xmlns:tools="http://schemas.android.com/tools" android:shape="oval" tools:ignore="UnusedResources"> - + diff --git a/WordPress/src/main/res/drawable/bg_oval_blue_wordpress_plus_white_16dp.xml b/WordPress/src/main/res/drawable/bg_oval_primary_500_plus_white_16dp.xml similarity index 90% rename from WordPress/src/main/res/drawable/bg_oval_blue_wordpress_plus_white_16dp.xml rename to WordPress/src/main/res/drawable/bg_oval_primary_500_plus_white_16dp.xml index f3c6d6e8e808..ad231ac74c13 100644 --- a/WordPress/src/main/res/drawable/bg_oval_blue_wordpress_plus_white_16dp.xml +++ b/WordPress/src/main/res/drawable/bg_oval_primary_500_plus_white_16dp.xml @@ -10,7 +10,7 @@ android:shape="oval" > + android:color="@color/primary_500" > - + diff --git a/WordPress/src/main/res/drawable/bg_oval_warning_stroke_white.xml b/WordPress/src/main/res/drawable/bg_oval_warning_stroke_white.xml new file mode 100644 index 000000000000..25af41ccf00f --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_oval_warning_stroke_white.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_oval_white.xml b/WordPress/src/main/res/drawable/bg_oval_white.xml index af1695bd39fa..31548c1bcf11 100644 --- a/WordPress/src/main/res/drawable/bg_oval_white.xml +++ b/WordPress/src/main/res/drawable/bg_oval_white.xml @@ -5,7 +5,7 @@ android:shape="oval" > + android:color="@android:color/white" > diff --git a/WordPress/src/main/res/drawable/scrollbar_transparent_black.xml b/WordPress/src/main/res/drawable/bg_rectangle_black_translucent_50_3dp.xml similarity index 79% rename from WordPress/src/main/res/drawable/scrollbar_transparent_black.xml rename to WordPress/src/main/res/drawable/bg_rectangle_black_translucent_50_3dp.xml index 5032513015e3..5cd3c0faef26 100644 --- a/WordPress/src/main/res/drawable/scrollbar_transparent_black.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_black_translucent_50_3dp.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:color="@color/black_translucent_50" /> diff --git a/WordPress/src/main/res/drawable/reader_photo_count_background.xml b/WordPress/src/main/res/drawable/bg_rectangle_black_translucent_50_radius_36dp.xml similarity index 80% rename from WordPress/src/main/res/drawable/reader_photo_count_background.xml rename to WordPress/src/main/res/drawable/bg_rectangle_black_translucent_50_radius_36dp.xml index ef0649f75b4c..7b2757b52421 100644 --- a/WordPress/src/main/res/drawable/reader_photo_count_background.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_black_translucent_50_radius_36dp.xml @@ -6,7 +6,7 @@ - + diff --git a/WordPress/src/main/res/drawable/preferences_divider.xml b/WordPress/src/main/res/drawable/bg_rectangle_divider.xml similarity index 80% rename from WordPress/src/main/res/drawable/preferences_divider.xml rename to WordPress/src/main/res/drawable/bg_rectangle_divider.xml index b912aac177e8..1276cffc3b1a 100644 --- a/WordPress/src/main/res/drawable/preferences_divider.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_divider.xml @@ -9,7 +9,7 @@ android:shape="rectangle"> + android:color="@color/divider" /> diff --git a/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml new file mode 100644 index 000000000000..0133b05e9ed1 --- /dev/null +++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_0_radius_2dp.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_grey_lighten_20_globe_32dp.xml b/WordPress/src/main/res/drawable/bg_rectangle_neutral_100_globe_32dp.xml similarity index 90% rename from WordPress/src/main/res/drawable/bg_rectangle_grey_lighten_20_globe_32dp.xml rename to WordPress/src/main/res/drawable/bg_rectangle_neutral_100_globe_32dp.xml index 424bd8c06bc5..5fac27d0d34e 100644 --- a/WordPress/src/main/res/drawable/bg_rectangle_grey_lighten_20_globe_32dp.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_neutral_100_globe_32dp.xml @@ -10,7 +10,7 @@ android:shape="rectangle" > + android:color="@color/neutral_100" > + android:color="@color/neutral_100" > + android:color="@color/neutral_100" > + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/shape_rectangle_blue_dark.xml b/WordPress/src/main/res/drawable/bg_rectangle_primary_700_16dp.xml similarity index 80% rename from WordPress/src/main/res/drawable/shape_rectangle_blue_dark.xml rename to WordPress/src/main/res/drawable/bg_rectangle_primary_700_16dp.xml index da021978b243..45ce82871c58 100644 --- a/WordPress/src/main/res/drawable/shape_rectangle_blue_dark.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_primary_700_16dp.xml @@ -1,5 +1,5 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml b/WordPress/src/main/res/drawable/bg_rectangle_primary_dark_radius_card_12dp.xml similarity index 85% rename from WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml rename to WordPress/src/main/res/drawable/bg_rectangle_primary_dark_radius_card_12dp.xml index 828b71424964..ded24c554a4e 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_legend_background_primary.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_primary_dark_radius_card_12dp.xml @@ -3,7 +3,7 @@ - + - + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/comment_unapproved_background.xml b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning.xml similarity index 70% rename from WordPress/src/main/res/drawable/comment_unapproved_background.xml rename to WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning.xml index 94dd3ca54d5d..f69c23a24c5d 100644 --- a/WordPress/src/main/res/drawable/comment_unapproved_background.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + diff --git a/WordPress/src/main/res/drawable/comment_reply_unapproved_background.xml b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning_white.xml similarity index 70% rename from WordPress/src/main/res/drawable/comment_reply_unapproved_background.xml rename to WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning_white.xml index 86be8b1c79a2..399436cd100d 100644 --- a/WordPress/src/main/res/drawable/comment_reply_unapproved_background.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_warning_0_warning_white.xml @@ -2,13 +2,13 @@ - + - + @@ -16,7 +16,7 @@ - + diff --git a/WordPress/src/main/res/drawable/bg_rectangle_white.xml b/WordPress/src/main/res/drawable/bg_rectangle_white.xml index dfc6c298af9f..a35999ccb6d4 100644 --- a/WordPress/src/main/res/drawable/bg_rectangle_white.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_white.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" > + android:color="@android:color/white" > diff --git a/WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml b/WordPress/src/main/res/drawable/bg_rectangle_white_neutral_0_radius_4dp.xml similarity index 83% rename from WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml rename to WordPress/src/main/res/drawable/bg_rectangle_white_neutral_0_radius_4dp.xml index 0e949df9e7c9..3d84d810af4c 100644 --- a/WordPress/src/main/res/drawable/stats_barchart_no_activity_background.xml +++ b/WordPress/src/main/res/drawable/bg_rectangle_white_neutral_0_radius_4dp.xml @@ -5,7 +5,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/WordPress/src/main/res/drawable/blavatar_border.xml b/WordPress/src/main/res/drawable/blavatar_border.xml index c164e446d627..7ca61ee1a764 100644 --- a/WordPress/src/main/res/drawable/blavatar_border.xml +++ b/WordPress/src/main/res/drawable/blavatar_border.xml @@ -2,7 +2,7 @@ + android:color="@color/neutral_100"/> diff --git a/WordPress/src/main/res/drawable/button_frame.xml b/WordPress/src/main/res/drawable/button_frame.xml index f92cf2646350..32c27c98f0f3 100644 --- a/WordPress/src/main/res/drawable/button_frame.xml +++ b/WordPress/src/main/res/drawable/button_frame.xml @@ -4,8 +4,8 @@ - + android:color="@color/neutral_300"/> + @@ -13,8 +13,8 @@ - + android:color="@color/neutral_100"/> + diff --git a/WordPress/src/main/res/drawable/comment_reply_background.xml b/WordPress/src/main/res/drawable/comment_reply_background.xml index 5a0d9dd0c5d2..b0418d2d6821 100644 --- a/WordPress/src/main/res/drawable/comment_reply_background.xml +++ b/WordPress/src/main/res/drawable/comment_reply_background.xml @@ -2,7 +2,7 @@ - + - + @@ -18,7 +18,7 @@ - + diff --git a/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml b/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml index 57fb6702b164..63c024f46e72 100644 --- a/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_add_outline_grey_dark_24dp.xml @@ -4,7 +4,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/WordPress/src/main/res/drawable/ic_arrow_left_white_24dp.xml b/WordPress/src/main/res/drawable/ic_arrow_left_white_24dp.xml index c566f6c8a2c1..393d26d0cfda 100644 --- a/WordPress/src/main/res/drawable/ic_arrow_left_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_arrow_left_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_aside_white_24dp.xml b/WordPress/src/main/res/drawable/ic_aside_white_24dp.xml index 25191f55a888..d9adc4623ec8 100644 --- a/WordPress/src/main/res/drawable/ic_aside_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_aside_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_audio_white_24dp.xml b/WordPress/src/main/res/drawable/ic_audio_white_24dp.xml index 5d6f1f2d809a..2694e63847b5 100644 --- a/WordPress/src/main/res/drawable/ic_audio_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_audio_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_bell_blue_wordpress_48dp.xml b/WordPress/src/main/res/drawable/ic_bell_blue_wordpress_48dp.xml index 9b1196b784d3..24f2905f186a 100644 --- a/WordPress/src/main/res/drawable/ic_bell_blue_wordpress_48dp.xml +++ b/WordPress/src/main/res/drawable/ic_bell_blue_wordpress_48dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="48" > diff --git a/WordPress/src/main/res/drawable/ic_bell_white_24dp.xml b/WordPress/src/main/res/drawable/ic_bell_white_24dp.xml index d80761b32b96..b5a69b646c73 100644 --- a/WordPress/src/main/res/drawable/ic_bell_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_bell_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_block_white_24dp.xml b/WordPress/src/main/res/drawable/ic_block_white_24dp.xml index c12a0f358e5d..9b0abaa69acb 100644 --- a/WordPress/src/main/res/drawable/ic_block_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_block_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_bookmark_grey_dark_18dp.xml b/WordPress/src/main/res/drawable/ic_bookmark_grey_dark_18dp.xml index 4f12e9ab29de..f75637ec429c 100644 --- a/WordPress/src/main/res/drawable/ic_bookmark_grey_dark_18dp.xml +++ b/WordPress/src/main/res/drawable/ic_bookmark_grey_dark_18dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24" > diff --git a/WordPress/src/main/res/drawable/ic_bookmark_outline_white_24dp.xml b/WordPress/src/main/res/drawable/ic_bookmark_outline_white_24dp.xml index 20b5c9c2b885..bd798f77ad94 100644 --- a/WordPress/src/main/res/drawable/ic_bookmark_outline_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_bookmark_outline_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_bookmark_white_24dp.xml b/WordPress/src/main/res/drawable/ic_bookmark_white_24dp.xml index 5f515dc40eb6..8f150eb373e8 100644 --- a/WordPress/src/main/res/drawable/ic_bookmark_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_bookmark_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_calendar_white_24dp.xml b/WordPress/src/main/res/drawable/ic_calendar_white_24dp.xml index a0213650b816..54ee71c78342 100644 --- a/WordPress/src/main/res/drawable/ic_calendar_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_calendar_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_checkmark_white_24dp.xml b/WordPress/src/main/res/drawable/ic_checkmark_white_24dp.xml index 832d0496373a..8f25e37566e0 100644 --- a/WordPress/src/main/res/drawable/ic_checkmark_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_checkmark_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_chevron_down_white_16dp.xml b/WordPress/src/main/res/drawable/ic_chevron_down_white_16dp.xml index 1eacd0d9d20d..6060b2fc1038 100644 --- a/WordPress/src/main/res/drawable/ic_chevron_down_white_16dp.xml +++ b/WordPress/src/main/res/drawable/ic_chevron_down_white_16dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_chevron_down_white_24dp.xml b/WordPress/src/main/res/drawable/ic_chevron_down_white_24dp.xml index 8c9e9e15c7eb..eefc8574e77e 100644 --- a/WordPress/src/main/res/drawable/ic_chevron_down_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_chevron_down_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_chevron_down_white_35dp.xml b/WordPress/src/main/res/drawable/ic_chevron_down_white_35dp.xml index f8e16bf9e950..552a9dc40ac7 100644 --- a/WordPress/src/main/res/drawable/ic_chevron_down_white_35dp.xml +++ b/WordPress/src/main/res/drawable/ic_chevron_down_white_35dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="35.0" > diff --git a/WordPress/src/main/res/drawable/ic_chevron_left_white_24dp.xml b/WordPress/src/main/res/drawable/ic_chevron_left_white_24dp.xml index 58d574ed26a7..c42944068bec 100644 --- a/WordPress/src/main/res/drawable/ic_chevron_left_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_chevron_left_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_chevron_right_white_24dp.xml b/WordPress/src/main/res/drawable/ic_chevron_right_white_24dp.xml index af49cbde66ed..8c197ca7e1b2 100644 --- a/WordPress/src/main/res/drawable/ic_chevron_right_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_chevron_right_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_cloud_upload_white_24dp.xml b/WordPress/src/main/res/drawable/ic_cloud_upload_white_24dp.xml index 4e319a6fab9b..fcdb1f7b0509 100644 --- a/WordPress/src/main/res/drawable/ic_cloud_upload_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_cloud_upload_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_cloud_white_24dp.xml b/WordPress/src/main/res/drawable/ic_cloud_white_24dp.xml index 6521feaf36c1..c22fa631ebcc 100644 --- a/WordPress/src/main/res/drawable/ic_cloud_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_cloud_white_24dp.xml @@ -7,6 +7,6 @@ android:viewportHeight="24"> diff --git a/WordPress/src/main/res/drawable/ic_cog_white_24dp.xml b/WordPress/src/main/res/drawable/ic_cog_white_24dp.xml index d1e4d5bbe4c7..103966b4b49d 100644 --- a/WordPress/src/main/res/drawable/ic_cog_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_cog_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_comment_white_24dp.xml b/WordPress/src/main/res/drawable/ic_comment_white_24dp.xml index a2035dc2f456..23b015c47ac9 100644 --- a/WordPress/src/main/res/drawable/ic_comment_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_comment_white_24dp.xml @@ -8,7 +8,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_copy_white_24dp.xml b/WordPress/src/main/res/drawable/ic_copy_white_24dp.xml index 2a7817e81350..dfeaaef33cc3 100644 --- a/WordPress/src/main/res/drawable/ic_copy_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_copy_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_create_blue_wordpress_48dp.xml b/WordPress/src/main/res/drawable/ic_create_blue_wordpress_48dp.xml index feeede41ecda..95ba462fa1c8 100644 --- a/WordPress/src/main/res/drawable/ic_create_blue_wordpress_48dp.xml +++ b/WordPress/src/main/res/drawable/ic_create_blue_wordpress_48dp.xml @@ -6,12 +6,12 @@ android:viewportWidth="48" > diff --git a/WordPress/src/main/res/drawable/ic_create_white_24dp.xml b/WordPress/src/main/res/drawable/ic_create_white_24dp.xml index fef65db1213d..2d0b8ff7d897 100644 --- a/WordPress/src/main/res/drawable/ic_create_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_create_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_cross_white_24dp.xml b/WordPress/src/main/res/drawable/ic_cross_white_24dp.xml index 25ab26a63f0c..5923a73b84ec 100644 --- a/WordPress/src/main/res/drawable/ic_cross_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_cross_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_customize_white_24dp.xml b/WordPress/src/main/res/drawable/ic_customize_white_24dp.xml index 53a215ff0ae1..ea8cb7908ead 100644 --- a/WordPress/src/main/res/drawable/ic_customize_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_customize_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_domains_white_24dp.xml b/WordPress/src/main/res/drawable/ic_domains_white_24dp.xml index 5316e17f2c01..bbf5d2ad37b6 100644 --- a/WordPress/src/main/res/drawable/ic_domains_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_domains_white_24dp.xml @@ -8,7 +8,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_download_white_24dp.xml b/WordPress/src/main/res/drawable/ic_download_white_24dp.xml index 7f8303885f95..1517c405f2db 100644 --- a/WordPress/src/main/res/drawable/ic_download_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_download_white_24dp.xml @@ -1,9 +1,13 @@ - + + + android:fillColor="@android:color/white" + android:pathData="M18,9c-0.01,0 -0.017,0.002 -0.025,0.003C17.72,5.646 14.922,3 11.5,3 7.91,3 5,5.91 5,9.5c0,0.524 0.07,1.03 0.186,1.52C5.123,11.015 5.064,11 5,11c-2.21,0 -4,1.79 -4,4 0,1.202 0.54,2.267 1.38,3h18.593C22.196,17.09 23,15.643 23,14c0,-2.76 -2.24,-5 -5,-5zM12,16l-4,-5h3L11,8h2v3h3l-4,5z"> + + diff --git a/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml b/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml index 28325ede8500..a5c72545691c 100644 --- a/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_dropdown_blue_light_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_ellipsis_vertical_white_24dp.xml b/WordPress/src/main/res/drawable/ic_ellipsis_vertical_white_24dp.xml index ecb76056bb3a..e7aa73bfb171 100644 --- a/WordPress/src/main/res/drawable/ic_ellipsis_vertical_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_ellipsis_vertical_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_ellipsis_white_24dp.xml b/WordPress/src/main/res/drawable/ic_ellipsis_white_24dp.xml index b68aa4ee9a28..46c60c79da72 100644 --- a/WordPress/src/main/res/drawable/ic_ellipsis_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_ellipsis_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_external_grey_min_24dp.xml b/WordPress/src/main/res/drawable/ic_external_grey_min_24dp.xml index b37d3ee50e76..ffcced09ff1f 100644 --- a/WordPress/src/main/res/drawable/ic_external_grey_min_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_external_grey_min_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_external_white_24dp.xml b/WordPress/src/main/res/drawable/ic_external_white_24dp.xml index 390f60b70f9c..d89a8316c6de 100644 --- a/WordPress/src/main/res/drawable/ic_external_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_external_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_folder_multiple_white_24dp.xml b/WordPress/src/main/res/drawable/ic_folder_multiple_white_24dp.xml index 390ecd45552d..41d57688e99a 100644 --- a/WordPress/src/main/res/drawable/ic_folder_multiple_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_folder_multiple_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_folder_white_24dp.xml b/WordPress/src/main/res/drawable/ic_folder_white_24dp.xml index 2a5ad5edb57b..34cb0c9c2c1f 100644 --- a/WordPress/src/main/res/drawable/ic_folder_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_folder_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_globe_white_24dp.xml b/WordPress/src/main/res/drawable/ic_globe_white_24dp.xml index 8965bb4bef93..4d9794f82d33 100644 --- a/WordPress/src/main/res/drawable/ic_globe_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_globe_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_help_outline_white_24dp.xml b/WordPress/src/main/res/drawable/ic_help_outline_white_24dp.xml index 869d42db5ea5..e2db5f5c2b62 100644 --- a/WordPress/src/main/res/drawable/ic_help_outline_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_help_outline_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_help_white_24dp.xml b/WordPress/src/main/res/drawable/ic_help_white_24dp.xml index 79480bdbd542..8dd93b1ad366 100644 --- a/WordPress/src/main/res/drawable/ic_help_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_help_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml b/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml index 8dbb4b958118..60fbca6cb38c 100644 --- a/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_history_alt_white_24dp.xml @@ -6,12 +6,12 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_history_white_24dp.xml b/WordPress/src/main/res/drawable/ic_history_white_24dp.xml index 424c557caed3..9e5cd87000af 100644 --- a/WordPress/src/main/res/drawable/ic_history_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_history_white_24dp.xml @@ -8,9 +8,9 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_image_remove_white_24dp.xml b/WordPress/src/main/res/drawable/ic_image_remove_white_24dp.xml index d4e913f06e1d..c97026b32134 100644 --- a/WordPress/src/main/res/drawable/ic_image_remove_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_image_remove_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_image_white_24dp.xml b/WordPress/src/main/res/drawable/ic_image_white_24dp.xml index 5d79e28a6747..3403a57ffc25 100644 --- a/WordPress/src/main/res/drawable/ic_image_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_image_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml b/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml index c70e0dd374f4..8826aca369f2 100644 --- a/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml +++ b/WordPress/src/main/res/drawable/ic_info_outline_grey_dark_18dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="18.0" > diff --git a/WordPress/src/main/res/drawable/ic_info_outline_white_24dp.xml b/WordPress/src/main/res/drawable/ic_info_outline_white_24dp.xml index ccd6a1a7e081..4a6fcba73bd2 100644 --- a/WordPress/src/main/res/drawable/ic_info_outline_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_info_outline_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_info_white_24dp.xml b/WordPress/src/main/res/drawable/ic_info_white_24dp.xml index 413fe5bcff43..0195e4a5dc59 100644 --- a/WordPress/src/main/res/drawable/ic_info_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_info_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_layout_white_24dp.xml b/WordPress/src/main/res/drawable/ic_layout_white_24dp.xml index 2f939f0ddcc0..8401f7d570b0 100644 --- a/WordPress/src/main/res/drawable/ic_layout_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_layout_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_location_white_24dp.xml b/WordPress/src/main/res/drawable/ic_location_white_24dp.xml index c26be8dd9827..beebda9110ad 100644 --- a/WordPress/src/main/res/drawable/ic_location_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_location_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_lock_white_24dp.xml b/WordPress/src/main/res/drawable/ic_lock_white_24dp.xml index 5f1a29005331..220efa159668 100644 --- a/WordPress/src/main/res/drawable/ic_lock_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_lock_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_mail_white_24dp.xml b/WordPress/src/main/res/drawable/ic_mail_white_24dp.xml index e3a4af71af5a..c2dbe4616473 100644 --- a/WordPress/src/main/res/drawable/ic_mail_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_mail_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_media_white_24dp.xml b/WordPress/src/main/res/drawable/ic_media_white_24dp.xml index 62c3e83729db..62f3e895e2b5 100644 --- a/WordPress/src/main/res/drawable/ic_media_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_media_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_mention_white_24dp.xml b/WordPress/src/main/res/drawable/ic_mention_white_24dp.xml index 2fa53ed7355b..17c26bdc1217 100644 --- a/WordPress/src/main/res/drawable/ic_mention_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_mention_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_menu_white_24dp.xml b/WordPress/src/main/res/drawable/ic_menu_white_24dp.xml index a240a3fb093e..84f9ac9bdbf7 100644 --- a/WordPress/src/main/res/drawable/ic_menu_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_menu_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_more_vert_white_24dp.xml b/WordPress/src/main/res/drawable/ic_more_vert_white_24dp.xml index 75dca615a590..70893eeb5109 100644 --- a/WordPress/src/main/res/drawable/ic_more_vert_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_more_vert_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_multiple_users_white_24dp.xml b/WordPress/src/main/res/drawable/ic_multiple_users_white_24dp.xml index a5eb6dbaad45..c5424e25d59f 100644 --- a/WordPress/src/main/res/drawable/ic_multiple_users_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_multiple_users_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_my_sites_white_24dp.xml b/WordPress/src/main/res/drawable/ic_my_sites_white_24dp.xml index c6f7bdf3b109..77e5bc497da7 100644 --- a/WordPress/src/main/res/drawable/ic_my_sites_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_my_sites_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_notice_outline_white_24dp.xml b/WordPress/src/main/res/drawable/ic_notice_outline_white_24dp.xml index 4c835dfec78d..5fec37269534 100644 --- a/WordPress/src/main/res/drawable/ic_notice_outline_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_notice_outline_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_notice_white_24dp.xml b/WordPress/src/main/res/drawable/ic_notice_white_24dp.xml index 91e3974b90b2..e217ddd9e360 100644 --- a/WordPress/src/main/res/drawable/ic_notice_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_notice_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_pages_white_24dp.xml b/WordPress/src/main/res/drawable/ic_pages_white_24dp.xml index 93c503addbc5..14336ca62bdf 100644 --- a/WordPress/src/main/res/drawable/ic_pages_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_pages_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_pencil_white_24dp.xml b/WordPress/src/main/res/drawable/ic_pencil_white_24dp.xml index 2b37ae0872cf..4f4fdebb3011 100644 --- a/WordPress/src/main/res/drawable/ic_pencil_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_pencil_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_phone_white_24dp.xml b/WordPress/src/main/res/drawable/ic_phone_white_24dp.xml index e048ef883aff..04bcf8a2538c 100644 --- a/WordPress/src/main/res/drawable/ic_phone_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_phone_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_plans_white_24dp.xml b/WordPress/src/main/res/drawable/ic_plans_white_24dp.xml index a00f93c082a0..456bd042b05b 100644 --- a/WordPress/src/main/res/drawable/ic_plans_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_plans_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_play_black_white_24dp.xml b/WordPress/src/main/res/drawable/ic_play_black_white_24dp.xml index 11b5b1204056..22be76c79a9f 100644 --- a/WordPress/src/main/res/drawable/ic_play_black_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_play_black_white_24dp.xml @@ -6,12 +6,12 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_play_white_black_24dp.xml b/WordPress/src/main/res/drawable/ic_play_white_black_24dp.xml index ef60dfd1efaa..7732f830ccee 100644 --- a/WordPress/src/main/res/drawable/ic_play_white_black_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_play_white_black_24dp.xml @@ -6,12 +6,12 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_plugins_white_24dp.xml b/WordPress/src/main/res/drawable/ic_plugins_white_24dp.xml index e8e3678d63f4..6237eb7ec31b 100644 --- a/WordPress/src/main/res/drawable/ic_plugins_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_plugins_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_plus_white_12dp.xml b/WordPress/src/main/res/drawable/ic_plus_white_12dp.xml index 3e197241e6a4..c2172beac1ec 100644 --- a/WordPress/src/main/res/drawable/ic_plus_white_12dp.xml +++ b/WordPress/src/main/res/drawable/ic_plus_white_12dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_plus_white_24dp.xml b/WordPress/src/main/res/drawable/ic_plus_white_24dp.xml index b9757f17f0d4..5bd151d62d5b 100644 --- a/WordPress/src/main/res/drawable/ic_plus_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_plus_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_posts_white_24dp.xml b/WordPress/src/main/res/drawable/ic_posts_white_24dp.xml index fe49d7b29723..39256666616f 100644 --- a/WordPress/src/main/res/drawable/ic_posts_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_posts_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_reader_follow_white_24dp.xml b/WordPress/src/main/res/drawable/ic_reader_follow_white_24dp.xml index a2d20f488bff..94675f37d2b9 100644 --- a/WordPress/src/main/res/drawable/ic_reader_follow_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_reader_follow_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_reader_following_white_24dp.xml b/WordPress/src/main/res/drawable/ic_reader_following_white_24dp.xml index c3b4621fc03e..337601c7e63a 100644 --- a/WordPress/src/main/res/drawable/ic_reader_following_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_reader_following_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_reader_white_24dp.xml b/WordPress/src/main/res/drawable/ic_reader_white_24dp.xml index ebc14d3be983..83095e4a0359 100644 --- a/WordPress/src/main/res/drawable/ic_reader_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_reader_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_refresh_white_24dp.xml b/WordPress/src/main/res/drawable/ic_refresh_white_24dp.xml index 4049fae147b2..7c05ce9f5e88 100644 --- a/WordPress/src/main/res/drawable/ic_refresh_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_refresh_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_reply_white_24dp.xml b/WordPress/src/main/res/drawable/ic_reply_white_24dp.xml index 9897fc195630..3734b43a7fa5 100644 --- a/WordPress/src/main/res/drawable/ic_reply_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_reply_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_search_grey_text_min_24dp.xml b/WordPress/src/main/res/drawable/ic_search_neutral_24dp.xml similarity index 89% rename from WordPress/src/main/res/drawable/ic_search_grey_text_min_24dp.xml rename to WordPress/src/main/res/drawable/ic_search_neutral_24dp.xml index ca9e328566cc..7a0141d329fb 100644 --- a/WordPress/src/main/res/drawable/ic_search_grey_text_min_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_search_neutral_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_search_white_24dp.xml b/WordPress/src/main/res/drawable/ic_search_white_24dp.xml index d53bb5de4e79..534ac1cf84ca 100644 --- a/WordPress/src/main/res/drawable/ic_search_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_search_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_select_all_white_24dp.xml b/WordPress/src/main/res/drawable/ic_select_all_white_24dp.xml index 7ff843753e7f..64063865f5ce 100644 --- a/WordPress/src/main/res/drawable/ic_select_all_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_select_all_white_24dp.xml @@ -4,6 +4,6 @@ android:viewportWidth="24.0" android:viewportHeight="24.0"> diff --git a/WordPress/src/main/res/drawable/ic_share_white_24dp.xml b/WordPress/src/main/res/drawable/ic_share_white_24dp.xml index 407ab9c60cca..36806567101a 100644 --- a/WordPress/src/main/res/drawable/ic_share_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_share_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_shipping_white_24dp.xml b/WordPress/src/main/res/drawable/ic_shipping_white_24dp.xml index c6c8eddc78f0..49b477240ea9 100644 --- a/WordPress/src/main/res/drawable/ic_shipping_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_shipping_white_24dp.xml @@ -8,6 +8,6 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_sign_out_white_24dp.xml b/WordPress/src/main/res/drawable/ic_sign_out_white_24dp.xml index bf93d367050a..67916dd85cbe 100644 --- a/WordPress/src/main/res/drawable/ic_sign_out_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_sign_out_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_spam_white_24dp.xml b/WordPress/src/main/res/drawable/ic_spam_white_24dp.xml index a2ff58303377..014f6a03c72f 100644 --- a/WordPress/src/main/res/drawable/ic_spam_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_spam_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_star_outline_white_24dp.xml b/WordPress/src/main/res/drawable/ic_star_outline_white_24dp.xml index df6c1039d6d0..cfdca765a23a 100644 --- a/WordPress/src/main/res/drawable/ic_star_outline_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_star_outline_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_star_white_24dp.xml b/WordPress/src/main/res/drawable/ic_star_white_24dp.xml index 148a0f24e1ec..4470092242ce 100644 --- a/WordPress/src/main/res/drawable/ic_star_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_star_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_stats_alt_blue_wordpress_48dp.xml b/WordPress/src/main/res/drawable/ic_stats_alt_blue_wordpress_48dp.xml index 49165577c16f..33f385d1b00f 100644 --- a/WordPress/src/main/res/drawable/ic_stats_alt_blue_wordpress_48dp.xml +++ b/WordPress/src/main/res/drawable/ic_stats_alt_blue_wordpress_48dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="48" > diff --git a/WordPress/src/main/res/drawable/ic_stats_alt_white_24dp.xml b/WordPress/src/main/res/drawable/ic_stats_alt_white_24dp.xml index e6b7adfaf598..459529013837 100644 --- a/WordPress/src/main/res/drawable/ic_stats_alt_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_stats_alt_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_stats_white_24dp.xml b/WordPress/src/main/res/drawable/ic_stats_white_24dp.xml index e05b167b9be3..147cc0561696 100644 --- a/WordPress/src/main/res/drawable/ic_stats_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_stats_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_sync_white_24dp.xml b/WordPress/src/main/res/drawable/ic_sync_white_24dp.xml index e11052d6082e..7984c6369e4c 100644 --- a/WordPress/src/main/res/drawable/ic_sync_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_sync_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24" > diff --git a/WordPress/src/main/res/drawable/ic_tag_white_24dp.xml b/WordPress/src/main/res/drawable/ic_tag_white_24dp.xml index 30fe2deb7c03..abc16edd4e9c 100644 --- a/WordPress/src/main/res/drawable/ic_tag_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_tag_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_themes_white_24dp.xml b/WordPress/src/main/res/drawable/ic_themes_white_24dp.xml index beec0e7cff0e..78bcd57778d9 100644 --- a/WordPress/src/main/res/drawable/ic_themes_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_themes_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_thumbs_down_white_24dp.xml b/WordPress/src/main/res/drawable/ic_thumbs_down_white_24dp.xml index 6985731e22e9..ddb6066e4116 100644 --- a/WordPress/src/main/res/drawable/ic_thumbs_down_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_thumbs_down_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_thumbs_up_white_24dp.xml b/WordPress/src/main/res/drawable/ic_thumbs_up_white_24dp.xml index 52650959af1c..32668274469d 100644 --- a/WordPress/src/main/res/drawable/ic_thumbs_up_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_thumbs_up_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_trash_white_24dp.xml b/WordPress/src/main/res/drawable/ic_trash_white_24dp.xml index 8780896f50ba..e5ff8e3c7da4 100644 --- a/WordPress/src/main/res/drawable/ic_trash_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_trash_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_trophy_white_24dp.xml b/WordPress/src/main/res/drawable/ic_trophy_white_24dp.xml index 57f77f85aa47..679042874ede 100644 --- a/WordPress/src/main/res/drawable/ic_trophy_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_trophy_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_undo_white_24dp.xml b/WordPress/src/main/res/drawable/ic_undo_white_24dp.xml index 8e194cbaea9b..9aaf59e7fe0d 100644 --- a/WordPress/src/main/res/drawable/ic_undo_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_undo_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml b/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml index 68060eef94f7..df67fcdb1e83 100644 --- a/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_user_circle_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_user_white_24dp.xml b/WordPress/src/main/res/drawable/ic_user_white_24dp.xml index 7bbbab1d7071..eb7d896cc4bd 100644 --- a/WordPress/src/main/res/drawable/ic_user_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_user_white_24dp.xml @@ -8,7 +8,7 @@ tools:ignore="UnusedResources"> diff --git a/WordPress/src/main/res/drawable/ic_video_camera_white_24dp.xml b/WordPress/src/main/res/drawable/ic_video_camera_white_24dp.xml index 7413a2afc211..b3a60cc5bbe1 100644 --- a/WordPress/src/main/res/drawable/ic_video_camera_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_video_camera_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/ic_visible_on_white_24dp.xml b/WordPress/src/main/res/drawable/ic_visible_on_white_24dp.xml index 7e0e30421189..8f33ae6c3eaa 100644 --- a/WordPress/src/main/res/drawable/ic_visible_on_white_24dp.xml +++ b/WordPress/src/main/res/drawable/ic_visible_on_white_24dp.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" > diff --git a/WordPress/src/main/res/drawable/img_confetti_284dp.xml b/WordPress/src/main/res/drawable/img_confetti_284dp.xml index 47d0fc8e7a33..b4af1017f612 100644 --- a/WordPress/src/main/res/drawable/img_confetti_284dp.xml +++ b/WordPress/src/main/res/drawable/img_confetti_284dp.xml @@ -8,77 +8,77 @@ + android:fillColor="@color/blue_600"/> + android:fillColor="@color/hot_blue_100"/> + android:fillColor="@color/hot_yellow_500"/> + android:fillColor="@color/hot_blue_50"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_100"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_100"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_200"/> + android:fillColor="@android:color/white"/> + android:fillColor="@color/hot_blue_200"/> + android:fillColor="@color/hot_purple_200"/> + android:fillColor="@color/green_200"/> + android:fillColor="@color/green_100"/> + android:fillColor="@color/hot_yellow_300"/> + android:fillColor="@color/hot_purple_200"/> + android:fillColor="@color/hot_purple_300"/> + android:fillColor="@color/hot_blue_50"/> diff --git a/WordPress/src/main/res/drawable/giphy_attribution_100dp.xml b/WordPress/src/main/res/drawable/img_giphy_100dp.xml similarity index 74% rename from WordPress/src/main/res/drawable/giphy_attribution_100dp.xml rename to WordPress/src/main/res/drawable/img_giphy_100dp.xml index 0824913ef528..101ab29a7660 100644 --- a/WordPress/src/main/res/drawable/giphy_attribution_100dp.xml +++ b/WordPress/src/main/res/drawable/img_giphy_100dp.xml @@ -1,31 +1,31 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml b/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml index 53f2a3d239e5..3f251a018ed6 100644 --- a/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_add_media_150dp.xml @@ -10,122 +10,122 @@ tools:ignore="UnusedAttribute" > @@ -135,19 +135,19 @@ diff --git a/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml index 0d20351ea1d0..a7afe439724d 100644 --- a/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_checkmark_280dp.xml @@ -8,17 +8,17 @@ android:viewportWidth="280" > diff --git a/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml b/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml new file mode 100644 index 000000000000..b2d841f79d0a --- /dev/null +++ b/WordPress/src/main/res/drawable/img_illustration_email_alert_120dp.xml @@ -0,0 +1,271 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml b/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml index 91ae13a7fc51..e40827576104 100644 --- a/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_empty_results_216dp.xml @@ -6,297 +6,297 @@ android:viewportWidth="216" > diff --git a/WordPress/src/main/res/drawable/img_publish_button_124dp.xml b/WordPress/src/main/res/drawable/img_illustration_hand_checkmark_button_124dp.xml similarity index 94% rename from WordPress/src/main/res/drawable/img_publish_button_124dp.xml rename to WordPress/src/main/res/drawable/img_illustration_hand_checkmark_button_124dp.xml index 466657d51259..20cca14f092e 100644 --- a/WordPress/src/main/res/drawable/img_publish_button_124dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_hand_checkmark_button_124dp.xml @@ -11,42 +11,42 @@ android:pathData="M0 42h125v100H0V42z" android:strokeWidth="1"/> diff --git a/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml b/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml index c763790ce859..d1341171f75e 100644 --- a/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_info_outline_88dp.xml @@ -5,6 +5,6 @@ android:viewportWidth="88.0" android:viewportHeight="88.0" > - - + + diff --git a/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml b/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml index 0e12d1f00330..b1f7286a48e6 100644 --- a/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_insights_94dp.xml @@ -1,17 +1,17 @@ - - - - - - - - - - - - - - + android:viewportWidth="88" android:width="88dp" xmlns:android="http://schemas.android.com/apk/res/android"> + + + + + + + + + + + + + + diff --git a/WordPress/src/main/res/drawable/img_illustration_media_105dp.xml b/WordPress/src/main/res/drawable/img_illustration_media_105dp.xml index e10c1486e3d3..a00da8424e07 100644 --- a/WordPress/src/main/res/drawable/img_illustration_media_105dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_media_105dp.xml @@ -6,22 +6,22 @@ android:viewportWidth="105" > diff --git a/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml b/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml index c78337f0460e..7b2593d5f1ed 100644 --- a/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_notifications_152dp.xml @@ -6,152 +6,152 @@ android:viewportWidth="226.0" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml b/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml index cdcf6a9eef5c..17c932802e27 100644 --- a/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_pages_104dp.xml @@ -6,22 +6,22 @@ android:viewportWidth="104" > diff --git a/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml b/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml index 08bf0086f19a..a7a0fba9b79c 100644 --- a/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_posts_75dp.xml @@ -6,22 +6,22 @@ android:viewportWidth="75" > diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml index 98bee737ca86..4080ef0ed067 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_182dp.xml @@ -6,607 +6,607 @@ android:viewportWidth="182.0"> diff --git a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml index 15ea7d730e7e..f987ed6a9d20 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_about_280dp.xml @@ -6,612 +6,612 @@ android:viewportWidth="280.0" > diff --git a/WordPress/src/main/res/drawable/img_type_blog_80dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_blog_cup_80dp.xml similarity index 91% rename from WordPress/src/main/res/drawable/img_type_blog_80dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_blog_cup_80dp.xml index e8e3c8fbe014..c622dab30bd8 100644 --- a/WordPress/src/main/res/drawable/img_type_blog_80dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_blog_cup_80dp.xml @@ -6,33 +6,33 @@ android:viewportWidth="1457.93" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml index c0951369af54..bf2b6014f1ed 100644 --- a/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_brush_191dp.xml @@ -6,327 +6,327 @@ android:viewportWidth="191.0"> diff --git a/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_error_camera_pencils_226dp.xml similarity index 92% rename from WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_error_camera_pencils_226dp.xml index 6cd02df0ce43..33173e9c95c3 100644 --- a/WordPress/src/main/res/drawable/img_site_error_camera_pencils_226dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_error_camera_pencils_226dp.xml @@ -6,48 +6,48 @@ android:viewportWidth="226" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_type_portfolio_80dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_media_camera_pencils_80dp.xml similarity index 92% rename from WordPress/src/main/res/drawable/img_type_portfolio_80dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_media_camera_pencils_80dp.xml index 894baa7412ce..127bda32cdae 100644 --- a/WordPress/src/main/res/drawable/img_type_portfolio_80dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_media_camera_pencils_80dp.xml @@ -6,90 +6,90 @@ android:viewportWidth="1466.56" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_type_website_80dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_website_cards_80dp.xml similarity index 88% rename from WordPress/src/main/res/drawable/img_type_website_80dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_website_cards_80dp.xml index 264f0d6cb502..37d9707f1c26 100644 --- a/WordPress/src/main/res/drawable/img_type_website_80dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_website_cards_80dp.xml @@ -6,57 +6,57 @@ android:viewportWidth="1454.44" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_site_wordpress_camera_pencils_226dp.xml b/WordPress/src/main/res/drawable/img_illustration_site_wordpress_camera_pencils_226dp.xml similarity index 93% rename from WordPress/src/main/res/drawable/img_site_wordpress_camera_pencils_226dp.xml rename to WordPress/src/main/res/drawable/img_illustration_site_wordpress_camera_pencils_226dp.xml index a1d5c7dcb85e..fef318606fc7 100644 --- a/WordPress/src/main/res/drawable/img_site_wordpress_camera_pencils_226dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_site_wordpress_camera_pencils_226dp.xml @@ -6,77 +6,77 @@ android:viewportWidth="226" > diff --git a/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml b/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml index 78350be30e7b..1fa3919ab023 100644 --- a/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml +++ b/WordPress/src/main/res/drawable/img_illustration_stats_226dp.xml @@ -6,87 +6,87 @@ android:viewportWidth="226.0" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_promo_editor.xml b/WordPress/src/main/res/drawable/img_promo_editor.xml index bbfde9143591..0e1ad11a615e 100644 --- a/WordPress/src/main/res/drawable/img_promo_editor.xml +++ b/WordPress/src/main/res/drawable/img_promo_editor.xml @@ -6,45 +6,45 @@ android:viewportWidth="280.0" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/img_promo_stats_widget.xml b/WordPress/src/main/res/drawable/img_promo_stats_widget.xml index 7b538eafdcbc..3ff0d0402af4 100644 --- a/WordPress/src/main/res/drawable/img_promo_stats_widget.xml +++ b/WordPress/src/main/res/drawable/img_promo_stats_widget.xml @@ -6,52 +6,51 @@ android:viewportWidth="420.0" tools:ignore="UnusedAttribute"> diff --git a/WordPress/src/main/res/drawable/indicator_dot_selected.xml b/WordPress/src/main/res/drawable/indicator_dot_selected.xml index 156ea28af881..1abb42a139f0 100644 --- a/WordPress/src/main/res/drawable/indicator_dot_selected.xml +++ b/WordPress/src/main/res/drawable/indicator_dot_selected.xml @@ -6,7 +6,7 @@ android:shape="ring" android:thickness="@dimen/promo_indicator_bullet_size" android:useLevel="false"> - + diff --git a/WordPress/src/main/res/drawable/invites_border.xml b/WordPress/src/main/res/drawable/invites_border.xml index 13d76b114bb5..66dc215638b9 100644 --- a/WordPress/src/main/res/drawable/invites_border.xml +++ b/WordPress/src/main/res/drawable/invites_border.xml @@ -1,6 +1,6 @@ - - + + diff --git a/WordPress/src/main/res/drawable/list_divider.xml b/WordPress/src/main/res/drawable/list_divider.xml index 3ab5e0fc21a8..b77ecc323d91 100644 --- a/WordPress/src/main/res/drawable/list_divider.xml +++ b/WordPress/src/main/res/drawable/list_divider.xml @@ -3,6 +3,6 @@ android:insetLeft="@dimen/margin_extra_large" android:insetRight="@dimen/margin_extra_large"> - + diff --git a/WordPress/src/main/res/drawable/login_shadow.xml b/WordPress/src/main/res/drawable/login_shadow.xml index 83a075757c0f..aad5df31f453 100644 --- a/WordPress/src/main/res/drawable/login_shadow.xml +++ b/WordPress/src/main/res/drawable/login_shadow.xml @@ -1,7 +1,12 @@ - - + + + + + + diff --git a/WordPress/src/main/res/drawable/media_icon_circle.xml b/WordPress/src/main/res/drawable/media_icon_circle.xml index 7efab52b94d1..5b60194b1e16 100644 --- a/WordPress/src/main/res/drawable/media_icon_circle.xml +++ b/WordPress/src/main/res/drawable/media_icon_circle.xml @@ -3,5 +3,5 @@ android:shape="oval"> + android:color="@android:color/white"/> diff --git a/WordPress/src/main/res/drawable/media_item_background.xml b/WordPress/src/main/res/drawable/media_item_background.xml index 1d55a3fb1940..dc34119c1e95 100644 --- a/WordPress/src/main/res/drawable/media_item_background.xml +++ b/WordPress/src/main/res/drawable/media_item_background.xml @@ -1,8 +1,8 @@ - + + android:color="@color/neutral_200" /> diff --git a/WordPress/src/main/res/drawable/media_settings_gradient_scrim.xml b/WordPress/src/main/res/drawable/media_settings_gradient_scrim.xml index d5b25d336bfc..8112a4bc8504 100644 --- a/WordPress/src/main/res/drawable/media_settings_gradient_scrim.xml +++ b/WordPress/src/main/res/drawable/media_settings_gradient_scrim.xml @@ -3,7 +3,7 @@ diff --git a/WordPress/src/main/res/drawable/moderate_button_selector.xml b/WordPress/src/main/res/drawable/moderate_button_selector.xml index 8bb328dfa0bf..9caefbccef30 100644 --- a/WordPress/src/main/res/drawable/moderate_button_selector.xml +++ b/WordPress/src/main/res/drawable/moderate_button_selector.xml @@ -7,22 +7,22 @@ - + - + - + - + diff --git a/WordPress/src/main/res/drawable/nav_bar_button_background.xml b/WordPress/src/main/res/drawable/nav_bar_button_background.xml index 2ab24eb43536..faa9091fdd9d 100644 --- a/WordPress/src/main/res/drawable/nav_bar_button_background.xml +++ b/WordPress/src/main/res/drawable/nav_bar_button_background.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + diff --git a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml index 917de8937f76..daeda889d156 100644 --- a/WordPress/src/main/res/drawable/nav_bar_button_selector.xml +++ b/WordPress/src/main/res/drawable/nav_bar_button_selector.xml @@ -2,7 +2,7 @@ - - + + diff --git a/WordPress/src/main/res/drawable/notifications_list_divider.xml b/WordPress/src/main/res/drawable/notifications_list_divider.xml index 35e8c2c206da..9e8f0289ba2e 100644 --- a/WordPress/src/main/res/drawable/notifications_list_divider.xml +++ b/WordPress/src/main/res/drawable/notifications_list_divider.xml @@ -4,7 +4,7 @@ android:insetRight="@dimen/margin_extra_large"> - + diff --git a/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml b/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml index efaf0ee83845..19dba6c9b995 100644 --- a/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml +++ b/WordPress/src/main/res/drawable/notifications_list_divider_full_width.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml b/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml deleted file mode 100644 index c5a85735c205..000000000000 --- a/WordPress/src/main/res/drawable/nux_flat_button_grey_text_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/nux_primary_button_selector.xml b/WordPress/src/main/res/drawable/nux_primary_button_selector.xml index 669b1f671e63..de11f20e0e67 100644 --- a/WordPress/src/main/res/drawable/nux_primary_button_selector.xml +++ b/WordPress/src/main/res/drawable/nux_primary_button_selector.xml @@ -1,9 +1,9 @@ + android:color="@color/primary_700"> - + diff --git a/WordPress/src/main/res/drawable/people_list_divider.xml b/WordPress/src/main/res/drawable/people_list_divider.xml index 2826aed083d9..93d6768005a5 100644 --- a/WordPress/src/main/res/drawable/people_list_divider.xml +++ b/WordPress/src/main/res/drawable/people_list_divider.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/photo_picker_circle_pressed.xml b/WordPress/src/main/res/drawable/photo_picker_circle_pressed.xml index 86189da649bb..31e6cb803551 100644 --- a/WordPress/src/main/res/drawable/photo_picker_circle_pressed.xml +++ b/WordPress/src/main/res/drawable/photo_picker_circle_pressed.xml @@ -1,6 +1,6 @@ - + diff --git a/WordPress/src/main/res/drawable/photo_picker_circle_selector.xml b/WordPress/src/main/res/drawable/photo_picker_circle_selector.xml index 52d2cb09d64f..7f1e81b990b4 100644 --- a/WordPress/src/main/res/drawable/photo_picker_circle_selector.xml +++ b/WordPress/src/main/res/drawable/photo_picker_circle_selector.xml @@ -2,5 +2,5 @@ - + diff --git a/WordPress/src/main/res/drawable/photo_picker_item_background.xml b/WordPress/src/main/res/drawable/photo_picker_item_background.xml index 3110b5bfb1a6..df320fccae4d 100644 --- a/WordPress/src/main/res/drawable/photo_picker_item_background.xml +++ b/WordPress/src/main/res/drawable/photo_picker_item_background.xml @@ -3,6 +3,6 @@ - + diff --git a/WordPress/src/main/res/drawable/plugin_placeholder.xml b/WordPress/src/main/res/drawable/plugin_placeholder.xml index 669e0c52cd92..e27cd99cbc61 100644 --- a/WordPress/src/main/res/drawable/plugin_placeholder.xml +++ b/WordPress/src/main/res/drawable/plugin_placeholder.xml @@ -1,7 +1,7 @@ - + + android:color="@color/primary_700" /> diff --git a/WordPress/src/main/res/drawable/reader_gap_marker_background.xml b/WordPress/src/main/res/drawable/reader_gap_marker_background.xml index e8852d8932f3..53fa528662cd 100644 --- a/WordPress/src/main/res/drawable/reader_gap_marker_background.xml +++ b/WordPress/src/main/res/drawable/reader_gap_marker_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/WordPress/src/main/res/drawable/reader_image_border.xml b/WordPress/src/main/res/drawable/reader_image_border.xml index f937a147c1dd..3dffe1f28dac 100644 --- a/WordPress/src/main/res/drawable/reader_image_border.xml +++ b/WordPress/src/main/res/drawable/reader_image_border.xml @@ -3,7 +3,7 @@ android:shape="rectangle"> + android:color="@color/divider" /> - + diff --git a/WordPress/src/main/res/drawable/related_posts_divider.xml b/WordPress/src/main/res/drawable/related_posts_divider.xml index 16e006514c7d..45cdafbee64b 100644 --- a/WordPress/src/main/res/drawable/related_posts_divider.xml +++ b/WordPress/src/main/res/drawable/related_posts_divider.xml @@ -4,10 +4,10 @@ xmlns:android="http://schemas.android.com/apk/res/android"> + android:drawable="@color/neutral_0" /> diff --git a/WordPress/src/main/res/drawable/ripple_oval.xml b/WordPress/src/main/res/drawable/ripple_oval.xml index 87a11ae8b8d4..c5855be440e9 100644 --- a/WordPress/src/main/res/drawable/ripple_oval.xml +++ b/WordPress/src/main/res/drawable/ripple_oval.xml @@ -3,7 +3,7 @@ android:color="?android:colorControlHighlight"> - + diff --git a/WordPress/src/main/res/drawable/selectable_background_wordpress.xml b/WordPress/src/main/res/drawable/selectable_background_wordpress.xml deleted file mode 100644 index a93f274a578e..000000000000 --- a/WordPress/src/main/res/drawable/selectable_background_wordpress.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/WordPress/src/main/res/drawable/shape_oval_blue_white_stroke.xml b/WordPress/src/main/res/drawable/shape_oval_blue_white_stroke.xml deleted file mode 100644 index 101f164d599a..000000000000 --- a/WordPress/src/main/res/drawable/shape_oval_blue_white_stroke.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/shape_oval_grey_lighten_10.xml b/WordPress/src/main/res/drawable/shape_oval_grey_lighten_10.xml deleted file mode 100644 index fb0296fa36f0..000000000000 --- a/WordPress/src/main/res/drawable/shape_oval_grey_lighten_10.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/shape_oval_orange.xml b/WordPress/src/main/res/drawable/shape_oval_orange.xml deleted file mode 100644 index 943e969676d3..000000000000 --- a/WordPress/src/main/res/drawable/shape_oval_orange.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/WordPress/src/main/res/drawable/stats_list_item_background.xml b/WordPress/src/main/res/drawable/stats_list_item_background.xml index 5a8c7fcf3b62..ef98074a2f60 100644 --- a/WordPress/src/main/res/drawable/stats_list_item_background.xml +++ b/WordPress/src/main/res/drawable/stats_list_item_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/WordPress/src/main/res/drawable/stats_list_item_child_background.xml b/WordPress/src/main/res/drawable/stats_list_item_child_background.xml index 80d2b3df1236..e8e99d1e04d5 100644 --- a/WordPress/src/main/res/drawable/stats_list_item_child_background.xml +++ b/WordPress/src/main/res/drawable/stats_list_item_child_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml b/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml index 80d2b3df1236..e8e99d1e04d5 100644 --- a/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml +++ b/WordPress/src/main/res/drawable/stats_list_item_expanded_background.xml @@ -2,13 +2,13 @@ - + - + diff --git a/WordPress/src/main/res/drawable/stats_pager_button_blue_light.xml b/WordPress/src/main/res/drawable/stats_pager_button_blue_light.xml index bf378034dda2..fe3c5e92d55a 100644 --- a/WordPress/src/main/res/drawable/stats_pager_button_blue_light.xml +++ b/WordPress/src/main/res/drawable/stats_pager_button_blue_light.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_pager_button_white.xml b/WordPress/src/main/res/drawable/stats_pager_button_white.xml index 638a4ab66b8b..f128e9005f72 100644 --- a/WordPress/src/main/res/drawable/stats_pager_button_white.xml +++ b/WordPress/src/main/res/drawable/stats_pager_button_white.xml @@ -2,14 +2,14 @@ - + - + diff --git a/WordPress/src/main/res/drawable/stats_pagination_item_background.xml b/WordPress/src/main/res/drawable/stats_pagination_item_background.xml index b9c98ee7c1da..cff047f21033 100644 --- a/WordPress/src/main/res/drawable/stats_pagination_item_background.xml +++ b/WordPress/src/main/res/drawable/stats_pagination_item_background.xml @@ -2,14 +2,14 @@ - + + android:color="@android:color/white"/> diff --git a/WordPress/src/main/res/drawable/stats_view_all_button_background.xml b/WordPress/src/main/res/drawable/stats_view_all_button_background.xml index b564667aeddd..0c282674c35d 100644 --- a/WordPress/src/main/res/drawable/stats_view_all_button_background.xml +++ b/WordPress/src/main/res/drawable/stats_view_all_button_background.xml @@ -2,14 +2,14 @@ - + + android:color="@android:color/white"/> diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml index aab007aaeb41..fd1296d4ca40 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_blue_light.xml @@ -2,14 +2,14 @@ - + + android:color="@color/neutral_0"/> diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml index 98cc068f2429..411d5f35cf56 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_blue_light.xml @@ -2,14 +2,14 @@ - + + android:color="@color/neutral_0"/> diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_white.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_white.xml index 3b4653054cad..297ea46d5340 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_white.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_latest_white.xml @@ -2,7 +2,7 @@ - + diff --git a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml index c18df5545cc8..1301136c8cd7 100644 --- a/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml +++ b/WordPress/src/main/res/drawable/stats_visitors_and_views_button_white.xml @@ -2,14 +2,14 @@ - + + android:color="@android:color/white"/> diff --git a/WordPress/src/main/res/drawable/stats_widget_header_background.xml b/WordPress/src/main/res/drawable/stats_widget_header_background.xml index a9fcb0a3ed87..0a8bf2d8a242 100644 --- a/WordPress/src/main/res/drawable/stats_widget_header_background.xml +++ b/WordPress/src/main/res/drawable/stats_widget_header_background.xml @@ -3,7 +3,7 @@ - + diff --git a/WordPress/src/main/res/drawable/tab_divider_wordpress.xml b/WordPress/src/main/res/drawable/tab_divider_wordpress.xml index c5b828e22dd8..a92f4acc0588 100644 --- a/WordPress/src/main/res/drawable/tab_divider_wordpress.xml +++ b/WordPress/src/main/res/drawable/tab_divider_wordpress.xml @@ -1,6 +1,6 @@ - + diff --git a/WordPress/src/main/res/drawable/tag_list_circle.xml b/WordPress/src/main/res/drawable/tag_list_circle.xml index e8ede8c66771..625c114022b4 100644 --- a/WordPress/src/main/res/drawable/tag_list_circle.xml +++ b/WordPress/src/main/res/drawable/tag_list_circle.xml @@ -1,8 +1,8 @@ - + + android:color="@color/primary_400"/> diff --git a/WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml b/WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml deleted file mode 100644 index 8d1d2f5d435c..000000000000 --- a/WordPress/src/main/res/drawable/wp_blue_medium_extra_small_rounded_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml b/WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml deleted file mode 100644 index 61c7004ad983..000000000000 --- a/WordPress/src/main/res/drawable/wp_grey_lighten_30_rounded_bg.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/WordPress/src/main/res/layout-land/login_intro_template_view.xml b/WordPress/src/main/res/layout-land/login_intro_template_view.xml index 310a6e853708..6096c95ef9c9 100644 --- a/WordPress/src/main/res/layout-land/login_intro_template_view.xml +++ b/WordPress/src/main/res/layout-land/login_intro_template_view.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/layout-land/login_signup_screen.xml b/WordPress/src/main/res/layout-land/login_signup_screen.xml index e9e81ac42196..2971e21016bf 100644 --- a/WordPress/src/main/res/layout-land/login_signup_screen.xml +++ b/WordPress/src/main/res/layout-land/login_signup_screen.xml @@ -32,7 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="@color/grey_lighten_30" + android:background="@color/neutral_0" android:orientation="horizontal" android:clipToPadding="false" android:padding="@dimen/margin_large"> diff --git a/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml b/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml index e3c8006b3f65..5fa9e86a1432 100644 --- a/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml +++ b/WordPress/src/main/res/layout-land/new_site_creation_preview_screen.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/wp_grey_lighten_30" + android:background="@color/neutral_50" android:orientation="vertical"> diff --git a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml index 390ecf62e3ca..8752eb0a9822 100644 --- a/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml +++ b/WordPress/src/main/res/layout-sw600dp/theme_grid_cardview_header.xml @@ -29,7 +29,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" - android:textColor="@color/grey" + android:textColor="@color/neutral_300" android:textSize="@dimen/text_sz_small" android:textAllCaps="true" android:text="@string/current_theme" /> @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textStyle="bold" - android:textColor="@color/black" + android:textColor="@android:color/black" android:text="@string/current_theme" /> @@ -53,7 +53,7 @@ + android:background="@color/divider" /> + android:tint="@color/neutral_700" /> @@ -83,7 +83,7 @@ + android:background="@color/divider" /> + android:tint="@color/neutral_700" /> @@ -113,7 +113,7 @@ + android:background="@color/divider" /> + android:tint="@color/neutral_700" /> diff --git a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml index f57a42f9ab9b..fde9f198eb95 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_activity.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_activity.xml @@ -41,7 +41,7 @@ android:id="@+id/ptr_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey_lighten_30" + android:background="@color/neutral_0" app:layout_behavior="@string/appbar_scrolling_view_behavior"> @@ -238,7 +238,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_large" - android:textColor="@color/stats_blue_labels" + android:textColor="@color/neutral" android:gravity="start" android:textAlignment="viewStart" android:textSize="@dimen/text_sz_large" @@ -251,7 +251,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/margin_small" - android:textColor="@color/stats_link_text_color" + android:textColor="@color/link_stats" android:gravity="start" android:textAlignment="viewStart" android:textSize="@dimen/text_sz_small" diff --git a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml index 3e761091cfb4..e1edf30805a8 100644 --- a/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml +++ b/WordPress/src/main/res/layout-sw720dp/stats_insights_all_time_item.xml @@ -29,7 +29,7 @@ android:layout_marginEnd="3dp" android:contentDescription="@null" android:src="@drawable/ic_posts_white_24dp" - android:tint="@color/grey_dark" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> + android:tint="@color/neutral_700" /> + android:tint="@color/warning_500" /> diff --git a/WordPress/src/main/res/layout/activity_log_item_detail.xml b/WordPress/src/main/res/layout/activity_log_item_detail.xml index d1c95bb7160d..215c221a4339 100644 --- a/WordPress/src/main/res/layout/activity_log_item_detail.xml +++ b/WordPress/src/main/res/layout/activity_log_item_detail.xml @@ -29,7 +29,7 @@ android:layout_width="36dp" android:layout_height="36dp" android:layout_marginEnd="12dp" - android:src="@drawable/bg_rectangle_grey_lighten_20_user_32dp" + android:src="@drawable/bg_rectangle_neutral_100_user_32dp" android:contentDescription="@null"/> @@ -68,7 +68,7 @@ android:ellipsize="end" android:lines="1" android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="Administrator"/> @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:ignore="RelativeOverlap" tools:text="January 8, 2018"/> @@ -94,7 +94,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="@style/Base.TextAppearance.AppCompat.Caption" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:ignore="RelativeOverlap" tools:text="11:32 PM"/> @@ -106,7 +106,7 @@ android:layout_height="wrap_content" android:layout_marginTop="24dp" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:linksClickable="true" tools:text="Jetpack by WordPress.com autoupdated to 5.6" android:focusable="true"/> @@ -117,7 +117,7 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_darken_10" + android:textColor="@color/neutral_400" tools:text="Plugin autoupdated"/> + android:tint="@color/primary_400"/> + android:textColor="@color/primary_400"/> diff --git a/WordPress/src/main/res/layout/activity_log_list_event_item.xml b/WordPress/src/main/res/layout/activity_log_list_event_item.xml index 2d458d9d38cd..a7ded1d9637d 100644 --- a/WordPress/src/main/res/layout/activity_log_list_event_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_event_item.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/activity_content_container" - android:background="@color/white" + android:background="@android:color/white" android:clickable="true" android:focusable="true" android:layout_height="wrap_content" @@ -26,7 +26,7 @@ android:layout_margin="@dimen/activity_log_icon_margin" android:layout_width="@dimen/activity_log_icon_size" android:padding="@dimen/margin_medium" - tools:background="@drawable/shape_oval_grey" + tools:background="@drawable/bg_oval_neutral_300" tools:src="@drawable/ic_comment_white_24dp" > @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:padding="@dimen/activity_log_icon_margin" android:src="@drawable/ic_history_white_24dp" - android:tint="@color/blue_wordpress" > + android:tint="@color/primary_500" > @@ -74,7 +74,7 @@ android:layout_width="wrap_content" android:singleLine="true" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" - android:textColor="@color/grey_darken_10" + android:textColor="@color/neutral_400" tools:text="Comment posted" > diff --git a/WordPress/src/main/res/layout/activity_log_list_footer_item.xml b/WordPress/src/main/res/layout/activity_log_list_footer_item.xml index 033761a82161..e5de8d088560 100644 --- a/WordPress/src/main/res/layout/activity_log_list_footer_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_footer_item.xml @@ -10,5 +10,5 @@ android:padding="@dimen/margin_extra_large" android:text="@string/activity_log_limited_content_on_free_plan" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" - android:textColor="@color/grey_darken_20" > + android:textColor="@color/neutral_500" > diff --git a/WordPress/src/main/res/layout/activity_log_list_header_item.xml b/WordPress/src/main/res/layout/activity_log_list_header_item.xml index 25c4660f4a3b..ff76cf38161d 100644 --- a/WordPress/src/main/res/layout/activity_log_list_header_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_header_item.xml @@ -13,6 +13,6 @@ android:paddingStart="@dimen/margin_extra_large" android:paddingTop="@dimen/margin_large" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body2" - android:textColor="@color/grey_darken_20" + android:textColor="@color/neutral_500" tools:text="Now" > diff --git a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml index c617324f51d4..45ef6f505c5d 100644 --- a/WordPress/src/main/res/layout/activity_log_list_progress_item.xml +++ b/WordPress/src/main/res/layout/activity_log_list_progress_item.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/activity_content_container" - android:background="@color/white" + android:background="@android:color/white" android:clickable="true" android:focusable="true" android:layout_height="wrap_content" @@ -19,7 +19,7 @@ @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:singleLine="true" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" - android:textColor="@color/grey_darken_10" + android:textColor="@color/neutral_400" tools:text="Rewind in progress" > @@ -79,7 +79,7 @@ @@ -43,7 +43,7 @@ android:layout_below="@id/category_name" android:layout_marginTop="20dp" android:text="@string/category_parent" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textStyle="bold" android:labelFor="@+id/parent_category" android:textSize="@dimen/text_sz_large" @@ -57,7 +57,7 @@ android:layout_height="wrap_content" android:layout_below="@id/parentDescLabel" android:layout_marginBottom="@dimen/margin_large" - android:textColor="@color/grey_darken_20" + android:textColor="@color/neutral_500" android:textSize="@dimen/text_sz_large" tools:listitem="@layout/wp_simple_list_item_1" android:paddingStart="0dp" diff --git a/WordPress/src/main/res/layout/categories_row.xml b/WordPress/src/main/res/layout/categories_row.xml index 57c46632570d..a6ed1d7359bb 100644 --- a/WordPress/src/main/res/layout/categories_row.xml +++ b/WordPress/src/main/res/layout/categories_row.xml @@ -13,10 +13,10 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:checkMark="@drawable/category_checkmark" - android:checkMarkTint="@color/grey_text_min" + android:checkMarkTint="@color/neutral" android:gravity="center_vertical" android:orientation="vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="Pony Category" /> diff --git a/WordPress/src/main/res/layout/categories_row_parent.xml b/WordPress/src/main/res/layout/categories_row_parent.xml index 56c4f0f1acb9..926836533afd 100644 --- a/WordPress/src/main/res/layout/categories_row_parent.xml +++ b/WordPress/src/main/res/layout/categories_row_parent.xml @@ -15,7 +15,7 @@ android:gravity="center_vertical" android:orientation="vertical" android:textSize="@dimen/text_sz_large" - android:textColor="@color/grey_darken_20" + android:textColor="@color/neutral_500" android:paddingStart="4dp" android:paddingEnd="4dp"/> diff --git a/WordPress/src/main/res/layout/comment_action_footer.xml b/WordPress/src/main/res/layout/comment_action_footer.xml index 0eb44667f7e6..a94d6c66b15e 100644 --- a/WordPress/src/main/res/layout/comment_action_footer.xml +++ b/WordPress/src/main/res/layout/comment_action_footer.xml @@ -4,7 +4,7 @@ android:id="@+id/layout_buttons" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@android:color/white" android:orientation="vertical"> + android:tint="@color/neutral"/> + android:tint="@color/neutral"/> + android:tint="@color/neutral"/> + android:tint="@color/neutral"/> + android:tint="@color/neutral"/> + android:background="@color/neutral_0"> @@ -47,7 +47,7 @@ android:background="?android:selectableItemBackground" android:ellipsize="end" android:maxLines="1" - android:textColor="@color/reader_hyperlink" + android:textColor="@color/link_reader" android:textSize="@dimen/text_sz_extra_large" tools:text="text_name" android:textAlignment="viewStart" @@ -65,7 +65,7 @@ android:maxLines="1" android:paddingBottom="@dimen/margin_extra_small" android:paddingTop="@dimen/margin_extra_small" - android:textColor="@color/grey_darken_10" + android:textColor="@color/neutral_400" android:textSize="@dimen/text_sz_large" tools:text="text_post_title" android:textAlignment="viewStart" @@ -113,9 +113,9 @@ android:layout_height="wrap_content" android:paddingTop="@dimen/margin_large" android:paddingBottom="@dimen/margin_large" - android:textColor="@color/grey_dark" - android:textColorLink="@color/reader_hyperlink" - android:background="@color/white" + android:textColor="@color/neutral_700" + android:textColorLink="@color/link_reader" + android:background="@android:color/white" android:textIsSelectable="false" android:textSize="@dimen/text_sz_large" android:fontFamily="serif" diff --git a/WordPress/src/main/res/layout/comment_edit_activity.xml b/WordPress/src/main/res/layout/comment_edit_activity.xml index cc5bdfae1836..6d359257df9e 100644 --- a/WordPress/src/main/res/layout/comment_edit_activity.xml +++ b/WordPress/src/main/res/layout/comment_edit_activity.xml @@ -6,7 +6,7 @@ android:clipToPadding="false" android:paddingBottom="@dimen/margin_large" android:paddingTop="@dimen/margin_large" - android:background="@color/white" + android:background="@android:color/white" android:scrollbarStyle="outsideInset" android:paddingStart="@dimen/margin_extra_large" android:paddingEnd="@dimen/margin_extra_large"> @@ -31,7 +31,7 @@ android:inputType="textCapSentences|textAutoCorrect|textMultiLine" android:minLines="4" android:typeface="serif" - android:textColorLink="@color/reader_hyperlink" /> + android:textColorLink="@color/link_reader" /> diff --git a/WordPress/src/main/res/layout/comment_listitem.xml b/WordPress/src/main/res/layout/comment_listitem.xml index 047a482ede6b..da9ac071bb40 100644 --- a/WordPress/src/main/res/layout/comment_listitem.xml +++ b/WordPress/src/main/res/layout/comment_listitem.xml @@ -33,7 +33,7 @@ android:id="@+id/image_checkmark" android:layout_width="@dimen/notifications_avatar_sz" android:layout_height="@dimen/notifications_avatar_sz" - android:background="@drawable/shape_oval_blue" + android:background="@drawable/bg_oval_primary_400" android:padding="@dimen/margin_medium" android:src="@drawable/ic_checkmark_white_24dp" android:contentDescription="@string/comment_checkmark_desc" @@ -78,7 +78,7 @@ android:ellipsize="end" android:lines="2" android:maxLines="2" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:text="title" android:textAlignment="viewStart" @@ -94,7 +94,7 @@ android:layout_marginTop="@dimen/margin_extra_small" android:ellipsize="end" android:maxLines="2" - android:textColor="@color/grey_text_min" + android:textColor="@color/neutral" android:importantForAccessibility="no" android:textSize="@dimen/text_sz_medium" tools:text="comment" diff --git a/WordPress/src/main/res/layout/detail_list_preference.xml b/WordPress/src/main/res/layout/detail_list_preference.xml index 22ff49b518c3..17ecd87e5cf0 100644 --- a/WordPress/src/main/res/layout/detail_list_preference.xml +++ b/WordPress/src/main/res/layout/detail_list_preference.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="@color/white" + android:background="@android:color/white" android:paddingStart="@dimen/dlp_padding_start" android:paddingEnd="@dimen/dlp_padding_end" android:paddingTop="@dimen/dlp_padding_top" @@ -16,7 +16,7 @@ android:focusable="true" > @@ -50,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:textSize="@dimen/text_sz_small" - android:textColor="@color/grey_text_min" + android:textColor="@color/neutral" android:gravity="start" android:textAlignment="viewStart" tools:text="Detail Text" /> diff --git a/WordPress/src/main/res/layout/detail_list_preference_title.xml b/WordPress/src/main/res/layout/detail_list_preference_title.xml index c7aba6ef58d7..1564ed1db2df 100644 --- a/WordPress/src/main/res/layout/detail_list_preference_title.xml +++ b/WordPress/src/main/res/layout/detail_list_preference_title.xml @@ -2,7 +2,7 @@ @@ -77,7 +77,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="@dimen/default_dialog_button_height" android:minWidth="@dimen/min_touch_target_sz" - android:textColor="@color/color_accent" + android:textColor="@color/accent" android:visibility="gone" tools:text="Not now" tools:visibility="visible"> @@ -92,7 +92,7 @@ android:fontFamily="sans-serif-medium" android:minHeight="@dimen/default_dialog_button_height" android:minWidth="@dimen/min_touch_target_sz" - android:textColor="@color/color_accent" + android:textColor="@color/accent" android:visibility="gone" tools:text="Never ever" tools:visibility="visible"> diff --git a/WordPress/src/main/res/layout/edit_post_preview_fragment.xml b/WordPress/src/main/res/layout/edit_post_preview_fragment.xml index 6b41246fab78..c0ff4411d47f 100644 --- a/WordPress/src/main/res/layout/edit_post_preview_fragment.xml +++ b/WordPress/src/main/res/layout/edit_post_preview_fragment.xml @@ -4,7 +4,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white"> + android:background="@android:color/white"> + android:background="@color/background_default"> + tools:background="@android:color/white"> + android:background="@color/neutral_100" /> @@ -34,6 +34,6 @@ android:layout_height="1dp" android:layout_gravity="center_vertical" android:layout_weight="1" - android:background="@color/grey_lighten_20" /> + android:background="@color/neutral_100" /> diff --git a/WordPress/src/main/res/layout/filter_spinner_item.xml b/WordPress/src/main/res/layout/filter_spinner_item.xml index 26c918502849..2ab8bd9f64e3 100644 --- a/WordPress/src/main/res/layout/filter_spinner_item.xml +++ b/WordPress/src/main/res/layout/filter_spinner_item.xml @@ -10,7 +10,7 @@ android:drawableRight="@drawable/ic_dropdown_blue_light_24dp" android:textAlignment="viewStart" android:gravity="start" - android:textColor="@color/white" + android:textColor="@android:color/white" tools:ignore="RtlHardcoded" tools:text="spinner item" > diff --git a/WordPress/src/main/res/layout/followed_sites_dialog.xml b/WordPress/src/main/res/layout/followed_sites_dialog.xml index 1642a493447b..6297c8059fc3 100644 --- a/WordPress/src/main/res/layout/followed_sites_dialog.xml +++ b/WordPress/src/main/res/layout/followed_sites_dialog.xml @@ -11,7 +11,7 @@ @@ -66,7 +66,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_switch" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:theme="@style/SwitchBlueMedium" tools:checked="true" @@ -92,7 +92,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_instantly" android:textAlignment="viewEnd" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" tools:checked="true" style="@style/TextAppearance.AppCompat.Body2" > @@ -108,7 +108,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_daily" android:textAlignment="viewEnd" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" style="@style/TextAppearance.AppCompat.Body2" > @@ -123,7 +123,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_posts_weekly" android:textAlignment="viewEnd" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" style="@style/TextAppearance.AppCompat.Body2" > @@ -148,7 +148,7 @@ android:paddingTop="@dimen/margin_large" android:text="@string/notification_settings_followed_dialog_email_comments" android:textAlignment="viewStart" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large" android:theme="@style/SwitchBlueMedium" style="@style/TextAppearance.AppCompat.Body2" > diff --git a/WordPress/src/main/res/layout/help_activity.xml b/WordPress/src/main/res/layout/help_activity.xml index 8d6883a6622c..d9c02dd4a8be 100644 --- a/WordPress/src/main/res/layout/help_activity.xml +++ b/WordPress/src/main/res/layout/help_activity.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/background_grey"> + android:background="@color/background_default"> + android:textColor="@color/neutral_400"/> @@ -49,7 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/support_contact_email" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_large"/> diff --git a/WordPress/src/main/res/layout/history_detail_container_fragment.xml b/WordPress/src/main/res/layout/history_detail_container_fragment.xml index f841388e9168..0ed7c78b525d 100644 --- a/WordPress/src/main/res/layout/history_detail_container_fragment.xml +++ b/WordPress/src/main/res/layout/history_detail_container_fragment.xml @@ -12,7 +12,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:background="@color/white"> + android:background="@android:color/white"> + android:tint="@color/neutral_700_neutral_200_selector" > @@ -63,9 +63,9 @@ android:layout_marginEnd="@dimen/margin_small_medium" android:layout_marginStart="@dimen/margin_small_medium" android:drawablePadding="@dimen/margin_small" - android:drawableStart="@drawable/bg_oval_alert_red_minus_white_16dp" + android:drawableStart="@drawable/bg_oval_error_500_minus_white_16dp" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" - android:textColor="@color/grey_darken_10" + android:textColor="@color/neutral_400" android:visibility="gone" tools:text="1" tools:visibility="visible"> @@ -86,7 +86,7 @@ android:minWidth="@dimen/min_touch_target_sz" android:padding="@dimen/margin_extra_large" android:src="@drawable/ic_chevron_right_white_24dp" - android:tint="@color/grey_dark_grey_lighten_10_selector" > + android:tint="@color/neutral_700_neutral_200_selector" > @@ -104,7 +104,7 @@ android:layout_height="wrap_content" android:layout_above="@+id/bottom_bar" android:layout_alignParentTop="true" - android:background="@color/white" + android:background="@android:color/white" android:fillViewport="true" android:visibility="gone"> @@ -122,7 +122,7 @@ android:freezesText="true" android:lineSpacingExtra="@dimen/spacing_extra_title" android:padding="@dimen/margin_extra_large" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/aztec_title_size" android:textStyle="bold"/> @@ -165,7 +165,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/list_divider_height" android:layout_above="@+id/bottom_bar" - android:background="@color/grey_lighten_30"> + android:background="@color/neutral_0"> diff --git a/WordPress/src/main/res/layout/history_detail_fragment.xml b/WordPress/src/main/res/layout/history_detail_fragment.xml index 2662edd9f9a4..5673167afa33 100644 --- a/WordPress/src/main/res/layout/history_detail_fragment.xml +++ b/WordPress/src/main/res/layout/history_detail_fragment.xml @@ -2,7 +2,7 @@ @@ -57,7 +57,7 @@ android:paddingStart="@dimen/margin_extra_large" android:paddingTop="@dimen/margin_extra_large" android:scrollbars="vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textIsSelectable="true" android:textSize="@dimen/text_sz_post_content" > diff --git a/WordPress/src/main/res/layout/history_list_footer.xml b/WordPress/src/main/res/layout/history_list_footer.xml index bd56e3359ae5..d7a7f770ca8c 100644 --- a/WordPress/src/main/res/layout/history_list_footer.xml +++ b/WordPress/src/main/res/layout/history_list_footer.xml @@ -12,6 +12,6 @@ android:minHeight="?attr/listPreferredItemHeight" android:padding="@dimen/margin_extra_large" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" - android:textColor="@color/grey_darken_20" + android:textColor="@color/neutral_500" tools:text="Post Created on September 19, 2018 at 8:51am" > diff --git a/WordPress/src/main/res/layout/history_list_header.xml b/WordPress/src/main/res/layout/history_list_header.xml index 86159ceec8d1..b120937eacf5 100644 --- a/WordPress/src/main/res/layout/history_list_header.xml +++ b/WordPress/src/main/res/layout/history_list_header.xml @@ -13,6 +13,6 @@ android:paddingStart="@dimen/margin_extra_large" android:paddingTop="@dimen/margin_large" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body2" - android:textColor="@color/grey_darken_20" + android:textColor="@color/neutral_500" tools:text="Today" > diff --git a/WordPress/src/main/res/layout/history_list_item.xml b/WordPress/src/main/res/layout/history_list_item.xml index 1d25fe3b5b0a..77e87e112bae 100644 --- a/WordPress/src/main/res/layout/history_list_item.xml +++ b/WordPress/src/main/res/layout/history_list_item.xml @@ -3,15 +3,14 @@ + tools:layout_height="?attr/listPreferredItemHeightLarge"> + android:src="@drawable/bg_oval_neutral_300_user_32dp" > @@ -88,7 +87,7 @@ android:singleLine="true" android:textAlignment="viewStart" android:textAppearance="@style/Base.TextAppearance.AppCompat.Subhead" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" tools:text="1d ago" > @@ -99,7 +98,7 @@ android:layout_width="wrap_content" android:singleLine="true" android:textAppearance="@style/Base.TextAppearance.AppCompat.Body1" - android:textColor="@color/grey_darken_10" + android:textColor="@color/neutral_400" tools:text="Draft" > diff --git a/WordPress/src/main/res/layout/home_row.xml b/WordPress/src/main/res/layout/home_row.xml index 269d09c777b7..718f44fcccb8 100644 --- a/WordPress/src/main/res/layout/home_row.xml +++ b/WordPress/src/main/res/layout/home_row.xml @@ -54,7 +54,7 @@ android:singleLine="true" android:text="@string/blogusername" android:textColor="#666666" - android:textColorLink="@color/blue_wordpress" + android:textColorLink="@color/primary_500" android:textSize="12sp" /> diff --git a/WordPress/src/main/res/layout/insert_media_dialog.xml b/WordPress/src/main/res/layout/insert_media_dialog.xml index cb7dce92a0ed..79185e4cd659 100644 --- a/WordPress/src/main/res/layout/insert_media_dialog.xml +++ b/WordPress/src/main/res/layout/insert_media_dialog.xml @@ -85,7 +85,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical|end" - android:tint="@color/grey_darken_10" + android:tint="@color/neutral_400" android:contentDescription="@null" tools:src="@drawable/gallery_icon_thumbnailgrid" android:layout_marginEnd="@dimen/margin_extra_large"/> diff --git a/WordPress/src/main/res/layout/invite_username_button.xml b/WordPress/src/main/res/layout/invite_username_button.xml index 7f781482556c..81ae9aeda294 100644 --- a/WordPress/src/main/res/layout/invite_username_button.xml +++ b/WordPress/src/main/res/layout/invite_username_button.xml @@ -14,7 +14,7 @@ android:layout_weight="1" android:layout_gravity="center_vertical" android:gravity="center_vertical" - android:textColor="@color/grey_dark" + android:textColor="@color/neutral_700" android:textSize="@dimen/text_sz_medium" android:layout_marginEnd="5dp"/> @@ -26,5 +26,5 @@ android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/remove" android:src="@drawable/ic_cross_white_24dp" - android:tint="@color/grey_600"/> + android:tint="@color/gray_600"/> diff --git a/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml b/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml index eb85412a85b2..0d9f5003d818 100644 --- a/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml +++ b/WordPress/src/main/res/layout/jetpack_remote_install_fragment.xml @@ -26,7 +26,7 @@ android:layout_marginTop="@dimen/margin_extra_large" android:contentDescription="@string/content_description_people_looking_charts" android:src="@drawable/ic_plans_white_24dp" - android:tint="@color/jetpack_green"/> + android:tint="@color/jetpack"/> @@ -31,7 +31,7 @@ android:id="@+id/learn_more_caption" android:layout_height="wrap_content" android:layout_width="match_parent" - android:textColor="@color/calypso_title_text" + android:textColor="@color/neutral_700_neutral_200_selector" android:visibility="invisible" tools:text="Learn more text" tools:visibility="visible" @@ -48,7 +48,7 @@ android:layout_marginBottom="@dimen/margin_extra_small" android:layout_marginTop="@dimen/margin_extra_small" android:layout_width="wrap_content" - android:textColor="@color/color_primary" + android:textColor="@color/primary" android:visibility="gone" tools:text="@string/learn_more" tools:visibility="visible" diff --git a/WordPress/src/main/res/layout/learn_more_pref_old.xml b/WordPress/src/main/res/layout/learn_more_pref_old.xml index d81b9d50282c..3ed7260f8e99 100644 --- a/WordPress/src/main/res/layout/learn_more_pref_old.xml +++ b/WordPress/src/main/res/layout/learn_more_pref_old.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:visibility="gone" android:textSize="@dimen/text_sz_small" - android:textColor="@color/grey_darken_10" /> + android:textColor="@color/neutral_400" />