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

Author: Hanprogramer

.idea/discord.xml

@@ -19,6 +19,6 @@ class Utils {
     String hour = '${dateTime.hour}';
     String minute = '${dateTime.minute}';
     String second = '${dateTime.second}';
-    return '$day/$month/$year $hour/$minute/$second';
+    return '$day/$month/$year $hour:$minute:$second';
   }
 }

lib/filebrowser/utils/utils.dart

@@ -4,7 +4,7 @@ import 'package:corecoder_develop/util/modules_manager.dart';
 import 'package:flutter/material.dart';
 
 import '../main.dart';
-class CoreModule extends Module { //TODO doesnt work
+class CoreModule extends Module {
 
   @override
   CoreModule()

lib/modules/module_core.dart

@@ -109,7 +109,17 @@ class _EditorPageState extends State<EditorPage> {
     return children;
   }
 
-  void initializeTreeView() async {
+  //TODO: Add file under directory
+  //TODO: Rename file
+  //TODO: Move file
+
+  void deleteFileOrFolder(String filepath) async {
+    var file = File(filepath);
+    file.delete();
+    refreshFileBrowser();
+  }
+
+  void refreshFileBrowser() async {
     List<Document> docs = List.empty(growable: true);
 
     // Add folders from the solution file
@@ -216,7 +226,10 @@ class _EditorPageState extends State<EditorPage> {
             controller: ScrollController(),
             child: Container(
               constraints: BoxConstraints(
-                  minHeight: MediaQuery.of(context).size.height * 2),
+                  minHeight: MediaQuery
+                      .of(context)
+                      .size
+                      .height * 2),
               child: field,
             )));
   }
@@ -332,11 +345,17 @@ class _EditorPageState extends State<EditorPage> {
 
   @override
   Widget build(BuildContext context) {
+    var _tapPosition;
+
+    void _storePosition(TapDownDetails details) {
+      _tapPosition = details.globalPosition;
+    }
+
     project = ModalRoute.of(context)!.settings.arguments as CCSolution;
     var query = MediaQuery.of(context);
     if (documentList.isEmpty) {
       // Populate the file browser tree once
-      initializeTreeView();
+      refreshFileBrowser();
     }
     var tabController = TabbedViewController(
       tabs,
@@ -394,6 +413,19 @@ class _EditorPageState extends State<EditorPage> {
       drawer: MyDrawer(documentList, project, (String filepath) {
         openFile(filepath);
         Navigator.pop(context);
+      }, (String filepath) async {
+        var selection = await showMenu(context: context, position: const RelativeRect.fromLTRB(1, 1, 1, 1), items: <PopupMenuEntry<String>>[
+          const PopupMenuItem<String>(
+            value: "delete",
+            child: Text('Delete item'),
+          ),
+        ]);
+        //TODO: Menu should show up at tap location
+        //TODO: Refactor menu into separate file
+        switch(selection) {
+          case 'delete':
+            deleteFileOrFolder(filepath);
+        }
       }),
       appBar: AppBar(
         title: null,

lib/screens/editor/editor.dart

@@ -27,12 +27,9 @@ class MyDrawer extends StatelessWidget {
   final CCSolution project;
   final List<Document> documentList;
   final void Function(String filepath) onFileTap;
+  final void Function(String filepath) onFileLongTap;
 
-  const MyDrawer(this.documentList, this.project, this.onFileTap);
-
-  void onFileLongTap(String filepath){
-
-  }
+  const MyDrawer(this.documentList, this.project, this.onFileTap, this.onFileLongTap);
 
   @override
   Widget build(BuildContext context) {

lib/screens/editor/editor_drawer.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:corecoder_develop/filebrowser/utils/utils.dart';
 import 'package:corecoder_develop/screens/homepage/homepage_project_create.dart';
 import 'package:corecoder_develop/screens/settings/plugins_browser.dart';
 import 'package:corecoder_develop/screens/settings/settings.dart';
@@ -147,9 +148,8 @@ class _HomePageState extends State<HomePage> {
                 ),
               ),
               subtitle: Text(
-                  (p.type == HistoryItemType.solution ? p.solution!.desc : "") +
                       "Last Modified: " +
-                      p.dateModified.toString()),
+                      Utils.getFormattedDateTime(dateTime: p.dateModified)),
               trailing: PopupMenuButton<String>(
                 onSelected: (String result) {
                   switch (result) {