From 8c325aef889f4c10175f8664391094fc820b5f3d Mon Sep 17 00:00:00 2001 From: Franz Heinfling Date: Fri, 21 Feb 2020 19:43:24 +0100 Subject: [PATCH] Remove unused constant - Fix deprecated code - Switch to master channel --- .../calendar/calendar_screen.dart | 3 -- .../channel/messages_scroll_controller.dart | 2 +- lib/theme.dart | 32 +++++++++---------- pubspec.lock | 15 ++++++--- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/lib/presentation/calendar/calendar_screen.dart b/lib/presentation/calendar/calendar_screen.dart index e881114..86cb314 100644 --- a/lib/presentation/calendar/calendar_screen.dart +++ b/lib/presentation/calendar/calendar_screen.dart @@ -326,9 +326,6 @@ class CalendarScreen extends StatelessWidget { /// Private Styles class _Style { - static const topSectionHeight = - _Style.titleHeight + DrawerStyle.sectionPadding * 2; - static const pastItemOpacity = 0.6; static const defaultElementPadding = EdgeInsets.only( left: 4, diff --git a/lib/presentation/channel/messages_scroll_controller.dart b/lib/presentation/channel/messages_scroll_controller.dart index 77bde72..164bf14 100644 --- a/lib/presentation/channel/messages_scroll_controller.dart +++ b/lib/presentation/channel/messages_scroll_controller.dart @@ -15,5 +15,5 @@ class MessagesScrollController extends InheritedWidget { } static MessagesScrollController of(BuildContext context) => - context.inheritFromWidgetOfExactType(MessagesScrollController); + context.dependOnInheritedWidgetOfExactType(); } diff --git a/lib/theme.dart b/lib/theme.dart index 3dafdab..aad59c3 100644 --- a/lib/theme.dart +++ b/lib/theme.dart @@ -42,7 +42,7 @@ class AppTheme { /// Calendar static TextStyle get calendarDayTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlue, fontSize: 16, fontFamily: fontFamilyEdmondsansBold, @@ -50,7 +50,7 @@ class AppTheme { } static TextStyle get calendarListEventName { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlue, fontSize: 16, fontFamily: fontFamilyEdmondsansMedium, @@ -58,7 +58,7 @@ class AppTheme { } static TextStyle get calendarListGroupName { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlue.withAlpha(150), fontSize: 16, fontFamily: fontFamilyEdmondsansMedium, @@ -66,7 +66,7 @@ class AppTheme { } static TextStyle get calendarListTime { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: Colors.white, fontSize: 12, fontFamily: fontFamilyEdmondsansMedium, @@ -76,7 +76,7 @@ class AppTheme { /// static TextStyle get eventIconMemberTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: Colors.white, fontSize: 11, fontFamily: fontFamilyEdmondsansBold, @@ -84,7 +84,7 @@ class AppTheme { } static TextStyle get eventIconTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlueFont, fontSize: 11, fontFamily: fontFamilyEdmondsansBold, @@ -92,7 +92,7 @@ class AppTheme { } static TextStyle get eventIconMemberSubTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: Colors.white, fontSize: 8, height: 0.7, @@ -101,7 +101,7 @@ class AppTheme { } static TextStyle get eventIconSubTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlueFont, fontSize: 8, height: 0.7, @@ -110,7 +110,7 @@ class AppTheme { } static TextStyle get channelTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: Colors.black, fontSize: 16, fontFamily: fontFamilyEdmondsansBold, @@ -134,7 +134,7 @@ class AppTheme { } static TextStyle get circleTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlueFont, fontSize: 24, fontFamily: fontFamilyEdmondsansBold, @@ -142,7 +142,7 @@ class AppTheme { } static TextStyle get circleSectionButtonTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlueFont, fontSize: 16, fontFamily: fontFamilyEdmondsansBold, @@ -150,7 +150,7 @@ class AppTheme { } static TextStyle get circleSectionChannelTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlue, fontSize: 16, fontFamily: fontFamilyEdmondsansMedium, @@ -158,7 +158,7 @@ class AppTheme { } static TextStyle get circleSectionTitle { - return theme.textTheme.headline.copyWith( + return theme.textTheme.headline5.copyWith( color: colorDarkBlueFont.withOpacity(0.4), fontSize: 12, letterSpacing: 1, @@ -167,7 +167,7 @@ class AppTheme { } static TextStyle get notificationTitle { - return theme.textTheme.body1.copyWith( + return theme.textTheme.bodyText2.copyWith( color: Colors.white, fontSize: 16, fontWeight: FontWeight.w800, @@ -176,7 +176,7 @@ class AppTheme { } static TextStyle get notificationTime { - return theme.textTheme.body1.copyWith( + return theme.textTheme.bodyText2.copyWith( color: Colors.white, fontSize: 12, fontFamily: fontFamilyEdmondsansRegular, @@ -184,7 +184,7 @@ class AppTheme { } static TextStyle get notificationBody { - return theme.textTheme.body1.copyWith( + return theme.textTheme.bodyText2.copyWith( color: Colors.white, fontSize: 16, fontFamily: fontFamilyEdmondsansRegular, diff --git a/pubspec.lock b/pubspec.lock index 801e82d..5449cc2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -435,7 +435,7 @@ packages: name: intl url: "https://pub.dartlang.org" source: hosted - version: "0.16.0" + version: "0.16.1" io: dependency: transitive description: @@ -736,21 +736,21 @@ packages: name: test url: "https://pub.dartlang.org" source: hosted - version: "1.9.4" + version: "1.12.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.11" + version: "0.2.14" test_core: dependency: transitive description: name: test_core url: "https://pub.dartlang.org" source: hosted - version: "0.2.15" + version: "0.3.0" timing: dependency: transitive description: @@ -828,6 +828,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.1.0" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + url: "https://pub.dartlang.org" + source: hosted + version: "0.5.0" xml: dependency: transitive description: