refactor: clean up main.ts and events.ts for improved readability and consistency

Author: lorens-osman-dev

main.ts

@@ -10,7 +10,6 @@ export default class clusterPlugin extends Plugin {
 		console.log("loading Cluster plugin");
 
 		await this.loadSettings();
-		
 		this.addSettingTab(new settingTab(this.app, this));
 
 		// UN-SORTED Folder Styling
@@ -19,8 +18,7 @@ export default class clusterPlugin extends Plugin {
 			await P.unSortedObserver(this.app);
 		}, 1000);
 
-		await P.cardStyleFunction( this.settings);//card style for lorens theme
-
+		
 		const file = this.app.workspace.getActiveFile() as TFile;
 		if (file) {
 			await P.buttonsLine(this.app, file, this.settings);
@@ -29,6 +27,8 @@ export default class clusterPlugin extends Plugin {
 		P.addRibbonIcon( this);
 		P.fileMenu(this,P.SimpleFocus);
 		P.addCommands(this);
+		
+		await P.cardStyleFunction( this.settings);//card style for lorens theme
 	}
 
 	async loadSettings() {

src/mainParts/events.ts

@@ -1,16 +1,20 @@
 import { Plugin, TFile } from "obsidian";
+import { clusterPluginSettings } from "src/settings/settings";
 import P from "src/util/P";
 
-export function addEvents(plugin: Plugin) {
+interface ExtendedPlugin extends Plugin {
+  settings: clusterPluginSettings;
+  }
+export function addEvents(plugin: ExtendedPlugin) {
   // watch if file opened
   plugin.registerEvent(
-    this.app.workspace.on("file-open", async (file: TFile) => {
+    plugin.app.workspace.on("file-open", async (file: TFile) => {
       if (file) {
-        await P.buttonsLine(this.app, file, this.settings);	// Add Cluster Buttons 
-        await P.coloringTreePanel(this.app, file);
-        this.settings.foldProperties ? await P.foldPropertiesElement(this.app, file) : null; // Fold Properties
-        await P.addUnsortedFilesCounter(this.app);
-        await P.unSortedObserver(this.app);
+        await P.buttonsLine(plugin.app, file, plugin.settings);	// Add Cluster Buttons 
+        await P.coloringTreePanel(plugin.app, file);
+        plugin.settings.foldProperties ? await P.foldPropertiesElement(plugin.app, file) : null; // Fold Properties
+        await P.addUnsortedFilesCounter(plugin.app);
+        await P.unSortedObserver(plugin.app);
       }
     }),
   );