fix tests, rename themes from cwtch* to opaque*
continuous-integration/drone/pr Build is passing
Details
continuous-integration/drone/pr Build is passing
Details
This commit is contained in:
parent
c5154a91d1
commit
1c961c2c4c
|
@ -22,7 +22,7 @@ import 'dart:io' show Platform, exit;
|
||||||
import 'opaque.dart';
|
import 'opaque.dart';
|
||||||
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
|
||||||
|
|
||||||
var globalSettings = Settings(Locale("en", ''), CwtchDark());
|
var globalSettings = Settings(Locale("en", ''), OpaqueDark());
|
||||||
var globalErrorHandler = ErrorHandler();
|
var globalErrorHandler = ErrorHandler();
|
||||||
var globalTorStatus = TorStatus();
|
var globalTorStatus = TorStatus();
|
||||||
var globalAppState = AppState();
|
var globalAppState = AppState();
|
||||||
|
|
|
@ -15,7 +15,7 @@ import 'package:flutter_test/flutter_test.dart';
|
||||||
import 'package:glob/glob.dart';
|
import 'package:glob/glob.dart';
|
||||||
import 'package:glob/list_local_fs.dart';
|
import 'package:glob/list_local_fs.dart';
|
||||||
|
|
||||||
var globalSettings = Settings(Locale("en", ''), CwtchDark());
|
var globalSettings = Settings(Locale("en", ''), OpaqueDark());
|
||||||
var globalErrorHandler = ErrorHandler();
|
var globalErrorHandler = ErrorHandler();
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
|
|
@ -317,7 +317,7 @@ abstract class OpaqueThemeType {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class CwtchDark extends OpaqueThemeType {
|
class OpaqueDark extends OpaqueThemeType {
|
||||||
static final Color darkGreyPurple = Color(0xFF281831);
|
static final Color darkGreyPurple = Color(0xFF281831);
|
||||||
static final Color deepPurple = Color(0xFF422850);
|
static final Color deepPurple = Color(0xFF422850);
|
||||||
static final Color mauvePurple = Color(0xFF8E64A5);
|
static final Color mauvePurple = Color(0xFF8E64A5);
|
||||||
|
@ -627,7 +627,7 @@ class CwtchDark extends OpaqueThemeType {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class CwtchLight extends OpaqueThemeType {
|
class OpaqueLight extends OpaqueThemeType {
|
||||||
static final Color whitePurple = Color(0xFFFFFDFF);
|
static final Color whitePurple = Color(0xFFFFFDFF);
|
||||||
static final Color softPurple = Color(0xFFFDF3FC);
|
static final Color softPurple = Color(0xFFFDF3FC);
|
||||||
static final Color purple = Color(0xFFDFB9DE);
|
static final Color purple = Color(0xFFDFB9DE);
|
||||||
|
|
|
@ -24,13 +24,13 @@ class Settings extends ChangeNotifier {
|
||||||
|
|
||||||
/// Set the dark theme.
|
/// Set the dark theme.
|
||||||
void setDark() {
|
void setDark() {
|
||||||
theme = CwtchDark();
|
theme = OpaqueDark();
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Set the Light theme.
|
/// Set the Light theme.
|
||||||
void setLight() {
|
void setLight() {
|
||||||
theme = CwtchLight();
|
theme = OpaqueLight();
|
||||||
notifyListeners();
|
notifyListeners();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,8 +14,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", ''), Opaque.dark);
|
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
|
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
|
|
@ -14,8 +14,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", ''), Opaque.dark);
|
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
|
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
|
|
|
@ -14,8 +14,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", ''), Opaque.dark);
|
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
|
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
String file(String slug) {
|
String file(String slug) {
|
||||||
|
|
|
@ -14,8 +14,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", ''), Opaque.dark);
|
var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
|
||||||
var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
|
var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
|
||||||
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
|
||||||
|
|
||||||
String file(String slug) {
|
String file(String slug) {
|
||||||
|
|
Loading…
Reference in New Issue