Merge branch 'dev' of https://github.com/Hanprogramer/corecoder_develop into dev

Author: skybird23333

lib/editor.dart

@@ -327,7 +327,7 @@ class _EditorPageState extends State<EditorPage> {
     var tabController = TabbedViewController(
       tabs,
     );
-    tabController.selectedIndex = selectedTab;
+    tabController.selectedIndex = tabs.isNotEmpty? selectedTab : null;
     final page = Stack(children: [
       Column(//direction: Axis.vertical,
           children: [

lib/homepage.dart

@@ -10,23 +10,41 @@ import 'package:provider/provider.dart';
 import 'package:provider/single_child_widget.dart';
 import 'homepage.dart';
 import 'editor_drawer.dart';
+import 'package:bitsdojo_window/bitsdojo_window.dart';
 
-void main() async{
+void main() async {
   runApp(const CoreCoderApp());
+  if (CoreCoderApp.isDesktop) {
+    doWhenWindowReady(() {
+      const initialSize = Size(800, 600);
+      appWindow.minSize = const Size(256, 256);
+      appWindow.size = initialSize;
+      appWindow.alignment = Alignment.center;
+      appWindow.show();
+    });
+  }
 }
 
+const borderColor = Color(0xFF3BBA73);
 
 class CoreCoderApp extends StatefulWidget {
   const CoreCoderApp({Key? key}) : super(key: key);
-
+  static const String version = "v0.0.1";
+  static bool isDesktop = (Platform.isWindows || Platform.isLinux || Platform.isMacOS);
+  static bool isLandscape(BuildContext context){
+    var q = MediaQuery.of(context);
+    return q.orientation == Orientation.landscape || q.size.width > q.size.height;
+  }
   @override
   State<StatefulWidget> createState() {
     return CoreCoderAppState();
   }
 }
 
-class CoreCoderAppState extends State<CoreCoderApp>{
+class CoreCoderAppState extends State<CoreCoderApp> {
   String themeName = "core-coder-dark";
+  var borderColor = Colors.black;
+
   @override
   void initState() {
     super.initState();
@@ -35,7 +53,7 @@ class CoreCoderAppState extends State<CoreCoderApp>{
         themeName = ThemeManager.currentTheme.value;
       });
     });
-    if(Platform.isWindows) {
+    if (Platform.isWindows) {
       /// On windows, get the runtime arguments
       /// this is provided by windows when you "Open with" CoreCoder
       /// the result is a string to the absolute path of the file
@@ -50,22 +68,91 @@ class CoreCoderAppState extends State<CoreCoderApp>{
   @override
   Widget build(BuildContext context) {
     return MultiProvider(
-      child: MaterialApp(
-        debugShowCheckedModeBanner: false,
-        title: 'CoreCoder Develop',
-        theme: ThemeManager.getThemeData(themeName:themeName),
-        //home: HomePage(),
-        initialRoute: "/",
-        routes: {
-          "/": (context) => HomePage(),
-          EditorPage.routeName: (context) => const EditorPage(),
-          PluginsBrowser.routeName: (context) => const PluginsBrowser()
-        },
-      ),
+      child: WindowBorder(
+          color: borderColor,
+          child: MaterialApp(
+            debugShowCheckedModeBanner: false,
+            title: 'CoreCoder Develop',
+            theme: ThemeManager.getThemeData(themeName: themeName),
+            //home: HomePage(),
+            initialRoute: "/",
+            routes: {
+              "/": (context) => HomePage(),
+              EditorPage.routeName: (context) => const EditorPage(),
+              PluginsBrowser.routeName: (context) => const PluginsBrowser()
+            },
+            builder: (BuildContext context, Widget? widget) {
+              borderColor = Theme.of(context).primaryColor;
+              return Container(
+                  color: Theme.of(context).colorScheme.background,
+                  child: Column(
+                    children: [
+                      // The title bar
+                      if(CoreCoderApp.isDesktop)
+                      WindowTitleBarBox(
+                          child: Row(children: [
+                        Expanded(
+                            child: MoveWindow(
+                          child: Row(children: [
+                            const SizedBox(
+                              width: 16.0,
+                            ),
+                            Image.asset(
+                              "assets/logo.png",
+                              isAntiAlias: true,
+                              filterQuality: FilterQuality.high,
+                              width: 20,
+                              height: 20,
+                            ),
+                            const SizedBox(
+                              width: 16.0,
+                            ),
+                            Text(
+                              "CoreCoder:Develop ${CoreCoderApp.version}",
+                              style: Theme.of(context).textTheme.bodyText1!,
+                            )
+                          ]),
+                        )),
+                        const WindowButtons()
+                      ])),
+                      if (widget != null) Expanded(child: widget)
+                    ],
+                  ));
+            },
+          )),
       providers: <SingleChildWidget>[
         ChangeNotifierProvider<DrawerStateInfo>(
             create: (_) => DrawerStateInfo()),
       ],
     );
   }
 }
+
+class WindowButtons extends StatelessWidget {
+  const WindowButtons({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    var theme = Theme.of(context);
+    var buttonColors = WindowButtonColors(
+        mouseOver: theme.canvasColor,
+        mouseDown: theme.backgroundColor,
+        iconNormal: theme.textTheme.bodyText1?.color,
+        iconMouseOver: theme.textTheme.bodyText1?.color,
+        iconMouseDown: theme.textTheme.bodyText1?.color);
+
+    var closeButtonColors = WindowButtonColors(
+        mouseOver: const Color(0xFFD32F2F),
+        mouseDown: const Color(0xFFB71C1C),
+        iconNormal: theme.textTheme.bodyText1?.color,
+        iconMouseOver: theme.textTheme.bodyText1?.color);
+
+    return Row(
+      children: [
+        MinimizeWindowButton(colors: buttonColors),
+        MaximizeWindowButton(colors: buttonColors),
+        CloseWindowButton(colors: closeButtonColors),
+      ],
+    );
+  }
+}

lib/main.dart

@@ -141,8 +141,8 @@ class PluginsBrowserState extends State<PluginsBrowser> {
             obj[key]["identifier"], isInstalled
         ));
       }
+      setState(() {}); // refresh
     }
-    setState(() {}); // refresh
   }
 
   @override

lib/plugins_browser.dart

@@ -1,3 +1,4 @@
+import 'package:corecoder_develop/main.dart';
 import 'package:corecoder_develop/plugins_browser.dart';
 import 'package:corecoder_develop/util/modules_manager.dart';
 import 'package:corecoder_develop/util/theme_manager.dart';
@@ -62,7 +63,7 @@ class SettingsPageState extends State<SettingsPage> {
         (dynamic val) => {ThemeManager.setTheme(val)},
         SettingsPageItemType.TypeStringList,
         <String>["core-coder-dark", "core-coder-light"],
-        "Atom One Dark")
+        ThemeManager.currentTheme.value)
   ];
 
   Widget generateListItem(int index, BuildContext context) {
@@ -251,10 +252,11 @@ class SettingsPageState extends State<SettingsPage> {
                     }))
                   ]),
                   /// About page
