From 1c961c2c4c49cb50579e835ab3d1f29fa3ecbd68 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 24 Jun 2021 10:59:23 -0700
Subject: [PATCH] fix tests, rename themes from cwtch* to opaque*

---
 lib/main.dart                  | 2 +-
 lib/main_test.dart             | 2 +-
 lib/opaque.dart                | 4 ++--
 lib/settings.dart              | 4 ++--
 test/buttontextfield_test.dart | 4 ++--
 test/cwtchlabel_test.dart      | 4 ++--
 test/profileimage_test.dart    | 4 ++--
 test/textfield_test.dart       | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index de6aba4..31e8a27 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -22,7 +22,7 @@ import 'dart:io' show Platform, exit;
 import 'opaque.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 globalTorStatus = TorStatus();
 var globalAppState = AppState();
diff --git a/lib/main_test.dart b/lib/main_test.dart
index 77e6443..1f6b96e 100644
--- a/lib/main_test.dart
+++ b/lib/main_test.dart
@@ -15,7 +15,7 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:glob/glob.dart';
 import 'package:glob/list_local_fs.dart';
 
-var globalSettings = Settings(Locale("en", ''), CwtchDark());
+var globalSettings = Settings(Locale("en", ''), OpaqueDark());
 var globalErrorHandler = ErrorHandler();
 
 void main() {
diff --git a/lib/opaque.dart b/lib/opaque.dart
index b9b0404..b6ba50b 100644
--- a/lib/opaque.dart
+++ b/lib/opaque.dart
@@ -317,7 +317,7 @@ abstract class OpaqueThemeType {
 
 }
 
-class CwtchDark extends OpaqueThemeType {
+class OpaqueDark extends OpaqueThemeType {
   static final Color darkGreyPurple = Color(0xFF281831);
   static final Color deepPurple = Color(0xFF422850);
   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 softPurple = Color(0xFFFDF3FC);
   static final Color purple = Color(0xFFDFB9DE);
diff --git a/lib/settings.dart b/lib/settings.dart
index 7d9eec9..ed4653e 100644
--- a/lib/settings.dart
+++ b/lib/settings.dart
@@ -24,13 +24,13 @@ class Settings extends ChangeNotifier {
 
   /// Set the dark theme.
   void setDark() {
-    theme = CwtchDark();
+    theme = OpaqueDark();
     notifyListeners();
   }
 
   /// Set the Light theme.
   void setLight() {
-    theme = CwtchLight();
+    theme = OpaqueLight();
     notifyListeners();
   }
 
diff --git a/test/buttontextfield_test.dart b/test/buttontextfield_test.dart
index de0fd69..2f75003 100644
--- a/test/buttontextfield_test.dart
+++ b/test/buttontextfield_test.dart
@@ -14,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), Opaque.dark);
-var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 void main() {
diff --git a/test/cwtchlabel_test.dart b/test/cwtchlabel_test.dart
index ec55f9c..d0d077a 100644
--- a/test/cwtchlabel_test.dart
+++ b/test/cwtchlabel_test.dart
@@ -14,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), Opaque.dark);
-var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 void main() {
diff --git a/test/profileimage_test.dart b/test/profileimage_test.dart
index 14a3f51..9a841f9 100644
--- a/test/profileimage_test.dart
+++ b/test/profileimage_test.dart
@@ -14,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), Opaque.dark);
-var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 String file(String slug) {
diff --git a/test/textfield_test.dart b/test/textfield_test.dart
index 1a7455d..9a0f052 100644
--- a/test/textfield_test.dart
+++ b/test/textfield_test.dart
@@ -14,8 +14,8 @@ import 'package:provider/provider.dart';
 
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-var settingsEnglishDark = Settings(Locale("en", ''), Opaque.dark);
-var settingsEnglishLight = Settings(Locale("en", ''), Opaque.light);
+var settingsEnglishDark = Settings(Locale("en", ''), OpaqueDark());
+var settingsEnglishLight = Settings(Locale("en", ''), OpaqueLight());
 ChangeNotifierProvider<Settings> getSettingsEnglishDark() => ChangeNotifierProvider.value(value: settingsEnglishDark);
 
 String file(String slug) {