beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'migrate-to-null-safety-2' of https://github.com/ente-io/frame into migrate-to-null-safety-2

Browse source
This commit is contained in:
ashilkn 2022-09-21 15:40:13 +05:30
parent f2adc32b4b 732e68898f
commit 8730899f48
1 changed files with 70 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

132
lib/ente_theme_data.dart
View file

@ -4,9 +4,9 @@ import 'package:flutter_datetime_picker/flutter_datetime_picker.dart';
final lightThemeData = ThemeData( final lightThemeData = ThemeData(
fontFamily: 'Inter', fontFamily: 'Inter',
brightness: Brightness.light, brightness: Brightness.light,
hintColor: Colors.grey, hintColor: const Color.fromRGBO(158, 158, 158, 1),
primaryColor: Colors.deepOrangeAccent, primaryColor: const Color.fromRGBO(255, 110, 64, 1),
primaryColorLight: Colors.black54, primaryColorLight: const Color.fromRGBO(0, 0, 0, 0.541),
iconTheme: const IconThemeData(color: Colors.black), iconTheme: const IconThemeData(color: Colors.black),
primaryIconTheme: primaryIconTheme:
const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0), const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
@ -16,18 +16,18 @@ final lightThemeData = ThemeData(
), ),
accentColor: const Color.fromRGBO(0, 0, 0, 0.6), accentColor: const Color.fromRGBO(0, 0, 0, 0.6),
outlinedButtonTheme: buildOutlinedButtonThemeData( outlinedButtonTheme: buildOutlinedButtonThemeData(
bgDisabled: Colors.grey.shade500, bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
bgEnabled: Colors.black, bgEnabled: const Color.fromRGBO(0, 0, 0, 1),
fgDisabled: Colors.white, fgDisabled: const Color.fromRGBO(255, 255, 255, 1),
fgEnabled: Colors.white, fgEnabled: const Color.fromRGBO(255, 255, 255, 1),
), ),
elevatedButtonTheme: buildElevatedButtonThemeData( elevatedButtonTheme: buildElevatedButtonThemeData(
onPrimary: Colors.white, onPrimary: const Color.fromRGBO(255, 255, 255, 1),
primary: Colors.black, primary: const Color.fromRGBO(0, 0, 0, 1),
), ),
toggleableActiveColor: Colors.green[400], toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
scaffoldBackgroundColor: Colors.white, scaffoldBackgroundColor: const Color.fromRGBO(255, 255, 255, 1),
backgroundColor: Colors.white, backgroundColor: const Color.fromRGBO(255, 255, 255, 1),
appBarTheme: const AppBarTheme().copyWith( appBarTheme: const AppBarTheme().copyWith(
backgroundColor: Colors.white, backgroundColor: Colors.white,
foregroundColor: Colors.black, foregroundColor: Colors.black,
@ -35,7 +35,7 @@ final lightThemeData = ThemeData(
elevation: 0, elevation: 0,
), ),
//https://api.flutter.dev/flutter/material/TextTheme-class.html //https://api.flutter.dev/flutter/material/TextTheme-class.html
textTheme: _buildTextTheme(Colors.black), textTheme: _buildTextTheme(const Color.fromRGBO(0, 0, 0, 1)),
primaryTextTheme: const TextTheme().copyWith( primaryTextTheme: const TextTheme().copyWith(
bodyText2: const TextStyle(color: Colors.yellow), bodyText2: const TextStyle(color: Colors.yellow),
bodyText1: const TextStyle(color: Colors.orange), bodyText1: const TextStyle(color: Colors.orange),
@ -70,13 +70,13 @@ final lightThemeData = ThemeData(
), ),
fillColor: MaterialStateProperty.resolveWith((states) { fillColor: MaterialStateProperty.resolveWith((states) {
return states.contains(MaterialState.selected) return states.contains(MaterialState.selected)
? Colors.black ? const Color.fromRGBO(0, 0, 0, 1)
: Colors.white; : const Color.fromRGBO(255, 255, 255, 1);
}), }),
checkColor: MaterialStateProperty.resolveWith((states) { checkColor: MaterialStateProperty.resolveWith((states) {
return states.contains(MaterialState.selected) return states.contains(MaterialState.selected)
? Colors.white ? const Color.fromRGBO(255, 255, 255, 1)
: Colors.black; : const Color.fromRGBO(0, 0, 0, 1);
}), }),
), ),
); );
@ -84,30 +84,30 @@ final lightThemeData = ThemeData(
final darkThemeData = ThemeData( final darkThemeData = ThemeData(
fontFamily: 'Inter', fontFamily: 'Inter',
brightness: Brightness.dark, brightness: Brightness.dark,
primaryColorLight: Colors.white70, primaryColorLight: const Color.fromRGBO(255, 255, 255, 0.702),
iconTheme: const IconThemeData(color: Colors.white), iconTheme: const IconThemeData(color: Colors.white),
primaryIconTheme: primaryIconTheme:
const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0), const IconThemeData(color: Colors.red, opacity: 1.0, size: 50.0),
hintColor: Colors.grey, hintColor: const Color.fromRGBO(158, 158, 158, 1),
colorScheme: const ColorScheme.dark(primary: Colors.white), colorScheme: const ColorScheme.dark(primary: Colors.white),
accentColor: const Color.fromRGBO(45, 194, 98, 0.2), accentColor: const Color.fromRGBO(45, 194, 98, 0.2),
buttonTheme: const ButtonThemeData().copyWith( buttonTheme: const ButtonThemeData().copyWith(
buttonColor: const Color.fromRGBO(45, 194, 98, 1.0), buttonColor: const Color.fromRGBO(45, 194, 98, 1.0),
), ),
textTheme: _buildTextTheme(Colors.white), textTheme: _buildTextTheme(const Color.fromRGBO(255, 255, 255, 1)),
toggleableActiveColor: Colors.green[400], toggleableActiveColor: const Color.fromRGBO(102, 187, 106, 1),
outlinedButtonTheme: buildOutlinedButtonThemeData( outlinedButtonTheme: buildOutlinedButtonThemeData(
bgDisabled: Colors.grey.shade500, bgDisabled: const Color.fromRGBO(158, 158, 158, 1),
bgEnabled: Colors.white, bgEnabled: const Color.fromRGBO(255, 255, 255, 1),
fgDisabled: Colors.white, fgDisabled: const Color.fromRGBO(255, 255, 255, 1),
fgEnabled: Colors.black, fgEnabled: const Color.fromRGBO(0, 0, 0, 1),
), ),
elevatedButtonTheme: buildElevatedButtonThemeData( elevatedButtonTheme: buildElevatedButtonThemeData(
onPrimary: Colors.black, onPrimary: const Color.fromRGBO(0, 0, 0, 1),
primary: Colors.white, primary: const Color.fromRGBO(255, 255, 255, 1),
), ),
scaffoldBackgroundColor: Colors.black, scaffoldBackgroundColor: const Color.fromRGBO(0, 0, 0, 1),
backgroundColor: Colors.black, backgroundColor: const Color.fromRGBO(0, 0, 0, 1),
appBarTheme: const AppBarTheme().copyWith( appBarTheme: const AppBarTheme().copyWith(
color: Colors.black, color: Colors.black,
elevation: 0, elevation: 0,
@ -142,16 +142,16 @@ final darkThemeData = ThemeData(
), ),
fillColor: MaterialStateProperty.resolveWith((states) { fillColor: MaterialStateProperty.resolveWith((states) {
if (states.contains(MaterialState.selected)) { if (states.contains(MaterialState.selected)) {
return Colors.grey; return const Color.fromRGBO(158, 158, 158, 1);
} else { } else {
return Colors.black; return const Color.fromRGBO(0, 0, 0, 1);
} }
}), }),
checkColor: MaterialStateProperty.resolveWith((states) { checkColor: MaterialStateProperty.resolveWith((states) {
if (states.contains(MaterialState.selected)) { if (states.contains(MaterialState.selected)) {
return Colors.black; return const Color.fromRGBO(0, 0, 0, 1);
} else { } else {
return Colors.grey; return const Color.fromRGBO(158, 158, 158, 1);
} }
}), }),
), ),
@ -217,20 +217,25 @@ TextTheme _buildTextTheme(Color textColor) {
} }
extension CustomColorScheme on ColorScheme { extension CustomColorScheme on ColorScheme {
Color get defaultBackgroundColor => Color get defaultBackgroundColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.white : Colors.black; ? const Color.fromRGBO(255, 255, 255, 1)
: const Color.fromRGBO(0, 0, 0, 1);
Color get defaultTextColor => Color get defaultTextColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.black : Colors.white; ? const Color.fromRGBO(0, 0, 0, 1)
: const Color.fromRGBO(255, 255, 255, 1);
Color get inverseTextColor => Color get inverseTextColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.white : Colors.black; ? const Color.fromRGBO(255, 255, 255, 1)
: const Color.fromRGBO(0, 0, 0, 1);
Color get inverseIconColor => Color get inverseIconColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.white : Colors.black; ? const Color.fromRGBO(255, 255, 255, 1)
: const Color.fromRGBO(0, 0, 0, 1);
Color get inverseBackgroundColor => Color get inverseBackgroundColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.black : Colors.white; ? const Color.fromRGBO(0, 0, 0, 1)
: const Color.fromRGBO(255, 255, 255, 1);
Color get boxSelectColor => brightness == Brightness.light Color get boxSelectColor => brightness == Brightness.light
? const Color.fromRGBO(67, 186, 108, 1) ? const Color.fromRGBO(67, 186, 108, 1)
@ -246,7 +251,8 @@ extension CustomColorScheme on ColorScheme {
? const Color.fromRGBO(0, 0, 0, 1) ? const Color.fromRGBO(0, 0, 0, 1)
: const Color.fromRGBO(48, 48, 48, 1); : const Color.fromRGBO(48, 48, 48, 1);
Color get dynamicFABTextColor => Colors.white; //same for both themes Color get dynamicFABTextColor =>
const Color.fromRGBO(255, 255, 255, 1); //same for both themes
// todo: use brightness == Brightness.light for changing color for dark/light theme // todo: use brightness == Brightness.light for changing color for dark/light theme
ButtonStyle? get optionalActionButtonStyle => buildElevatedButtonThemeData( ButtonStyle? get optionalActionButtonStyle => buildElevatedButtonThemeData(
@ -264,18 +270,18 @@ extension CustomColorScheme on ColorScheme {
: const Color.fromRGBO(48, 48, 48, 0.5); : const Color.fromRGBO(48, 48, 48, 0.5);
Color get iconColor => brightness == Brightness.light Color get iconColor => brightness == Brightness.light
? Colors.black.withOpacity(0.75) ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.75)
: Colors.white; : const Color.fromRGBO(255, 255, 255, 1);
Color get bgColorForQuestions => brightness == Brightness.light Color get bgColorForQuestions => brightness == Brightness.light
? Colors.white ? const Color.fromRGBO(255, 255, 255, 1)
: const Color.fromRGBO(10, 15, 15, 1.0); : const Color.fromRGBO(10, 15, 15, 1.0);
Color get greenText => const Color.fromARGB(255, 40, 190, 113); Color get greenText => const Color.fromARGB(255, 40, 190, 113);
Color get cupertinoPickerTopColor => brightness == Brightness.light Color get cupertinoPickerTopColor => brightness == Brightness.light
? const Color.fromARGB(255, 238, 238, 238) ? const Color.fromARGB(255, 238, 238, 238)
: Colors.white.withOpacity(0.1); : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.1);
DatePickerTheme get dateTimePickertheme => brightness == Brightness.light DatePickerTheme get dateTimePickertheme => brightness == Brightness.light
? const DatePickerTheme( ? const DatePickerTheme(
@ -314,23 +320,24 @@ extension CustomColorScheme on ColorScheme {
: const Color.fromRGBO(20, 20, 20, 1); : const Color.fromRGBO(20, 20, 20, 1);
Color get galleryThumbDrawColor => brightness == Brightness.light Color get galleryThumbDrawColor => brightness == Brightness.light
? Colors.black.withOpacity(0.8) ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.8)
: Colors.white.withOpacity(0.5); : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);
Color get backupEnabledBgColor => brightness == Brightness.light Color get backupEnabledBgColor => brightness == Brightness.light
? const Color.fromRGBO(230, 230, 230, 0.95) ? const Color.fromRGBO(230, 230, 230, 0.95)
: const Color.fromRGBO(10, 40, 40, 0.3); : const Color.fromRGBO(10, 40, 40, 0.3);
Color get dotsIndicatorActiveColor => brightness == Brightness.light Color get dotsIndicatorActiveColor => brightness == Brightness.light
? Colors.black.withOpacity(0.5) ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.5)
: Colors.white.withOpacity(0.5); : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);
Color get dotsIndicatorInactiveColor => brightness == Brightness.light Color get dotsIndicatorInactiveColor => brightness == Brightness.light
? Colors.black.withOpacity(0.12) ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.12)
: Colors.white.withOpacity(0.12); : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.12);
Color get toastTextColor => Color get toastTextColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.white : Colors.black; ? const Color.fromRGBO(255, 255, 255, 1)
: const Color.fromRGBO(0, 0, 0, 1);
Color get toastBackgroundColor => brightness == Brightness.light Color get toastBackgroundColor => brightness == Brightness.light
? const Color.fromRGBO(24, 24, 24, 0.95) ? const Color.fromRGBO(24, 24, 24, 0.95)
@ -341,15 +348,16 @@ extension CustomColorScheme on ColorScheme {
: const Color.fromRGBO(100, 100, 100, 1); : const Color.fromRGBO(100, 100, 100, 1);
Color get themeSwitchIndicatorColor => brightness == Brightness.light Color get themeSwitchIndicatorColor => brightness == Brightness.light
? Colors.black.withOpacity(0.75) ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.75)
: Colors.white; : const Color.fromRGBO(255, 255, 255, 1);
Color get themeSwitchActiveIconColor => Color get themeSwitchActiveIconColor => brightness == Brightness.light
brightness == Brightness.light ? Colors.white : Colors.black; ? const Color.fromRGBO(255, 255, 255, 1)
: const Color.fromRGBO(0, 0, 0, 1);
Color get themeSwitchInactiveIconColor => brightness == Brightness.light Color get themeSwitchInactiveIconColor => brightness == Brightness.light
? Colors.black.withOpacity(0.5) ? const Color.fromRGBO(0, 0, 0, 1).withOpacity(0.5)
: Colors.white.withOpacity(0.5); : const Color.fromRGBO(255, 255, 255, 1).withOpacity(0.5);
Color get searchResultsColor => brightness == Brightness.light Color get searchResultsColor => brightness == Brightness.light
? const Color.fromRGBO(245, 245, 245, 1.0) ? const Color.fromRGBO(245, 245, 245, 1.0)