Skip to content

Commit 3be722a

Browse files
Coding-MeetCoding-Meet
committed
refactor: reorganize project structure and rename utility classes
- Relocate utility files from `core.utility` to specialized subpackages: `utility.platform`, `utility.crash_report`, and `utility.ui` - Rename `Utils` object to `FolderFileUtils` and move it to `utility.platform` - Move `AppLogger` and log writers to `utility.crash_report` - Move UI-related enums and interfaces like `TabItem` and `ExpandableSection` to `utility.ui` - Relocate platform-specific logic and configurations to `utility.platform` - Update all internal references and imports to reflect the new package structure - Move `tagName` helper function from `FolderFileUtils` to `AppLogger`
1 parent c8e7fde commit 3be722a

54 files changed

Lines changed: 195 additions & 184 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/datastore/PathPreferenceManger.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import androidx.datastore.core.DataStore
44
import androidx.datastore.preferences.core.Preferences
55
import androidx.datastore.preferences.core.edit
66
import androidx.datastore.preferences.core.stringPreferencesKey
7-
import com.meet.dev.analyzer.core.utility.getDefaultAndroidFolderPath
8-
import com.meet.dev.analyzer.core.utility.getDefaultAndroidSdkPath
9-
import com.meet.dev.analyzer.core.utility.getDefaultAvdLocationPath
10-
import com.meet.dev.analyzer.core.utility.getDefaultGoogleFolderPaths
11-
import com.meet.dev.analyzer.core.utility.getDefaultGradleHomePath
12-
import com.meet.dev.analyzer.core.utility.getDefaultJdkFolderPaths
13-
import com.meet.dev.analyzer.core.utility.getDefaultJetbrainsFolderPaths
14-
import com.meet.dev.analyzer.core.utility.getDefaultKonanFolderPath
7+
import com.meet.dev.analyzer.utility.getDefaultAndroidFolderPath
8+
import com.meet.dev.analyzer.utility.getDefaultAndroidSdkPath
9+
import com.meet.dev.analyzer.utility.getDefaultAvdLocationPath
10+
import com.meet.dev.analyzer.utility.getDefaultGoogleFolderPaths
11+
import com.meet.dev.analyzer.utility.getDefaultGradleHomePath
12+
import com.meet.dev.analyzer.utility.getDefaultJdkFolderPaths
13+
import com.meet.dev.analyzer.utility.getDefaultJetbrainsFolderPaths
14+
import com.meet.dev.analyzer.utility.getDefaultKonanFolderPath
1515
import kotlinx.coroutines.Dispatchers
1616
import kotlinx.coroutines.flow.map
1717
import kotlinx.coroutines.withContext

‎composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/models/cleanbuild/ProjectBuildInfo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
package com.meet.dev.analyzer.data.models.cleanbuild
44

5-
import com.meet.dev.analyzer.core.utility.Utils.formatSize
5+
import com.meet.dev.analyzer.utility.platform.FolderFileUtils.formatSize
66
import kotlin.uuid.ExperimentalUuidApi
77
import kotlin.uuid.Uuid
88

‎composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/models/storage/IdeDataInfo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.meet.dev.analyzer.data.models.storage
22

3-
import com.meet.dev.analyzer.core.utility.ExpandableSection
3+
import com.meet.dev.analyzer.utility.ui.ExpandableSection
44
import kotlin.uuid.ExperimentalUuidApi
55
import kotlin.uuid.Uuid
66

‎composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/cleanbuild/CleanBuildRepositoryImpl.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package com.meet.dev.analyzer.data.repository.cleanbuild
22

3-
import com.meet.dev.analyzer.core.utility.AppLogger
4-
import com.meet.dev.analyzer.core.utility.Utils.calculateFolderSize
5-
import com.meet.dev.analyzer.core.utility.Utils.formatSize
6-
import com.meet.dev.analyzer.core.utility.Utils.tagName
73
import com.meet.dev.analyzer.data.models.cleanbuild.ModuleBuild
84
import com.meet.dev.analyzer.data.models.cleanbuild.ProjectBuildInfo
95
import com.meet.dev.analyzer.data.models.project.BuildFileType
6+
import com.meet.dev.analyzer.utility.crash_report.AppLogger
7+
import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName
8+
import com.meet.dev.analyzer.utility.platform.FolderFileUtils.calculateFolderSize
9+
import com.meet.dev.analyzer.utility.platform.FolderFileUtils.formatSize
1010
import kotlinx.coroutines.Dispatchers
1111
import kotlinx.coroutines.withContext
1212
import java.io.File

‎composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/ProjectAnalyzerRepositoryImpl.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@ package com.meet.dev.analyzer.data.repository.project
22

