From 3a02748df2ae6aa280db978864b58a79cc95075c Mon Sep 17 00:00:00 2001
From: Abdullah Deshmukh <abdullahzakir99@gmail.com>
Date: Thu, 19 Mar 2020 23:09:40 +0530
Subject: [PATCH] [platform_design]Fix problems in dark mode (#377)
---
platform_design/lib/main.dart | 1 +
platform_design/lib/news_tab.dart | 8 ++------
platform_design/lib/widgets.dart | 13 +++++++------
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/platform_design/lib/main.dart b/platform_design/lib/main.dart
index 61144ea6d..c38bf0305 100644
--- a/platform_design/lib/main.dart
+++ b/platform_design/lib/main.dart
@@ -20,6 +20,7 @@ class MyAdaptingApp extends StatelessWidget {
// Use the green theme for Material widgets.
primarySwatch: Colors.green,
),
+ darkTheme: ThemeData.dark(),
builder: (context, child) {
return CupertinoTheme(
// Instead of letting Cupertino widgets auto-adapt to the Material
diff --git a/platform_design/lib/news_tab.dart b/platform_design/lib/news_tab.dart
index 4e8614137..f41a6fcfe 100644
--- a/platform_design/lib/news_tab.dart
+++ b/platform_design/lib/news_tab.dart
@@ -96,7 +96,6 @@ class _NewsTabState extends State<NewsTab> {
title: Text(NewsTab.title),
),
body: Container(
- color: Colors.grey[100],
child: ListView.builder(
itemBuilder: _listBuilder,
),
@@ -107,11 +106,8 @@ class _NewsTabState extends State<NewsTab> {
Widget _buildIos(BuildContext context) {
return CupertinoPageScaffold(
navigationBar: CupertinoNavigationBar(),
- child: Container(
- color: Colors.grey[100],
- child: ListView.builder(
- itemBuilder: _listBuilder,
- ),
+ child: ListView.builder(
+ itemBuilder: _listBuilder,
),
);
}
diff --git a/platform_design/lib/widgets.dart b/platform_design/lib/widgets.dart
index 6c8b813ac..6ff11a5ce 100644
--- a/platform_design/lib/widgets.dart
+++ b/platform_design/lib/widgets.dart
@@ -222,7 +222,7 @@ class SongPlaceholderTile extends StatelessWidget {
child: Row(
children: [
Container(
- color: Colors.grey[400],
+ color: Theme.of(context).textTheme.body1.color,
width: 130,
),
Padding(
@@ -235,27 +235,27 @@ class SongPlaceholderTile extends StatelessWidget {
Container(
height: 9,
margin: EdgeInsets.only(right: 60),
- color: Colors.grey[300],
+ color: Theme.of(context).textTheme.body1.color,
),
Container(
height: 9,
margin: EdgeInsets.only(right: 20, top: 8),
- color: Colors.grey[300],
+ color: Theme.of(context).textTheme.body1.color,
),
Container(
height: 9,
margin: EdgeInsets.only(right: 40, top: 8),
- color: Colors.grey[300],
+ color: Theme.of(context).textTheme.body1.color,
),
Container(
height: 9,
margin: EdgeInsets.only(right: 80, top: 8),
- color: Colors.grey[300],
+ color: Theme.of(context).textTheme.body1.color,
),
Container(
height: 9,
margin: EdgeInsets.only(right: 50, top: 8),
- color: Colors.grey[300],
+ color: Theme.of(context).textTheme.body1.color,
),
],
),
@@ -325,6 +325,7 @@ void showChoices(BuildContext context, List<String> choices) {
return SizedBox(
height: 250,
child: CupertinoPicker(
+ backgroundColor: Theme.of(context).canvasColor,
useMagnifier: true,
magnification: 1.1,
itemExtent: 40,