Skip to content

Commit

Permalink
Merge a3a9beb into 88eb438
Browse files Browse the repository at this point in the history
  • Loading branch information
@Steve-Mr
Steve-Mr authored May 2, 2024
2 parents 88eb438 + a3a9beb commit 8c7cd97
Show file tree
Hide file tree
Showing 27 changed files with 80 additions and 14 deletions.
Binary file modified app/src/main/ic_launcher-playstore.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.
43 changes: 35 additions & 8 deletions app/src/main/res/drawable/ic_launcher_foreground.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,40 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="41.37931"
android:viewportHeight="41.37931"
android:tint="#FFFFFF">
<group android:translateX="8.689655"
android:translateY="8.689655">
<path
android:fillColor="#FF000000"
android:pathData="M23,8c0,1.1 -0.9,2 -2,2 -0.18,0 -0.35,-0.02 -0.51,-0.07l-3.56,3.55c0.05,0.16 0.07,0.34 0.07,0.52 0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-0.18 0.02,-0.36 0.07,-0.52l-2.55,-2.55c-0.16,0.05 -0.34,0.07 -0.52,0.07s-0.36,-0.02 -0.52,-0.07l-4.55,4.56c0.05,0.16 0.07,0.33 0.07,0.51 0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2 0.9,-2 2,-2c0.18,0 0.35,0.02 0.51,0.07l4.56,-4.55C8.02,9.36 8,9.18 8,9c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,0.18 -0.02,0.36 -0.07,0.52l2.55,2.55c0.16,-0.05 0.34,-0.07 0.52,-0.07s0.36,0.02 0.52,0.07l3.55,-3.56C19.02,8.35 19,8.18 19,8c0,-1.1 0.9,-2 2,-2s2,0.9 2,2z"/>
android:viewportWidth="511.98"
android:viewportHeight="511.98">
<group android:scaleX="0.39722222"
android:scaleY="0.39722222"
android:translateX="144.30508"
android:translateY="154.30508">
<path
android:pathData="M330.68,32.03h21.34v42.65h-21.34z"
android:fillColor="#AAB2BC"/>
<path
android:pathData="M158.81,170.62c0.41,0.05 0.83,0.08 1.23,0.08h341.28c5.89,0 10.66,-4.76 10.66,-10.66v-64.06c0,-2.83 -1.13,-5.53 -3.13,-7.53s-4.7,-3.13 -7.53,-3.13H170.71v-0.09h-10.67c-42.75,0 -82.93,16.64 -113.17,46.87C16.66,162.32 0,202.52 0,245.27c0,42.73 16.66,82.93 46.87,113.15c27.7,27.7 63.76,43.98 102.5,46.51v0.36h10.67h10.67h181.24c41.15,0 74.65,33.5 74.65,74.65c0,5.89 4.76,10.67 10.65,10.67h64.06c5.89,0 10.66,-4.78 10.66,-10.67c0,-42.75 -16.64,-82.93 -46.87,-113.15c-27.7,-27.7 -63.76,-43.98 -102.5,-46.53v-0.34H170.71h-10.67c-41.17,0 -74.65,-33.5 -74.65,-74.65C85.39,204.51 118.21,171.29 158.81,170.62z"
android:fillColor="#5D9CEC"/>
<path
android:pathData="M351.95,415.97c-5.89,0 -10.67,-4.78 -10.67,-10.67v-85.37c0,-5.89 4.78,-10.67 10.67,-10.67c5.88,0 10.65,4.78 10.65,10.67v85.37C362.61,411.19 357.83,415.97 351.95,415.97z"
android:fillColor="#4A89DC"/>
<path
android:pathData="M160.04,415.97c-5.89,0 -10.67,-4.78 -10.67,-10.67v-85.37c0,-5.89 4.78,-10.67 10.67,-10.67c5.89,0 10.67,4.78 10.67,10.67v85.37C170.71,411.19 165.93,415.97 160.04,415.97z"
android:fillColor="#4A89DC"/>
<path
android:pathData="M160.04,181.37c-5.89,0 -10.67,-4.78 -10.67,-10.67V85.32c0,-5.89 4.78,-10.67 10.67,-10.67c5.89,0 10.67,4.78 10.67,10.67v85.37C170.71,176.59 165.93,181.37 160.04,181.37z"
android:fillColor="#4A89DC"/>
<path
android:pathData="M423.55,67.14c-2,-2 -4.72,-3.11 -7.55,-3.11H266.69c-5.89,0 -10.67,4.76 -10.67,10.66v106.65c0,2.83 1.13,5.55 3.13,7.55s4.72,3.13 7.55,3.13H416c5.89,0 10.67,-4.78 10.67,-10.67V74.68C426.67,71.86 425.55,69.14 423.55,67.14z"
android:fillColor="#656D78"/>
<path
android:pathData="M423.55,67.14c-2,-2 -4.72,-3.11 -7.55,-3.11H266.69c-5.89,0 -10.67,4.76 -10.67,10.66v106.65c0,2.83 1.13,5.55 3.13,7.55s4.72,3.13 7.55,3.13H416c5.89,0 10.67,-4.78 10.67,-10.67V74.68C426.67,71.86 425.55,69.14 423.55,67.14z"
android:fillColor="#656D78"/>
<path
android:pathData="M426.67,170.67c0,5.89 -4.78,10.67 -10.67,10.67H266.69c-2.83,0 -5.55,-1.13 -7.55,-3.13s-3.13,-4.72 -3.13,-7.55v10.67c0,2.83 1.13,5.55 3.13,7.55s4.72,3.13 7.55,3.13H416c5.89,0 10.67,-4.78 10.67,-10.67V74.68l0,0V170.67z"
android:strokeAlpha="0.2"
android:fillColor="#FFFFFF"
android:fillAlpha="0.2"/>
<path
android:pathData="M384,42.69h-85.31c-5.89,0 -10.67,-4.77 -10.67,-10.66s4.78,-10.67 10.67,-10.67h85.31c5.89,0 10.67,4.78 10.67,10.67S389.89,42.69 384,42.69z"
android:fillColor="#ffffff"/>
</group>
</vector>
39 changes: 39 additions & 0 deletions app/src/main/res/drawable/ic_launcher_monochrome.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="511.98"
android:viewportHeight="511.98">
<group android:scaleX="0.39722222"
android:scaleY="0.39722222"
android:translateX="144.30508"
android:translateY="154.30508">
<path
android:pathData="M330.68,32.03h21.34v42.65h-21.34z"
android:fillColor="#5f000000"/>
<path
android:pathData="M158.81,170.62c0.41,0.05 0.83,0.08 1.23,0.08h341.28c5.89,0 10.66,-4.76 10.66,-10.66v-64.06c0,-2.83 -1.13,-5.53 -3.13,-7.53s-4.7,-3.13 -7.53,-3.13H170.71v-0.09h-10.67c-42.75,0 -82.93,16.64 -113.17,46.87C16.66,162.32 0,202.52 0,245.27c0,42.73 16.66,82.93 46.87,113.15c27.7,27.7 63.76,43.98 102.5,46.51v0.36h10.67h10.67h181.24c41.15,0 74.65,33.5 74.65,74.65c0,5.89 4.76,10.67 10.65,10.67h64.06c5.89,0 10.66,-4.78 10.66,-10.67c0,-42.75 -16.64,-82.93 -46.87,-113.15c-27.7,-27.7 -63.76,-43.98 -102.5,-46.53v-0.34H170.71h-10.67c-41.17,0 -74.65,-33.5 -74.65,-74.65C85.39,204.51 118.21,171.29 158.81,170.62z"
android:fillColor="#4f000000"/>
<path
android:pathData="M351.95,415.97c-5.89,0 -10.67,-4.78 -10.67,-10.67v-85.37c0,-5.89 4.78,-10.67 10.67,-10.67c5.88,0 10.65,4.78 10.65,10.67v85.37C362.61,411.19 357.83,415.97 351.95,415.97z"
android:fillColor="#000000"/>
<path
android:pathData="M160.04,415.97c-5.89,0 -10.67,-4.78 -10.67,-10.67v-85.37c0,-5.89 4.78,-10.67 10.67,-10.67c5.89,0 10.67,4.78 10.67,10.67v85.37C170.71,411.19 165.93,415.97 160.04,415.97z"
android:fillColor="#000000"/>
<path
android:pathData="M160.04,181.37c-5.89,0 -10.67,-4.78 -10.67,-10.67V85.32c0,-5.89 4.78,-10.67 10.67,-10.67c5.89,0 10.67,4.78 10.67,10.67v85.37C170.71,176.59 165.93,181.37 160.04,181.37z"
android:fillColor="#000000"/>
<path
android:pathData="M423.55,67.14c-2,-2 -4.72,-3.11 -7.55,-3.11H266.69c-5.89,0 -10.67,4.76 -10.67,10.66v106.65c0,2.83 1.13,5.55 3.13,7.55s4.72,3.13 7.55,3.13H416c5.89,0 10.67,-4.78 10.67,-10.67V74.68C426.67,71.86 425.55,69.14 423.55,67.14z"
android:fillColor="#df000000"/>
<path
android:pathData="M423.55,67.14c-2,-2 -4.72,-3.11 -7.55,-3.11H266.69c-5.89,0 -10.67,4.76 -10.67,10.66v106.65c0,2.83 1.13,5.55 3.13,7.55s4.72,3.13 7.55,3.13H416c5.89,0 10.67,-4.78 10.67,-10.67V74.68C426.67,71.86 425.55,69.14 423.55,67.14z"
android:fillColor="#00000000"/>
<path
android:pathData="M426.67,170.67c0,5.89 -4.78,10.67 -10.67,10.67H266.69c-2.83,0 -5.55,-1.13 -7.55,-3.13s-3.13,-4.72 -3.13,-7.55v10.67c0,2.83 1.13,5.55 3.13,7.55s4.72,3.13 7.55,3.13H416c5.89,0 10.67,-4.78 10.67,-10.67V74.68l0,0V170.67z"
android:strokeAlpha="0.2"
android:fillColor="#2fffffff" />
<path
android:pathData="M384,42.69h-85.31c-5.89,0 -10.67,-4.77 -10.67,-10.66s4.78,-10.67 10.67,-10.67h85.31c5.89,0 10.67,4.78 10.67,10.67S389.89,42.69 384,42.69z"
android:fillColor="#ffffff"/>
</group>
</vector>
2 changes: 1 addition & 1 deletion app/src/main/res/drawable/ic_setter.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="36dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="36dp">

