Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

16 changes: 8 additions & 8 deletions fluent/src/commonMain/kotlin/com/konyaco/fluent/FluentTheme.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.konyaco.fluent

import androidx.compose.runtime.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.staticCompositionLocalOf
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontFamily
import com.konyaco.fluent.component.ProvideFontIcon

@Composable
fun FluentTheme(
Expand All @@ -25,12 +27,9 @@ fun FluentTheme(
titleLarge = typography.titleLarge.copy(fontFamily = defaultFontFamily),
display = typography.display.copy(fontFamily = defaultFontFamily),
)
} ?: typography)
) {
ProvideFontIcon {
PlatformCompositionLocalProvider(content)
}
}
} ?: typography),
content = content
)
}

object FluentTheme {
Expand All @@ -46,5 +45,6 @@ object FluentTheme {

internal val LocalColors = staticCompositionLocalOf { lightColors() }


fun lightColors(accent: Color = Color(0xFF0078D4)): Colors = Colors(generateShades(accent), false)
fun darkColors(accent: Color = Color(0xFF0078D4)): Colors = Colors(generateShades(accent), true)

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.draw.shadow
import androidx.compose.ui.graphics.TransformOrigin
import androidx.compose.ui.input.key.KeyEvent
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.*
import androidx.compose.ui.window.Popup
Expand All @@ -35,9 +33,6 @@ fun DropdownMenu(
expanded: Boolean,
onDismissRequest: () -> Unit,
modifier: Modifier = Modifier,
focusable: Boolean = false,
onPreviewKeyEvent: ((KeyEvent) -> Boolean) = { false },
onKeyEvent: ((KeyEvent) -> Boolean) = { false },
offset: DpOffset = DpOffset(0.dp, 0.dp), // TODO: Offset
content: @Composable ColumnScope.() -> Unit
) {
Expand All @@ -51,10 +46,7 @@ fun DropdownMenu(
val popupPositionProvider = DropdownMenuPositionProvider(density)

Popup(
focusable = focusable,
onDismissRequest = onDismissRequest,
onKeyEvent = onKeyEvent,
onPreviewKeyEvent = onPreviewKeyEvent,
popupPositionProvider = popupPositionProvider,
) {
DropdownMenuContent(
Expand Down Expand Up @@ -129,8 +121,8 @@ internal fun DropdownMenuContent(
}

@Composable
fun DropdownMenuItem(onClick: () -> Unit, modifier: Modifier = Modifier, content: @Composable RowScope.() -> Unit) {
SubtleButton(modifier = modifier.defaultMinSize(minWidth = 100.dp), onClick = onClick, iconOnly = true, content = {
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp), modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), content = content)
fun DropdownMenuItem(onClick: () -> Unit, content: @Composable RowScope.() -> Unit) {
SubtleButton(modifier = Modifier.defaultMinSize(minWidth = 100.dp), onClick = onClick, iconOnly = true, content = {
Row(modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), content = content)
})
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.