Skip to content

App hints tooltips #335

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

Merged
andrewtavis merged 5 commits into from
Mar 17, 2025
Merged

App hints tooltips #335

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f6ec5e5
[FIX] - add shadow to tooltips button
catreedle Mar 16, 2025
49acd83
[FIX] - add more horizontal padding for toolkits
catreedle Mar 17, 2025
46a7bf3
[FIX] - add tooltips shadow and padding top
catreedle Mar 17, 2025
ccacaaa
Move tooltip down slightly and reduce shadow
andrewtavis Mar 17, 2025
2d10b5a
[FIX] - reduce button shadow using drawBehind
catreedle Mar 17, 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
140 changes: 95 additions & 45 deletions app/src/main/java/be/scri/ui/common/appcomponents/HintDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@
package be.scri.ui.common.appcomponents

import android.content.Context
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.pager.PagerState
Expand All @@ -24,14 +27,20 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.drawBehind
import androidx.compose.ui.geometry.CornerRadius
import androidx.compose.ui.geometry.Offset
import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import be.scri.R
import be.scri.helpers.PreferencesHelper.getIsDarkModeOrNot

@Composable
fun HintDialog(
Expand All @@ -55,6 +64,8 @@ fun HintDialog(
derivedStateOf { pagerState.currentPage == currentPageIndex }
}

val isUserDarkMode = remember { getIsDarkModeOrNot(context.applicationContext) }

LaunchedEffect(isPageVisible) {
if (isPageVisible && !isHintShown) {
isHintShown = false
Expand All @@ -69,9 +80,10 @@ fun HintDialog(
isHintShown = true
onDismiss(currentPageIndex)
},
isUserDarkMode = isUserDarkMode,
modifier =
modifier
.padding(top = 8.dp),
.padding(top = 24.dp),
)
}
}
Expand All @@ -81,58 +93,96 @@ fun HintDialog(
fun HintDialogContent(
text: String,
onDismiss: () -> Unit,
isUserDarkMode: Boolean,
modifier: Modifier = Modifier,
) {
Surface(
shape = RoundedCornerShape(10.dp),
color = MaterialTheme.colorScheme.surface,
modifier = modifier,
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(vertical = 8.dp, horizontal = 6.dp),
) {
Icon(
painter = painterResource(R.drawable.light_bulb_icon),
contentDescription = "Hint",
tint = Color(0xFFFDAD0D),
modifier =
Modifier
.padding(end = 8.dp)
.size(30.dp),
)
val buttonColor =
if (isUserDarkMode) {
colorResource(R.color.dark_scribe_blue)
} else {
colorResource(R.color.light_scribe_blue)
}

Text(
text = text,
color = MaterialTheme.colorScheme.onSurface,
fontSize = 14.sp,
style =
MaterialTheme.typography.labelMedium.copy(
fontWeight = FontWeight.Normal,
),
modifier = Modifier.weight(0.85f),
)
val shadowColor = colorResource(R.color.light_key_shadow_color)

Button(
onClick = onDismiss,
colors =
ButtonColors(
containerColor = MaterialTheme.colorScheme.secondary,
contentColor = Color.White,
disabledContainerColor = MaterialTheme.colorScheme.secondary,
disabledContentColor = Color.White,
Box(
modifier =
modifier.padding(horizontal = 12.dp).background(
brush =
Brush.verticalGradient(
colors =
listOf(
Color.Transparent,
shadowColor,
),
),
contentPadding = PaddingValues(0.dp),
shape = RoundedCornerShape(8.dp),
modifier =
Modifier
.weight(0.15f),
shape = RoundedCornerShape(10.dp),
),
) {
Surface(
shape = RoundedCornerShape(10.dp),
color = MaterialTheme.colorScheme.surface,
shadowElevation = 4.dp,
modifier = Modifier.padding(bottom = 4.dp),
) {
Row(
verticalAlignment = Alignment.CenterVertically,
modifier = Modifier.padding(vertical = 8.dp, horizontal = 6.dp),
) {
Icon(
painter = painterResource(R.drawable.light_bulb_icon),
contentDescription = "Hint",
tint = Color(0xFFFDAD0D),
modifier =
Modifier
.padding(start = 8.dp, end = 12.dp)
.size(30.dp),
)

Text(
text = "OK",
fontSize = 12.sp,
modifier = Modifier,
text = text,
color = MaterialTheme.colorScheme.onSurface,
fontSize = 14.sp,
style =
MaterialTheme.typography.labelMedium.copy(
fontWeight = FontWeight.Normal,
),
modifier = Modifier.weight(0.85f),
)

Box(
modifier =
Modifier
.weight(0.15f)
.background(Color.Transparent)
.drawBehind {
drawRoundRect(
color = shadowColor,
topLeft = Offset.Zero.copy(y = size.height - 16.dp.toPx()),
size = size.copy(height = 14.dp.toPx()),
cornerRadius = CornerRadius(8.dp.toPx()),
)
},
) {
Button(
onClick = onDismiss,
colors =
ButtonColors(
containerColor = buttonColor,
contentColor = Color.White,
disabledContainerColor = MaterialTheme.colorScheme.secondary,
disabledContentColor = Color.White,
),
contentPadding = PaddingValues(0.dp),
shape = RoundedCornerShape(8.dp),
) {
Text(
text = "OK",
fontSize = 20.sp,
modifier = Modifier,
)
}
}
}
}
}
Expand Down
Loading