From 79f05884abe5c155468ecc2fc9131f2024a0227a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 10 Dec 2018 08:18:52 +0300
Subject: amber theme misc fixes

---
 .../main/res/drawable-hdpi/drawer_header_amber.png | Bin 0 -> 17915 bytes
 .../res/drawable-xxhdpi/drawer_header_amber.png    | Bin 0 -> 35712 bytes
 org.fox.ttrss/src/main/res/values/colors.xml       |   2 +-
 org.fox.ttrss/src/main/res/values/style.xml        |   2 +
 .../src_drawable/s_drawer_header_amber.svg         | 257 +++++++++++++++++++++
 .../src_drawable/s_drawer_header_dark.svg          |  28 +--
 6 files changed, 274 insertions(+), 15 deletions(-)
 create mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png
 create mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png
 create mode 100644 org.fox.ttrss/src_drawable/s_drawer_header_amber.svg

(limited to 'org.fox.ttrss')

diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png
new file mode 100644
index 00000000..e41c647d
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png
new file mode 100644
index 00000000..463fba18
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png differ
diff --git a/org.fox.ttrss/src/main/res/values/colors.xml b/org.fox.ttrss/src/main/res/values/colors.xml
index 7ad81fac..d87ac346 100755
--- a/org.fox.ttrss/src/main/res/values/colors.xml
+++ b/org.fox.ttrss/src/main/res/values/colors.xml
@@ -2,5 +2,5 @@
 <resources>
     <item name="window_background" type="color">#216d96</item>
     <item name="window_background_dark" type="color">#18506e</item>
-
+    <item name="window_background_amber" type="color">#6e4b1a</item>
 </resources>
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index e16ee854..5cf9b3b0 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -70,6 +70,8 @@
     <style name="AmberTheme" parent="DarkTheme">
         <item name="colorPrimary">#b87d2c</item>
         <item name="colorPrimaryDark">#6e4b1a</item>
+        <item name="android:windowBackground">@color/window_background_amber</item>
+        <item name="drawer_header">@drawable/drawer_header_amber</item>
     </style>
 
     <style name="DarkTheme" parent="DarkTheme.Base">
