From 04c77831b5bb21c72bf5b224e8e0784e03d35527 Mon Sep 17 00:00:00 2001 From: david-swift Date: Thu, 30 Oct 2025 21:36:13 +0100 Subject: [PATCH] Remove Core library --- .swiftlint.yml | 2 +- Package.swift | 10 +--------- Sources/Adwaita/ActionRow+.swift | 17 ----------------- Sources/Adwaita/AnyView+.swift | 1 - Sources/{Core => Adwaita}/Menu/MenuButton.swift | 0 .../{Core => Adwaita}/Menu/MenuCollection.swift | 0 .../{Core => Adwaita}/Menu/MenuContext.swift | 0 .../{Core => Adwaita}/Menu/MenuEitherView.swift | 0 .../{Core => Adwaita}/Menu/MenuSection.swift | 0 Sources/{Core => Adwaita}/Menu/Submenu.swift | 0 .../{Core => Adwaita}/Model/AdwaitaApp.swift | 0 .../Model/AdwaitaMainView.swift | 0 .../Model/AdwaitaSceneElement.swift | 0 .../{Core => Adwaita}/Model/AdwaitaWidget.swift | 0 .../Model/Enumerations/Alignment.swift | 0 .../Model/Enumerations/ContentFit.swift | 0 .../Model/Enumerations/Edge.swift | 0 .../Model/Enumerations/Icon.swift | 0 .../Enumerations/ScrollbarVisibility.swift | 0 .../Model/Enumerations/ToolbarStyle.swift | 0 .../Model/Enumerations/Transition.swift | 0 .../Model/Enumerations/WrapMode.swift | 0 .../Model/Extensions/Array.swift | 0 .../Model/Extensions/Bool.swift | 0 .../Model/Extensions/GtkWrapMode.swift | 0 .../Model/Extensions/Int.swift | 0 .../Model/Extensions/OpaquePointer.swift | 0 .../Model/Extensions/Set.swift | 0 .../Model/Extensions/String.swift | 0 .../Model/Extensions/UInt.swift | 0 .../Model/Extensions/UnsafeMutablePointer.swift | 0 .../Extensions/UnsafeMutableRawPointer.swift | 0 .../Model/Extensions/ViewStorage.swift | 0 Sources/{Core => Adwaita}/Model/Idle.swift | 0 .../Model/Signals/SignalData.swift | 0 Sources/{Core => Adwaita}/Model/Storage.swift | 0 .../{Core => Adwaita}/Model/WindowView.swift | 0 Sources/Adwaita/StatusPage+.swift | 17 ----------------- Sources/Adwaita/{ => View}/AnyView++.swift | 0 Sources/{Core => Adwaita}/View/Banner+.swift | 0 Sources/Adwaita/{ => View}/Box+.swift | 0 .../{Core => Adwaita}/View/BreakpointBin.swift | 0 Sources/{Core => Adwaita}/View/Button+.swift | 0 Sources/{Core => Adwaita}/View/Carousel+.swift | 0 Sources/Adwaita/{ => View}/CheckButton+.swift | 0 .../View/Dialogs/AboutDialog.swift | 8 ++++---- .../View/Dialogs/AlertDialog.swift | 2 +- .../{Core => Adwaita}/View/Dialogs/Dialog.swift | 8 ++++---- .../View/Dialogs/FileDialog.swift | 10 +++++----- .../View/Dialogs/PreferencesDialog.swift | 8 ++++---- Sources/{Core => Adwaita}/View/DropDown+.swift | 0 Sources/{Core => Adwaita}/View/EitherView.swift | 0 Sources/{Core => Adwaita}/View/Entry+.swift | 0 Sources/{Core => Adwaita}/View/Fixed+.swift | 0 Sources/{Core => Adwaita}/View/FlowBox+.swift | 0 Sources/{Core => Adwaita}/View/ForEach.swift | 0 .../View/Forms/ActionRow+.swift | 7 +++++++ .../View/Forms/ComboRow+.swift | 0 .../View/Forms/EntryRow+.swift | 0 Sources/{Core => Adwaita}/View/Forms/Form.swift | 0 .../View/Forms/FormSection+.swift | 0 .../View/Forms/PasswordEntryRow+.swift | 0 .../{Core => Adwaita}/View/Forms/SpinRow+.swift | 0 .../View/Forms/SwitchRow+.swift | 0 .../View/Generated/ActionRow.swift | 0 .../View/Generated/AspectFrame.swift | 0 .../View/Generated/Avatar.swift | 0 .../View/Generated/Banner.swift | 0 .../{Core => Adwaita}/View/Generated/Bin.swift | 0 .../{Core => Adwaita}/View/Generated/Box.swift | 0 .../View/Generated/Button.swift | 0 .../View/Generated/ButtonContent.swift | 0 .../View/Generated/Carousel.swift | 0 .../View/Generated/CenterBox.swift | 0 .../View/Generated/CheckButton.swift | 0 .../View/Generated/Clamp.swift | 0 .../View/Generated/ComboRow.swift | 0 .../View/Generated/DropDown.swift | 0 .../View/Generated/Entry.swift | 0 .../View/Generated/EntryRow.swift | 0 .../View/Generated/ExpanderRow.swift | 0 .../View/Generated/Fixed.swift | 0 .../View/Generated/FlowBox.swift | 0 .../View/Generated/HeaderBar.swift | 0 .../View/Generated/Image.swift | 0 .../View/Generated/Label.swift | 0 .../View/Generated/LevelBar.swift | 0 .../View/Generated/LinkButton.swift | 0 .../View/Generated/ListBox.swift | 0 .../{Core => Adwaita}/View/Generated/Menu.swift | 0 .../View/Generated/NavigationView.swift | 0 .../View/Generated/Overlay.swift | 0 .../View/Generated/OverlaySplitView.swift | 0 .../View/Generated/PasswordEntryRow.swift | 0 .../View/Generated/Picture.swift | 0 .../View/Generated/Popover.swift | 0 .../View/Generated/PreferencesGroup.swift | 0 .../View/Generated/PreferencesPage.swift | 0 .../View/Generated/PreferencesRow.swift | 0 .../View/Generated/ProgressBar.swift | 0 .../View/Generated/ScrolledWindow.swift | 0 .../View/Generated/SearchBar.swift | 0 .../View/Generated/SearchEntry.swift | 0 .../View/Generated/Separator.swift | 0 .../View/Generated/SpinRow.swift | 0 .../View/Generated/Spinner.swift | 0 .../View/Generated/SplitButton.swift | 0 .../View/Generated/StatusPage.swift | 0 .../View/Generated/SwitchRow.swift | 0 .../View/Generated/ToastOverlay.swift | 0 .../View/Generated/ToggleButton.swift | 0 .../View/Generated/ToolbarView.swift | 0 .../View/Generated/WindowTitle.swift | 0 Sources/{Core => Adwaita}/View/HStack.swift | 0 Sources/{Core => Adwaita}/View/HeaderBar+.swift | 0 Sources/Adwaita/{ => View}/List+.swift | 0 Sources/{Core => Adwaita}/View/List.swift | 0 Sources/{Core => Adwaita}/View/Menu+.swift | 0 .../View/Modifiers/Clamp+.swift | 0 .../View/Modifiers/ModifierWrapper.swift | 8 ++++---- .../View/Modifiers/Popover+.swift | 0 .../View/Modifiers/ToastOverlay+.swift | 0 .../View/NavigationSplitView.swift | 0 .../View/NavigationView+.swift | 0 .../View/OverlaySplitView+.swift | 0 Sources/{Core => Adwaita}/View/Picture+.swift | 0 .../{Core => Adwaita}/View/ProgressBar+.swift | 0 Sources/{Core => Adwaita}/View/ScrollView.swift | 0 Sources/{Core => Adwaita}/View/SplitView.swift | 0 .../{Core => Adwaita}/View/StatusPage+.swift | 7 +++++++ Sources/{Core => Adwaita}/View/Symbol.swift | 0 Sources/{Core => Adwaita}/View/Text.swift | 0 Sources/{Core => Adwaita}/View/TextEditor.swift | 0 Sources/{Core => Adwaita}/View/Toggle.swift | 0 Sources/{Core => Adwaita}/View/VStack.swift | 0 Sources/{Core => Adwaita}/View/ViewStack.swift | 0 .../{Core => Adwaita}/View/ViewSwitcher.swift | 0 Sources/{Core => Adwaita}/Window/Window.swift | 0 .../Generation/GenerationConfiguration.swift | 2 +- 139 files changed, 39 insertions(+), 68 deletions(-) delete mode 100644 Sources/Adwaita/ActionRow+.swift rename Sources/{Core => Adwaita}/Menu/MenuButton.swift (100%) rename Sources/{Core => Adwaita}/Menu/MenuCollection.swift (100%) rename Sources/{Core => Adwaita}/Menu/MenuContext.swift (100%) rename Sources/{Core => Adwaita}/Menu/MenuEitherView.swift (100%) rename Sources/{Core => Adwaita}/Menu/MenuSection.swift (100%) rename Sources/{Core => Adwaita}/Menu/Submenu.swift (100%) rename Sources/{Core => Adwaita}/Model/AdwaitaApp.swift (100%) rename Sources/{Core => Adwaita}/Model/AdwaitaMainView.swift (100%) rename Sources/{Core => Adwaita}/Model/AdwaitaSceneElement.swift (100%) rename Sources/{Core => Adwaita}/Model/AdwaitaWidget.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/Alignment.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/ContentFit.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/Edge.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/Icon.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/ScrollbarVisibility.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/ToolbarStyle.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/Transition.swift (100%) rename Sources/{Core => Adwaita}/Model/Enumerations/WrapMode.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/Array.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/Bool.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/GtkWrapMode.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/Int.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/OpaquePointer.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/Set.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/String.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/UInt.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/UnsafeMutablePointer.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/UnsafeMutableRawPointer.swift (100%) rename Sources/{Core => Adwaita}/Model/Extensions/ViewStorage.swift (100%) rename Sources/{Core => Adwaita}/Model/Idle.swift (100%) rename Sources/{Core => Adwaita}/Model/Signals/SignalData.swift (100%) rename Sources/{Core => Adwaita}/Model/Storage.swift (100%) rename Sources/{Core => Adwaita}/Model/WindowView.swift (100%) delete mode 100644 Sources/Adwaita/StatusPage+.swift rename Sources/Adwaita/{ => View}/AnyView++.swift (100%) rename Sources/{Core => Adwaita}/View/Banner+.swift (100%) rename Sources/Adwaita/{ => View}/Box+.swift (100%) rename Sources/{Core => Adwaita}/View/BreakpointBin.swift (100%) rename Sources/{Core => Adwaita}/View/Button+.swift (100%) rename Sources/{Core => Adwaita}/View/Carousel+.swift (100%) rename Sources/Adwaita/{ => View}/CheckButton+.swift (100%) rename Sources/{Core => Adwaita}/View/Dialogs/AboutDialog.swift (95%) rename Sources/{Core => Adwaita}/View/Dialogs/AlertDialog.swift (99%) rename Sources/{Core => Adwaita}/View/Dialogs/Dialog.swift (96%) rename Sources/{Core => Adwaita}/View/Dialogs/FileDialog.swift (97%) rename Sources/{Core => Adwaita}/View/Dialogs/PreferencesDialog.swift (97%) rename Sources/{Core => Adwaita}/View/DropDown+.swift (100%) rename Sources/{Core => Adwaita}/View/EitherView.swift (100%) rename Sources/{Core => Adwaita}/View/Entry+.swift (100%) rename Sources/{Core => Adwaita}/View/Fixed+.swift (100%) rename Sources/{Core => Adwaita}/View/FlowBox+.swift (100%) rename Sources/{Core => Adwaita}/View/ForEach.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/ActionRow+.swift (55%) rename Sources/{Core => Adwaita}/View/Forms/ComboRow+.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/EntryRow+.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/Form.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/FormSection+.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/PasswordEntryRow+.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/SpinRow+.swift (100%) rename Sources/{Core => Adwaita}/View/Forms/SwitchRow+.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ActionRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/AspectFrame.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Avatar.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Banner.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Bin.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Box.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Button.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ButtonContent.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Carousel.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/CenterBox.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/CheckButton.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Clamp.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ComboRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/DropDown.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Entry.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/EntryRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ExpanderRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Fixed.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/FlowBox.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/HeaderBar.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Image.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Label.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/LevelBar.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/LinkButton.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ListBox.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Menu.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/NavigationView.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Overlay.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/OverlaySplitView.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/PasswordEntryRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Picture.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Popover.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/PreferencesGroup.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/PreferencesPage.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/PreferencesRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ProgressBar.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ScrolledWindow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/SearchBar.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/SearchEntry.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Separator.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/SpinRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/Spinner.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/SplitButton.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/StatusPage.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/SwitchRow.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ToastOverlay.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ToggleButton.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/ToolbarView.swift (100%) rename Sources/{Core => Adwaita}/View/Generated/WindowTitle.swift (100%) rename Sources/{Core => Adwaita}/View/HStack.swift (100%) rename Sources/{Core => Adwaita}/View/HeaderBar+.swift (100%) rename Sources/Adwaita/{ => View}/List+.swift (100%) rename Sources/{Core => Adwaita}/View/List.swift (100%) rename Sources/{Core => Adwaita}/View/Menu+.swift (100%) rename Sources/{Core => Adwaita}/View/Modifiers/Clamp+.swift (100%) rename Sources/{Core => Adwaita}/View/Modifiers/ModifierWrapper.swift (97%) rename Sources/{Core => Adwaita}/View/Modifiers/Popover+.swift (100%) rename Sources/{Core => Adwaita}/View/Modifiers/ToastOverlay+.swift (100%) rename Sources/{Core => Adwaita}/View/NavigationSplitView.swift (100%) rename Sources/{Core => Adwaita}/View/NavigationView+.swift (100%) rename Sources/{Core => Adwaita}/View/OverlaySplitView+.swift (100%) rename Sources/{Core => Adwaita}/View/Picture+.swift (100%) rename Sources/{Core => Adwaita}/View/ProgressBar+.swift (100%) rename Sources/{Core => Adwaita}/View/ScrollView.swift (100%) rename Sources/{Core => Adwaita}/View/SplitView.swift (100%) rename Sources/{Core => Adwaita}/View/StatusPage+.swift (74%) rename Sources/{Core => Adwaita}/View/Symbol.swift (100%) rename Sources/{Core => Adwaita}/View/Text.swift (100%) rename Sources/{Core => Adwaita}/View/TextEditor.swift (100%) rename Sources/{Core => Adwaita}/View/Toggle.swift (100%) rename Sources/{Core => Adwaita}/View/VStack.swift (100%) rename Sources/{Core => Adwaita}/View/ViewStack.swift (100%) rename Sources/{Core => Adwaita}/View/ViewSwitcher.swift (100%) rename Sources/{Core => Adwaita}/Window/Window.swift (100%) diff --git a/.swiftlint.yml b/.swiftlint.yml index c6d38bd..ee56c69 100644 --- a/.swiftlint.yml +++ b/.swiftlint.yml @@ -154,5 +154,5 @@ type_contents_order: - other_method excluded: - - Sources/Core/View/Generated/ + - Sources/Adwaita/View/Generated/ - .build/ \ No newline at end of file diff --git a/Package.swift b/Package.swift index a648865..1c11d0c 100644 --- a/Package.swift +++ b/Package.swift @@ -17,10 +17,6 @@ let package = Package( name: "Adwaita", targets: ["Adwaita"] ), - .library( - name: "Core", - targets: ["Core"] - ), .library( name: "CAdw", targets: ["CAdw"] @@ -41,7 +37,7 @@ let package = Package( pkgConfig: "libadwaita-1" ), .target( - name: "Core", + name: "Adwaita", dependencies: [ "CAdw", .product(name: "LevenshteinTransformations", package: "levenshtein-transformations"), @@ -49,10 +45,6 @@ let package = Package( .product(name: "MetaSQLite", package: "meta-sqlite") ] ), - .target( - name: "Adwaita", - dependencies: ["Core"] - ), .executableTarget( name: "Generation", dependencies: [ diff --git a/Sources/Adwaita/ActionRow+.swift b/Sources/Adwaita/ActionRow+.swift deleted file mode 100644 index c0a3016..0000000 --- a/Sources/Adwaita/ActionRow+.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// ActionRow+.swift -// Adwaita -// -// Created by david-swift on 16.10.24. -// - -extension ActionRow { - - /// Deemphasize the row title and emphasize the subtitle. - /// - Parameter active: Whether the style is currently applied. - /// - Returns: A view. - public func property(_ active: Bool = true) -> AnyView { - style("property", active: active) - } - -} diff --git a/Sources/Adwaita/AnyView+.swift b/Sources/Adwaita/AnyView+.swift index adbce40..5909aa0 100644 --- a/Sources/Adwaita/AnyView+.swift +++ b/Sources/Adwaita/AnyView+.swift @@ -5,7 +5,6 @@ // Created by david-swift on 16.10.24. // -@_exported import Core import Foundation extension AnyView { diff --git a/Sources/Core/Menu/MenuButton.swift b/Sources/Adwaita/Menu/MenuButton.swift similarity index 100% rename from Sources/Core/Menu/MenuButton.swift rename to Sources/Adwaita/Menu/MenuButton.swift diff --git a/Sources/Core/Menu/MenuCollection.swift b/Sources/Adwaita/Menu/MenuCollection.swift similarity index 100% rename from Sources/Core/Menu/MenuCollection.swift rename to Sources/Adwaita/Menu/MenuCollection.swift diff --git a/Sources/Core/Menu/MenuContext.swift b/Sources/Adwaita/Menu/MenuContext.swift similarity index 100% rename from Sources/Core/Menu/MenuContext.swift rename to Sources/Adwaita/Menu/MenuContext.swift diff --git a/Sources/Core/Menu/MenuEitherView.swift b/Sources/Adwaita/Menu/MenuEitherView.swift similarity index 100% rename from Sources/Core/Menu/MenuEitherView.swift rename to Sources/Adwaita/Menu/MenuEitherView.swift diff --git a/Sources/Core/Menu/MenuSection.swift b/Sources/Adwaita/Menu/MenuSection.swift similarity index 100% rename from Sources/Core/Menu/MenuSection.swift rename to Sources/Adwaita/Menu/MenuSection.swift diff --git a/Sources/Core/Menu/Submenu.swift b/Sources/Adwaita/Menu/Submenu.swift similarity index 100% rename from Sources/Core/Menu/Submenu.swift rename to Sources/Adwaita/Menu/Submenu.swift diff --git a/Sources/Core/Model/AdwaitaApp.swift b/Sources/Adwaita/Model/AdwaitaApp.swift similarity index 100% rename from Sources/Core/Model/AdwaitaApp.swift rename to Sources/Adwaita/Model/AdwaitaApp.swift diff --git a/Sources/Core/Model/AdwaitaMainView.swift b/Sources/Adwaita/Model/AdwaitaMainView.swift similarity index 100% rename from Sources/Core/Model/AdwaitaMainView.swift rename to Sources/Adwaita/Model/AdwaitaMainView.swift diff --git a/Sources/Core/Model/AdwaitaSceneElement.swift b/Sources/Adwaita/Model/AdwaitaSceneElement.swift similarity index 100% rename from Sources/Core/Model/AdwaitaSceneElement.swift rename to Sources/Adwaita/Model/AdwaitaSceneElement.swift diff --git a/Sources/Core/Model/AdwaitaWidget.swift b/Sources/Adwaita/Model/AdwaitaWidget.swift similarity index 100% rename from Sources/Core/Model/AdwaitaWidget.swift rename to Sources/Adwaita/Model/AdwaitaWidget.swift diff --git a/Sources/Core/Model/Enumerations/Alignment.swift b/Sources/Adwaita/Model/Enumerations/Alignment.swift similarity index 100% rename from Sources/Core/Model/Enumerations/Alignment.swift rename to Sources/Adwaita/Model/Enumerations/Alignment.swift diff --git a/Sources/Core/Model/Enumerations/ContentFit.swift b/Sources/Adwaita/Model/Enumerations/ContentFit.swift similarity index 100% rename from Sources/Core/Model/Enumerations/ContentFit.swift rename to Sources/Adwaita/Model/Enumerations/ContentFit.swift diff --git a/Sources/Core/Model/Enumerations/Edge.swift b/Sources/Adwaita/Model/Enumerations/Edge.swift similarity index 100% rename from Sources/Core/Model/Enumerations/Edge.swift rename to Sources/Adwaita/Model/Enumerations/Edge.swift diff --git a/Sources/Core/Model/Enumerations/Icon.swift b/Sources/Adwaita/Model/Enumerations/Icon.swift similarity index 100% rename from Sources/Core/Model/Enumerations/Icon.swift rename to Sources/Adwaita/Model/Enumerations/Icon.swift diff --git a/Sources/Core/Model/Enumerations/ScrollbarVisibility.swift b/Sources/Adwaita/Model/Enumerations/ScrollbarVisibility.swift similarity index 100% rename from Sources/Core/Model/Enumerations/ScrollbarVisibility.swift rename to Sources/Adwaita/Model/Enumerations/ScrollbarVisibility.swift diff --git a/Sources/Core/Model/Enumerations/ToolbarStyle.swift b/Sources/Adwaita/Model/Enumerations/ToolbarStyle.swift similarity index 100% rename from Sources/Core/Model/Enumerations/ToolbarStyle.swift rename to Sources/Adwaita/Model/Enumerations/ToolbarStyle.swift diff --git a/Sources/Core/Model/Enumerations/Transition.swift b/Sources/Adwaita/Model/Enumerations/Transition.swift similarity index 100% rename from Sources/Core/Model/Enumerations/Transition.swift rename to Sources/Adwaita/Model/Enumerations/Transition.swift diff --git a/Sources/Core/Model/Enumerations/WrapMode.swift b/Sources/Adwaita/Model/Enumerations/WrapMode.swift similarity index 100% rename from Sources/Core/Model/Enumerations/WrapMode.swift rename to Sources/Adwaita/Model/Enumerations/WrapMode.swift diff --git a/Sources/Core/Model/Extensions/Array.swift b/Sources/Adwaita/Model/Extensions/Array.swift similarity index 100% rename from Sources/Core/Model/Extensions/Array.swift rename to Sources/Adwaita/Model/Extensions/Array.swift diff --git a/Sources/Core/Model/Extensions/Bool.swift b/Sources/Adwaita/Model/Extensions/Bool.swift similarity index 100% rename from Sources/Core/Model/Extensions/Bool.swift rename to Sources/Adwaita/Model/Extensions/Bool.swift diff --git a/Sources/Core/Model/Extensions/GtkWrapMode.swift b/Sources/Adwaita/Model/Extensions/GtkWrapMode.swift similarity index 100% rename from Sources/Core/Model/Extensions/GtkWrapMode.swift rename to Sources/Adwaita/Model/Extensions/GtkWrapMode.swift diff --git a/Sources/Core/Model/Extensions/Int.swift b/Sources/Adwaita/Model/Extensions/Int.swift similarity index 100% rename from Sources/Core/Model/Extensions/Int.swift rename to Sources/Adwaita/Model/Extensions/Int.swift diff --git a/Sources/Core/Model/Extensions/OpaquePointer.swift b/Sources/Adwaita/Model/Extensions/OpaquePointer.swift similarity index 100% rename from Sources/Core/Model/Extensions/OpaquePointer.swift rename to Sources/Adwaita/Model/Extensions/OpaquePointer.swift diff --git a/Sources/Core/Model/Extensions/Set.swift b/Sources/Adwaita/Model/Extensions/Set.swift similarity index 100% rename from Sources/Core/Model/Extensions/Set.swift rename to Sources/Adwaita/Model/Extensions/Set.swift diff --git a/Sources/Core/Model/Extensions/String.swift b/Sources/Adwaita/Model/Extensions/String.swift similarity index 100% rename from Sources/Core/Model/Extensions/String.swift rename to Sources/Adwaita/Model/Extensions/String.swift diff --git a/Sources/Core/Model/Extensions/UInt.swift b/Sources/Adwaita/Model/Extensions/UInt.swift similarity index 100% rename from Sources/Core/Model/Extensions/UInt.swift rename to Sources/Adwaita/Model/Extensions/UInt.swift diff --git a/Sources/Core/Model/Extensions/UnsafeMutablePointer.swift b/Sources/Adwaita/Model/Extensions/UnsafeMutablePointer.swift similarity index 100% rename from Sources/Core/Model/Extensions/UnsafeMutablePointer.swift rename to Sources/Adwaita/Model/Extensions/UnsafeMutablePointer.swift diff --git a/Sources/Core/Model/Extensions/UnsafeMutableRawPointer.swift b/Sources/Adwaita/Model/Extensions/UnsafeMutableRawPointer.swift similarity index 100% rename from Sources/Core/Model/Extensions/UnsafeMutableRawPointer.swift rename to Sources/Adwaita/Model/Extensions/UnsafeMutableRawPointer.swift diff --git a/Sources/Core/Model/Extensions/ViewStorage.swift b/Sources/Adwaita/Model/Extensions/ViewStorage.swift similarity index 100% rename from Sources/Core/Model/Extensions/ViewStorage.swift rename to Sources/Adwaita/Model/Extensions/ViewStorage.swift diff --git a/Sources/Core/Model/Idle.swift b/Sources/Adwaita/Model/Idle.swift similarity index 100% rename from Sources/Core/Model/Idle.swift rename to Sources/Adwaita/Model/Idle.swift diff --git a/Sources/Core/Model/Signals/SignalData.swift b/Sources/Adwaita/Model/Signals/SignalData.swift similarity index 100% rename from Sources/Core/Model/Signals/SignalData.swift rename to Sources/Adwaita/Model/Signals/SignalData.swift diff --git a/Sources/Core/Model/Storage.swift b/Sources/Adwaita/Model/Storage.swift similarity index 100% rename from Sources/Core/Model/Storage.swift rename to Sources/Adwaita/Model/Storage.swift diff --git a/Sources/Core/Model/WindowView.swift b/Sources/Adwaita/Model/WindowView.swift similarity index 100% rename from Sources/Core/Model/WindowView.swift rename to Sources/Adwaita/Model/WindowView.swift diff --git a/Sources/Adwaita/StatusPage+.swift b/Sources/Adwaita/StatusPage+.swift deleted file mode 100644 index d5df4c0..0000000 --- a/Sources/Adwaita/StatusPage+.swift +++ /dev/null @@ -1,17 +0,0 @@ -// -// StatusPage+.swift -// Adwaita -// -// Created by david-swift on 16.10.24. -// - -extension StatusPage { - - /// Make the status page more compact. - /// - Parameter active: Whether the style is applied. - /// - Returns: A view. - public func compact(_ active: Bool = true) -> AnyView { - style("compact", active: active) - } - -} diff --git a/Sources/Adwaita/AnyView++.swift b/Sources/Adwaita/View/AnyView++.swift similarity index 100% rename from Sources/Adwaita/AnyView++.swift rename to Sources/Adwaita/View/AnyView++.swift diff --git a/Sources/Core/View/Banner+.swift b/Sources/Adwaita/View/Banner+.swift similarity index 100% rename from Sources/Core/View/Banner+.swift rename to Sources/Adwaita/View/Banner+.swift diff --git a/Sources/Adwaita/Box+.swift b/Sources/Adwaita/View/Box+.swift similarity index 100% rename from Sources/Adwaita/Box+.swift rename to Sources/Adwaita/View/Box+.swift diff --git a/Sources/Core/View/BreakpointBin.swift b/Sources/Adwaita/View/BreakpointBin.swift similarity index 100% rename from Sources/Core/View/BreakpointBin.swift rename to Sources/Adwaita/View/BreakpointBin.swift diff --git a/Sources/Core/View/Button+.swift b/Sources/Adwaita/View/Button+.swift similarity index 100% rename from Sources/Core/View/Button+.swift rename to Sources/Adwaita/View/Button+.swift diff --git a/Sources/Core/View/Carousel+.swift b/Sources/Adwaita/View/Carousel+.swift similarity index 100% rename from Sources/Core/View/Carousel+.swift rename to Sources/Adwaita/View/Carousel+.swift diff --git a/Sources/Adwaita/CheckButton+.swift b/Sources/Adwaita/View/CheckButton+.swift similarity index 100% rename from Sources/Adwaita/CheckButton+.swift rename to Sources/Adwaita/View/CheckButton+.swift diff --git a/Sources/Core/View/Dialogs/AboutDialog.swift b/Sources/Adwaita/View/Dialogs/AboutDialog.swift similarity index 95% rename from Sources/Core/View/Dialogs/AboutDialog.swift rename to Sources/Adwaita/View/Dialogs/AboutDialog.swift index 1a97db7..106fdde 100644 --- a/Sources/Core/View/Dialogs/AboutDialog.swift +++ b/Sources/Adwaita/View/Dialogs/AboutDialog.swift @@ -9,7 +9,7 @@ import CAdw import Foundation /// The about dialog widget. -public struct AboutDialog: AdwaitaWidget { +struct AboutDialog: AdwaitaWidget { /// Whether the dialog is visible. @Binding var visible: Bool @@ -42,7 +42,7 @@ public struct AboutDialog: AdwaitaWidget { /// - icon: The icon. /// - website: The website's URL. /// - issues: The link for opening issues. - public init( + init( visible: Binding, child: AnyView, appName: String? = nil, @@ -67,7 +67,7 @@ public struct AboutDialog: AdwaitaWidget { /// - modifiers: Modify views before being updated. /// - type: The view render data type. /// - Returns: The view storage. - public func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { + func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { let storage = child.storage(data: data, type: type) update(storage, data: data, updateProperties: true, type: type) return storage @@ -79,7 +79,7 @@ public struct AboutDialog: AdwaitaWidget { /// - modifiers: Modify views before being updated /// - updateProperties: Whether to update the view's properties. /// - type: The view render data type. - public func update( + func update( _ storage: ViewStorage, data: WidgetData, updateProperties: Bool, diff --git a/Sources/Core/View/Dialogs/AlertDialog.swift b/Sources/Adwaita/View/Dialogs/AlertDialog.swift similarity index 99% rename from Sources/Core/View/Dialogs/AlertDialog.swift rename to Sources/Adwaita/View/Dialogs/AlertDialog.swift index 6986518..d741c8d 100644 --- a/Sources/Core/View/Dialogs/AlertDialog.swift +++ b/Sources/Adwaita/View/Dialogs/AlertDialog.swift @@ -43,7 +43,7 @@ public struct AlertDialog: AdwaitaWidget { /// - heading: The heading. /// - body: The body text. /// - extraChild: The body view. - public init( + init( visible: Binding, child: AnyView, id: String, diff --git a/Sources/Core/View/Dialogs/Dialog.swift b/Sources/Adwaita/View/Dialogs/Dialog.swift similarity index 96% rename from Sources/Core/View/Dialogs/Dialog.swift rename to Sources/Adwaita/View/Dialogs/Dialog.swift index 612cb42..8a533e9 100644 --- a/Sources/Core/View/Dialogs/Dialog.swift +++ b/Sources/Adwaita/View/Dialogs/Dialog.swift @@ -8,7 +8,7 @@ import CAdw /// The dialog widget. -public struct Dialog: AdwaitaWidget { +struct Dialog: AdwaitaWidget { /// Whether the dialog is visible. @Binding var visible: Bool @@ -39,7 +39,7 @@ public struct Dialog: AdwaitaWidget { /// - title: The title. /// - width: The width. /// - height: The height. - public init( + init( visible: Binding, child: AnyView, id: String, @@ -62,7 +62,7 @@ public struct Dialog: AdwaitaWidget { /// - modifiers: Modify views before being updated. /// - type: The view render data type. /// - Returns: The view storage. - public func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { + func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { let child = child.storage(data: data, type: type) let storage = ViewStorage(child.opaquePointer, content: [.mainContent: [child]]) update(storage, data: data, updateProperties: true, type: type) @@ -75,7 +75,7 @@ public struct Dialog: AdwaitaWidget { /// - modifiers: Modify views before being updated /// - updateProperties: Whether to update the view's properties. /// - type: The view render data type. - public func update( + func update( _ storage: ViewStorage, data: WidgetData, updateProperties: Bool, diff --git a/Sources/Core/View/Dialogs/FileDialog.swift b/Sources/Adwaita/View/Dialogs/FileDialog.swift similarity index 97% rename from Sources/Core/View/Dialogs/FileDialog.swift rename to Sources/Adwaita/View/Dialogs/FileDialog.swift index dc8836d..5eba69e 100644 --- a/Sources/Core/View/Dialogs/FileDialog.swift +++ b/Sources/Adwaita/View/Dialogs/FileDialog.swift @@ -9,7 +9,7 @@ import CAdw import Foundation /// A structure representing a file dialog window. -public struct FileDialog: AdwaitaWidget { +struct FileDialog: AdwaitaWidget { /// The dialog type. var type: DialogType @@ -32,7 +32,7 @@ public struct FileDialog: AdwaitaWidget { /// - result: Run when the import or export succeeds. /// - cancel: Run when the import or export is not successful. /// - initialFolder: The initial folder. - public init( + init( type: DialogType, `open`: Signal, child: AnyView, @@ -49,7 +49,7 @@ public struct FileDialog: AdwaitaWidget { } /// The different types of dialogs and their properties. - public enum DialogType { + enum DialogType { /// An importer dialog. case importer(folder: Bool, extensions: [String]?) @@ -103,7 +103,7 @@ public struct FileDialog: AdwaitaWidget { /// - modifiers: Modify views before being updated. /// - type: The view render data type. /// - Returns: The view storage. - public func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { + func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { let child = child.storage(data: data, type: type) let storage = ViewStorage(child.opaquePointer, content: [.mainContent: [child]]) update(storage, data: data, updateProperties: true, type: type) @@ -116,7 +116,7 @@ public struct FileDialog: AdwaitaWidget { /// - modifiers: Modify views before being updated /// - updateProperties: Whether to update the view's properties. /// - type: The view render data type. - public func update( + func update( _ storage: ViewStorage, data: WidgetData, updateProperties: Bool, diff --git a/Sources/Core/View/Dialogs/PreferencesDialog.swift b/Sources/Adwaita/View/Dialogs/PreferencesDialog.swift similarity index 97% rename from Sources/Core/View/Dialogs/PreferencesDialog.swift rename to Sources/Adwaita/View/Dialogs/PreferencesDialog.swift index 7b7db6c..b116dab 100644 --- a/Sources/Core/View/Dialogs/PreferencesDialog.swift +++ b/Sources/Adwaita/View/Dialogs/PreferencesDialog.swift @@ -29,7 +29,7 @@ public struct PreferencesDialog: AdwaitaWidget { /// - visible: Whether the dialog is visible. /// - child: The wrapped view. /// - id: An unique identifier for dialogs on the view. - public init( + init( visible: Binding, child: AnyView, id: String @@ -53,7 +53,7 @@ public struct PreferencesDialog: AdwaitaWidget { /// - Parameters: /// - title: The page title. /// - icon: The page's icon. - public init(_ title: String, icon: Icon) { + init(_ title: String, icon: Icon) { self.title = title self.icon = icon } @@ -62,7 +62,7 @@ public struct PreferencesDialog: AdwaitaWidget { /// - Parameter data: The widget data. /// - Returns: The preferences page pointer and the groups view storages. func gtkPreferencesPage(data: WidgetData) -> (OpaquePointer?, [ViewStorage]) { - let page = Core.PreferencesPage() + let page = Adwaita.PreferencesPage() .title(title) .iconName(icon.string) .storage(data: data.noModifiers, type: AdwaitaMainView.self) @@ -120,7 +120,7 @@ public struct PreferencesDialog: AdwaitaWidget { /// Get the GTk preferences group. /// - Parameter data: The widget data. /// - Returns: The preferences group. - func group(data: WidgetData) -> Core.PreferencesGroup { + func group(data: WidgetData) -> Adwaita.PreferencesGroup { .init() .title(title) .description(description) diff --git a/Sources/Core/View/DropDown+.swift b/Sources/Adwaita/View/DropDown+.swift similarity index 100% rename from Sources/Core/View/DropDown+.swift rename to Sources/Adwaita/View/DropDown+.swift diff --git a/Sources/Core/View/EitherView.swift b/Sources/Adwaita/View/EitherView.swift similarity index 100% rename from Sources/Core/View/EitherView.swift rename to Sources/Adwaita/View/EitherView.swift diff --git a/Sources/Core/View/Entry+.swift b/Sources/Adwaita/View/Entry+.swift similarity index 100% rename from Sources/Core/View/Entry+.swift rename to Sources/Adwaita/View/Entry+.swift diff --git a/Sources/Core/View/Fixed+.swift b/Sources/Adwaita/View/Fixed+.swift similarity index 100% rename from Sources/Core/View/Fixed+.swift rename to Sources/Adwaita/View/Fixed+.swift diff --git a/Sources/Core/View/FlowBox+.swift b/Sources/Adwaita/View/FlowBox+.swift similarity index 100% rename from Sources/Core/View/FlowBox+.swift rename to Sources/Adwaita/View/FlowBox+.swift diff --git a/Sources/Core/View/ForEach.swift b/Sources/Adwaita/View/ForEach.swift similarity index 100% rename from Sources/Core/View/ForEach.swift rename to Sources/Adwaita/View/ForEach.swift diff --git a/Sources/Core/View/Forms/ActionRow+.swift b/Sources/Adwaita/View/Forms/ActionRow+.swift similarity index 55% rename from Sources/Core/View/Forms/ActionRow+.swift rename to Sources/Adwaita/View/Forms/ActionRow+.swift index 0a4257d..8e2c044 100644 --- a/Sources/Core/View/Forms/ActionRow+.swift +++ b/Sources/Adwaita/View/Forms/ActionRow+.swift @@ -14,4 +14,11 @@ extension ActionRow { self = self.title(title) } + /// Deemphasize the row title and emphasize the subtitle. + /// - Parameter active: Whether the style is currently applied. + /// - Returns: A view. + public func property(_ active: Bool = true) -> AnyView { + style("property", active: active) + } + } diff --git a/Sources/Core/View/Forms/ComboRow+.swift b/Sources/Adwaita/View/Forms/ComboRow+.swift similarity index 100% rename from Sources/Core/View/Forms/ComboRow+.swift rename to Sources/Adwaita/View/Forms/ComboRow+.swift diff --git a/Sources/Core/View/Forms/EntryRow+.swift b/Sources/Adwaita/View/Forms/EntryRow+.swift similarity index 100% rename from Sources/Core/View/Forms/EntryRow+.swift rename to Sources/Adwaita/View/Forms/EntryRow+.swift diff --git a/Sources/Core/View/Forms/Form.swift b/Sources/Adwaita/View/Forms/Form.swift similarity index 100% rename from Sources/Core/View/Forms/Form.swift rename to Sources/Adwaita/View/Forms/Form.swift diff --git a/Sources/Core/View/Forms/FormSection+.swift b/Sources/Adwaita/View/Forms/FormSection+.swift similarity index 100% rename from Sources/Core/View/Forms/FormSection+.swift rename to Sources/Adwaita/View/Forms/FormSection+.swift diff --git a/Sources/Core/View/Forms/PasswordEntryRow+.swift b/Sources/Adwaita/View/Forms/PasswordEntryRow+.swift similarity index 100% rename from Sources/Core/View/Forms/PasswordEntryRow+.swift rename to Sources/Adwaita/View/Forms/PasswordEntryRow+.swift diff --git a/Sources/Core/View/Forms/SpinRow+.swift b/Sources/Adwaita/View/Forms/SpinRow+.swift similarity index 100% rename from Sources/Core/View/Forms/SpinRow+.swift rename to Sources/Adwaita/View/Forms/SpinRow+.swift diff --git a/Sources/Core/View/Forms/SwitchRow+.swift b/Sources/Adwaita/View/Forms/SwitchRow+.swift similarity index 100% rename from Sources/Core/View/Forms/SwitchRow+.swift rename to Sources/Adwaita/View/Forms/SwitchRow+.swift diff --git a/Sources/Core/View/Generated/ActionRow.swift b/Sources/Adwaita/View/Generated/ActionRow.swift similarity index 100% rename from Sources/Core/View/Generated/ActionRow.swift rename to Sources/Adwaita/View/Generated/ActionRow.swift diff --git a/Sources/Core/View/Generated/AspectFrame.swift b/Sources/Adwaita/View/Generated/AspectFrame.swift similarity index 100% rename from Sources/Core/View/Generated/AspectFrame.swift rename to Sources/Adwaita/View/Generated/AspectFrame.swift diff --git a/Sources/Core/View/Generated/Avatar.swift b/Sources/Adwaita/View/Generated/Avatar.swift similarity index 100% rename from Sources/Core/View/Generated/Avatar.swift rename to Sources/Adwaita/View/Generated/Avatar.swift diff --git a/Sources/Core/View/Generated/Banner.swift b/Sources/Adwaita/View/Generated/Banner.swift similarity index 100% rename from Sources/Core/View/Generated/Banner.swift rename to Sources/Adwaita/View/Generated/Banner.swift diff --git a/Sources/Core/View/Generated/Bin.swift b/Sources/Adwaita/View/Generated/Bin.swift similarity index 100% rename from Sources/Core/View/Generated/Bin.swift rename to Sources/Adwaita/View/Generated/Bin.swift diff --git a/Sources/Core/View/Generated/Box.swift b/Sources/Adwaita/View/Generated/Box.swift similarity index 100% rename from Sources/Core/View/Generated/Box.swift rename to Sources/Adwaita/View/Generated/Box.swift diff --git a/Sources/Core/View/Generated/Button.swift b/Sources/Adwaita/View/Generated/Button.swift similarity index 100% rename from Sources/Core/View/Generated/Button.swift rename to Sources/Adwaita/View/Generated/Button.swift diff --git a/Sources/Core/View/Generated/ButtonContent.swift b/Sources/Adwaita/View/Generated/ButtonContent.swift similarity index 100% rename from Sources/Core/View/Generated/ButtonContent.swift rename to Sources/Adwaita/View/Generated/ButtonContent.swift diff --git a/Sources/Core/View/Generated/Carousel.swift b/Sources/Adwaita/View/Generated/Carousel.swift similarity index 100% rename from Sources/Core/View/Generated/Carousel.swift rename to Sources/Adwaita/View/Generated/Carousel.swift diff --git a/Sources/Core/View/Generated/CenterBox.swift b/Sources/Adwaita/View/Generated/CenterBox.swift similarity index 100% rename from Sources/Core/View/Generated/CenterBox.swift rename to Sources/Adwaita/View/Generated/CenterBox.swift diff --git a/Sources/Core/View/Generated/CheckButton.swift b/Sources/Adwaita/View/Generated/CheckButton.swift similarity index 100% rename from Sources/Core/View/Generated/CheckButton.swift rename to Sources/Adwaita/View/Generated/CheckButton.swift diff --git a/Sources/Core/View/Generated/Clamp.swift b/Sources/Adwaita/View/Generated/Clamp.swift similarity index 100% rename from Sources/Core/View/Generated/Clamp.swift rename to Sources/Adwaita/View/Generated/Clamp.swift diff --git a/Sources/Core/View/Generated/ComboRow.swift b/Sources/Adwaita/View/Generated/ComboRow.swift similarity index 100% rename from Sources/Core/View/Generated/ComboRow.swift rename to Sources/Adwaita/View/Generated/ComboRow.swift diff --git a/Sources/Core/View/Generated/DropDown.swift b/Sources/Adwaita/View/Generated/DropDown.swift similarity index 100% rename from Sources/Core/View/Generated/DropDown.swift rename to Sources/Adwaita/View/Generated/DropDown.swift diff --git a/Sources/Core/View/Generated/Entry.swift b/Sources/Adwaita/View/Generated/Entry.swift similarity index 100% rename from Sources/Core/View/Generated/Entry.swift rename to Sources/Adwaita/View/Generated/Entry.swift diff --git a/Sources/Core/View/Generated/EntryRow.swift b/Sources/Adwaita/View/Generated/EntryRow.swift similarity index 100% rename from Sources/Core/View/Generated/EntryRow.swift rename to Sources/Adwaita/View/Generated/EntryRow.swift diff --git a/Sources/Core/View/Generated/ExpanderRow.swift b/Sources/Adwaita/View/Generated/ExpanderRow.swift similarity index 100% rename from Sources/Core/View/Generated/ExpanderRow.swift rename to Sources/Adwaita/View/Generated/ExpanderRow.swift diff --git a/Sources/Core/View/Generated/Fixed.swift b/Sources/Adwaita/View/Generated/Fixed.swift similarity index 100% rename from Sources/Core/View/Generated/Fixed.swift rename to Sources/Adwaita/View/Generated/Fixed.swift diff --git a/Sources/Core/View/Generated/FlowBox.swift b/Sources/Adwaita/View/Generated/FlowBox.swift similarity index 100% rename from Sources/Core/View/Generated/FlowBox.swift rename to Sources/Adwaita/View/Generated/FlowBox.swift diff --git a/Sources/Core/View/Generated/HeaderBar.swift b/Sources/Adwaita/View/Generated/HeaderBar.swift similarity index 100% rename from Sources/Core/View/Generated/HeaderBar.swift rename to Sources/Adwaita/View/Generated/HeaderBar.swift diff --git a/Sources/Core/View/Generated/Image.swift b/Sources/Adwaita/View/Generated/Image.swift similarity index 100% rename from Sources/Core/View/Generated/Image.swift rename to Sources/Adwaita/View/Generated/Image.swift diff --git a/Sources/Core/View/Generated/Label.swift b/Sources/Adwaita/View/Generated/Label.swift similarity index 100% rename from Sources/Core/View/Generated/Label.swift rename to Sources/Adwaita/View/Generated/Label.swift diff --git a/Sources/Core/View/Generated/LevelBar.swift b/Sources/Adwaita/View/Generated/LevelBar.swift similarity index 100% rename from Sources/Core/View/Generated/LevelBar.swift rename to Sources/Adwaita/View/Generated/LevelBar.swift diff --git a/Sources/Core/View/Generated/LinkButton.swift b/Sources/Adwaita/View/Generated/LinkButton.swift similarity index 100% rename from Sources/Core/View/Generated/LinkButton.swift rename to Sources/Adwaita/View/Generated/LinkButton.swift diff --git a/Sources/Core/View/Generated/ListBox.swift b/Sources/Adwaita/View/Generated/ListBox.swift similarity index 100% rename from Sources/Core/View/Generated/ListBox.swift rename to Sources/Adwaita/View/Generated/ListBox.swift diff --git a/Sources/Core/View/Generated/Menu.swift b/Sources/Adwaita/View/Generated/Menu.swift similarity index 100% rename from Sources/Core/View/Generated/Menu.swift rename to Sources/Adwaita/View/Generated/Menu.swift diff --git a/Sources/Core/View/Generated/NavigationView.swift b/Sources/Adwaita/View/Generated/NavigationView.swift similarity index 100% rename from Sources/Core/View/Generated/NavigationView.swift rename to Sources/Adwaita/View/Generated/NavigationView.swift diff --git a/Sources/Core/View/Generated/Overlay.swift b/Sources/Adwaita/View/Generated/Overlay.swift similarity index 100% rename from Sources/Core/View/Generated/Overlay.swift rename to Sources/Adwaita/View/Generated/Overlay.swift diff --git a/Sources/Core/View/Generated/OverlaySplitView.swift b/Sources/Adwaita/View/Generated/OverlaySplitView.swift similarity index 100% rename from Sources/Core/View/Generated/OverlaySplitView.swift rename to Sources/Adwaita/View/Generated/OverlaySplitView.swift diff --git a/Sources/Core/View/Generated/PasswordEntryRow.swift b/Sources/Adwaita/View/Generated/PasswordEntryRow.swift similarity index 100% rename from Sources/Core/View/Generated/PasswordEntryRow.swift rename to Sources/Adwaita/View/Generated/PasswordEntryRow.swift diff --git a/Sources/Core/View/Generated/Picture.swift b/Sources/Adwaita/View/Generated/Picture.swift similarity index 100% rename from Sources/Core/View/Generated/Picture.swift rename to Sources/Adwaita/View/Generated/Picture.swift diff --git a/Sources/Core/View/Generated/Popover.swift b/Sources/Adwaita/View/Generated/Popover.swift similarity index 100% rename from Sources/Core/View/Generated/Popover.swift rename to Sources/Adwaita/View/Generated/Popover.swift diff --git a/Sources/Core/View/Generated/PreferencesGroup.swift b/Sources/Adwaita/View/Generated/PreferencesGroup.swift similarity index 100% rename from Sources/Core/View/Generated/PreferencesGroup.swift rename to Sources/Adwaita/View/Generated/PreferencesGroup.swift diff --git a/Sources/Core/View/Generated/PreferencesPage.swift b/Sources/Adwaita/View/Generated/PreferencesPage.swift similarity index 100% rename from Sources/Core/View/Generated/PreferencesPage.swift rename to Sources/Adwaita/View/Generated/PreferencesPage.swift diff --git a/Sources/Core/View/Generated/PreferencesRow.swift b/Sources/Adwaita/View/Generated/PreferencesRow.swift similarity index 100% rename from Sources/Core/View/Generated/PreferencesRow.swift rename to Sources/Adwaita/View/Generated/PreferencesRow.swift diff --git a/Sources/Core/View/Generated/ProgressBar.swift b/Sources/Adwaita/View/Generated/ProgressBar.swift similarity index 100% rename from Sources/Core/View/Generated/ProgressBar.swift rename to Sources/Adwaita/View/Generated/ProgressBar.swift diff --git a/Sources/Core/View/Generated/ScrolledWindow.swift b/Sources/Adwaita/View/Generated/ScrolledWindow.swift similarity index 100% rename from Sources/Core/View/Generated/ScrolledWindow.swift rename to Sources/Adwaita/View/Generated/ScrolledWindow.swift diff --git a/Sources/Core/View/Generated/SearchBar.swift b/Sources/Adwaita/View/Generated/SearchBar.swift similarity index 100% rename from Sources/Core/View/Generated/SearchBar.swift rename to Sources/Adwaita/View/Generated/SearchBar.swift diff --git a/Sources/Core/View/Generated/SearchEntry.swift b/Sources/Adwaita/View/Generated/SearchEntry.swift similarity index 100% rename from Sources/Core/View/Generated/SearchEntry.swift rename to Sources/Adwaita/View/Generated/SearchEntry.swift diff --git a/Sources/Core/View/Generated/Separator.swift b/Sources/Adwaita/View/Generated/Separator.swift similarity index 100% rename from Sources/Core/View/Generated/Separator.swift rename to Sources/Adwaita/View/Generated/Separator.swift diff --git a/Sources/Core/View/Generated/SpinRow.swift b/Sources/Adwaita/View/Generated/SpinRow.swift similarity index 100% rename from Sources/Core/View/Generated/SpinRow.swift rename to Sources/Adwaita/View/Generated/SpinRow.swift diff --git a/Sources/Core/View/Generated/Spinner.swift b/Sources/Adwaita/View/Generated/Spinner.swift similarity index 100% rename from Sources/Core/View/Generated/Spinner.swift rename to Sources/Adwaita/View/Generated/Spinner.swift diff --git a/Sources/Core/View/Generated/SplitButton.swift b/Sources/Adwaita/View/Generated/SplitButton.swift similarity index 100% rename from Sources/Core/View/Generated/SplitButton.swift rename to Sources/Adwaita/View/Generated/SplitButton.swift diff --git a/Sources/Core/View/Generated/StatusPage.swift b/Sources/Adwaita/View/Generated/StatusPage.swift similarity index 100% rename from Sources/Core/View/Generated/StatusPage.swift rename to Sources/Adwaita/View/Generated/StatusPage.swift diff --git a/Sources/Core/View/Generated/SwitchRow.swift b/Sources/Adwaita/View/Generated/SwitchRow.swift similarity index 100% rename from Sources/Core/View/Generated/SwitchRow.swift rename to Sources/Adwaita/View/Generated/SwitchRow.swift diff --git a/Sources/Core/View/Generated/ToastOverlay.swift b/Sources/Adwaita/View/Generated/ToastOverlay.swift similarity index 100% rename from Sources/Core/View/Generated/ToastOverlay.swift rename to Sources/Adwaita/View/Generated/ToastOverlay.swift diff --git a/Sources/Core/View/Generated/ToggleButton.swift b/Sources/Adwaita/View/Generated/ToggleButton.swift similarity index 100% rename from Sources/Core/View/Generated/ToggleButton.swift rename to Sources/Adwaita/View/Generated/ToggleButton.swift diff --git a/Sources/Core/View/Generated/ToolbarView.swift b/Sources/Adwaita/View/Generated/ToolbarView.swift similarity index 100% rename from Sources/Core/View/Generated/ToolbarView.swift rename to Sources/Adwaita/View/Generated/ToolbarView.swift diff --git a/Sources/Core/View/Generated/WindowTitle.swift b/Sources/Adwaita/View/Generated/WindowTitle.swift similarity index 100% rename from Sources/Core/View/Generated/WindowTitle.swift rename to Sources/Adwaita/View/Generated/WindowTitle.swift diff --git a/Sources/Core/View/HStack.swift b/Sources/Adwaita/View/HStack.swift similarity index 100% rename from Sources/Core/View/HStack.swift rename to Sources/Adwaita/View/HStack.swift diff --git a/Sources/Core/View/HeaderBar+.swift b/Sources/Adwaita/View/HeaderBar+.swift similarity index 100% rename from Sources/Core/View/HeaderBar+.swift rename to Sources/Adwaita/View/HeaderBar+.swift diff --git a/Sources/Adwaita/List+.swift b/Sources/Adwaita/View/List+.swift similarity index 100% rename from Sources/Adwaita/List+.swift rename to Sources/Adwaita/View/List+.swift diff --git a/Sources/Core/View/List.swift b/Sources/Adwaita/View/List.swift similarity index 100% rename from Sources/Core/View/List.swift rename to Sources/Adwaita/View/List.swift diff --git a/Sources/Core/View/Menu+.swift b/Sources/Adwaita/View/Menu+.swift similarity index 100% rename from Sources/Core/View/Menu+.swift rename to Sources/Adwaita/View/Menu+.swift diff --git a/Sources/Core/View/Modifiers/Clamp+.swift b/Sources/Adwaita/View/Modifiers/Clamp+.swift similarity index 100% rename from Sources/Core/View/Modifiers/Clamp+.swift rename to Sources/Adwaita/View/Modifiers/Clamp+.swift diff --git a/Sources/Core/View/Modifiers/ModifierWrapper.swift b/Sources/Adwaita/View/Modifiers/ModifierWrapper.swift similarity index 97% rename from Sources/Core/View/Modifiers/ModifierWrapper.swift rename to Sources/Adwaita/View/Modifiers/ModifierWrapper.swift index 5a1ee31..82c2942 100644 --- a/Sources/Core/View/Modifiers/ModifierWrapper.swift +++ b/Sources/Adwaita/View/Modifiers/ModifierWrapper.swift @@ -8,7 +8,7 @@ import CAdw /// A wrapper for view modifiers for any view. -public struct ModifierWrapper: AdwaitaWidget { +struct ModifierWrapper: AdwaitaWidget { /// The view. var content: AnyView @@ -55,7 +55,7 @@ public struct ModifierWrapper: AdwaitaWidget { /// - insensitive: Whether the view is insensitive. /// - visible: Whether the view is visible. /// - tooltip: The tooltip. - public init( + init( content: AnyView, padding: Int? = nil, edges: Set? = nil, @@ -92,7 +92,7 @@ public struct ModifierWrapper: AdwaitaWidget { /// - modifiers: Modify views before being updated. /// - type: The view render data type. /// - Returns: The view storage. - public func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { + func container(data: WidgetData, type: Data.Type) -> ViewStorage where Data: ViewRenderData { let content = content.storage(data: data, type: type) let storage = ViewStorage(content.pointer, content: [.mainContent: [content]]) update(storage, data: data, updateProperties: true, type: type) @@ -105,7 +105,7 @@ public struct ModifierWrapper: AdwaitaWidget { /// - modifiers: Modify views before being updated /// - updateProperties: Whether to update the view's properties. /// - type: The view render data type. - public func update( + func update( _ storage: ViewStorage, data: WidgetData, updateProperties: Bool, diff --git a/Sources/Core/View/Modifiers/Popover+.swift b/Sources/Adwaita/View/Modifiers/Popover+.swift similarity index 100% rename from Sources/Core/View/Modifiers/Popover+.swift rename to Sources/Adwaita/View/Modifiers/Popover+.swift diff --git a/Sources/Core/View/Modifiers/ToastOverlay+.swift b/Sources/Adwaita/View/Modifiers/ToastOverlay+.swift similarity index 100% rename from Sources/Core/View/Modifiers/ToastOverlay+.swift rename to Sources/Adwaita/View/Modifiers/ToastOverlay+.swift diff --git a/Sources/Core/View/NavigationSplitView.swift b/Sources/Adwaita/View/NavigationSplitView.swift similarity index 100% rename from Sources/Core/View/NavigationSplitView.swift rename to Sources/Adwaita/View/NavigationSplitView.swift diff --git a/Sources/Core/View/NavigationView+.swift b/Sources/Adwaita/View/NavigationView+.swift similarity index 100% rename from Sources/Core/View/NavigationView+.swift rename to Sources/Adwaita/View/NavigationView+.swift diff --git a/Sources/Core/View/OverlaySplitView+.swift b/Sources/Adwaita/View/OverlaySplitView+.swift similarity index 100% rename from Sources/Core/View/OverlaySplitView+.swift rename to Sources/Adwaita/View/OverlaySplitView+.swift diff --git a/Sources/Core/View/Picture+.swift b/Sources/Adwaita/View/Picture+.swift similarity index 100% rename from Sources/Core/View/Picture+.swift rename to Sources/Adwaita/View/Picture+.swift diff --git a/Sources/Core/View/ProgressBar+.swift b/Sources/Adwaita/View/ProgressBar+.swift similarity index 100% rename from Sources/Core/View/ProgressBar+.swift rename to Sources/Adwaita/View/ProgressBar+.swift diff --git a/Sources/Core/View/ScrollView.swift b/Sources/Adwaita/View/ScrollView.swift similarity index 100% rename from Sources/Core/View/ScrollView.swift rename to Sources/Adwaita/View/ScrollView.swift diff --git a/Sources/Core/View/SplitView.swift b/Sources/Adwaita/View/SplitView.swift similarity index 100% rename from Sources/Core/View/SplitView.swift rename to Sources/Adwaita/View/SplitView.swift diff --git a/Sources/Core/View/StatusPage+.swift b/Sources/Adwaita/View/StatusPage+.swift similarity index 74% rename from Sources/Core/View/StatusPage+.swift rename to Sources/Adwaita/View/StatusPage+.swift index 472e9ae..8e1c830 100644 --- a/Sources/Core/View/StatusPage+.swift +++ b/Sources/Adwaita/View/StatusPage+.swift @@ -26,4 +26,11 @@ extension StatusPage { self = self.child(content) } + /// Make the status page more compact. + /// - Parameter active: Whether the style is applied. + /// - Returns: A view. + public func compact(_ active: Bool = true) -> AnyView { + style("compact", active: active) + } + } diff --git a/Sources/Core/View/Symbol.swift b/Sources/Adwaita/View/Symbol.swift similarity index 100% rename from Sources/Core/View/Symbol.swift rename to Sources/Adwaita/View/Symbol.swift diff --git a/Sources/Core/View/Text.swift b/Sources/Adwaita/View/Text.swift similarity index 100% rename from Sources/Core/View/Text.swift rename to Sources/Adwaita/View/Text.swift diff --git a/Sources/Core/View/TextEditor.swift b/Sources/Adwaita/View/TextEditor.swift similarity index 100% rename from Sources/Core/View/TextEditor.swift rename to Sources/Adwaita/View/TextEditor.swift diff --git a/Sources/Core/View/Toggle.swift b/Sources/Adwaita/View/Toggle.swift similarity index 100% rename from Sources/Core/View/Toggle.swift rename to Sources/Adwaita/View/Toggle.swift diff --git a/Sources/Core/View/VStack.swift b/Sources/Adwaita/View/VStack.swift similarity index 100% rename from Sources/Core/View/VStack.swift rename to Sources/Adwaita/View/VStack.swift diff --git a/Sources/Core/View/ViewStack.swift b/Sources/Adwaita/View/ViewStack.swift similarity index 100% rename from Sources/Core/View/ViewStack.swift rename to Sources/Adwaita/View/ViewStack.swift diff --git a/Sources/Core/View/ViewSwitcher.swift b/Sources/Adwaita/View/ViewSwitcher.swift similarity index 100% rename from Sources/Core/View/ViewSwitcher.swift rename to Sources/Adwaita/View/ViewSwitcher.swift diff --git a/Sources/Core/Window/Window.swift b/Sources/Adwaita/Window/Window.swift similarity index 100% rename from Sources/Core/Window/Window.swift rename to Sources/Adwaita/Window/Window.swift diff --git a/Sources/Generation/GenerationConfiguration.swift b/Sources/Generation/GenerationConfiguration.swift index 700cfa0..2170757 100644 --- a/Sources/Generation/GenerationConfiguration.swift +++ b/Sources/Generation/GenerationConfiguration.swift @@ -35,7 +35,7 @@ struct GenerationConfiguration { var adwGirFilePath = adwGirFilePath + "Adw-1.gir" /// The folder containing the generated Swift files. - var folder = "Sources/Core/View/Generated/" + var folder = "Sources/Adwaita/View/Generated/" /// The Libadwaita widgets. var adwWidgets: [WidgetConfiguration] = [