Theme system rework, theme redo

Author: skybird23333

lib/main.dart

@@ -24,7 +24,7 @@ class CoreCoderApp extends StatefulWidget {
 }
 
 class CoreCoderAppState extends State<CoreCoderApp>{
-  String themeName = "atom-one-dark";
+  String themeName = "core-coder-dark";
   @override
   void initState(){
     super.initState();

lib/settings.dart

@@ -6,7 +6,7 @@ import 'package:flutter/material.dart';
 import 'util/plugins_manager.dart';
 
 class AppSettings {
-  static String appTheme = "atom-one-dark";
+  static String appTheme = "core-coder-dark";
 }
 
 class Settings {
@@ -56,7 +56,7 @@ class SettingsPage extends StatelessWidget {
         "The theme for entire app",
         (dynamic val) => {ThemeManager.setTheme(val)},
         SettingsPageItemType.TypeStringList,
-        <String>["atom-one-dark", "atom-one-light"],
+        <String>["core-coder-dark", "core-coder-light"],
         "Atom One Dark")
   ];
 

lib/util/theme_manager.dart

@@ -3,7 +3,7 @@ import './themes.dart';
 
 class ThemeManager {
   static ValueNotifier<String> currentTheme =
-      ValueNotifier<String>("atom-one-dark");
+      ValueNotifier<String>("core-coder-dark");
 
   static void setTheme(String themeName) {
     currentTheme.value = themeName;
@@ -33,7 +33,7 @@ class ThemeManager {
     var backgroundColor = scheme["background"] as Color;
     var backgroundSecondary = scheme["backgroundSecondary"] as Color;
     var foregroundColor = scheme["foreground"] as Color;
-    var primaryColor = scheme["purple"] as Color;
+    var primaryColor = scheme["primaryColour"] as Color;
     debugPrint("Loading theme $themeName:dark=$isDark");
     var theme = ThemeData(
       brightness: brightness,
@@ -58,8 +58,11 @@ class ThemeManager {
       cardColor: backgroundColor,
       floatingActionButtonTheme: FloatingActionButtonThemeData(
         backgroundColor: primaryColor,
-        foregroundColor: foregroundColor
-      )
+        foregroundColor: backgroundSecondary
+      ),
+      iconTheme: IconThemeData(
+          color: primaryColor
+      ),
     );
     return theme;
   }

lib/util/themes.dart

@@ -186,62 +186,46 @@ const THEMES = {
 
 
 const editorThemes = {
-  'atom-one-dark': {
+  'core-coder-dark': {
     "brightness" : "dark",
     "highlight": atomOneDarkTheme,
     "scheme": {
-      // Controls
-      "background": Color(0xFF1E2127),
-      "backgroundSecondary": Color(0xFF282C34),
-      "foreground": Color(0xfffdfdfd),
+      // Color settings
+      "primaryColour": Color(0xff13BB67),
+      "secondaryColour": Color(0xff0d8c4c),
 
-      // Colors
-      "black": Color(0xFF000000),
-      "blue": Color(0xFF61AFEF),
-      "brightBlack": Color(0xFF5C6370),
-      "brightBlue": Color(0xFF61AFEF),
-      "brightCyan": Color(0xFF56B6C2),
-      "brightGreen": Color(0xFF98C379),
-      "brightPurple": Color(0xFFC678DD),
-      "brightRed": Color(0xFFE06C75),
-      "brightWhite": Color(0xFFFFFFFF),
-      "brightYellow": Color(0xFFD19A66),
-      "cyan": Color(0xFF56B6C2),
-      "green": Color(0xFF98C379),
-      "purple": Color(0xFFC678DD),
-      "red": Color(0xFFE06C75),
-      "white": Color(0xFFABB2BF),
-      "yellow": Color(0xFFD19A66)
+      // Controls
+      "background": Color(0xFF191919),
+      "backgroundSecondary": Color(0xFF202020),
+      "foreground": Color(0xFFFFFFFF),
 
+      // Color symbols
+      "info": Color(0xFF108FE8),
+      "success": Color(0xFF87DB4A),
+      "error": Color(0xFFDC1F2D),
+      "warn": Color(0xFFF8D952)
     },
   },
-  'atom-one-light': {
+  'core-coder-light': {
     "brightness" : "light",
     "highlight": atomOneLightTheme,
     "scheme": {
+      // Color settings
+      "primaryColour": Color(0xff13BB67),
+      "secondaryColour": Color(0xff0d8c4c),
+
       // Controls
-      "background": Color(0xFFF9F9F9),
-      "backgroundSecondary": Color(0xFFEFEFEF),
-      "foreground": Color(0xFF383A42),
+      "background": Color(0xFFE5E5E5),
+      "backgroundSecondary": Color(0xFFFFFFFF),
+      "foreground": Color(0xFF000000),
 
-      // Colors
-      "black": Color(0xFF000000),
-      "blue": Color(0xFF4078F2),
-      "brightBlack": Color(0xFF383A42),
-      "brightBlue": Color(0xFF4078F2),
-      "brightCyan": Color(0xFF0184BC),
-      "brightGreen": Color(0xFF50A14F),
-      "brightPurple": Color(0xFFA626A4),
-      "brightRed": Color(0xFFE45649),
-      "brightWhite": Color(0xFFFFFFFF),
-      "brightYellow": Color(0xFF986801),
-      "cyan": Color(0xFF0184BC),
-      "green": Color(0xFF50A14F),
-      "purple": Color(0xFFA626A4),
-      "red": Color(0xFFE45649),
-      "white": Color(0xFFA0A1A7),
-      "yellow": Color(0xFF986801)
-    }
+      // Color symbols
+      "info": Color(0xFF108FE8),
+      "success": Color(0xFF87DB4A),
+      "error": Color(0xFFDC1F2D),
+      "warn": Color(0xFFF8D952)
+
+    },
   },
 };