Miscellaneous fixes

- Fix button color (github material-components#133) - Restore obscureText on password field (github material-components#127) - Change AccentColorOverride to PrimaryColorOverride (github material-components#128, material-components#132) - Fix default BorderSide in CutCornersBorder constructor (github material-components#134)
jdkoren · Dec 3, 2018 · aa8f9fb · aa8f9fb
1 parent 6256c6c
commit aa8f9fb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/mdc_100_series/lib/app.dart b/mdc_100_series/lib/app.dart
@@ -86,8 +86,8 @@ ThemeData _buildShrineTheme() {
     cardColor: kShrineBackgroundWhite,
     textSelectionColor: kShrinePink100,
     errorColor: kShrineErrorRed,
-    buttonTheme: ButtonThemeData(
-      textTheme: ButtonTextTheme.accent,
+    buttonTheme: base.buttonTheme.copyWith(
+      buttonColor: kShrinePink100,
     ),
     primaryIconTheme: base.iconTheme.copyWith(color: kShrineBrown900),
     inputDecorationTheme: InputDecorationTheme(

diff --git a/mdc_100_series/lib/login.dart b/mdc_100_series/lib/login.dart
@@ -61,6 +61,7 @@ class _LoginPageState extends State<LoginPage> {
                 decoration: InputDecoration(
                   labelText: 'Password',
                 ),
+                obscureText: true,
               ),
             ),
             ButtonBar(
@@ -105,7 +106,10 @@ class AccentColorOverride extends StatelessWidget {
   Widget build(BuildContext context) {
     return Theme(
       child: child,
-      data: Theme.of(context).copyWith(accentColor: color),
+      data: Theme.of(context).copyWith(
+        accentColor: color,
+        brightness: Brightness.dark,
+      ),
     );
   }
 }
diff --git a/mdc_100_series/lib/supplemental/cut_corners_border.dart b/mdc_100_series/lib/supplemental/cut_corners_border.dart
@@ -19,7 +19,7 @@ import 'package:flutter/widgets.dart';
 
 class CutCornersBorder extends OutlineInputBorder {
   const CutCornersBorder({
-    BorderSide borderSide: BorderSide.none,
+    BorderSide borderSide: const BorderSide(),
     BorderRadius borderRadius: const BorderRadius.all(Radius.circular(2.0)),
     this.cut: 7.0,
     double gapPadding: 2.0,