Skip to content

Commit ff3367e

Browse files
egorikftpegorikftp
committed
Move standard components into common package
1 parent 0ed02ff commit ff3367e

24 files changed

Lines changed: 76 additions & 76 deletions

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/service/PersistentSettings.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model
1414
import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_GRADE
1515
import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_OPTICAL_SIZE
1616
import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_WEIGHT
17-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings.Companion.DEFAULT_SIZE
17+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings.Companion.DEFAULT_SIZE
1818

1919
@State(name = "Valkyrie.Settings", storages = [Storage("valkyrie_settings.xml")])
2020
class PersistentSettings : SimplePersistentStateComponent<ValkyrieState>(ValkyrieState()) {

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/settings/InMemorySettings.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model
1313
import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_GRADE
1414
import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_OPTICAL_SIZE
1515
import io.github.composegears.valkyrie.ui.screen.webimport.material.domain.model.font.MaterialFontSettings.Companion.DEFAULT_WEIGHT
16-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings.Companion.DEFAULT_SIZE
16+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings.Companion.DEFAULT_SIZE
1717
import java.util.Collections.emptyList
1818
import kotlinx.coroutines.flow.MutableStateFlow
1919
import kotlinx.coroutines.flow.asStateFlow

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/common/ui/IconSizeCustomization.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import io.github.composegears.valkyrie.jewel.tooling.PreviewTheme
2121
import io.github.composegears.valkyrie.sdk.compose.foundation.layout.CenterVerticalRow
2222
import io.github.composegears.valkyrie.sdk.compose.foundation.layout.WeightSpacer
2323
import io.github.composegears.valkyrie.sdk.compose.foundation.rememberMutableState
24-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings
24+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings
2525
import io.github.composegears.valkyrie.util.stringResource
2626
import kotlin.math.roundToInt
2727
import org.jetbrains.compose.ui.tooling.preview.Preview

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/bootstrap/BootstrapImportScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.composegears.tiamat.compose.navDestination
77
import com.composegears.tiamat.compose.navigate
88
import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionParamsSource.TextSource
99
import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionScreen
10-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.StandardImportScreen
1110
import io.github.composegears.valkyrie.ui.screen.webimport.standard.bootstrap.di.BootstrapModule
11+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.StandardImportScreen
1212
import io.github.composegears.valkyrie.util.stringResource
1313

1414
val BootstrapImportScreen by navDestination {

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/bootstrap/domain/BootstrapUseCase.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package io.github.composegears.valkyrie.ui.screen.webimport.standard.bootstrap.d
33
import io.github.composegears.valkyrie.settings.InMemorySettings
44
import io.github.composegears.valkyrie.ui.screen.webimport.common.model.FontByteArray
55
import io.github.composegears.valkyrie.ui.screen.webimport.standard.bootstrap.data.BootstrapRepository
6-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.StandardIconProvider
7-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.SvgSizeCustomizer
8-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.inferCategoryFromTags
9-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.toDisplayName
10-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings
11-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIcon
12-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIconConfig
13-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.toStandardIconConfig
6+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.StandardIconProvider
7+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.SvgSizeCustomizer
8+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.inferCategoryFromTags
9+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.toDisplayName
10+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings
11+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIcon
12+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIconConfig
13+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.toStandardIconConfig
1414

1515
class BootstrapUseCase(
1616
private val repository: BootstrapRepository,

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/boxicons/BoxIconsImportScreen.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import com.composegears.tiamat.compose.navDestination
77
import com.composegears.tiamat.compose.navigate
88
import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionParamsSource.TextSource
99
import io.github.composegears.valkyrie.ui.screen.mode.simple.conversion.SimpleConversionScreen
10-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.StandardImportScreen
1110
import io.github.composegears.valkyrie.ui.screen.webimport.standard.boxicons.di.BoxIconsModule
11+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.StandardImportScreen
1212
import io.github.composegears.valkyrie.util.stringResource
1313

1414
val BoxIconsImportScreen by navDestination {

‎tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/boxicons/domain/BoxIconsUseCase.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ package io.github.composegears.valkyrie.ui.screen.webimport.standard.boxicons.do
33
import io.github.composegears.valkyrie.settings.InMemorySettings
44
import io.github.composegears.valkyrie.ui.screen.webimport.common.model.FontByteArray
55
import io.github.composegears.valkyrie.ui.screen.webimport.standard.boxicons.data.BoxIconsRepository
6-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.StandardIconProvider
7-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.SvgSizeCustomizer
8-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.inferCategoryFromTags
9-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.toDisplayName
10-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.IconStyle
11-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings
12-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIcon
13-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIconConfig
14-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.toStandardIconConfig
6+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.StandardIconProvider
7+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.SvgSizeCustomizer
8+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.inferCategoryFromTags
9+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.toDisplayName
10+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.IconStyle
11+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings
12+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIcon
13+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIconConfig
14+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.toStandardIconConfig
1515

1616
class BoxIconsUseCase(
1717
private val repository: BoxIconsRepository,

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/StandardIconViewModel.kt renamed to tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/common/StandardIconViewModel.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.composegears.valkyrie.ui.screen.webimport.standard
1+
package io.github.composegears.valkyrie.ui.screen.webimport.standard.common
22

33
import androidx.compose.runtime.Stable
44
import androidx.lifecycle.ViewModel
@@ -11,13 +11,13 @@ import io.github.composegears.valkyrie.sdk.core.extensions.safeAs
1111
import io.github.composegears.valkyrie.ui.screen.webimport.common.model.FontByteArray
1212
import io.github.composegears.valkyrie.ui.screen.webimport.common.model.GridItem
1313
import io.github.composegears.valkyrie.ui.screen.webimport.common.util.toGridItems
14-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.StandardIconProvider
15-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.IconStyle
16-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.InferredCategory
17-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings
18-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIcon
19-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIconConfig
20-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.util.filterByCategory
14+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.StandardIconProvider
15+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.IconStyle
16+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.InferredCategory
17+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings
18+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIcon
19+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIconConfig
20+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.util.filterByCategory
2121
import kotlinx.coroutines.Dispatchers
2222
import kotlinx.coroutines.Job
2323
import kotlinx.coroutines.channels.Channel

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/StandardImportScreenUI.kt renamed to tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/common/StandardImportScreenUI.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package io.github.composegears.valkyrie.ui.screen.webimport.standard
1+
package io.github.composegears.valkyrie.ui.screen.webimport.standard.common
22

33
import androidx.compose.animation.AnimatedContent
44
import androidx.compose.foundation.gestures.detectTapGestures
@@ -48,12 +48,12 @@ import io.github.composegears.valkyrie.ui.screen.webimport.common.ui.IconGrid
4848
import io.github.composegears.valkyrie.ui.screen.webimport.common.ui.IconLoadingPlaceholder
4949
import io.github.composegears.valkyrie.ui.screen.webimport.common.ui.IconSizeCustomization
5050
import io.github.composegears.valkyrie.ui.screen.webimport.common.ui.SidePanel
51-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.domain.StandardIconProvider
52-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.IconStyle
53-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.InferredCategory
54-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.SizeSettings
55-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.StandardIcon
56-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.ui.StandardTopActions
51+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain.StandardIconProvider
52+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.IconStyle
53+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.InferredCategory
54+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.SizeSettings
55+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.StandardIcon
56+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.ui.StandardTopActions
5757
import io.github.composegears.valkyrie.util.stringResource
5858
import kotlinx.coroutines.launch
5959
import org.jetbrains.jewel.foundation.theme.LocalContentColor

tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/domain/CategoryInferrer.kt renamed to tools/idea-plugin/src/main/kotlin/io/github/composegears/valkyrie/ui/screen/webimport/standard/common/domain/CategoryInferrer.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package io.github.composegears.valkyrie.ui.screen.webimport.standard.domain
1+
package io.github.composegears.valkyrie.ui.screen.webimport.standard.common.domain
22

3-
import io.github.composegears.valkyrie.ui.screen.webimport.standard.model.InferredCategory
3+
import io.github.composegears.valkyrie.ui.screen.webimport.standard.common.model.InferredCategory
44

55
/**
66
* Category keyword mapping with priority (lower number = higher priority).

0 commit comments

Comments
 (0)