feat: use noto sans sc as default font; fix build script on arm64 linux.
This commit is contained in:
@@ -21,6 +21,8 @@ const double defaultButtonHeight = 36;
|
||||
|
||||
const userGestureConfigFilePath = 'deepin/dde-daemon/gesture.json';
|
||||
|
||||
const defaultFontFamily = 'NotoSansSC';
|
||||
|
||||
const deepinLogoutCommands = [
|
||||
'dbus-send',
|
||||
'--type=method_call',
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:dde_gesture_manager/constants/constants.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
var darkTheme = ThemeData.dark().copyWith(
|
||||
final _darkTheme = ThemeData(
|
||||
brightness: Brightness.dark,
|
||||
fontFamily: kIsWeb ? null : defaultFontFamily,
|
||||
);
|
||||
|
||||
var darkTheme = _darkTheme.copyWith(
|
||||
primaryColor: Colors.grey,
|
||||
scaffoldBackgroundColor: Color(0xff252525),
|
||||
backgroundColor: Color(0xff282828),
|
||||
@@ -9,21 +15,23 @@ var darkTheme = ThemeData.dark().copyWith(
|
||||
color: Color(0xffc0c6d4),
|
||||
),
|
||||
dividerColor: Color(0xfff3f3f3),
|
||||
textTheme: ThemeData.dark().textTheme.copyWith(
|
||||
textTheme: _darkTheme.textTheme.copyWith(
|
||||
headline1: TextStyle(
|
||||
color: Color(0xffc0c6d4),
|
||||
fontFamilyFallback: kIsWeb ? null : [defaultFontFamily],
|
||||
),
|
||||
bodyText2: TextStyle(
|
||||
color: Color(0xffc0c6d4),
|
||||
fontFamilyFallback: kIsWeb ? null : [defaultFontFamily],
|
||||
),
|
||||
),
|
||||
popupMenuTheme: ThemeData.dark().popupMenuTheme.copyWith(
|
||||
popupMenuTheme: _darkTheme.popupMenuTheme.copyWith(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(defaultBorderRadius),
|
||||
),
|
||||
),
|
||||
dialogBackgroundColor: Color(0xff202020),
|
||||
tooltipTheme: ThemeData.dark().tooltipTheme.copyWith(
|
||||
tooltipTheme: _darkTheme.tooltipTheme.copyWith(
|
||||
textStyle: TextStyle(
|
||||
color: Colors.grey,
|
||||
),
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
import 'package:dde_gesture_manager/constants/constants.dart';
|
||||
import 'package:flutter/foundation.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
var lightTheme = ThemeData.light().copyWith(
|
||||
final _lightTheme = ThemeData(
|
||||
brightness: Brightness.light,
|
||||
fontFamily: kIsWeb ? null : defaultFontFamily,
|
||||
);
|
||||
|
||||
var lightTheme = _lightTheme.copyWith(
|
||||
primaryColor: Colors.blue,
|
||||
scaffoldBackgroundColor: Color(0xfff8f8f8),
|
||||
backgroundColor: Color(0xffffffff),
|
||||
@@ -9,21 +15,23 @@ var lightTheme = ThemeData.light().copyWith(
|
||||
color: Color(0xff414d68),
|
||||
),
|
||||
dividerColor: Colors.grey.shade600,
|
||||
textTheme: ThemeData.light().textTheme.copyWith(
|
||||
textTheme: _lightTheme.textTheme.copyWith(
|
||||
headline1: TextStyle(
|
||||
color: Color(0xff414d68),
|
||||
fontFamilyFallback: kIsWeb ? null : [defaultFontFamily],
|
||||
),
|
||||
bodyText2: TextStyle(
|
||||
color: Color(0xff414d68),
|
||||
fontFamilyFallback: kIsWeb ? null : [defaultFontFamily],
|
||||
),
|
||||
),
|
||||
popupMenuTheme: ThemeData.dark().popupMenuTheme.copyWith(
|
||||
popupMenuTheme: _lightTheme.popupMenuTheme.copyWith(
|
||||
shape: RoundedRectangleBorder(
|
||||
borderRadius: BorderRadius.circular(defaultBorderRadius),
|
||||
),
|
||||
),
|
||||
dialogBackgroundColor: Color(0xfffefefe),
|
||||
tooltipTheme: ThemeData.dark().tooltipTheme.copyWith(
|
||||
tooltipTheme: _lightTheme.tooltipTheme.copyWith(
|
||||
textStyle: TextStyle(
|
||||
color: Colors.grey.shade600,
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user