Merge branch 'release/SR02' into develop

isunican · Nov 8, 2024 · 3e37592 · 3e37592
2 parents 01c18cd + db5c86f
commit 3e37592
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...roidTest/java/es/unican/gasolineras/activities/common/MostrarHorarioGasolineraUITest.java b/...roidTest/java/es/unican/gasolineras/activities/common/MostrarHorarioGasolineraUITest.java
@@ -41,7 +41,7 @@
 @UninstallModules(RepositoriesModule.class)
 @HiltAndroidTest
 public class MostrarHorarioGasolineraUITest {
-    @Rule(order = 0)  // the Hilt rule must execute first
+    @Rule(order = 0)  // The Hilt rule must execute first
     public HiltAndroidRule hiltRule = new HiltAndroidRule(this);
     @Rule(order = 1)
     public ActivityScenarioRule<MainView> activityRule = new ActivityScenarioRule<>(MainView.class);

diff --git a/AndroidProject/app/src/main/AndroidManifest.xml b/AndroidProject/app/src/main/AndroidManifest.xml
@@ -9,9 +9,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/generic"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/generic"
         android:supportsRtl="true"
         android:theme="@style/Theme.Gasolineras"
         tools:targetApi="31">

diff --git a/Releases/Gasolineras-00.02.00.24-11-08.apk b/Releases/Gasolineras-00.02.00.24-11-08.apk