diff --git a/dist/index.js b/dist/index.js index b14480f1..b03dac06 100644 --- a/dist/index.js +++ b/dist/index.js @@ -2637,7 +2637,7 @@ setNameButtonAudioLabel: "set name", firstDayOfWeekLabel: "First day of week", manageStorageButton: "Manage storage", - transferFilesButton: "Transfer Files", + transferDataButton: "Transfer Data", scrollToChatButton: "Chats", /// backToOverviewAudioLabel: "go back to overview", @@ -2651,9 +2651,9 @@ /// connectButtonAudioLabel: "connect" }, - fileTransferModal: { - transferFilesHeadline: "Transfer Files", - selectionDescription: "Select the files that you want to transfer.", + dataTransferModal: { + transferDataHeadline: "Transfer Data", + selectionDescription: "Select the data that you want to transfer.", /// fromThisDeviceButton: "From this device", toThisDeviceButton: "To this device", @@ -4438,10 +4438,10 @@ taskStatusSuggestions = new ListState(); }; - // src/View/Modals/fileTransferModal.tsx - function FileTransferModal(fileTransferViewModel2) { + // src/View/Modals/dataTransferModal.tsx + function DataTransferModal(fileTransferViewModel2) { const OptionConverter = (fileOption) => { - return FileOption(fileOption, fileTransferViewModel2); + return OptionEntry(fileOption, fileTransferViewModel2); }; return /* @__PURE__ */ createElement( "div", @@ -4449,7 +4449,7 @@ class: "modal", "toggle:open": fileTransferViewModel2.isShowingTransferModal }, - /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translations.fileTransferModal.transferFilesHeadline), /* @__PURE__ */ createElement("span", { class: "secondary" }, translations.fileTransferModal.selectionDescription), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("h3", null, translations.fileTransferModal.generalHeadline), /* @__PURE__ */ createElement( + /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translations.dataTransferModal.transferDataHeadline), /* @__PURE__ */ createElement("span", { class: "secondary" }, translations.dataTransferModal.selectionDescription), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("h3", null, translations.dataTransferModal.generalHeadline), /* @__PURE__ */ createElement( "div", { class: "flex-column gap content-margin-bottom", @@ -4458,7 +4458,7 @@ OptionConverter ] } - ), /* @__PURE__ */ createElement("h3", null, translations.fileTransferModal.chatsHeadline), /* @__PURE__ */ createElement( + ), /* @__PURE__ */ createElement("h3", null, translations.dataTransferModal.chatsHeadline), /* @__PURE__ */ createElement( "div", { class: "flex-column gap", @@ -4485,7 +4485,7 @@ ))) ); } - function FileOption(fileOption, fileTransferViewModel2) { + function OptionEntry(fileOption, fileTransferViewModel2) { const isSelected = new State(false); isSelected.subscribeSilent((isSelected2) => { if (isSelected2 == true) { @@ -4587,11 +4587,11 @@ this.chatFileOptions.clear(); this.generalFileOptions.add( { - label: translations.fileTransferModal.connectionData, + label: translations.dataTransferModal.connectionData, path: StorageModel.getPath("connection" /* ConnectionModel */, []) }, { - label: translations.fileTransferModal.settingsData, + label: translations.dataTransferModal.settingsData, path: StorageModel.getPath("settings" /* SettingsModel */, []) } ); @@ -4729,7 +4729,7 @@ "on:click": fileTransferViewModel2.showTransferModal }, /* @__PURE__ */ createElement("span", { class: "icon" }, "sync_alt"), - /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.homePage.transferFilesButton)) + /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.homePage.transferDataButton)) ), /* @__PURE__ */ createElement("button", { class: "tile flex-no", "on:click": storageViewModel2.showStorageModal }, /* @__PURE__ */ createElement("span", { class: "icon" }, "hard_drive_2"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translations.homePage.manageStorageButton))), /* @__PURE__ */ createElement("div", { class: "mobile-only" }, /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("div", { class: "flex-row justify-end" }, /* @__PURE__ */ createElement("button", { class: "ghost width-50", "on:click": scrollToChat }, translations.homePage.scrollToChatButton, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward"))))); const chatSection = /* @__PURE__ */ createElement("div", { id: "chat-section" }, /* @__PURE__ */ createElement("h2", null, translations.homePage.chatsHeadline), /* @__PURE__ */ createElement("div", { class: "flex-row width-input" }, /* @__PURE__ */ createElement( "input", @@ -5228,7 +5228,7 @@ ), ChatPageWrapper(chatListViewModel), ConnectionModal(connectionViewModel), - FileTransferModal(fileTransferViewModel), + DataTransferModal(fileTransferViewModel), StorageModal(storageViewModel) ); })(); diff --git a/dist/styles.css b/dist/styles.css index 633fdacb..78c11792 100644 --- a/dist/styles.css +++ b/dist/styles.css @@ -76,7 +76,7 @@ COLORS @media (prefers-color-scheme: dark) { :root { --background: hsla(0, 0%, 9%, 100%); - --background-glass: hsla(0, 0%, 9%, 40%); + --background-glass: hsla(0, 0%, 9%, 20%); --background-transparent: hsla(0, 0%, 100%, 5%); --background-hover: hsla(0, 0%, 55%, 16%); --background-active: hsla(0, 0%, 55%, 40%); diff --git a/src/View/Modals/fileTransferModal.tsx b/src/View/Modals/dataTransferModal.tsx similarity index 86% rename from src/View/Modals/fileTransferModal.tsx rename to src/View/Modals/dataTransferModal.tsx index 61d69ca2..f76dcb0b 100644 --- a/src/View/Modals/fileTransferModal.tsx +++ b/src/View/Modals/dataTransferModal.tsx @@ -7,13 +7,13 @@ import FileTransferViewModel, { import StorageModel from "../../Model/Global/storageModel"; import { translations } from "../translations"; -export function FileTransferModal( +export function DataTransferModal( fileTransferViewModel: FileTransferViewModel ) { const OptionConverter: React.StateItemConverter = ( fileOption: FileTransferOption ) => { - return FileOption(fileOption, fileTransferViewModel); + return OptionEntry(fileOption, fileTransferViewModel); }; return ( @@ -23,14 +23,14 @@ export function FileTransferModal( >
-

