From 3f306932ef3a06109340933d5e19260c37df8a45 Mon Sep 17 00:00:00 2001
From: Vishesh Handa <me@vhanda.in>
Date: Fri, 4 Jun 2021 18:55:19 +0200
Subject: [PATCH] Cleanup themes

---
 lib/monarch.dart |  7 +++++++
 lib/themes.dart  | 51 +++++++++++++++++++++---------------------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/lib/monarch.dart b/lib/monarch.dart
index e9c48252..8c5ba1ea 100644
--- a/lib/monarch.dart
+++ b/lib/monarch.dart
@@ -5,6 +5,7 @@ import 'package:flutter/material.dart';
 import 'package:easy_localization/src/localization.dart';
 import 'package:easy_localization/src/translations.dart';
 import 'package:easy_localization_loader/easy_localization_loader.dart';
+import 'package:gitjournal/themes.dart';
 import 'package:monarch_annotations/monarch_annotations.dart';
 
 // ignore_for_file: implementation_imports
@@ -54,3 +55,9 @@ class MonarchLocalizationsDelegate extends LocalizationsDelegate<Localization> {
   MonarchLocale('zh'),
 ])
 const myEasyLocalizationsDelegate = MonarchLocalizationsDelegate();
+
+@MonarchTheme('Light Theme', isDefault: true)
+final monarchLightTheme = Themes.light;
+
+@MonarchTheme('Dark Theme')
+final monarchDarkTheme = Themes.dark;
diff --git a/lib/themes.dart b/lib/themes.dart
index 6c1159ce..e17c1586 100644
--- a/lib/themes.dart
+++ b/lib/themes.dart
@@ -1,33 +1,26 @@
 import 'package:flutter/material.dart';
 
-import 'package:monarch_annotations/monarch_annotations.dart';
-
-@MonarchTheme('Light Theme', isDefault: true)
-final monarchLightTheme = ThemeData(
-  brightness: Brightness.light,
-  primaryColor: const Color(0xFF66bb6a),
-  primaryColorLight: const Color(0xFF98ee99),
-  primaryColorDark: const Color(0xFF338a3e),
-  accentColor: const Color(0xff6d4c41),
-  textSelectionTheme: const TextSelectionThemeData(
-    cursorColor: Color(0xFF338a3e),
-    selectionHandleColor: Color(0xFF66bb6a),
-  ),
-);
-
-@MonarchTheme('Dark Theme')
-final monarchDarkTheme = ThemeData(
-  brightness: Brightness.dark,
-  primaryColor: const Color(0xff212121),
-  accentColor: const Color(0xff689f38),
-  toggleableActiveColor: const Color(0xFF66bb6a),
-  textSelectionTheme: const TextSelectionThemeData(
-    cursorColor: Color(0xFF66bb6a),
-    selectionHandleColor: Color(0xFF66bb6a),
-  ),
-);
-
 class Themes {
-  static final light = monarchLightTheme;
-  static final dark = monarchDarkTheme;
+  static final light = ThemeData(
+    brightness: Brightness.light,
+    primaryColor: const Color(0xFF66bb6a),
+    primaryColorLight: const Color(0xFF98ee99),
+    primaryColorDark: const Color(0xFF338a3e),
+    accentColor: const Color(0xff6d4c41),
+    textSelectionTheme: const TextSelectionThemeData(
+      cursorColor: Color(0xFF338a3e),
+      selectionHandleColor: Color(0xFF66bb6a),
+    ),
+  );
+
+  static final dark = ThemeData(
+    brightness: Brightness.dark,
+    primaryColor: const Color(0xff212121),
+    accentColor: const Color(0xff689f38),
+    toggleableActiveColor: const Color(0xFF66bb6a),
+    textSelectionTheme: const TextSelectionThemeData(
+      cursorColor: Color(0xFF66bb6a),
+      selectionHandleColor: Color(0xFF66bb6a),
+    ),
+  );
 }