diff --git a/org.fox.ttrss/src_drawable/s_drawer_header_amber.svg b/org.fox.ttrss/src_drawable/s_drawer_header_amber.svg
new file mode 100644
index 00000000..9c83cf7f
--- /dev/null
+++ b/org.fox.ttrss/src_drawable/s_drawer_header_amber.svg
@@ -0,0 +1,257 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="300"
+   height="120"
+   viewBox="0 0 300.00001 120.00001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="s_drawer_header_dark.svg"
+   inkscape:export-filename="C:\Users\andrew\Projects\tt-rss-android\org.fox.ttrss\src\main\res\drawable-xxhdpi\drawer_header_dark.png"
+   inkscape:export-xdpi="307.20001"
+   inkscape:export-ydpi="307.20001">
+  <defs
+     id="defs4">
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4210">
+      <feFlood
+         flood-opacity="0.321569"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4212" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4214" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur4216" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4218" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4220" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4222">
+      <feFlood
+         flood-opacity="0.321569"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4224" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4226" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur4228" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4230" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4232" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4234">
+      <feFlood
+         flood-opacity="0.321569"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4236" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4238" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="2"
+         result="blur"
+         id="feGaussianBlur4240" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4242" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4244" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:label="Drop Shadow"
+       id="filter4306">
+      <feFlood
+         flood-opacity="0.611765"
+         flood-color="rgb(0,0,0)"
+         result="flood"
+         id="feFlood4308" />
+      <feComposite
+         in="flood"
+         in2="SourceGraphic"
+         operator="in"
+         result="composite1"
+         id="feComposite4310" />
+      <feGaussianBlur
+         in="composite1"
+         stdDeviation="6"
+         result="blur"
+         id="feGaussianBlur4312" />
+      <feOffset
+         dx="0"
+         dy="0"
+         result="offset"
+         id="feOffset4314" />
+      <feComposite
+         in="SourceGraphic"
+         in2="offset"
+         operator="over"
+         result="composite2"
+         id="feComposite4316" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="1"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="95.509823"
+     inkscape:cy="76.447795"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     borderlayer="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1170"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-932.36214)">
+    <path
+       style="fill:#eed5b2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 96.7857,905.93357 63.21428,60.35714 -55.35714,95.71429 -32.857141,-1.0714 z"
+       id="path4208"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="fill:#624318;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 198.57141,994.505 64.64286,68.9286 -126.78572,-2.5 z"
+       id="path4162"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#a0712c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)"
+       d="M 219.2857,1007.3621 71.071414,1113.0764 161.78572,948.79071 Z"
+       id="path4154"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:#ab2f08;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 58.214271,1057.3621 -62.1428577,0.3572 -0.7142858,-157.14287 24.6428575,-0.71429 z"
+       id="path4160"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f4511e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4222)"
+       d="M 100.71427,895.93357 71.071414,1111.6478 3.2142708,895.93357 Z"
+       id="path4156"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="fill:#b87d2c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)"
+       d="m 83.571414,898.07643 163.214276,159.99997 63.21429,-0.7143 -3.57143,-161.42853 z"
+       id="path4142"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m -1.4285867,895.93357 -1.0714286,-5"
+       id="path4158"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4164"
+       width="65.35714"
+       height="202.85715"
+       x="-66.428589"
+       y="888.43359" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4164-4"
+       width="65.357147"
+       height="202.85718"
+       x="300.89288"
+       y="875.93353" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4164-41"
+       width="364.28574"
+       height="81.428589"
+       x="-36.250019"
+       y="1053.7908" />
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4164-41-3"
+       width="364.28577"
+       height="81.428596"
+       x="-23.571449"
+       y="820.2193" />
+  </g>
+</svg>
diff --git a/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg b/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg
index c1c94ae2..45c92e72 100644
--- a/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg
+++ b/org.fox.ttrss/src_drawable/s_drawer_header_dark.svg
@@ -14,11 +14,11 @@
    viewBox="0 0 300.00001 120.00001"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="s_drawer_header_dark.svg"
-   inkscape:export-filename="C:\Users\andrew\Projects\tt-rss-android\org.fox.ttrss\src\main\res\drawable-xxhdpi\drawer_header_dark.png"
-   inkscape:export-xdpi="307.20001"
-   inkscape:export-ydpi="307.20001">
+   inkscape:export-filename="/home/fox/Projects/tt-rss-android/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png"
+   inkscape:export-xdpi="192"
+   inkscape:export-ydpi="192">
   <defs
      id="defs4">
     <filter
@@ -158,17 +158,17 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="2.8"
-     inkscape:cx="52.474109"
-     inkscape:cy="70.376366"
+     inkscape:cx="95.15268"
+     inkscape:cy="76.447795"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
      units="px"
      borderlayer="true"
      inkscape:window-width="1920"
-     inkscape:window-height="1137"
-     inkscape:window-x="-8"
-     inkscape:window-y="-8"
+     inkscape:window-height="1170"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -178,7 +178,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>
@@ -188,18 +188,18 @@
      id="layer1"
      transform="translate(0,-932.36214)">
     <path
-       style="fill:#b2d9ee;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#eed5b2;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 96.7857,905.93357 63.21428,60.35714 -55.35714,95.71429 -32.857141,-1.0714 z"
        id="path4208"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
     <path
-       style="fill:#164964;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#624318;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 198.57141,994.505 64.64286,68.9286 -126.78572,-2.5 z"
        id="path4162"
        inkscape:connector-curvature="0" />
     <path
-       style="fill:#2579a6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)"
+       style="fill:#a0712c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4234)"
        d="M 219.2857,1007.3621 71.071414,1113.0764 161.78572,948.79071 Z"
        id="path4154"
        inkscape:connector-curvature="0"
@@ -216,7 +216,7 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccc" />
     <path
-       style="fill:#1e6286;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)"
+       style="fill:#b87d2c;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4306)"
        d="m 83.571414,898.07643 163.214276,159.99997 63.21429,-0.7143 -3.57143,-161.42853 z"
        id="path4142"
        inkscape:connector-curvature="0" />
-- 
cgit v1.2.3