-                  Column(children:const [
-                    Text("CoreCoder Develop"),
-                    Text("v0.0.1 dev beta"),
-                  ])
+                  ListTile(
+                    leading: Image.asset("assets/logo.png"),
+                    title: const Text("CoreCoder Develop"),
+                    subtitle: const Text(CoreCoderApp.version),
+                  )
                 ],
               );
             },future: PluginsManager.pluginsPath,)));

lib/settings.dart

@@ -156,6 +156,7 @@ class InnerField extends StatelessWidget {
           onUnAutoComplete!.call();
         }
       },
+      onChange: (String lastToken) { if(onChange!=null) onChange!(language, lastToken); }
     );
     codeField = CodeField(
       onCursorPosChanged: setCursorOffset,

lib/util/custom_code_box.dart

@@ -0,0 +1,118 @@
+import 'package:corecoder_develop/util/theme_manager.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:tabbed_view/tabbed_view.dart';
+
+class DesktopTabBar extends StatefulWidget {
+  final double tabSize;
+  final List<Widget> content;
+  final List<DesktopTabData> tabs;
+
+  const DesktopTabBar(
+      {Key? key,
+      this.tabSize = 256.0,
+      required this.content,
+      required this.tabs})
+      : super(key: key);
+
+  @override
+  State createState() => DesktopTabBarState();
+}
+
+class DesktopTabBarState extends State<DesktopTabBar> {
+  Color? colorBackground;
+  Color? colorBackgroundSecondary;
+  int selectedTab = 0;
+
+  List<Widget> get tabs {
+    return List.generate(widget.tabs.length, (index) {
+      var item = widget.tabs[index];
+      return DesktopTab(
+          icon: item.icon, title: item.title, onClick: () {
+            setState(() {
+              selectedTab = index;
+            });
+      }, isActive: selectedTab == index);
+    });
+  }
+
+  @override
+  void initState() {
+    super.initState();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    var query = MediaQuery.of(context);
+
+    colorBackground = ThemeManager.getThemeSchemeColor("backgroundTertiary");
+    colorBackgroundSecondary =
+        ThemeManager.getThemeSchemeColor("backgroundSecondary");
+    return Container(
+        color: colorBackground,
+        constraints: BoxConstraints(maxHeight: query.size.height - 200),
+        child: Flex(
+          direction: Axis.horizontal,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: <Widget>[
+            Container(
+              padding: const EdgeInsets.all(16.0),
+              child: SingleChildScrollView(
+                child: Column(
+                  children: tabs,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                ),
+              ),
+              constraints: BoxConstraints(
+                  minWidth: widget.tabSize, maxWidth: widget.tabSize),
+            ),
+            Expanded(
+                child: Container(
+              color: colorBackgroundSecondary,
+              child: widget.content[selectedTab],
+            ))
+          ],
+        ));
+  }
+}
+
+class DesktopTabData {
+  final Widget icon, title;
+
+  DesktopTabData({required this.icon, required this.title});
+}
+
+class DesktopTab extends StatelessWidget {
+  final Widget icon, title;
+  final Function() onClick;
+  final bool isActive;
+
+  const DesktopTab(
+      {Key? key,
+      required this.icon,
+      required this.title,
+      required this.onClick,
+      required this.isActive})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return TextButton(
+      style: ButtonStyle(
+        backgroundColor:(isActive)? MaterialStateProperty.all(Theme.of(context).canvasColor) : null,
+          padding: MaterialStateProperty.all(const EdgeInsets.all(16.0)),
+          foregroundColor: MaterialStateProperty.all(
+              Theme.of(context).textTheme.bodyText1?.color)),
+      onPressed: onClick,
+      child: Row(
+        children: [
+          icon,
+          const SizedBox(
+            width: 16.0,
+          ),
+          title
+        ],
+      ),
+    );
+  }
+}

