Skip to content

Commit 293d7ab

Browse files
authored
Merge pull request #55 from Konyaco/dev
v0.0.1-dev.8
2 parents 09910b8 + cb9fdcc commit 293d7ab

File tree

155 files changed

+11940
-1884
lines changed

Some content is hidden

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

155 files changed

+11940
-1884
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.gradle/
22
.idea/
33
build/
4-
local.properties
4+
local.properties
5+
.DS_Store

.idea/icon.svg

Lines changed: 72 additions & 0 deletions
Loading

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright 2024 Konyaco
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

README.md

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Compose Fluent
1+
<h1><img src="assets/icon.png" alt="Compose Fluent logo" height="48" valign="middle"> Compose Fluent</h1>
22

33
[![License](https://img.shields.io/github/license/Konyaco/compose-fluent-ui)](LICENSE)
44
[![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
2323
### Add Dependency
2424

2525
```kts
26-
implementation("com.konyaco:fluent:0.0.1-dev.7")
27-
implementation("com.konyaco:fluent-icons-extended:0.0.1-dev.7") // If you want to use full fluent icons.
26+
implementation("com.konyaco:fluent:0.0.1-dev.8")
27+
implementation("com.konyaco:fluent-icons-extended:0.0.1-dev.8") // If you want to use full fluent icons.
2828
```
2929

3030
### Example
@@ -67,35 +67,55 @@ The copyright of the icon assets (in `com.konyaco.fluent.icons` package) belongs
6767
- Layer
6868
- [x] Simple Layer
6969
- [ ] Real Layer
70-
- [ ] Acrylic
70+
- [x] Acrylic
71+
- [x] Card
7172

72-
### Basic Inputs
73+
### Basic Components
7374

74-
- [x] Button
75+
- [x] Buttons
76+
- [x] Button
77+
- [x] AccentButton
78+
- [x] SubtleButton
79+
- [x] DropdownButton
80+
- [x] HyperlinkButton
81+
- [x] RepeatButton
82+
- [x] ToggleButton
83+
- [x] SplitButton
84+
- [x] ToggleSplitButton
85+
- [x] RadioButton
7586
- [x] ToggleSwitch
7687
- [x] CheckBox
77-
- [x] RadioButton
78-
- [x] Slider
79-
- [x] DropdownMenu
80-
- [x] TextField
88+
- [ ] TriStateCheckBox
89+
- [x] ComboBox (Simple)
8190
- [x] ProgressBar
8291
- [x] ProgressRing
92+
- [x] Slider
93+
- [x] TextField
94+
95+
- [x] ColorPicker
96+
- [x] RatingControl
8397
- [ ] Pill Button
84-
- [ ] ComboBox
85-
- [ ] RatingControl
8698

87-
### Basic Components
99+
### Compound Components
88100

101+
- [x] CalendarView (Simple)
102+
- [x] DateTimePicker (Simple)
103+
- [x] Color Picker
104+
- [ ] Navigation
105+
- [x] SideNav
106+
- [ ] BreadcrumbBar
107+
- [ ] Pivot
108+
- [ ] TabView
89109
- [ ] Tooltip
90110
- [ ] InfoBar
91111
- [ ] FilePicker
92112
- [ ] Menu
93113

94114
### Dialogs
95115

96-
- [x] Simple Dialog
97-
- [ ] Compound Dialog (Title, Content, Controls)
98-
- [ ] Flyout
116+
- [x] FluentDialog
117+
- [x] ContentDialog
118+
- [x] Flyout (Simple)
99119

100120
### Animations
101121

@@ -106,18 +126,6 @@ The copyright of the icon assets (in `com.konyaco.fluent.icons` package) belongs
106126
- [x] Light and Dark theme
107127
- [ ] Custom accent color
108128

109-
### Compound Components
110-
111-
- [ ] Color Picker
112-
- [ ] DateTime Picker
113-
- [ ] Calender
114-
- [ ] Navigation
115-
- [x] SideNav
116-
- [ ] BreadcrumbBar
117-
- [ ] Pivot
118-
- [ ] TabView
119-
120-
### TODO
121-
129+
### Accessibility
122130

123131
- [ ] Accessibility Semantics

TODO.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
- [ ] Improve performance and smoothness.
2020

2121
- Layer
22-
- [ ] Eliminate workarounds like `circular`, `cornerRadius` etc.
22+
- [x] Eliminate workarounds like `circular`, `cornerRadius` etc.
2323

2424
## Compound Components
2525

assets/icon.png

8.92 KB
Loading

assets/screenshot.png

138 KB
Loading

build-plugin/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ repositories {
99

1010
dependencies {
1111
implementation(gradleApi())
12-
implementation(kotlin("gradle-plugin"))
12+
implementation(kotlin("gradle-plugin", libs.versions.kotlin.get()))
1313
}
1414

1515
kotlin {

build-plugin/settings.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
dependencyResolutionManagement {
2+
versionCatalogs {
3+
create("libs") {
4+
from(files("../gradle/libs.versions.toml"))
5+
}
6+
}
7+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ object BuildConfig {
88

99
const val packageName = "$group.fluent"
1010

11-
const val libraryVersion = "0.0.1-dev.7"
11+
const val libraryVersion = "0.0.1-dev.8"
1212

1313
object Android {
1414
const val compileSdkVersion = 34

0 commit comments

Comments
 (0)