diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml index d4eaf97..d6a72a5 100644 --- a/.github/workflows/build-desktop.yml +++ b/.github/workflows/build-desktop.yml @@ -72,7 +72,19 @@ jobs: echo "updater_url=$UPDATER_URL" >> composeApp/src/jvmMain/resources/props.properties echo "feedback_url=$FEEDBACK_URL" >> composeApp/src/jvmMain/resources/props.properties - name: Build native packages - run: ./gradlew packageReleaseDistributionForCurrentOS --stacktrace + shell: bash + run: | + case "${{ matrix.format }}" in + macos-arm|macos-intel) + ./gradlew packageReleaseDmg --stacktrace + ;; + windows) + ./gradlew packageReleaseMsi --stacktrace + ;; + linux) + ./gradlew packageReleaseDeb --stacktrace + ;; + esac # macOS ARM - name: Rename macOS ARM DMG diff --git a/README.md b/README.md index 6d11ca2..c933ab7 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@

- - DevAnalyzer + + DevAnalyzer

@@ -21,121 +21,131 @@ DevAnalyzer is a cross-platform desktop application built with Compose Multiplat ## Overview -* **Project Analyzer**: Analyze modules, Gradle configurations, plugins, dependencies, and project metadata in a single view. -* **Clean Build**: Scan projects for build folders across all modules and safely delete them to reclaim space. -* **Workspace Analyzer**: Scan multiple workspaces to detect actively used Android SDKs, NDKs, CMake versions, and Gradle wrappers, highlighting what can be safely removed. -* **Storage Analyzer**: View storage consumed by Android SDKs, Gradle caches, IDE caches, Kotlin/Native, and AVDs. -* **Settings**: Configure custom toolchain paths and manage privacy options. +- **Project Analyzer**: Analyze modules, Gradle configurations, plugins, dependencies, and project metadata in a single view. +- **Clean Build**: Scan projects for build folders across all modules and safely delete them to reclaim space. +- **Workspace Analyzer**: Scan multiple workspaces to detect actively used Android SDKs, NDKs, CMake versions, and Gradle wrappers, highlighting what can be safely removed. +- **Storage Analyzer**: View storage consumed by Android SDKs, Gradle caches, IDE caches, Kotlin/Native, and AVDs. +- **Settings**: Configure custom toolchain paths and manage privacy options. --- ## Features ### Project Analyzer -* Analyze Gradle modules, plugins, and dependencies. -* List applied plugins and Version Catalog libraries. -* Browse Gradle build files and project configuration scripts directly inside the app. -* Inspect project metadata including: - * Kotlin Version - * Android Gradle Plugin (AGP) - * Gradle Version - * Compile, Target, and Min SDKs - * NDK and CMake versions + +- Analyze Gradle modules, plugins, and dependencies. +- List applied plugins and Version Catalog libraries. +- Browse Gradle build files and project configuration scripts directly inside the app. +- Inspect project metadata including: + - Kotlin Version + - Android Gradle Plugin (AGP) + - Gradle Version + - Compile, Target, and Min SDKs + - NDK and CMake versions ### Clean Build -* Scan Android Studio projects for module build folders. -* Display expandable project and module layout. -* Compute folder sizes in real-time. -* Perform batch deletion of selected build folders with a safety confirmation dialog. -* View space recovery summaries after cleaning. + +- Scan Android Studio projects for module build folders. +- Display expandable project and module layout. +- Compute folder sizes in real-time. +- Perform batch deletion of selected build folders with a safety confirmation dialog. +- View space recovery summaries after cleaning. ### Workspace Analyzer -* Analyze multiple workspace directories simultaneously. -* Cross-reference installed SDK tools, NDKs, CMake versions, and Gradle caches against all projects. -* Automatically protect active versions referenced by existing projects. -* Detect unused resources: - * Android SDK Platforms - * SDK Build Tools - * SDK Sources - * NDK & CMake Versions - * Gradle Wrapper Caches - * Kotlin/Native Prebuilts + +- Analyze multiple workspace directories simultaneously. +- Cross-reference installed SDK tools, NDKs, CMake versions, and Gradle caches against all projects. +- Automatically protect active versions referenced by existing projects. +- Detect unused resources: + - Android SDK Platforms + - SDK Build Tools + - SDK Sources + - NDK & CMake Versions + - Gradle Wrapper Caches + - Kotlin/Native Prebuilts ### Storage Analyzer -* View storage allocations across: - * Android SDK - * Gradle Caches - * Kotlin/Native - * JDK - * Android Virtual Devices (AVD) - * IDE Caches and configuration folders -* Track real-time scan progress with elapsed timers. -* Support custom, non-standard JDK and IDE locations. + +- View storage allocations across: + - Android SDK + - Gradle Caches + - Kotlin/Native + - JDK + - Android Virtual Devices (AVD) + - IDE Caches and configuration folders +- Track real-time scan progress with elapsed timers. +- Support custom, non-standard JDK and IDE locations. ### Settings -* Custom paths configuration (SDK, Gradle Home, Kotlin Native, JDK, Android Studio, IntelliJ). -* Automatic path validation with quick-reset options. -* Toggle local crash logging, crash reporting, and usage analytics. + +- Custom paths configuration (SDK, Gradle Home, Kotlin Native, JDK, Android Studio, IntelliJ). +- Automatic path validation with one-click reset options. +- Toggle local crash logging, crash reporting, and usage analytics. --- ## Privacy & Analytics Privacy is a core design principle of DevAnalyzer: -* **Local Processing**: All analysis runs locally. Your code, project names, and file paths are never uploaded. -* **Optional Analytics**: You can opt in or out of anonymous analytics at any time. -* **Zero PII**: No email addresses, personal details, or sensitive metadata are tracked. -* **SDK Configuration**: We configure the analytics client to keep all metrics completely anonymous. Since we never call identification methods, all users remain completely anonymous. + +- **Local Processing**: All analysis runs locally. Your code, project names, and file paths are never uploaded. +- **Optional Analytics**: You can opt in or out of anonymous analytics at any time. +- **Zero PII**: No email addresses, personal details, or sensitive metadata are tracked. +- **SDK Configuration**: Analytics are configured to remain completely anonymous. --- ## Feedback & Updates -* **In-App Feedback**: Rate the app, suggest features, and report issues using the built-in feedback dialog. -* **Update Verification**: Silently checks for new GitHub releases on startup and displays release notes inside the app. +- **In-App Feedback**: Rate the app, suggest features, and report issues using the built-in feedback dialog. +- **Update Verification**: Silently checks for new GitHub releases on startup and displays release notes inside the app. --- ## Tech Stack -| Category | Libraries & Tools | -|---|---| -| **Framework** | Compose Multiplatform | -| **Language** | Kotlin 2.x (Multiplatform) | -| **Design System** | Material 3 with Adaptive Navigation Suite | -| **Dependency Injection** | Koin | -| **Network** | Ktor | -| **Navigation** | Jetpack Navigation for Compose | -| **Image Loading** | Coil3 | -| **Local Storage** | DataStore (Core + Preferences) | -| **File Handling** | FileKit | -| **Semantic Versioning** | SemVer | -| **Analytics** | PostHog JVM (Anonymous Analytics) | -| **Crash Reporting** | Sentry JVM (Optional) | +| Category | Libraries & Tools | +| ------------------------ |-------------------------------------------| +| **Framework** | Compose Multiplatform | +| **Language** | Kotlin 2.x (Multiplatform) | +| **Design System** | Material 3 with Adaptive Navigation Suite | +| **Dependency Injection** | Koin | +| **Network** | Ktor | +| **Navigation** | Jetpack Navigation 2 | +| **Image Loading** | Coil3 | +| **Local Storage** | DataStore (Core + Preferences) | +| **File Handling** | FileKit | +| **Semantic Versioning** | SemVer | +| **Analytics** | PostHog JVM (Anonymous Analytics) | +| **Crash Reporting** | Sentry JVM (Optional) | --- ## How to Run ### Run from Source + If you want to build and run the app from source: **macOS / Linux** + ```shell ./gradlew :composeApp:run ``` **Windows** + ```shell .\gradlew.bat :composeApp:run ``` ### Installation Packages -Download the latest binaries from the [Releases](https://github.com/Coding-Meet/DevAnalyzer/releases) page. -* **Windows**: Download the `.msi` installer. -* **macOS**: Download the `.dmg` file. (If blocked by security settings, go to **System Settings → Privacy & Security → Allow Anyway** to run). -* **Linux**: Install the `.deb` package using: +Download the latest release from the [Releases](https://github.com/Coding-Meet/DevAnalyzer/releases) page. + +- **Windows**: Download the `.msi` installer. +- **macOS**: Download the `.dmg` file. (If blocked by security settings, go to **System Settings → Privacy & Security → Allow Anyway** to run). +- **Linux**: Install the `.deb` package using: ```shell sudo dpkg -i devanalyzer_1.0.0-1_amd64.deb ``` @@ -150,4 +160,4 @@ If this project helped you, please give it a star! ⭐ Buy Me A Coffee -Your support is greatly appreciated. \ No newline at end of file +Your support is greatly appreciated. diff --git a/build.gradle.kts b/build.gradle.kts index 10a98c2..72e7e2d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,10 +1,9 @@ plugins { - // Kotlin plugins - For multiplatform and serialization - alias(libs.plugins.kotlinMultiplatform) apply false // Kotlin Multiplatform plugin - alias(libs.plugins.kotlinSerialization) apply false // Kotlinx Serialization plugin - - // Compose plugins - For UI framework - alias(libs.plugins.composeMultiplatform) apply false // Compose Multiplatform plugin - alias(libs.plugins.composeCompiler) apply false // Compose Compiler plugin - alias(libs.plugins.composeHotReload) apply false // Hot reload for development + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + alias(libs.plugins.kotlinMultiplatform) apply false + alias(libs.plugins.kotlinSerialization) apply false + alias(libs.plugins.composeMultiplatform) apply false + alias(libs.plugins.composeCompiler) apply false + alias(libs.plugins.composeHotReload) apply false } \ No newline at end of file diff --git a/composeApp/compose-desktop.pro b/composeApp/compose-desktop.pro index 3ba5424..73e361f 100644 --- a/composeApp/compose-desktop.pro +++ b/composeApp/compose-desktop.pro @@ -108,4 +108,20 @@ -keeppackagenames org.jsoup.nodes -keep public enum * { public static **[] values(); public static ** valueOf(java.lang.String); } --ignorewarnings \ No newline at end of file +-ignorewarnings + +# Ktor (HTTP client). Many internals resolved via ServiceLoader / reflection. +-keep class io.ktor.** { *; } +-keepclassmembers class io.ktor.** { *; } +-dontwarn io.ktor.** + +# CIO engine factory is discovered through META-INF/services. +-keep class * implements io.ktor.client.HttpClientEngineContainer { *; } +-keep class io.ktor.client.engine.cio.** { *; } + +-dontwarn com.posthog.** +-keep class com.posthog.** { *; } +-keepclassmembers class com.posthog.** { *; } + +-keep class kotlinx.coroutines.** { *; } +-dontwarn kotlinx.coroutines.** \ No newline at end of file diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/datastore/AppPreferenceManager.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/datastore/AppPreferenceManager.kt index 84efb9f..fabb56b 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/datastore/AppPreferenceManager.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/datastore/AppPreferenceManager.kt @@ -29,7 +29,7 @@ class AppPreferenceManager(private val dataStore: DataStore) { val DARK_MODE_KEY = booleanPreferencesKey("dark_mode") val ONBOARDING_DONE_KEY = booleanPreferencesKey("onboarding_done") val WINDOW_WIDTH_KEY = floatPreferencesKey("window_width") - val WINDOW_HEIGHT_KEY = floatPreferencesKey("window_height") + val WINDOW_HEIGHT_KEY = floatPreferencesKey("window_height") val WINDOW_POSITION_X_KEY = floatPreferencesKey("window_position_x") val WINDOW_POSITION_Y_KEY = floatPreferencesKey("window_position_y") val CRASH_REPORTING_ENABLED = booleanPreferencesKey("crash_reporting_enabled") diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/models/updater/GitHubRelease.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/models/updater/GitHubRelease.kt index d212b2e..679fd9b 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/models/updater/GitHubRelease.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/models/updater/GitHubRelease.kt @@ -1,7 +1,7 @@ package com.meet.dev.analyzer.data.models.updater -import kotlinx.serialization.Serializable import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable @Serializable data class GitHubRelease( diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/cleanbuild/CleanBuildRepositoryImpl.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/cleanbuild/CleanBuildRepositoryImpl.kt index 31a1c6b..77cb087 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/cleanbuild/CleanBuildRepositoryImpl.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/cleanbuild/CleanBuildRepositoryImpl.kt @@ -10,7 +10,6 @@ import com.meet.dev.analyzer.utility.platform.FolderFileUtils.formatSize import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File -import kotlin.random.Random class CleanBuildRepositoryImpl : CleanBuildRepository { diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/feedback/FeedbackRepositoryImpl.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/feedback/FeedbackRepositoryImpl.kt index d33c54a..89ef354 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/feedback/FeedbackRepositoryImpl.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/feedback/FeedbackRepositoryImpl.kt @@ -13,35 +13,36 @@ class FeedbackRepositoryImpl( private val appConfig: DesktopConfig, ) : FeedbackRepository { - override suspend fun submitFeedback(feedback: FeedbackData): Result = withContext(Dispatchers.IO) { - val client = HttpClient(CIO) - try { - val response = client.submitForm( - url = appConfig.feedbackUrl, - formParameters = Parameters.build { - append("entry.1761072179", feedback.rating.toString()) - append("entry.1087708121", feedback.name) - append("entry.1559444738", feedback.likesAndImprovements) - - feedback.mostUsedFeatures.forEach { feature -> - append("entry.1144468351", feature) + override suspend fun submitFeedback(feedback: FeedbackData): Result = + withContext(Dispatchers.IO) { + val client = HttpClient(CIO) + try { + val response = client.submitForm( + url = appConfig.feedbackUrl, + formParameters = Parameters.build { + append("entry.1761072179", feedback.rating.toString()) + append("entry.1087708121", feedback.name) + append("entry.1559444738", feedback.likesAndImprovements) + + feedback.mostUsedFeatures.forEach { feature -> + append("entry.1144468351", feature) + } + + append("entry.929779127", feedback.futureFeatures) + append("entry.1500692418", feedback.systemInfo) + append("entry.1169610342", feedback.email) } - - append("entry.929779127", feedback.futureFeatures) - append("entry.1500692418", feedback.systemInfo) - append("entry.1169610342", feedback.email) + ) + + if (response.status.value in 200..299) { + Result.success(Unit) + } else { + Result.failure(Exception("HTTP Error: ${response.status.value}")) } - ) - - if (response.status.value in 200..299) { - Result.success(Unit) - } else { - Result.failure(Exception("HTTP Error: ${response.status.value}")) + } catch (e: Exception) { + Result.failure(e) + } finally { + client.close() } - } catch (e: Exception) { - Result.failure(e) - } finally { - client.close() } - } } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/ProjectAnalyzerRepositoryImpl.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/ProjectAnalyzerRepositoryImpl.kt index 534234d..1be802b 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/ProjectAnalyzerRepositoryImpl.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/ProjectAnalyzerRepositoryImpl.kt @@ -1,6 +1,5 @@ package com.meet.dev.analyzer.data.repository.project -import com.meet.dev.analyzer.data.datastore.PathPreferenceManger import com.meet.dev.analyzer.data.models.project.ProjectInfo import com.meet.dev.analyzer.data.repository.project.helpers.DependencyAnalyzer import com.meet.dev.analyzer.data.repository.project.helpers.PluginAnalyzer diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/DependencyAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/DependencyAnalyzer.kt index 47e78c9..7afa8a3 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/DependencyAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/DependencyAnalyzer.kt @@ -1,6 +1,9 @@ package com.meet.dev.analyzer.data.repository.project.helpers -import com.meet.dev.analyzer.data.models.project.* +import com.meet.dev.analyzer.data.models.project.Dependency +import com.meet.dev.analyzer.data.models.project.ModuleBuildFileInfo +import com.meet.dev.analyzer.data.models.project.Plugin +import com.meet.dev.analyzer.data.models.project.VersionCatalog import com.meet.dev.analyzer.data.models.storage.GradleLibraryInfo import com.meet.dev.analyzer.data.models.storage.GradleModulesInfo import com.meet.dev.analyzer.utility.crash_report.AppLogger @@ -8,7 +11,7 @@ import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName class DependencyAnalyzer { private val tag = tagName(javaClass = javaClass) - + fun addDependencyEachModule( moduleBuildFileInfos: List, plugins: List, diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/PluginAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/PluginAnalyzer.kt index 380e5b4..ccbe119 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/PluginAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/PluginAnalyzer.kt @@ -1,6 +1,8 @@ package com.meet.dev.analyzer.data.repository.project.helpers -import com.meet.dev.analyzer.data.models.project.* +import com.meet.dev.analyzer.data.models.project.ModuleBuildFileInfo +import com.meet.dev.analyzer.data.models.project.Plugin +import com.meet.dev.analyzer.data.models.project.VersionCatalog import com.meet.dev.analyzer.data.models.storage.GradleLibraryInfo import com.meet.dev.analyzer.data.models.storage.GradleModulesInfo import com.meet.dev.analyzer.utility.crash_report.AppLogger diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectFileScanner.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectFileScanner.kt index 157128a..6644536 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectFileScanner.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectFileScanner.kt @@ -1,6 +1,15 @@ package com.meet.dev.analyzer.data.repository.project.helpers -import com.meet.dev.analyzer.data.models.project.* +import com.meet.dev.analyzer.data.models.project.BuildFileType +import com.meet.dev.analyzer.data.models.project.FileType +import com.meet.dev.analyzer.data.models.project.GradleWrapperPropertiesFileInfo +import com.meet.dev.analyzer.data.models.project.ModuleBuildFileInfo +import com.meet.dev.analyzer.data.models.project.ProjectFileInfo +import com.meet.dev.analyzer.data.models.project.PropertiesFileInfo +import com.meet.dev.analyzer.data.models.project.PropertiesFileType +import com.meet.dev.analyzer.data.models.project.SettingsGradleFileInfo +import com.meet.dev.analyzer.data.models.project.SettingsGradleFileType +import com.meet.dev.analyzer.data.models.project.VersionCatalogFileInfo import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectOverviewAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectOverviewAnalyzer.kt index 242d764..3e344fd 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectOverviewAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/ProjectOverviewAnalyzer.kt @@ -1,6 +1,10 @@ package com.meet.dev.analyzer.data.repository.project.helpers -import com.meet.dev.analyzer.data.models.project.* +import com.meet.dev.analyzer.data.models.project.GradleWrapperPropertiesFileInfo +import com.meet.dev.analyzer.data.models.project.ModuleBuildFileInfo +import com.meet.dev.analyzer.data.models.project.ProjectOverviewInfo +import com.meet.dev.analyzer.data.models.project.SettingsGradleFileInfo +import com.meet.dev.analyzer.data.models.project.VersionCatalog import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/VersionCatalogParser.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/VersionCatalogParser.kt index 93fe6ff..ba4ab11 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/VersionCatalogParser.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/project/helpers/VersionCatalogParser.kt @@ -1,16 +1,20 @@ package com.meet.dev.analyzer.data.repository.project.helpers -import com.meet.dev.analyzer.data.models.project.* -import com.meet.dev.analyzer.utility.crash_report.AppLogger -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.withContext import com.akuleshov7.ktoml.Toml import com.akuleshov7.ktoml.TomlInputConfig +import com.meet.dev.analyzer.data.models.project.Bundle +import com.meet.dev.analyzer.data.models.project.Library +import com.meet.dev.analyzer.data.models.project.Plugin +import com.meet.dev.analyzer.data.models.project.Version +import com.meet.dev.analyzer.data.models.project.VersionCatalog +import com.meet.dev.analyzer.data.models.project.VersionCatalogFileInfo +import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName -import kotlinx.serialization.Serializable +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.withContext import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable import kotlinx.serialization.decodeFromString -import java.io.File class VersionCatalogParser { private val tag = tagName(javaClass = javaClass) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/StorageAnalyzerRepositoryImpl.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/StorageAnalyzerRepositoryImpl.kt index 0865199..5d97533 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/StorageAnalyzerRepositoryImpl.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/StorageAnalyzerRepositoryImpl.kt @@ -31,7 +31,8 @@ class StorageAnalyzerRepositoryImpl( override suspend fun analyzeAvdData(): AndroidAvdInfo = avdAnalyzer.analyzeAvdData() - override suspend fun analyzeAndroidSdkData(): AndroidSdkInfo = androidSdkAnalyzer.analyzeAndroidSdkData() + override suspend fun analyzeAndroidSdkData(): AndroidSdkInfo = + androidSdkAnalyzer.analyzeAndroidSdkData() override suspend fun analyzeGradleData(): GradleInfo = gradleAnalyzer.analyzeGradleData() diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AndroidSdkAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AndroidSdkAnalyzer.kt index 15c2fb5..d5cb6e1 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AndroidSdkAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AndroidSdkAnalyzer.kt @@ -1,7 +1,21 @@ package com.meet.dev.analyzer.data.repository.storage.helpers import com.meet.dev.analyzer.data.datastore.PathPreferenceManger -import com.meet.dev.analyzer.data.models.storage.* +import com.meet.dev.analyzer.data.models.storage.AndroidSdkInfo +import com.meet.dev.analyzer.data.models.storage.BuildToolInfo +import com.meet.dev.analyzer.data.models.storage.BuildToolItem +import com.meet.dev.analyzer.data.models.storage.CmakeInfo +import com.meet.dev.analyzer.data.models.storage.CmakeInfoItem +import com.meet.dev.analyzer.data.models.storage.ExtrasInfo +import com.meet.dev.analyzer.data.models.storage.ExtrasInfoItem +import com.meet.dev.analyzer.data.models.storage.NdkInfo +import com.meet.dev.analyzer.data.models.storage.NdkItem +import com.meet.dev.analyzer.data.models.storage.PlatformInfo +import com.meet.dev.analyzer.data.models.storage.PlatformItem +import com.meet.dev.analyzer.data.models.storage.SourcesInfo +import com.meet.dev.analyzer.data.models.storage.SourcesInfoItem +import com.meet.dev.analyzer.data.models.storage.SystemImageInfo +import com.meet.dev.analyzer.data.models.storage.SystemImageInfoItem import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AvdAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AvdAnalyzer.kt index 663462c..be27e19 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AvdAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/AvdAnalyzer.kt @@ -1,7 +1,8 @@ package com.meet.dev.analyzer.data.repository.storage.helpers import com.meet.dev.analyzer.data.datastore.PathPreferenceManger -import com.meet.dev.analyzer.data.models.storage.* +import com.meet.dev.analyzer.data.models.storage.AndroidAvdInfo +import com.meet.dev.analyzer.data.models.storage.AvdItem import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/GradleAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/GradleAnalyzer.kt index 628e8ca..cae217e 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/GradleAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/GradleAnalyzer.kt @@ -1,7 +1,20 @@ package com.meet.dev.analyzer.data.repository.storage.helpers import com.meet.dev.analyzer.data.datastore.PathPreferenceManger -import com.meet.dev.analyzer.data.models.storage.* +import com.meet.dev.analyzer.data.models.storage.CachesGradleWrapperInfo +import com.meet.dev.analyzer.data.models.storage.CachesGradleWrapperItem +import com.meet.dev.analyzer.data.models.storage.DaemonInfo +import com.meet.dev.analyzer.data.models.storage.DaemonItem +import com.meet.dev.analyzer.data.models.storage.GradleInfo +import com.meet.dev.analyzer.data.models.storage.GradleLibraryInfo +import com.meet.dev.analyzer.data.models.storage.GradleModulesInfo +import com.meet.dev.analyzer.data.models.storage.GradleVersionInfo +import com.meet.dev.analyzer.data.models.storage.JdkInfo +import com.meet.dev.analyzer.data.models.storage.JdkItem +import com.meet.dev.analyzer.data.models.storage.OtherGradleFolderInfo +import com.meet.dev.analyzer.data.models.storage.OtherGradleFolderItem +import com.meet.dev.analyzer.data.models.storage.WrapperInfo +import com.meet.dev.analyzer.data.models.storage.WrapperItem import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils @@ -55,7 +68,8 @@ class GradleAnalyzer( val versionInfos = try { versions.map { version -> val versionDir = File(artifactDir, version) - val versionSizeBytes = FolderFileUtils.calculateFolderSize(versionDir, isCommend = false) + val versionSizeBytes = + FolderFileUtils.calculateFolderSize(versionDir, isCommend = false) GradleVersionInfo( version = version, path = versionDir.absolutePath, @@ -66,7 +80,8 @@ class GradleAnalyzer( } catch (e: VersionFormatException) { versions.map { version -> val versionDir = File(artifactDir, version) - val versionSizeBytes = FolderFileUtils.calculateFolderSize(versionDir, isCommend = false) + val versionSizeBytes = + FolderFileUtils.calculateFolderSize(versionDir, isCommend = false) GradleVersionInfo( version = version, path = versionDir.absolutePath, @@ -81,7 +96,7 @@ class GradleAnalyzer( artifactId = artifactId, versions = versionInfos, path = artifactDir.absolutePath, - sizeReadable = FolderFileUtils.formatSize(artifactSizeBytes), + sizeReadable = FolderFileUtils.formatSize(artifactSizeBytes), totalSizeBytes = artifactSizeBytes ) } @@ -231,6 +246,7 @@ class GradleAnalyzer( it.sizeBytes } ?: emptyList() } + suspend fun analyzeGradleData(): GradleInfo = withContext(Dispatchers.IO) { val emptyGradleInfo = GradleInfo( sizeReadable = "0 B", diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/IdeAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/IdeAnalyzer.kt index 85e248d..1151788 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/IdeAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/IdeAnalyzer.kt @@ -1,7 +1,9 @@ package com.meet.dev.analyzer.data.repository.storage.helpers import com.meet.dev.analyzer.data.datastore.PathPreferenceManger -import com.meet.dev.analyzer.data.models.storage.* +import com.meet.dev.analyzer.data.models.storage.IdeDataInfo +import com.meet.dev.analyzer.data.models.storage.IdeGroup +import com.meet.dev.analyzer.data.models.storage.IdeInstallation import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/KonanAnalyzer.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/KonanAnalyzer.kt index c336b37..057b5f8 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/KonanAnalyzer.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/storage/helpers/KonanAnalyzer.kt @@ -1,7 +1,11 @@ package com.meet.dev.analyzer.data.repository.storage.helpers import com.meet.dev.analyzer.data.datastore.PathPreferenceManger -import com.meet.dev.analyzer.data.models.storage.* +import com.meet.dev.analyzer.data.models.storage.DependenciesInfo +import com.meet.dev.analyzer.data.models.storage.DependenciesItem +import com.meet.dev.analyzer.data.models.storage.KonanInfo +import com.meet.dev.analyzer.data.models.storage.KotlinNativeInfo +import com.meet.dev.analyzer.data.models.storage.KotlinNativeItem import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/workspace/WorkspaceRepositoryImpl.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/workspace/WorkspaceRepositoryImpl.kt index ec63b27..013e1c4 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/workspace/WorkspaceRepositoryImpl.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/data/repository/workspace/WorkspaceRepositoryImpl.kt @@ -1,22 +1,23 @@ package com.meet.dev.analyzer.data.repository.workspace -import com.meet.dev.analyzer.data.datastore.PathPreferenceManger import com.meet.dev.analyzer.data.models.project.ProjectOverviewInfo import com.meet.dev.analyzer.data.models.workspace.ResourceCategory import com.meet.dev.analyzer.data.models.workspace.UnusedResourceItem import com.meet.dev.analyzer.data.models.workspace.WorkspaceAnalysisResult -import com.meet.dev.analyzer.data.repository.project.helpers.* -import com.meet.dev.analyzer.data.repository.storage.helpers.* +import com.meet.dev.analyzer.data.repository.project.helpers.ProjectFileScanner +import com.meet.dev.analyzer.data.repository.project.helpers.ProjectOverviewAnalyzer +import com.meet.dev.analyzer.data.repository.project.helpers.VersionCatalogParser +import com.meet.dev.analyzer.data.repository.storage.helpers.AndroidSdkAnalyzer +import com.meet.dev.analyzer.data.repository.storage.helpers.GradleAnalyzer +import com.meet.dev.analyzer.data.repository.storage.helpers.KonanAnalyzer import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName import com.meet.dev.analyzer.utility.platform.FolderFileUtils import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File -import kotlin.random.Random class WorkspaceRepositoryImpl( - private val pathPreferenceManger: PathPreferenceManger, private val projectFileScanner: ProjectFileScanner, private val versionCatalogParser: VersionCatalogParser, private val projectOverviewAnalyzer: ProjectOverviewAnalyzer, @@ -64,7 +65,8 @@ class WorkspaceRepositoryImpl( val moduleBuildFileInfos = projectFileScanner.findModuleBuildFiles(projectDir) val settingsGradleFileInfo = projectFileScanner.findSettingsGradleFiles(projectDir) - val gradleWrapperPropertiesFileInfo = projectFileScanner.findGradleWrapperProFile(projectDir) + val gradleWrapperPropertiesFileInfo = + projectFileScanner.findGradleWrapperProFile(projectDir) val versionCatalogFileInfo = projectFileScanner.findVersionCatalogFile(projectDir) val versionCatalog = versionCatalogParser.findVersionCatalog(versionCatalogFileInfo) @@ -79,7 +81,7 @@ class WorkspaceRepositoryImpl( projects.add(overview) - overview.compileSdkVersion?.let { + overview.compileSdkVersion?.let { usedCompileSdks.add(it) // Auto-infer primary build-tools version matching compileSdk usedBuildTools.add("$it.0.0") @@ -112,15 +114,22 @@ class WorkspaceRepositoryImpl( val sdkInfo = androidSdkAnalyzer.analyzeAndroidSdkData() val apiRegex = Regex("""android-(\d+)""") sdkInfo.platformInfo.platforms.forEach { item -> - val apiVal = apiRegex.find(item.name)?.groupValues?.get(1) ?: item.name.substringAfter("android-") + val apiVal = apiRegex.find(item.name)?.groupValues?.get(1) + ?: item.name.substringAfter("android-") val isUsed = usedCompileSdks.contains(apiVal) || usedCompileSdks.any { it.contains(apiVal) } || - usedTargetSdks.contains(apiVal) || usedTargetSdks.any { it.contains(apiVal) } || + usedTargetSdks.contains(apiVal) || usedTargetSdks.any { + it.contains( + apiVal + ) + } || usedMinSdks.contains(apiVal) || usedMinSdks.any { it.contains(apiVal) } val usingProjects = if (isUsed) { projects.filter { it.compileSdkVersion == apiVal || it.compileSdkVersion?.contains(apiVal) == true || - it.targetSdkVersion == apiVal || it.targetSdkVersion?.contains(apiVal) == true || + it.targetSdkVersion == apiVal || it.targetSdkVersion?.contains( + apiVal + ) == true || it.minSdkVersion == apiVal || it.minSdkVersion?.contains(apiVal) == true }.map { it.projectName } } else emptyList() @@ -140,11 +149,14 @@ class WorkspaceRepositoryImpl( onProgress(0.7f, "Scanning installed Android SDK Build Tools...") sdkInfo.buildToolInfo.buildTools.forEach { item -> val buildToolsVersion = item.name - val isUsed = usedBuildTools.contains(buildToolsVersion) || usedCompileSdks.any { sdk -> buildToolsVersion.startsWith("$sdk.") } + val isUsed = + usedBuildTools.contains(buildToolsVersion) || usedCompileSdks.any { sdk -> + buildToolsVersion.startsWith("$sdk.") + } val usingProjects = if (isUsed) { projects.filter { it.buildToolsSdk == buildToolsVersion || - it.compileSdkVersion?.let { sdk -> buildToolsVersion.startsWith("$sdk.") } == true + it.compileSdkVersion?.let { sdk -> buildToolsVersion.startsWith("$sdk.") } == true }.map { it.projectName } } else emptyList() val resource = UnusedResourceItem( @@ -180,7 +192,8 @@ class WorkspaceRepositoryImpl( if (isUsed) activeResources.add(resource) else unusedResources.add(resource) // Check for matching version cache folder - val cacheItem = gradleInfo.cachesGradleWrapperInfo.cachesGradleWrapperItems.find { it.version == version } + val cacheItem = + gradleInfo.cachesGradleWrapperInfo.cachesGradleWrapperItems.find { it.version == version } if (cacheItem != null) { val cacheResource = UnusedResourceItem( name = "Gradle Cache $version", @@ -191,7 +204,9 @@ class WorkspaceRepositoryImpl( sizeFormatted = cacheItem.sizeReadable, usedByProjects = usingProjects ) - if (isUsed) activeResources.add(cacheResource) else unusedResources.add(cacheResource) + if (isUsed) activeResources.add(cacheResource) else unusedResources.add( + cacheResource + ) } } @@ -280,9 +295,14 @@ class WorkspaceRepositoryImpl( onProgress(0.96f, "Scanning Android SDK Sources...") sdkInfo.sourcesInfo.sources.forEach { item -> val version = item.name - val isUsed = usedCompileSdks.contains(version) || usedCompileSdks.any { it.contains(version) } + val isUsed = + usedCompileSdks.contains(version) || usedCompileSdks.any { it.contains(version) } val usingProjects = if (isUsed) { - projects.filter { it.compileSdkVersion == version || it.compileSdkVersion?.contains(version) == true }.map { it.projectName } + projects.filter { + it.compileSdkVersion == version || it.compileSdkVersion?.contains( + version + ) == true + }.map { it.projectName } } else emptyList() val resource = UnusedResourceItem( name = "Android SDK Sources $version", @@ -308,22 +328,26 @@ class WorkspaceRepositoryImpl( } } - override suspend fun deleteResource(path: String): Pair = withContext(Dispatchers.IO) { - return@withContext try { - val file = File(path) - if (!file.exists()) { - Pair(false, "Path does not exist: $path") - } else { - val success = file.deleteRecursively() - if (success) { - Pair(true, null) + override suspend fun deleteResource(path: String): Pair = + withContext(Dispatchers.IO) { + return@withContext try { + val file = File(path) + if (!file.exists()) { + Pair(false, "Path does not exist: $path") } else { - Pair(false, "Failed to delete files recursively. Check permissions or file usage lock.") + val success = file.deleteRecursively() + if (success) { + Pair(true, null) + } else { + Pair( + false, + "Failed to delete files recursively. Check permissions or file usage lock." + ) + } } + } catch (e: Exception) { + AppLogger.e(TAG, e) { "Exception deleting path: $path" } + Pair(false, e.message) } - } catch (e: Exception) { - AppLogger.e(TAG, e) { "Exception deleting path: $path" } - Pair(false, e.message) } - } } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/LoggingModule.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/LoggingModule.kt index a9ff049..8f147ff 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/LoggingModule.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/LoggingModule.kt @@ -6,14 +6,13 @@ import co.touchlab.kermit.StaticConfig import co.touchlab.kermit.platformLogWriter import com.meet.dev.analyzer.utility.crash_report.FileLogWriter import com.meet.dev.analyzer.utility.crash_report.SentryLogWriter -import com.meet.dev.analyzer.utility.platform.AppEnvironment import com.meet.dev.analyzer.utility.platform.DesktopConfig import org.koin.core.module.Module import org.koin.dsl.module // this method not use. it not need it SentryLogWriter and FileLogWriter move core module, and logger object is not need it to koin fun getLoggingModule( - desktopConfig: DesktopConfig, + desktopConfig: DesktopConfig, ): Module = module { single { SentryLogWriter() } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/RepositoryModule.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/RepositoryModule.kt index 4a9900a..65c9626 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/RepositoryModule.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/di/RepositoryModule.kt @@ -2,20 +2,28 @@ package com.meet.dev.analyzer.di import com.meet.dev.analyzer.data.repository.cleanbuild.CleanBuildRepository import com.meet.dev.analyzer.data.repository.cleanbuild.CleanBuildRepositoryImpl +import com.meet.dev.analyzer.data.repository.feedback.FeedbackRepository +import com.meet.dev.analyzer.data.repository.feedback.FeedbackRepositoryImpl import com.meet.dev.analyzer.data.repository.project.ProjectAnalyzerRepository import com.meet.dev.analyzer.data.repository.project.ProjectAnalyzerRepositoryImpl -import com.meet.dev.analyzer.data.repository.project.helpers.* +import com.meet.dev.analyzer.data.repository.project.helpers.DependencyAnalyzer +import com.meet.dev.analyzer.data.repository.project.helpers.PluginAnalyzer +import com.meet.dev.analyzer.data.repository.project.helpers.ProjectFileScanner +import com.meet.dev.analyzer.data.repository.project.helpers.ProjectOverviewAnalyzer +import com.meet.dev.analyzer.data.repository.project.helpers.VersionCatalogParser import com.meet.dev.analyzer.data.repository.setting.SettingsRepository import com.meet.dev.analyzer.data.repository.setting.SettingsRepositoryImpl import com.meet.dev.analyzer.data.repository.storage.StorageAnalyzerRepository import com.meet.dev.analyzer.data.repository.storage.StorageAnalyzerRepositoryImpl -import com.meet.dev.analyzer.data.repository.storage.helpers.* -import com.meet.dev.analyzer.data.repository.workspace.WorkspaceRepository -import com.meet.dev.analyzer.data.repository.workspace.WorkspaceRepositoryImpl -import com.meet.dev.analyzer.data.repository.feedback.FeedbackRepository -import com.meet.dev.analyzer.data.repository.feedback.FeedbackRepositoryImpl +import com.meet.dev.analyzer.data.repository.storage.helpers.AndroidSdkAnalyzer +import com.meet.dev.analyzer.data.repository.storage.helpers.AvdAnalyzer +import com.meet.dev.analyzer.data.repository.storage.helpers.GradleAnalyzer +import com.meet.dev.analyzer.data.repository.storage.helpers.IdeAnalyzer +import com.meet.dev.analyzer.data.repository.storage.helpers.KonanAnalyzer import com.meet.dev.analyzer.data.repository.updater.UpdaterRepository import com.meet.dev.analyzer.data.repository.updater.UpdaterRepositoryImpl +import com.meet.dev.analyzer.data.repository.workspace.WorkspaceRepository +import com.meet.dev.analyzer.data.repository.workspace.WorkspaceRepositoryImpl import org.koin.core.module.dsl.singleOf import org.koin.dsl.bind import org.koin.dsl.module diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/CustomToolTip.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/CustomToolTip.kt index 6d86565..6390ac3 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/CustomToolTip.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/CustomToolTip.kt @@ -4,6 +4,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.MaterialTheme import androidx.compose.material3.RichTooltip import androidx.compose.material3.Text +import androidx.compose.material3.TooltipAnchorPosition import androidx.compose.material3.TooltipBox import androidx.compose.material3.TooltipDefaults import androidx.compose.material3.rememberTooltipState @@ -17,7 +18,9 @@ fun CustomToolTip( content: @Composable () -> Unit ) { TooltipBox( - positionProvider = TooltipDefaults.rememberRichTooltipPositionProvider(), + positionProvider = TooltipDefaults.rememberTooltipPositionProvider( + positioning = TooltipAnchorPosition.Above + ), tooltip = { RichTooltip( title = { @@ -32,7 +35,7 @@ fun CustomToolTip( style = MaterialTheme.typography.bodySmall ) }, -// caretSize = DpSize(16.dp, 8.dp), + caretShape = TooltipDefaults.caretShape(caretSize = TooltipDefaults.caretSize), colors = TooltipDefaults.richTooltipColors( containerColor = MaterialTheme.colorScheme.surfaceVariant, contentColor = MaterialTheme.colorScheme.onSurface, @@ -42,7 +45,7 @@ fun CustomToolTip( ) }, state = rememberTooltipState( - isPersistent = true + isPersistent = false ), content = content ) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/EmptyStateCardLayout.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/EmptyStateCardLayout.kt index 40610d7..2724506 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/EmptyStateCardLayout.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/EmptyStateCardLayout.kt @@ -8,8 +8,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Search import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/ReviewDialog.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/ReviewDialog.kt index ef2f482..2f62ef4 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/ReviewDialog.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/ReviewDialog.kt @@ -1,5 +1,9 @@ package com.meet.dev.analyzer.presentation.components +import androidx.compose.animation.core.Animatable +import androidx.compose.animation.core.Spring +import androidx.compose.animation.core.spring +import androidx.compose.animation.core.tween import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -13,7 +17,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.CheckCircle import androidx.compose.material.icons.filled.Star import androidx.compose.material3.AlertDialog import androidx.compose.material3.Button @@ -25,6 +28,7 @@ import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -32,23 +36,18 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.graphicsLayer -import androidx.compose.runtime.LaunchedEffect -import androidx.compose.animation.core.Animatable -import androidx.compose.animation.core.spring -import androidx.compose.animation.core.Spring -import androidx.compose.animation.core.tween import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.meet.dev.analyzer.data.models.feedback.FeedbackData import com.meet.dev.analyzer.data.repository.feedback.FeedbackRepository +import kotlinx.coroutines.launch import org.koin.compose.koinInject import java.awt.Cursor -import kotlinx.coroutines.launch @Composable fun ReviewDialog( @@ -185,11 +184,19 @@ fun ReviewDialog( Icon( imageVector = Icons.Default.Star, contentDescription = "$index Stars", - tint = if (isSelected) Color(0xFFF7C325) else MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = 0.3f), + tint = if (isSelected) Color(0xFFF7C325) else MaterialTheme.colorScheme.onSurfaceVariant.copy( + alpha = 0.3f + ), modifier = Modifier .size(32.dp) .clickable { rating = index } - .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + .pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) } } @@ -259,13 +266,20 @@ fun ReviewDialog( modifier = Modifier .weight(1f) .clickable { - mostUsedFeatures = if (mostUsedFeatures.contains(feature)) { - mostUsedFeatures - feature - } else { - mostUsedFeatures + feature - } + mostUsedFeatures = + if (mostUsedFeatures.contains(feature)) { + mostUsedFeatures - feature + } else { + mostUsedFeatures + feature + } } - .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))), + .pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ), verticalAlignment = Alignment.CenterVertically ) { Checkbox( @@ -340,7 +354,13 @@ fun ReviewDialog( if (submitSuccess) { Button( onClick = onDismiss, - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Text("Close") } @@ -352,7 +372,13 @@ fun ReviewDialog( TextButton( onClick = onDismiss, enabled = !isSubmitting, - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Text("Cancel") } @@ -377,14 +403,21 @@ fun ReviewDialog( onReviewSubmitted(rating) submitSuccess = true } else { - submitError = result.exceptionOrNull()?.message ?: "Unknown network error" + submitError = result.exceptionOrNull()?.message + ?: "Unknown network error" } isSubmitting = false } } }, enabled = isFormValid && !isSubmitting, - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { if (isSubmitting) { CircularProgressIndicator( diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/SponsorTipCard.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/SponsorTipCard.kt index c5fb740..5998c55 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/SponsorTipCard.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/components/SponsorTipCard.kt @@ -72,7 +72,13 @@ fun SponsorTipCard( TextButton( onClick = { uriHandler.openUri(AppLinks.DONATE) }, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp), - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Icon( imageVector = Icons.Default.Favorite, @@ -92,7 +98,13 @@ fun SponsorTipCard( TextButton( onClick = { uriHandler.openUri(AppLinks.DONATE_COFFEE) }, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp), - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Icon( imageVector = Icons.Default.LocalCafe, @@ -112,7 +124,13 @@ fun SponsorTipCard( TextButton( onClick = { uriHandler.openUri(AppLinks.DONATE_PAYPAL) }, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp), - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Icon( imageVector = Icons.Default.CreditCard, @@ -133,7 +151,13 @@ fun SponsorTipCard( TextButton( onClick = onShareFeedbackClick, contentPadding = PaddingValues(horizontal = 8.dp, vertical = 4.dp), - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Icon( imageVector = Icons.Default.RateReview, diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/navigation/AppNavigation.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/navigation/AppNavigation.kt index efee28d..454ef7e 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/navigation/AppNavigation.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/navigation/AppNavigation.kt @@ -28,7 +28,7 @@ import com.meet.dev.analyzer.presentation.screen.workspace.WorkspaceScreen fun AppNavigation( isDarkMode: Boolean, onThemeChange: () -> Unit, - updateDialogWithNavigation: @Composable (NavigationItem?) -> Unit + updateDialogWithNavigation: @Composable (NavigationItem?) -> Unit ) { val navController = rememberNavController() val navBackStackEntry by navController.currentBackStackEntryAsState() diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/UpdateDialogState.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/UpdateDialogState.kt index 87b6888..e8b2f25 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/UpdateDialogState.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/UpdateDialogState.kt @@ -2,7 +2,9 @@ package com.meet.dev.analyzer.presentation.screen.app sealed class UpdateDialogState { data object Checking : UpdateDialogState() - data class Available(val version: String, val releaseNotes: String, val htmlUrl: String) : UpdateDialogState() + data class Available(val version: String, val releaseNotes: String, val htmlUrl: String) : + UpdateDialogState() + data object UpToDate : UpdateDialogState() data class Error(val message: String) : UpdateDialogState() } \ No newline at end of file diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/components/UpdateDialog.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/components/UpdateDialog.kt index 7c64ed6..8e365d8 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/components/UpdateDialog.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/app/components/UpdateDialog.kt @@ -30,7 +30,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.platform.LocalUriHandler diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildIntent.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildIntent.kt index 3ba917b..0753b12 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildIntent.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildIntent.kt @@ -11,8 +11,10 @@ sealed interface CleanBuildIntent { val moduleIndex: Int, val isSelected: Boolean ) : CleanBuildIntent + data class OnSelectAllInProject(val uniqueId: String, val isSelected: Boolean) : CleanBuildIntent + data object OnSelectAllProjects : CleanBuildIntent data object OnDeselectAllProjects : CleanBuildIntent data object OnDeleteClicked : CleanBuildIntent @@ -23,8 +25,8 @@ sealed interface CleanBuildIntent { data object OnToggleProjectSelection : CleanBuildIntent // Analytics event trackers - data object TrackFeedbackOpened : CleanBuildIntent - data object TrackReviewPromptShown : CleanBuildIntent - data object TrackFeedbackCancelled : CleanBuildIntent + data object TrackFeedbackOpened : CleanBuildIntent + data object TrackReviewPromptShown : CleanBuildIntent + data object TrackFeedbackCancelled : CleanBuildIntent data object TrackCleanBuildOpened : CleanBuildIntent } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildScreen.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildScreen.kt index 3cd091c..fe59c0a 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildScreen.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildScreen.kt @@ -22,19 +22,18 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon -import androidx.compose.runtime.setValue -import androidx.compose.runtime.mutableStateOf -import com.meet.dev.analyzer.presentation.components.ReviewDialog -import com.meet.dev.analyzer.utility.crash_report.CustomProperties import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.NavBackStackEntry import com.meet.dev.analyzer.presentation.components.EmptyStateCardLayout +import com.meet.dev.analyzer.presentation.components.ReviewDialog import com.meet.dev.analyzer.presentation.components.TopAppBar import com.meet.dev.analyzer.presentation.components.VerticalScrollBarLayout import com.meet.dev.analyzer.presentation.screen.cleanbuild.components.ActionsCardLayout @@ -43,6 +42,7 @@ import com.meet.dev.analyzer.presentation.screen.cleanbuild.components.DeleteFlo import com.meet.dev.analyzer.presentation.screen.cleanbuild.components.DeletionProgressDialog import com.meet.dev.analyzer.presentation.screen.cleanbuild.components.ProjectGroupItemLayout import com.meet.dev.analyzer.presentation.screen.cleanbuild.components.ProjectsSelectionSection +import com.meet.dev.analyzer.utility.crash_report.CustomProperties import io.github.vinceglb.filekit.PlatformFile import io.github.vinceglb.filekit.dialogs.compose.rememberDirectoryPickerLauncher import io.github.vinceglb.filekit.path @@ -66,7 +66,9 @@ fun CleanBuildScreen( viewModel.handleIntent(CleanBuildIntent.TrackCleanBuildOpened) } - val lastSubmittedVersion by uiState.lastSubmittedReviewVersion.collectAsStateWithLifecycle(initialValue = "") + val lastSubmittedVersion by uiState.lastSubmittedReviewVersion.collectAsStateWithLifecycle( + initialValue = "" + ) val desktopConfig = remember { CustomProperties.createAppConfig(CustomProperties.loadProperties()) } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildViewModel.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildViewModel.kt index 3b8bd10..2595638 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildViewModel.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/cleanbuild/CleanBuildViewModel.kt @@ -67,10 +67,10 @@ class CleanBuildViewModel( CleanBuildIntent.OnToggleProjectSelection -> handleToggleProjectSelection() // Analytics event trackers - CleanBuildIntent.TrackFeedbackOpened -> analyticsManager.capture(AnalyticsEvent.FeedbackOpened) + CleanBuildIntent.TrackFeedbackOpened -> analyticsManager.capture(AnalyticsEvent.FeedbackOpened) CleanBuildIntent.TrackFeedbackCancelled -> analyticsManager.capture(AnalyticsEvent.FeedbackCancelled) CleanBuildIntent.TrackReviewPromptShown -> analyticsManager.capture(AnalyticsEvent.ReviewPromptShown) - CleanBuildIntent.TrackCleanBuildOpened -> analyticsManager.capture(AnalyticsEvent.CleanBuildOpened) + CleanBuildIntent.TrackCleanBuildOpened -> analyticsManager.capture(AnalyticsEvent.CleanBuildOpened) } } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/project/components/ProjectOverviewTabContent.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/project/components/ProjectOverviewTabContent.kt index 3b5a978..1dfb529 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/project/components/ProjectOverviewTabContent.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/project/components/ProjectOverviewTabContent.kt @@ -160,7 +160,7 @@ fun ProjectOverviewCard( } } } - } + } } @Composable @@ -185,19 +185,19 @@ private fun ProjectConfigurationCard(projectOverviewInfo: ProjectOverviewInfo) { ) ) { - Column( - modifier = Modifier.padding(16.dp), - verticalArrangement = Arrangement.spacedBy(12.dp) - ) { - SectionTitle( - title = "Build Configuration", - icon = Icons.Default.Code - ) - DetailGrid( - items = configurationItems, - columnCount = 5 - ) - } + Column( + modifier = Modifier.padding(16.dp), + verticalArrangement = Arrangement.spacedBy(12.dp) + ) { + SectionTitle( + title = "Build Configuration", + icon = Icons.Default.Code + ) + DetailGrid( + items = configurationItems, + columnCount = 5 + ) + } } } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsScreen.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsScreen.kt index 6a8593a..9f66e92 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsScreen.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsScreen.kt @@ -70,7 +70,6 @@ import com.meet.dev.analyzer.presentation.screen.setting.components.SocialLinkBu import com.meet.dev.analyzer.presentation.screen.setting.components.SwitchSettingItem import com.meet.dev.analyzer.utility.AppLinks import com.meet.dev.analyzer.utility.AppLinks.socialLinks -import com.meet.dev.analyzer.utility.crash_report.CustomProperties import com.meet.dev.analyzer.utility.getDefaultAndroidSdkPath import com.meet.dev.analyzer.utility.getDefaultAvdLocationPath import com.meet.dev.analyzer.utility.getDefaultGoogleFolderPaths @@ -99,9 +98,9 @@ fun SettingsScreen( } SettingsScreenContent( - pathUiState = pathUiState, + pathUiState = pathUiState, settingsUiState = settingsUiState, - onEvent = viewModel::onIntent, + onEvent = viewModel::onIntent, ) } @@ -700,7 +699,13 @@ fun SettingsScreenContent( modifier = Modifier .weight(1f) .height(48.dp) - .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))), + .pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ), colors = ButtonDefaults.buttonColors( containerColor = MaterialTheme.colorScheme.tertiary, contentColor = MaterialTheme.colorScheme.onTertiary @@ -727,7 +732,13 @@ fun SettingsScreenContent( modifier = Modifier .weight(1f) .height(48.dp) - .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))), + .pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ), colors = ButtonDefaults.buttonColors( containerColor = MaterialTheme.colorScheme.secondary, contentColor = MaterialTheme.colorScheme.onSecondary @@ -754,7 +765,13 @@ fun SettingsScreenContent( modifier = Modifier .weight(1f) .height(48.dp) - .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))), + .pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ), colors = ButtonDefaults.buttonColors( containerColor = MaterialTheme.colorScheme.primary, contentColor = MaterialTheme.colorScheme.onPrimary diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsUiIntent.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsUiIntent.kt index 542ce97..f67e9d0 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsUiIntent.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsUiIntent.kt @@ -33,11 +33,11 @@ sealed interface SettingsUiIntent { data class SaveReviewVersion(val version: String, val rating: Int) : SettingsUiIntent // Analytics event trackers - data object TrackSettingsOpened : SettingsUiIntent - data object TrackGitHubSponsor : SettingsUiIntent - data object TrackBuyMeCoffee : SettingsUiIntent - data object TrackPaypal : SettingsUiIntent - data object TrackReviewPromptShown : SettingsUiIntent - data object TrackFeedbackOpened : SettingsUiIntent - data object TrackFeedbackCancelled : SettingsUiIntent + data object TrackSettingsOpened : SettingsUiIntent + data object TrackGitHubSponsor : SettingsUiIntent + data object TrackBuyMeCoffee : SettingsUiIntent + data object TrackPaypal : SettingsUiIntent + data object TrackReviewPromptShown : SettingsUiIntent + data object TrackFeedbackOpened : SettingsUiIntent + data object TrackFeedbackCancelled : SettingsUiIntent } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsViewModel.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsViewModel.kt index 3d3c253..f1e2649 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsViewModel.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/setting/SettingsViewModel.kt @@ -98,7 +98,10 @@ class SettingsViewModel( is SettingsUiIntent.CheckForUpdates -> checkForUpdates() is SettingsUiIntent.ShowPathPicker -> showPathPicker(intent.path, intent.type) - is SettingsUiIntent.SaveReviewVersion -> saveReviewVersion(intent.version, intent.rating) + is SettingsUiIntent.SaveReviewVersion -> saveReviewVersion( + intent.version, + intent.rating + ) // Analytics event trackers SettingsUiIntent.TrackSettingsOpened -> analyticsManager.capture(AnalyticsEvent.SettingsOpened) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceIntent.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceIntent.kt index 427a27e..74b8dc5 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceIntent.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceIntent.kt @@ -8,8 +8,12 @@ sealed interface WorkspaceIntent { data class OnRemovePath(val path: String) : WorkspaceIntent data object OnClearPaths : WorkspaceIntent data object OnAnalyzeWorkspace : WorkspaceIntent - data class OnResourceSelectionChange(val uniqueId: String, val isSelected: Boolean) : WorkspaceIntent - data class OnCategorySelectionChange(val category: ResourceCategory, val isSelected: Boolean) : WorkspaceIntent + data class OnResourceSelectionChange(val uniqueId: String, val isSelected: Boolean) : + WorkspaceIntent + + data class OnCategorySelectionChange(val category: ResourceCategory, val isSelected: Boolean) : + WorkspaceIntent + data object OnSelectAll : WorkspaceIntent data object OnDeselectAll : WorkspaceIntent data object OnDeleteClicked : WorkspaceIntent @@ -24,8 +28,8 @@ sealed interface WorkspaceIntent { data object OnClearHighlights : WorkspaceIntent // Analytics event trackers - data object TrackFeedbackOpened : WorkspaceIntent - data object TrackReviewPromptShown : WorkspaceIntent - data object TrackFeedbackCancelled : WorkspaceIntent + data object TrackFeedbackOpened : WorkspaceIntent + data object TrackReviewPromptShown : WorkspaceIntent + data object TrackFeedbackCancelled : WorkspaceIntent data object TrackWorkspaceAnalyzerOpened : WorkspaceIntent } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceScreen.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceScreen.kt index e42ddc0..6b85b2c 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceScreen.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceScreen.kt @@ -58,7 +58,9 @@ fun WorkspaceScreen( viewModel.handleIntent(WorkspaceIntent.TrackWorkspaceAnalyzerOpened) } - val lastSubmittedVersion by uiState.lastSubmittedReviewVersion.collectAsStateWithLifecycle(initialValue = "") + val lastSubmittedVersion by uiState.lastSubmittedReviewVersion.collectAsStateWithLifecycle( + initialValue = "" + ) val desktopConfig = remember { CustomProperties.createAppConfig(CustomProperties.loadProperties()) } @@ -86,7 +88,13 @@ fun WorkspaceScreen( actions = { if (uiState.projects.isNotEmpty() || uiState.unusedResources.isNotEmpty() || uiState.activeResources.isNotEmpty()) { IconButton( - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))), + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ), onClick = { isSelectionPanelExpanded = !isSelectionPanelExpanded } ) { Icon( @@ -99,7 +107,11 @@ fun WorkspaceScreen( ) }, floatingActionButton = { - val visibleSelectedCount by remember(uiState.resourceFilter, uiState.unusedResources, uiState.activeResources) { + val visibleSelectedCount by remember( + uiState.resourceFilter, + uiState.unusedResources, + uiState.activeResources + ) { derivedStateOf { val combined = when (uiState.resourceFilter) { ResourceFilter.ALL -> uiState.unusedResources + uiState.activeResources @@ -109,7 +121,11 @@ fun WorkspaceScreen( combined.count { it.isSelected } } } - val visibleSelectedSizeReadable by remember(uiState.resourceFilter, uiState.unusedResources, uiState.activeResources) { + val visibleSelectedSizeReadable by remember( + uiState.resourceFilter, + uiState.unusedResources, + uiState.activeResources + ) { derivedStateOf { val combined = when (uiState.resourceFilter) { ResourceFilter.ALL -> uiState.unusedResources + uiState.activeResources diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceViewModel.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceViewModel.kt index 4aacc4a..eb3ac3a 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceViewModel.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/WorkspaceViewModel.kt @@ -24,7 +24,6 @@ import kotlinx.coroutines.isActive import kotlinx.coroutines.launch import kotlinx.io.IOException import java.io.File -import kotlin.time.Duration.Companion.seconds import kotlin.time.TimeSource class WorkspaceViewModel( @@ -107,7 +106,7 @@ class WorkspaceViewModel( WorkspaceIntent.OnClearHighlights -> _uiState.update { it.copy(highlightedProjectName = null) } // Analytics event trackers - WorkspaceIntent.TrackFeedbackOpened -> analyticsManager.capture(AnalyticsEvent.FeedbackOpened) + WorkspaceIntent.TrackFeedbackOpened -> analyticsManager.capture(AnalyticsEvent.FeedbackOpened) WorkspaceIntent.TrackFeedbackCancelled -> analyticsManager.capture(AnalyticsEvent.FeedbackCancelled) WorkspaceIntent.TrackReviewPromptShown -> analyticsManager.capture(AnalyticsEvent.ReviewPromptShown) WorkspaceIntent.TrackWorkspaceAnalyzerOpened -> analyticsManager.capture(AnalyticsEvent.WorkspaceAnalyzerOpened) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/CategoryHeaderItem.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/CategoryHeaderItem.kt index e54bd8d..e4aa1bf 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/CategoryHeaderItem.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/CategoryHeaderItem.kt @@ -30,7 +30,6 @@ import com.meet.dev.analyzer.data.models.workspace.ResourceCategory import com.meet.dev.analyzer.data.models.workspace.UnusedResourceItem import com.meet.dev.analyzer.presentation.components.CustomToolTip import com.meet.dev.analyzer.presentation.screen.workspace.WorkspaceIntent -import com.meet.dev.analyzer.presentation.theme.DevAnalyzerTheme import com.meet.dev.analyzer.utility.platform.FolderFileUtils.formatSize import java.awt.Cursor @@ -66,7 +65,8 @@ fun CategoryHeaderItem( ) { if (!isReadOnly) { val allCategorySelected = remember(items) { items.all { it.isSelected } } - val someCategorySelected = remember(items) { items.any { it.isSelected } && !allCategorySelected } + val someCategorySelected = + remember(items) { items.any { it.isSelected } && !allCategorySelected } val categorySelectState = remember(allCategorySelected, someCategorySelected) { when { @@ -79,9 +79,20 @@ fun CategoryHeaderItem( TriStateCheckbox( state = categorySelectState, onClick = { - onIntent(WorkspaceIntent.OnCategorySelectionChange(category, !allCategorySelected)) + onIntent( + WorkspaceIntent.OnCategorySelectionChange( + category, + !allCategorySelected + ) + ) }, - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) } Text( diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ProjectInfoCard.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ProjectInfoCard.kt index 1eff787..cfa60df 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ProjectInfoCard.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ProjectInfoCard.kt @@ -22,13 +22,11 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import com.meet.dev.analyzer.data.models.project.ProjectOverviewInfo -import com.meet.dev.analyzer.presentation.theme.DevAnalyzerTheme import com.meet.dev.analyzer.utility.platform.FolderFileUtils.openFile import java.awt.Cursor @@ -99,7 +97,8 @@ fun ProjectInfoCard( "Compile SDK" to project.compileSdkVersion, "Target SDK" to project.targetSdkVersion, "Min SDK" to project.minSdkVersion, - "Build Tools" to (project.buildToolsSdk ?: project.compileSdkVersion?.let { "$it.0.0 (Auto)" }), + "Build Tools" to (project.buildToolsSdk + ?: project.compileSdkVersion?.let { "$it.0.0 (Auto)" }), "Gradle Version" to project.gradleVersion, "Kotlin version" to project.kotlinVersion, "AGP version" to project.androidGradlePluginVersion, diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ResourceItemCard.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ResourceItemCard.kt index 1afa22e..f3e5e6b 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ResourceItemCard.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/ResourceItemCard.kt @@ -40,7 +40,6 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import com.meet.dev.analyzer.data.models.workspace.UnusedResourceItem import com.meet.dev.analyzer.presentation.screen.workspace.WorkspaceIntent -import com.meet.dev.analyzer.presentation.theme.DevAnalyzerTheme import com.meet.dev.analyzer.utility.platform.FolderFileUtils.openFile import java.awt.Cursor @@ -136,7 +135,7 @@ fun ResourceItemCard( imageVector = Icons.Default.Lock, contentDescription = "Active / Protected", tint = if (isSelectedActive) MaterialTheme.colorScheme.error - else MaterialTheme.colorScheme.secondary.copy(alpha = 0.7f), + else MaterialTheme.colorScheme.secondary.copy(alpha = 0.7f), modifier = Modifier.size(14.dp) ) } @@ -147,7 +146,7 @@ fun ResourceItemCard( style = MaterialTheme.typography.bodyMedium, fontWeight = FontWeight.Bold, color = if (isSelectedActive) MaterialTheme.colorScheme.error - else MaterialTheme.colorScheme.primary, + else MaterialTheme.colorScheme.primary, textAlign = TextAlign.End ) } @@ -162,7 +161,12 @@ fun ResourceItemCard( modifier = Modifier .clip(RoundedCornerShape(4.dp)) .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) - .clickable { try { resource.path.openFile() } catch (_: Exception) {} } + .clickable { + try { + resource.path.openFile() + } catch (_: Exception) { + } + } ) // "Used By" tags for active resources diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceConfirmationDialog.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceConfirmationDialog.kt index 3bd19a4..01d61b8 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceConfirmationDialog.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceConfirmationDialog.kt @@ -28,7 +28,6 @@ import androidx.compose.material3.CardDefaults import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import com.meet.dev.analyzer.presentation.components.VerticalScrollBarLayout import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -37,8 +36,10 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.PointerIcon import androidx.compose.ui.input.pointer.pointerHoverIcon import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import com.meet.dev.analyzer.data.models.workspace.UnusedResourceItem +import com.meet.dev.analyzer.presentation.components.VerticalScrollBarLayout import java.awt.Cursor @Composable @@ -161,15 +162,23 @@ fun WorkspaceConfirmationDialog( .padding(12.dp), verticalArrangement = Arrangement.spacedBy(8.dp) ) { - Text( - resource.name, - style = MaterialTheme.typography.titleSmall, - fontWeight = FontWeight.Bold, - modifier = Modifier.weight(1f) + // Project header + Row( + modifier = Modifier.fillMaxWidth(), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + Text( + resource.name, + style = MaterialTheme.typography.titleSmall, + fontWeight = FontWeight.Bold, + modifier = Modifier.weight(1f), + ) + } + HorizontalDivider( + color = MaterialTheme.colorScheme.onSurfaceVariant ) - HorizontalDivider() - Row( modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween @@ -182,7 +191,8 @@ fun WorkspaceConfirmationDialog( Text( resource.category.displayName, style = MaterialTheme.typography.bodySmall, - fontWeight = FontWeight.Bold + fontWeight = FontWeight.Bold, + textAlign = TextAlign.End ) } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceDeletionProgressDialog.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceDeletionProgressDialog.kt index f865c27..8085418 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceDeletionProgressDialog.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceDeletionProgressDialog.kt @@ -276,7 +276,10 @@ fun WorkspaceDeletionProgressDialog( modifier = Modifier.size(20.dp) ) } else { - CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp) + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + strokeWidth = 2.dp + ) } Text( progress.status.statusText, @@ -296,7 +299,13 @@ fun WorkspaceDeletionProgressDialog( if (isDeletionComplete) { Button( onClick = onDismiss, - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) { Text("OK") } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceResultsContent.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceResultsContent.kt index df1e870..77c1b86 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceResultsContent.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceResultsContent.kt @@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.HorizontalDivider import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -19,10 +17,12 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.rememberLazyListState import androidx.compose.foundation.rememberScrollbarAdapter +import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Search import androidx.compose.material3.FilterChip import androidx.compose.material3.FilterChipDefaults +import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -41,8 +41,8 @@ import com.meet.dev.analyzer.presentation.components.VerticalScrollBarLayout import com.meet.dev.analyzer.presentation.screen.workspace.ResourceFilter import com.meet.dev.analyzer.presentation.screen.workspace.WorkspaceIntent import com.meet.dev.analyzer.presentation.screen.workspace.WorkspaceUiState -import java.awt.Cursor import kotlinx.coroutines.launch +import java.awt.Cursor @Composable fun WorkspaceResultsContent( @@ -59,13 +59,14 @@ fun WorkspaceResultsContent( } // Combined resource list based on active filter - val combinedResources = remember(uiState.resourceFilter, uiState.unusedResources, uiState.activeResources) { - when (uiState.resourceFilter) { - ResourceFilter.ALL -> uiState.unusedResources + uiState.activeResources - ResourceFilter.UNUSED -> uiState.unusedResources - ResourceFilter.ACTIVE -> uiState.activeResources + val combinedResources = + remember(uiState.resourceFilter, uiState.unusedResources, uiState.activeResources) { + when (uiState.resourceFilter) { + ResourceFilter.ALL -> uiState.unusedResources + uiState.activeResources + ResourceFilter.UNUSED -> uiState.unusedResources + ResourceFilter.ACTIVE -> uiState.activeResources + } } - } // Single collapse state map shared across all categories val collapsedCategories = remember { mutableStateMapOf() } @@ -129,7 +130,8 @@ fun WorkspaceResultsContent( verticalArrangement = Arrangement.spacedBy(8.dp) ) { items(filteredProjects) { project -> - val isHighlighted = project.projectName == uiState.highlightedProjectName + val isHighlighted = + project.projectName == uiState.highlightedProjectName ProjectInfoCard( project = project, isHighlighted = isHighlighted @@ -181,7 +183,13 @@ fun WorkspaceResultsContent( elevation = FilterChipDefaults.filterChipElevation( hoveredElevation = 0.dp ), - modifier = Modifier.pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + modifier = Modifier.pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) ) } } @@ -225,7 +233,9 @@ fun WorkspaceResultsContent( shape = RoundedCornerShape(10.dp) ) .background( - color = MaterialTheme.colorScheme.surfaceVariant.copy(alpha = 0.05f), + color = MaterialTheme.colorScheme.surfaceVariant.copy( + alpha = 0.05f + ), shape = RoundedCornerShape(10.dp) ) ) { @@ -252,14 +262,20 @@ fun WorkspaceResultsContent( verticalArrangement = Arrangement.spacedBy(6.dp) ) { items.forEach { resource -> - val isActive = uiState.activeResources.any { it.uniqueId == resource.uniqueId } + val isActive = + uiState.activeResources.any { it.uniqueId == resource.uniqueId } ResourceItemCard( resource = resource, isActive = isActive, onIntent = onIntent, onProjectHighlight = onProjectHighlight, onCheckedChange = { isChecked -> - onIntent(WorkspaceIntent.OnResourceSelectionChange(resource.uniqueId, isChecked)) + onIntent( + WorkspaceIntent.OnResourceSelectionChange( + resource.uniqueId, + isChecked + ) + ) } ) } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceSelectionSection.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceSelectionSection.kt index c06da40..69be114 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceSelectionSection.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceSelectionSection.kt @@ -65,8 +65,16 @@ fun WorkspaceSelectionSection( ) { AnimatedVisibility( visible = isExpanded, - enter = expandVertically(animationSpec = tween(durationMillis = 300)) + fadeIn(animationSpec = tween(durationMillis = 300)), - exit = shrinkVertically(animationSpec = tween(durationMillis = 250)) + fadeOut(animationSpec = tween(durationMillis = 250)) + enter = expandVertically(animationSpec = tween(durationMillis = 300)) + fadeIn( + animationSpec = tween( + durationMillis = 300 + ) + ), + exit = shrinkVertically(animationSpec = tween(durationMillis = 250)) + fadeOut( + animationSpec = tween( + durationMillis = 250 + ) + ) ) { Column( modifier = Modifier.fillMaxWidth().padding(10.dp), @@ -199,7 +207,8 @@ fun WorkspaceSelectionSection( modifier = Modifier.size(16.dp) ) Text( - text = path.split(File.separatorChar).lastOrNull()?.takeIf { it.isNotEmpty() } ?: path, + text = path.split(File.separatorChar).lastOrNull() + ?.takeIf { it.isNotEmpty() } ?: path, style = MaterialTheme.typography.bodySmall, fontWeight = FontWeight.Medium, color = MaterialTheme.colorScheme.onSurface @@ -211,7 +220,13 @@ fun WorkspaceSelectionSection( modifier = Modifier .size(14.dp) .clip(RoundedCornerShape(2.dp)) - .pointerHoverIcon(PointerIcon(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR))) + .pointerHoverIcon( + PointerIcon( + Cursor.getPredefinedCursor( + Cursor.HAND_CURSOR + ) + ) + ) .clickable { onRemovePath(path) } ) } diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceWarningBanner.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceWarningBanner.kt index 839536b..2e55d62 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceWarningBanner.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/screen/workspace/components/WorkspaceWarningBanner.kt @@ -9,6 +9,7 @@ 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.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Warning import androidx.compose.material3.Card @@ -19,7 +20,6 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/theme/Theme.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/theme/Theme.kt index c710f06..518e96c 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/theme/Theme.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/presentation/theme/Theme.kt @@ -148,7 +148,6 @@ fun RepaintHack() { } - //@Composable //fun CustomTypography() = Typography().run { // val fontFamily = FontFamily(Font(Res.font.nunito_sans)) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/analytics/AnalyticsEventMapper.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/analytics/AnalyticsEventMapper.kt index fa9231d..8ff23ed 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/analytics/AnalyticsEventMapper.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/analytics/AnalyticsEventMapper.kt @@ -52,15 +52,15 @@ internal fun AnalyticsEvent.toProperties(): Map = when (this) { // ── Clean Build ─────────────────────────────────────────────────────────── is AnalyticsEvent.CleanBuildAnalysisCompleted -> mapOf( - "project_count" to projectCount, + "project_count" to projectCount, "build_folder_count" to buildFolderCount, - "duration_ms" to durationMs, + "duration_ms" to durationMs, ) is AnalyticsEvent.CleanBuildCompleted -> mapOf( "deleted_build_folders" to deletedBuildFolders, - "reclaimed_bytes" to reclaimedBytes, - "duration_ms" to durationMs, + "reclaimed_bytes" to reclaimedBytes, + "duration_ms" to durationMs, ) is AnalyticsEvent.CleanBuildFailed -> mapOf("reason" to reason.value) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/AppLogger.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/AppLogger.kt index c2f0faf..92e61fc 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/AppLogger.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/AppLogger.kt @@ -5,19 +5,19 @@ import co.touchlab.kermit.Logger object AppLogger { fun d(tag: String = "", throwable: Throwable? = null, message: () -> String) { - Logger.d(tag, throwable = throwable, message = message) + Logger.d(throwable = throwable, tag = tag, message = message) } fun i(tag: String = "", throwable: Throwable? = null, message: () -> String) { - Logger.i(tag, throwable = throwable, message = message) + Logger.i(throwable = throwable, tag = tag, message = message) } fun e(tag: String = "", throwable: Throwable? = null, message: () -> String) { - Logger.e(tag, throwable = throwable, message = message) + Logger.e(throwable = throwable, tag = tag, message = message) } fun w(tag: String = "", throwable: Throwable? = null, message: () -> String) { - Logger.w(tag, throwable = throwable, message = message) + Logger.w(throwable = throwable, tag = tag, message = message) } fun tagName( diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/CustomProperties.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/CustomProperties.kt index d450f82..a02b6e1 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/CustomProperties.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/crash_report/CustomProperties.kt @@ -16,6 +16,7 @@ private object Keys { const val UPDATER_URL = "updater_url" const val FEEDBACK_URL = "feedback_url" } + object CustomProperties { fun loadProperties(): Properties { @@ -25,6 +26,7 @@ object CustomProperties { ?.use(::load) } } + fun createAppConfig(properties: Properties): DesktopConfig { val sentryDns = properties.requireProperty(Keys.SENTRY_DSN) val version = properties.requireProperty(Keys.VERSION) diff --git a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/platform/FolderFileUtils.kt b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/platform/FolderFileUtils.kt index 441e2fa..5a8872b 100644 --- a/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/platform/FolderFileUtils.kt +++ b/composeApp/src/jvmMain/kotlin/com/meet/dev/analyzer/utility/platform/FolderFileUtils.kt @@ -1,12 +1,7 @@ package com.meet.dev.analyzer.utility.platform -import com.meet.dev.analyzer.data.models.storage.GradleLibraryInfo -import com.meet.dev.analyzer.data.models.storage.GradleModulesInfo -import com.meet.dev.analyzer.data.models.storage.GradleVersionInfo import com.meet.dev.analyzer.utility.crash_report.AppLogger import com.meet.dev.analyzer.utility.crash_report.AppLogger.tagName -import io.github.z4kn4fein.semver.VersionFormatException -import io.github.z4kn4fein.semver.toVersion import java.awt.Desktop import java.awt.Toolkit import java.awt.datatransfer.StringSelection @@ -116,6 +111,7 @@ object FolderFileUtils { val file = File(this) file.openFile() } + fun copyToClipboard(content: String) { try { val clipboard = Toolkit.getDefaultToolkit().systemClipboard diff --git a/composeApp/src/jvmMain/resources/icons/app_logo.icns b/composeApp/src/jvmMain/resources/icons/app_logo.icns index 03644af..8c30d2f 100644 Binary files a/composeApp/src/jvmMain/resources/icons/app_logo.icns and b/composeApp/src/jvmMain/resources/icons/app_logo.icns differ diff --git a/composeApp/src/jvmMain/resources/icons/app_logo.ico b/composeApp/src/jvmMain/resources/icons/app_logo.ico index cf72ea0..77e37f4 100644 Binary files a/composeApp/src/jvmMain/resources/icons/app_logo.ico and b/composeApp/src/jvmMain/resources/icons/app_logo.ico differ diff --git a/composeApp/src/jvmMain/resources/icons/app_logo.png b/composeApp/src/jvmMain/resources/icons/app_logo.png index 9db6359..8a2f79c 100644 Binary files a/composeApp/src/jvmMain/resources/icons/app_logo.png and b/composeApp/src/jvmMain/resources/icons/app_logo.png differ diff --git a/docs/favicon/apple-touch-icon.png b/docs/favicon/apple-touch-icon.png index e181fae..ae147b8 100644 Binary files a/docs/favicon/apple-touch-icon.png and b/docs/favicon/apple-touch-icon.png differ diff --git a/docs/favicon/favicon-96x96.png b/docs/favicon/favicon-96x96.png index cd64748..8989170 100644 Binary files a/docs/favicon/favicon-96x96.png and b/docs/favicon/favicon-96x96.png differ diff --git a/docs/favicon/favicon.ico b/docs/favicon/favicon.ico index b74d29a..73ba57e 100644 Binary files a/docs/favicon/favicon.ico and b/docs/favicon/favicon.ico differ diff --git a/docs/favicon/favicon.svg b/docs/favicon/favicon.svg index ea9a6e4..377b02f 100644 --- a/docs/favicon/favicon.svg +++ b/docs/favicon/favicon.svg @@ -1,118 +1,61 @@ - - - - - RealFaviconGenerator - https://realfavicongenerator.net - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/docs/favicon/site.webmanifest b/docs/favicon/site.webmanifest index a9e0718..b996926 100644 --- a/docs/favicon/site.webmanifest +++ b/docs/favicon/site.webmanifest @@ -3,19 +3,19 @@ "short_name": "DA", "icons": [ { - "src": "/favicon/web-app-manifest-192x192.png", + "src": "web-app-manifest-192x192.png", "sizes": "192x192", "type": "image/png", "purpose": "maskable" }, { - "src": "/favicon/web-app-manifest-512x512.png", + "src": "web-app-manifest-512x512.png", "sizes": "512x512", "type": "image/png", "purpose": "maskable" } ], - "theme_color": "#0061A4", + "theme_color": "#ffffff", "background_color": "#ffffff", "display": "standalone" } \ No newline at end of file diff --git a/docs/favicon/web-app-manifest-192x192.png b/docs/favicon/web-app-manifest-192x192.png index 391b6bb..bbb3734 100644 Binary files a/docs/favicon/web-app-manifest-192x192.png and b/docs/favicon/web-app-manifest-192x192.png differ diff --git a/docs/favicon/web-app-manifest-512x512.png b/docs/favicon/web-app-manifest-512x512.png index c768f7d..46fa4a8 100644 Binary files a/docs/favicon/web-app-manifest-512x512.png and b/docs/favicon/web-app-manifest-512x512.png differ diff --git a/docs/index.html b/docs/index.html index 2ac5f63..c601133 100644 --- a/docs/index.html +++ b/docs/index.html @@ -4,1039 +4,1257 @@ - DevAnalyzer - Deep Insights for Your Development Environment - - - - - - + + + DevAnalyzer | Analyze and Optimize Your Android Development Environment + + + + + + + + + - -
-