<path android:fillColor="@android:color/white" android:pathData="M10,13c0.55,0 1,0.45 1,1s-0.45,1 -1,1s-1,-0.45 -1,-1S9.45,13 10,13M10,11c-1.66,0 -3,1.34 -3,3s1.34,3 3,3s3,-1.34 3,-3S11.66,11 10,11L10,11zM18.5,9l1.09,-2.41L22,5.5l-2.41,-1.09L18.5,2l-1.09,2.41L15,5.5l2.41,1.09L18.5,9zM21.28,12.72L20.5,11l-0.78,1.72L18,13.5l1.72,0.78L20.5,16l0.78,-1.72L23,13.5L21.28,12.72zM16.25,14c0,-0.12 0,-0.25 -0.01,-0.37l1.94,-1.47l-2.5,-4.33l-2.24,0.94c-0.2,-0.13 -0.42,-0.26 -0.64,-0.37L12.5,6h-5L7.2,8.41C6.98,8.52 6.77,8.65 6.56,8.78L4.32,7.83l-2.5,4.33l1.94,1.47C3.75,13.75 3.75,13.88 3.75,14s0,0.25 0.01,0.37l-1.94,1.47l2.5,4.33l2.24,-0.94c0.2,0.13 0.42,0.26 0.64,0.37L7.5,22h5l0.3,-2.41c0.22,-0.11 0.43,-0.23 0.64,-0.37l2.24,0.94l2.5,-4.33l-1.94,-1.47C16.25,14.25 16.25,14.12 16.25,14zM14.83,17.64l-1.73,-0.73c-0.56,0.6 -1.3,1.04 -2.13,1.23L10.73,20H9.27l-0.23,-1.86c-0.83,-0.19 -1.57,-0.63 -2.13,-1.23l-1.73,0.73l-0.73,-1.27l1.49,-1.13c-0.12,-0.39 -0.18,-0.8 -0.18,-1.23c0,-0.43 0.06,-0.84 0.18,-1.23l-1.49,-1.13l0.73,-1.27l1.73,0.73c0.56,-0.6 1.3,-1.04 2.13,-1.23L9.27,8h1.47l0.23,1.86c0.83,0.19 1.57,0.63 2.13,1.23l1.73,-0.73l0.73,1.27l-1.49,1.13c0.12,0.39 0.18,0.8 0.18,1.23c0,0.43 -0.06,0.84 -0.18,1.23l1.49,1.13L14.83,17.64z"/>

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>
4 changes: 2 additions & 2 deletions app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
<monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
</adaptive-icon>
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-hdpi/ic_launcher_round.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-mdpi/ic_launcher_round.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
View file
Binary file not shown.
Binary file removed app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
View file
Binary file not shown.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/res/values/ic_launcher_background.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#FFEB3B</color>
<color name="ic_launcher_background">#F8BBD0</color>
</resources>

0 comments on commit 8c7cd97

Please sign in to comment.