{translations.fileTransferModal.transferFilesHeadline}

+

{translations.dataTransferModal.transferDataHeadline}

- {translations.fileTransferModal.selectionDescription} + {translations.dataTransferModal.selectionDescription}
-

{translations.fileTransferModal.generalHeadline}

+

{translations.dataTransferModal.generalHeadline}

-

{translations.fileTransferModal.chatsHeadline}

+

{translations.dataTransferModal.chatsHeadline}

sync_alt
- {translations.homePage.transferFilesButton} + {translations.homePage.transferDataButton}
diff --git a/src/View/translations.ts b/src/View/translations.ts index 16cf91aa..e5713a16 100644 --- a/src/View/translations.ts +++ b/src/View/translations.ts @@ -56,7 +56,7 @@ const englishTranslations = { manageStorageButton: "Manage storage", - transferFilesButton: "Transfer Files", + transferDataButton: "Transfer Data", scrollToChatButton: "Chats", @@ -78,9 +78,9 @@ const englishTranslations = { connectButtonAudioLabel: "connect", }, - fileTransferModal: { - transferFilesHeadline: "Transfer Files", - selectionDescription: "Select the files that you want to transfer.", + dataTransferModal: { + transferDataHeadline: "Transfer Data", + selectionDescription: "Select the data that you want to transfer.", /// diff --git a/src/ViewModel/Global/fileTransferViewModel.ts b/src/ViewModel/Global/fileTransferViewModel.ts index e65dfb05..f2a1b558 100644 --- a/src/ViewModel/Global/fileTransferViewModel.ts +++ b/src/ViewModel/Global/fileTransferViewModel.ts @@ -28,11 +28,11 @@ export default class FileTransferViewModel { this.generalFileOptions.add( { - label: translations.fileTransferModal.connectionData, + label: translations.dataTransferModal.connectionData, path: StorageModel.getPath(StorageModelSubPath.ConnectionModel, []), }, { - label: translations.fileTransferModal.settingsData, + label: translations.dataTransferModal.settingsData, path: StorageModel.getPath(StorageModelSubPath.SettingsModel, []), } ); @@ -70,3 +70,16 @@ export interface FileTransferOption { label: string; path: string[]; } + +export enum FileTransferModals { + DirectionSelection, + + // sending + FileSelection, + TransferDataDisplay, + TransferDisplay, + + // receiving + TransferDataInput, + ReceptionDisplay +} \ No newline at end of file diff --git a/src/index.tsx b/src/index.tsx index 2908285b..ed5c9566 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -11,7 +11,7 @@ import { ConnectionModal } from "./View/Modals/connectionModal"; import ConnectionModel from "./Model/Global/connectionModel"; import ConnectionViewModel from "./ViewModel/Global/connectionViewModel"; import CoreViewModel from "./ViewModel/Global/coreViewModel"; -import { FileTransferModal } from "./View/Modals/fileTransferModal"; +import { DataTransferModal } from "./View/Modals/dataTransferModal"; import FileTransferModel from "./Model/Global/fileTransferModel"; import FileTransferViewModel from "./ViewModel/Global/fileTransferViewModel"; import { HomePage } from "./View/homePage"; @@ -83,6 +83,6 @@ document ), ChatPageWrapper(chatListViewModel), ConnectionModal(connectionViewModel), - FileTransferModal(fileTransferViewModel), + DataTransferModal(fileTransferViewModel), StorageModal(storageViewModel) );