diff --git a/lib/main.dart b/lib/main.dart index 90b7ff8..ec7691b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -13,6 +13,14 @@ class MyApp extends StatelessWidget { theme: ThemeData( primaryColor: Colors.red, accentColor: Color(0xFFFEF9EB), + cardColor: Colors.white, + secondaryHeaderColor: Colors.red + ), + darkTheme: ThemeData( + brightness: Brightness.dark, + secondaryHeaderColor: Colors.tealAccent, + cardColor: Colors.black, + ), home: HomeScreen(), ); diff --git a/lib/screens/chat_screen.dart b/lib/screens/chat_screen.dart index 847749b..d0cb649 100644 --- a/lib/screens/chat_screen.dart +++ b/lib/screens/chat_screen.dart @@ -85,13 +85,13 @@ class _ChatScreenState extends State { return Container( padding: EdgeInsets.symmetric(horizontal: 8.0), height: 70.0, - color: Colors.white, + color: Theme.of(context).cardColor, child: Row( children: [ IconButton( icon: Icon(Icons.photo), iconSize: 25.0, - color: Theme.of(context).primaryColor, + color: Theme.of(context).secondaryHeaderColor, onPressed: () {}, ), Expanded( @@ -106,7 +106,7 @@ class _ChatScreenState extends State { IconButton( icon: Icon(Icons.send), iconSize: 25.0, - color: Theme.of(context).primaryColor, + color: Theme.of(context).secondaryHeaderColor, onPressed: () {}, ), ], @@ -143,7 +143,7 @@ class _ChatScreenState extends State { Expanded( child: Container( decoration: BoxDecoration( - color: Colors.white, + color: Theme.of(context).cardColor, borderRadius: BorderRadius.only( topLeft: Radius.circular(30.0), topRight: Radius.circular(30.0), diff --git a/lib/widgets/recent_chats.dart b/lib/widgets/recent_chats.dart index f855a01..9398de3 100644 --- a/lib/widgets/recent_chats.dart +++ b/lib/widgets/recent_chats.dart @@ -8,7 +8,7 @@ class RecentChats extends StatelessWidget { return Expanded( child: Container( decoration: BoxDecoration( - color: Colors.white, + color: Theme.of(context).cardColor, borderRadius: BorderRadius.only( topLeft: Radius.circular(30.0), topRight: Radius.circular(30.0), diff --git a/pubspec.lock b/pubspec.lock index d0de369..3c64e9e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,62 +1,48 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.10" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.3.0" + version: "2.4.2" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" - charcode: + version: "2.0.0" + characters: dependency: transitive description: - name: charcode + name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" - collection: + version: "1.0.0" + charcode: dependency: transitive description: - name: collection + name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: + version: "1.1.3" + clock: dependency: transitive description: - name: convert + name: clock url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" - crypto: + version: "1.0.1" + collection: dependency: transitive description: - name: crypto + name: collection url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "1.14.13" cupertino_icons: dependency: "direct main" description: @@ -64,6 +50,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -74,55 +67,27 @@ packages: description: flutter source: sdk version: "0.0.0" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" + version: "0.12.8" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.7" + version: "1.1.8" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" - pedantic: - dependency: transitive - description: - name: pedantic - url: "https://pub.dartlang.org" - source: hosted - version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" + version: "1.7.0" sky_engine: dependency: transitive description: flutter @@ -134,14 +99,14 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.7.0" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.9.5" stream_channel: dependency: transitive description: @@ -169,14 +134,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.5" + version: "0.2.17" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.2.0" vector_math: dependency: transitive description: @@ -184,12 +149,5 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: - dart: ">=2.4.0 <3.0.0" + dart: ">=2.9.0-14.0.dev <3.0.0"