Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into master
Browse files Browse the repository at this point in the history 
# Conflicts:
#	app/src/main/res/mipmap-hdpi/ic_launcher.png
#	app/src/main/res/mipmap-mdpi/ic_launcher.png
#	app/src/main/res/mipmap-xhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxhdpi/ic_launcher.png
#	app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  • Loading branch information
@KipJM
KipJM committed Apr 19, 2023
2 parents f9c7b98 + fa15666 commit 6e9b0fe
Show file tree
Hide file tree
Showing 14 changed files with 180 additions and 0 deletions.
83 changes: 83 additions & 0 deletions app/src/main/res/drawable-v24/adaptive.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="115.2"
android:viewportHeight="115.2">
<group android:scaleX="0.62"
android:scaleY="0.62"
android:translateX="21.888"
android:translateY="21.888">
<path
android:pathData="m26.58,34.1c0,0 -3.62,0.35 -5.16,2.22 -0.8,0.97 -1.35,3.15 -1.38,5.25 -0.03,1.96 0.13,4.14 0.6,5.18 0.31,0.67 0.77,1.36 1.13,1.82 1.49,1.87 3.36,2.3 5.32,2.3 1.25,0 3.81,-1 4.91,-2.44 1.35,-1.78 2.51,-3.98 2.43,-5.73 -0.14,-3.18 -0.84,-8.59 -7.85,-8.59zM25.29,36.08a3.25,3.63 0,0 1,3.25 3.63,3.25 3.63,0 0,1 -3.25,3.63 3.25,3.63 0,0 1,-3.25 -3.63,3.25 3.63,0 0,1 3.25,-3.63z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m87.6,33.99c0,0 -3.62,0.35 -5.16,2.22 -0.8,0.97 -1.35,3.15 -1.38,5.25 -0.03,1.96 0.13,4.14 0.6,5.18 0.31,0.67 0.77,1.36 1.13,1.82 1.49,1.87 3.36,2.3 5.32,2.3 1.25,0 3.81,-1 4.91,-2.44 1.35,-1.78 2.51,-3.98 2.43,-5.73 -0.14,-3.18 -0.84,-8.59 -7.85,-8.59zM86.31,35.98a3.25,3.63 0,0 1,3.25 3.63,3.25 3.63,0 0,1 -3.25,3.63 3.25,3.63 0,0 1,-3.25 -3.63,3.25 3.63,0 0,1 3.25,-3.63z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m51.34,54.19c0,0 0.31,-0.03 2.81,0.06 2.5,0.09 5.64,3.27 0.39,4.42 -5.25,1.16 -9.09,-2.88 -5.39,-4.02 1.41,-0.43 2.19,-0.47 2.19,-0.47z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="M60.56,70.33C66.27,70.56 67.97,74 68.25,77.56c0.28,3.56 0.28,5.28 -0.28,7.31 -0.56,2.03 -2.95,3.61 -5.69,4.22 -1.87,0.42 -3.91,0.45 -6.28,0C53.87,88.69 46.13,86.25 45.28,80.47 44.44,74.69 46.38,72.5 49.16,71.75 51.94,71 53.89,70.45 55.17,70.36 56.66,70.25 60.56,70.33 60.56,70.33Z"
android:strokeLineJoin="miter"
android:strokeWidth="2.3"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m97.66,101.82c-0.24,-0.02 -6.03,-1.71 -9.15,-1.81 -3.12,-0.1 -7.52,-2.11 -9.01,-5.07 -1.49,-2.96 -1.15,-4.28 0.38,-6.13 1.53,-1.85 3.78,-1.33 5.81,-0.16 2.03,1.17 2.45,3.74 9.96,3.88 7.5,0.14 9.46,3.21 10.82,4.53 3.62,3.51 18.46,12.12 20.26,13.02 10.53,5.26 38.24,14.04 36.78,15.91 -1.52,1.95 5.03,13.31 -6.46,12.99 -7.95,-0.22 -41.01,-22.86 -41.42,-22.56 -1.01,0.74 -17.96,-14.6 -17.96,-14.6z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m113.9,53.63c0,0 -3.73,4.1 -15.19,6.64 -11.46,2.53 -8.45,9.09 -7.97,9.65 0.48,0.56 2.47,3.76 8.19,0.32 5.71,-3.44 6.8,-1.17 12.77,-5.13 1.09,-0.72 42.99,-21.18 61.41,-22.28 29.3,-1.74 -14.71,-11.48 -14.86,-13.52 -0.15,-2.11 -35.99,18.23 -35.99,18.23z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m1.95,89.58c0,0 4.41,-1.28 8.56,-1.79 4.15,-0.51 2.02,-0.57 4.95,-2.36 2.93,-1.79 6.46,-0.91 7.71,1.08 1.25,1.99 0.57,5.4 -2.13,6.94 -2.7,1.54 -5.77,3.64 -11.52,4.21 -1.55,0.15 -11.58,3.92 -12.83,4.74 -5.48,3.57 -41.68,45.02 -42.2,42.6 -0.6,-2.77 -21.33,-20.23 -10.16,-32.41 3.33,-3.64 36.52,-17.15 45.2,-20.29 7.33,-2.66 12.43,-2.71 12.43,-2.71z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m-4,59.1c0,0 9.21,2.57 14.24,1.69 5.03,-0.89 10.82,9.09 -0.28,9.37 -11.1,0.28 -15.41,-2.17 -15.41,-2.17l-45.5,-11.23 7.68,-13.04z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m21.43,0.6c0,0 13.15,13.12 15.21,16.66 2.05,3.54 5.19,4.3 7.84,6.88 2.66,2.57 0.68,8.89 -5.35,6.64 -6.03,-2.25 -8.65,-5.39 -10.86,-9.49 -2.21,-4.1 -5.43,-6.56 -6.72,-7.04 -1.29,-0.48 -8.97,-13.13 -8.97,-13.13 -15.96,-20.8 -12.59,-24.44 -25.89,-33.87l-5.39,-2.85 29.01,-7.45c1.84,12.49 2.93,18.4 5.85,31.45 1.77,7.91 3.89,8.96 5.27,12.22z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m84.95,11.47c0,0 -9.74,12.07 -14.8,13.68 -5.07,1.61 -3.62,12.67 5.43,7.2 9.05,-5.47 16.61,-15.49 16.61,-15.49l12.51,-15.92 16.33,-43.04 -21.43,1.22 -8.44,41.41z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
</group>
</vector>
55 changes: 55 additions & 0 deletions app/src/main/res/drawable-v24/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="49.129"
android:viewportHeight="49.129">
<path
android:pathData="M0,0h49.129v49.129h-49.129z"
android:strokeLineJoin="round"
android:strokeWidth="0.426466"
android:fillColor="#3198e8"
android:strokeColor="#00000000"
android:strokeLineCap="round"/>
<path
android:pathData="m35.806,35.391c-0.064,-0.005 -1.597,-0.452 -2.421,-0.479 -0.825,-0.027 -1.99,-0.559 -2.384,-1.341 -0.394,-0.782 -0.303,-1.134 0.101,-1.623 0.404,-0.49 1,-0.351 1.538,-0.043 0.538,0.309 0.649,0.99 2.634,1.027 1.985,0.037 2.502,0.848 2.863,1.197 0.959,0.928 4.884,3.208 5.36,3.445 2.785,1.392 10.117,3.715 9.731,4.208 -0.403,0.515 1.332,3.522 -1.71,3.438 -2.103,-0.058 -10.851,-6.048 -10.959,-5.968 -0.267,0.195 -4.752,-3.862 -4.752,-3.862z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m40.103,22.64c0,0 -0.986,1.086 -4.02,1.756 -3.033,0.671 -2.235,2.405 -2.107,2.554 0.128,0.149 0.655,0.995 2.166,0.085 1.511,-0.91 1.799,-0.309 3.379,-1.357 0.287,-0.191 11.375,-5.605 16.249,-5.895 7.751,-0.461 -3.891,-3.037 -3.931,-3.578 -0.041,-0.558 -9.522,4.823 -9.522,4.823z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m10.484,32.152c0,0 1.167,-0.339 2.265,-0.474 1.099,-0.135 0.534,-0.151 1.31,-0.625 0.775,-0.474 1.708,-0.241 2.04,0.286 0.331,0.527 0.151,1.43 -0.564,1.836 -0.715,0.406 -1.528,0.963 -3.048,1.114 -0.409,0.041 -3.063,1.038 -3.394,1.253 -1.451,0.943 -11.028,11.912 -11.167,11.271 -0.158,-0.732 -5.643,-5.351 -2.689,-8.575 0.882,-0.962 9.663,-4.538 11.959,-5.37 1.941,-0.703 3.288,-0.717 3.288,-0.717z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m8.909,24.087c0,0 2.437,0.681 3.768,0.447 1.33,-0.234 2.863,2.405 -0.075,2.48 -2.938,0.075 -4.077,-0.575 -4.077,-0.575l-12.038,-2.971 2.032,-3.451z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m15.636,8.611c0,0 3.48,3.47 4.023,4.407 0.543,0.937 1.373,1.139 2.076,1.82 0.702,0.681 0.181,2.352 -1.416,1.756 -1.597,-0.596 -2.288,-1.426 -2.874,-2.512 -0.585,-1.086 -1.437,-1.735 -1.777,-1.863 -0.341,-0.128 -2.374,-3.475 -2.374,-3.475 -4.222,-5.505 -3.331,-6.466 -6.849,-8.961l-1.426,-0.754 7.676,-1.972c0.486,3.306 0.775,4.869 1.548,8.322 0.469,2.093 1.029,2.371 1.393,3.233z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="m32.442,11.485c0,0 -2.576,3.193 -3.917,3.619 -1.341,0.426 -0.958,3.353 1.437,1.905 2.395,-1.448 4.396,-4.098 4.396,-4.098l3.309,-4.211 4.32,-11.387 -5.671,0.323 -2.234,10.955z"
android:strokeLineJoin="miter"
android:strokeWidth="0.264583"
android:fillColor="#2a76d0"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
</vector>
41 changes: 41 additions & 0 deletions app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="115.2"
android:viewportHeight="115.2">
<group android:scaleX="0.62"
android:scaleY="0.62"
android:translateX="21.888"
android:translateY="21.888">
<path
android:pathData="m26.58,34.1c0,0 -3.62,0.35 -5.16,2.22 -0.8,0.97 -1.35,3.15 -1.38,5.25 -0.03,1.96 0.13,4.14 0.6,5.18 0.31,0.67 0.77,1.36 1.13,1.82 1.49,1.87 3.36,2.3 5.32,2.3 1.25,0 3.81,-1 4.91,-2.44 1.35,-1.78 2.51,-3.98 2.43,-5.73 -0.14,-3.18 -0.84,-8.59 -7.85,-8.59zM25.29,36.08a3.25,3.63 0,0 1,3.25 3.63,3.25 3.63,0 0,1 -3.25,3.63 3.25,3.63 0,0 1,-3.25 -3.63,3.25 3.63,0 0,1 3.25,-3.63z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m87.6,33.99c0,0 -3.62,0.35 -5.16,2.22 -0.8,0.97 -1.35,3.15 -1.38,5.25 -0.03,1.96 0.13,4.14 0.6,5.18 0.31,0.67 0.77,1.36 1.13,1.82 1.49,1.87 3.36,2.3 5.32,2.3 1.25,0 3.81,-1 4.91,-2.44 1.35,-1.78 2.51,-3.98 2.43,-5.73 -0.14,-3.18 -0.84,-8.59 -7.85,-8.59zM86.31,35.98a3.25,3.63 0,0 1,3.25 3.63,3.25 3.63,0 0,1 -3.25,3.63 3.25,3.63 0,0 1,-3.25 -3.63,3.25 3.63,0 0,1 3.25,-3.63z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:strokeLineCap="butt"/>
<path
android:pathData="m51.34,54.19c0,0 0.31,-0.03 2.81,0.06 2.5,0.09 5.64,3.27 0.39,4.42 -5.25,1.16 -9.09,-2.88 -5.39,-4.02 1.41,-0.43 2.19,-0.47 2.19,-0.47z"
android:strokeLineJoin="miter"
android:strokeWidth="1"
android:fillColor="#000000"
android:strokeColor="#00000000"
android:strokeLineCap="butt"/>
<path
android:pathData="M60.56,70.33C66.27,70.56 67.97,74 68.25,77.56c0.28,3.56 0.28,5.28 -0.28,7.31 -0.56,2.03 -2.95,3.61 -5.69,4.22 -1.87,0.42 -3.91,0.45 -6.28,0C53.87,88.69 46.13,86.25 45.28,80.47 44.44,74.69 46.38,72.5 49.16,71.75 51.94,71 53.89,70.45 55.17,70.36 56.66,70.25 60.56,70.33 60.56,70.33Z"
android:strokeLineJoin="miter"
android:strokeWidth="2.3"
android:fillColor="#818181"
android:strokeColor="#000000"
android:strokeLineCap="butt"/>
</group>
</vector>
1 change: 1 addition & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/adaptive"/>
</adaptive-icon>
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_background.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_background.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_background.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
View file
Binary file not shown.

0 comments on commit 6e9b0fe

Please sign in to comment.