Dbrant has uploaded a new change for review. https://gerrit.wikimedia.org/r/192916
Change subject: [WIP] Dark toolbar with white icons. ...................................................................... [WIP] Dark toolbar with white icons. - Switch to a dark toolbar with white icons in both light and dark theme. - Update theme styles to be more consistent and sane. - Fade in the status-bar color on 5.0+ devices in articles with a lead image, and make it the same as the toolbar color in articles with no lead image. - Slightly decrease the height of the background gradient of the toolbar, and make the gradient less dark. - Make the default window background color fully white, instead of slightly off-white. Change-Id: I64a345ba43e47cc7e8d824b09752c8037a3462d8 --- A icon-svgs/24/ic_close.noflip.svg M icon-svgs/24/ic_delete.noflip.svg A icon-svgs/24/ic_more_vert.noflip.svg M icon-svgs/24/ic_refresh.svg M icon-svgs/24/ic_search.svg M icon-svgs/24/ic_toc.svg A wikipedia/res/drawable-hdpi/ic_close.png M wikipedia/res/drawable-hdpi/ic_delete.png A wikipedia/res/drawable-hdpi/ic_more_vert.png M wikipedia/res/drawable-hdpi/ic_refresh.png M wikipedia/res/drawable-hdpi/ic_search.png M wikipedia/res/drawable-hdpi/ic_toc.png A wikipedia/res/drawable-ldpi/ic_close.png M wikipedia/res/drawable-ldpi/ic_delete.png A wikipedia/res/drawable-ldpi/ic_more_vert.png M wikipedia/res/drawable-ldpi/ic_refresh.png M wikipedia/res/drawable-ldpi/ic_search.png M wikipedia/res/drawable-ldpi/ic_toc.png M wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png M wikipedia/res/drawable-ldrtl-hdpi/ic_search.png M wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png M wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png M wikipedia/res/drawable-ldrtl-ldpi/ic_search.png M wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png M wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png M wikipedia/res/drawable-ldrtl-mdpi/ic_search.png M wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png M wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png M wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png M wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png M wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png M wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png M wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png A wikipedia/res/drawable-mdpi/ic_close.png M wikipedia/res/drawable-mdpi/ic_delete.png A wikipedia/res/drawable-mdpi/ic_more_vert.png M wikipedia/res/drawable-mdpi/ic_refresh.png M wikipedia/res/drawable-mdpi/ic_search.png M wikipedia/res/drawable-mdpi/ic_toc.png A wikipedia/res/drawable-xhdpi/ic_close.png M wikipedia/res/drawable-xhdpi/ic_delete.png A wikipedia/res/drawable-xhdpi/ic_more_vert.png M wikipedia/res/drawable-xhdpi/ic_refresh.png M wikipedia/res/drawable-xhdpi/ic_search.png M wikipedia/res/drawable-xhdpi/ic_toc.png A wikipedia/res/drawable-xxhdpi/ic_close.png M wikipedia/res/drawable-xxhdpi/ic_delete.png A wikipedia/res/drawable-xxhdpi/ic_more_vert.png M wikipedia/res/drawable-xxhdpi/ic_refresh.png M wikipedia/res/drawable-xxhdpi/ic_search.png M wikipedia/res/drawable-xxhdpi/ic_toc.png R wikipedia/res/drawable/search_bar_shape.xml D wikipedia/res/drawable/search_bar_shape_light.xml R wikipedia/res/drawable/toolbar_lead_gradient.xml D wikipedia/res/drawable/toolbar_lead_gradient_light.xml M wikipedia/res/layout/activity_gallery.xml M wikipedia/res/layout/activity_main.xml M wikipedia/res/layout/group_find_in_page.xml M wikipedia/res/values/attrs.xml M wikipedia/res/values/colors.xml M wikipedia/res/values/strings.xml M wikipedia/res/values/styles.xml M wikipedia/res/values/styles_wikidark.xml M wikipedia/res/values/styles_wikilight.xml M wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java M wikipedia/src/main/java/org/wikipedia/page/FindInPageActionProvider.java M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java M wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java M wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java M wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java M wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java 74 files changed, 274 insertions(+), 92 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia refs/changes/16/192916/1 diff --git a/icon-svgs/24/ic_close.noflip.svg b/icon-svgs/24/ic_close.noflip.svg new file mode 100644 index 0000000..03a5087 --- /dev/null +++ b/icon-svgs/24/ic_close.noflip.svg @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="32px" + height="32px" + viewBox="290 380.312 32 32" + enable-background="new 290 380.312 32 32" + xml:space="preserve" + inkscape:version="0.91 r13725" + sodipodi:docname="ic_close.noflip.svg"><metadata + id="metadata9"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /></cc:Work></rdf:RDF></metadata><defs + id="defs7" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="686" + inkscape:window-height="480" + id="namedview5" + showgrid="false" + inkscape:zoom="7.375" + inkscape:cx="16" + inkscape:cy="16" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:current-layer="Layer_1" /><path + fill="#333333" + d="M313.222,406.714l-7.33-7.33l-7.33,7.33l-1.132-1.132c-1.078-1.078-1.078-2.749,0-3.827l5.389-5.443 l-7.06-7.06l3.018-3.018l7.06,7.06l7.33-7.384l1.132,1.132c1.078,1.078,1.078,2.749,0,3.827l-5.443,5.443l7.384,7.384 L313.222,406.714z" + id="path3" + style="fill:#ffffff;fill-opacity:1" /></svg> \ No newline at end of file diff --git a/icon-svgs/24/ic_delete.noflip.svg b/icon-svgs/24/ic_delete.noflip.svg index 5229822..8916360 100644 --- a/icon-svgs/24/ic_delete.noflip.svg +++ b/icon-svgs/24/ic_delete.noflip.svg @@ -12,7 +12,7 @@ viewBox="0 0 24 24" id="svg3284" version="1.1" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="ic_delete.noflip.svg"> <metadata id="metadata3292"> @@ -36,7 +36,7 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="640" + inkscape:window-width="686" inkscape:window-height="480" id="namedview3288" showgrid="false" @@ -50,6 +50,6 @@ <path d="m 6,19 c 0,1.1 0.9,2 2,2 l 8,0 c 1.1,0 2,-0.9 2,-2 L 18,7 6,7 6,19 z M 19,4 15.5,4 14.5,3 9.5,3 8.5,4 5,4 5,6 19,6 19,4 z" id="path3286" - style="fill:#333333;fill-opacity:0.6" + style="fill:#ffffff;fill-opacity:1" inkscape:connector-curvature="0" /> </svg> diff --git a/icon-svgs/24/ic_more_vert.noflip.svg b/icon-svgs/24/ic_more_vert.noflip.svg new file mode 100644 index 0000000..51f5335 --- /dev/null +++ b/icon-svgs/24/ic_more_vert.noflip.svg @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + width="24" + height="24" + viewBox="0 0 24 24" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="ic_more_vert.noflip.svg"> + <metadata + id="metadata12"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs10" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1334" + inkscape:window-height="952" + id="namedview8" + showgrid="false" + inkscape:zoom="55.625733" + inkscape:cx="8.806052" + inkscape:cy="11.198661" + inkscape:window-x="359" + inkscape:window-y="15" + inkscape:window-maximized="0" + inkscape:current-layer="svg2" /> + <path + d="M0 0h24v24h-24z" + fill="none" + id="path4" /> + <path + d="m 12,8 c 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 -1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 z m 0,2 c -1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 z m 0,6 c -1.1,0 -2,0.9 -2,2 0,1.1 0.9,2 2,2 1.1,0 2,-0.9 2,-2 0,-1.1 -0.9,-2 -2,-2 z" + id="path6" + style="fill:#ffffff;fill-opacity:1" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssssssssssssss" /> +</svg> diff --git a/icon-svgs/24/ic_refresh.svg b/icon-svgs/24/ic_refresh.svg index b01010a..1b2301f 100644 --- a/icon-svgs/24/ic_refresh.svg +++ b/icon-svgs/24/ic_refresh.svg @@ -12,7 +12,7 @@ viewBox="0 0 24 24" id="svg3332" version="1.1" - inkscape:version="0.48.5 r10040" + inkscape:version="0.91 r13725" sodipodi:docname="ic_refresh.svg"> <metadata id="metadata3340"> @@ -36,7 +36,7 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="640" + inkscape:window-width="686" inkscape:window-height="480" id="namedview3336" showgrid="false" @@ -50,6 +50,6 @@ <path d="M 17.65,6.35 C 16.2,4.9 14.21,4 12,4 7.58,4 4.01,7.58 4.01,12 c 0,4.42 3.57,8 7.99,8 3.73,0 6.84,-2.55 7.73,-6 l -2.08,0 C 16.83,16.33 14.61,18 12,18 8.69,18 6,15.31 6,12 6,8.69 8.69,6 12,6 c 1.66,0 3.14,0.69 4.22,1.78 L 13,11 l 7,0 0,-7 -2.35,2.35 z" id="path3334" - style="fill:#333333;fill-opacity:0.6" + style="fill:#ffffff;fill-opacity:1" inkscape:connector-curvature="0" /> </svg> diff --git a/icon-svgs/24/ic_search.svg b/icon-svgs/24/ic_search.svg index a2cadc6..f022dbd 100644 --- a/icon-svgs/24/ic_search.svg +++ b/icon-svgs/24/ic_search.svg @@ -12,8 +12,8 @@ viewBox="0 0 24 24" id="svg3072" version="1.1" - inkscape:version="0.48.5 r10040" - sodipodi:docname="ic_search_24.svg"> + inkscape:version="0.91 r13725" + sodipodi:docname="ic_search.svg"> <metadata id="metadata3080"> <rdf:RDF> @@ -22,7 +22,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> @@ -37,7 +37,7 @@ guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:window-width="640" + inkscape:window-width="686" inkscape:window-height="480" id="namedview3076" showgrid="false" @@ -51,6 +51,6 @@ <path d="m 15.5,14 -0.79,0 -0.28,-0.27 C 15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3 5.91,3 3,5.91 3,9.5 3,13.09 5.91,16 9.5,16 c 1.61,0 3.09,-0.59 4.23,-1.57 L 14,14.71 14,15.5 19,20.49 20.49,19 15.5,14 z m -6,0 C 7.01,14 5,11.99 5,9.5 5,7.01 7.01,5 9.5,5 11.99,5 14,7.01 14,9.5 14,11.99 11.99,14 9.5,14 z" id="path3074" - style="fill:#333333;fill-opacity:0.6" + style="fill:#ffffff;fill-opacity:1" inkscape:connector-curvature="0" /> </svg> diff --git a/icon-svgs/24/ic_toc.svg b/icon-svgs/24/ic_toc.svg index 36b5158..705cd23 100644 --- a/icon-svgs/24/ic_toc.svg +++ b/icon-svgs/24/ic_toc.svg @@ -1 +1,48 @@ -<svg xmlns="http://www.w3.org/2000/svg"; width="24" height="24" viewBox="0 0 24 24"><path d="M3 9h14V7H3v2zm0 4h14v-2H3v2zm0 4h14v-2H3v2zm16 0h2v-2h-2v2zm0-10v2h2V7h-2zm0 6h2v-2h-2v2z" style="fill:#333333;fill-opacity:0.6"/></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 17.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/"; + xmlns:cc="http://creativecommons.org/ns#"; + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; + xmlns:svg="http://www.w3.org/2000/svg"; + xmlns="http://www.w3.org/2000/svg"; + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"; + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"; + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="24px" + height="24px" + viewBox="0 0 24 24" + enable-background="new 0 0 24 24" + xml:space="preserve" + inkscape:version="0.91 r13725" + sodipodi:docname="ic_actionbar_toc.svg"><metadata + id="metadata9"><rdf:RDF><cc:Work + rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage"; /></cc:Work></rdf:RDF></metadata><defs + id="defs7" /><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="686" + inkscape:window-height="480" + id="namedview5" + showgrid="false" + inkscape:zoom="9.8333333" + inkscape:cx="12" + inkscape:cy="12" + inkscape:window-x="688" + inkscape:window-y="62" + inkscape:window-maximized="0" + inkscape:current-layer="Layer_1" /><path + d="M19,2H5C3.895,2,3,2.895,3,4v16c0,1.105,0.895,2,2,2h14c1.105,0,2-0.895,2-2V4C21,2.895,20.105,2,19,2z M12,20H5V4h7V20z M18.458,17.5h-4v-2h4V17.5z M18.458,12.5h-4v-2h4V12.5z M18.458,7.5h-4v-2h4V7.5z" + id="path3" + style="fill:#ffffff;fill-opacity:1" /></svg> \ No newline at end of file diff --git a/wikipedia/res/drawable-hdpi/ic_close.png b/wikipedia/res/drawable-hdpi/ic_close.png new file mode 100644 index 0000000..64a00f3 --- /dev/null +++ b/wikipedia/res/drawable-hdpi/ic_close.png Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_delete.png b/wikipedia/res/drawable-hdpi/ic_delete.png index 5e4f2b7..1ee8b3e 100644 --- a/wikipedia/res/drawable-hdpi/ic_delete.png +++ b/wikipedia/res/drawable-hdpi/ic_delete.png Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_more_vert.png b/wikipedia/res/drawable-hdpi/ic_more_vert.png new file mode 100644 index 0000000..7315c10 --- /dev/null +++ b/wikipedia/res/drawable-hdpi/ic_more_vert.png Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_refresh.png b/wikipedia/res/drawable-hdpi/ic_refresh.png index 75958f8..97ca742 100644 --- a/wikipedia/res/drawable-hdpi/ic_refresh.png +++ b/wikipedia/res/drawable-hdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_search.png b/wikipedia/res/drawable-hdpi/ic_search.png index eba9241..ff06b21 100644 --- a/wikipedia/res/drawable-hdpi/ic_search.png +++ b/wikipedia/res/drawable-hdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-hdpi/ic_toc.png b/wikipedia/res/drawable-hdpi/ic_toc.png index 482ca84..b64ff6a 100644 --- a/wikipedia/res/drawable-hdpi/ic_toc.png +++ b/wikipedia/res/drawable-hdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_close.png b/wikipedia/res/drawable-ldpi/ic_close.png new file mode 100644 index 0000000..8390113 --- /dev/null +++ b/wikipedia/res/drawable-ldpi/ic_close.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_delete.png b/wikipedia/res/drawable-ldpi/ic_delete.png index 33177a0..beb5f08 100644 --- a/wikipedia/res/drawable-ldpi/ic_delete.png +++ b/wikipedia/res/drawable-ldpi/ic_delete.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_more_vert.png b/wikipedia/res/drawable-ldpi/ic_more_vert.png new file mode 100644 index 0000000..80a6bdc --- /dev/null +++ b/wikipedia/res/drawable-ldpi/ic_more_vert.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_refresh.png b/wikipedia/res/drawable-ldpi/ic_refresh.png index 33041c0..23fb199 100644 --- a/wikipedia/res/drawable-ldpi/ic_refresh.png +++ b/wikipedia/res/drawable-ldpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_search.png b/wikipedia/res/drawable-ldpi/ic_search.png index 96b456f..410f6f0 100644 --- a/wikipedia/res/drawable-ldpi/ic_search.png +++ b/wikipedia/res/drawable-ldpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-ldpi/ic_toc.png b/wikipedia/res/drawable-ldpi/ic_toc.png index 188e940..261b3c5 100644 --- a/wikipedia/res/drawable-ldpi/ic_toc.png +++ b/wikipedia/res/drawable-ldpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png b/wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png index bbab36b..79972bd 100644 --- a/wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png +++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_search.png b/wikipedia/res/drawable-ldrtl-hdpi/ic_search.png index 40f9445..4ad7087 100644 --- a/wikipedia/res/drawable-ldrtl-hdpi/ic_search.png +++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png b/wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png index 2cca167..efba58c 100644 --- a/wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png +++ b/wikipedia/res/drawable-ldrtl-hdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png b/wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png index 72da0b0..dd59807 100644 --- a/wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png +++ b/wikipedia/res/drawable-ldrtl-ldpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_search.png b/wikipedia/res/drawable-ldrtl-ldpi/ic_search.png index 9f7361d..bd34523 100644 --- a/wikipedia/res/drawable-ldrtl-ldpi/ic_search.png +++ b/wikipedia/res/drawable-ldrtl-ldpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png b/wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png index 62ca6bc..88aa8c5 100644 --- a/wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png +++ b/wikipedia/res/drawable-ldrtl-ldpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png b/wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png index bcc5f8a..0108a33 100644 --- a/wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png +++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_search.png b/wikipedia/res/drawable-ldrtl-mdpi/ic_search.png index 596b473..c4dd503 100644 --- a/wikipedia/res/drawable-ldrtl-mdpi/ic_search.png +++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png b/wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png index 26ab9b6..624ff36 100644 --- a/wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png +++ b/wikipedia/res/drawable-ldrtl-mdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png b/wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png index c1830f0..a23be38 100644 --- a/wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png +++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png b/wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png index 039603b..f2fb497 100644 --- a/wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png +++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png b/wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png index dc469a8..12771d8 100644 --- a/wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png +++ b/wikipedia/res/drawable-ldrtl-xhdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png index 2cb88c4..4ab4c3c 100644 --- a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png +++ b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png index d24656d..d163187 100644 --- a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png +++ b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png index 89f006c..ce16237 100644 --- a/wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png +++ b/wikipedia/res/drawable-ldrtl-xxhdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_close.png b/wikipedia/res/drawable-mdpi/ic_close.png new file mode 100644 index 0000000..93252fa --- /dev/null +++ b/wikipedia/res/drawable-mdpi/ic_close.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_delete.png b/wikipedia/res/drawable-mdpi/ic_delete.png index 59b2d8b..fc55db3 100644 --- a/wikipedia/res/drawable-mdpi/ic_delete.png +++ b/wikipedia/res/drawable-mdpi/ic_delete.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_more_vert.png b/wikipedia/res/drawable-mdpi/ic_more_vert.png new file mode 100644 index 0000000..4488ece --- /dev/null +++ b/wikipedia/res/drawable-mdpi/ic_more_vert.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_refresh.png b/wikipedia/res/drawable-mdpi/ic_refresh.png index 7b7ac7f..9bc1a36 100644 --- a/wikipedia/res/drawable-mdpi/ic_refresh.png +++ b/wikipedia/res/drawable-mdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_search.png b/wikipedia/res/drawable-mdpi/ic_search.png index 7e7869a..410b6a3 100644 --- a/wikipedia/res/drawable-mdpi/ic_search.png +++ b/wikipedia/res/drawable-mdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-mdpi/ic_toc.png b/wikipedia/res/drawable-mdpi/ic_toc.png index 4fe0ed4..f7ec419 100644 --- a/wikipedia/res/drawable-mdpi/ic_toc.png +++ b/wikipedia/res/drawable-mdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_close.png b/wikipedia/res/drawable-xhdpi/ic_close.png new file mode 100644 index 0000000..fee43f2 --- /dev/null +++ b/wikipedia/res/drawable-xhdpi/ic_close.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_delete.png b/wikipedia/res/drawable-xhdpi/ic_delete.png index f408d4d..e02d351 100644 --- a/wikipedia/res/drawable-xhdpi/ic_delete.png +++ b/wikipedia/res/drawable-xhdpi/ic_delete.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_more_vert.png b/wikipedia/res/drawable-xhdpi/ic_more_vert.png new file mode 100644 index 0000000..9ab99dc --- /dev/null +++ b/wikipedia/res/drawable-xhdpi/ic_more_vert.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_refresh.png b/wikipedia/res/drawable-xhdpi/ic_refresh.png index 564ae3c..6d6ebfd 100644 --- a/wikipedia/res/drawable-xhdpi/ic_refresh.png +++ b/wikipedia/res/drawable-xhdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_search.png b/wikipedia/res/drawable-xhdpi/ic_search.png index 0c2ae84..dd6d295 100644 --- a/wikipedia/res/drawable-xhdpi/ic_search.png +++ b/wikipedia/res/drawable-xhdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-xhdpi/ic_toc.png b/wikipedia/res/drawable-xhdpi/ic_toc.png index 3556f87..9aa60de 100644 --- a/wikipedia/res/drawable-xhdpi/ic_toc.png +++ b/wikipedia/res/drawable-xhdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_close.png b/wikipedia/res/drawable-xxhdpi/ic_close.png new file mode 100644 index 0000000..4ae4d77 --- /dev/null +++ b/wikipedia/res/drawable-xxhdpi/ic_close.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_delete.png b/wikipedia/res/drawable-xxhdpi/ic_delete.png index 6e89189..7445351 100644 --- a/wikipedia/res/drawable-xxhdpi/ic_delete.png +++ b/wikipedia/res/drawable-xxhdpi/ic_delete.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_more_vert.png b/wikipedia/res/drawable-xxhdpi/ic_more_vert.png new file mode 100644 index 0000000..43e0861 --- /dev/null +++ b/wikipedia/res/drawable-xxhdpi/ic_more_vert.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_refresh.png b/wikipedia/res/drawable-xxhdpi/ic_refresh.png index 0b00eca..a6719f8 100644 --- a/wikipedia/res/drawable-xxhdpi/ic_refresh.png +++ b/wikipedia/res/drawable-xxhdpi/ic_refresh.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_search.png b/wikipedia/res/drawable-xxhdpi/ic_search.png index 8ecf0a3..640f0cf 100644 --- a/wikipedia/res/drawable-xxhdpi/ic_search.png +++ b/wikipedia/res/drawable-xxhdpi/ic_search.png Binary files differ diff --git a/wikipedia/res/drawable-xxhdpi/ic_toc.png b/wikipedia/res/drawable-xxhdpi/ic_toc.png index efc71d6..d8db0fe 100644 --- a/wikipedia/res/drawable-xxhdpi/ic_toc.png +++ b/wikipedia/res/drawable-xxhdpi/ic_toc.png Binary files differ diff --git a/wikipedia/res/drawable/search_bar_shape_dark.xml b/wikipedia/res/drawable/search_bar_shape.xml similarity index 77% rename from wikipedia/res/drawable/search_bar_shape_dark.xml rename to wikipedia/res/drawable/search_bar_shape.xml index 8cedb1d..d6ab38f 100644 --- a/wikipedia/res/drawable/search_bar_shape_dark.xml +++ b/wikipedia/res/drawable/search_bar_shape.xml @@ -2,6 +2,6 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"; android:shape="rectangle"> - <solid android:color="@color/search_bar_dark"></solid> + <solid android:color="@color/search_bar"></solid> <corners android:radius="@dimen/corner_radius"/> </shape> \ No newline at end of file diff --git a/wikipedia/res/drawable/search_bar_shape_light.xml b/wikipedia/res/drawable/search_bar_shape_light.xml deleted file mode 100644 index fdcdaac..0000000 --- a/wikipedia/res/drawable/search_bar_shape_light.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape - xmlns:android="http://schemas.android.com/apk/res/android"; - android:shape="rectangle"> - <solid android:color="@color/search_bar_light"></solid> - <corners android:radius="@dimen/corner_radius"/> -</shape> \ No newline at end of file diff --git a/wikipedia/res/drawable/toolbar_lead_gradient_dark.xml b/wikipedia/res/drawable/toolbar_lead_gradient.xml similarity index 84% rename from wikipedia/res/drawable/toolbar_lead_gradient_dark.xml rename to wikipedia/res/drawable/toolbar_lead_gradient.xml index af0adbd..0441981 100644 --- a/wikipedia/res/drawable/toolbar_lead_gradient_dark.xml +++ b/wikipedia/res/drawable/toolbar_lead_gradient.xml @@ -2,7 +2,7 @@ <shape xmlns:android="http://schemas.android.com/apk/res/android"; android:shape="rectangle"> <gradient - android:startColor="#d0000000" + android:startColor="#60000000" android:endColor="#00000000" android:angle="270"/> </shape> \ No newline at end of file diff --git a/wikipedia/res/drawable/toolbar_lead_gradient_light.xml b/wikipedia/res/drawable/toolbar_lead_gradient_light.xml deleted file mode 100644 index f4f1443..0000000 --- a/wikipedia/res/drawable/toolbar_lead_gradient_light.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"; - android:shape="rectangle"> - <gradient - android:startColor="#d0ffffff" - android:endColor="#00ffffff" - android:angle="270"/> -</shape> \ No newline at end of file diff --git a/wikipedia/res/layout/activity_gallery.xml b/wikipedia/res/layout/activity_gallery.xml index 92a5d87..90e243f 100644 --- a/wikipedia/res/layout/activity_gallery.xml +++ b/wikipedia/res/layout/activity_gallery.xml @@ -18,7 +18,7 @@ <android.support.v7.widget.Toolbar android:id="@+id/gallery_toolbar" android:layout_width="match_parent" - android:layout_height="72dp" + android:layout_height="?attr/actionBarSize" android:background="@drawable/gallery_toolbar_shape"> </android.support.v7.widget.Toolbar> <ProgressBar diff --git a/wikipedia/res/layout/activity_main.xml b/wikipedia/res/layout/activity_main.xml index ca8b481..a737942 100644 --- a/wikipedia/res/layout/activity_main.xml +++ b/wikipedia/res/layout/activity_main.xml @@ -26,12 +26,12 @@ <FrameLayout android:id="@+id/main_toolbar_container" android:layout_width="match_parent" - android:layout_height="96dp"> + android:layout_height="72dp"> <LinearLayout android:id="@+id/main_toolbar_gradient" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/actionbar_gradient" + android:background="@drawable/toolbar_lead_gradient" android:orientation="vertical"> </LinearLayout> <LinearLayout @@ -45,10 +45,13 @@ android:id="@+id/main_toolbar_background" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" - android:background="?attr/actionbar_background_color"> + android:background="@color/actionbar_background"> </FrameLayout> <android.support.v7.widget.Toolbar + xmlns:app="http://schemas.android.com/apk/res-auto"; + app:theme="@style/AppTheme.ToolbarTheme" android:id="@+id/main_toolbar" + android:background="@android:color/transparent" android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"> <FrameLayout @@ -65,7 +68,7 @@ android:layout_marginRight="4dp" android:paddingLeft="6dp" android:paddingRight="6dp" - android:background="?attr/search_bar_shape"> + android:background="@drawable/search_bar_shape"> </LinearLayout> <LinearLayout android:id="@+id/main_search_bar" @@ -92,9 +95,14 @@ android:paddingRight="4dp" android:gravity="center" android:text="@string/search_hint" + android:textColor="@android:color/white" android:textSize="16sp" android:singleLine="true" android:ellipsize="end" + android:shadowColor="@color/lead_text_shadow" + android:shadowDx="1" + android:shadowDy="1" + android:shadowRadius="2" android:layout_gravity="center_vertical"/> </LinearLayout> <android.support.v7.widget.SearchView @@ -104,11 +112,13 @@ android:layout_gravity="center_vertical" android:layout_marginRight="8dp" android:layout_marginEnd="8dp" + android:textColor="@android:color/white" android:textSize="16sp" android:visibility="gone" android:focusable="true" android:inputType="text" android:imeOptions="actionGo" + style="@style/AppTheme.SearchViewStyle" /> </FrameLayout> </android.support.v7.widget.Toolbar> diff --git a/wikipedia/res/layout/group_find_in_page.xml b/wikipedia/res/layout/group_find_in_page.xml index 830153d..0234c46 100644 --- a/wikipedia/res/layout/group_find_in_page.xml +++ b/wikipedia/res/layout/group_find_in_page.xml @@ -15,6 +15,7 @@ android:hint="@string/find_in_page" android:layout_gravity="center_vertical" android:singleLine="true" + style="@style/AppTheme.SearchViewStyle" /> <TextView android:id="@+id/find_in_page_match" @@ -34,7 +35,7 @@ android:textSize="20sp" android:textStyle="bold" android:contentDescription="@string/find_previous" - android:src="?attr/ic_find_previous_drawable"/> + android:src="@drawable/ic_expand_less_dark"/> <ImageButton android:id="@+id/find_in_page_next" android:layout_width="48dp" @@ -45,5 +46,5 @@ android:textSize="20sp" android:textStyle="bold" android:contentDescription="@string/find_next" - android:src="?attr/ic_find_next_drawable"/> + android:src="@drawable/ic_expand_more_dark"/> </LinearLayout> \ No newline at end of file diff --git a/wikipedia/res/values/attrs.xml b/wikipedia/res/values/attrs.xml index 1256fb2..f34eaef 100644 --- a/wikipedia/res/values/attrs.xml +++ b/wikipedia/res/values/attrs.xml @@ -3,22 +3,16 @@ <attr name="window_background_color" format="reference"/> <attr name="page_background_color" format="reference"/> <attr name="search_background_color" format="reference"/> - <attr name="actionbar_background_color" format="reference"/> - <attr name="actionbar_gradient" format="reference"/> <attr name="toc_background_color" format="reference"/> <attr name="toc_section_text_color" format="reference"/> <attr name="toc_subsection_text_color" format="reference"/> <attr name="edit_text_color" format="reference"/> <attr name="link_color" format="reference"/> <attr name="abusefilter_background_color" format="reference"/> - <attr name="actionbar_drawable" format="reference"/> - <attr name="ic_find_previous_drawable" format="reference"/> - <attr name="ic_find_next_drawable" format="reference"/> <attr name="lead_image_drawable" format="reference"/> <attr name="lead_disabled_text_color" format="reference"/> <attr name="list_separator_color" format="reference"/> <attr name="syntax_highlight_template_color" format="reference"/> - <attr name="search_bar_shape" format="reference"/> <attr name="subtle_gray_color" format="reference"/> <attr name="nearby_marker_drawable" format="reference"/> </resources> diff --git a/wikipedia/res/values/colors.xml b/wikipedia/res/values/colors.xml index 4b3dd2a..217daea 100644 --- a/wikipedia/res/values/colors.xml +++ b/wikipedia/res/values/colors.xml @@ -23,12 +23,15 @@ <color name="gray_disabled">#80606060</color> <color name="gray_highlight">#ff808080</color> <color name="page_info_heading">#555555</color> + <color name="actionbar_background">#ff303030</color> + <color name="actionbar_highlight">#ff808080</color> + <color name="search_bar">#ff404040</color> + <color name="search_text_hint">#ff808080</color> <color name="link_light">#ff347BFF</color> <color name="button_light">#ff777777</color> - <color name="window_background_light">#fff2f2f2</color> + <color name="window_background_light">#ffffffff</color> <color name="page_background_light">#ffffffff</color> - <color name="actionbar_background_light">#ffe8e8e8</color> <color name="search_background_light">#ffffffff</color> <color name="toc_background_light">#ffffffff</color> <color name="toc_section_text_light">#ff333333</color> @@ -37,13 +40,11 @@ <color name="abusefilter_background_light">#E8E8E8</color> <color name="subtle_gray_light">#fff0f0f0</color> <color name="list_separator_light">#ffcccccc</color> - <color name="search_bar_light">#fff2f2f2</color> <color name="link_dark">#ff2B6FB2</color> <color name="button_dark">#ff2B6FB2</color> <color name="window_background_dark">#ff000000</color> <color name="page_background_dark">#ff000000</color> - <color name="actionbar_background_dark">#ff505050</color> <color name="search_background_dark">#ff303030</color> <color name="toc_background_dark">#ff0C0C0C</color> <color name="toc_section_text_dark">#ffd0d0d0</color> @@ -52,7 +53,6 @@ <color name="abusefilter_background_dark">#505050</color> <color name="subtle_gray_dark">#ff141414</color> <color name="list_separator_dark">#ff606060</color> - <color name="search_bar_dark">#ff606060</color> <color name="list_item_highlight">#a033b5e5</color> <color name="list_item_selected">#d033b5e5</color> diff --git a/wikipedia/res/values/strings.xml b/wikipedia/res/values/strings.xml index d2ad1b9..d6d0ebc 100644 --- a/wikipedia/res/values/strings.xml +++ b/wikipedia/res/values/strings.xml @@ -261,6 +261,8 @@ <string name="license_title">License text for %s library</string> <string name="gallery_image_info">Image information</string> <string name="gallery_menu_share">Share</string> + <string name="gallery_license_text">License - %s</string> + <string name="gallery_credit_text">Author - %s</string> <string name="gallery_share_error">Could not share image: %s</string> <string name="gallery_menu_save">Save to device</string> <string name="gallery_save_error">Could not save image: %s</string> diff --git a/wikipedia/res/values/styles.xml b/wikipedia/res/values/styles.xml index d10fe19..3dea097 100644 --- a/wikipedia/res/values/styles.xml +++ b/wikipedia/res/values/styles.xml @@ -4,8 +4,44 @@ <style name="NoTitle" parent="AppTheme"> <item name="windowActionBar">false</item> - <item name="android:windowActionBar">false</item> - <item name="android:windowTitleSize">0dp</item> + </style> + + <style name="AppTheme.ToolbarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar"> + <item name="colorControlNormal">@android:color/white</item> + <item name="colorControlActivated">@color/actionbar_highlight</item> + <item name="colorControlHighlight">@color/actionbar_highlight</item> + </style> + + <style name="AppTheme.ToolbarStyle" parent="@style/Widget.AppCompat.ActionBar"> + <item name="android:background">@color/actionbar_background</item> + <item name="background">@color/actionbar_background</item> + <item name="navigationIcon">?attr/homeAsUpIndicator</item> + <item name="elevation">4dp</item> + <item name="titleTextStyle">@style/AppTheme.ToolBarTitleText</item> + </style> + + <style name="AppTheme.ToolBarTitleText" + parent="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"> + <item name="android:textColor">@android:color/white</item> + </style> + + <style name="AppTheme.DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle"> + <item name="android:color">@android:color/white</item> + <item name="color">@android:color/white</item> + </style> + + <style name="AppTheme.OverflowStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow"> + <item name="android:src">@drawable/ic_more_vert</item> + </style> + + <style name="AppTheme.ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode"> + <item name="background">@color/actionbar_background</item> + <item name="android:background">@color/actionbar_background</item> + </style> + + <style name="AppTheme.SearchViewStyle" parent="@style/Widget.AppCompat.SearchView"> + <item name="closeIcon">@drawable/ic_close</item> + <item name="searchIcon">@drawable/ic_search</item> </style> <style name="button_progressive" parent="@android:style/TextAppearance.Large"> diff --git a/wikipedia/res/values/styles_wikidark.xml b/wikipedia/res/values/styles_wikidark.xml index e2bb6c8..37efa14 100644 --- a/wikipedia/res/values/styles_wikidark.xml +++ b/wikipedia/res/values/styles_wikidark.xml @@ -2,35 +2,28 @@ <style name="Theme.WikiDark" parent="Theme.AppCompat"> <item name="windowActionModeOverlay">true</item> - <item name="toolbarStyle">@style/Toolbar.WikiDark</item> + <item name="drawerArrowStyle">@style/AppTheme.DrawerArrowStyle</item> + <item name="actionOverflowButtonStyle">@style/AppTheme.OverflowStyle</item> + <item name="actionBarTheme">@style/AppTheme.ToolbarTheme</item> + <item name="actionBarStyle">@style/AppTheme.ToolbarStyle</item> + <item name="actionModeStyle">@style/AppTheme.ActionModeStyle</item> <item name="android:dropDownListViewStyle">@style/DropDownListView.WikiDark</item> <item name="android:windowBackground">@color/window_background_dark</item> <item name="window_background_color">@color/window_background_dark</item> <item name="page_background_color">@color/page_background_dark</item> <item name="search_background_color">@color/search_background_dark</item> - <item name="actionbar_background_color">@color/actionbar_background_dark</item> - <item name="actionbar_gradient">@drawable/toolbar_lead_gradient_dark</item> <item name="toc_background_color">@color/toc_background_dark</item> <item name="toc_section_text_color">@color/toc_section_text_dark</item> <item name="toc_subsection_text_color">@color/toc_subsection_text_dark</item> <item name="edit_text_color">@color/edit_text_dark</item> <item name="link_color">@color/link_dark</item> <item name="abusefilter_background_color">@color/abusefilter_background_dark</item> - <item name="ic_find_previous_drawable">@drawable/ic_expand_less_dark</item> - <item name="ic_find_next_drawable">@drawable/ic_expand_more_dark</item> <item name="lead_image_drawable">@drawable/lead_default_dark</item> <item name="lead_disabled_text_color">@color/lead_disabled_text_dark</item> <item name="list_separator_color">@color/list_separator_dark</item> <item name="syntax_highlight_template_color">@color/syntax_highlight_template_dark</item> - <item name="search_bar_shape">@drawable/search_bar_shape_dark</item> <item name="subtle_gray_color">@color/subtle_gray_dark</item> <item name="nearby_marker_drawable">@drawable/ic_place_dark</item> - </style> - - <style name="Toolbar.WikiDark" parent="@style/Widget.AppCompat.Toolbar"> - <item name="android:background">@android:color/transparent</item> - <item name="android:navigationIcon">?attr/homeAsUpIndicator</item> - <item name="navigationIcon">?attr/homeAsUpIndicator</item> </style> <style name="DropDownListView.WikiDark" parent="@style/Widget.AppCompat.ListView.DropDown"> diff --git a/wikipedia/res/values/styles_wikilight.xml b/wikipedia/res/values/styles_wikilight.xml index f72c63a..cc777fc 100644 --- a/wikipedia/res/values/styles_wikilight.xml +++ b/wikipedia/res/values/styles_wikilight.xml @@ -1,36 +1,29 @@ <resources> - <style name="Theme.WikiLight" parent="Theme.AppCompat.Light"> + <style name="Theme.WikiLight" parent="Theme.AppCompat.Light.DarkActionBar"> <item name="windowActionModeOverlay">true</item> - <item name="toolbarStyle">@style/Toolbar.WikiLight</item> + <item name="drawerArrowStyle">@style/AppTheme.DrawerArrowStyle</item> + <item name="actionOverflowButtonStyle">@style/AppTheme.OverflowStyle</item> + <item name="actionBarTheme">@style/AppTheme.ToolbarTheme</item> + <item name="actionBarStyle">@style/AppTheme.ToolbarStyle</item> + <item name="actionModeStyle">@style/AppTheme.ActionModeStyle</item> <item name="android:dropDownListViewStyle">@style/DropDownListView.WikiLight</item> <item name="android:windowBackground">@color/window_background_light</item> <item name="window_background_color">@color/window_background_light</item> <item name="page_background_color">@color/page_background_light</item> <item name="search_background_color">@color/search_background_light</item> - <item name="actionbar_background_color">@color/actionbar_background_light</item> - <item name="actionbar_gradient">@drawable/toolbar_lead_gradient_light</item> <item name="toc_background_color">@color/toc_background_light</item> <item name="toc_section_text_color">@color/toc_section_text_light</item> <item name="toc_subsection_text_color">@color/toc_subsection_text_light</item> <item name="edit_text_color">@color/edit_text_light</item> <item name="link_color">@color/link_light</item> <item name="abusefilter_background_color">@color/abusefilter_background_light</item> - <item name="ic_find_previous_drawable">@drawable/ic_expand_less</item> - <item name="ic_find_next_drawable">@drawable/ic_expand_more</item> <item name="lead_image_drawable">@drawable/lead_default</item> <item name="lead_disabled_text_color">@color/lead_disabled_text_light</item> <item name="list_separator_color">@color/list_separator_light</item> <item name="syntax_highlight_template_color">@color/syntax_highlight_template_light</item> - <item name="search_bar_shape">@drawable/search_bar_shape_light</item> <item name="subtle_gray_color">@color/subtle_gray_light</item> <item name="nearby_marker_drawable">@drawable/ic_place</item> - </style> - - <style name="Toolbar.WikiLight" parent="@style/Widget.AppCompat.Toolbar"> - <item name="android:background">@android:color/transparent</item> - <item name="android:navigationIcon">?attr/homeAsUpIndicator</item> - <item name="navigationIcon">?attr/homeAsUpIndicator</item> </style> <style name="DropDownListView.WikiLight" parent="@style/Widget.AppCompat.Light.ListView.DropDown"> diff --git a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java index e4a0e34..54d81f0 100644 --- a/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/history/HistoryFragment.java @@ -313,7 +313,6 @@ return; } inflater.inflate(R.menu.menu_history, menu); - app.adjustDrawableToTheme(menu.findItem(R.id.menu_clear_all_history).getIcon()); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java index f1afb0f..777eab0 100644 --- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java @@ -504,7 +504,6 @@ return; } inflater.inflate(R.menu.menu_nearby, menu); - app.adjustDrawableToTheme(menu.findItem(R.id.menu_refresh_nearby).getIcon()); menu.findItem(R.id.menu_metric_imperial).setTitle(showImperial ? getString(R.string.nearby_set_metric) : getString(R.string.nearby_set_imperial)); diff --git a/wikipedia/src/main/java/org/wikipedia/page/FindInPageActionProvider.java b/wikipedia/src/main/java/org/wikipedia/page/FindInPageActionProvider.java index f9e66ed..a3b1ac5 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/FindInPageActionProvider.java +++ b/wikipedia/src/main/java/org/wikipedia/page/FindInPageActionProvider.java @@ -9,6 +9,7 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import android.webkit.WebView.FindListener; +import android.widget.EditText; import android.widget.TextView; public class FindInPageActionProvider extends ActionProvider { @@ -68,6 +69,9 @@ searchView.setInputType(EditorInfo.TYPE_CLASS_TEXT); searchView.setImeOptions(EditorInfo.IME_ACTION_DONE); searchView.setSubmitButtonEnabled(false); + EditText searchEditText = (EditText) searchView + .findViewById(android.support.v7.appcompat.R.id.search_src_text); + searchEditText.setHintTextColor(parentActivity.getResources().getColor(R.color.search_text_hint)); return view; } diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java index 4eb076a..5f9a242 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java @@ -167,7 +167,6 @@ searchFragment.openSearch(); } }); - app.adjustDrawableToTheme(((ImageView)findViewById(R.id.main_search_bar_icon)).getDrawable()); mDrawerToggle = new MainDrawerToggle( this, /* host Activity */ @@ -180,7 +179,7 @@ drawerLayout.setDrawerListener(mDrawerToggle); getSupportActionBar().setTitle(""); - searchBarHideHandler = new SearchBarHideHandler(toolbarContainer); + searchBarHideHandler = new SearchBarHideHandler(this, toolbarContainer); noTextSelectedShareAdapter = new NoTextSelectedShareAdapter(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java index 147bbf5..5bf5050 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragment.java @@ -146,7 +146,6 @@ return; } inflater.inflate(R.menu.menu_page_actions, menu); - fragment.onCreateOptionsMenu(menu, inflater); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java index f0c2bbb..5788ad5 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java +++ b/wikipedia/src/main/java/org/wikipedia/page/PageViewFragmentInternal.java @@ -616,10 +616,6 @@ } } - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - app.adjustDrawableToTheme(menu.findItem(R.id.menu_toc).getIcon()); - } - public void onPrepareOptionsMenu(Menu menu) { MenuItem savePageMenu = menu.findItem(R.id.menu_save_page); if (savePageMenu == null) { diff --git a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java index 5d40d23..009ab07 100644 --- a/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java +++ b/wikipedia/src/main/java/org/wikipedia/page/gallery/GalleryActivity.java @@ -100,6 +100,7 @@ final Toolbar toolbar = (Toolbar) findViewById(R.id.gallery_toolbar); setSupportActionBar(toolbar); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setTitle(""); toolbarContainer = (ViewGroup) findViewById(R.id.gallery_toolbar_container); diff --git a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java index 042a839..4e01e7d 100644 --- a/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/savedpages/SavedPagesFragment.java @@ -296,8 +296,6 @@ return; } inflater.inflate(R.menu.menu_saved_pages, menu); - app.adjustDrawableToTheme(menu.findItem(R.id.menu_refresh_all_saved_pages).getIcon()); - app.adjustDrawableToTheme(menu.findItem(R.id.menu_clear_all_saved_pages).getIcon()); } @Override diff --git a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java index e2621ce..cbf930f 100644 --- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java @@ -120,7 +120,6 @@ alert.create().show(); } }); - app.adjustDrawableToTheme(((ImageView)deleteButton).getDrawable()); recentSearchesFragment = (RecentSearchesFragment)getChildFragmentManager().findFragmentById(R.id.search_panel_recent); @@ -291,14 +290,14 @@ searchEditText = (EditText) searchView .findViewById(android.support.v7.appcompat.R.id.search_src_text); // need to explicitly set text color (you're welcome, 2.3!). - searchEditText.setTextColor(getResources().getColor( - Utils.getThemedAttributeId(getActivity(), R.attr.edit_text_color))); + searchEditText.setTextColor(getResources().getColor(android.R.color.white)); // and make the text size be the same as the size of the search field // placeholder in the main activity searchEditText.setTextSize(TypedValue.COMPLEX_UNIT_PX, ((TextView) getActivity() .findViewById(R.id.main_search_bar_text)).getTextSize()); // reset its background searchEditText.setBackgroundColor(Color.TRANSPARENT); + searchEditText.setHintTextColor(getResources().getColor(R.color.search_text_hint)); // make the search frame match_parent View searchEditFrame = searchView .findViewById(android.support.v7.appcompat.R.id.search_edit_frame); @@ -310,7 +309,7 @@ // and make the background of the search plate the same as our placeholder... View searchPlate = searchView .findViewById(android.support.v7.appcompat.R.id.search_plate); - searchPlate.setBackgroundResource(Utils.getThemedAttributeId(getActivity(), R.attr.search_bar_shape)); + searchPlate.setBackgroundResource(R.drawable.search_bar_shape); } updateZeroChrome(); diff --git a/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java b/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java index e4c04a4..e87a193 100644 --- a/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java +++ b/wikipedia/src/main/java/org/wikipedia/search/SearchBarHideHandler.java @@ -1,8 +1,11 @@ package org.wikipedia.search; +import android.app.Activity; +import android.graphics.Color; import android.os.Build; import android.view.View; +import com.nineoldandroids.animation.ArgbEvaluator; import com.nineoldandroids.view.ViewHelper; import org.wikipedia.R; @@ -11,8 +14,12 @@ public class SearchBarHideHandler implements ObservableWebView.OnScrollChangeListener, ObservableWebView.OnUpOrCancelMotionEventListener, ObservableWebView.OnDownMotionEventListener { private static final int HUMAN_SCROLL_THRESHOLD = 200; + private final Activity parentActivity; private final View quickReturnView; private final float displayDensity; + private final int toolbarColor; + private final ArgbEvaluator colorEvaluator; + private ObservableWebView webview; private boolean fadeEnabled = false; private boolean forceNoFade = false; @@ -21,7 +28,8 @@ private View toolbarGradient; private View toolbarShadow; - public SearchBarHideHandler(View quickReturnView) { + public SearchBarHideHandler(Activity activity, View quickReturnView) { + this.parentActivity = activity; this.quickReturnView = quickReturnView; this.displayDensity = quickReturnView.getResources().getDisplayMetrics().density; @@ -29,6 +37,11 @@ toolbarSearchBackground = quickReturnView.findViewById(R.id.main_search_background); toolbarShadow = quickReturnView.findViewById(R.id.main_toolbar_shadow); toolbarGradient = quickReturnView.findViewById(R.id.main_toolbar_gradient); + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { + toolbarGradient.setVisibility(View.GONE); + } + colorEvaluator = new ArgbEvaluator(); + toolbarColor = activity.getResources().getColor(R.color.actionbar_background); } /** @@ -79,15 +92,20 @@ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { // enable fading/translucent search bar only in API 11+ final int fadeHeight = 256; - final float searchBoxFadeOffset = 0.3f; float alpha = 1f; if (fadeEnabled && !forceNoFade) { alpha = (float) scrollY / (fadeHeight * displayDensity); } + alpha = Math.max(0f, alpha); + alpha = Math.min(1f, alpha); toolbarBackground.setAlpha(alpha); toolbarShadow.setAlpha(alpha); - toolbarSearchBackground.setAlpha(Math.min(1f, alpha + searchBoxFadeOffset)); + toolbarSearchBackground.setAlpha(alpha); toolbarGradient.setAlpha(1f - alpha); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ) { + parentActivity.getWindow().setStatusBarColor( + (int) colorEvaluator.evaluate(alpha, Color.BLACK, toolbarColor)); + } } if (scrollY <= webview.getHeight()) { // For the first screenful, ensure it always exists. -- To view, visit https://gerrit.wikimedia.org/r/192916 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64a345ba43e47cc7e8d824b09752c8037a3462d8 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