33
import com.akuleshov7.ktoml.Toml
44
import com.akuleshov7.ktoml.TomlInputConfig
5-
import com.meet.dev.analyzer.core.utility.AppLogger
6-
import com.meet.dev.analyzer.core.utility.Utils
7-
import com.meet.dev.analyzer.core.utility.Utils.tagName
85
import com.meet.dev.analyzer.data.models.project.BuildFileType
96
import com.meet.dev.analyzer.data.models.project.Bundle
107
import com.meet.dev.analyzer.data.models.project.Dependency
@@ -25,6 +22,9 @@ import com.meet.dev.analyzer.data.models.project.VersionCatalog
2522
import com.meet.dev.analyzer.data.models.project.VersionCatalogFileInfo
2623
import com.meet.dev.analyzer.data.models.storage.GradleLibraryInfo
2724
import com.meet.dev.analyzer.data.models.storage.GradleModulesInfo
25+
import com.meet.dev.analyzer.utility.crash_report.AppLogger
26+
import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName
27+
import com.meet.dev.analyzer.utility.platform.FolderFileUtils
2828
import kotlinx.coroutines.Dispatchers
2929
import kotlinx.coroutines.withContext
3030
import kotlinx.serialization.SerialName
@@ -77,7 +77,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
7777
)
7878

7979
updateProgress(0.5f, "Analyzing plugins...")
80-
val gradleModulesInfo = Utils.getGradleModulesInfo()
80+
val gradleModulesInfo = FolderFileUtils.getGradleModulesInfo()
8181
val plugins =
8282
findPlugin(
8383
moduleBuildFileInfos = moduleBuildFileInfos,
@@ -673,12 +673,12 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
673673
return platforms.toList()
674674
}
675675

676-
val sizeBytes = Utils.calculateFolderSize(projectDir)
676+
val sizeBytes = FolderFileUtils.calculateFolderSize(projectDir)
677677

678678
val projectOverviewInfo = ProjectOverviewInfo(
679679
projectPath = projectDir.absolutePath,
680680
projectName = findProjectName(),
681-
sizeReadable = Utils.formatSize(sizeBytes),
681+
sizeReadable = FolderFileUtils.formatSize(sizeBytes),
682682
totalSizeBytes = sizeBytes,
683683
isMultiModule = moduleBuildFileInfos.size > 2,
684684
gradleVersion = findGradleVersion(),
@@ -721,7 +721,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
721721
val versionCatalogFileInfo = VersionCatalogFileInfo(
722722
name = versionCatalogFile.name,
723723
path = versionCatalogFile.absolutePath,
724-
sizeReadable = Utils.formatSize(sizeBytes),
724+
sizeReadable = FolderFileUtils.formatSize(sizeBytes),
725725
sizeBytes = sizeBytes,
726726
content = versionCatalogFile.readText(),
727727
readLines = versionCatalogFile.readLines(),
@@ -754,7 +754,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
754754
ModuleBuildFileInfo(
755755
path = file.absolutePath,
756756
type = buildFileType,
757-
sizeReadable = Utils.formatSize(sizeBytes),
757+
sizeReadable = FolderFileUtils.formatSize(sizeBytes),
758758
sizeBytes = sizeBytes,
759759
content = file.readText(),
760760
readLines = file.readLines(),
@@ -795,7 +795,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
795795
name = settingsGradleFileType.fileName,
796796
path = file.absolutePath,
797797
type = settingsGradleFileType,
798-
size = Utils.formatSize(sizeBytes),
798+
size = FolderFileUtils.formatSize(sizeBytes),
799799
sizeBytes = sizeBytes,
800800
content = file.readText(),
801801
readLines = file.readLines(),
@@ -832,7 +832,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
832832
name = propertiesFileType.fileName,
833833
path = file.absolutePath,
834834
type = propertiesFileType,
835-
size = Utils.formatSize(sizeBytes),
835+
size = FolderFileUtils.formatSize(sizeBytes),
836836
sizeBytes = sizeBytes,
837837
content = file.readText(),
838838
readLines = file.readLines(),
@@ -870,7 +870,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
870870
val gradleWrapperPropertiesFileInfo = GradleWrapperPropertiesFileInfo(
871871
name = gradleWrapperPropertiesFile.name,
872872
path = gradleWrapperPropertiesFile.absolutePath,
873-
size = Utils.formatSize(sizeBytes),
873+
size = FolderFileUtils.formatSize(sizeBytes),
874874
sizeBytes = sizeBytes,
875875
content = gradleWrapperPropertiesFile.readText(),
876876
readLines = gradleWrapperPropertiesFile.readLines(),
@@ -1166,7 +1166,7 @@ class ProjectAnalyzerRepositoryImpl : ProjectAnalyzerRepository {
11661166
path = file.absolutePath,
11671167
relativePath = relativePath,
11681168
type = fileType,
1169-
sizeReadable = Utils.formatSize(sizeBytes),
1169+
sizeReadable = FolderFileUtils.formatSize(sizeBytes),
11701170
sizeBytes = sizeBytes,
11711171
extension = file.extension.lowercase(),
11721172
content = file.readText(),

0 commit comments

Comments
 (0)