Merge branch 'feature/rework_icon' into develop

app/build.gradle

@@ -2,8 +2,8 @@
 apply plugin: 'com.android.application'
 
 ext.versionMajor = 0
-ext.versionMinor = 50
+ext.versionMinor = 55
-ext.versionPatch = 20210929
+ext.versionPatch = 20211003
 ext.versionClassifier = null
 ext.isSnapshot = false
 ext.minimumSdkVersion = defaultMinSdkVersion

app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
     <application
         android:fullBackupContent="true"
         android:hardwareAccelerated="true"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
@@ -19,7 +19,8 @@
         <activity
             android:name=".DrugListActivity"
             android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/res/drawable/ic_icon_officielle_android.xml

@@ -1,33 +1,29 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="1024dp"
     android:height="1024dp"
     android:viewportWidth="1024"
-    android:viewportHeight="1024"
+    android:viewportHeight="1024">
-    tools:ignore="VectorRaster">
   <path
       android:pathData="M0,0h1024v1024h-1024z"
       android:strokeWidth="2"
       android:fillColor="#2c75ff"
       android:strokeColor="#00000000"
-      android:fillType="nonZero"
+      android:fillType="nonZero"/>
-      android:fillAlpha="1"/>
   <path
       android:pathData="M270.22,598.75C100.34,496.76 112.04,503.85 103.99,498.08 97.09,493.14 83.3,480.94 77.72,474.84 54.48,449.45 39.25,418.26 32.91,383.12 31.24,373.86 29.8,349.63 30.41,341.17 33.3,301.26 47.02,265.54 70.82,235.94 123.21,170.8 211.33,152.85 283.15,192.69c8.33,4.62 308.41,186.09 308.98,186.46 0.64,0.43 -1.77,0.5 -3.69,1.79 -43.37,28.95 -86.69,76.32 -118.01,129.03 -26.24,44.17 -44.75,95.02 -50.07,137.56 -1.65,13.19 -1.98,28.66 -1.39,36.02 0.17,2.08 0.49,4.23 0.24,4.25 -0.25,0.02 -67.76,-40.29 -148.99,-89.05z"
       android:fillColor="#ff0000"
       android:strokeColor="#00000000"
-      android:fillType="evenOdd"
+      android:fillType="evenOdd"/>
-      android:fillAlpha="1"/>
   <path
       android:pathData="m780.26,882.05c-1.22,-0.11 -6.22,-0.35 -11.1,-0.51 -18.42,-0.63 -37.94,-6.33 -55.42,-16.17 -4.98,-2.8 -74.42,-44.42 -154.31,-92.48l-145.25,-87.38 0.11,-11.72c0.12,-13.28 3.18,-32.51 8.11,-51.04 23.6,-88.72 84.95,-183.58 155.56,-240.53 4.14,-3.34 8.25,-6.18 9.18,-6.05 2.62,0.35 293.81,176.26 303.96,183.26 28.37,19.55 48.24,52.78 55.9,93.46 2.93,15.59 2.78,44.99 -0.32,62.58 -6.28,35.63 -19.82,66.45 -41.79,95.14 -21.43,27.99 -44.42,46.36 -74.72,59.71 -7.52,3.31 -14.6,5.32 -28.82,8.16 -10.37,2.07 -19.85,3.68 -21.07,3.56v0z"
       android:fillColor="#ebebeb"
       android:strokeColor="#00000000"
-      android:fillType="evenOdd"
+      android:fillType="evenOdd"/>
-      android:fillAlpha="1"/>
   <path
       android:pathData="m268.31,209.94c-55.66,-33.49 -118.17,-29.81 -144.71,7.13 31.24,-23.49 85.79,-21.26 135.58,8.7L861.38,588.14c22.28,13.41 40.35,30.49 53.25,48.82 -9.75,-29.09 -33.17,-58.06 -66.49,-78.11z"
       android:strokeAlpha="0.75"
-      android:strokeWidth="2.1958425"
+      android:strokeWidth="5.649193"
       android:fillColor="#ffffff"
       android:strokeColor="#ffffff"
       android:fillAlpha="0.75"

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,26 +1,27 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group android:scaleX="0.057409793"
+  <group android:scaleX="0.053821683"
-      android:scaleY="0.057409793"
+      android:scaleY="0.053821683"
-      android:translateX="25.96701"
+      android:translateX="27.719072"
-      android:translateY="23.78969">
+      android:translateY="26.953608">
     <path
