Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Replace deprecated colors #560

Merged
merged 3 commits into from
Dec 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class EditBoardPoint extends StatelessWidget {
final boardPointColors = <Color>{
Colors.white,
GalleryThemeData.darkColorScheme.primary,
GalleryThemeData.darkColorScheme.primaryVariant,
GalleryThemeData.darkColorScheme.primaryContainer,
GalleryThemeData.darkColorScheme.secondary,
backgroundColor,
};
Expand Down
4 changes: 2 additions & 2 deletions lib/pages/backdrop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ class _BackdropState extends State<Backdrop> with TickerProviderStateMixin {
elevation: 7,
clipBehavior: Clip.antiAlias,
borderRadius: BorderRadius.circular(40),
color: Theme.of(context).colorScheme.secondaryVariant,
color: Theme.of(context).colorScheme.secondaryContainer,
child: Container(
constraints: const BoxConstraints(
maxHeight: 560,
Expand Down Expand Up @@ -278,7 +278,7 @@ class _SettingsIcon extends AnimatedWidget {
color:
isSettingsOpenNotifier.value & !animationController.isAnimating
? Colors.transparent
: Theme.of(context).colorScheme.secondaryVariant,
: Theme.of(context).colorScheme.secondaryContainer,
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: () {
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ class _GalleryHeader extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Header(
color: Theme.of(context).colorScheme.primaryVariant,
color: Theme.of(context).colorScheme.primaryContainer,
text: GalleryLocalizations.of(context).homeHeaderGallery,
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/pages/settings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class _SettingsPageState extends State<SettingsPage> {
];

return Material(
color: colorScheme.secondaryVariant,
color: colorScheme.secondaryContainer,
child: Padding(
padding: isDesktop
? EdgeInsets.zero
Expand Down
1 change: 1 addition & 0 deletions lib/studies/rally/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ class RallyApp extends StatelessWidget {
return ThemeData(
appBarTheme: const AppBarTheme(
systemOverlayStyle: SystemUiOverlayStyle.light,
backgroundColor: RallyColors.primaryBackground,
elevation: 0,
),
scaffoldBackgroundColor: RallyColors.primaryBackground,
Expand Down
8 changes: 4 additions & 4 deletions lib/studies/reply/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,9 @@ ThemeData _buildReplyLightTheme(BuildContext context) {
),
colorScheme: const ColorScheme.light(
primary: ReplyColors.blue700,
primaryVariant: ReplyColors.blue800,
primaryContainer: ReplyColors.blue800,
secondary: ReplyColors.orange500,
secondaryVariant: ReplyColors.orange400,
secondaryContainer: ReplyColors.orange400,
surface: ReplyColors.white50,
error: ReplyColors.red400,
onPrimary: ReplyColors.white50,
Expand Down Expand Up @@ -221,9 +221,9 @@ ThemeData _buildReplyDarkTheme(BuildContext context) {
),
colorScheme: const ColorScheme.dark(
primary: ReplyColors.blue200,
primaryVariant: ReplyColors.blue300,
primaryContainer: ReplyColors.blue300,
secondary: ReplyColors.orange300,
secondaryVariant: ReplyColors.orange300,
secondaryContainer: ReplyColors.orange300,
surface: ReplyColors.black800,
error: ReplyColors.red200,
onPrimary: ReplyColors.black900,
Expand Down
4 changes: 2 additions & 2 deletions lib/studies/shrine/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ TextTheme _buildShrineTextTheme(TextTheme base) {

const ColorScheme _shrineColorScheme = ColorScheme(
primary: shrinePink100,
primaryVariant: shrineBrown900,
primaryContainer: shrineBrown900,
secondary: shrinePink50,
secondaryVariant: shrineBrown900,
secondaryContainer: shrineBrown900,
surface: shrineSurfaceWhite,
background: shrineBackgroundWhite,
error: shrineErrorRed,
Expand Down
4 changes: 2 additions & 2 deletions lib/studies/starter/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class StarterApp extends StatelessWidget {
highlightColor: Colors.transparent,
colorScheme: const ColorScheme(
primary: _primaryColor,
primaryVariant: Color(0xFF3700B3),
primaryContainer: Color(0xFF3700B3),
secondary: Color(0xFF03DAC6),
secondaryVariant: Color(0xFF018786),
secondaryContainer: Color(0xFF018786),
background: Colors.white,
surface: Colors.white,
onBackground: Colors.black,
Expand Down
8 changes: 4 additions & 4 deletions lib/themes/gallery_theme_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ class GalleryThemeData {

static const ColorScheme lightColorScheme = ColorScheme(
primary: Color(0xFFB93C5D),
primaryVariant: Color(0xFF117378),
primaryContainer: Color(0xFF117378),
secondary: Color(0xFFEFF3F3),
secondaryVariant: Color(0xFFFAFBFB),
secondaryContainer: Color(0xFFFAFBFB),
background: Color(0xFFE6EBEB),
surface: Color(0xFFFAFBFB),
onBackground: Colors.white,
Expand All @@ -61,9 +61,9 @@ class GalleryThemeData {

static const ColorScheme darkColorScheme = ColorScheme(
primary: Color(0xFFFF8383),
primaryVariant: Color(0xFF1CDEC9),
primaryContainer: Color(0xFF1CDEC9),
secondary: Color(0xFF4D1F7C),
secondaryVariant: Color(0xFF451B6F),
secondaryContainer: Color(0xFF451B6F),
background: Color(0xFF241E30),
surface: Color(0xFF1F1929),
onBackground: Color(0x0DFFFFFF), // White with 0.05 opacity
Expand Down
4 changes: 2 additions & 2 deletions lib/themes/material_demo_theme_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ class MaterialDemoThemeData {

static const _colorScheme = ColorScheme(
primary: Color(0xFF6200EE),
primaryVariant: Color(0xFF6200EE),
primaryContainer: Color(0xFF6200EE),
secondary: Color(0xFFFF5722),
secondaryVariant: Color(0xFFFF5722),
secondaryContainer: Color(0xFFFF5722),
background: Colors.white,
surface: Color(0xFFF2F2F2),
onBackground: Colors.black,
Expand Down
2 changes: 1 addition & 1 deletion macos/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c

COCOAPODS: 1.10.1
COCOAPODS: 1.11.2
17 changes: 12 additions & 5 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: _fe_analyzer_shared
url: "https://pub.dartlang.org"
source: hosted
version: "24.0.0"
version: "31.0.0"
adaptive_breakpoints:
dependency: "direct main"
description:
Expand All @@ -21,7 +21,7 @@ packages:
name: analyzer
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0"
version: "2.8.0"
animations:
dependency: "direct main"
description:
Expand Down Expand Up @@ -290,6 +290,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.11"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
meta:
dependency: "direct main"
description:
Expand Down Expand Up @@ -574,21 +581,21 @@ packages:
name: test
url: "https://pub.dartlang.org"
source: hosted
version: "1.17.11"
version: "1.19.5"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.3"
version: "0.4.8"
test_core:
dependency: transitive
description:
name: test_core
url: "https://pub.dartlang.org"
source: hosted
version: "0.4.1"
version: "0.4.9"
typed_data:
dependency: transitive
description:
Expand Down