From 8010229d6bf4bdb336dddcbffb7cc04341688d46 Mon Sep 17 00:00:00 2001
From: djmaze <djmaze@djmaze.lan>
Date: Thu, 23 Sep 2021 10:40:10 +0200
Subject: [PATCH] Merge SystemDropDownMailBoxUserView &
 SystemDropDownSettingsUserView into SystemDropDownUserView

---
 dev/Screen/User/MailBox.js                                 | 4 ++--
 dev/Screen/User/Settings.js                                | 4 ++--
 dev/View/User/MailBox/SystemDropDown.js                    | 7 -------
 dev/View/User/Settings/SystemDropDown.js                   | 7 -------
 .../User/{AbstractSystemDropDown.js => SystemDropDown.js}  | 2 +-
 5 files changed, 5 insertions(+), 19 deletions(-)
 delete mode 100644 dev/View/User/MailBox/SystemDropDown.js
 delete mode 100644 dev/View/User/Settings/SystemDropDown.js
 rename dev/View/User/{AbstractSystemDropDown.js => SystemDropDown.js} (97%)

diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js
index 11221f016..bc7e6aecf 100644
--- a/dev/Screen/User/MailBox.js
+++ b/dev/Screen/User/MailBox.js
@@ -10,7 +10,7 @@ import { FolderUserStore } from 'Stores/User/Folder';
 import { MessageUserStore } from 'Stores/User/Message';
 import { ThemeStore } from 'Stores/Theme';
 
-import { SystemDropDownMailBoxUserView } from 'View/User/MailBox/SystemDropDown';
+import { SystemDropDownUserView } from 'View/User/SystemDropDown';
 import { MailFolderList } from 'View/User/MailBox/FolderList';
 import { MailMessageList } from 'View/User/MailBox/MessageList';
 import { MailMessageView } from 'View/User/MailBox/MessageView';
@@ -20,7 +20,7 @@ import { AbstractScreen } from 'Knoin/AbstractScreen';
 export class MailBoxUserScreen extends AbstractScreen {
 	constructor() {
 		super('mailbox', [
-			SystemDropDownMailBoxUserView,
+			SystemDropDownUserView,
 			MailFolderList,
 			MailMessageList,
 			MailMessageView
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index 73291a9b1..26a2d2ed2 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -18,13 +18,13 @@ import { FoldersUserSettings } from 'Settings/User/Folders';
 import { ThemesUserSettings } from 'Settings/User/Themes';
 import { OpenPgpUserSettings } from 'Settings/User/OpenPgp';
 
-import { SystemDropDownSettingsUserView } from 'View/User/Settings/SystemDropDown';
+import { SystemDropDownUserView } from 'View/User/SystemDropDown';
 import { MenuSettingsUserView } from 'View/User/Settings/Menu';
 import { PaneSettingsUserView } from 'View/User/Settings/Pane';
 
 export class SettingsUserScreen extends AbstractSettingsScreen {
 	constructor() {
-		super([SystemDropDownSettingsUserView, MenuSettingsUserView, PaneSettingsUserView]);
+		super([SystemDropDownUserView, MenuSettingsUserView, PaneSettingsUserView]);
 
 		settingsAddViewModel(GeneralUserSettings, 'SettingsGeneral', 'SETTINGS_LABELS/LABEL_GENERAL_NAME', 'general', true);
 
diff --git a/dev/View/User/MailBox/SystemDropDown.js b/dev/View/User/MailBox/SystemDropDown.js
deleted file mode 100644
index 7f038d837..000000000
--- a/dev/View/User/MailBox/SystemDropDown.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { AbstractSystemDropDownUserView } from 'View/User/AbstractSystemDropDown';
-
-class SystemDropDownMailBoxUserView extends AbstractSystemDropDownUserView
-{
-}
-
-export { SystemDropDownMailBoxUserView };
diff --git a/dev/View/User/Settings/SystemDropDown.js b/dev/View/User/Settings/SystemDropDown.js
deleted file mode 100644
index aacd5fe62..000000000
--- a/dev/View/User/Settings/SystemDropDown.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { AbstractSystemDropDownUserView } from 'View/User/AbstractSystemDropDown';
-
-class SystemDropDownSettingsUserView extends AbstractSystemDropDownUserView
-{
-}
-
-export { SystemDropDownSettingsUserView };
diff --git a/dev/View/User/AbstractSystemDropDown.js b/dev/View/User/SystemDropDown.js
similarity index 97%
rename from dev/View/User/AbstractSystemDropDown.js
rename to dev/View/User/SystemDropDown.js
index 8143b3b6d..671f7b9be 100644
--- a/dev/View/User/AbstractSystemDropDown.js
+++ b/dev/View/User/SystemDropDown.js
@@ -16,7 +16,7 @@ import { doc, Settings, leftPanelDisabled } from 'Common/Globals';
 
 import { ThemeStore } from 'Stores/Theme';
 
-export class AbstractSystemDropDownUserView extends AbstractViewRight {
+export class SystemDropDownUserView extends AbstractViewRight {
 	constructor() {
 		super('SystemDropDown');