GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-24 04:59:26 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'shine/emoji-on-desktop' into 'main'

Browse Source 
feat: emoji working on desktop

See merge request famedly/fluffychat!355
This commit is contained in:
Krille Fear 2021-01-20 17:01:44 +00:00
commit 067bf08df1
4 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/fonts/NotoEmoji/NotoColorEmoji.ttf Normal file
View File

Binary file not shown.

BIN
assets/fonts/NotoEmoji/NotoEmoji-Regular.ttf Normal file
View File

Binary file not shown.

24
lib/config/themes.dart
View File

@ -1,8 +1,30 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:fluffychat/utils/platform_infos.dart';
abstract class FluffyThemes { abstract class FluffyThemes {
static const double columnWidth = 360.0; static const double columnWidth = 360.0;
static const fallback_text_style =
TextStyle(fontFamilyFallback: ['NotoEmoji']);
static var fallback_text_theme = PlatformInfos.isDesktop
? TextTheme(
bodyText1: fallback_text_style,
bodyText2: fallback_text_style,
button: fallback_text_style,
caption: fallback_text_style,
overline: fallback_text_style,
headline1: fallback_text_style,
headline2: fallback_text_style,
headline3: fallback_text_style,
headline4: fallback_text_style,
headline5: fallback_text_style,
headline6: fallback_text_style,
subtitle1: fallback_text_style,
subtitle2: fallback_text_style)
: TextTheme();
static ThemeData light = ThemeData( static ThemeData light = ThemeData(
primaryColorDark: Colors.white, primaryColorDark: Colors.white,
primaryColorLight: Color(0xff121212), primaryColorLight: Color(0xff121212),
@ -11,6 +33,7 @@ abstract class FluffyThemes {
backgroundColor: Colors.white, backgroundColor: Colors.white,
secondaryHeaderColor: Color(0xFFECECF2), secondaryHeaderColor: Color(0xFFECECF2),
scaffoldBackgroundColor: Colors.white, scaffoldBackgroundColor: Colors.white,
textTheme: Typography.material2018().black.merge(fallback_text_theme),
snackBarTheme: SnackBarThemeData( snackBarTheme: SnackBarThemeData(
behavior: kIsWeb ? SnackBarBehavior.floating : SnackBarBehavior.fixed, behavior: kIsWeb ? SnackBarBehavior.floating : SnackBarBehavior.fixed,
), ),
@ -46,6 +69,7 @@ abstract class FluffyThemes {
scaffoldBackgroundColor: Colors.black, scaffoldBackgroundColor: Colors.black,
accentColor: Color(0xFFF5B4D2), accentColor: Color(0xFFF5B4D2),
secondaryHeaderColor: Color(0xff1D1D1D), secondaryHeaderColor: Color(0xff1D1D1D),
textTheme: Typography.material2018().white.merge(fallback_text_theme),
snackBarTheme: SnackBarThemeData( snackBarTheme: SnackBarThemeData(
behavior: kIsWeb ? SnackBarBehavior.floating : SnackBarBehavior.fixed, behavior: kIsWeb ? SnackBarBehavior.floating : SnackBarBehavior.fixed,
), ),

5
pubspec.yaml
View File

@ -87,3 +87,8 @@ flutter:
- assets/sounds/ - assets/sounds/
- assets/js/ - assets/js/
- assets/js/package/ - assets/js/package/
fonts:
- family: NotoEmoji
fonts:
- asset: assets/fonts/NotoEmoji/NotoColorEmoji.ttf