diff --git a/google_fonts/Rubik-Black.ttf b/google_fonts/Rubik-Black.ttf new file mode 100644 index 0000000..ac35613 Binary files /dev/null and b/google_fonts/Rubik-Black.ttf differ diff --git a/google_fonts/Rubik-BlackItalic.ttf b/google_fonts/Rubik-BlackItalic.ttf new file mode 100644 index 0000000..aac8ad5 Binary files /dev/null and b/google_fonts/Rubik-BlackItalic.ttf differ diff --git a/google_fonts/Rubik-Bold.ttf b/google_fonts/Rubik-Bold.ttf new file mode 100644 index 0000000..bddc26e Binary files /dev/null and b/google_fonts/Rubik-Bold.ttf differ diff --git a/google_fonts/Rubik-BoldItalic.ttf b/google_fonts/Rubik-BoldItalic.ttf new file mode 100644 index 0000000..531a0c2 Binary files /dev/null and b/google_fonts/Rubik-BoldItalic.ttf differ diff --git a/google_fonts/Rubik-ExtraBold.ttf b/google_fonts/Rubik-ExtraBold.ttf new file mode 100644 index 0000000..184fae7 Binary files /dev/null and b/google_fonts/Rubik-ExtraBold.ttf differ diff --git a/google_fonts/Rubik-ExtraBoldItalic.ttf b/google_fonts/Rubik-ExtraBoldItalic.ttf new file mode 100644 index 0000000..0948bb2 Binary files /dev/null and b/google_fonts/Rubik-ExtraBoldItalic.ttf differ diff --git a/google_fonts/Rubik-Italic.ttf b/google_fonts/Rubik-Italic.ttf new file mode 100644 index 0000000..8ea3722 Binary files /dev/null and b/google_fonts/Rubik-Italic.ttf differ diff --git a/google_fonts/Rubik-Light.ttf b/google_fonts/Rubik-Light.ttf new file mode 100644 index 0000000..0d172b5 Binary files /dev/null and b/google_fonts/Rubik-Light.ttf differ diff --git a/google_fonts/Rubik-LightItalic.ttf b/google_fonts/Rubik-LightItalic.ttf new file mode 100644 index 0000000..4b8e00c Binary files /dev/null and b/google_fonts/Rubik-LightItalic.ttf differ diff --git a/google_fonts/Rubik-Medium.ttf b/google_fonts/Rubik-Medium.ttf new file mode 100644 index 0000000..a4cfd87 Binary files /dev/null and b/google_fonts/Rubik-Medium.ttf differ diff --git a/google_fonts/Rubik-MediumItalic.ttf b/google_fonts/Rubik-MediumItalic.ttf new file mode 100644 index 0000000..93baa01 Binary files /dev/null and b/google_fonts/Rubik-MediumItalic.ttf differ diff --git a/google_fonts/Rubik-Regular.ttf b/google_fonts/Rubik-Regular.ttf new file mode 100644 index 0000000..06a67a2 Binary files /dev/null and b/google_fonts/Rubik-Regular.ttf differ diff --git a/google_fonts/Rubik-SemiBold.ttf b/google_fonts/Rubik-SemiBold.ttf new file mode 100644 index 0000000..3eeeb11 Binary files /dev/null and b/google_fonts/Rubik-SemiBold.ttf differ diff --git a/google_fonts/Rubik-SemiBoldItalic.ttf b/google_fonts/Rubik-SemiBoldItalic.ttf new file mode 100644 index 0000000..a469a4e Binary files /dev/null and b/google_fonts/Rubik-SemiBoldItalic.ttf differ diff --git a/lib/route.dart b/lib/route.dart index 0cd1ec8..23697a0 100644 --- a/lib/route.dart +++ b/lib/route.dart @@ -1,5 +1,6 @@ import 'package:cloudtech_calculator/theme_model.dart'; import 'package:flutter/material.dart'; +import 'package:google_fonts/google_fonts.dart'; import 'package:provider/provider.dart'; class SecondRoute extends StatefulWidget { @@ -43,7 +44,7 @@ class _SecondRouteState extends State { .toggleTheme(); }, ), - ) + ), ], ), )), @@ -61,8 +62,16 @@ class _CursRouteState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - title: Text("Курсы валют в рублях", - style: TextStyle(color: Theme.of(context).accentColor)), + title: Text( + "NOTHING", + style: GoogleFonts.rubik( + fontSize: 18, + fontWeight: FontWeight.w600, + color: Theme.of(context).accentColor, + letterSpacing: 3.06, + ), + textAlign: TextAlign.center, + ), shadowColor: const Color(0x00000000), ), body: Container( @@ -72,25 +81,61 @@ class _CursRouteState extends State { child: ListView( padding: const EdgeInsets.all(8), children: [ - ListTile( - leading: IconButton( - icon: Icon( - Icons.settings_display, - color: Theme.of(context).accentColor, - ), - onPressed: null), - title: Text( - "Светлая тема", - style: TextStyle( - fontWeight: FontWeight.w500, - color: Theme.of(context).accentColor), + Container( + margin: const EdgeInsets.symmetric(vertical: 10.0), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Theme.of(context).backgroundColor, ), - trailing: Switch( - value: Theme.of(context).brightness == Brightness.light, - onChanged: (value) { - Provider.of(context, listen: false) - .toggleTheme(); - }, + child: ListTile( + leading: IconButton( + icon: Icon( + Icons.settings_display, + color: Theme.of(context).accentColor, + ), + onPressed: null), + title: Text( + "USD", + style: GoogleFonts.rubik( + fontSize: 21, + fontWeight: FontWeight.w400, + color: Theme.of(context).accentColor), + ), + trailing: Text( + "77,96 ₽", + style: GoogleFonts.rubik( + fontSize: 21, + fontWeight: FontWeight.w500, + color: Theme.of(context).accentColor), + ), + ), + ), + Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(10), + color: Theme.of(context).backgroundColor, + ), + child: ListTile( + leading: IconButton( + icon: Icon( + Icons.settings_display, + color: Theme.of(context).accentColor, + ), + onPressed: null), + title: Text( + "USD", + style: GoogleFonts.rubik( + fontSize: 21, + fontWeight: FontWeight.w400, + color: Theme.of(context).accentColor), + ), + trailing: Text( + "77,96 ₽", + style: GoogleFonts.rubik( + fontSize: 21, + fontWeight: FontWeight.w500, + color: Theme.of(context).accentColor), + ), ), ) ], diff --git a/lib/theme.dart b/lib/theme.dart index b373ce6..fab2541 100644 --- a/lib/theme.dart +++ b/lib/theme.dart @@ -1,8 +1,9 @@ import 'package:flutter/material.dart'; ThemeData darkTheme = ThemeData( - primaryColor: const Color(0xff131618), - accentColor: Colors.white, + primaryColor: const Color(0xff20274C), + accentColor: const Color(0xffD4D9EC), + backgroundColor: const Color(0xff414d7b), brightness: Brightness.dark, textTheme: const TextTheme(bodyText2: TextStyle(color: Color(0xffffffff))), ); @@ -10,6 +11,7 @@ ThemeData darkTheme = ThemeData( ThemeData lightTheme = ThemeData( primaryColor: Colors.white, accentColor: Colors.green, + backgroundColor: const Color(0xff414d7b), brightness: Brightness.light, textTheme: const TextTheme(bodyText2: TextStyle(color: Colors.green)), ); diff --git a/pubspec.lock b/pubspec.lock index 8f0ba9d..04b9425 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -21,7 +21,7 @@ packages: name: bloc url: "https://pub.dartlang.org" source: hosted - version: "6.0.3" + version: "6.1.0" boolean_selector: dependency: transitive description: @@ -57,6 +57,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.15.0-nullsafety.3" + convert: + dependency: transitive + description: + name: convert + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.1" + crypto: + dependency: transitive + description: + name: crypto + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.5" cupertino_icons: dependency: "direct main" description: @@ -71,6 +85,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.0-nullsafety.1" + ffi: + dependency: transitive + description: + name: ffi + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.3" + file: + dependency: transitive + description: + name: file + url: "https://pub.dartlang.org" + source: hosted + version: "5.2.1" flutter: dependency: "direct main" description: flutter @@ -88,6 +116,34 @@ packages: description: flutter source: sdk version: "0.0.0" + google_fonts: + dependency: "direct main" + description: + name: google_fonts + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" + http: + dependency: transitive + description: + name: http + url: "https://pub.dartlang.org" + source: hosted + version: "0.12.2" + http_parser: + dependency: transitive + description: + name: http_parser + url: "https://pub.dartlang.org" + source: hosted + version: "3.1.4" + intl: + dependency: transitive + description: + name: intl + url: "https://pub.dartlang.org" + source: hosted + version: "0.16.1" lint: dependency: "direct dev" description: @@ -123,6 +179,69 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0-nullsafety.1" + path_provider: + dependency: transitive + description: + name: path_provider + url: "https://pub.dartlang.org" + source: hosted + version: "1.6.21" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.1+2" + path_provider_macos: + dependency: transitive + description: + name: path_provider_macos + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4+4" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.4+1" + pedantic: + dependency: transitive + description: + name: pedantic + url: "https://pub.dartlang.org" + source: hosted + version: "1.9.2" + platform: + dependency: transitive + description: + name: platform + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.1" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" + process: + dependency: transitive + description: + name: process + url: "https://pub.dartlang.org" + source: hosted + version: "3.0.13" provider: dependency: "direct main" description: @@ -191,6 +310,20 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.1.0-nullsafety.3" + win32: + dependency: transitive + description: + name: win32 + url: "https://pub.dartlang.org" + source: hosted + version: "1.7.3" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.2" sdks: dart: ">=2.10.0-110 <2.11.0" - flutter: ">=1.16.0" + flutter: ">=1.17.0 <2.0.0" diff --git a/pubspec.yaml b/pubspec.yaml index 50ba785..59b1cf3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,20 +1,8 @@ name: cloudtech_calculator description: A new Flutter project. -# The following line prevents the package from being accidentally published to -# pub.dev using `pub publish`. This is preferred for private packages. publish_to: 'none' # Remove this line if you wish to publish to pub.dev -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html version: 1.0.0+1 environment: @@ -25,11 +13,9 @@ dependencies: sdk: flutter auto_size_text: ^2.1.0 bloc: ^6.0.3 - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.0 flutter_bloc: ^6.0.6 + google_fonts: ^1.1.1 provider: ^4.3.2+2 dev_dependencies: @@ -37,39 +23,8 @@ dev_dependencies: sdk: flutter lint: ^1.2.0 -# 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. 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: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/assets-and-images/#resolution-aware. - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/assets-and-images/#from-packages - # 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: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/custom-fonts/#from-packages + + assets: + - google_fonts/ \ No newline at end of file