clean up imports

Danil0v3s · Dec 29, 2024 · 72c6354 · 72c6354
1 parent 3b9fea8
commit 72c6354
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 59 deletions.
diff --git a/core/common/src/main/kotlin/app/cleanmeter/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 app.cleanmeter.core.common.mahm.dto
 
-import kotlinx.serialization.Serializable
 import app.cleanmeter.core.common.mahm.Data
 import app.cleanmeter.core.common.mahm.Entry
 import app.cleanmeter.core.common.mahm.SourceID
+import kotlinx.serialization.Serializable
 
 @Serializable
 data class DataDTO(

diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hardwaremonitor/HardwareMonitorReader.kt
@@ -3,16 +3,8 @@ package app.cleanmeter.core.os.hardwaremonitor
 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.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.flow.flowOn
-import kotlinx.coroutines.flow.map
-import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.mapNotNull
-import java.net.Socket
 import java.nio.ByteBuffer
 
 private const val HARDWARE_SIZE = 260

diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/hwinfo/HwInfoReader.kt
@@ -5,13 +5,13 @@ 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 app.cleanmeter.core.os.util.getByteBuffer
+import app.cleanmeter.core.os.util.readString
+import app.cleanmeter.core.os.win32.WindowsService
 import com.sun.jna.Pointer
 import com.sun.jna.platform.win32.WinNT
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.flow
-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/app/cleanmeter/core/os/mahm/MahmReader.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/mahm/MahmReader.kt
@@ -6,19 +6,17 @@ 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 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 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 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
 
 object MAHMSizes {
     const val HEADER_SIZE = 32

diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/util/MemoryUtils.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/util/MemoryUtils.kt
@@ -5,7 +5,7 @@ import java.io.InputStream
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.nio.charset.Charset
-import java.util.Locale
+import java.util.*
 
 internal fun getByteBuffer(input: InputStream, length: Int): ByteBuffer {
     if (length <= 0) return ByteBuffer.allocate(0).order(ByteOrder.LITTLE_ENDIAN)

diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Shell32Impl.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/Shell32Impl.kt
@@ -1,7 +1,6 @@
 package app.cleanmeter.core.os.win32
 
 import com.sun.jna.Native
-import com.sun.jna.WString
 import com.sun.jna.platform.win32.ShellAPI
 import com.sun.jna.platform.win32.WinDef
 import com.sun.jna.platform.win32.WinDef.HWND

diff --git a/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WindowsService.kt b/core/native/src/main/kotlin/app/cleanmeter/core/os/win32/WindowsService.kt
@@ -12,10 +12,7 @@ import com.sun.jna.platform.win32.WinNT.HANDLE
 import com.sun.jna.platform.win32.WinUser
 import java.awt.Component
 import java.io.File
-import java.io.IOException
-import java.nio.file.Files.createFile
 import java.nio.file.Path
-import kotlin.io.path.exists
 import kotlin.system.exitProcess
 
 class WindowsService {

diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/model/OverlaySettings.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/model/OverlaySettings.kt
@@ -1,7 +1,6 @@
 package app.cleanmeter.target.desktop.model
 
 import androidx.compose.runtime.Immutable
-import app.cleanmeter.target.desktop.ui.settings.SensorType
 import kotlinx.serialization.Serializable
 
 @Serializable

diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/HotKeySymbol.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/HotKeySymbol.kt
@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -15,12 +14,9 @@ import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Add
-import androidx.compose.material.icons.rounded.ChevronRight
-import androidx.compose.material.icons.rounded.PlusOne
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.util.fastForEachIndexed
 import app.cleanmeter.core.designsystem.LocalColorScheme

diff --git a/.../src/main/kotlin/app/cleanmeter/target/desktop/ui/components/KeyboardShortcutInfoLabel.kt b/.../src/main/kotlin/app/cleanmeter/target/desktop/ui/components/KeyboardShortcutInfoLabel.kt
@@ -1,12 +1,10 @@
 package app.cleanmeter.target.desktop.ui.components
 
-import androidx.compose.foundation.Image
 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.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape

diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ProgressUnit.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/ProgressUnit.kt
@@ -5,9 +5,7 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 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 app.cleanmeter.core.designsystem.LocalTypography
 
 @Composable

diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SliderElements.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/SliderElements.kt
@@ -3,12 +3,10 @@ package app.cleanmeter.target.desktop.ui.components
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.hoverable
-import androidx.compose.foundation.indication
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.SliderState
 import androidx.compose.runtime.Composable

diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Toggle.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/Toggle.kt
@@ -1,8 +1,6 @@
 package app.cleanmeter.target.desktop.ui.components
 
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Switch
 import androidx.compose.material3.SwitchColors
 import androidx.compose.material3.SwitchDefaults

diff --git a/...ktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/dropdown/DropdownMenu.kt b/...ktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/dropdown/DropdownMenu.kt
@@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.DropdownMenuItem
 import androidx.compose.material.ExperimentalMaterialApi
@@ -17,7 +16,6 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.rounded.ChevronRight
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue

diff --git a/...op/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/section/CheckboxSection.kt b/...op/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/section/CheckboxSection.kt
@@ -1,21 +1,16 @@
 package app.cleanmeter.target.desktop.ui.components.section
 
-import androidx.compose.animation.animateContentSize
-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.fillMaxWidth
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import app.cleanmeter.core.designsystem.LocalColorScheme
 import app.cleanmeter.target.desktop.ui.components.CheckboxWithLabel
 import app.cleanmeter.target.desktop.ui.components.SectionTitle
 import app.cleanmeter.target.desktop.ui.components.Toggle

diff --git a/...op/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/section/DropdownSection.kt b/...op/src/main/kotlin/app/cleanmeter/target/desktop/ui/components/section/DropdownSection.kt
@@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import app.cleanmeter.target.desktop.ui.components.dropdown.DropdownMenu
 import app.cleanmeter.target.desktop.ui.components.SectionTitle
+import app.cleanmeter.target.desktop.ui.components.dropdown.DropdownMenu
 
 @Composable
 fun DropdownSection(

diff --git a/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayUi.kt b/target/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/overlay/OverlayUi.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color

diff --git a/...t/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/AppSettingsUi.kt b/...t/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/AppSettingsUi.kt
@@ -4,19 +4,14 @@ import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.TooltipArea
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Icon
 import androidx.compose.material.Text
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AdminPanelSettings
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue

diff --git a/...t/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/StatsUi.kt b/...t/desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/stats/StatsUi.kt
@@ -9,21 +9,15 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import app.cleanmeter.core.common.hardwaremonitor.HardwareMonitorData
 import app.cleanmeter.core.designsystem.LocalColorScheme
 import app.cleanmeter.core.designsystem.LocalTypography
 import app.cleanmeter.target.desktop.model.OverlaySettings
-import app.cleanmeter.target.desktop.ui.components.section.CheckboxSection
-import app.cleanmeter.target.desktop.ui.components.CheckboxWithLabel
-import app.cleanmeter.target.desktop.ui.components.section.CustomBodyCheckboxSection
-import app.cleanmeter.target.desktop.ui.components.section.DropdownSection
 import app.cleanmeter.target.desktop.ui.components.KeyboardShortcutInfoLabel
-import app.cleanmeter.target.desktop.ui.components.dropdown.DropdownMenu
-import app.cleanmeter.target.desktop.ui.components.dropdown.SensorReadingDropdownMenu
+import app.cleanmeter.target.desktop.ui.components.section.DropdownSection
 import app.cleanmeter.target.desktop.ui.settings.CheckboxSectionOption
 import app.cleanmeter.target.desktop.ui.settings.SectionType
 import app.cleanmeter.target.desktop.ui.settings.SensorType

diff --git a/.../desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Position.kt b/.../desktop/src/main/kotlin/app/cleanmeter/target/desktop/ui/settings/tabs/style/Position.kt
@@ -6,8 +6,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
-import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth