* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
204 lines
7.8 KiB
Dart
204 lines
7.8 KiB
Dart
import 'package:flutter/cupertino.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
|
|
import 'package:fluffychat/config/setting_keys.dart';
|
|
import 'app_config.dart';
|
|
|
|
abstract class FluffyThemes {
|
|
static const double columnWidth = 380.0;
|
|
|
|
static const double maxTimelineWidth = columnWidth * 2;
|
|
|
|
// #Pangea
|
|
// static const double navRailWidth = 80.0;
|
|
static const double navRailWidth = 72.0;
|
|
// Pangea#
|
|
|
|
static bool isColumnModeByWidth(double width) =>
|
|
width > columnWidth * 2 + navRailWidth;
|
|
|
|
static bool isColumnMode(BuildContext context) =>
|
|
isColumnModeByWidth(MediaQuery.sizeOf(context).width);
|
|
|
|
static bool isThreeColumnMode(BuildContext context) =>
|
|
MediaQuery.sizeOf(context).width > FluffyThemes.columnWidth * 3.5;
|
|
|
|
static LinearGradient backgroundGradient(BuildContext context, int alpha) {
|
|
final colorScheme = Theme.of(context).colorScheme;
|
|
return LinearGradient(
|
|
begin: Alignment.topCenter,
|
|
colors: [
|
|
colorScheme.primaryContainer.withAlpha(alpha),
|
|
colorScheme.secondaryContainer.withAlpha(alpha),
|
|
colorScheme.tertiaryContainer.withAlpha(alpha),
|
|
colorScheme.primaryContainer.withAlpha(alpha),
|
|
],
|
|
);
|
|
}
|
|
|
|
static const Duration animationDuration = Duration(milliseconds: 250);
|
|
static const Curve animationCurve = Curves.easeInOut;
|
|
|
|
static ThemeData buildTheme(
|
|
BuildContext context,
|
|
Brightness brightness, [
|
|
Color? seed,
|
|
]) {
|
|
final colorScheme = ColorScheme.fromSeed(
|
|
brightness: brightness,
|
|
seedColor: seed ?? Color(AppSettings.colorSchemeSeedInt.value),
|
|
);
|
|
final isColumnMode = FluffyThemes.isColumnMode(context);
|
|
return ThemeData(
|
|
visualDensity: VisualDensity.standard,
|
|
useMaterial3: true,
|
|
brightness: brightness,
|
|
colorScheme: colorScheme,
|
|
dividerColor: brightness == Brightness.dark
|
|
? colorScheme.surfaceContainerHighest
|
|
: colorScheme.surfaceContainer,
|
|
popupMenuTheme: PopupMenuThemeData(
|
|
color: colorScheme.surfaceContainerLow,
|
|
iconColor: colorScheme.onSurface,
|
|
textStyle: TextStyle(color: colorScheme.onSurface),
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
|
|
),
|
|
),
|
|
segmentedButtonTheme: SegmentedButtonThemeData(
|
|
style: SegmentedButton.styleFrom(
|
|
iconColor: colorScheme.onSurface,
|
|
disabledIconColor: colorScheme.onSurface,
|
|
),
|
|
),
|
|
textSelectionTheme: TextSelectionThemeData(
|
|
selectionColor: colorScheme.onSurface.withAlpha(128),
|
|
selectionHandleColor: colorScheme.secondary,
|
|
),
|
|
inputDecorationTheme: InputDecorationTheme(
|
|
border: OutlineInputBorder(
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
|
),
|
|
contentPadding: const EdgeInsets.all(12),
|
|
),
|
|
chipTheme: ChipThemeData(
|
|
showCheckmark: false,
|
|
backgroundColor: colorScheme.surfaceContainer,
|
|
side: BorderSide.none,
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
|
),
|
|
),
|
|
appBarTheme: AppBarTheme(
|
|
toolbarHeight: isColumnMode ? 72 : 56,
|
|
shadowColor: isColumnMode
|
|
? colorScheme.surfaceContainer.withAlpha(128)
|
|
: null,
|
|
// #Pangea
|
|
// surfaceTintColor: isColumnMode ? colorScheme.surface : null,
|
|
// backgroundColor: isColumnMode ? colorScheme.surface : null,
|
|
surfaceTintColor: colorScheme.surface,
|
|
backgroundColor: colorScheme.surface,
|
|
// Pangea#
|
|
actionsPadding: isColumnMode
|
|
? const EdgeInsets.symmetric(horizontal: 16.0)
|
|
: null,
|
|
systemOverlayStyle: SystemUiOverlayStyle(
|
|
statusBarColor: Colors.transparent,
|
|
statusBarIconBrightness: brightness.reversed,
|
|
statusBarBrightness: brightness,
|
|
systemNavigationBarIconBrightness: brightness.reversed,
|
|
systemNavigationBarColor: colorScheme.surface,
|
|
),
|
|
),
|
|
outlinedButtonTheme: OutlinedButtonThemeData(
|
|
style: OutlinedButton.styleFrom(
|
|
side: BorderSide(width: 1, color: colorScheme.primary),
|
|
shape: RoundedRectangleBorder(
|
|
side: BorderSide(color: colorScheme.primary),
|
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
|
|
),
|
|
),
|
|
),
|
|
progressIndicatorTheme: ProgressIndicatorThemeData(
|
|
strokeCap: StrokeCap.round,
|
|
color: colorScheme.primary,
|
|
refreshBackgroundColor: colorScheme.primaryContainer,
|
|
),
|
|
snackBarTheme: isColumnMode
|
|
? const SnackBarThemeData(
|
|
showCloseIcon: true,
|
|
behavior: SnackBarBehavior.floating,
|
|
width: FluffyThemes.columnWidth * 1.5,
|
|
)
|
|
: const SnackBarThemeData(behavior: SnackBarBehavior.floating),
|
|
elevatedButtonTheme: ElevatedButtonThemeData(
|
|
style: ElevatedButton.styleFrom(
|
|
backgroundColor: colorScheme.secondaryContainer,
|
|
foregroundColor: colorScheme.onSecondaryContainer,
|
|
elevation: 0,
|
|
padding: const EdgeInsets.all(16),
|
|
textStyle: const TextStyle(fontSize: 16),
|
|
),
|
|
),
|
|
// #Pangea
|
|
cupertinoOverrideTheme: const CupertinoThemeData(
|
|
textTheme: CupertinoTextThemeData(),
|
|
),
|
|
// Pangea#
|
|
);
|
|
}
|
|
|
|
// #Pangea
|
|
// TextTheme scaleTextTheme(TextTheme base, Size size) {
|
|
// debugPrint("scaling text theme based on width ${size.width}");
|
|
// double factor = 1.0;
|
|
// if (size.width < 400) {
|
|
// factor = 0.7;
|
|
// } else if (size.width < 600) {
|
|
// factor = 1.25;
|
|
// } else if (size.width > 400) {
|
|
// factor = 1.1;
|
|
// }
|
|
// return base.copyWith(
|
|
// displayLarge: base.displayLarge?.copyWith(fontSize: base.displayLarge!.fontSize! * factor),
|
|
// displayMedium: base.displayMedium?.copyWith(fontSize: base.displayMedium!.fontSize! * factor),
|
|
// displaySmall: base.displaySmall?.copyWith(fontSize: base.displaySmall!.fontSize! * factor),
|
|
// headlineLarge: base.headlineLarge?.copyWith(fontSize: base.headlineLarge!.fontSize! * factor),
|
|
// headlineMedium: base.headlineMedium?.copyWith(fontSize: base.headlineMedium!.fontSize! * factor),
|
|
// headlineSmall: base.headlineSmall?.copyWith(fontSize: base.headlineSmall!.fontSize! * factor),
|
|
// titleLarge: base.titleLarge?.copyWith(fontSize: base.titleLarge!.fontSize! * factor),
|
|
// titleMedium: base.titleMedium?.copyWith(fontSize: base.titleMedium!.fontSize! * factor),
|
|
// titleSmall: base.titleSmall?.copyWith(fontSize: base.titleSmall!.fontSize! * factor),
|
|
// bodyLarge: base.bodyLarge?.copyWith(fontSize: base.bodyLarge!.fontSize! * factor),
|
|
// bodyMedium: base.bodyMedium?.copyWith(fontSize: base.bodyMedium!.fontSize! * factor),
|
|
// bodySmall: base.bodySmall?.copyWith(fontSize: base.bodySmall!.fontSize! * factor),
|
|
// labelLarge: base.labelLarge?.copyWith(fontSize: base.labelLarge!.fontSize! * factor),
|
|
// labelMedium: base.labelMedium?.copyWith(fontSize: base.labelMedium!.fontSize! * factor),
|
|
// labelSmall: base.labelSmall?.copyWith(fontSize: base.labelSmall!.fontSize! * factor),
|
|
// );
|
|
// }
|
|
// Pangea#
|
|
}
|
|
|
|
extension on Brightness {
|
|
Brightness get reversed =>
|
|
this == Brightness.dark ? Brightness.light : Brightness.dark;
|
|
}
|
|
|
|
extension BubbleColorTheme on ThemeData {
|
|
Color get bubbleColor => brightness == Brightness.light
|
|
? colorScheme.primary
|
|
: colorScheme.primaryContainer;
|
|
|
|
Color get onBubbleColor => brightness == Brightness.light
|
|
? colorScheme.onPrimary
|
|
: colorScheme.onPrimaryContainer;
|
|
|
|
Color get secondaryBubbleColor => HSLColor.fromColor(
|
|
brightness == Brightness.light
|
|
? colorScheme.tertiary
|
|
: colorScheme.tertiaryContainer,
|
|
).withSaturation(0.5).toColor();
|
|
}
|