Merge pull request #34 from Cellulo-Hub-Team/antoine

Antoine

android/app/src/main/AndroidManifest.xml

@@ -8,9 +8,9 @@
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <application
-        android:label="cellulo_hub"
+        android:label="Cellulo Hub"
         android:name="${applicationName}"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/launcher_icon"
         android:requestLegacyExternalStorage="true">
 
         <activity

ios/Runner.xcodeproj/project.pbxproj

@@ -478,4 +478,4 @@
 /* End XCConfigurationList section */
 	};
 	rootObject = 97C146E61CF9000F007C117D /* Project object */;
-}
+}

lib/game/game_panel_list.dart

@@ -83,6 +83,8 @@ class _GamePanelListState extends State<GamePanelList>
           onPressedTertiary: () => widget.onPressedTertiary!(_game),
         ),
         isExpanded: _game.isExpanded,
-        canTapOnHeader: true);
+        canTapOnHeader: true,
+        //hasIcon: false //TODO remove to pass tests
+    );
   }
 }

lib/main/shop.dart

@@ -124,9 +124,6 @@ class _ShopState extends State<Shop>
       if (_trendingDescriptionDisplayed && _index == _trendingDecriptionIndex) {
         _trendingController.reverse();
         _trendingDescriptionDisplayed = !_trendingDescriptionDisplayed;
-        /*Future.delayed(
-            const Duration(milliseconds: 300),
-                () => _trendingDescriptionDisplayed = !_trendingDescriptionDisplayed);*/ //TODO find fix to restore
       } else if (!_trendingDescriptionDisplayed) {
         Common.percentageController.reset();
         Common.percentageController.forward();
@@ -361,7 +358,7 @@ class _ShopState extends State<Shop>
         },
         child: GameBody(
           game: _game,
-          index: 0, //TODO actual index
+          index: Common.allGamesList.length + _trendingDecriptionIndex,
           isDescription: false,
           onPressedPrimary: () => _onPressedPrimary(_game),
         ));
@@ -403,7 +400,7 @@ class _ShopState extends State<Shop>
                               context,
                               GameDescription(
                                 game: _game,
-                                index: 0, //TODO actual index
+                                index: Common.allGamesList.length + _trendingDecriptionIndex,
                                 onPressedPrimary: () =>
                                     _onPressedPrimary(_game),
                               ),

lib/main/welcome_screen.dart

@@ -38,7 +38,7 @@ class _WelcomeScreenState extends State<WelcomeScreen> {
   void initState() {
     super.initState();
     Future.delayed(
-        const Duration(seconds: 1), //TODO use 3 for final release
+        const Duration(seconds: 3),
         () => {
               Navigator.push(
                 context,

pubspec.yaml

@@ -64,8 +64,10 @@ dependencies:
   ext_storage: ^1.0.3
   permission_handler: ^9.2.0
   firebase_auth_mocks: ^0.8.4
+  flutter_launcher_icons: ^0.9.3
 
 dev_dependencies:
+  flutter_launcher_icons: "^0.9.3"
   flutter_test:
     sdk: flutter
 
@@ -79,6 +81,11 @@ dev_dependencies:
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
+flutter_icons:
+  android: "launcher_icon"
+  ios: true
+  image_path: "graphics/logo_app.png"
+
 # The following section is specific to Flutter.
 flutter: