update with new PRs rebase, update goldens for slight variance
|
@ -14,7 +14,7 @@ import 'dart:typed_data';
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
import 'package:glob/glob.dart';
|
import 'package:glob/glob.dart';
|
||||||
|
|
||||||
var globalSettings = Settings(Locale("en", ''), OpaqueDark());
|
var globalSettings = Settings(Locale("en", ''), CwtchDark());
|
||||||
var globalErrorHandler = ErrorHandler();
|
var globalErrorHandler = ErrorHandler();
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
|
|
@ -133,7 +133,7 @@ ThemeData mkThemeData(Settings opaque) {
|
||||||
actionsIconTheme: IconThemeData(
|
actionsIconTheme: IconThemeData(
|
||||||
color: opaque.current().mainTextColor,
|
color: opaque.current().mainTextColor,
|
||||||
)),
|
)),
|
||||||
//bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor()), // Can't determine current use
|
//bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor), // Can't determine current use
|
||||||
textButtonTheme: TextButtonThemeData(
|
textButtonTheme: TextButtonThemeData(
|
||||||
style: ButtonStyle(
|
style: ButtonStyle(
|
||||||
backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor),
|
backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor),
|
||||||
|
|
|
@ -105,7 +105,7 @@ class _AddEditServerViewState extends State<AddEditServerView> {
|
||||||
),
|
),
|
||||||
CwtchTextField(
|
CwtchTextField(
|
||||||
controller: ctrlrDesc,
|
controller: ctrlrDesc,
|
||||||
labelText: AppLocalizations.of(context)!.fieldDescriptionLabel,
|
hintText: AppLocalizations.of(context)!.fieldDescriptionLabel,
|
||||||
autofocus: false,
|
autofocus: false,
|
||||||
)
|
)
|
||||||
]),
|
]),
|
||||||
|
|
|
@ -245,7 +245,7 @@ class _GlobalSettingsViewState extends State<GlobalSettingsView> {
|
||||||
secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
|
secondary: Icon(Icons.attach_file, color: settings.current().mainTextColor),
|
||||||
),
|
),
|
||||||
SwitchListTile(
|
SwitchListTile(
|
||||||
title: Text(AppLocalizations.of(context)!.enableExperimentClickableLinks, style: TextStyle(color: settings.current().mainTextColor())),
|
title: Text(AppLocalizations.of(context)!.enableExperimentClickableLinks, style: TextStyle(color: settings.current().mainTextColor)),
|
||||||
subtitle: Text(AppLocalizations.of(context)!.experimentClickableLinksDescription),
|
subtitle: Text(AppLocalizations.of(context)!.experimentClickableLinksDescription),
|
||||||
value: settings.isExperimentEnabled(ClickableLinksExperiment),
|
value: settings.isExperimentEnabled(ClickableLinksExperiment),
|
||||||
onChanged: (bool value) {
|
onChanged: (bool value) {
|
||||||
|
|
|
@ -65,7 +65,7 @@ class _ProfileServersView extends State<ProfileServersView> {
|
||||||
|
|
||||||
final importCard = Card( child: ListTile(
|
final importCard = Card( child: ListTile(
|
||||||
title: Text(AppLocalizations.of(context)!.importLocalServerLabel),
|
title: Text(AppLocalizations.of(context)!.importLocalServerLabel),
|
||||||
leading: Icon(CwtchIcons.add_circle_24px , color: Provider.of<Settings>(context).current().mainTextColor()),
|
leading: Icon(CwtchIcons.add_circle_24px , color: Provider.of<Settings>(context).current().mainTextColor),
|
||||||
trailing: DropdownButton(
|
trailing: DropdownButton(
|
||||||
onChanged: (String? importServer) {
|
onChanged: (String? importServer) {
|
||||||
if (importServer!.isNotEmpty) {
|
if (importServer!.isNotEmpty) {
|
||||||
|
|
|
@ -130,7 +130,7 @@ class _RemoteServerViewState extends State<RemoteServerView> {
|
||||||
children: [
|
children: [
|
||||||
Text(
|
Text(
|
||||||
group.nickname,
|
group.nickname,
|
||||||
style: Provider.of<FlwtchState>(context).biggerFont.apply(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor()),
|
style: Provider.of<FlwtchState>(context).biggerFont.apply(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor),
|
||||||
softWrap: true,
|
softWrap: true,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
),
|
),
|
||||||
|
@ -141,7 +141,7 @@ class _RemoteServerViewState extends State<RemoteServerView> {
|
||||||
group.onion,
|
group.onion,
|
||||||
softWrap: true,
|
softWrap: true,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: TextStyle(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor()),
|
style: TextStyle(color: Provider.of<Settings>(context).theme.portraitOnlineBorderColor),
|
||||||
)))
|
)))
|
||||||
])
|
])
|
||||||
);
|
);
|
||||||
|
|
|
@ -41,7 +41,7 @@ class _CwtchButtonTextFieldState extends State<CwtchButtonTextField> {
|
||||||
enableIMEPersonalizedLearning: false,
|
enableIMEPersonalizedLearning: false,
|
||||||
decoration: InputDecoration(
|
decoration: InputDecoration(
|
||||||
labelText: widget.labelText,
|
labelText: widget.labelText,
|
||||||
labelStyle: TextStyle(color: theme.current().mainTextColor(), backgroundColor: theme.current().textfieldBackgroundColor()),
|
labelStyle: TextStyle(color: theme.current().mainTextColor, backgroundColor: theme.current().textfieldBackgroundColor),
|
||||||
suffixIcon: IconButton(
|
suffixIcon: IconButton(
|
||||||
onPressed: widget.onPressed,
|
onPressed: widget.onPressed,
|
||||||
icon: widget.icon,
|
icon: widget.icon,
|
||||||
|
|
|
@ -36,7 +36,7 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.all(6.0), //border size
|
padding: const EdgeInsets.all(6.0), //border size
|
||||||
child: Icon(CwtchIcons.dns_24px,
|
child: Icon(CwtchIcons.dns_24px,
|
||||||
color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor(),
|
color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor,
|
||||||
size: 64)
|
size: 64)
|
||||||
|
|
||||||
),
|
),
|
||||||
|
@ -46,7 +46,7 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
|
||||||
Text(
|
Text(
|
||||||
description,
|
description,
|
||||||
semanticsLabel: description,
|
semanticsLabel: description,
|
||||||
style: Provider.of<FlwtchState>(context).biggerFont.apply(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
|
style: Provider.of<FlwtchState>(context).biggerFont.apply(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
|
||||||
softWrap: true,
|
softWrap: true,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
),
|
),
|
||||||
|
@ -57,7 +57,7 @@ class _RemoteServerRowState extends State<RemoteServerRow> {
|
||||||
server.onion,
|
server.onion,
|
||||||
softWrap: true,
|
softWrap: true,
|
||||||
overflow: TextOverflow.ellipsis,
|
overflow: TextOverflow.ellipsis,
|
||||||
style: TextStyle(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor() : Provider.of<Settings>(context).theme.portraitOfflineBorderColor()),
|
style: TextStyle(color: running ? Provider.of<Settings>(context).theme.portraitOnlineBorderColor : Provider.of<Settings>(context).theme.portraitOfflineBorderColor),
|
||||||
)))
|
)))
|
||||||
],
|
],
|
||||||
)),
|
)),
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
// gestures. You can also use WidgetTester to find child widgets in the widget
|
// gestures. You can also use WidgetTester to find child widgets in the widget
|
||||||
// tree, read text, and verify that the values of widget properties are correct.
|
// tree, read text, and verify that the values of widget properties are correct.
|
||||||
|
|
||||||
|
import 'package:cwtch/themes/cwtch.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cwtch/themes/opaque.dart';
|
import 'package:cwtch/themes/opaque.dart';
|
||||||
import 'package:cwtch/settings.dart';
|
import 'package:cwtch/settings.dart';
|
||||||
|
@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
// gestures. You can also use WidgetTester to find child widgets in the widget
|
// gestures. You can also use WidgetTester to find child widgets in the widget
|
||||||
// tree, read text, and verify that the values of widget properties are correct.
|
// tree, read text, and verify that the values of widget properties are correct.
|
||||||
|
|
||||||
|
import 'package:cwtch/themes/cwtch.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cwtch/themes/opaque.dart';
|
import 'package:cwtch/themes/opaque.dart';
|
||||||
import 'package:cwtch/settings.dart';
|
import 'package:cwtch/settings.dart';
|
||||||
|
@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
// gestures. You can also use WidgetTester to find child widgets in the widget
|
// gestures. You can also use WidgetTester to find child widgets in the widget
|
||||||
// tree, read text, and verify that the values of widget properties are correct.
|
// tree, read text, and verify that the values of widget properties are correct.
|
||||||
|
|
||||||
|
import 'package:cwtch/themes/cwtch.dart';
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cwtch/themes/opaque.dart';
|
import 'package:cwtch/themes/opaque.dart';
|
||||||
import 'package:cwtch/settings.dart';
|
import 'package:cwtch/settings.dart';
|
||||||
|
@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
String file(String slug) {
|
String file(String slug) {
|
||||||
|
|
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 7.9 KiB |
Before Width: | Height: | Size: 6.1 KiB After Width: | Height: | Size: 6.1 KiB |
|
@ -7,6 +7,7 @@
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:cwtch/themes/opaque.dart';
|
import 'package:cwtch/themes/opaque.dart';
|
||||||
|
import 'package:cwtch/themes/cwtch.dart';
|
||||||
import 'package:cwtch/settings.dart';
|
import 'package:cwtch/settings.dart';
|
||||||
import 'package:cwtch/widgets/textfield.dart';
|
import 'package:cwtch/widgets/textfield.dart';
|
||||||
import 'package:flutter_test/flutter_test.dart';
|
import 'package:flutter_test/flutter_test.dart';
|
||||||
|
@ -14,8 +15,8 @@ import 'package:provider/provider.dart';
|
||||||
|
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
var settingsEnglishDark = Settings(Locale("en", ''), CwtchDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
var settingsEnglishLight = Settings(Locale("en", ''), CwtchLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
String file(String slug) {
|
String file(String slug) {
|
||||||
|
|