Skip to content

Added tooltip to UI components #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Added tooltip to UI components #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
362c3f6
Added tooltip to UI components
Sushant-Hande Feb 3, 2025
0860845
The Surface composable of New Chat component has been added under Too…
Sushant-Hande Feb 3, 2025
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
55 changes: 33 additions & 22 deletions composeApp/src/jvmMain/kotlin/com/kashif/deepseek/presentation/ChatScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.ColorScheme
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TextFieldDefaults
import androidx.compose.material3.Typography
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
Expand Down Expand Up @@ -91,6 +83,7 @@ fun ChatScreen(
}


@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun MainContent(
uiState: ChatUiState,
Expand All @@ -112,18 +105,31 @@ private fun MainContent(
horizontalArrangement = Arrangement.SpaceBetween,
verticalAlignment = Alignment.CenterVertically
) {
ModelSelector(
selectedModel = uiState.selectedModel,
availableModels = uiState.availableModels,
onModelSelect = { onEvent(ChatEvent.UserEvent.SelectModel(it)) }
)

var isDark by LocalThemeIsDark.current
IconButton(onClick = { isDark = !isDark }) {
Icon(
if (isDark) FeatherIcons.Sun else FeatherIcons.Moon,
contentDescription = "Toggle theme"
TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
tooltip = { PlainTooltip { Text("Select AI Model") } },
state = rememberTooltipState()
) {
ModelSelector(
selectedModel = uiState.selectedModel,
availableModels = uiState.availableModels,
onModelSelect = { onEvent(ChatEvent.UserEvent.SelectModel(it)) }
)

}

TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
tooltip = { PlainTooltip { Text("Toggle theme") } },
state = rememberTooltipState()
) {
var isDark by LocalThemeIsDark.current
IconButton(onClick = { isDark = !isDark }) {
Icon(
if (isDark) FeatherIcons.Sun else FeatherIcons.Moon,
contentDescription = "Toggle theme"
)
}
}
}
}
Expand Down Expand Up @@ -159,10 +165,14 @@ private fun MainContent(
onSendMessage = { onEvent(ChatEvent.UserEvent.SendMessage(it)) },
enabled = !uiState.isLoading && uiState.thinkingMessage == null,
modifier = Modifier.padding(16.dp)
)
)
}

Text(text = "KOllama can make mistakes, so double check the generated contents.", fontSize = 12.sp, modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp))
Text(
text = "KOllama can make mistakes, so double check the generated contents.",
fontSize = 12.sp,
modifier = Modifier.padding(start = 10.dp, end = 10.dp, bottom = 10.dp)
)
}
}

Expand Down Expand Up @@ -401,6 +411,7 @@ fun rememberMarkdownTypography(
)
)
}

@Composable
fun ButtonBackground(
modifier: Modifier = Modifier,
Expand Down
57 changes: 30 additions & 27 deletions composeApp/src/jvmMain/kotlin/com/kashif/deepseek/presentation/components/Sidebar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@ import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -35,6 +32,7 @@ import compose.icons.feathericons.Cpu
import compose.icons.feathericons.MessageCircle
import compose.icons.feathericons.Plus

@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun ChatSidebar(
uiState: ChatUiState,
Expand Down Expand Up @@ -77,31 +75,36 @@ internal fun ChatSidebar(
)
}


Surface(
onClick = { onEvent(ChatEvent.UserEvent.CreateNewChat) },
shape = RoundedCornerShape(12.dp),
color = MaterialTheme.colorScheme.primary.copy(alpha = 0.1f),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)),
modifier = Modifier.fillMaxWidth()
TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
tooltip = { PlainTooltip { Text("New Chat") } },
state = rememberTooltipState()
) {
Row(
modifier = Modifier.padding(16.dp),
horizontalArrangement = Arrangement.spacedBy(
8.dp,
Alignment.CenterHorizontally
),
verticalAlignment = Alignment.CenterVertically
Surface(
onClick = { onEvent(ChatEvent.UserEvent.CreateNewChat) },
shape = RoundedCornerShape(12.dp),
color = MaterialTheme.colorScheme.primary.copy(alpha = 0.1f),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)),
modifier = Modifier.fillMaxWidth()
) {
Icon(
FeatherIcons.Plus,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary
)
Text(
"New Chat",
color = MaterialTheme.colorScheme.primary
)
Row(
modifier = Modifier.padding(16.dp),
horizontalArrangement = Arrangement.spacedBy(
8.dp,
Alignment.CenterHorizontally
),
verticalAlignment = Alignment.CenterVertically
) {
Icon(
FeatherIcons.Plus,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary
)
Text(
"New Chat",
color = MaterialTheme.colorScheme.primary
)
}
}
}

Expand Down
38 changes: 21 additions & 17 deletions composeApp/src/jvmMain/kotlin/com/kashif/deepseek/presentation/components/WelcomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.material3.*
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand All @@ -28,6 +25,7 @@ import compose.icons.feathericons.MessageCircle
import compose.icons.feathericons.Plus


@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun WelcomeScreen(onEvent: (ChatEvent) -> Unit) {
Box(
Expand Down Expand Up @@ -83,20 +81,26 @@ fun WelcomeScreen(onEvent: (ChatEvent) -> Unit) {
color = MaterialTheme.colorScheme.primary.copy(alpha = 0.1f),
border = BorderStroke(1.dp, MaterialTheme.colorScheme.primary.copy(alpha = 0.2f))
) {
Row(
modifier = Modifier.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally)
TooltipBox(
positionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
tooltip = { PlainTooltip { Text("New Chat") } },
state = rememberTooltipState()
) {
Icon(
FeatherIcons.Plus,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary
)
Text(
"Start New Chat",
color = MaterialTheme.colorScheme.primary
)
Row(
modifier = Modifier.padding(16.dp),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally)
) {
Icon(
FeatherIcons.Plus,
contentDescription = null,
tint = MaterialTheme.colorScheme.primary
)
Text(
"Start New Chat",
color = MaterialTheme.colorScheme.primary
)
}
}
}
}
Expand Down