Original PR: https://github.com/dscyrescotti/Memola/pull/65 Author: @dscyrescotti Created: 7/18/2024 Status: ✅ Merged Merged: 7/18/2024 Merged by: @dscyrescotti
Base: main ← Head: feature/settings
main
feature/settings
ae91b69
4807ef1
167fa6b
2e2cc24
4734709
c9381bf
f7e2d9d
23 files changed (+391 additions, -178 deletions)
📝 Memola.xcodeproj/project.pbxproj (+40 -28) 📝 Memola/App/Application.swift (+13 -0) 📝 Memola/App/MemolaApp.swift (+29 -4) 📝 Memola/Canvas/History/History.swift (+3 -1) 📝 Memola/Commands/AppCommands.swift (+9 -1) 📝 Memola/Commands/EditCommands.swift (+0 -0) ➕ Memola/Commands/FileCommands.swift (+41 -0) 📝 Memola/Commands/ViewCommands.swift (+0 -0) 📝 Memola/Config/Info.plist (+39 -26) 📝 Memola/Features/Dashboard/Dashboard/DashboardView.swift (+1 -1) 📝 Memola/Features/Dashboard/Details/Memos/MemosView.swift (+4 -14) 📝 Memola/Features/Dashboard/Details/Trash/TrashView.swift (+0 -1) 📝 Memola/Features/Dashboard/Sidebar/Sidebar.swift (+86 -17) ➕ Memola/Features/Settings/About/AboutView.swift (+37 -0) ➕ Memola/Features/Settings/Settings/SettingsView.swift (+53 -0) ➖ Memola/Shortcut/Commands/FileCommands.swift (+0 -26) ➖ Memola/Shortcut/Core/Shortcut.swift (+0 -25) ➖ Memola/Shortcut/Core/Shortcuts.swift (+0 -14) ➖ Memola/Shortcut/EnvironmentValues/ShortcutKey.swift (+0 -18) 📝 Memola/Utilies/AppScene/AppScene.swift (+1 -0)
Memola.xcodeproj/project.pbxproj
Memola/App/Application.swift
Memola/App/MemolaApp.swift
Memola/Canvas/History/History.swift
Memola/Commands/AppCommands.swift
Memola/Commands/EditCommands.swift
Memola/Commands/FileCommands.swift
Memola/Commands/ViewCommands.swift
Memola/Config/Info.plist
Memola/Features/Dashboard/Dashboard/DashboardView.swift
Memola/Features/Dashboard/Details/Memos/MemosView.swift
Memola/Features/Dashboard/Details/Trash/TrashView.swift
Memola/Features/Dashboard/Sidebar/Sidebar.swift
Memola/Features/Settings/About/AboutView.swift
Memola/Features/Settings/Settings/SettingsView.swift
Memola/Shortcut/Commands/FileCommands.swift
Memola/Shortcut/Core/Shortcut.swift
Memola/Shortcut/Core/Shortcuts.swift
Memola/Shortcut/EnvironmentValues/ShortcutKey.swift
Memola/Utilies/AppScene/AppScene.swift
...and 3 more files
This PR adds Settings window for both iOS and macOS targets.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/dscyrescotti/Memola/pull/65
Author: @dscyrescotti
Created: 7/18/2024
Status: ✅ Merged
Merged: 7/18/2024
Merged by: @dscyrescotti
Base:
main← Head:feature/settings📝 Commits (7)
ae91b69feat: update tool bar background color4807ef1feat: remove redo items in main thread167fa6bfeat: add setting view2e2cc24feat: add about view4734709chore: update app versionc9381bffeat: update for macosf7e2d9dchore: remove shortcut📊 Changes
23 files changed (+391 additions, -178 deletions)
View changed files
📝
Memola.xcodeproj/project.pbxproj(+40 -28)📝
Memola/App/Application.swift(+13 -0)📝
Memola/App/MemolaApp.swift(+29 -4)📝
Memola/Canvas/History/History.swift(+3 -1)📝
Memola/Commands/AppCommands.swift(+9 -1)📝
Memola/Commands/EditCommands.swift(+0 -0)➕
Memola/Commands/FileCommands.swift(+41 -0)📝
Memola/Commands/ViewCommands.swift(+0 -0)📝
Memola/Config/Info.plist(+39 -26)📝
Memola/Features/Dashboard/Dashboard/DashboardView.swift(+1 -1)📝
Memola/Features/Dashboard/Details/Memos/MemosView.swift(+4 -14)📝
Memola/Features/Dashboard/Details/Trash/TrashView.swift(+0 -1)📝
Memola/Features/Dashboard/Sidebar/Sidebar.swift(+86 -17)➕
Memola/Features/Settings/About/AboutView.swift(+37 -0)➕
Memola/Features/Settings/Settings/SettingsView.swift(+53 -0)➖
Memola/Shortcut/Commands/FileCommands.swift(+0 -26)➖
Memola/Shortcut/Core/Shortcut.swift(+0 -25)➖
Memola/Shortcut/Core/Shortcuts.swift(+0 -14)➖
Memola/Shortcut/EnvironmentValues/ShortcutKey.swift(+0 -18)📝
Memola/Utilies/AppScene/AppScene.swift(+1 -0)...and 3 more files
📄 Description
Description
This PR adds Settings window for both iOS and macOS targets.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.