From b030e245370ffa6a31405e3e2e3732dd1382e07b Mon Sep 17 00:00:00 2001
From: john4650-hub <johndelvin51@gmail.com>
Date: Thu, 14 Sep 2023 05:40:24 +0300
Subject: [PATCH] now settings can be remembered on app start

---
 www/index.html                      | 17 ++++++++++-------
 www/js/app.js                       | 12 +-----------
 www/js/components/main_FileEntry.js | 15 +++++++++++++--
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/www/index.html b/www/index.html
index 029f761..27d1ebd 100644
--- a/www/index.html
+++ b/www/index.html
@@ -7,7 +7,7 @@
   <script src="./eruda.js"></script>
   <script src="./src-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
   <script src="./cordova.js"></script>
-  
+
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <link rel="stylesheet" href="./css/bootstrap-treeview.min.css">
   <link rel="stylesheet" href="./css/style.css">
@@ -28,9 +28,12 @@
 
       <div class="position-absolute mx-5 end-0" id="saveFs" type="submit"><i class="fa fa-save text-light fw-bolder"></i></div>
 
-      <div class="position-absolute start-0 top-50 translate-middle ms-4" id="openFs" data-bs-toggle="offcanvas" data-bs-target="#fileSystemCanvas" aria-controls="fileSystemCanvas" type="submit"><i class="fa fa-bars text-light fs-2 fw-bolder opacity-100"></i></div>
-      <div class="position-absolute top-50 ms-5 ps-5 translate-middle">
-        <i class="fa fa-clipboard-list fs-2 text-light" data-bs-toggle="offcanvas" data-bs-target="#recentlyOpened" aria-controls="recentlyOpened" id="recentlyOpenedFilDisplay"></i>
+      <div class="position-absolute start-0 top-50 translate-middle ms-4"><i class="fa fa-bars text-light fs-2 fw-bolder opacity-100" id="openFs" data-bs-toggle="offcanvas" data-bs-target="#fileSystemCanvas" aria-controls="fileSystemCanvas" type="submit"></i></div>
+      <div class="position-absolute top-50 start-50 translate-middle me-5 pe-5">
+        <div class="pe-5 me-5">
+          
+        <i class="fa fa-clipboard-list fs-2 text-light me-5 " data-bs-toggle="offcanvas" data-bs-target="#recentlyOpened" aria-controls="recentlyOpened" id="recentlyOpenedFilDisplay"></i>
+        </div>
       </div>
       <div class="position-absolute end-0 mx-2" id="settingsPanel" data-bs-toggle="offcanvas" data-bs-target="#settingsCanvas" aria-controls="settingsCanvas"><i class="fa fa-tools text-light fs-5"></i>
       </div>
@@ -49,7 +52,7 @@ <h5 class="offcanvas-title text-white" id="fileSystemCanvasLabel">FILE SYSTEM</h
     <div class=" bg-dark list-group list-group-flush overflow-auto mh-100 mw-75" id="fileList" style="overflow-x: hidden;">
     </div>
   </div>
-  
+
   <div class="bg-dark w-75 offcanvas offcanvas-end border rounded-3" tabindex="-1" id="settingsCanvas" aria-labelledby="settingsCanvasLabel">
     <div class="offcanvas-header border-bottom pb-0 pt-0 pe-0 px-0">
       <ul class="nav nav-tabs nav-fill border w-100" role="tablist" id="menuTab" style="overflow-x: auto; overflow-y: hidden; flex-wrap: nowrap;background-color:black;">
@@ -63,7 +66,7 @@ <h5 class="offcanvas-title text-white" id="fileSystemCanvasLabel">FILE SYSTEM</h
       </div>
     </div>
   </div>
-<!--Recent opened files-->
+  <!--Recent opened files-->
   <div class="offcanvas offcanvas-top bg-dark" id="recentlyOpened" aria-labelledby="recentFiles">
     <div class="offcanvas-header">
       <h5 id="recentFiles">Recent files</h5>
@@ -71,7 +74,7 @@ <h5 id="recentFiles">Recent files</h5>
     </div>
     <div class="offcanvas-body">
       <ul class="list-group list-group-flush mh-50" id="recent_file"></ul>
-      
+
     </div>
   </div>
   <script src="./libs/jquery.min.js"></script>
diff --git a/www/js/app.js b/www/js/app.js
index 12c6ada..140b2cc 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -24,7 +24,7 @@ export const SAVEFS = document.getElementById('saveFs');
 
 export const OPENFS = document.getElementById('openFs');
 export const SETFILE = document.getElementById('setFile');
-
+export let recentFilesTab = document.getElementById('recent_file')
 
 const MENU_TAB = document.querySelector("#menuTab");
 let tabContent = document.querySelector(".tab-content")
@@ -73,13 +73,3 @@ aboutMe('#aboutme')
 
 // recent files
 
-export function addRecentlyOpenedFile(name, url, fs) {
-  let recentFilesTab = document.getElementById('recent_file')
-
-  let openedFile = makeElm('li')
-  insertAttr(['class=list-group-item'], openedFile)
-  openedFile.innerText = name
-  openedFile.addEventListener('click', function() { fs(url) })
-
-  recentFilesTab.appendChild(openedFile)
-}
\ No newline at end of file
diff --git a/www/js/components/main_FileEntry.js b/www/js/components/main_FileEntry.js
index bbcc501..ed86fb4 100644
--- a/www/js/components/main_FileEntry.js
+++ b/www/js/components/main_FileEntry.js
@@ -1,4 +1,4 @@
-import { OPENFS, SAVEFS, addRecentlyOpenedFile } from "../app.js";
+import { OPENFS, SAVEFS, recentFilesTab } from "../app.js";
 import { writeFile } from "./File_System/writeFile.js";
 import { readFile } from "./File_System/readFile.js";
 import { entryIcon } from "./File_System/fileSysUi.js";
@@ -73,13 +73,14 @@ export async function onDeviceReady() {
         })
         if (checkValidity == undefined) {
           workWithFile(fileTruePath);
+          addRecentlyOpenedFile(filename,fileTruePath)
           window.aceEditor.session.setMode(`ace/mode/${FILE_EXTENSIONS[extension]}`)
 
         } else {
           alert(`file ${filename} is not valid`)
         }
-        addRecentlyOpenedFile(filename,fileTruePath,workWithFile)
       }
+
       fs.root.getFile('Android/data/com.ace.code/files/settings.json', {
         create: true,
         exclusive: false
@@ -101,11 +102,21 @@ export async function onDeviceReady() {
           fE = fileEntry
           readFile(fE);
           //SAVE FILE when saveFs btn is clicked
+
           SAVEFS.addEventListener('click', saveFile);
 
           function saveFile() { writeFile(fE, null); }
 
         }, () => { console.log('failed to save file'); });
       }
+
+      function addRecentlyOpenedFile(name,url) {
+        let openedFile = makeElm('li')
+        insertAttr(['class=list-group-item'], openedFile)
+        openedFile.innerText = name
+        openedFile.addEventListener('click', function() { workWithFile(url) })
+
+        recentFilesTab.appendChild(openedFile)
+      }
     }, () => { console.log('failed to load file system'); });
 }
\ No newline at end of file