Merge pull request #55 from Konyaco/dev

v0.0.1-dev.8

.gitignore

@@ -1,4 +1,5 @@
 .gradle/
 .idea/
 build/
-local.properties
+local.properties
+.DS_Store

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 Konyaco
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

README.md

@@ -1,4 +1,4 @@
-# Compose Fluent
+<h1><img src="assets/icon.png" alt="Compose Fluent logo" height="48" valign="middle"> Compose Fluent</h1>
 
 [![License](https://img.shields.io/github/license/Konyaco/compose-fluent-ui)](LICENSE)
 [![Version](https://img.shields.io/github/v/release/Konyaco/compose-fluent-ui?include_prereleases)](https://github.com/Konyaco/compose-fluent-ui/releases)
@@ -23,8 +23,8 @@ Thank you for using our library. We look forward to receiving your feedback and
 ### Add Dependency
 
 ```kts
-implementation("com.konyaco:fluent:0.0.1-dev.7")
-implementation("com.konyaco:fluent-icons-extended:0.0.1-dev.7") // If you want to use full fluent icons.
+implementation("com.konyaco:fluent:0.0.1-dev.8")
+implementation("com.konyaco:fluent-icons-extended:0.0.1-dev.8") // If you want to use full fluent icons.
 ```
 
 ### Example
@@ -67,35 +67,55 @@ The copyright of the icon assets (in `com.konyaco.fluent.icons` package) belongs
 - Layer
   - [x] Simple Layer
   - [ ] Real Layer
-- [ ] Acrylic
+- [x] Acrylic
+- [x] Card
 
-### Basic Inputs
+### Basic Components
 
-- [x] Button
+- [x] Buttons
+  - [x] Button
+  - [x] AccentButton
+  - [x] SubtleButton
+  - [x] DropdownButton
+  - [x] HyperlinkButton
+  - [x] RepeatButton
+  - [x] ToggleButton
+  - [x] SplitButton
+  - [x] ToggleSplitButton
+- [x] RadioButton
 - [x] ToggleSwitch
 - [x] CheckBox
-- [x] RadioButton
-- [x] Slider
-- [x] DropdownMenu
-- [x] TextField
+  - [ ] TriStateCheckBox
+- [x] ComboBox (Simple)
 - [x] ProgressBar
 - [x] ProgressRing
+- [x] Slider
+- [x] TextField
+
+- [x] ColorPicker
+- [x] RatingControl
 - [ ] Pill Button
-- [ ] ComboBox
-- [ ] RatingControl
 
-### Basic Components
+### Compound Components
 
+- [x] CalendarView (Simple)
+- [x] DateTimePicker (Simple)
+- [x] Color Picker
+- [ ] Navigation
+  - [x] SideNav
+  - [ ] BreadcrumbBar
+  - [ ] Pivot
+  - [ ] TabView
 - [ ] Tooltip
 - [ ] InfoBar
 - [ ] FilePicker
 - [ ] Menu
 
 ### Dialogs
 
-- [x] Simple Dialog
-- [ ] Compound Dialog (Title, Content, Controls)
-- [ ] Flyout
+- [x] FluentDialog
+- [x] ContentDialog
+- [x] Flyout (Simple)
 
 ### Animations
 
@@ -106,18 +126,6 @@ The copyright of the icon assets (in `com.konyaco.fluent.icons` package) belongs
 - [x] Light and Dark theme
 - [ ] Custom accent color
 
-### Compound Components
-
-- [ ] Color Picker
-- [ ] DateTime Picker
-- [ ] Calender
-- [ ] Navigation
-  - [x] SideNav
-  - [ ] BreadcrumbBar
-  - [ ] Pivot
-  - [ ] TabView
-
-### TODO
-
+### Accessibility
 
 - [ ] Accessibility Semantics

TODO.md

@@ -19,7 +19,7 @@
   - [ ] Improve performance and smoothness.
 
 - Layer
-  - [ ] Eliminate workarounds like `circular`, `cornerRadius` etc.
+  - [x] Eliminate workarounds like `circular`, `cornerRadius` etc.
 
 ## Compound Components
 

build-plugin/build.gradle.kts

@@ -9,7 +9,7 @@ repositories {
 
 dependencies {
     implementation(gradleApi())
-    implementation(kotlin("gradle-plugin"))
+    implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
 }
 
 kotlin {

build-plugin/settings.gradle.kts

@@ -0,0 +1,7 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}

build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildConfig.kt

@@ -8,7 +8,7 @@ object BuildConfig {
 
     const val packageName = "$group.fluent"
 
-    const val libraryVersion = "0.0.1-dev.7"
+    const val libraryVersion = "0.0.1-dev.8"
 
     object Android {
         const val compileSdkVersion = 34

build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildExtension.kt

@@ -0,0 +1,11 @@
+package com.konyaco.fluent.plugin.build
+
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+
+fun KotlinMultiplatformExtension.applyTargets(publish: Boolean = true) {
+    jvm("desktop")
+    androidTarget {
+        if (publish) publishLibraryVariants("release")
+    }
+    jvmToolchain(BuildConfig.Jvm.jvmToolchainVersion)
+}

fluent-icons-core/build.gradle.kts

@@ -1,9 +1,11 @@
 import com.konyaco.fluent.plugin.build.BuildConfig
+import com.konyaco.fluent.plugin.build.applyTargets
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
+    alias(libs.plugins.ksp)
     id("maven-publish")
     signing
 }
@@ -12,24 +14,20 @@ group = BuildConfig.group
 version = BuildConfig.libraryVersion
 
 kotlin {
-    jvm()
-    androidTarget {
-        publishLibraryVariants("release")
-    }
+    applyTargets()
     sourceSets {
         val commonMain by getting {
             dependencies {
                 implementation(compose.foundation)
             }
         }
-        val jvmMain by getting {
+        val desktopMain by getting {
             dependencies {
                 implementation(compose.desktop.currentOs)
             }
         }
-        val jvmTest by getting
+        val desktopTest by getting
     }
-    jvmToolchain(BuildConfig.Jvm.jvmToolchainVersion)
 }
 
 android {
@@ -42,4 +40,15 @@ android {
         sourceCompatibility = BuildConfig.Jvm.javaVersion
         targetCompatibility = BuildConfig.Jvm.javaVersion
     }
+}
+
+dependencies {
+    val processor = (project(":source-generated-processor"))
+    add("kspCommonMainMetadata", processor)
+}
+
+ksp {
+    arg("source.generated.module.name", "FluentIconCore")
+    arg("source.generated.module.enabled", false.toString())
+    arg("source.generated.icon.enabled", true.toString())
 }

fluent-icons-extended/build.gradle.kts

@@ -1,9 +1,11 @@
 import com.konyaco.fluent.plugin.build.BuildConfig
+import com.konyaco.fluent.plugin.build.applyTargets
 
 plugins {
     alias(libs.plugins.kotlin.multiplatform)
     alias(libs.plugins.compose)
     alias(libs.plugins.android.library)
+    alias(libs.plugins.ksp)
     id("maven-publish")
     signing
 }
@@ -12,10 +14,7 @@ group = BuildConfig.group
 version = BuildConfig.libraryVersion
 
 kotlin {
-    jvm()
-    androidTarget {
-        publishLibraryVariants("release")
-    }
+    applyTargets()
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -24,14 +23,13 @@ kotlin {
                 implementation(project(":fluent-icons-core"))
             }
         }
-        val jvmMain by getting {
+        val desktopMain by getting {
             dependencies {
                 implementation(compose.desktop.currentOs)
             }
         }
-        val jvmTest by getting
+        val desktopTest by getting
     }
-    jvmToolchain(BuildConfig.Jvm.jvmToolchainVersion)
 }
 
 android {
@@ -44,4 +42,15 @@ android {
         sourceCompatibility = BuildConfig.Jvm.javaVersion
         targetCompatibility = BuildConfig.Jvm.javaVersion
     }
+}
+
+dependencies {
+    val processor = (project(":source-generated-processor"))
+    add("kspCommonMainMetadata", processor)
+}
+
+ksp {
+    arg("source.generated.module.name", "FluentIconExtended")
+    arg("source.generated.module.enabled", false.toString())
+    arg("source.generated.icon.enabled", true.toString())
 }