Merge pull request #22 from Hanprogramer/dev

v0.0.2

Author: Hanprogramer

android/.idea/gradle.xml

@@ -1,15 +1,16 @@
 import 'dart:io';
 
-import 'package:corecoder_develop/editor.dart';
-import 'package:corecoder_develop/plugins_browser.dart';
-import 'package:corecoder_develop/settings.dart';
+import 'package:corecoder_develop/screens/editor/editor.dart';
+import 'package:corecoder_develop/screens/settings/plugins_browser.dart';
+import 'package:corecoder_develop/util/cc_project_structure.dart';
 import 'package:corecoder_develop/util/theme_manager.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:provider/single_child_widget.dart';
-import 'homepage.dart';
-import 'editor_drawer.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'screens/homepage/homepage.dart';
+import 'screens/editor/editor_drawer.dart';
 import 'package:bitsdojo_window/bitsdojo_window.dart';
 
 void main() async {
@@ -29,7 +30,7 @@ const borderColor = Color(0xFF3BBA73);
 
 class CoreCoderApp extends StatefulWidget {
   const CoreCoderApp({Key? key}) : super(key: key);
-  static const String version = "v0.0.1";
+  static const String version = "v0.0.2";
   static bool isDesktop = (Platform.isWindows || Platform.isLinux || Platform.isMacOS);
   static bool isLandscape(BuildContext context){
     var q = MediaQuery.of(context);
@@ -48,9 +49,15 @@ class CoreCoderAppState extends State<CoreCoderApp> {
   @override
   void initState() {
     super.initState();
-    ThemeManager.currentTheme.addListener(() {
+    _pref.then((value) {
       setState(() {
-        themeName = ThemeManager.currentTheme.value;
+        themeName = value.getString("theme") ?? themeName;
+        ThemeManager.currentTheme = ValueNotifier(themeName);
+      });
+      ThemeManager.currentTheme.addListener(() {
+        setState(() {
+          themeName = ThemeManager.currentTheme.value;
+        });
       });
     });
     if (Platform.isWindows) {
@@ -63,7 +70,11 @@ class CoreCoderAppState extends State<CoreCoderApp> {
         debugPrint(result as String);
       });
     }
+
+
   }
+  static final Future<SharedPreferences> _pref =
+  SharedPreferences.getInstance();
 
   @override
   Widget build(BuildContext context) {

lib/main.dart

@@ -1,4 +1,3 @@
-import 'dart:convert';
 import 'dart:ffi';
 import 'dart:io';
 import 'dart:typed_data';
@@ -11,7 +10,7 @@ import 'package:ffi/ffi.dart';
 import 'package:flutter_jscore/flutter_jscore.dart';
 import 'package:flutter_jscore/jscore_bindings.dart' as js;
 
-import '../homepage.dart';
+import '../screens/homepage/homepage.dart';
 
 String jsStringToDartString(Pointer resultJsString) {
   var resultCString = js.jSStringGetCharactersPtr(resultJsString);
@@ -201,7 +200,14 @@ class CoreCoder {
         ctx, function, thisObject, argumentCount, arguments, exception);
     return nullptr;
   }
-
+  static String getProjectFolder(String moduleFolderName, String folderName) {
+    var result = PluginsManager.projectsPath +
+        moduleFolderName +
+        Platform.pathSeparator +
+        folderName +
+        Platform.pathSeparator;
+    return result;
+  }
   static Pointer jsGetProjectFolder(
       Pointer ctx,
       Pointer function,

lib/modules/jsapi.dart

@@ -0,0 +1,67 @@
+import 'dart:io' show File;
+import 'package:corecoder_develop/modules/jsapi.dart';
+import 'package:corecoder_develop/util/modules_manager.dart';
+import 'package:flutter/material.dart';
+
+import '../main.dart';
+class CoreModule extends Module { //TODO doesnt work
+
+  @override
+  CoreModule()
+      : super(
+            "Built-in",
+            "Provides core functionality",
+            "skybird23333",
+            "Corecoder 0.0.1",
+            null,
+            "com.corecoder.coremodule");
+
+  @override
+  void onInitialized(ModulesManager modulesManager, BuildContext buildContext) async {
+    super.onInitialized(modulesManager, buildContext);
+    var template = Template(
+        "Empty", //title
+        "Empty project with no workspace plugins or files", //desc
+        "",
+        {
+          "Project Name" : "String",
+          "Author" : "String",
+        },
+            (Map<String, dynamic> args) async {
+      //do absolutely nothing because this is empty
+              /// ---------------------------
+              /// Create .ccsln.json file
+              /// ---------------------------
+              var obj = {
+                "cc_version": CoreCoderApp.version,
+                "name": args["Project Name"],
+                "author": args["Author"],
+                "description": "",
+                "identifier": identifier,
+                // must be unique to every module
+                "folders": {
+                },
+                "run_config": []
+              };
+              obj["folders"]["Workspace"] = ".";
+
+
+              // Write the file asynchronously
+              var slnFilePath = CoreCoder.getProjectFolder("core", args["Project Name"]) + "solution.ccsln.json";
+              var slnFile = File(slnFilePath);
+              await slnFile.create(recursive: true);
+              await slnFile.writeAsString(ModulesManager.encoder.convert(obj));
+              // Return the filepath so it loads the project automatically
+              return slnFilePath;
+        },
+        icon, "com.corecoder.empty");
+
+    templates.add(template);
+  }
+
+  @override
+  List<String> onAutoComplete(String language, String lastToken) {
+    return [];
+  }
+
+}

lib/modules/module_core.dart

@@ -1,12 +1,10 @@
 import 'dart:ffi';
 import 'dart:typed_data';
 import 'package:corecoder_develop/modules/jsapi.dart';
-import 'package:corecoder_develop/util/cc_project_structure.dart';
 import 'package:corecoder_develop/util/modules_manager.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_jscore/jscore_bindings.dart';
 import 'package:ffi/ffi.dart';
-import 'package:corecoder_develop/homepage.dart';
 import 'package:flutter_jscore/flutter_jscore.dart' as jscore
     show
         JSContext,

lib/modules/module_jsplugins.dart

@@ -3,7 +3,6 @@ import 'dart:io' show Directory, File, Platform;
 import 'package:corecoder_develop/util/modules_manager.dart';
 import 'package:flutter/material.dart';
 import 'package:uuid/uuid.dart';
-import 'package:android_external_storage/android_external_storage.dart';
 import 'package:path_provider/path_provider.dart';
 class MinecraftModule extends Module {
   String comMojang = ""; // platform dependent
@@ -58,6 +57,7 @@ class MinecraftModule extends Module {
 
   @override
   void onInitialized(ModulesManager modulesManager, BuildContext buildContext) async {
+    super.onInitialized(modulesManager, buildContext);
     if (Platform.isWindows) {
       comMojang = Platform.environment['LOCALAPPDATA'] as String;
       comMojang +=