2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Switch to flutter_lints

Browse source
This commit is contained in:
Krille Fear 2021-10-14 18:09:30 +02:00
commit 13fda9458f
101 changed files with 719 additions and 653 deletions
Download patch file Download diff file Expand all files Collapse all files

108
lib/config/routes.dart
View file

@ -45,52 +45,52 @@ class AppRoutes {
List<VRouteElement> get _mobileRoutes => [
VWidget(
path: '/rooms',
widget: ChatList(),
widget: const ChatList(),
stackedRoutes: [
VWidget(
path: '/spaces/:roomid',
widget: ChatDetails(),
widget: const ChatDetails(),
stackedRoutes: _chatDetailsRoutes,
),
VWidget(path: ':roomid', widget: Chat(), stackedRoutes: [
VWidget(path: ':roomid', widget: const Chat(), stackedRoutes: [
VWidget(
path: 'encryption',
widget: ChatEncryptionSettings(),
widget: const ChatEncryptionSettings(),
),
VWidget(
path: 'invite',
widget: InvitationSelection(),
widget: const InvitationSelection(),
),
VWidget(
path: 'details',
widget: ChatDetails(),
widget: const ChatDetails(),
stackedRoutes: _chatDetailsRoutes,
),
]),
VWidget(
path: '/settings',
widget: Settings(),
widget: const Settings(),
stackedRoutes: _settingsRoutes,
),
VWidget(
path: '/search',
widget: Search(),
widget: const Search(),
),
VWidget(
path: '/archive',
widget: Archive(),
widget: const Archive(),
),
VWidget(
path: '/newprivatechat',
widget: NewPrivateChat(),
widget: const NewPrivateChat(),
),
VWidget(
path: '/newgroup',
widget: NewGroup(),
widget: const NewGroup(),
),
VWidget(
path: '/newspace',
widget: NewSpace(),
widget: const NewSpace(),
),
],
),
@ -99,64 +99,64 @@ class AppRoutes {
VNester(
path: '/rooms',
widgetBuilder: (child) => TwoColumnLayout(
mainView: ChatList(),
mainView: const ChatList(),
sideView: child,
),
buildTransition: _fadeTransition,
nestedRoutes: [
VWidget(
path: '',
widget: EmptyPage(),
widget: const EmptyPage(),
buildTransition: _fadeTransition,
stackedRoutes: [
VWidget(
path: '/spaces/:roomid',
widget: ChatDetails(),
widget: const ChatDetails(),
buildTransition: _fadeTransition,
stackedRoutes: _chatDetailsRoutes,
),
VWidget(
path: '/newprivatechat',
widget: NewPrivateChat(),
widget: const NewPrivateChat(),
buildTransition: _fadeTransition,
),
VWidget(
path: '/newgroup',
widget: NewGroup(),
widget: const NewGroup(),
buildTransition: _fadeTransition,
),
VWidget(
path: '/newspace',
widget: NewSpace(),
widget: const NewSpace(),
buildTransition: _fadeTransition,
),
VNester(
path: ':roomid',
widgetBuilder: (child) => SideViewLayout(
mainView: Chat(),
mainView: const Chat(),
sideView: child,
),
buildTransition: _fadeTransition,
nestedRoutes: [
VWidget(
path: '',
widget: Chat(),
widget: const Chat(),
buildTransition: _fadeTransition,
),
VWidget(
path: 'encryption',
widget: ChatEncryptionSettings(),
widget: const ChatEncryptionSettings(),
buildTransition: _fadeTransition,
),
VWidget(
path: 'details',
widget: ChatDetails(),
widget: const ChatDetails(),
buildTransition: _fadeTransition,
stackedRoutes: _chatDetailsRoutes,
),
VWidget(
path: 'invite',
widget: InvitationSelection(),
widget: const InvitationSelection(),
buildTransition: _fadeTransition,
),
],
@ -167,7 +167,7 @@ class AppRoutes {
),
VWidget(
path: '/rooms',
widget: TwoColumnLayout(
widget: const TwoColumnLayout(
mainView: ChatList(),
sideView: EmptyPage(),
),
@ -176,14 +176,14 @@ class AppRoutes {
VNester(
path: '/settings',
widgetBuilder: (child) => TwoColumnLayout(
mainView: Settings(),
mainView: const Settings(),
sideView: child,
),
buildTransition: _dynamicTransition,
nestedRoutes: [
VWidget(
path: '',
widget: EmptyPage(),
widget: const EmptyPage(),
buildTransition: _dynamicTransition,
stackedRoutes: _settingsRoutes,
),
@ -191,7 +191,7 @@ class AppRoutes {
),
VWidget(
path: '/search',
widget: TwoColumnLayout(
widget: const TwoColumnLayout(
mainView: Search(),
sideView: EmptyPage(),
),
@ -199,7 +199,7 @@ class AppRoutes {
),
VWidget(
path: '/archive',
widget: TwoColumnLayout(
widget: const TwoColumnLayout(
mainView: Archive(),
sideView: EmptyPage(),
),
@ -210,25 +210,25 @@ class AppRoutes {
];
List<VRouteElement> get _homeRoutes => [
VWidget(path: '/', widget: LoadingView()),
VWidget(path: '/', widget: const LoadingView()),
VWidget(
path: '/home',
widget: HomeserverPicker(),
widget: const HomeserverPicker(),
buildTransition: _fadeTransition,
stackedRoutes: [
VWidget(
path: 'login',
widget: Login(),
widget: const Login(),
buildTransition: _fadeTransition,
),
VWidget(
path: 'signup',
widget: SignupPage(),
widget: const SignupPage(),
buildTransition: _fadeTransition,
),
VWidget(
path: 'logs',
widget: LogViewer(),
widget: const LogViewer(),
buildTransition: _dynamicTransition,
),
],
@ -238,27 +238,27 @@ class AppRoutes {
List<VRouteElement> get _chatDetailsRoutes => [
VWidget(
path: 'permissions',
widget: ChatPermissionsSettings(),
widget: const ChatPermissionsSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'invite',
widget: InvitationSelection(),
widget: const InvitationSelection(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'multiple_emotes',
widget: MultipleEmotesSettings(),
widget: const MultipleEmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'emotes',
widget: EmotesSettings(),
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'emotes/:state_key',
widget: EmotesSettings(),
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
];
@ -266,49 +266,49 @@ class AppRoutes {
List<VRouteElement> get _settingsRoutes => [
VWidget(
path: 'notifications',
widget: SettingsNotifications(),
widget: const SettingsNotifications(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'chat',
widget: SettingsChat(),
widget: const SettingsChat(),
buildTransition: _dynamicTransition,
stackedRoutes: [
VWidget(
path: 'emotes',
widget: EmotesSettings(),
widget: const EmotesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'style',
widget: SettingsStyle(),
widget: const SettingsStyle(),
buildTransition: _dynamicTransition,
),
],
),
VWidget(
path: 'account',
widget: SettingsAccount(),
widget: const SettingsAccount(),
buildTransition: _dynamicTransition,
stackedRoutes: [
VWidget(
path: 'devices',
widget: DevicesSettings(),
widget: const DevicesSettings(),
buildTransition: _dynamicTransition,
),
VWidget(
path: 'add',
widget: HomeserverPicker(),
widget: const HomeserverPicker(),
buildTransition: _fadeTransition,
stackedRoutes: [
VWidget(
path: 'login',
widget: Login(),
widget: const Login(),
buildTransition: _fadeTransition,
),
VWidget(
path: 'signup',
widget: SignupPage(),
widget: const SignupPage(),
buildTransition: _fadeTransition,
),
],
@ -317,31 +317,31 @@ class AppRoutes {
),
VWidget(
path: 'security',
widget: SettingsSecurity(),
widget: const SettingsSecurity(),
buildTransition: _dynamicTransition,
stackedRoutes: [
VWidget(
path: 'ignorelist',
widget: SettingsIgnoreList(),
widget: const SettingsIgnoreList(),
buildTransition: _dynamicTransition,
),
VWidget(
path: '3pid',
widget: Settings3Pid(),
widget: const Settings3Pid(),
buildTransition: _dynamicTransition,
),
],
),
VWidget(
path: 'logs',
widget: LogViewer(),
widget: const LogViewer(),
buildTransition: _dynamicTransition,
),
];
final _fadeTransition = (animation1, _, child) =>
FadeTransition(opacity: animation1, child: child);
FadeTransition Function(dynamic, dynamic, dynamic) get _dynamicTransition =>
columnMode ? _fadeTransition : null;
FadeTransition _fadeTransition(animation1, _, child) =>
FadeTransition(opacity: animation1, child: child);
}

40
lib/config/themes.dart
View file

@ -14,8 +14,8 @@ abstract class FluffyThemes {
static const fallbackTextStyle =
TextStyle(fontFamily: 'Roboto', fontFamilyFallback: ['NotoEmoji']);
static var fallback_text_theme = PlatformInfos.isDesktop
? TextTheme(
static var fallbackTextTheme = PlatformInfos.isDesktop
? const TextTheme(
bodyText1: fallbackTextStyle,
bodyText2: fallbackTextStyle,
button: fallbackTextStyle,
@ -29,12 +29,12 @@ abstract class FluffyThemes {
headline6: fallbackTextStyle,
subtitle1: fallbackTextStyle,
subtitle2: fallbackTextStyle)
: TextTheme();
: const TextTheme();
static ThemeData light = ThemeData(
visualDensity: VisualDensity.standard,
primaryColorDark: Colors.white,
primaryColorLight: Color(0xff121212),
primaryColorLight: const Color(0xff121212),
brightness: Brightness.light,
primaryColor: AppConfig.primaryColor,
colorScheme: ThemeData.light().colorScheme.copyWith(
@ -43,11 +43,11 @@ abstract class FluffyThemes {
secondaryVariant: AppConfig.secondaryColor,
),
backgroundColor: Colors.white,
secondaryHeaderColor: Color(0xffeeeffe),
secondaryHeaderColor: const Color(0xffeeeffe),
scaffoldBackgroundColor: Colors.white,
textTheme: Typography.material2018().black.merge(fallback_text_theme),
snackBarTheme: SnackBarThemeData(behavior: SnackBarBehavior.floating),
pageTransitionsTheme: PageTransitionsTheme(
textTheme: Typography.material2018().black.merge(fallbackTextTheme),
snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating),
pageTransitionsTheme: const PageTransitionsTheme(
builders: {
TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
TargetPlatform.android: ZoomPageTransitionsBuilder(),
@ -75,7 +75,7 @@ abstract class FluffyThemes {
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
),
floatingActionButtonTheme: FloatingActionButtonThemeData(
floatingActionButtonTheme: const FloatingActionButtonThemeData(
backgroundColor: AppConfig.primaryColor,
foregroundColor: Colors.white,
),
@ -86,7 +86,7 @@ abstract class FluffyThemes {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
padding: EdgeInsets.all(12),
padding: const EdgeInsets.all(12),
),
),
cardTheme: CardTheme(
@ -108,7 +108,7 @@ abstract class FluffyThemes {
filled: true,
fillColor: lighten(AppConfig.primaryColor, .51),
),
appBarTheme: AppBarTheme(
appBarTheme: const AppBarTheme(
elevation: 2,
systemOverlayStyle: SystemUiOverlayStyle.dark,
backgroundColor: Colors.white,
@ -122,10 +122,10 @@ abstract class FluffyThemes {
static ThemeData dark = ThemeData.dark().copyWith(
visualDensity: VisualDensity.standard,
primaryColorDark: Color(0xff121212),
primaryColorDark: const Color(0xff121212),
primaryColorLight: Colors.white,
primaryColor: AppConfig.primaryColor,
errorColor: Color(0xFFCF6679),
errorColor: const Color(0xFFCF6679),
backgroundColor: Colors.black,
scaffoldBackgroundColor: Colors.black,
colorScheme: ThemeData.dark().colorScheme.copyWith(
@ -133,8 +133,8 @@ abstract class FluffyThemes {
secondary: AppConfig.primaryColorLight,
secondaryVariant: AppConfig.secondaryColor,
),
secondaryHeaderColor: Color(0xff232543),
textTheme: Typography.material2018().white.merge(fallback_text_theme),
secondaryHeaderColor: const Color(0xff232543),
textTheme: Typography.material2018().white.merge(fallbackTextTheme),
dialogTheme: DialogTheme(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
@ -152,7 +152,7 @@ abstract class FluffyThemes {
),
clipBehavior: Clip.hardEdge,
),
pageTransitionsTheme: PageTransitionsTheme(
pageTransitionsTheme: const PageTransitionsTheme(
builders: {
TargetPlatform.fuchsia: ZoomPageTransitionsBuilder(),
TargetPlatform.android: ZoomPageTransitionsBuilder(),
@ -162,7 +162,7 @@ abstract class FluffyThemes {
TargetPlatform.iOS: CupertinoPageTransitionsBuilder(),
},
),
floatingActionButtonTheme: FloatingActionButtonThemeData(
floatingActionButtonTheme: const FloatingActionButtonThemeData(
backgroundColor: AppConfig.primaryColor,
foregroundColor: Colors.white,
),
@ -192,11 +192,11 @@ abstract class FluffyThemes {
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
padding: EdgeInsets.all(12),
padding: const EdgeInsets.all(12),
),
),
snackBarTheme: SnackBarThemeData(behavior: SnackBarBehavior.floating),
appBarTheme: AppBarTheme(
snackBarTheme: const SnackBarThemeData(behavior: SnackBarBehavior.floating),
appBarTheme: const AppBarTheme(
elevation: 2,
systemOverlayStyle: SystemUiOverlayStyle.light,
backgroundColor: Color(0xff1D1D1D),