cwtch.im
/
cwtch-ui
10
11
Fork 17
Code Issues 89 Pull Requests 1 Projects 2 Releases 28 Wiki Activity

Initial Cut

This commit is contained in:
Sarah Jamie Lewis 2023-05-15 10:56:03 -07:00
parent d09b82db76
commit f945d77a7e
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/settings.dart
View File

@ -131,7 +131,7 @@ class Settings extends ChangeNotifier {
switchLocaleByCode(settings["Locale"]); switchLocaleByCode(settings["Locale"]);
// Decide whether to enable Experiments // Decide whether to enable Experiments
_fontScaling = double.parse(settings["FontScaling"].toString()); _fontScaling = double.parse(settings["FontScaling"].toString()).clamp(0.5, 2.0);
blockUnknownConnections = settings["BlockUnknownConnections"] ?? false; blockUnknownConnections = settings["BlockUnknownConnections"] ?? false;
streamerMode = settings["StreamerMode"] ?? false; streamerMode = settings["StreamerMode"] ?? false;

35
lib/themes/opaque.dart
View File

@ -120,7 +120,6 @@ abstract class OpaqueThemeType {
get messageFromOtherTextColor => red; get messageFromOtherTextColor => red;
// Sizes // Sizes
double contactOnionTextSize() { double contactOnionTextSize() {
return 18; return 18;
} }
@ -154,9 +153,7 @@ ThemeData mkThemeData(Settings opaque) {
iconTheme: IconThemeData( iconTheme: IconThemeData(
color: opaque.current().mainTextColor, color: opaque.current().mainTextColor,
), ),
titleTextStyle: TextStyle( titleTextStyle: TextStyle(color: opaque.current().mainTextColor, fontSize: opaque.fontScaling * 18.0),
color: opaque.current().mainTextColor,
),
actionsIconTheme: IconThemeData( actionsIconTheme: IconThemeData(
color: opaque.current().mainTextColor, color: opaque.current().mainTextColor,
)), )),
@ -186,6 +183,7 @@ ThemeData mkThemeData(Settings opaque) {
)), )),
), ),
), ),
scrollbarTheme: ScrollbarThemeData(isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor)), scrollbarTheme: ScrollbarThemeData(isAlwaysShown: false, thumbColor: MaterialStateProperty.all(opaque.current().scrollbarDefaultColor)),
tabBarTheme: TabBarTheme( tabBarTheme: TabBarTheme(
labelColor: opaque.current().mainTextColor, labelColor: opaque.current().mainTextColor,
@ -198,19 +196,22 @@ ThemeData mkThemeData(Settings opaque) {
color: opaque.current().mainTextColor, color: opaque.current().mainTextColor,
)), )),
textTheme: TextTheme( textTheme: TextTheme(
headline1: TextStyle(color: opaque.current().mainTextColor), displayMedium: TextStyle(fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
headline2: TextStyle(color: opaque.current().mainTextColor), displaySmall: TextStyle(fontSize: opaque.fontScaling * 14.0, color: opaque.current().mainTextColor),
headline3: TextStyle(color: opaque.current().mainTextColor), displayLarge: TextStyle(fontSize: opaque.fontScaling * 18.0, color: opaque.current().mainTextColor),
headline4: TextStyle(color: opaque.current().mainTextColor), titleSmall: TextStyle(fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
headline5: TextStyle(color: opaque.current().mainTextColor), titleLarge: TextStyle(fontSize: opaque.fontScaling * 18.0, color: opaque.current().mainTextColor),
headline6: TextStyle(color: opaque.current().mainTextColor), titleMedium: TextStyle(fontSize: opaque.fontScaling * 20.0, color: opaque.current().mainTextColor),
bodyText1: TextStyle(color: opaque.current().mainTextColor), bodySmall: TextStyle(fontSize: opaque.fontScaling * 12.0, color: opaque.current().mainTextColor),
bodyText2: TextStyle(color: opaque.current().mainTextColor), bodyMedium: TextStyle(fontSize: opaque.fontScaling * 14.0, color: opaque.current().mainTextColor),
subtitle1: TextStyle(color: opaque.current().mainTextColor), bodyLarge: TextStyle(fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
subtitle2: TextStyle(color: opaque.current().mainTextColor), headlineSmall: TextStyle(fontSize: opaque.fontScaling * 24.0, color: opaque.current().mainTextColor),
caption: TextStyle(color: opaque.current().mainTextColor), headlineMedium: TextStyle(fontSize: opaque.fontScaling * 26.0, color: opaque.current().mainTextColor),
button: TextStyle(color: opaque.current().mainTextColor), headlineLarge: TextStyle(fontSize: opaque.fontScaling * 28.0, color: opaque.current().mainTextColor),
overline: TextStyle(color: opaque.current().mainTextColor)), labelSmall: TextStyle(fontSize: opaque.fontScaling * 14.0, color: opaque.current().mainTextColor),
labelLarge: TextStyle(fontSize: opaque.fontScaling * 16.0, color: opaque.current().mainTextColor),
labelMedium: TextStyle(fontSize: opaque.fontScaling * 18.0, color: opaque.current().mainTextColor),
),
switchTheme: SwitchThemeData( switchTheme: SwitchThemeData(
overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor), overlayColor: MaterialStateProperty.all(opaque.current().defaultButtonActiveColor),
thumbColor: MaterialStateProperty.all(opaque.current().mainTextColor), thumbColor: MaterialStateProperty.all(opaque.current().mainTextColor),

5
lib/views/globalsettingsview.dart
View File

@ -226,9 +226,10 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
settings.fontScaling = value; settings.fontScaling = value;
// Save Settings... // Save Settings...
saveSettings(context); saveSettings(context);
EnvironmentConfig.debugLog("Font Scaling: $value");
}, },
min: -1.0, min: 0.5,
divisions: 10, divisions: 6,
max: 2.0, max: 2.0,
activeColor: settings.current().defaultButtonColor, activeColor: settings.current().defaultButtonColor,
thumbColor: settings.current().mainTextColor, thumbColor: settings.current().mainTextColor,