diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index e560150..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "dart.flutterSdkPath": ".fvm/versions/3.29.3" -} \ No newline at end of file diff --git a/lib/core/constants/assets.dart b/lib/core/constants/assets.dart index 700a2c0..ef6a7c8 100644 --- a/lib/core/constants/assets.dart +++ b/lib/core/constants/assets.dart @@ -7,4 +7,7 @@ class AssetsManager { static const passwordIcon = 'assets/svgs/password_icon.svg'; static const passwordVisibility = 'assets/svgs/password_visibility.svg'; static const passwordVisibilityOff = 'assets/svgs/password_visibility.svg'; + + // tenders page + static const tenderLogo = 'assets/icons/tenderLogo.png'; } diff --git a/lib/core/constants/colors.dart b/lib/core/constants/colors.dart index 4cffacd..aaf487f 100644 --- a/lib/core/constants/colors.dart +++ b/lib/core/constants/colors.dart @@ -20,4 +20,6 @@ class AppColors { static const Color successColor = Color(0xFF28A745); static const Color errorColor = Color(0xFFDC3545); static const Color warningColor = Color(0xFFFFC107); + + static const Color grey70 = Color(0xFF444444); } diff --git a/lib/core/constants/strings.dart b/lib/core/constants/strings.dart index e08b27c..486ed98 100644 --- a/lib/core/constants/strings.dart +++ b/lib/core/constants/strings.dart @@ -32,4 +32,7 @@ class AppStrings { static const String tenderValue = 'Tender Value'; static const String thunderStatus = 'Thunder status'; static const String yourTenders = 'Your tenders'; + + //Tenders + static const String tendersTitle = 'Tenders'; } diff --git a/lib/views/home/statistics_card.dart b/lib/views/home/statistics_card.dart index d6aa597..6e29584 100644 --- a/lib/views/home/statistics_card.dart +++ b/lib/views/home/statistics_card.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import 'package:flutter_svg/svg.dart'; +import 'package:flutter_svg/flutter_svg.dart'; import '../../core/utils/size_config.dart'; diff --git a/lib/views/tenders/tenders_screen.dart b/lib/views/tenders/tenders_screen.dart index cd24651..7d0175f 100644 --- a/lib/views/tenders/tenders_screen.dart +++ b/lib/views/tenders/tenders_screen.dart @@ -1,5 +1,8 @@ import 'package:flutter/material.dart'; +import '../../core/constants/assets.dart'; +import '../../core/constants/colors.dart'; +import '../../core/constants/strings.dart'; import '../../core/utils/size_config.dart'; class TendersScreen extends StatelessWidget { @@ -10,7 +13,29 @@ class TendersScreen extends StatelessWidget { return Scaffold( body: Padding( padding: EdgeInsets.symmetric(horizontal: 24.0.w(), vertical: 24.0.h()), - child: Column(children: [Text('Tenders')]), + child: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + AppStrings.tendersTitle, + style: TextStyle( + fontSize: 20.0.sp(), + fontWeight: FontWeight.w600, + color: AppColors.grey70, + ), + ), + Image.asset( + AssetsManager.tenderLogo, + width: 59.0.w(), + height: 28.0.h(), + fit: BoxFit.cover, + ), + ], + ), + ], + ), ), ); } diff --git a/pubspec.yaml b/pubspec.yaml index 804551f..775a829 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,76 +1,38 @@ name: tm_app description: "tender managment." -publish_to: 'none' # Remove this line if you wish to publish to pub.dev +publish_to: 'none' version: 1.0.0+1 environment: sdk: ^3.7.2 -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. dependencies: flutter: sdk: flutter - - provider: ^6.1.5 - flutter_svg: ^2.2.0 - freezed: ^3.1.0 - freezed_annotation: ^3.1.0 - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 provider: ^6.1.5 freezed: ^3.1.0 freezed_annotation: ^3.1.0 + flutter_svg: ^2.2.0 dev_dependencies: flutter_test: sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. flutter_lints: ^5.0.0 build_runner: ^2.5.4 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec -# The following section is specific to Flutter packages. flutter: - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - # To add assets to your application, add an assets section, like this: assets: - assets/icons/ - assets/svgs/ - assets/pngs/ - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/to/resolution-aware-images - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/to/asset-from-package - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: + # fonts: # - family: Schyler # fonts: