change icons (#47)

canopas · Jun 18, 2024 · 1a09dfa · 1a09dfa
1 parent ae5568f
commit 1a09dfa
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 32 deletions.
diff --git a/khelo/assets/images/ic_save.svg b/khelo/assets/images/ic_save.svg
diff --git a/khelo/ios/Podfile.lock b/khelo/ios/Podfile.lock
@@ -1198,6 +1198,8 @@ PODS:
     - FlutterMacOS
   - Toast (4.1.1)
   - TOCropViewController (2.7.4)
+  - url_launcher_ios (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - cloud_firestore (from `.symlinks/plugins/cloud_firestore/ios`)
@@ -1215,6 +1217,7 @@ DEPENDENCIES:
   - path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
   - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
   - sqflite (from `.symlinks/plugins/sqflite/darwin`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
 
 SPEC REPOS:
   trunk:
@@ -1279,6 +1282,8 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/shared_preferences_foundation/darwin"
   sqflite:
     :path: ".symlinks/plugins/sqflite/darwin"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
   abseil: d121da9ef7e2ff4cab7666e76c5a3e0915ae08c3
@@ -1325,6 +1330,7 @@ SPEC CHECKSUMS:
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e
   TOCropViewController: 80b8985ad794298fb69d3341de183f33d1853654
+  url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
 
 PODFILE CHECKSUM: 1959d098c91d8a792531a723c4a9d7e9f6a01e38
 

diff --git a/khelo/lib/gen/assets.gen.dart b/khelo/lib/gen/assets.gen.dart
diff --git a/khelo/lib/ui/flow/matches/add_match/add_match_screen.dart b/khelo/lib/ui/flow/matches/add_match/add_match_screen.dart
@@ -96,11 +96,15 @@ class _AddMatchScreenState extends ConsumerState<AddMatchScreen> {
               context: context,
               error: saveBtnError.getString(context),
             ),
-      icon: Icon(
-        Icons.alarm,
-        color: saveBtnError == null
-            ? context.colorScheme.primary
-            : context.colorScheme.textDisabled,
+      icon: SvgPicture.asset(
+        Assets.images.icSave,
+        width: 24,
+        height: 24,
+        colorFilter: ColorFilter.mode(
+            saveBtnError == null
+                ? context.colorScheme.primary
+                : context.colorScheme.textDisabled,
+            BlendMode.srcIn),
       ),
     );
   }

diff --git a/khelo/lib/ui/flow/my_game/my_game_tab_screen.dart b/khelo/lib/ui/flow/my_game/my_game_tab_screen.dart
@@ -9,7 +9,6 @@ import 'package:khelo/ui/flow/my_game/my_game_tab_view_model.dart';
 import 'package:khelo/ui/flow/team/team_list_screen.dart';
 import 'package:khelo/ui/flow/team/team_list_view_model.dart';
 import 'package:style/button/action_button.dart';
-import 'package:style/button/large_icon_button.dart';
 import 'package:style/button/tab_button.dart';
 import 'package:style/extensions/context_extensions.dart';
 
@@ -71,10 +70,6 @@ class _MyGameTabScreenState extends ConsumerState<MyGameTabScreen>
     final notifier = ref.watch(myGameTabViewStateProvider.notifier);
 
     return AppPage(
-      floatingActionButton: Visibility(
-        visible: _selectedTab == 0,
-        child: _floatingAddButton(context),
-      ),
       body: Builder(
         builder: (context) {
           return _content(context, notifier);
@@ -105,9 +100,10 @@ class _MyGameTabScreenState extends ConsumerState<MyGameTabScreen>
 
   Widget _tabView(BuildContext context) {
     return Padding(
-      padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
+      padding: const EdgeInsets.symmetric(vertical: 8),
       child: Row(
         children: [
+          const SizedBox(width: 16),
           TabButton(
             context.l10n.common_matches_title,
             selected: _selectedTab == 0,
@@ -123,35 +119,22 @@ class _MyGameTabScreenState extends ConsumerState<MyGameTabScreen>
               _controller.jumpToPage(1);
             },
           ),
+          const Spacer(),
           if (_selectedTab == 1) ...[
-            const Spacer(),
             actionButton(context,
                 onPressed: () => ref
                     .read(teamListViewStateProvider.notifier)
                     .onFilterButtonTap(),
                 icon: Icon(CupertinoIcons.slider_horizontal_3,
                     color: context.colorScheme.primary)),
-            actionButton(context,
-                onPressed: () => AppRoute.addTeam().push(context),
-                icon: Icon(Icons.add, color: context.colorScheme.primary)),
-          ]
+          ],
+          actionButton(context,
+              onPressed: () => _selectedTab == 1
+                  ? AppRoute.addTeam().push(context)
+                  : AppRoute.addMatch().push(context),
+              icon: Icon(Icons.add, color: context.colorScheme.primary)),
         ],
       ),
     );
   }
-
-  Widget _floatingAddButton(
-    BuildContext context,
-  ) {
-    return LargeIconButton(
-      backgroundColor: context.colorScheme.primary,
-      onTap: () async {
-        AppRoute.addMatch().push(context);
-      },
-      icon: Icon(
-        Icons.add_rounded,
-        color: context.colorScheme.onPrimary,
-      ),
-    );
-  }
 }
diff --git a/khelo/lib/ui/flow/profile/profile_screen.dart b/khelo/lib/ui/flow/profile/profile_screen.dart
@@ -60,7 +60,8 @@ class ProfileScreen extends ConsumerWidget {
                     color: context.colorScheme.textDisabled,
                   ),
                 ),
-              )
+              ),
+              const SizedBox(height: 24),
             ],
           );
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,8 @@ class ProfileScreen extends ConsumerWidget { @@
                         color: context.colorScheme.textDisabled,
                       ),
                     ),
-                  )
+                  ),
+                  const SizedBox(height: 24),
                 ],
               );
             },
@@ Expand Down @@