lib/util/desktop_tabbar.dart

@@ -39,10 +39,16 @@ class ThemeManager {
       brightness: brightness,
       backgroundColor: backgroundColor,
       canvasColor: backgroundSecondary,
+      primaryColor: primaryColor,
+      primaryColorDark: Colors.red,
+      primarySwatch:  Colors.red,
       colorScheme: ColorScheme.fromSwatch(brightness: brightness).copyWith(
         primary: primaryColor,
         brightness: brightness,
+        background: backgroundColor,
+
       ),
+
       scaffoldBackgroundColor: backgroundSecondary,
       appBarTheme: AppBarTheme(
         backgroundColor: backgroundColor,

lib/util/theme_manager.dart

@@ -233,6 +233,7 @@ const editorThemes = {
       // Controls
       "background": Color(0xFF191919),
       "backgroundSecondary": Color(0xFF202020),
+      "backgroundTertiary": Color(0xFF2B2B2B),
       "foreground": Color(0xFFFFFFFF),
 
       // Color symbols
@@ -253,6 +254,7 @@ const editorThemes = {
       // Controls
       "background": Color(0xFFE5E5E5),
       "backgroundSecondary": Color(0xFFFFFFFF),
+      "backgroundTertiary": Color(0xFFDCDCDC),
       "foreground": Color(0xFF000000),
 
       // Color symbols