From 25c606a4778d1fadcfdc06caa1ee0908217c651e Mon Sep 17 00:00:00 2001 From: Danilo Lemes Date: Wed, 11 Dec 2024 18:35:28 +0000 Subject: [PATCH 1/2] rename packages --- .github/workflows/build.yml | 2 +- .idea/compiler.xml | 7 +++- .../hardwaremonitor/HardwareMonitorData.kt | 2 +- .../hardwaremonitor/PresentMonReading.kt | 2 +- .../core/common/hwinfo/HwInfoData.kt | 2 +- .../core/common/hwinfo/SensorElement.kt | 2 +- .../common/hwinfo/SensorReadingElement.kt | 2 +- .../core/common/hwinfo/SensorReadingType.kt | 2 +- .../core/common/hwinfo/SensorSharedMem.kt | 2 +- .../cleanmeter}/core/common/mahm/Data.kt | 2 +- .../cleanmeter}/core/common/mahm/Entry.kt | 2 +- .../cleanmeter}/core/common/mahm/EntryFlag.kt | 2 +- .../cleanmeter}/core/common/mahm/GPUEntry.kt | 2 +- .../cleanmeter}/core/common/mahm/Header.kt | 2 +- .../cleanmeter}/core/common/mahm/SourceID.kt | 2 +- .../core/common/mahm/dto/DataDTO.kt | 8 ++--- .../core/common/process/SingleInstance.kt | 6 ++-- .../common/reporting/ApplicationParams.kt | 2 +- .../core/common/reporting/LoggerUtils.kt | 2 +- .../cleanmeter}/core/os/ProcessManager.kt | 4 +-- .../HardwareMonitorProcessManager.kt | 4 +-- .../hardwaremonitor/HardwareMonitorReader.kt | 8 ++--- .../core/os/hwinfo/HwInfoProcessManager.kt | 4 +-- .../core/os/hwinfo/HwInfoReader.kt | 18 +++++----- .../cleanmeter}/core/os/mahm/MahmReader.kt | 24 ++++++------- .../core/os/resource/NativeResourceLoader.kt | 2 +- .../cleanmeter}/core/os/util/MemoryUtils.kt | 2 +- .../cleanmeter}/core/os/util/env.kt | 2 +- .../core/os/win32/Kernel32Impl.java | 2 +- .../cleanmeter}/core/os/win32/Shell32Impl.kt | 2 +- .../cleanmeter}/core/os/win32/WinRegistry.kt | 4 +-- .../core/os/win32/WindowsService.kt | 4 +-- .../cleanmeter}/updater/AutoUpdater.kt | 6 ++-- settings.gradle.kts | 5 ++- target/{server => desktop}/build.gradle.kts | 2 +- .../ApplicationViewModelStoreOwner.kt | 2 +- .../cleanmeter/target/desktop}/ComposeApp.kt | 10 +++--- .../target/desktop}/KeyboardHook.kt | 2 +- .../target/desktop}/MainViewModel.kt | 6 ++-- .../cleanmeter/target/desktop}/ServerMain.kt | 12 +++---- .../desktop/data/ObserveHardwareReadings.kt | 7 ++++ .../data/OverlaySettingsRepository.kt | 4 +-- .../desktop}/data/PreferencesRepository.kt | 4 +-- .../target/desktop}/model/OverlaySettings.kt | 4 +-- .../cleanmeter/target/desktop}/ui/AppTheme.kt | 2 +- .../target/desktop}/ui/ColorTokens.kt | 2 +- .../desktop}/ui/components/CheckboxSection.kt | 6 ++-- .../ui/components/CheckboxWithLabel.kt | 4 +-- .../ui/components/CollapsibleSection.kt | 4 +-- .../ui/components/CustomReadingProgress.kt | 8 ++--- .../desktop}/ui/components/DropdownMenu.kt | 17 ++-------- .../desktop}/ui/components/DropdownSection.kt | 4 +-- .../components/KeyboardShortcutInfoLabel.kt | 4 +-- .../target/desktop}/ui/components/Label.kt | 2 +- .../target/desktop}/ui/components/Pill.kt | 6 ++-- .../target/desktop}/ui/components/Progress.kt | 12 +++---- .../desktop}/ui/components/ProgressUnit.kt | 2 +- .../target/desktop}/ui/components/Section.kt | 7 ++-- .../components/SensorReadingDropdownMenu.kt | 18 +++++----- .../desktop}/ui/components/SettingsTab.kt | 8 ++--- .../desktop}/ui/components/SliderElements.kt | 4 +-- .../desktop}/ui/components/StyleCard.kt | 10 +++--- .../target/desktop}/ui/components/Title.kt | 2 +- .../target/desktop}/ui/components/Toggle.kt | 8 ++--- .../desktop}/ui/components/ToggleSection.kt | 4 +-- .../target/desktop}/ui/components/TopBar.kt | 8 ++--- .../desktop}/ui/components/UpdateToast.kt | 18 +++++----- .../target/desktop}/ui/overlay/Overlay.kt | 8 ++--- .../target/desktop}/ui/overlay/OverlayUi.kt | 16 ++++----- .../desktop}/ui/overlay/OverlayViewModel.kt | 12 +++---- .../desktop}/ui/overlay/OverlayWindow.kt | 10 +++--- .../ui/overlay/sections/CpuSection.kt | 10 +++--- .../ui/overlay/sections/FpsSection.kt | 16 ++++----- .../ui/overlay/sections/GpuSection.kt | 14 ++++---- .../ui/overlay/sections/NetSection.kt | 19 +++++------ .../ui/overlay/sections/RamSection.kt | 14 ++++---- .../desktop}/ui/overlay/sections/drawLine.kt | 2 +- .../ui/settings/CheckboxSectionOption.kt | 4 +-- .../target/desktop}/ui/settings/Footer.kt | 6 ++-- .../target/desktop}/ui/settings/Settings.kt | 32 +++++++++--------- .../desktop}/ui/settings/SettingsViewModel.kt | 10 +++--- .../desktop}/ui/settings/SettingsWindow.kt | 7 ++-- .../ui/settings/tabs/AppSettingsUi.kt | 16 ++++----- .../ui/settings/tabs/HelpSettingsUi.kt | 8 ++--- .../ui/settings/tabs/OverlaySettingsUi.kt | 26 +++++++------- .../ui/settings/tabs/style/GraphType.kt | 8 ++--- .../ui/settings/tabs/style/Opacity.kt | 20 +++++------ .../ui/settings/tabs/style/Orientation.kt | 8 ++--- .../ui/settings/tabs/style/Position.kt | 20 +++++------ .../ui/settings/tabs/style/StyleUi.kt | 4 +-- .../src/main/resources/font/inter_black.ttf | Bin .../src/main/resources/font/inter_bold.ttf | Bin .../main/resources/font/inter_extrabold.ttf | Bin .../main/resources/font/inter_extralight.ttf | Bin .../src/main/resources/font/inter_light.ttf | Bin .../src/main/resources/font/inter_medium.ttf | Bin .../src/main/resources/font/inter_regular.ttf | Bin .../main/resources/font/inter_semibold.ttf | Bin .../src/main/resources/font/inter_thin.ttf | Bin .../src/main/resources/icons/arrow_down.svg | 0 .../src/main/resources/icons/bars.png | Bin .../main/resources/icons/cloud_download.svg | 0 .../src/main/resources/icons/data_usage.svg | 0 .../src/main/resources/icons/discord.png | Bin .../src/main/resources/icons/download.svg | 0 .../main/resources/icons/download_done.svg | 0 .../src/main/resources/icons/drag_pan.svg | 0 .../main/resources/icons/full_brightness.svg | 0 .../src/main/resources/icons/github.png | Bin .../src/main/resources/icons/help.svg | 0 .../src/main/resources/icons/horizontal.png | Bin .../src/main/resources/icons/hotkey.png | Bin .../src/main/resources/icons/info.svg | 0 .../src/main/resources/icons/ko-fi.png | Bin .../src/main/resources/icons/layers.svg | 0 .../src/main/resources/icons/lock_closed.svg | 0 .../src/main/resources/icons/lock_open.svg | 0 .../main/resources/icons/mid_brightness.svg | 0 .../main/resources/icons/no_brightness.svg | 0 .../src/main/resources/icons/rings.png | Bin .../src/main/resources/icons/sensors.svg | 0 .../src/main/resources/icons/settings.svg | 0 .../src/main/resources/icons/update.svg | 0 .../src/main/resources/icons/vertical.png | Bin .../src/main/resources/imgs/favicon.ico | Bin .../src/main/resources/imgs/github.svg | 0 .../src/main/resources/imgs/logo.png | Bin .../server/data/ObserveHardwareReadings.kt | 7 ---- 128 files changed, 320 insertions(+), 334 deletions(-) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hardwaremonitor/HardwareMonitorData.kt (98%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hardwaremonitor/PresentMonReading.kt (90%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hwinfo/HwInfoData.kt (98%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hwinfo/SensorElement.kt (82%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hwinfo/SensorReadingElement.kt (89%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hwinfo/SensorReadingType.kt (87%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/hwinfo/SensorSharedMem.kt (90%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/Data.kt (98%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/Entry.kt (97%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/EntryFlag.kt (90%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/GPUEntry.kt (95%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/Header.kt (96%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/SourceID.kt (98%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/mahm/dto/DataDTO.kt (73%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/process/SingleInstance.kt (86%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/reporting/ApplicationParams.kt (88%) rename core/common/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/common/reporting/LoggerUtils.kt (91%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/ProcessManager.kt (60%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt (95%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/hardwaremonitor/HardwareMonitorReader.kt (94%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/hwinfo/HwInfoProcessManager.kt (95%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/hwinfo/HwInfoReader.kt (91%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/mahm/MahmReader.kt (87%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/resource/NativeResourceLoader.kt (84%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/util/MemoryUtils.kt (97%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/util/env.kt (53%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/win32/Kernel32Impl.java (90%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/win32/Shell32Impl.kt (93%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/win32/WinRegistry.kt (94%) rename core/native/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/core/os/win32/WindowsService.kt (97%) rename core/updater/src/main/kotlin/{br/com/firstsoft => app/cleanmeter}/updater/AutoUpdater.kt (96%) rename target/{server => desktop}/build.gradle.kts (97%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ApplicationViewModelStoreOwner.kt (87%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ComposeApp.kt (80%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/KeyboardHook.kt (97%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/MainViewModel.kt (84%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ServerMain.kt (57%) create mode 100644 target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/ObserveHardwareReadings.kt rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/data/OverlaySettingsRepository.kt (87%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/data/PreferencesRepository.kt (92%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/model/OverlaySettings.kt (96%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/AppTheme.kt (97%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/ColorTokens.kt (94%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/CheckboxSection.kt (94%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/CheckboxWithLabel.kt (92%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/CollapsibleSection.kt (96%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/CustomReadingProgress.kt (67%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/DropdownMenu.kt (83%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/DropdownSection.kt (92%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/KeyboardShortcutInfoLabel.kt (93%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/Label.kt (87%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/Pill.kt (91%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/Progress.kt (91%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/ProgressUnit.kt (93%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/Section.kt (86%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/SensorReadingDropdownMenu.kt (95%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/SettingsTab.kt (89%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/SliderElements.kt (96%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/StyleCard.kt (87%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/Title.kt (90%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/Toggle.kt (83%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/ToggleSection.kt (93%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/TopBar.kt (92%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/components/UpdateToast.kt (93%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/Overlay.kt (86%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/OverlayUi.kt (89%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/OverlayViewModel.kt (75%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/OverlayWindow.kt (95%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/sections/CpuSection.kt (79%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/sections/FpsSection.kt (92%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/sections/GpuSection.kt (81%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/sections/NetSection.kt (93%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/sections/RamSection.kt (57%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/overlay/sections/drawLine.kt (92%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/CheckboxSectionOption.kt (80%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/Footer.kt (97%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/Settings.kt (86%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/SettingsViewModel.kt (97%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/SettingsWindow.kt (89%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/AppSettingsUi.kt (84%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/HelpSettingsUi.kt (96%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/OverlaySettingsUi.kt (93%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/style/GraphType.kt (88%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/style/Opacity.kt (77%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/style/Orientation.kt (86%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/style/Position.kt (94%) rename target/{server/src/main/kotlin/br/com/firstsoft/target/server => desktop/src/main/kotlin/app/cleanmeter/target/desktop}/ui/settings/tabs/style/StyleUi.kt (92%) rename target/{server => desktop}/src/main/resources/font/inter_black.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_bold.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_extrabold.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_extralight.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_light.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_medium.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_regular.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_semibold.ttf (100%) rename target/{server => desktop}/src/main/resources/font/inter_thin.ttf (100%) rename target/{server => desktop}/src/main/resources/icons/arrow_down.svg (100%) rename target/{server => desktop}/src/main/resources/icons/bars.png (100%) rename target/{server => desktop}/src/main/resources/icons/cloud_download.svg (100%) rename target/{server => desktop}/src/main/resources/icons/data_usage.svg (100%) rename target/{server => desktop}/src/main/resources/icons/discord.png (100%) rename target/{server => desktop}/src/main/resources/icons/download.svg (100%) rename target/{server => desktop}/src/main/resources/icons/download_done.svg (100%) rename target/{server => desktop}/src/main/resources/icons/drag_pan.svg (100%) rename target/{server => desktop}/src/main/resources/icons/full_brightness.svg (100%) rename target/{server => desktop}/src/main/resources/icons/github.png (100%) rename target/{server => desktop}/src/main/resources/icons/help.svg (100%) rename target/{server => desktop}/src/main/resources/icons/horizontal.png (100%) rename target/{server => desktop}/src/main/resources/icons/hotkey.png (100%) rename target/{server => desktop}/src/main/resources/icons/info.svg (100%) rename target/{server => desktop}/src/main/resources/icons/ko-fi.png (100%) rename target/{server => desktop}/src/main/resources/icons/layers.svg (100%) rename target/{server => desktop}/src/main/resources/icons/lock_closed.svg (100%) rename target/{server => desktop}/src/main/resources/icons/lock_open.svg (100%) rename target/{server => desktop}/src/main/resources/icons/mid_brightness.svg (100%) rename target/{server => desktop}/src/main/resources/icons/no_brightness.svg (100%) rename target/{server => desktop}/src/main/resources/icons/rings.png (100%) rename target/{server => desktop}/src/main/resources/icons/sensors.svg (100%) rename target/{server => desktop}/src/main/resources/icons/settings.svg (100%) rename target/{server => desktop}/src/main/resources/icons/update.svg (100%) rename target/{server => desktop}/src/main/resources/icons/vertical.png (100%) rename target/{server => desktop}/src/main/resources/imgs/favicon.ico (100%) rename target/{server => desktop}/src/main/resources/imgs/github.svg (100%) rename target/{server => desktop}/src/main/resources/imgs/logo.png (100%) delete mode 100644 target/server/src/main/kotlin/br/com/firstsoft/target/server/data/ObserveHardwareReadings.kt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f20afb0..5cfbb56 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,7 +38,7 @@ jobs: uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0 - name: Build with Gradle Wrapper - run: ./gradlew :target:server:createDistributable + run: ./gradlew :target:desktop:createDistributable - name: Archive production artifacts uses: actions/upload-artifact@v4 diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 312bf2e..c32b392 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,11 @@ - + + + + + + \ No newline at end of file diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/HardwareMonitorData.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/HardwareMonitorData.kt similarity index 98% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/HardwareMonitorData.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/HardwareMonitorData.kt index 73f3c51..6d8d555 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/HardwareMonitorData.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/HardwareMonitorData.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hardwaremonitor +package app.cleanmeter.core.common.hardwaremonitor import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/PresentMonReading.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/PresentMonReading.kt similarity index 90% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/PresentMonReading.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/PresentMonReading.kt index 8f00845..9671b90 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hardwaremonitor/PresentMonReading.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hardwaremonitor/PresentMonReading.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hardwaremonitor +package app.cleanmeter.core.common.hardwaremonitor data class PresentMonReading( diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/HwInfoData.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/HwInfoData.kt similarity index 98% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/HwInfoData.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/HwInfoData.kt index 68ed15a..9395f07 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/HwInfoData.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/HwInfoData.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hwinfo +package app.cleanmeter.core.common.hwinfo import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorElement.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorElement.kt similarity index 82% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorElement.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorElement.kt index f24251f..8b1d865 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorElement.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorElement.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hwinfo +package app.cleanmeter.core.common.hwinfo import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingElement.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingElement.kt similarity index 89% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingElement.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingElement.kt index 69b6674..ea7f415 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingElement.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingElement.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hwinfo +package app.cleanmeter.core.common.hwinfo import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingType.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingType.kt similarity index 87% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingType.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingType.kt index ebd8f37..0a597f4 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorReadingType.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorReadingType.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hwinfo +package app.cleanmeter.core.common.hwinfo enum class SensorReadingType(val value: Int) { None(0), diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorSharedMem.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorSharedMem.kt similarity index 90% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorSharedMem.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorSharedMem.kt index 15c4fbf..abffdde 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/hwinfo/SensorSharedMem.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/hwinfo/SensorSharedMem.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.hwinfo +package app.cleanmeter.core.common.hwinfo import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Data.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Data.kt similarity index 98% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Data.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Data.kt index b92abd9..2aa3ae3 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Data.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Data.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.mahm +package app.cleanmeter.core.common.mahm import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Entry.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Entry.kt similarity index 97% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Entry.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Entry.kt index 05adcae..f82f523 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Entry.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Entry.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.mahm +package app.cleanmeter.core.common.mahm import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/EntryFlag.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/EntryFlag.kt similarity index 90% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/EntryFlag.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/EntryFlag.kt index 008b844..2fab797 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/EntryFlag.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/EntryFlag.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.mahm +package app.cleanmeter.core.common.mahm import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/GPUEntry.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/GPUEntry.kt similarity index 95% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/GPUEntry.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/GPUEntry.kt index 774bb28..ce53d6a 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/GPUEntry.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/GPUEntry.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.mahm +package app.cleanmeter.core.common.mahm import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Header.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Header.kt similarity index 96% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Header.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Header.kt index 39311ab..aa61a98 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/Header.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/Header.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.mahm +package app.cleanmeter.core.common.mahm import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/SourceID.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/SourceID.kt similarity index 98% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/SourceID.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/SourceID.kt index e772bce..7d99230 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/SourceID.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/SourceID.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.mahm +package app.cleanmeter.core.common.mahm import kotlinx.serialization.Serializable diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/dto/DataDTO.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/dto/DataDTO.kt similarity index 73% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/dto/DataDTO.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/dto/DataDTO.kt index e47e47f..966c004 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/mahm/dto/DataDTO.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/mahm/dto/DataDTO.kt @@ -1,9 +1,9 @@ -package br.com.firstsoft.core.common.mahm.dto +package app.cleanmeter.core.common.mahm.dto import kotlinx.serialization.Serializable -import br.com.firstsoft.core.common.mahm.Data -import br.com.firstsoft.core.common.mahm.Entry -import br.com.firstsoft.core.common.mahm.SourceID +import app.cleanmeter.core.common.mahm.Data +import app.cleanmeter.core.common.mahm.Entry +import app.cleanmeter.core.common.mahm.SourceID @Serializable data class DataDTO( diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/process/SingleInstance.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/process/SingleInstance.kt similarity index 86% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/process/SingleInstance.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/process/SingleInstance.kt index 90e41af..ea32a09 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/process/SingleInstance.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/process/SingleInstance.kt @@ -1,7 +1,7 @@ -package br.com.firstsoft.core.common.process +package app.cleanmeter.core.common.process -import br.com.firstsoft.core.common.reporting.ApplicationParams -import br.com.firstsoft.core.common.reporting.setDefaultUncaughtExceptionHandler +import app.cleanmeter.core.common.reporting.ApplicationParams +import app.cleanmeter.core.common.reporting.setDefaultUncaughtExceptionHandler import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/ApplicationParams.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/ApplicationParams.kt similarity index 88% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/ApplicationParams.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/ApplicationParams.kt index c625df8..6b9234e 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/ApplicationParams.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/ApplicationParams.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.reporting +package app.cleanmeter.core.common.reporting object ApplicationParams { diff --git a/core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/LoggerUtils.kt b/core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/LoggerUtils.kt similarity index 91% rename from core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/LoggerUtils.kt rename to core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/LoggerUtils.kt index 710d480..fbf8044 100644 --- a/core/common/src/main/kotlin/br/com/firstsoft/core/common/reporting/LoggerUtils.kt +++ b/core/common/src/main/kotlin/app/cleanmeter/core/common/reporting/LoggerUtils.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.common.reporting +package app.cleanmeter.core.common.reporting import java.io.File diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/ProcessManager.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/ProcessManager.kt similarity index 60% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/ProcessManager.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/ProcessManager.kt index f7d0726..0b89f61 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/ProcessManager.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/ProcessManager.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.core.os +package app.cleanmeter.core.os -import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorProcessManager +import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorProcessManager object ProcessManager { diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt similarity index 95% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt index 90b74da..2772235 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorProcessManager.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.core.os.hardwaremonitor +package app.cleanmeter.core.os.hardwaremonitor -import br.com.firstsoft.core.os.util.isDev +import app.cleanmeter.core.os.util.isDev import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt similarity index 94% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorReader.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt index 056ac3e..24c3299 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hardwaremonitor/HardwareMonitorReader.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt @@ -1,8 +1,8 @@ -package br.com.firstsoft.core.os.hardwaremonitor +package app.cleanmeter.core.os.hardwaremonitor -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.core.os.util.getByteBuffer -import br.com.firstsoft.core.os.util.readString +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.core.os.util.getByteBuffer +import app.cleanmeter.core.os.util.readString import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoProcessManager.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoProcessManager.kt similarity index 95% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoProcessManager.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoProcessManager.kt index 6d5b4c3..89103d7 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoProcessManager.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoProcessManager.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.core.os.hwinfo +package app.cleanmeter.core.os.hwinfo -import br.com.firstsoft.core.os.resource.NativeResourceLoader +import app.cleanmeter.core.os.resource.NativeResourceLoader import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoReader.kt similarity index 91% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoReader.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoReader.kt index bef4722..9391650 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/hwinfo/HwInfoReader.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoReader.kt @@ -1,17 +1,17 @@ -package br.com.firstsoft.core.os.hwinfo +package app.cleanmeter.core.os.hwinfo -import br.com.firstsoft.core.common.hwinfo.HwInfoData -import br.com.firstsoft.core.common.hwinfo.SensorElement -import br.com.firstsoft.core.common.hwinfo.SensorReadingElement -import br.com.firstsoft.core.common.hwinfo.SensorReadingType -import br.com.firstsoft.core.common.hwinfo.SensorSharedMem +import app.cleanmeter.core.common.hwinfo.HwInfoData +import app.cleanmeter.core.common.hwinfo.SensorElement +import app.cleanmeter.core.common.hwinfo.SensorReadingElement +import app.cleanmeter.core.common.hwinfo.SensorReadingType +import app.cleanmeter.core.common.hwinfo.SensorSharedMem import com.sun.jna.Pointer import com.sun.jna.platform.win32.WinNT import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow -import br.com.firstsoft.core.os.util.getByteBuffer -import br.com.firstsoft.core.os.util.readString -import br.com.firstsoft.core.os.win32.WindowsService +import app.cleanmeter.core.os.util.getByteBuffer +import app.cleanmeter.core.os.util.readString +import app.cleanmeter.core.os.win32.WindowsService import java.nio.ByteBuffer import java.nio.ByteOrder import kotlin.coroutines.cancellation.CancellationException diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/mahm/MahmReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/mahm/MahmReader.kt similarity index 87% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/mahm/MahmReader.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/mahm/MahmReader.kt index c41f0b3..e499384 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/mahm/MahmReader.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/mahm/MahmReader.kt @@ -1,21 +1,21 @@ -package br.com.firstsoft.core.os.mahm - -import br.com.firstsoft.core.common.mahm.Data -import br.com.firstsoft.core.common.mahm.Entry -import br.com.firstsoft.core.common.mahm.EntryFlag -import br.com.firstsoft.core.common.mahm.GPUEntry -import br.com.firstsoft.core.common.mahm.Header -import br.com.firstsoft.core.common.mahm.SourceID +package app.cleanmeter.core.os.mahm + +import app.cleanmeter.core.common.mahm.Data +import app.cleanmeter.core.common.mahm.Entry +import app.cleanmeter.core.common.mahm.EntryFlag +import app.cleanmeter.core.common.mahm.GPUEntry +import app.cleanmeter.core.common.mahm.Header +import app.cleanmeter.core.common.mahm.SourceID import com.sun.jna.Pointer import com.sun.jna.platform.win32.WinNT import kotlinx.coroutines.CancellationException import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.flow.flow -import br.com.firstsoft.core.os.mahm.MAHMSizes.MAX_STRING_LENGTH -import br.com.firstsoft.core.os.util.getByteBuffer -import br.com.firstsoft.core.os.util.readString -import br.com.firstsoft.core.os.win32.WindowsService +import app.cleanmeter.core.os.mahm.MAHMSizes.MAX_STRING_LENGTH +import app.cleanmeter.core.os.util.getByteBuffer +import app.cleanmeter.core.os.util.readString +import app.cleanmeter.core.os.win32.WindowsService import java.nio.ByteBuffer import java.nio.ByteOrder import java.nio.charset.StandardCharsets diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/resource/NativeResourceLoader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/resource/NativeResourceLoader.kt similarity index 84% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/resource/NativeResourceLoader.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/resource/NativeResourceLoader.kt index bb479bf..8d88542 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/resource/NativeResourceLoader.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/resource/NativeResourceLoader.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.os.resource +package app.cleanmeter.core.os.resource object NativeResourceLoader { fun load(path: String): String { diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/util/MemoryUtils.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/util/MemoryUtils.kt similarity index 97% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/util/MemoryUtils.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/util/MemoryUtils.kt index a4a7cdd..9b50402 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/util/MemoryUtils.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/util/MemoryUtils.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.os.util +package app.cleanmeter.core.os.util import com.sun.jna.Pointer import java.io.InputStream diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/util/env.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/util/env.kt similarity index 53% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/util/env.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/util/env.kt index 300ab7c..f92ca5f 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/util/env.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/util/env.kt @@ -1,3 +1,3 @@ -package br.com.firstsoft.core.os.util +package app.cleanmeter.core.os.util fun isDev() = System.getenv("env") == "dev" \ No newline at end of file diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Kernel32Impl.java b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Kernel32Impl.java similarity index 90% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Kernel32Impl.java rename to core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Kernel32Impl.java index 68a86ca..c6b1b5d 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Kernel32Impl.java +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Kernel32Impl.java @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.os.win32; +package app.cleanmeter.core.os.win32; import com.sun.jna.Native; import com.sun.jna.win32.W32APIOptions; diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Shell32Impl.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Shell32Impl.kt similarity index 93% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Shell32Impl.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Shell32Impl.kt index bb625d9..15edf85 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/Shell32Impl.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Shell32Impl.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.core.os.win32 +package app.cleanmeter.core.os.win32 import com.sun.jna.Native import com.sun.jna.WString diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WinRegistry.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WinRegistry.kt similarity index 94% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WinRegistry.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WinRegistry.kt index a99f200..f60653c 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WinRegistry.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WinRegistry.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.core.os.win32 +package app.cleanmeter.core.os.win32 -import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorProcessManager +import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorProcessManager import java.io.BufferedReader import java.io.InputStreamReader import java.nio.file.Path diff --git a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WindowsService.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WindowsService.kt similarity index 97% rename from core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WindowsService.kt rename to core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WindowsService.kt index 4c57b03..53cf5ee 100644 --- a/core/native/src/main/kotlin/br/com/firstsoft/core/os/win32/WindowsService.kt +++ b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WindowsService.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.core.os.win32 +package app.cleanmeter.core.os.win32 -import br.com.firstsoft.core.os.util.isDev +import app.cleanmeter.core.os.util.isDev import com.sun.jna.Native import com.sun.jna.Pointer import com.sun.jna.platform.win32.Kernel32 diff --git a/core/updater/src/main/kotlin/br/com/firstsoft/updater/AutoUpdater.kt b/core/updater/src/main/kotlin/app/cleanmeter/updater/AutoUpdater.kt similarity index 96% rename from core/updater/src/main/kotlin/br/com/firstsoft/updater/AutoUpdater.kt rename to core/updater/src/main/kotlin/app/cleanmeter/updater/AutoUpdater.kt index 522a096..2940621 100644 --- a/core/updater/src/main/kotlin/br/com/firstsoft/updater/AutoUpdater.kt +++ b/core/updater/src/main/kotlin/app/cleanmeter/updater/AutoUpdater.kt @@ -1,7 +1,7 @@ -package br.com.firstsoft.updater +package app.cleanmeter.updater -import br.com.firstsoft.core.common.reporting.ApplicationParams -import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorProcessManager +import app.cleanmeter.core.common.reporting.ApplicationParams +import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorProcessManager import io.github.z4kn4fein.semver.Version import io.github.z4kn4fein.semver.toVersion import io.ktor.client.HttpClient diff --git a/settings.gradle.kts b/settings.gradle.kts index d868134..5691ce8 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -39,7 +39,6 @@ rootProject.name = "CleanMeter" include( "core:common", "core:native", - "target:server" + "core:updater", + "target:desktop" ) -include("core:updater") -findProject(":core:updater")?.name = "updater" diff --git a/target/server/build.gradle.kts b/target/desktop/build.gradle.kts similarity index 97% rename from target/server/build.gradle.kts rename to target/desktop/build.gradle.kts index 096c2eb..4c4db57 100644 --- a/target/server/build.gradle.kts +++ b/target/desktop/build.gradle.kts @@ -64,7 +64,7 @@ compose.desktop { } } - mainClass = "br.com.firstsoft.target.server.ServerMainKt" + mainClass = "app.cleanmeter.target.server.ServerMainKt" buildTypes.release.proguard { version.set("7.5.0") diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ApplicationViewModelStoreOwner.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ApplicationViewModelStoreOwner.kt similarity index 87% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ApplicationViewModelStoreOwner.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ApplicationViewModelStoreOwner.kt index a88428c..53c5a28 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ApplicationViewModelStoreOwner.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ApplicationViewModelStoreOwner.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server +package app.cleanmeter.target.desktop import androidx.lifecycle.ViewModelStore import androidx.lifecycle.ViewModelStoreOwner diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ComposeApp.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ComposeApp.kt similarity index 80% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ComposeApp.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ComposeApp.kt index ada45a3..332d0f2 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ComposeApp.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ComposeApp.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server +package app.cleanmeter.target.desktop import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue @@ -8,10 +8,10 @@ import androidx.compose.runtime.setValue import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.window.application import androidx.lifecycle.viewmodel.compose.viewModel -import br.com.firstsoft.core.common.reporting.ApplicationParams -import br.com.firstsoft.core.os.ProcessManager -import br.com.firstsoft.target.server.ui.overlay.OverlayWindow -import br.com.firstsoft.target.server.ui.settings.SettingsWindow +import app.cleanmeter.core.common.reporting.ApplicationParams +import app.cleanmeter.core.os.ProcessManager +import app.cleanmeter.target.desktop.ui.overlay.OverlayWindow +import app.cleanmeter.target.desktop.ui.settings.SettingsWindow fun composeApp() = application { val viewModel: MainViewModel = viewModel(ApplicationViewModelStoreOwner) diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/KeyboardHook.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/KeyboardHook.kt similarity index 97% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/KeyboardHook.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/KeyboardHook.kt index 59a3da2..f0e71fe 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/KeyboardHook.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/KeyboardHook.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server +package app.cleanmeter.target.desktop import com.github.kwhat.jnativehook.GlobalScreen import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/MainViewModel.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/MainViewModel.kt similarity index 84% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/MainViewModel.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/MainViewModel.kt index 4de57dd..556fc65 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/MainViewModel.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/MainViewModel.kt @@ -1,8 +1,8 @@ -package br.com.firstsoft.target.server +package app.cleanmeter.target.desktop import androidx.lifecycle.ViewModel -import br.com.firstsoft.target.server.data.OverlaySettingsRepository -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.target.desktop.data.OverlaySettingsRepository +import app.cleanmeter.target.desktop.model.OverlaySettings import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ServerMain.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ServerMain.kt similarity index 57% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ServerMain.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ServerMain.kt index 61e2a54..33c7d96 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ServerMain.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ServerMain.kt @@ -1,10 +1,10 @@ -package br.com.firstsoft.target.server +package app.cleanmeter.target.desktop -import br.com.firstsoft.core.common.process.singleInstance -import br.com.firstsoft.core.common.reporting.ApplicationParams -import br.com.firstsoft.core.os.ProcessManager -import br.com.firstsoft.core.os.util.isDev -import br.com.firstsoft.core.os.win32.WindowsService +import app.cleanmeter.core.common.process.singleInstance +import app.cleanmeter.core.common.reporting.ApplicationParams +import app.cleanmeter.core.os.ProcessManager +import app.cleanmeter.core.os.util.isDev +import app.cleanmeter.core.os.win32.WindowsService fun main(vararg args: String) = singleInstance(args) { diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/ObserveHardwareReadings.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/ObserveHardwareReadings.kt new file mode 100644 index 0000000..7f5cbdf --- /dev/null +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/ObserveHardwareReadings.kt @@ -0,0 +1,7 @@ +package app.cleanmeter.target.desktop.data + +import app.cleanmeter.core.os.hardwaremonitor.HardwareMonitorReader + +object ObserveHardwareReadings { + val data = HardwareMonitorReader.currentData +} \ No newline at end of file diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/OverlaySettingsRepository.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/OverlaySettingsRepository.kt similarity index 87% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/data/OverlaySettingsRepository.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/OverlaySettingsRepository.kt index eb70af0..25adcd8 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/OverlaySettingsRepository.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/OverlaySettingsRepository.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.target.server.data +package app.cleanmeter.target.desktop.data -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.target.desktop.model.OverlaySettings import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.filterNotNull diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/PreferencesRepository.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/PreferencesRepository.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/data/PreferencesRepository.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/PreferencesRepository.kt index 4ab1535..ff7f9e4 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/PreferencesRepository.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/data/PreferencesRepository.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.target.server.data +package app.cleanmeter.target.desktop.data -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.target.desktop.model.OverlaySettings import kotlinx.serialization.decodeFromString import kotlinx.serialization.json.Json import java.util.prefs.Preferences diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/model/OverlaySettings.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/model/OverlaySettings.kt similarity index 96% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/model/OverlaySettings.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/model/OverlaySettings.kt index a803e45..a36c647 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/model/OverlaySettings.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/model/OverlaySettings.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.target.server.model +package app.cleanmeter.target.desktop.model -import br.com.firstsoft.target.server.ui.settings.SensorType +import app.cleanmeter.target.desktop.ui.settings.SensorType import kotlinx.serialization.Serializable @Serializable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/AppTheme.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/AppTheme.kt similarity index 97% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/AppTheme.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/AppTheme.kt index 3fecf81..e0ebb61 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/AppTheme.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/AppTheme.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui +package app.cleanmeter.target.desktop.ui import androidx.compose.material.MaterialTheme import androidx.compose.material.Typography diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/ColorTokens.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/ColorTokens.kt similarity index 94% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/ColorTokens.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/ColorTokens.kt index fafaf00..98d5e3a 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/ColorTokens.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/ColorTokens.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui +package app.cleanmeter.target.desktop.ui import androidx.compose.ui.graphics.Color diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CheckboxSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CheckboxSection.kt similarity index 94% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CheckboxSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CheckboxSection.kt index 508f19b..735c6da 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CheckboxSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CheckboxSection.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -19,8 +19,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray -import br.com.firstsoft.target.server.ui.settings.CheckboxSectionOption +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.settings.CheckboxSectionOption @Composable fun CheckboxSection( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CheckboxWithLabel.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CheckboxWithLabel.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CheckboxWithLabel.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CheckboxWithLabel.kt index c087faf..f552bdc 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CheckboxWithLabel.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CheckboxWithLabel.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row @@ -12,7 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray @Composable fun CheckboxWithLabel( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CollapsibleSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CollapsibleSection.kt similarity index 96% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CollapsibleSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CollapsibleSection.kt index 0ba5f16..414e8fa 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CollapsibleSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CollapsibleSection.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -30,7 +30,7 @@ import androidx.compose.ui.semantics.clearAndSetSemantics import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @Composable fun CollapsibleSection( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CustomReadingProgress.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CustomReadingProgress.kt similarity index 67% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CustomReadingProgress.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CustomReadingProgress.kt index 5238eb8..0492acb 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/CustomReadingProgress.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/CustomReadingProgress.kt @@ -1,9 +1,9 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.runtime.Composable -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.core.common.hardwaremonitor.getReading -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.core.common.hardwaremonitor.getReading +import app.cleanmeter.target.desktop.model.OverlaySettings @Composable internal fun CustomReadingProgress( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/DropdownMenu.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/DropdownMenu.kt similarity index 83% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/DropdownMenu.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/DropdownMenu.kt index aa99f5b..9fdc1c5 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/DropdownMenu.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/DropdownMenu.kt @@ -1,14 +1,7 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components -import androidx.compose.foundation.background import androidx.compose.foundation.border -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.DropdownMenuItem import androidx.compose.material.ExperimentalMaterialApi @@ -25,7 +18,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.rotate import androidx.compose.ui.graphics.Color @@ -34,11 +26,8 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.BarelyVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/DropdownSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/DropdownSection.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/DropdownSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/DropdownSection.kt index a679935..2aa77c0 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/DropdownSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/DropdownSection.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -15,7 +15,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @Composable fun DropdownSection( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/KeyboardShortcutInfoLabel.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/KeyboardShortcutInfoLabel.kt similarity index 93% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/KeyboardShortcutInfoLabel.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/KeyboardShortcutInfoLabel.kt index 18f1513..57aef83 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/KeyboardShortcutInfoLabel.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/KeyboardShortcutInfoLabel.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -18,7 +18,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.BorderGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BorderGray @Composable internal fun KeyboardShortcutInfoLabel() { diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Label.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Label.kt similarity index 87% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Label.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Label.kt index e8de8a7..b53fcdd 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Label.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Label.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.material.MaterialTheme import androidx.compose.material.Text diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Pill.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Pill.kt similarity index 91% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Pill.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Pill.kt index b24fff4..86a676b 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Pill.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Pill.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -18,8 +18,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.OffWhite -import br.com.firstsoft.target.server.ui.overlay.conditional +import app.cleanmeter.target.desktop.ui.ColorTokens.OffWhite +import app.cleanmeter.target.desktop.ui.overlay.conditional @Composable fun Pill( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Progress.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Progress.kt similarity index 91% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Progress.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Progress.kt index f028877..81714f2 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Progress.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Progress.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.desktop.ui.tooling.preview.Preview import androidx.compose.foundation.background @@ -19,11 +19,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.ui.ColorTokens.ClearGray -import br.com.firstsoft.target.server.ui.ColorTokens.Green -import br.com.firstsoft.target.server.ui.ColorTokens.Red -import br.com.firstsoft.target.server.ui.ColorTokens.Yellow -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.ColorTokens.ClearGray +import app.cleanmeter.target.desktop.ui.ColorTokens.Green +import app.cleanmeter.target.desktop.ui.ColorTokens.Red +import app.cleanmeter.target.desktop.ui.ColorTokens.Yellow +import app.cleanmeter.target.desktop.model.OverlaySettings import kotlin.math.abs @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/ProgressUnit.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ProgressUnit.kt similarity index 93% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/ProgressUnit.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ProgressUnit.kt index 9513df8..a08dba0 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/ProgressUnit.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ProgressUnit.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.layout.padding import androidx.compose.material.Text diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Section.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Section.kt similarity index 86% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Section.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Section.kt index 1e8766f..cb6daf1 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Section.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Section.kt @@ -1,14 +1,12 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.RowScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material.Switch import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -17,8 +15,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray -import br.com.firstsoft.target.server.ui.settings.CheckboxSectionOption +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @Composable fun Section( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SensorReadingDropdownMenu.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SensorReadingDropdownMenu.kt similarity index 95% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SensorReadingDropdownMenu.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SensorReadingDropdownMenu.kt index f697a25..a7faf7c 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SensorReadingDropdownMenu.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SensorReadingDropdownMenu.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -52,14 +52,14 @@ import androidx.compose.ui.unit.sp import androidx.compose.ui.window.Popup import androidx.compose.ui.window.PopupPositionProvider import androidx.compose.ui.window.PopupProperties -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.BarelyVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.Gray200 -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray -import br.com.firstsoft.target.server.ui.overlay.conditional +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BarelyVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.Gray200 +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.overlay.conditional @OptIn(ExperimentalMaterialApi::class) @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SettingsTab.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SettingsTab.kt similarity index 89% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SettingsTab.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SettingsTab.kt index 0309d8d..1b71869 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SettingsTab.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SettingsTab.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -21,9 +21,9 @@ import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.BarelyVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BarelyVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @Composable internal fun SettingsTab( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SliderElements.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SliderElements.kt similarity index 96% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SliderElements.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SliderElements.kt index 3538f9b..0b5909a 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/SliderElements.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SliderElements.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -20,7 +20,7 @@ import androidx.compose.ui.graphics.StrokeCap import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray @Composable fun SliderThumb() { diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/StyleCard.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/StyleCard.kt similarity index 87% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/StyleCard.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/StyleCard.kt index 01df1b1..9064312 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/StyleCard.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/StyleCard.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -18,10 +18,10 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.BarelyVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.overlay.conditional +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BarelyVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.overlay.conditional @Composable internal fun StyleCard( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Title.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Title.kt similarity index 90% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Title.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Title.kt index 4d6b1f7..3accb9a 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Title.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Title.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.layout.padding import androidx.compose.material.Text diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Toggle.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Toggle.kt similarity index 83% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Toggle.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Toggle.kt index 010cdef..b2e31a2 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/Toggle.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Toggle.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.layout.height import androidx.compose.material3.Switch @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.scale import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.Green -import br.com.firstsoft.target.server.ui.overlay.conditional +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.Green +import app.cleanmeter.target.desktop.ui.overlay.conditional @Composable fun Toggle( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/ToggleSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ToggleSection.kt similarity index 93% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/ToggleSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ToggleSection.kt index aeff46e..5115fd2 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/ToggleSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ToggleSection.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @Composable fun ToggleSection( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/TopBar.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/TopBar.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/TopBar.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/TopBar.kt index fb053f8..e323ad3 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/TopBar.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/TopBar.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image @@ -24,9 +24,9 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.BarelyVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BarelyVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray @OptIn(ExperimentalFoundationApi::class) @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/UpdateToast.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/UpdateToast.kt similarity index 93% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/UpdateToast.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/UpdateToast.kt index 0273b99..72bbd87 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/components/UpdateToast.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/UpdateToast.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.components +package app.cleanmeter.target.desktop.ui.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -39,14 +39,14 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.AppTheme -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostDarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.ClearGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.Green -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.updater.AutoUpdater -import br.com.firstsoft.updater.UpdateState +import app.cleanmeter.target.desktop.ui.AppTheme +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostDarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.ClearGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.Green +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray +import app.cleanmeter.updater.AutoUpdater +import app.cleanmeter.updater.UpdateState import kotlinx.coroutines.delay @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/Overlay.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/Overlay.kt similarity index 86% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/Overlay.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/Overlay.kt index a3ca780..79e14a2 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/Overlay.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/Overlay.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.overlay +package app.cleanmeter.target.desktop.ui.overlay import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize @@ -6,9 +6,9 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.AppTheme +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.AppTheme @Composable fun Overlay( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayUi.kt similarity index 89% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayUi.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayUi.kt index 673b517..885c716 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayUi.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayUi.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.overlay +package app.cleanmeter.target.desktop.ui.overlay import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -21,13 +21,13 @@ import androidx.compose.ui.layout.MeasureResult import androidx.compose.ui.layout.MeasureScope import androidx.compose.ui.unit.Constraints import androidx.compose.ui.unit.dp -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.overlay.sections.CpuSection -import br.com.firstsoft.target.server.ui.overlay.sections.FpsSection -import br.com.firstsoft.target.server.ui.overlay.sections.GpuSection -import br.com.firstsoft.target.server.ui.overlay.sections.NetSection -import br.com.firstsoft.target.server.ui.overlay.sections.RamSection +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.overlay.sections.CpuSection +import app.cleanmeter.target.desktop.ui.overlay.sections.FpsSection +import app.cleanmeter.target.desktop.ui.overlay.sections.GpuSection +import app.cleanmeter.target.desktop.ui.overlay.sections.NetSection +import app.cleanmeter.target.desktop.ui.overlay.sections.RamSection inline fun Modifier.conditional( predicate: Boolean, diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayViewModel.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayViewModel.kt similarity index 75% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayViewModel.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayViewModel.kt index b2eacfd..6943c86 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayViewModel.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayViewModel.kt @@ -1,12 +1,10 @@ -package br.com.firstsoft.target.server.ui.overlay +package app.cleanmeter.target.desktop.ui.overlay import androidx.lifecycle.ViewModel -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.core.common.hwinfo.HwInfoData -import br.com.firstsoft.core.os.hwinfo.HwInfoReader -import br.com.firstsoft.target.server.data.ObserveHardwareReadings -import br.com.firstsoft.target.server.data.OverlaySettingsRepository -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.data.ObserveHardwareReadings +import app.cleanmeter.target.desktop.data.OverlaySettingsRepository +import app.cleanmeter.target.desktop.model.OverlaySettings import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayWindow.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayWindow.kt similarity index 95% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayWindow.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayWindow.kt index 67b049a..62d5a7a 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/OverlayWindow.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayWindow.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.overlay +package app.cleanmeter.target.desktop.ui.overlay import androidx.compose.foundation.window.WindowDraggableArea import androidx.compose.runtime.Composable @@ -19,10 +19,10 @@ import androidx.compose.ui.window.WindowPlacement import androidx.compose.ui.window.WindowPosition import androidx.compose.ui.window.rememberWindowState import androidx.lifecycle.viewmodel.compose.viewModel -import br.com.firstsoft.core.os.win32.WindowsService -import br.com.firstsoft.target.server.ApplicationViewModelStoreOwner -import br.com.firstsoft.target.server.KeyboardEvent -import br.com.firstsoft.target.server.KeyboardManager +import app.cleanmeter.core.os.win32.WindowsService +import app.cleanmeter.target.desktop.ApplicationViewModelStoreOwner +import app.cleanmeter.target.desktop.KeyboardEvent +import app.cleanmeter.target.desktop.KeyboardManager import kotlinx.coroutines.flow.collectLatest import java.awt.GraphicsEnvironment import java.awt.Toolkit diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/CpuSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/CpuSection.kt similarity index 79% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/CpuSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/CpuSection.kt index cf35837..0dab853 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/CpuSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/CpuSection.kt @@ -1,10 +1,10 @@ -package br.com.firstsoft.target.server.ui.overlay.sections +package app.cleanmeter.target.desktop.ui.overlay.sections import androidx.compose.runtime.Composable -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.components.CustomReadingProgress -import br.com.firstsoft.target.server.ui.components.Pill +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.components.CustomReadingProgress +import app.cleanmeter.target.desktop.ui.components.Pill import java.util.* @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/FpsSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/FpsSection.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/FpsSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/FpsSection.kt index 783a076..989e7c6 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/FpsSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/FpsSection.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.overlay.sections +package app.cleanmeter.target.desktop.ui.overlay.sections import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -28,13 +28,13 @@ import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.core.common.hardwaremonitor.FPS -import br.com.firstsoft.core.common.hardwaremonitor.Frametime -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.ColorTokens.OffWhite -import br.com.firstsoft.target.server.ui.components.Pill -import br.com.firstsoft.target.server.ui.overlay.conditional +import app.cleanmeter.core.common.hardwaremonitor.FPS +import app.cleanmeter.core.common.hardwaremonitor.Frametime +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.ColorTokens.OffWhite +import app.cleanmeter.target.desktop.ui.components.Pill +import app.cleanmeter.target.desktop.ui.overlay.conditional import java.util.* @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/GpuSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/GpuSection.kt similarity index 81% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/GpuSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/GpuSection.kt index 4a27fa6..6dbff7e 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/GpuSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/GpuSection.kt @@ -1,12 +1,12 @@ -package br.com.firstsoft.target.server.ui.overlay.sections +package app.cleanmeter.target.desktop.ui.overlay.sections import androidx.compose.runtime.Composable -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.core.common.hardwaremonitor.getReading -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.components.CustomReadingProgress -import br.com.firstsoft.target.server.ui.components.Pill -import br.com.firstsoft.target.server.ui.components.Progress +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.core.common.hardwaremonitor.getReading +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.components.CustomReadingProgress +import app.cleanmeter.target.desktop.ui.components.Pill +import app.cleanmeter.target.desktop.ui.components.Progress import java.util.* @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/NetSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/NetSection.kt similarity index 93% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/NetSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/NetSection.kt index e6e7497..57fecb1 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/NetSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/NetSection.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.overlay.sections +package app.cleanmeter.target.desktop.ui.overlay.sections import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width -import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.Icon import androidx.compose.material.Text @@ -33,14 +32,14 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.core.common.hardwaremonitor.getReading -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.ColorTokens.Cyan -import br.com.firstsoft.target.server.ui.ColorTokens.OffWhite -import br.com.firstsoft.target.server.ui.ColorTokens.Purple -import br.com.firstsoft.target.server.ui.components.Pill -import br.com.firstsoft.target.server.ui.overlay.conditional +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.core.common.hardwaremonitor.getReading +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.ColorTokens.Cyan +import app.cleanmeter.target.desktop.ui.ColorTokens.OffWhite +import app.cleanmeter.target.desktop.ui.ColorTokens.Purple +import app.cleanmeter.target.desktop.ui.components.Pill +import app.cleanmeter.target.desktop.ui.overlay.conditional @Composable internal fun NetSection(overlaySettings: OverlaySettings, data: HardwareMonitorData) { diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/RamSection.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/RamSection.kt similarity index 57% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/RamSection.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/RamSection.kt index b6221d1..835f7a5 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/RamSection.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/RamSection.kt @@ -1,12 +1,12 @@ -package br.com.firstsoft.target.server.ui.overlay.sections +package app.cleanmeter.target.desktop.ui.overlay.sections import androidx.compose.runtime.Composable -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.core.common.hardwaremonitor.RamUsage -import br.com.firstsoft.core.common.hardwaremonitor.RamUsagePercent -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.components.Pill -import br.com.firstsoft.target.server.ui.components.Progress +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.core.common.hardwaremonitor.RamUsage +import app.cleanmeter.core.common.hardwaremonitor.RamUsagePercent +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.components.Pill +import app.cleanmeter.target.desktop.ui.components.Progress import java.util.* @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/drawLine.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/drawLine.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/drawLine.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/drawLine.kt index 0dbe324..87a5226 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/overlay/sections/drawLine.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/sections/drawLine.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.overlay.sections +package app.cleanmeter.target.desktop.ui.overlay.sections import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Canvas diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/CheckboxSectionOption.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/CheckboxSectionOption.kt similarity index 80% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/CheckboxSectionOption.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/CheckboxSectionOption.kt index 15b16c9..2fba66e 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/CheckboxSectionOption.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/CheckboxSectionOption.kt @@ -1,6 +1,6 @@ -package br.com.firstsoft.target.server.ui.settings +package app.cleanmeter.target.desktop.ui.settings -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData data class CheckboxSectionOption( val isSelected: Boolean, diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/Footer.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Footer.kt similarity index 97% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/Footer.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Footer.kt index 7ee461a..6aa9733 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/Footer.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Footer.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings +package app.cleanmeter.target.desktop.ui.settings import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -35,8 +35,8 @@ import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.BorderGray -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BorderGray +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray @Composable fun FooterUi(modifier: Modifier = Modifier) { diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/Settings.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Settings.kt similarity index 86% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/Settings.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Settings.kt index c7f8ec7..1b5a54f 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/Settings.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/Settings.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings +package app.cleanmeter.target.desktop.ui.settings import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box @@ -24,21 +24,21 @@ import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.window.WindowScope import androidx.lifecycle.viewmodel.compose.viewModel -import br.com.firstsoft.core.common.hardwaremonitor.cpuReadings -import br.com.firstsoft.core.common.hardwaremonitor.gpuReadings -import br.com.firstsoft.core.common.hardwaremonitor.networkReadings -import br.com.firstsoft.target.server.ui.AppTheme -import br.com.firstsoft.target.server.ui.ColorTokens.BackgroundOffWhite -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.components.SettingsTab -import br.com.firstsoft.target.server.ui.components.TopBar -import br.com.firstsoft.target.server.ui.components.UpdateToast -import br.com.firstsoft.target.server.ui.settings.tabs.AppSettingsUi -import br.com.firstsoft.target.server.ui.settings.tabs.HelpSettingsUi -import br.com.firstsoft.target.server.ui.settings.tabs.OverlaySettingsUi -import br.com.firstsoft.target.server.ui.settings.tabs.style.StyleUi -import br.com.firstsoft.updater.AutoUpdater -import br.com.firstsoft.updater.UpdateState +import app.cleanmeter.core.common.hardwaremonitor.cpuReadings +import app.cleanmeter.core.common.hardwaremonitor.gpuReadings +import app.cleanmeter.core.common.hardwaremonitor.networkReadings +import app.cleanmeter.target.desktop.ui.AppTheme +import app.cleanmeter.target.desktop.ui.ColorTokens.BackgroundOffWhite +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.components.SettingsTab +import app.cleanmeter.target.desktop.ui.components.TopBar +import app.cleanmeter.target.desktop.ui.components.UpdateToast +import app.cleanmeter.target.desktop.ui.settings.tabs.AppSettingsUi +import app.cleanmeter.target.desktop.ui.settings.tabs.HelpSettingsUi +import app.cleanmeter.target.desktop.ui.settings.tabs.OverlaySettingsUi +import app.cleanmeter.target.desktop.ui.settings.tabs.style.StyleUi +import app.cleanmeter.updater.AutoUpdater +import app.cleanmeter.updater.UpdateState @Composable fun WindowScope.Settings( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/SettingsViewModel.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/SettingsViewModel.kt similarity index 97% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/SettingsViewModel.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/SettingsViewModel.kt index 9902129..cb17b89 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/SettingsViewModel.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/SettingsViewModel.kt @@ -1,11 +1,11 @@ -package br.com.firstsoft.target.server.ui.settings +package app.cleanmeter.target.desktop.ui.settings import androidx.compose.ui.unit.IntOffset import androidx.lifecycle.ViewModel -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.data.ObserveHardwareReadings -import br.com.firstsoft.target.server.data.OverlaySettingsRepository -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.data.ObserveHardwareReadings +import app.cleanmeter.target.desktop.data.OverlaySettingsRepository +import app.cleanmeter.target.desktop.model.OverlaySettings import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/SettingsWindow.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/SettingsWindow.kt similarity index 89% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/SettingsWindow.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/SettingsWindow.kt index 2acec70..451de85 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/SettingsWindow.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/SettingsWindow.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings +package app.cleanmeter.target.desktop.ui.settings import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -13,9 +13,8 @@ import androidx.compose.ui.window.ApplicationScope import androidx.compose.ui.window.Tray import androidx.compose.ui.window.Window import androidx.compose.ui.window.rememberWindowState -import br.com.firstsoft.target.server.data.PREFERENCE_START_MINIMIZED -import br.com.firstsoft.target.server.data.PreferencesRepository -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.target.desktop.data.PREFERENCE_START_MINIMIZED +import app.cleanmeter.target.desktop.data.PreferencesRepository import com.github.kwhat.jnativehook.GlobalScreen @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/AppSettingsUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/AppSettingsUi.kt similarity index 84% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/AppSettingsUi.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/AppSettingsUi.kt index 2910999..f1f89ef 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/AppSettingsUi.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/AppSettingsUi.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs +package app.cleanmeter.target.desktop.ui.settings.tabs import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.TooltipArea @@ -20,13 +20,13 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import br.com.firstsoft.target.server.data.PREFERENCE_START_MINIMIZED -import br.com.firstsoft.target.server.data.PreferencesRepository -import br.com.firstsoft.target.server.ui.components.CheckboxWithLabel -import br.com.firstsoft.target.server.ui.components.Label -import br.com.firstsoft.target.server.ui.components.Section -import br.com.firstsoft.target.server.ui.settings.FooterUi -import br.com.firstsoft.core.os.win32.WinRegistry +import app.cleanmeter.target.desktop.data.PREFERENCE_START_MINIMIZED +import app.cleanmeter.target.desktop.data.PreferencesRepository +import app.cleanmeter.target.desktop.ui.components.CheckboxWithLabel +import app.cleanmeter.target.desktop.ui.components.Label +import app.cleanmeter.target.desktop.ui.components.Section +import app.cleanmeter.target.desktop.ui.settings.FooterUi +import app.cleanmeter.core.os.win32.WinRegistry @Composable fun AppSettingsUi() = Box(modifier = Modifier.fillMaxSize().padding(top = 20.dp)) { diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/HelpSettingsUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/HelpSettingsUi.kt similarity index 96% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/HelpSettingsUi.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/HelpSettingsUi.kt index fc00d2f..92ce2ba 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/HelpSettingsUi.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/HelpSettingsUi.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs +package app.cleanmeter.target.desktop.ui.settings.tabs import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -31,9 +31,9 @@ import androidx.compose.ui.text.style.TextIndent import androidx.compose.ui.text.withStyle import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.target.server.ui.components.CollapsibleSection +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray +import app.cleanmeter.target.desktop.ui.components.CollapsibleSection @Composable internal fun HelpSettingsUi() { diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/OverlaySettingsUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/OverlaySettingsUi.kt similarity index 93% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/OverlaySettingsUi.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/OverlaySettingsUi.kt index dc565f1..64881f9 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/OverlaySettingsUi.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/OverlaySettingsUi.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs +package app.cleanmeter.target.desktop.ui.settings.tabs import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -15,18 +15,18 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.core.common.hardwaremonitor.HardwareMonitorData -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.target.server.ui.components.CheckboxSection -import br.com.firstsoft.target.server.ui.components.CheckboxWithLabel -import br.com.firstsoft.target.server.ui.components.CustomBodyCheckboxSection -import br.com.firstsoft.target.server.ui.components.DropdownSection -import br.com.firstsoft.target.server.ui.components.KeyboardShortcutInfoLabel -import br.com.firstsoft.target.server.ui.components.SensorReadingDropdownMenu -import br.com.firstsoft.target.server.ui.settings.CheckboxSectionOption -import br.com.firstsoft.target.server.ui.settings.SectionType -import br.com.firstsoft.target.server.ui.settings.SensorType +import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray +import app.cleanmeter.target.desktop.ui.components.CheckboxSection +import app.cleanmeter.target.desktop.ui.components.CheckboxWithLabel +import app.cleanmeter.target.desktop.ui.components.CustomBodyCheckboxSection +import app.cleanmeter.target.desktop.ui.components.DropdownSection +import app.cleanmeter.target.desktop.ui.components.KeyboardShortcutInfoLabel +import app.cleanmeter.target.desktop.ui.components.SensorReadingDropdownMenu +import app.cleanmeter.target.desktop.ui.settings.CheckboxSectionOption +import app.cleanmeter.target.desktop.ui.settings.SectionType +import app.cleanmeter.target.desktop.ui.settings.SensorType import java.awt.GraphicsEnvironment private fun List.filterOptions(vararg optionType: SensorType) = diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/GraphType.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/GraphType.kt similarity index 88% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/GraphType.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/GraphType.kt index affc62f..8208cae 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/GraphType.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/GraphType.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs.style +package app.cleanmeter.target.desktop.ui.settings.tabs.style import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -8,9 +8,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.components.StyleCard -import br.com.firstsoft.target.server.ui.components.ToggleSection +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.components.StyleCard +import app.cleanmeter.target.desktop.ui.components.ToggleSection @Composable internal fun GraphType( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Opacity.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Opacity.kt similarity index 77% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Opacity.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Opacity.kt index 6e89a17..555a102 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Opacity.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Opacity.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs.style +package app.cleanmeter.target.desktop.ui.settings.tabs.style import androidx.compose.foundation.Canvas import androidx.compose.foundation.layout.Arrangement @@ -14,15 +14,15 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.BackgroundOffWhite -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.target.server.ui.components.CollapsibleSection -import br.com.firstsoft.target.server.ui.components.SliderThumb -import br.com.firstsoft.target.server.ui.components.coercedValueAsFraction -import br.com.firstsoft.target.server.ui.components.drawTrack +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BackgroundOffWhite +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray +import app.cleanmeter.target.desktop.ui.components.CollapsibleSection +import app.cleanmeter.target.desktop.ui.components.SliderThumb +import app.cleanmeter.target.desktop.ui.components.coercedValueAsFraction +import app.cleanmeter.target.desktop.ui.components.drawTrack @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Orientation.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Orientation.kt similarity index 86% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Orientation.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Orientation.kt index 1128c35..6b848df 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Orientation.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Orientation.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs.style +package app.cleanmeter.target.desktop.ui.settings.tabs.style import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Arrangement @@ -8,9 +8,9 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.components.CollapsibleSection -import br.com.firstsoft.target.server.ui.components.StyleCard +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.components.CollapsibleSection +import app.cleanmeter.target.desktop.ui.components.StyleCard @Composable internal fun Orientation( diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Position.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Position.kt similarity index 94% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Position.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Position.kt index dec1b34..99b499d 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/Position.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Position.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs.style +package app.cleanmeter.target.desktop.ui.settings.tabs.style import androidx.compose.foundation.background import androidx.compose.foundation.border @@ -26,15 +26,15 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import br.com.firstsoft.target.server.model.OverlaySettings -import br.com.firstsoft.target.server.ui.ColorTokens.AlmostVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.BarelyVisibleGray -import br.com.firstsoft.target.server.ui.ColorTokens.DarkGray -import br.com.firstsoft.target.server.ui.ColorTokens.LabelGray -import br.com.firstsoft.target.server.ui.ColorTokens.MutedGray -import br.com.firstsoft.target.server.ui.components.CollapsibleSection -import br.com.firstsoft.target.server.ui.components.StyleCard -import br.com.firstsoft.target.server.ui.components.Toggle +import app.cleanmeter.target.desktop.model.OverlaySettings +import app.cleanmeter.target.desktop.ui.ColorTokens.AlmostVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.BarelyVisibleGray +import app.cleanmeter.target.desktop.ui.ColorTokens.DarkGray +import app.cleanmeter.target.desktop.ui.ColorTokens.LabelGray +import app.cleanmeter.target.desktop.ui.ColorTokens.MutedGray +import app.cleanmeter.target.desktop.ui.components.CollapsibleSection +import app.cleanmeter.target.desktop.ui.components.StyleCard +import app.cleanmeter.target.desktop.ui.components.Toggle @OptIn(ExperimentalLayoutApi::class) @Composable diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/StyleUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/StyleUi.kt similarity index 92% rename from target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/StyleUi.kt rename to target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/StyleUi.kt index 299ee51..10bebeb 100644 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/ui/settings/tabs/style/StyleUi.kt +++ b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/StyleUi.kt @@ -1,4 +1,4 @@ -package br.com.firstsoft.target.server.ui.settings.tabs.style +package app.cleanmeter.target.desktop.ui.settings.tabs.style import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -9,7 +9,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp -import br.com.firstsoft.target.server.model.OverlaySettings +import app.cleanmeter.target.desktop.model.OverlaySettings @Composable fun StyleUi( diff --git a/target/server/src/main/resources/font/inter_black.ttf b/target/desktop/src/main/resources/font/inter_black.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_black.ttf rename to target/desktop/src/main/resources/font/inter_black.ttf diff --git a/target/server/src/main/resources/font/inter_bold.ttf b/target/desktop/src/main/resources/font/inter_bold.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_bold.ttf rename to target/desktop/src/main/resources/font/inter_bold.ttf diff --git a/target/server/src/main/resources/font/inter_extrabold.ttf b/target/desktop/src/main/resources/font/inter_extrabold.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_extrabold.ttf rename to target/desktop/src/main/resources/font/inter_extrabold.ttf diff --git a/target/server/src/main/resources/font/inter_extralight.ttf b/target/desktop/src/main/resources/font/inter_extralight.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_extralight.ttf rename to target/desktop/src/main/resources/font/inter_extralight.ttf diff --git a/target/server/src/main/resources/font/inter_light.ttf b/target/desktop/src/main/resources/font/inter_light.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_light.ttf rename to target/desktop/src/main/resources/font/inter_light.ttf diff --git a/target/server/src/main/resources/font/inter_medium.ttf b/target/desktop/src/main/resources/font/inter_medium.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_medium.ttf rename to target/desktop/src/main/resources/font/inter_medium.ttf diff --git a/target/server/src/main/resources/font/inter_regular.ttf b/target/desktop/src/main/resources/font/inter_regular.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_regular.ttf rename to target/desktop/src/main/resources/font/inter_regular.ttf diff --git a/target/server/src/main/resources/font/inter_semibold.ttf b/target/desktop/src/main/resources/font/inter_semibold.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_semibold.ttf rename to target/desktop/src/main/resources/font/inter_semibold.ttf diff --git a/target/server/src/main/resources/font/inter_thin.ttf b/target/desktop/src/main/resources/font/inter_thin.ttf similarity index 100% rename from target/server/src/main/resources/font/inter_thin.ttf rename to target/desktop/src/main/resources/font/inter_thin.ttf diff --git a/target/server/src/main/resources/icons/arrow_down.svg b/target/desktop/src/main/resources/icons/arrow_down.svg similarity index 100% rename from target/server/src/main/resources/icons/arrow_down.svg rename to target/desktop/src/main/resources/icons/arrow_down.svg diff --git a/target/server/src/main/resources/icons/bars.png b/target/desktop/src/main/resources/icons/bars.png similarity index 100% rename from target/server/src/main/resources/icons/bars.png rename to target/desktop/src/main/resources/icons/bars.png diff --git a/target/server/src/main/resources/icons/cloud_download.svg b/target/desktop/src/main/resources/icons/cloud_download.svg similarity index 100% rename from target/server/src/main/resources/icons/cloud_download.svg rename to target/desktop/src/main/resources/icons/cloud_download.svg diff --git a/target/server/src/main/resources/icons/data_usage.svg b/target/desktop/src/main/resources/icons/data_usage.svg similarity index 100% rename from target/server/src/main/resources/icons/data_usage.svg rename to target/desktop/src/main/resources/icons/data_usage.svg diff --git a/target/server/src/main/resources/icons/discord.png b/target/desktop/src/main/resources/icons/discord.png similarity index 100% rename from target/server/src/main/resources/icons/discord.png rename to target/desktop/src/main/resources/icons/discord.png diff --git a/target/server/src/main/resources/icons/download.svg b/target/desktop/src/main/resources/icons/download.svg similarity index 100% rename from target/server/src/main/resources/icons/download.svg rename to target/desktop/src/main/resources/icons/download.svg diff --git a/target/server/src/main/resources/icons/download_done.svg b/target/desktop/src/main/resources/icons/download_done.svg similarity index 100% rename from target/server/src/main/resources/icons/download_done.svg rename to target/desktop/src/main/resources/icons/download_done.svg diff --git a/target/server/src/main/resources/icons/drag_pan.svg b/target/desktop/src/main/resources/icons/drag_pan.svg similarity index 100% rename from target/server/src/main/resources/icons/drag_pan.svg rename to target/desktop/src/main/resources/icons/drag_pan.svg diff --git a/target/server/src/main/resources/icons/full_brightness.svg b/target/desktop/src/main/resources/icons/full_brightness.svg similarity index 100% rename from target/server/src/main/resources/icons/full_brightness.svg rename to target/desktop/src/main/resources/icons/full_brightness.svg diff --git a/target/server/src/main/resources/icons/github.png b/target/desktop/src/main/resources/icons/github.png similarity index 100% rename from target/server/src/main/resources/icons/github.png rename to target/desktop/src/main/resources/icons/github.png diff --git a/target/server/src/main/resources/icons/help.svg b/target/desktop/src/main/resources/icons/help.svg similarity index 100% rename from target/server/src/main/resources/icons/help.svg rename to target/desktop/src/main/resources/icons/help.svg diff --git a/target/server/src/main/resources/icons/horizontal.png b/target/desktop/src/main/resources/icons/horizontal.png similarity index 100% rename from target/server/src/main/resources/icons/horizontal.png rename to target/desktop/src/main/resources/icons/horizontal.png diff --git a/target/server/src/main/resources/icons/hotkey.png b/target/desktop/src/main/resources/icons/hotkey.png similarity index 100% rename from target/server/src/main/resources/icons/hotkey.png rename to target/desktop/src/main/resources/icons/hotkey.png diff --git a/target/server/src/main/resources/icons/info.svg b/target/desktop/src/main/resources/icons/info.svg similarity index 100% rename from target/server/src/main/resources/icons/info.svg rename to target/desktop/src/main/resources/icons/info.svg diff --git a/target/server/src/main/resources/icons/ko-fi.png b/target/desktop/src/main/resources/icons/ko-fi.png similarity index 100% rename from target/server/src/main/resources/icons/ko-fi.png rename to target/desktop/src/main/resources/icons/ko-fi.png diff --git a/target/server/src/main/resources/icons/layers.svg b/target/desktop/src/main/resources/icons/layers.svg similarity index 100% rename from target/server/src/main/resources/icons/layers.svg rename to target/desktop/src/main/resources/icons/layers.svg diff --git a/target/server/src/main/resources/icons/lock_closed.svg b/target/desktop/src/main/resources/icons/lock_closed.svg similarity index 100% rename from target/server/src/main/resources/icons/lock_closed.svg rename to target/desktop/src/main/resources/icons/lock_closed.svg diff --git a/target/server/src/main/resources/icons/lock_open.svg b/target/desktop/src/main/resources/icons/lock_open.svg similarity index 100% rename from target/server/src/main/resources/icons/lock_open.svg rename to target/desktop/src/main/resources/icons/lock_open.svg diff --git a/target/server/src/main/resources/icons/mid_brightness.svg b/target/desktop/src/main/resources/icons/mid_brightness.svg similarity index 100% rename from target/server/src/main/resources/icons/mid_brightness.svg rename to target/desktop/src/main/resources/icons/mid_brightness.svg diff --git a/target/server/src/main/resources/icons/no_brightness.svg b/target/desktop/src/main/resources/icons/no_brightness.svg similarity index 100% rename from target/server/src/main/resources/icons/no_brightness.svg rename to target/desktop/src/main/resources/icons/no_brightness.svg diff --git a/target/server/src/main/resources/icons/rings.png b/target/desktop/src/main/resources/icons/rings.png similarity index 100% rename from target/server/src/main/resources/icons/rings.png rename to target/desktop/src/main/resources/icons/rings.png diff --git a/target/server/src/main/resources/icons/sensors.svg b/target/desktop/src/main/resources/icons/sensors.svg similarity index 100% rename from target/server/src/main/resources/icons/sensors.svg rename to target/desktop/src/main/resources/icons/sensors.svg diff --git a/target/server/src/main/resources/icons/settings.svg b/target/desktop/src/main/resources/icons/settings.svg similarity index 100% rename from target/server/src/main/resources/icons/settings.svg rename to target/desktop/src/main/resources/icons/settings.svg diff --git a/target/server/src/main/resources/icons/update.svg b/target/desktop/src/main/resources/icons/update.svg similarity index 100% rename from target/server/src/main/resources/icons/update.svg rename to target/desktop/src/main/resources/icons/update.svg diff --git a/target/server/src/main/resources/icons/vertical.png b/target/desktop/src/main/resources/icons/vertical.png similarity index 100% rename from target/server/src/main/resources/icons/vertical.png rename to target/desktop/src/main/resources/icons/vertical.png diff --git a/target/server/src/main/resources/imgs/favicon.ico b/target/desktop/src/main/resources/imgs/favicon.ico similarity index 100% rename from target/server/src/main/resources/imgs/favicon.ico rename to target/desktop/src/main/resources/imgs/favicon.ico diff --git a/target/server/src/main/resources/imgs/github.svg b/target/desktop/src/main/resources/imgs/github.svg similarity index 100% rename from target/server/src/main/resources/imgs/github.svg rename to target/desktop/src/main/resources/imgs/github.svg diff --git a/target/server/src/main/resources/imgs/logo.png b/target/desktop/src/main/resources/imgs/logo.png similarity index 100% rename from target/server/src/main/resources/imgs/logo.png rename to target/desktop/src/main/resources/imgs/logo.png diff --git a/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/ObserveHardwareReadings.kt b/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/ObserveHardwareReadings.kt deleted file mode 100644 index 0098bff..0000000 --- a/target/server/src/main/kotlin/br/com/firstsoft/target/server/data/ObserveHardwareReadings.kt +++ /dev/null @@ -1,7 +0,0 @@ -package br.com.firstsoft.target.server.data - -import br.com.firstsoft.core.os.hardwaremonitor.HardwareMonitorReader - -object ObserveHardwareReadings { - val data = HardwareMonitorReader.currentData -} \ No newline at end of file From 261a5b76a1c2d9400241c7eb3e2428764b8a00ce Mon Sep 17 00:00:00 2001 From: Danilo Lemes Date: Wed, 11 Dec 2024 18:40:19 +0000 Subject: [PATCH 2/2] fix paths --- .idea/runConfigurations/Run.xml | 14 ++++++++++++++ .../HardwareMonitor/HardwareMonitor.csproj | 2 +- target/desktop/build.gradle.kts | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .idea/runConfigurations/Run.xml diff --git a/.idea/runConfigurations/Run.xml b/.idea/runConfigurations/Run.xml new file mode 100644 index 0000000..2e415db --- /dev/null +++ b/.idea/runConfigurations/Run.xml @@ -0,0 +1,14 @@ + + + + + + + \ No newline at end of file diff --git a/HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj b/HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj index 478f689..b7d22d2 100644 --- a/HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj +++ b/HardwareMonitor/HardwareMonitor/HardwareMonitor.csproj @@ -5,7 +5,7 @@ net8.0 enable enable - ..\..\target\server\src\main\resources\imgs\favicon.ico + ..\..\target\desktop\src\main\resources\imgs\favicon.ico diff --git a/target/desktop/build.gradle.kts b/target/desktop/build.gradle.kts index 4c4db57..9b7d737 100644 --- a/target/desktop/build.gradle.kts +++ b/target/desktop/build.gradle.kts @@ -64,7 +64,7 @@ compose.desktop { } } - mainClass = "app.cleanmeter.target.server.ServerMainKt" + mainClass = "app.cleanmeter.target.desktop.ServerMainKt" buildTypes.release.proguard { version.set("7.5.0")