diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a2cb260..413a3bf 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ - - + - + - + - + - + - + - + - + - + - + - + + C-749.66-54.24-749.66-54.23-749.66-54.22z"/> + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 0000000..9071eb5 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 0000000..31d31f4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 0000000..9e8e229 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 0000000..f60d050 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 0000000..4534586 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 0000000..0318de7 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 0000000..4d5d99b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 0000000..d64aade Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 0000000..08cbb2f Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 0000000..cbfca89 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 0000000..f6c0483 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index d36b1fa..73d3b7f 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,122 +1 @@ -{ - "images" : [ - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "Icon-App-20x20@3x.png", - "scale" : "3x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "Icon-App-29x29@3x.png", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "Icon-App-40x40@3x.png", - "scale" : "3x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@2x.png", - "scale" : "2x" - }, - { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "Icon-App-60x60@3x.png", - "scale" : "3x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@1x.png", - "scale" : "1x" - }, - { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "Icon-App-20x20@2x.png", - "scale" : "2x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@1x.png", - "scale" : "1x" - }, - { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "Icon-App-29x29@2x.png", - "scale" : "2x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@1x.png", - "scale" : "1x" - }, - { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "Icon-App-40x40@2x.png", - "scale" : "2x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@1x.png", - "scale" : "1x" - }, - { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "Icon-App-76x76@2x.png", - "scale" : "2x" - }, - { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "Icon-App-83.5x83.5@2x.png", - "scale" : "2x" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "Icon-App-1024x1024@1x.png", - "scale" : "1x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} +{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"}]} \ No newline at end of file diff --git a/lib/common/widgets/button.dart b/lib/common/widgets/button.dart index 3964a4b..48d1077 100644 --- a/lib/common/widgets/button.dart +++ b/lib/common/widgets/button.dart @@ -44,7 +44,7 @@ class ButtonWidget extends StatelessWidget { child ?? Container(), BoldTextWidget( title, - color: textColor, + color: Colors.white, ).paddingSymmetric(horizontal: 10), ]) : isLoading! @@ -58,7 +58,7 @@ class ButtonWidget extends StatelessWidget { isLoading!), child: BoldTextWidget( title, - color: textColor, + color: Colors.white, ).paddingSymmetric(horizontal: 20), ), SizedBox( @@ -72,7 +72,7 @@ class ButtonWidget extends StatelessWidget { ) : BoldTextWidget( title, - color: textColor, + color: Colors.white, ), ).onTap(() { if (isLoading == null || !isLoading!) onTap(); diff --git a/lib/features/auth/presentation_layer/screens/forgot_password.dart b/lib/features/auth/presentation_layer/screens/forgot_password.dart index 6f855e4..b925e50 100644 --- a/lib/features/auth/presentation_layer/screens/forgot_password.dart +++ b/lib/features/auth/presentation_layer/screens/forgot_password.dart @@ -34,9 +34,9 @@ class ForgotPasswordScreen extends StatelessWidget { RoutingManager.back(); }).paddingOnly(top: 16.0, left: 16.0, right: 16.0), SizedBox( - width: 120, - height: 63, - child: Image.asset(AppAssets.logo), + width: 150, + height: 150, + child: SvgPicture.asset('assets/icons/tafee icon.svg'), ).center().expanded(3), Form( key: _formKey, diff --git a/lib/features/auth/presentation_layer/screens/login.dart b/lib/features/auth/presentation_layer/screens/login.dart index 7e51088..acd3e8c 100644 --- a/lib/features/auth/presentation_layer/screens/login.dart +++ b/lib/features/auth/presentation_layer/screens/login.dart @@ -1,5 +1,6 @@ import 'dart:developer'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:taafee_mobile/common/const/const.dart'; import 'package:taafee_mobile/common/extensions/widget_extension.dart'; @@ -64,10 +65,10 @@ class LoginScreen extends StatelessWidget { ], ), SizedBox( - width: 120, - height: 63, - child: Image.asset(AppAssets.logo), - ).center().expanded(2), + width: 150, + height: 150, + child: SvgPicture.asset('assets/icons/tafee icon.svg'), + ).center().expanded(3), Form( key: _formKey, child: Column( diff --git a/lib/features/auth/presentation_layer/screens/register.dart b/lib/features/auth/presentation_layer/screens/register.dart index 7fe014c..c22d5dd 100644 --- a/lib/features/auth/presentation_layer/screens/register.dart +++ b/lib/features/auth/presentation_layer/screens/register.dart @@ -1,6 +1,7 @@ import 'dart:developer'; import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:taafee_mobile/common/const/const.dart'; import 'package:taafee_mobile/common/extensions/widget_extension.dart'; @@ -75,9 +76,9 @@ class RegisterScreen extends StatelessWidget { ], ), SizedBox( - width: 120, - height: 63, - child: Image.asset(AppAssets.logo), + width: 150, + height: 150, + child: SvgPicture.asset('assets/icons/tafee icon.svg'), ).center().paddingOnly(top: 20).expanded(1), Container( child: Column( diff --git a/lib/features/auth/presentation_layer/screens/reset_password.dart b/lib/features/auth/presentation_layer/screens/reset_password.dart index 2974620..c188617 100644 --- a/lib/features/auth/presentation_layer/screens/reset_password.dart +++ b/lib/features/auth/presentation_layer/screens/reset_password.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:taafee_mobile/common/extensions/widget_extension.dart'; import 'package:taafee_mobile/core/routing/routing_manager.dart'; @@ -26,9 +27,9 @@ class ResetPasswordScreen extends StatelessWidget { // crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox( - width: 120, - height: 63, - child: Image.asset(AppAssets.logo), + width: 150, + height: 150, + child: SvgPicture.asset('assets/icons/tafee icon.svg'), ).center().expanded(3), Form( key: _formKey, diff --git a/lib/features/auth/presentation_layer/screens/verification_code.dart b/lib/features/auth/presentation_layer/screens/verification_code.dart index 4800209..e4cd133 100644 --- a/lib/features/auth/presentation_layer/screens/verification_code.dart +++ b/lib/features/auth/presentation_layer/screens/verification_code.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import 'package:get/get.dart'; import 'package:taafee_mobile/common/const/const.dart'; import 'package:taafee_mobile/common/extensions/widget_extension.dart'; @@ -26,9 +27,9 @@ class VerificationCodeScreen extends StatelessWidget { // crossAxisAlignment: CrossAxisAlignment.center, children: [ SizedBox( - width: 120, - height: 63, - child: Image.asset(AppAssets.logo), + width: 150, + height: 150, + child: SvgPicture.asset('assets/icons/tafee icon.svg'), ).center().expanded(3), Container( child: Column( diff --git a/lib/features/auth/presentation_layer/screens/verification_code_reset_password.dart b/lib/features/auth/presentation_layer/screens/verification_code_reset_password.dart index 54bfa71..ce45f18 100644 --- a/lib/features/auth/presentation_layer/screens/verification_code_reset_password.dart +++ b/lib/features/auth/presentation_layer/screens/verification_code_reset_password.dart @@ -33,9 +33,9 @@ class VerificationCodeResetPasswordScreen extends StatelessWidget { RoutingManager.back(); }).paddingOnly(top: 16.0, left: 16.0, right: 16.0), SizedBox( - width: 120, - height: 63, - child: Image.asset(AppAssets.logo), + width: 150, + height: 150, + child: SvgPicture.asset('assets/icons/tafee icon.svg'), ).center().expanded(3), Container( child: Column( diff --git a/lib/main.dart b/lib/main.dart index d1defa6..56363ed 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:get/get.dart'; import 'package:get_storage/get_storage.dart'; +import 'package:taafee_mobile/common/const/const.dart'; import 'package:taafee_mobile/core/init/dependency_injection.dart'; import 'package:taafee_mobile/core/init/language_init.dart'; import 'package:taafee_mobile/core/localization/localization.dart'; @@ -12,6 +13,7 @@ import 'package:taafee_mobile/features/card/data_layer/source/card_service.dart' import 'common/widgets/notification_message.dart'; import 'core/local_storage/cache_service.dart'; import 'core/local_storage/local_storage.dart'; +import 'core/utils/utils.dart'; import 'features/card/data_layer/model/card_model.dart'; String? fcmToken; @@ -67,7 +69,7 @@ class MyApp extends StatelessWidget { debugShowCheckedModeBanner: false, title: 'Yellow Pages', theme: ThemeData( - primarySwatch: Colors.yellow, + primarySwatch: Utils.createMaterialColor(AppColors.primeColor), ), initialRoute: RouteName.splash, getPages: RoutingManager.pages,