-        android:pathData="M270.22,598.75C100.34,496.76 112.04,503.85 103.99,498.08 97.09,493.14 83.3,480.94 77.72,474.84 54.48,449.45 39.25,418.26 32.91,383.12 31.24,373.86 29.8,349.63 30.41,341.17 33.3,301.26 47.02,265.54 70.82,235.94 123.21,170.8 211.33,152.85 283.15,192.69c8.33,4.62 308.41,186.09 308.98,186.46 0.64,0.43 -1.77,0.5 -3.69,1.79 -43.37,28.95 -86.69,76.32 -118.01,129.03 -26.24,44.17 -44.75,95.02 -50.07,137.56 -1.65,13.19 -1.98,28.66 -1.39,36.02 0.17,2.08 0.49,4.23 0.24,4.25 -0.25,0.02 -67.76,-40.29 -148.99,-89.05z"
+        android:pathData="M270.22,597.99C100.34,468.26 112.04,477.27 103.99,469.93 97.09,463.64 83.3,448.12 77.72,440.37 54.48,408.06 39.25,368.39 32.91,323.68 31.24,311.91 29.8,281.09 30.41,270.33 33.3,219.55 47.02,174.11 70.82,136.45 123.21,53.59 211.33,30.75 283.15,81.44c8.33,5.88 308.41,236.73 308.98,237.2 0.64,0.54 -1.77,0.64 -3.69,2.27 -43.37,36.83 -86.69,97.08 -118.01,164.15 -26.24,56.19 -44.75,120.88 -50.07,174.99 -1.65,16.78 -1.98,36.46 -1.39,45.82 0.17,2.65 0.49,5.38 0.24,5.41 -0.25,0.03 -67.76,-51.25 -148.99,-113.28z"
         android:fillColor="#ff0000"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="m780.26,882.05c-1.22,-0.11 -6.22,-0.35 -11.1,-0.51 -18.42,-0.63 -37.94,-6.33 -55.42,-16.17 -4.98,-2.8 -74.42,-44.42 -154.31,-92.48l-145.25,-87.38 0.11,-11.72c0.12,-13.28 3.18,-32.51 8.11,-51.04 23.6,-88.72 84.95,-183.58 155.56,-240.53 4.14,-3.34 8.25,-6.18 9.18,-6.05 2.62,0.35 293.81,176.26 303.96,183.26 28.37,19.55 48.24,52.78 55.9,93.46 2.93,15.59 2.78,44.99 -0.32,62.58 -6.28,35.63 -19.82,66.45 -41.79,95.14 -21.43,27.99 -44.42,46.36 -74.72,59.71 -7.52,3.31 -14.6,5.32 -28.82,8.16 -10.37,2.07 -19.85,3.68 -21.07,3.56v0z"
+        android:pathData="m780.26,958.4c-1.22,-0.15 -6.22,-0.44 -11.1,-0.65 -18.42,-0.81 -37.94,-8.05 -55.42,-20.56 -4.98,-3.57 -74.42,-56.51 -154.31,-117.64l-145.25,-111.16 0.11,-14.91c0.12,-16.89 3.18,-41.36 8.11,-64.93 23.6,-112.87 84.95,-233.54 155.56,-305.98 4.14,-4.25 8.25,-7.86 9.18,-7.7 2.62,0.44 293.81,224.23 303.96,233.13 28.37,24.87 48.24,67.14 55.9,118.9 2.93,19.83 2.78,57.23 -0.32,79.62 -6.28,45.32 -19.82,84.53 -41.79,121.03 -21.43,35.6 -44.42,58.97 -74.72,75.96 -7.52,4.22 -14.6,6.77 -28.82,10.38 -10.37,2.64 -19.85,4.68 -21.07,4.53l0,0z"
         android:fillColor="#ebebeb"
         android:strokeColor="#00000000"
         android:fillType="evenOdd"/>
     <path
-        android:pathData="m268.31,209.94c-55.66,-33.49 -118.17,-29.81 -144.71,7.13 31.24,-23.49 85.79,-21.26 135.58,8.7L861.38,588.14c22.28,13.41 40.35,30.49 53.25,48.82 -9.75,-29.09 -33.17,-58.06 -66.49,-78.11z"
+        android:pathData="m268.31,103.38c-55.66,-42.6 -118.17,-37.92 -144.71,9.07 31.24,-29.88 85.79,-27.04 135.58,11.07L861.38,584.5c22.28,17.06 40.35,38.79 53.25,62.1 -9.75,-37 -33.17,-73.86 -66.49,-99.36z"
         android:strokeAlpha="0.75"
-        android:strokeWidth="2.1958425"
+        android:strokeWidth="6.3716674"
         android:fillColor="#ffffff"
         android:strokeColor="#ffffff"
         android:fillAlpha="0.75"