Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changed variable name to adhere to Google's documented best practices… #202

Closed
wants to merge 2 commits into from
Closed

Changed variable name to adhere to Google's documented best practices… #202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f33e483
Changed variable name to adhere to Google's documented best practices…
jpe90 Jul 6, 2020
ffaca51
Changed variable names in another file
jpe90 Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions mdc_100_series/lib/app.dart
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ class ShrineApp extends StatelessWidget {
// TODO: Change backLayer field value to CategoryMenuPage (104)
initialRoute: '/login',
onGenerateRoute: _getRoute,
theme: _kShrineTheme,
theme: _shrineTheme,
);
}

Expand All @@ -50,35 +50,35 @@ class ShrineApp extends StatelessWidget {
}
}

final ThemeData _kShrineTheme = _buildShrineTheme();
final ThemeData _shrineTheme = _buildShrineTheme();

ThemeData _buildShrineTheme() {
final ThemeData base = ThemeData.light();
return base.copyWith(
accentColor: kShrineBrown900,
primaryColor: kShrinePink100,
buttonColor: kShrinePink100,
scaffoldBackgroundColor: kShrineBackgroundWhite,
cardColor: kShrineBackgroundWhite,
textSelectionColor: kShrinePink100,
errorColor: kShrineErrorRed,
accentColor: shrineBrown900,
primaryColor: shrinePink100,
buttonColor: shrinePink100,
scaffoldBackgroundColor: shrineBackgroundWhite,
cardColor: shrineBackgroundWhite,
textSelectionColor: shrinePink100,
errorColor: shrineErrorRed,
buttonTheme: base.buttonTheme.copyWith(
buttonColor: kShrinePink100,
buttonColor: shrinePink100,
colorScheme: base.colorScheme.copyWith(
secondary: kShrineBrown900,
secondary: shrineBrown900,
),
),
buttonBarTheme: base.buttonBarTheme.copyWith(
buttonTextTheme: ButtonTextTheme.accent,
),
primaryIconTheme: base.iconTheme.copyWith(
color: kShrineBrown900
color: shrineBrown900
),
inputDecorationTheme: InputDecorationTheme(
focusedBorder: CutCornersBorder(
borderSide: BorderSide(
width: 2.0,
color: kShrineBrown900,
color: shrineBrown900,
),
),
border: CutCornersBorder(),
Expand Down Expand Up @@ -107,7 +107,7 @@ TextTheme _buildShrineTextTheme(TextTheme base) {
),
).apply(
fontFamily: 'Rubik',
displayColor: kShrineBrown900,
bodyColor: kShrineBrown900,
displayColor: shrineBrown900,
bodyColor: shrineBrown900,
);
}
16 changes: 8 additions & 8 deletions mdc_100_series/lib/colors.dart
View file
Open in desktop
Expand Up @@ -14,14 +14,14 @@

import 'package:flutter/material.dart';

const kShrinePink50 = const Color(0xFFFEEAE6);
const kShrinePink100 = const Color(0xFFFEDBD0);
const kShrinePink300 = const Color(0xFFFBB8AC);
const kShrinePink400 = const Color(0xFFEAA4A4);
const shrinePink50 = const Color(0xFFFEEAE6);
const shrinePink100 = const Color(0xFFFEDBD0);
const shrinePink300 = const Color(0xFFFBB8AC);
const shrinePink400 = const Color(0xFFEAA4A4);

const kShrineBrown900 = const Color(0xFF442B2D);
const shrineBrown900 = const Color(0xFF442B2D);

const kShrineErrorRed = const Color(0xFFC5032B);
const shrineErrorRed = const Color(0xFFC5032B);

const kShrineSurfaceWhite = const Color(0xFFFFFBFA);
const kShrineBackgroundWhite = Colors.white;
const shrineSurfaceWhite = const Color(0xFFFFFBFA);
const shrineBackgroundWhite = Colors.white;