Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #4381: Different shades of fillColor used in portrait and landscape #4479

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 32 additions & 32 deletions app/src/main/res/drawable/ic_landscape_onboarding_0.xml

Large diffs are not rendered by default.

82 changes: 41 additions & 41 deletions app/src/main/res/drawable/ic_landscape_onboarding_0_tablet.xml

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions app/src/main/res/drawable/ic_landscape_onboarding_1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:endY="52.994225"
android:endX="-73.86013"
android:type="linear">
<item android:offset="0" android:color="#6688241B"/>
<item android:offset="0" android:color="#66882209"/>
<item android:offset="1" android:color="#FFE76F51"/>
</gradient>
</aapt:attr>
Expand All @@ -28,41 +28,41 @@
android:endY="66.9288"
android:endX="-80.297966"
android:type="linear">
<item android:offset="0" android:color="#33A62E23"/>
<item android:offset="0" android:color="#33A72B0C"/>
<item android:offset="1" android:color="#FFC55F45"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M85,130m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:fillColor="#fee557"/>
android:fillColor="#ffe558"/>
<path
android:pathData="M73.91,124.89m-5.96,0a5.96,5.96 0,1 1,11.92 0a5.96,5.96 0,1 1,-11.92 0"
android:fillColor="#d6a229"/>
android:fillColor="#d6a12b"/>
<path
android:pathData="M96.33,124.89m-5.96,0a5.96,5.96 0,1 1,11.92 0a5.96,5.96 0,1 1,-11.92 0"
android:fillColor="#d6a229"/>
android:fillColor="#d6a12b"/>
<path
android:pathData="M76.44,138.36H93.8a1,1 0,0 1,1 1v4.91a6,6 0,0 1,-6 6H81.44a6,6 0,0 1,-6 -6v-4.91A1,1 0,0 1,76.44 138.36Z"
android:fillColor="#d6a229"/>
android:fillColor="#d6a12b"/>
<path
android:pathData="M185,130m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:fillColor="#76c47f"/>
android:fillColor="#6dd180"/>
<path
android:pathData="M173.47,118.92a6,6 0,0 1,5.95 6h0c0,3.29 -11.91,3.29 -11.91,0a6,6 0,0 1,6 -6Z"
android:fillColor="#389b4a"/>
android:fillColor="#389b4b"/>
<path
android:pathData="M195.89,118.92a6,6 0,0 1,6 6h0c0,3.29 -11.91,3.29 -11.91,0a6,6 0,0 1,6 -6Z"
android:fillColor="#389b4a"/>
android:fillColor="#389b4b"/>
<path
android:pathData="M176,138.36h17.36a1,1 0,0 1,1 1v4.91a6,6 0,0 1,-6 6H181a6,6 0,0 1,-6 -6v-4.91A1,1 0,0 1,176 138.36Z"
android:fillColor="#389b4a"/>
android:fillColor="#389b4b"/>
<path
android:pathData="M179,136.86h11.4a1,1 0,0 1,1 1v3.43a6,6 0,0 1,-6 6H184a6,6 0,0 1,-6 -6v-3.43A1,1 0,0 1,179 136.86Z"
android:fillColor="#76c47f"/>
android:fillColor="#6dd180"/>
<path
android:pathData="M85,230m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:fillColor="#a5d2eb"/>
android:fillColor="#a5d3ec"/>
<path
android:pathData="M73.91,224.45m-5.96,0a5.96,5.96 0,1 1,11.92 0a5.96,5.96 0,1 1,-11.92 0"
android:fillColor="#618da5"/>
Expand Down Expand Up @@ -99,7 +99,7 @@
<path
android:pathData="M185,231m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:strokeAlpha="0"
android:fillColor="#adaaa9"
android:fillColor="#aca9a9"
android:fillAlpha="0"/>
<path
android:pathData="M184.68,219.38L184.68,244.69"
Expand Down
32 changes: 16 additions & 16 deletions app/src/main/res/drawable/ic_landscape_onboarding_1_tablet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:endY="39.459335"
android:endX="-72.87742"
android:type="linear">
<item android:offset="0" android:color="#6688241B"/>
<item android:offset="0" android:color="#66882209"/>
<item android:offset="1" android:color="#FFE76F51"/>
</gradient>
</aapt:attr>
Expand All @@ -35,51 +35,51 @@
android:endY="53.880173"
android:endX="-79.65139"
android:type="linear">
<item android:offset="0" android:color="#33A62E23"/>
<item android:offset="0" android:color="#33A72B0C"/>
<item android:offset="1" android:color="#FFC55F45"/>
</gradient>
</aapt:attr>
</path>
</group>
<path
android:pathData="M110,118m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:fillColor="#FEE557"/>
android:fillColor="#ffe558"/>
<path
android:pathData="M98.9,112.9m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
android:fillColor="#D6A229"/>
android:fillColor="#d6a12b"/>
<path
android:pathData="M121.3,112.9m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
android:fillColor="#D6A229"/>
android:fillColor="#d6a12b"/>
<path
android:pathData="M101.4,126.4h17.4c0.6,0 1,0.4 1,1v4.9c0,3.3 -2.7,6 -6,6h-7.4c-3.3,0 -6,-2.7 -6,-6v-4.9C100.4,126.8 100.9,126.4 101.4,126.4z"
android:fillColor="#D6A229"/>
android:fillColor="#d6a12b"/>
<path
android:pathData="M210,118m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:fillColor="#76C47F"/>
android:fillColor="#6dd180"/>
<path
android:pathData="M198.5,106.9c3.3,0 6,2.7 5.9,6l0,0c0,3.3 -11.9,3.3 -11.9,0C192.5,109.6 195.2,106.9 198.5,106.9L198.5,106.9z"
android:fillColor="#389B4A"/>
android:fillColor="#389b4b"/>
<path
android:pathData="M220.9,106.9c3.3,0 6,2.7 6,6l0,0c0,3.3 -11.9,3.3 -11.9,0C215,109.6 217.7,106.9 220.9,106.9L220.9,106.9z"
android:fillColor="#389B4A"/>
android:fillColor="#389b4b"/>
<path
android:pathData="M201,126.4h17.4c0.6,0 1,0.4 1,1v4.9c0,3.3 -2.7,6 -6,6H206c-3.3,0 -6,-2.7 -6,-6v-4.9C200,126.8 200.4,126.4 201,126.4z"
android:fillColor="#389B4A"/>
android:fillColor="#389b4b"/>
<path
android:pathData="M204,124.9h11.4c0.6,0 1,0.4 1,1v3.4c0,3.3 -2.7,6 -6,6H209c-3.3,0 -6,-2.7 -6,-6v-3.4C203,125.3 203.4,124.9 204,124.9z"
android:fillColor="#76C47F"/>
android:fillColor="#6dd180"/>
<path
android:pathData="M110,218m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:fillColor="#A5D2EB"/>
android:fillColor="#a5d3ec"/>
<path
android:pathData="M98.9,212.4m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
android:fillColor="#618DA5"/>
android:fillColor="#618da5"/>
<path
android:pathData="M121.3,212.4m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
android:fillColor="#618DA5"/>
android:fillColor="#618da5"/>
<path
android:pathData="M104.9,230.4a5.2,7.4 0,1 0,10.4 0a5.2,7.4 0,1 0,-10.4 0z"
android:fillColor="#618DA5"/>
android:fillColor="#618da5"/>
<path
android:strokeWidth="1"
android:pathData="M122.1,204.2L122.1,210.2"
Expand Down Expand Up @@ -134,7 +134,7 @@
<path
android:pathData="M185,219m-32,0a32,32 0,1 1,64 0a32,32 0,1 1,-64 0"
android:strokeAlpha="0"
android:fillColor="#ADAAA9"
android:fillColor="#aca9a9"
android:fillAlpha="0"/>
<path
android:pathData="M184.7,207.4L184.7,232.7"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/res/drawable/ic_landscape_onboarding_2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
android:endY="51.43397"
android:endX="-73.16784"
android:type="linear">
<item android:offset="0" android:color="#FFFEE557"/>
<item android:offset="0" android:color="#FFFFE558"/>
<item android:offset="1" android:color="#FFE76F51"/>
</gradient>
</aapt:attr>
Expand All @@ -28,12 +28,12 @@
android:endY="63.72883"
android:endX="-81.23758"
android:type="linear">
<item android:offset="0" android:color="#7FFEE557"/>
<item android:offset="1" android:color="#CCCAAD2D"/>
<item android:offset="0" android:color="#7FFFE558"/>
<item android:offset="1" android:color="#CCCBAC04"/>
</gradient>
</aapt:attr>
</path>
<path
android:pathData="M202.2,157.8H167V105H114.2v52.8H79l61.6,61.6ZM79,237v17.6H202.2V237Z"
android:fillColor="#02655c"/>
android:fillColor="#00645c"/>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:endY="39.447502"
android:endX="-73.15616"
android:type="linear">
<item android:offset="0" android:color="#FFFEE557"/>
<item android:offset="0" android:color="#FFFFE558"/>
<item android:offset="1" android:color="#FFE76F51"/>
</gradient>
</aapt:attr>
Expand All @@ -31,8 +31,8 @@
android:endY="53.203266"
android:endX="-82.14086"
android:type="linear">
<item android:offset="0" android:color="#7FFEE557"/>
<item android:offset="1" android:color="#CCCAAD2D"/>
<item android:offset="0" android:color="#7FFFE558"/>
<item android:offset="1" android:color="#CCCBAC04"/>
</gradient>
</aapt:attr>
</path>
Expand All @@ -42,6 +42,6 @@
android:pathData="M0,-12h320v360h-320z"/>
<path
android:pathData="M221.6,134h-35.2V81.2h-52.8V134H98.4l61.6,61.6L221.6,134zM98.4,213.2v17.6h123.2v-17.6H98.4z"
android:fillColor="#02655C"/>
android:fillColor="#00645c"/>
</group>
</vector>
Loading