Skip to content

Commit

Permalink
fix: update theme colors
Browse files Browse the repository at this point in the history
  • Loading branch information
rafayali committed Jul 9, 2023
1 parent cfd21c8 commit ff76074
Show file tree
Hide file tree
Showing 6 changed files with 98 additions and 27 deletions.
81 changes: 70 additions & 11 deletions lib/app/theme.dart
Original file line number Diff line number Diff line change
@@ -1,30 +1,89 @@
import 'package:flutter/material.dart';
import 'package:movies_flutter/utils/colors.dart';

const lightColorScheme =
ColorScheme.light(primary: Color.fromARGB(255, 170, 0, 255));
const darkColorScehem = ColorScheme.dark();
const lightColorScheme = ColorScheme(
brightness: Brightness.light,
primary: Color(0xFF9010D9),
onPrimary: Color(0xFFFFFFFF),
primaryContainer: Color(0xFFF3DAFF),
onPrimaryContainer: Color(0xFF2F004C),
secondary: Color(0xFF7245B7),
onSecondary: Color(0xFFFFFFFF),
secondaryContainer: Color(0xFFECDCFF),
onSecondaryContainer: Color(0xFF280057),
tertiary: Color(0xFF6E41C8),
onTertiary: Color(0xFFFFFFFF),
tertiaryContainer: Color(0xFFEADDFF),
onTertiaryContainer: Color(0xFF24005B),
error: Color(0xFFBA1A1A),
errorContainer: Color(0xFFFFDAD6),
onError: Color(0xFFFFFFFF),
onErrorContainer: Color(0xFF410002),
background: Color(0xFFFFFBFF),
onBackground: Color(0xFF1D1B1E),
surface: Color(0xFFFFFBFF),
onSurface: Color(0xFF1D1B1E),
surfaceVariant: Color(0xFFEADFEA),
onSurfaceVariant: Color(0xFF4B454D),
outline: Color(0xFF7C747E),
onInverseSurface: Color(0xFFF6EFF3),
inverseSurface: Color(0xFF332F33),
inversePrimary: Color(0xFFE3B5FF),
shadow: Color(0xFF000000),
surfaceTint: Color(0xFF9010D9),
outlineVariant: Color(0xFFCDC3CE),
scrim: Color(0xFF000000),
);

const darkColorScheme = ColorScheme(
brightness: Brightness.dark,
primary: Color(0xFFE3B5FF),
onPrimary: Color(0xFF4E0079),
primaryContainer: Color(0xFF6E00AA),
onPrimaryContainer: Color(0xFFF3DAFF),
secondary: Color(0xFFD6BAFF),
onSecondary: Color(0xFF420586),
secondaryContainer: Color(0xFF5A2A9D),
onSecondaryContainer: Color(0xFFECDCFF),
tertiary: Color(0xFFD1BCFF),
onTertiary: Color(0xFF3D008F),
tertiaryContainer: Color(0xFF5623AF),
onTertiaryContainer: Color(0xFFEADDFF),
error: Color(0xFFFFB4AB),
errorContainer: Color(0xFF93000A),
onError: Color(0xFF690005),
onErrorContainer: Color(0xFFFFDAD6),
background: Color(0xFF1D1B1E),
onBackground: Color(0xFFE7E0E5),
surface: Color(0xFF1D1B1E),
onSurface: Color(0xFFE7E0E5),
surfaceVariant: Color(0xFF4B454D),
onSurfaceVariant: Color(0xFFCDC3CE),
outline: Color(0xFF978E98),
onInverseSurface: Color(0xFF1D1B1E),
inverseSurface: Color(0xFFE7E0E5),
inversePrimary: Color(0xFF9010D9),
shadow: Color(0xFF000000),
surfaceTint: Color(0xFFE3B5FF),
outlineVariant: Color(0xFF4B454D),
scrim: Color(0xFF000000),
);

final lightTheme = ThemeData(
useMaterial3: true,
brightness: Brightness.light,
colorScheme: lightColorScheme,
pageTransitionsTheme: pageTransitionsTheme,
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(elevation: MaterialStateProperty.all(0)),
),
colorScheme: lightColorScheme.copyWith(background: backgroundColor),
);

final darkTheme = ThemeData(
useMaterial3: true,
brightness: Brightness.dark,
colorScheme: darkColorScheme,
pageTransitionsTheme: pageTransitionsTheme,
elevatedButtonTheme: ElevatedButtonThemeData(
style: ButtonStyle(
elevation: MaterialStateProperty.all(0),
),
style: ButtonStyle(elevation: MaterialStateProperty.all(0)),
),
colorScheme: darkColorScehem.copyWith(background: backgroundColorDark),
);

const pageTransitionsTheme = PageTransitionsTheme(
Expand Down
6 changes: 0 additions & 6 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import 'app/app.dart';
Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();

SystemChrome.setSystemUIOverlayStyle(
const SystemUiOverlayStyle(
systemNavigationBarColor: Colors.transparent,
),
);

SystemChrome.setEnabledSystemUIMode(
SystemUiMode.edgeToEdge,
overlays: [SystemUiOverlay.top],
Expand Down
22 changes: 22 additions & 0 deletions lib/ui/common/back_button.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import 'package:flutter/material.dart';

class MoviesBackButton extends StatelessWidget {
const MoviesBackButton({
super.key,
required this.onPressed,
});

final void Function() onPressed;

@override
Widget build(BuildContext context) {
return ElevatedButton(
onPressed: onPressed,
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
elevation: 4,
),
child: const Icon(Icons.arrow_back),
);
}
}
1 change: 1 addition & 0 deletions lib/ui/common/common.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export 'back_button.dart';
13 changes: 4 additions & 9 deletions lib/ui/movie_detail/view/movie_detail_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:movies_flutter/ui/movie_detail/viewmodel/movie_detail_viewmodel.
import 'package:movies_flutter/utils/constants.dart';
import 'package:provider/provider.dart';

import '../../common/common.dart';
import 'widgets/cast.dart';
import 'widgets/rating.dart';

Expand Down Expand Up @@ -118,15 +119,9 @@ class MovieContent extends StatelessWidget {
),
),
SafeArea(
child: ElevatedButton(
onPressed: () => Navigator.of(context).pop(),
style: ElevatedButton.styleFrom(
shape: const CircleBorder(),
foregroundColor: Colors.white,
disabledForegroundColor: Colors.black,
elevation: 4,
),
child: const Icon(Icons.arrow_back),
minimum: const EdgeInsets.only(top: 32),
child: MoviesBackButton(
onPressed: () => Navigator.pop(context),
),
),
],
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
# 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.3+4
version: 1.1.0+5

environment:
sdk: ">=3.0.0 <4.0.0"
Expand Down

0 comments on commit ff76074

Please sign in to comment.