Skip to content

Commit

Permalink
Merge pull request #16620 from wordpress-mobile/merge/19.9-rc-3
Browse files Browse the repository at this point in the history 
Merge release/19.9 (19.9-rc-3 + conflict resolution)
  • Loading branch information
@ParaskP7
ParaskP7 authored May 24, 2022
2 parents 32421e5 + 6e70dfd commit 2244362
Show file tree
Hide file tree
Showing 58 changed files with 4,245 additions and 2,614 deletions.
375 changes: 353 additions & 22 deletions WordPress/src/jetpack/res/drawable/app_icon_background.xml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,355 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
android:viewportWidth="432"
android:viewportHeight="432"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M0,0h108v108h-108z"
android:strokeWidth="1"
android:fillType="evenOdd"
android:strokeColor="@android:color/transparent">
<aapt:attr name="android:fillColor">
<gradient
android:startY="0"
android:startX="0"
android:endY="108"
android:endX="108"
android:type="linear">
<item android:offset="0" android:color="@color/primary_30"/>
<item android:offset="1" android:color="@color/primary_40"/>
</gradient>
</aapt:attr>
</path>
android:height="108dp">
<path
android:pathData="M0 0H432V432H0V0Z"
android:fillType="evenOdd"
android:fillColor="#FFFFFF" />
<group
android:rotation="-0.00000000000001403342"
android:translateX="-0.00000000000005684342"
android:translateY="0.00000000000005684342">
<path
android:pathData="M-0.00000000000005684342 0.0000000000004547474H432V432H-0.00000000000005684342V0.0000000000004547474Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.1399"
android:startY="144.296"
android:endX="166.0848"
android:endY="267.3012"
android:tileMode="clamp">
<item
android:color="#00BA37"
android:offset="0" />
<item
android:color="#0000BA37"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:scaleX="-1"
android:scaleY="-1"
android:translateX="0.00000000000002842171"
android:translateY="432">
<path
android:pathData="M0.000000000004355627 -0.00000000001257974L432 -0.00000000001257974 432 432 0.000000000004355627 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.0605"
android:startY="144.3934"
android:endX="164.693"
android:endY="267.3549"
android:tileMode="clamp">
<item
android:color="#F0C930"
android:offset="0" />
<item
android:color="#00F0C930"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="-0.000000000000007016709"
android:scaleX="-1"
android:scaleY="-1"
android:translateX="432"
android:translateY="432">
<path
android:pathData="M-0.00000000000005684342 0.0000000000004547474H432V432H-0.00000000000005684342V0.0000000000004547474Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.7125"
android:startY="143.8074"
android:endX="162.5663"
android:endY="267.3105"
android:tileMode="clamp">
<item
android:color="#D63638"
android:offset="0" />
<item
android:color="#00D63638"
android:offset="1" />
<item
android:color="#00D8D8D8"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:translateX="432">
<path
android:pathData="M-0.00000000001118856 -0.000000000007027268L432 -0.000000000007027268 432 432 -0.00000000001118856 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.4413"
android:startY="144.6138"
android:endX="165.6572"
android:endY="267.5576"
android:tileMode="clamp">
<item
android:color="#0675C4"
android:offset="0" />
<item
android:color="#000675C4"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="-0.00000000000001403342"
android:translateX="-0.00000000000005684342"
android:translateY="0.00000000000005684342">
<path
android:pathData="M-0.00000000000005684342 0.0000000000004547474H432V432H-0.00000000000005684342V0.0000000000004547474Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.1399"
android:startY="144.296"
android:endX="166.0848"
android:endY="267.3012"
android:tileMode="clamp">
<item
android:color="#00BA37"
android:offset="0" />
<item
android:color="#0000BA37"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:scaleX="-1"
android:scaleY="-1"
android:translateX="0.00000000000002842171"
android:translateY="432">
<path
android:pathData="M0.000000000004355627 -0.00000000001257974L432 -0.00000000001257974 432 432 0.000000000004355627 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.0605"
android:startY="144.3934"
android:endX="164.693"
android:endY="267.3549"
android:tileMode="clamp">
<item
android:color="#F0C930"
android:offset="0" />
<item
android:color="#00F0C930"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="-0.000000000000007016709"
android:scaleX="-1"
android:scaleY="-1"
android:translateX="432"
android:translateY="432">
<path
android:pathData="M-0.00000000000005684342 0.0000000000004547474H432V432H-0.00000000000005684342V0.0000000000004547474Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.7125"
android:startY="143.8074"
android:endX="162.5663"
android:endY="267.3105"
android:tileMode="clamp">
<item
android:color="#D63638"
android:offset="0" />
<item
android:color="#00D63638"
android:offset="1" />
<item
android:color="#00D8D8D8"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:translateX="432">
<path
android:pathData="M-0.00000000001118856 -0.000000000007027268L432 -0.000000000007027268 432 432 -0.00000000001118856 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.4413"
android:startY="144.6138"
android:endX="165.6572"
android:endY="267.5576"
android:tileMode="clamp">
<item
android:color="#0675C4"
android:offset="0" />
<item
android:color="#000675C4"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="-0.00000000000001403342"
android:translateX="-0.00000000000005684342"
android:translateY="0.00000000000005684342">
<path
android:pathData="M-0.00000000000005684342 0.0000000000003979039H432V432H-0.00000000000005684342V0.0000000000003979039Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.1399"
android:startY="144.296"
android:endX="166.0848"
android:endY="267.3012"
android:tileMode="clamp">
<item
android:color="#00BA37"
android:offset="0" />
<item
android:color="#0000BA37"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:scaleX="-1"
android:scaleY="-1"
android:translateX="0.00000000000002842171"
android:translateY="432">
<path
android:pathData="M0.000000000004355627 -0.00000000001263659L432 -0.00000000001263659 432 432 0.000000000004355627 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.0605"
android:startY="144.3934"
android:endX="164.693"
android:endY="267.3549"
android:tileMode="clamp">
<item
android:color="#F0C930"
android:offset="0" />
<item
android:color="#00F0C930"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="-0.000000000000007016709"
android:scaleX="-1"
android:scaleY="-1"
android:translateX="432"
android:translateY="432">
<path
android:pathData="M-0.00000000000005684342 0.0000000000003979039H432V432H-0.00000000000005684342V0.0000000000003979039Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.7125"
android:startY="143.8074"
android:endX="162.5663"
android:endY="267.3105"
android:tileMode="clamp">
<item
android:color="#D63638"
android:offset="0" />
<item
android:color="#00D63638"
android:offset="1" />
<item
android:color="#00D8D8D8"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:translateX="432">
<path
android:pathData="M-0.00000000001118856 -0.000000000007084111L432 -0.000000000007084111 432 432 -0.00000000001118856 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="287.4413"
android:startY="144.6138"
android:endX="165.6572"
android:endY="267.5576"
android:tileMode="clamp">
<item
android:color="#0675C4"
android:offset="0" />
<item
android:color="#000675C4"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
<group
android:rotation="90"
android:translateX="432">
<path
android:pathData="M0.00000000000315786 0.0000000000004938272L432 0.0000000000004938272 432 432 0.00000000000315786 432Z"
android:fillType="evenOdd">
<aapt:attr
name="android:fillColor">
<gradient
android:startX="432"
android:startY="0.0000000000004938272"
android:endX="0.00000000000315786"
android:endY="432"
android:tileMode="clamp">
<item
android:color="#1689DB"
android:offset="0" />
<item
android:color="#041689DB"
android:offset="0.2536087" />
<item
android:color="#001689DB"
android:offset="1" />
</gradient>
</aapt:attr>
</path>
</group>
</vector>
16 changes: 7 additions & 9 deletions WordPress/src/jetpack/res/drawable/app_icon_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:viewportWidth="432"
android:viewportHeight="432"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:pathData="M54,23C71.121,23 85,36.879 85,54C85,71.121 71.121,85 54,85C36.879,85 23,71.121 23,54C23,36.879 36.879,23 54,23ZM71.034,48.814L55.572,48.814L55.572,78.86L71.034,48.814ZM52.427,29.143L36.964,59.19L52.427,59.19L52.427,29.143Z"
android:strokeWidth="1"
android:fillColor="@color/white"
android:fillType="evenOdd"
android:strokeColor="@android:color/transparent"/>
android:height="108dp">
<path
android:pathData="M0 0L432 0L432 432L0 432L0 0ZM222.285714 318.857143L222.285714 194.857143L286.285714 194.857143L222.285714 318.857143ZM209.714286 237.142857L145.714286 237.142857L209.714286 113.142857L209.714286 237.142857ZM216 88C145.30734 88 88 145.308252 88 216C88 286.692901 145.30734 344 216 344C286.691507 344 344 286.692901 344 216C344 145.308252 286.691507 88 216 88L216 88Z"
android:fillType="evenOdd"
android:fillColor="#151515" />
</vector>
Binary file modified WordPress/src/jetpack/res/mipmap-hdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified WordPress/src/jetpack/res/mipmap-xhdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified WordPress/src/jetpack/res/mipmap-xxhdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified WordPress/src/jetpack/res/mipmap-xxxhdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 2244362

Please sign in to comment.