diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml
index 62abc5ae..7d7f9c94 100644
--- a/.github/workflows/deploy-gh-pages.yml
+++ b/.github/workflows/deploy-gh-pages.yml
@@ -34,6 +34,8 @@ jobs:
with:
cache-disabled: true
- name: Build wasm target
+ env:
+ PROJECT_BUILD_TYPE: release
run: ./gradlew :gallery:wasmJsBrowserDistribution
- name: Setup Pages
uses: actions/configure-pages@v5
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
index 5ad27310..1c7ff341 100644
--- a/.github/workflows/gradle-publish.yml
+++ b/.github/workflows/gradle-publish.yml
@@ -37,10 +37,10 @@ jobs:
- name: Publish to Maven Central
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
with:
- arguments: publish
+ arguments: publishToMavenCentral --no-configuration-cache
env:
- OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
- OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
- SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
- SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
- SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+ ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+ ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+ ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_KEY }}
+ ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_SIGNING_KEY_ID }}
+ ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_PASSWORD }}
diff --git a/.github/workflows/multiplatform_snapshot_build.yml b/.github/workflows/multiplatform_snapshot_build.yml
new file mode 100644
index 00000000..5967e0b0
--- /dev/null
+++ b/.github/workflows/multiplatform_snapshot_build.yml
@@ -0,0 +1,160 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a package using Gradle and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Publishing-using-gradle
+
+name: Multiplatform Snapshot Build
+
+on:
+ push:
+ branches:
+ - dev
+ paths-ignore:
+ - 'assets/**'
+ - '**.md'
+ - 'LICENSE'
+ - '**.gitignore'
+
+ pull_request_review:
+ types: submitted
+
+jobs:
+ build:
+ strategy:
+ matrix:
+ type: [PublishLibrary, Android, Windows, Linux, macOS, iOS, WasmJs, Js]
+ include:
+ - type: PublishLibrary
+ publish: release
+ os: macos-latest
+ - type: Android
+ android: apk
+ os: ubuntu-latest
+ - type: Windows
+ desktop: msi
+ os: windows-latest
+ - type: Linux
+ desktop: deb
+ os: ubuntu-latest
+ - type: macOS
+ desktop: dmg
+ os: macos-latest
+ - type: iOS
+ iOS: ipa
+ # workaround runner version for iPhoneOS sdk 18.2
+ os: macos-15
+ - type: WasmJs
+ js: wasmJs
+ os: windows-latest
+ - type: Js
+ js: js
+ os: ubuntu-latest
+
+ runs-on: ${{ matrix.os }}
+ if: ${{ github.event_name != 'pull_request_review' || github.event.review.state == 'approved' }}
+ permissions:
+ contents: read
+ packages: write
+
+ steps:
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ ref: ${{ github.ref }}
+ - name: Set up JDK 17
+ uses: actions/setup-java@v4
+ with:
+ java-version: '17'
+ distribution: 'temurin'
+
+ # Configure Gradle for optimal use in GitHub Actions, including caching of downloaded dependencies.
+ # See: https://github.com/gradle/actions/blob/main/setup-gradle/README.md
+ - name: Setup Gradle
+ uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
+
+ # Publish Snapshot Library
+ - name: Publish Library
+ if: ${{ github.ref == 'refs/heads/dev' && github.event_name == 'push' && matrix.type == 'PublishLibrary' }}
+ run: |
+ ./gradlew publishToMavenLocal
+ ./gradlew publishToMavenCentral --no-configuration-cache
+ env:
+ ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.MAVEN_CENTRAL_USERNAME }}
+ ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.MAVEN_CENTRAL_PASSWORD }}
+ ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.MAVEN_SIGNING_KEY }}
+ ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.MAVEN_SIGNING_KEY_ID }}
+ ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.MAVEN_SIGNING_PASSWORD }}
+
+ - name: Upload Library Artifact
+ if: ${{ github.event_name == 'push' && matrix.type == 'PublishLibrary' }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: Repository-${{ github.run_id }}
+ path: ~/.m2/repository
+
+ # Android Build Action
+ - name: Build Gallery for ${{ matrix.type }}
+ if: ${{ matrix.android }}
+ run: |
+ echo "$ANDROID_KEYSTORE" | base64 --decode > ${{ github.workspace }}/android_sign_key.jks
+ ./gradlew :gallery:assembleRelease
+ env:
+ ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }}
+ ANDROID_SIGNING_FILE: ${{ github.workspace }}/android_sign_key.jks
+ ANDROID_SIGNING_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
+ ANDROID_SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
+ ANDROID_SIGNING_KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+
+ - name: Upload android build artifacts
+ if: ${{ matrix.android }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: Gallery-${{ matrix.type }}-${{ github.run_id }}
+ path: ${{github.workspace}}/gallery/build/outputs/**/*.${{ matrix.android }}
+
+ # Desktop Build Action
+ - name: Build Gallery for ${{ matrix.type }}
+ if: ${{ matrix.desktop }}
+ run: |
+ ./gradlew :gallery:packageReleaseDistributionForCurrentOS
+
+ - name: Upload desktop build artifacts
+ if: ${{ matrix.desktop }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: Gallery-${{ matrix.type }}-${{ github.run_id }}
+ path: ${{github.workspace}}/gallery/build/compose/binaries/main-release/${{ matrix.desktop }}/*.${{ matrix.desktop }}
+
+ # iOS Build Action, Note: Due to the long build time, the iOS build only build the debug version.
+ - name: Set up Xcode
+ if: ${{ matrix.iOS }}
+ uses: maxim-lobanov/setup-xcode@v1
+ with:
+ xcode-version: 'latest-stable'
+
+ - name: Build Gallery for iOS
+ if: ${{ matrix.iOS }}
+ run: |
+ xcodebuild -scheme iosApp -configuration Debug -sdk iphoneos -archivePath gallery/iosApp/build/Gallery.xcarchive archive -workspace gallery/iosApp/iosApp.xcodeproj/project.xcworkspace CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO
+
+ - name: Upload iOS Artifact
+ if: ${{ matrix.iOS }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: Gallery-${{ matrix.type }}-${{ github.run_id }}
+ path: ${{ github.workspace }}/gallery/iosApp/build/
+
+ # Js and WasmJs Build Action
+ - name: Build Gallery for ${{ matrix.type }}
+ if: ${{ matrix.js }}
+ run: |
+ ./gradlew :gallery:${{ matrix.js }}BrowserDistribution
+
+ - name: Upload ${{ matrix.type }} build artifacts
+ if: ${{ matrix.js }}
+ uses: actions/upload-artifact@v4
+ with:
+ name: Gallery-${{ matrix.type }}-${{ github.run_id }}
+ path: ./gallery/build/dist/${{ matrix.js }}/productionExecutable
diff --git a/CONTRIBUTION.md b/CONTRIBUTION.md
new file mode 100644
index 00000000..ac4ab18e
--- /dev/null
+++ b/CONTRIBUTION.md
@@ -0,0 +1,149 @@
+# Contributing to Compose-Fluent-UI
+
+Hello and welcome! 🎉
+
+**Our project components are designed using the [Windows UI Kit Figma guidelines](https://www.figma.com/community/file/1440832812269040007/windows-ui-kit). Therefore, the layout and style of the components must strictly adhere to this design guide. Additionally, the components showcased in the Gallery should align as closely as possible with this design guide.**
+
+We are thrilled to have you considering contributing to Compose-Fluent-UI. Contributions are what make the open-source community such an incredible place to learn, inspire, and create. Here are some guidelines to help you get started:
+
+## Getting Started
+
+- **Fork this repository**: Click on the "Fork" button at the top right of this page. This will create a copy of the repository in your account.
+- **Select the Dev branch**: Choose the `dev` branch as your base branch.
+- **Create a new branch**: Create a new branch from `dev` for your feature or bug fix using `git checkout -b your-branch-name`.
+- **Base all development work on your new branch**: Ensure that all your development work is committed to the branch you just created from `dev`.
+
+## Developing Components
+
+- **Create the source code**: In the `fluent/components` directory, create the source code for the component that corresponds to the Windows UI Kit.
+```Kotlin
+// Button.kt
+package io.github.composefluent.components
+```
+- **Handle internal classes**: If your component involves internal classes that may be used by other components (such as `OverflowRow`), create the relevant classes in the appropriate package (e.g., `/layout`).
+```Kotlin
+// OverflowRow.kt
+package io.github.composefluent.layout.overflow
+
+@Composable
+internal fun OverflowRow(
+ modifier: Modifier = Modifier,
+ overflow: OverflowPosition = OverflowPosition.End,
+ state: OverflowRowState = rememberOverflowRowState(),
+ horizontalArrangement: Arrangement.Horizontal = Arrangement.Start,
+ verticalAlignment: Alignment.Vertical = Alignment.CenterVertically,
+ overflowAction: @Composable OverflowActionScope.() -> Unit = {},
+ contentPadding: PaddingValues = PaddingValues(),
+ alwaysShowOverflowAction: Boolean = false,
+ content: OverflowRowScope.() -> Unit
+)
+```
+- **Adhere to guidelines**: When developing, strictly follow the Windows UI Kit for layout, typography, and color.
+- **Include TODOs for animations**: If your component involves animations and you're unsure of the specific parameters to use, add a `TODO` note.
+
+## Testing and Showcasing Components
+
+The Gallery app uses KSP and KotlinPoet to automatically generate a navigation tree and Kotlin example source code. Below are the steps to add a component example page in the Gallery:
+
+1. **Create [YourComponent]Screen.kt**: In the package corresponding to the component group, create a `[YourComponent]Screen.kt` file.
+```Kotlin
+// ButtonScreen.kt
+package io.github.composefluent.gallery.screen.basicinput
+```
+2. **Create a method with @Component annotation**: Create a method named `[YourComponent]Screen` and annotate it with `@Component`, providing the relevant `description` and `index`.
+```Kotlin
+// ButtonScreen.kt
+@Component(index = 0, description = "A control that responds to user input")
+@Composable
+fun ButtonScreen() {
+
+}
+```
+
+3. **Use GalleryPage method**: In this method, use the `GalleryPage` method to create a uniform component example page layout. The `GalleryPage` method takes `componentPath` and `galleryPath` as parameters, which are provided by the `FluentSourceFile` and `ComponentPagePath` classes generated by KSP, indicating the source code path of the component and the corresponding Gallery example code path.
+```Kotlin
+// ButtonScreen.kt
+@Component(index = 0, description = "A control that responds to user input")
+@Composable
+fun ButtonScreen() {
+ GalleryPage(
+ componentPath = FluentSourceFile.Button,
+ galleryPath = ComponentPagePath.ButtonScreen,
+ ) {
+ // Sample sections.
+ }
+}
+```
+4. **Use Section method in GalleryPage**: Within `GalleryPage`, use the `Section` method for each component example. The `Section` method provides `output` and `options` parameters for adjusting options and display output. The `sourceCode` parameter should be the global variable generated by the `@Sample` annotation (which contains the component source code).
+```Kotlin
+// ButtonScreen.kt
+@Component(index = 0, description = "A control that responds to user input")
+@Composable
+fun ButtonScreen() {
+ GalleryPage(
+ componentPath = FluentSourceFile.Button,
+ galleryPath = ComponentPagePath.ButtonScreen,
+ ) {
+ val clickTextContent = remember { mutableStateOf("") }
+ val buttonEnabled = remember { mutableStateOf(true) }
+ Section(
+ title = "A simple Button with text content.",
+ content = {
+ ButtonSample(enabled = buttonEnabled.value) { clickTextContent.value = "You clicked: Button 1" }
+ },
+ output = {
+ if (clickTextContent.value.isNotBlank()) {
+ Text(clickTextContent.value)
+ }
+ },
+ options = {
+ CheckBox(
+ checked = !buttonEnabled.value,
+ onCheckStateChange = { buttonEnabled.value = !it },
+ label = "Disable button"
+ )
+ },
+ sourceCode = sourceCodeOfButtonSample
+ )
+ }
+}
+```
+5. **Create an example**: In the `[YourComponent]Screen.kt` file, add a new method named `[YourComponentCase]Sample` with a private visibility modifier, and annotate this method with `@Sample`. This will generate a global variable `sourceCodeOf[YourComponentCase]Sample`, which should be assigned to the `sourceCode` parameter in the corresponding `Section`.
+```Kotlin
+//ButtonScreen.kt
+@Sample
+@Composable
+private fun ButtonSample(enabled: Boolean = true, onClick: () -> Unit) {
+ Button(disabled = !enabled, onClick = onClick) {
+ Text("Standard Compose Button")
+ }
+}
+```
+6. **Add new groups if needed**: If you cannot find the appropriate group for the component, add a new group in the `ComponentGroupInfo` object, following the format of the existing groups. After adding the group, place the Screen file in the corresponding package.
+```Kotlin
+// ComponentGrupInfo.kt
+package io.github.composefluent.gallery.component
+
+object ComponentGroupInfo {
+ prival const val screenPackage: String = "io.github.composefluent.gallery.screen"
+
+ // Basic Input is group name, ChckboxChecked is icon, packageMap is the component screens under this group were placed, like ButtonScreen
+ @ComponentGroup("CheckboxChecked", index = 2, packageMap = "$screenPackage.basicinput")
+ const val BasicInput = "Basic input"
+
+ //other groups
+ //....
+}
+```
+
+7. At the end, you should see the component example page you've created in the Gallery, ready for demonstration and testing.
+
+
+8. **Debugging components with scale mode if needed**: If you need to debug your component with scale mode, you can test it in `TestComponentScreen`. Navigate to this test page in the Gallery app through `Settings > Test Component`.
+
+
+## Need Help?
+
+If you have any questions or need assistance, feel free to open an issue or reach out to the maintainers. We’re here to help!
+
+Thank you for considering contributing to **Compose-Fluent-UI**. We can’t wait to see what you’ll create!
\ No newline at end of file
diff --git a/README.md b/README.md
index e677d5dc..a3b85c58 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,11 @@
Compose Fluent
-[](LICENSE)
-[](https://github.com/Konyaco/compose-fluent-ui/releases)
-[](https://central.sonatype.com/artifact/com.konyaco/fluent/)
+[](LICENSE)
+[](https://github.com/compose-fluent/compose-fluent-ui/releases)
+[](https://central.sonatype.com/artifact/io.github.compose-fluent/fluent/)
+[](https://t.me/compose_fluent_ui)
+[//]: # ([](https://central.sonatype.com/service/rest/repository/browse/maven-snapshots/io/github/compose-fluent))
**Fluent Design** UI library for **Compose Multiplatform**
@@ -17,20 +19,51 @@ Please note that there are lots of hard-coding and workarounds in our source cod
Thank you for using our library. We look forward to receiving your feedback and contributions!
+### Supported Kotlin Targets
+
+| Target | Platform |
+|:------------------|:----------------------|
+| desktop | Linux, macOS, Windows |
+| iosX64 | iPhone, iPad |
+| iosArm64 | iPhone, iPad |
+| iosSimulatorArm64 | iOS Simulator |
+| androidTarget | Android Devices |
+| wasmJs | Web Browsers |
+| js | Web Browsers |
## Quick Start
### Add Dependency
```kts
-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.
+implementation("io.github.compose-fluent:fluent:0.0.1-dev.8")
+implementation("io.github.compose-fluent:fluent-icons-extended:0.0.1-dev.8") // If you want to use full fluent icons.
+```
+
+#### Snapshot Versions
+
+Snapshot versions are automatically published from the `dev` branch. To access snapshot artifacts, add the Sonatype snapshot repository to your `build.gradle.kts`:
+
+```kotlin
+repositories {
+ mavenCentral()
+ // Add Sonatype snapshots repository
+ maven("https://central.sonatype.com/repository/maven-snapshots/")
+}
```
+Then specify the snapshot dependency with the `-SNAPSHOT` suffix:
+
+```kotlin
+implementation("io.github.compose-fluent:fluent:0.1.0-SNAPSHOT")
+```
+
+You can check our latest snapshots at [Maven Central](https://central.sonatype.com/artifact/io.github.compose-fluent/fluent/).
+
### Example
```kotlin
-import com.konyaco.fluent.component.*
+import io.github.composefluent.component.*
@Composable
fun App() {
@@ -51,70 +84,89 @@ See [`gallery`](gallery) module for more details.
- Components are under `component` package
- `Mica` and `Layer` are under `background` package
-## License
-
-This library is under Apache-2.0 license.
-
-The copyright of the icon assets (in `com.konyaco.fluent.icons` package) belongs to Microsoft.
-
## Components
### Layers
-
+- Materials
+ - [x] App Layer Mica
+ - [x] App Layer Mica Alt
+ - [x] App Layer Acrylic Default
+ - [x] App Layer Acrylic Base
+ - [x] App Layer Accent Acrylic Default
+ - [x] App Layer Accent Acrylic Base
+ - [x] App Layer Thin Acrylic
+ - [ ] Window Layer Mica
+ - [ ] Window Layer Acrylic
- Mica
- [x] Simple Mica
- [ ] Real Mica
- Layer
- [x] Simple Layer
- [ ] Real Layer
-- [x] Acrylic
- [x] Card
### Basic Components
- [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
- - [ ] TriStateCheckBox
-- [x] ComboBox (Simple)
-- [x] ProgressBar
-- [x] ProgressRing
+ - [x] Accent Button
+ - [x] Subtle Button
+ - [x] Dropdown Button
+ - [x] Hyperlink Button
+ - [x] Repeat Button
+ - [x] Toggle Button
+ - [x] Split Button
+ - [x] Toggle Split Button
+- [x] Radio Button
+- [x] Toggle Switch
+- [x] Check Box
+ - [ ] TriState Check Box
+- [x] Combo Box (Simple)
+- [x] Progress Bar
+- [x] Progress Ring
- [x] Slider
-- [x] TextField
+- [x] Text Field
+- [X] Text
-- [x] ColorPicker
-- [x] RatingControl
-- [ ] Pill Button
+- [x] Color Picker
+- [x] Rating Control
+- [x] Pill Button
+- [x] Segmented Button
+- [x] Lite Filter
+- [x] List Item
+- [x] Grid View Item
+- [x] Flip View
+- [x] Pips Pager
### Compound Components
-- [x] CalendarView (Simple)
-- [x] DateTimePicker (Simple)
+- [x] Calendar View (Simple)
+ > If you need running on the Android 7.1 and below, you should enable [core library desugar](https://developer.android.com/studio/write/java8-support#library-desugaring) to avoid crash.
+- [x] Date Time Picker (Simple)
- [x] Color Picker
- [ ] Navigation
- - [x] SideNav
- - [ ] BreadcrumbBar
+ - [x] Side Nav
+ - [x] Top Nav
+ - [x] Navigation View
+ - [x] Breadcrumb Bar
- [ ] Pivot
- - [ ] TabView
-- [ ] Tooltip
-- [ ] InfoBar
-- [ ] FilePicker
-- [ ] Menu
+ - [x] Tab View
+ - [x] Selector Bar
+- [x] Tooltip
+- [x] Info Bar
+- [x] Badge
+- [ ] File Picker
+- [x] Menu Bar (Simple)
+- [x] MenuFlyout (Simple)
+- [x] Expander
+- [x] Command Bar
+- [x] Command Bar Flyout
+- [x] Auto Suggest Box
### Dialogs
-- [x] FluentDialog
-- [x] ContentDialog
+- [x] Fluent Dialog
+- [x] Content Dialog
- [x] Flyout (Simple)
### Animations
@@ -129,3 +181,44 @@ The copyright of the icon assets (in `com.konyaco.fluent.icons` package) belongs
### Accessibility
- [ ] Accessibility Semantics
+
+## Contribution
+
+See [CONTRIBUTION.md](CONTRIBUTION.md)
+
+## License
+
+This library is licensed under the Apache License 2.0.
+
+The copyright of the icon assets (in `io.github.composefluent.icons` package) belongs to Microsoft.
+
+## Credits
+
+This project is built upon the foundations laid by several remarkable open-source projects. We extend our sincere gratitude to the developers and maintainers of these projects for their invaluable contributions to the open-source community.
+
+### Fluent
+
+| Project | Description | License |
+|---|---|---|
+| **[Windows UI Kit (Figma)](https://www.figma.com/community/file/1440832812269040007/windows-ui-kit)** | Provided design mockups for controls. | [CC BY 4.0](https://creativecommons.org/licenses/by/4.0/) |
+| [JetBrains/compose-multiplatform](https://github.com/JetBrains/compose-multiplatform) | Provides the fundamental framework for Compose Multiplatform development. | [Apache License 2.0](https://github.com/JetBrains/compose-multiplatform/blob/master/LICENSE.txt) |
+| [Kotlin/kotlinx-datetime](https://github.com/Kotlin/kotlinx-datetime) | Provides a unified clock API. | [Apache License 2.0](https://github.com/Kotlin/kotlinx-datetime/blob/master/LICENSE.txt) |
+| [chrisbanes/haze](https://github.com/chrisbanes/haze) | Offers essential implementations for acrylic and mica effects. | [Apache License 2.0](https://github.com/chrisbanes/haze/blob/main/LICENSE) |
+
+### Fluent-Icons
+| Project | Description | License |
+|---|---|---|
+| [microsoft/fluentui-system-icons](https://github.com/microsoft/fluentui-system-icons) | Supplies the icon assets used in the project. | [MIT License](https://github.com/microsoft/fluentui-system-icons/blob/main/LICENSE) |
+| [DevSrSouza/svg-to-compose](https://github.com/DevSrSouza/svg-to-compose) | Facilitates the conversion of SVG icons to Compose icons, aiding in the implementation of Fluent icons. | [MIT License](https://github.com/DevSrSouza/svg-to-compose/blob/master/LICENSE) |
+
+### Gallery
+| Project | Description | License |
+|---|---|---|
+| [lhwdev/compose-window](https://github.com/lhwdev/compose-window) | Provides guidance on passing pointer events back to the parent window. | [Apache License 2.0](https://github.com/lhwdev/compose-window/blob/main/LICENSE) |
+| [grassator/win32-window-custom-titlebar](https://github.com/grassator/win32-window-custom-titlebar) | Demonstrates how to hide the Windows title bar. | [MIT License](https://github.com/grassator/win32-window-custom-titlebar/blob/master/LICENSE) |
+| [MayakaApps/ComposeWindowStyler](https://github.com/MayakaApps/ComposeWindowStyler) | Enables mica window backgrounds on Windows. | [MIT License](https://github.com/MayakaApps/ComposeWindowStyler/blob/main/LICENSE) |
+| [java-native-access/jna](https://github.com/java-native-access/jna) | Provides the capability to interact with Win32 APIs, enabling title bar customization. | [Apache License 2.0](https://github.com/java-native-access/jna/blob/master/LICENSE) |
+| [google/ksp](https://github.com/google/ksp) | Along with KotlinPoet, helps with source code generation for examples and navigation logic. | [Apache License 2.0](https://github.com/google/ksp/blob/main/LICENSE) |
+| [square/kotlinpoet](https://github.com/square/kotlinpoet) | Along with KSP, helps with source code generation for examples and navigation logic. | [Apache License 2.0](https://github.com/square/kotlinpoet/blob/main/LICENSE.txt) |
+| [SnipMeDev/Highlights](https://github.com/SnipMeDev/Highlights) | Enables syntax highlighting for example code. | [Apache License 2.0](https://github.com/SnipMeDev/Highlights/blob/main/LICENSE) |
+| [yshrsmz/BuildKonfig](https://github.com/yshrsmz/BuildKonfig) | Facilitates the generation of build configuration parameter classes. | [Apache License 2.0](https://github.com/yshrsmz/BuildKonfig/blob/master/LICENSE) |
diff --git a/assets/sample_page_screenshot.png b/assets/sample_page_screenshot.png
new file mode 100644
index 00000000..91657f42
Binary files /dev/null and b/assets/sample_page_screenshot.png differ
diff --git a/assets/screenshot.png b/assets/screenshot.png
index e4380cce..e292b786 100644
Binary files a/assets/screenshot.png and b/assets/screenshot.png differ
diff --git a/assets/test_component_screenshot.png b/assets/test_component_screenshot.png
new file mode 100644
index 00000000..03af8b72
Binary files /dev/null and b/assets/test_component_screenshot.png differ
diff --git a/build-plugin/build.gradle.kts b/build-plugin/build.gradle.kts
index 362af2cb..9a65906a 100644
--- a/build-plugin/build.gradle.kts
+++ b/build-plugin/build.gradle.kts
@@ -5,11 +5,23 @@ plugins {
repositories {
mavenCentral()
+ google()
}
dependencies {
implementation(gradleApi())
+
implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
+ gradlePluginImplementation(libs.plugins.android.kotlin.multiplatform.library.get())
+ gradlePluginImplementation(libs.plugins.maven.publish.get())
+}
+
+fun DependencyHandler.gradlePluginImplementation(plugin: PluginDependency) {
+ implementation(
+ group = plugin.pluginId,
+ name = "${plugin.pluginId}.gradle.plugin",
+ version = plugin.version.toString()
+ )
}
kotlin {
@@ -23,8 +35,8 @@ kotlin {
gradlePlugin {
plugins {
create("BuildPlugin") {
- id = "com.konyaco.fluent.plugin.build"
- implementationClass = "com.konyaco.fluent.plugin.build.BuildPlugin"
+ id = "io.github.composefluent.plugin.build"
+ implementationClass = "io.github.composefluent.plugin.build.BuildPlugin"
}
}
}
\ No newline at end of file
diff --git a/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildConfig.kt b/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildConfig.kt
deleted file mode 100644
index 301ac7e0..00000000
--- a/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildConfig.kt
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.konyaco.fluent.plugin.build
-
-import org.gradle.api.JavaVersion
-
-object BuildConfig {
-
- const val group = "com.konyaco"
-
- const val packageName = "$group.fluent"
-
- const val libraryVersion = "0.0.1-dev.8"
-
- object Android {
- const val compileSdkVersion = 34
-
- const val minSdkVersion = 24
- }
-
- object Jvm {
- const val jvmToolchainVersion = 17
- val javaVersion = JavaVersion.VERSION_17
- }
-}
\ No newline at end of file
diff --git a/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildExtension.kt b/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildExtension.kt
deleted file mode 100644
index ea279ed4..00000000
--- a/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildExtension.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.konyaco.fluent.plugin.build
-
-import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
-import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
-
-@OptIn(ExperimentalWasmDsl::class)
-fun KotlinMultiplatformExtension.applyTargets(publish: Boolean = true) {
- jvm("desktop")
- androidTarget {
- if (publish) publishLibraryVariants("release")
- }
- jvmToolchain(BuildConfig.Jvm.jvmToolchainVersion)
- wasmJs { browser() }
- js { browser() }
- iosX64()
- iosArm64()
- iosSimulatorArm64()
-}
\ No newline at end of file
diff --git a/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildPlugin.kt b/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildPlugin.kt
deleted file mode 100644
index a71a0c25..00000000
--- a/build-plugin/src/main/java/com/konyaco/fluent/plugin/build/BuildPlugin.kt
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.konyaco.fluent.plugin.build
-
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.publish.PublishingExtension
-import org.gradle.api.publish.maven.MavenPublication
-import org.gradle.api.tasks.bundling.Jar
-import org.gradle.kotlin.dsl.create
-import org.gradle.kotlin.dsl.findByType
-import org.gradle.kotlin.dsl.withType
-import org.gradle.plugins.signing.SigningExtension
-
-class BuildPlugin : Plugin {
- override fun apply(target: Project) {
- target.allprojects.forEach {
- it.afterEvaluate {
-
- it.extensions.findByType()?.apply {
- setupMavenPublishing(it)
- it.extensions.findByType()?.setupSigning(this)
- }
- }
- }
- }
-
- private fun SigningExtension.setupSigning(publishing: PublishingExtension) {
- useInMemoryPgpKeys(
- System.getenv("SIGNING_KEY_ID"),
- System.getenv("SIGNING_KEY"),
- System.getenv("SIGNING_PASSWORD")
- )
- sign(publishing.publications)
- }
-
- private fun PublishingExtension.setupMavenPublishing(target: Project) {
- val javadocJar = target.tasks.findByName("javadocJar") ?: target.tasks.create("javadocJar", Jar::class) {
- archiveClassifier.set("javadoc")
- }
- publications.withType {
- artifact(javadocJar)
- pom {
- name.set("compose-fluent-ui")
- description.set("A Fluent Design UI library for compose-multiplatform.")
- url.set("https://github.com/Konyaco/compose-fluent-ui")
-
- licenses {
- license {
- name.set("The Apache License, Version 2.0")
- url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
- }
- }
-
- developers {
- developer {
- name.set("Kon Yaco")
- email.set("atwzj233@gmail.com")
- url.set("https://github.com/Konyaco")
- }
- }
-
- scm {
- url.set("https://github.com/Konyaco/compose-fluent-ui")
- connection.set("scm:git:git://github.com/Konyaco/compose-fluent-ui.git")
- developerConnection.set("scm:git:ssh://github.com/Konyaco/compose-fluent-ui.git")
- }
- }
- }
- repositories {
- maven {
- val releasesUrl ="https://s01.oss.sonatype.org/content/repositories/snapshots/"
- val snapshotsUrl = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
- name = "OSSRH"
- url = target.uri(
- if (target.version.toString().endsWith("SNAPSHOT")) releasesUrl
- else snapshotsUrl
- )
- credentials {
- username = System.getenv("OSSRH_USERNAME")
- password = System.getenv("OSSRH_PASSWORD")
- }
- }
- }
- }
-}
diff --git a/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildConfig.kt b/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildConfig.kt
new file mode 100644
index 00000000..5a3c985f
--- /dev/null
+++ b/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildConfig.kt
@@ -0,0 +1,34 @@
+package io.github.composefluent.plugin.build
+
+import org.gradle.api.JavaVersion
+
+object BuildConfig {
+
+ const val group = "io.github.compose-fluent"
+
+ const val packageName = "io.github.composefluent"
+
+ internal const val snapshotLibraryVersion = "0.1.0-SNAPSHOT"
+
+ val isRelease = System.getenv("PROJECT_BUILD_TYPE") == "release"
+
+ var libraryVersion: String = snapshotLibraryVersion
+ internal set
+
+ var integerVersionName: String = ""
+ internal set
+
+ var branch: String = "dev"
+ internal set
+
+ object Android {
+ const val compileSdkVersion = 35
+
+ const val minSdkVersion = 24
+ }
+
+ object Jvm {
+ const val jvmToolchainVersion = 17
+ val javaVersion = JavaVersion.VERSION_17
+ }
+}
\ No newline at end of file
diff --git a/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt b/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt
new file mode 100644
index 00000000..8ae9641d
--- /dev/null
+++ b/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildExtension.kt
@@ -0,0 +1,60 @@
+package io.github.composefluent.plugin.build
+
+import com.android.build.api.dsl.androidLibrary
+import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
+import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
+import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
+
+@OptIn(ExperimentalWasmDsl::class, ExperimentalKotlinGradlePluginApi::class)
+fun KotlinMultiplatformExtension.applyTargets(namespaceModule: String = "") {
+ jvm("desktop")
+
+ try {
+ androidLibrary {
+ compileSdk = 35
+ namespace = "${BuildConfig.packageName}$namespaceModule"
+ }
+ } catch (_: IllegalStateException) {
+ // handle exception when android library plugin was not applied
+ androidTarget()
+ }
+
+ jvmToolchain(BuildConfig.Jvm.jvmToolchainVersion)
+ wasmJs { browser() }
+ js { browser() }
+ iosX64()
+ iosArm64()
+ iosSimulatorArm64()
+
+ applyHierarchyTemplate {
+ sourceSetTrees(KotlinSourceSetTree.main, KotlinSourceSetTree.test)
+
+ common {
+ group("skiko") {
+ withCompilations {
+ it.target.name != "android"
+ }
+ }
+
+ group("jvm") {
+ withJvm()
+ withAndroidTarget()
+ withCompilations { it.target.name == "android" }
+ }
+
+ group("web") {
+ withJs()
+ withWasmJs()
+ }
+
+ group("apple") {
+ withApple()
+ }
+
+ group("ios") {
+ withIos()
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildPlugin.kt b/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildPlugin.kt
new file mode 100644
index 00000000..d41a4b0e
--- /dev/null
+++ b/build-plugin/src/main/java/io/github/composefluent/plugin/build/BuildPlugin.kt
@@ -0,0 +1,200 @@
+package io.github.composefluent.plugin.build
+
+import com.vanniktech.maven.publish.MavenPublishBaseExtension
+import io.github.composefluent.plugin.build.BuildConfig.branch
+import io.github.composefluent.plugin.build.BuildConfig.integerVersionName
+import io.github.composefluent.plugin.build.BuildConfig.isRelease
+import io.github.composefluent.plugin.build.BuildConfig.libraryVersion
+import io.github.composefluent.plugin.build.BuildConfig.snapshotLibraryVersion
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.tasks.bundling.Jar
+import org.gradle.kotlin.dsl.create
+import org.gradle.kotlin.dsl.findByType
+import org.gradle.kotlin.dsl.withType
+import org.gradle.plugins.signing.SigningExtension
+
+class BuildPlugin : Plugin {
+ override fun apply(target: Project) {
+
+ setupLibraryVersion(target)
+
+ target.allprojects.forEach { project ->
+ project.afterEvaluate {
+
+ project.extensions.findByType()?.apply {
+ setupMavenPortalPublishing(project)
+ }
+ /*project.extensions.findByType()?.apply {
+ setupMavenPublishing(project)
+ project.extensions.findByType()?.let { signing ->
+ signing.setupSigning(this)
+
+ // workaround for publishing with javadoc see https://github.com/gradle/gradle/issues/26091#issuecomment-1722947958
+ project.tasks.withType().configureEach {
+ val signingTask = project.tasks.withType()
+ mustRunAfter(signingTask)
+ }
+ }
+ }*/
+ }
+ }
+ }
+
+ private fun MavenPublishBaseExtension.setupMavenPortalPublishing(target: Project) {
+ publishToMavenCentral()
+ signAllPublications()
+ coordinates(target.group.toString(), target.name, target.version.toString())
+
+ pom {
+ name.set("Compose Fluent UI")
+ description.set("A Fluent Design UI library for Compose Multiplatform.")
+ inceptionYear.set("2025")
+ url.set("https://github.com/compose-fluent/compose-fluent-ui")
+ licenses {
+ license {
+ name.set("The Apache License, Version 2.0")
+ url.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+ distribution.set("https://www.apache.org/licenses/LICENSE-2.0.txt")
+ }
+ }
+ developers {
+ developer {
+ id.set("konyaco")
+ name.set("Yaco")
+ url.set("https://github.com/konyaco")
+ }
+ developer {
+ id.set("sanlorng")
+ name.set("Sanlorng")
+ url.set("https://github.com/sanlorng")
+ }
+ }
+ scm {
+ url.set("https://github.com/compose-fluent/compose-fluent-ui")
+ connection.set("scm:git:git://github.com/compose-fluent/compose-fluent-ui.git")
+ developerConnection.set("scm:git:ssh://github.com/compose-fluent/compose-fluent-ui.git")
+ }
+ }
+ }
+
+ private fun SigningExtension.setupSigning(publishing: PublishingExtension) {
+ useInMemoryPgpKeys(
+ System.getenv("SIGNING_KEY_ID"),
+ System.getenv("SIGNING_KEY"),
+ System.getenv("SIGNING_PASSWORD")
+ )
+ sign(publishing.publications)
+ }
+
+ @Deprecated("use setupMavenPortalPublishing instead")
+ private fun PublishingExtension.setupMavenPublishing(target: Project) {
+ val javadocJar = target.tasks.findByName("javadocJar") ?: target.tasks.create("javadocJar", Jar::class) {
+ archiveClassifier.set("javadoc")
+ }
+ publications.withType