diff --git a/app/detekt-baseline.xml b/app/detekt-baseline.xml index f517791e..efde6168 100644 --- a/app/detekt-baseline.xml +++ b/app/detekt-baseline.xml @@ -2,8 +2,6 @@ - ForbiddenImport:AcsMissingScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:CrashReportScreen.kt$import androidx.compose.material3.MaterialTheme LongMethod:AslNavHost.kt$@Composable fun AslNavHost( startDestination: String, openProjectId: String? = null, onOpenProjectConsumed: () -> Unit = {}, navController: NavHostController = rememberNavController(), ) MatchingDeclarationName:BlockingErrorScreen.kt$BlockingErrorType ParameterNaming:AslNavHost.kt$onOpenProjectConsumed diff --git a/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/acsmissing/AcsMissingScreen.kt b/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/acsmissing/AcsMissingScreen.kt index f3b10f98..f60e6008 100644 --- a/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/acsmissing/AcsMissingScreen.kt +++ b/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/acsmissing/AcsMissingScreen.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -16,6 +15,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.component.feedback.AslDialog import com.ahmadkharfan.androidstudiolite.designsystem.modifier.aslCard import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AcsMissingRoute() { @@ -33,7 +33,7 @@ private fun AcsMissingScreen(onExit: () -> Unit) { .alpha(0.5f) .padding(horizontal = 20.dp, vertical = 24.dp), ) { - Text(text = "Good morning, Alex", style = MaterialTheme.typography.headlineLarge, color = colors.textPrimary) + Text(text = "Good morning, Alex", style = AslTypography.headlineLarge, color = colors.textPrimary) Box( modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/crashreport/CrashReportScreen.kt b/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/crashreport/CrashReportScreen.kt index 5aea4e24..f45bfe2f 100644 --- a/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/crashreport/CrashReportScreen.kt +++ b/app/src/main/java/com/ahmadkharfan/androidstudiolite/feature/crashreport/CrashReportScreen.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -38,6 +37,7 @@ import kotlinx.coroutines.delay import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography private const val STACK_TRACE = """java.lang.OutOfMemoryError: Failed to allocate 48MB @@ -114,12 +114,12 @@ private fun CrashReportMessage(colors: AslColorScheme) { Column { Text( text = "Something went wrong", - style = MaterialTheme.typography.headlineMedium, + style = AslTypography.headlineMedium, color = colors.textPrimary, ) Text( text = "Android Studio Lite encountered an error and needs to restart. Your files are saved.", - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, modifier = Modifier.padding(top = 6.dp), ) diff --git a/designsystem/detekt-baseline.xml b/designsystem/detekt-baseline.xml index ca6370af..94e71f9e 100644 --- a/designsystem/detekt-baseline.xml +++ b/designsystem/detekt-baseline.xml @@ -12,49 +12,7 @@ CyclomaticComplexMethod:ListItem.kt$@Composable fun AslListItem( title: String, modifier: Modifier = Modifier, subtitle: String? = null, icon: String? = null, iconColor: Color? = null, leading: (@Composable () -> Unit)? = null, trailing: (@Composable () -> Unit)? = null, divider: Boolean = true, selected: Boolean = false, disabled: Boolean = false, onClick: (() -> Unit)? = null, ) CyclomaticComplexMethod:TextField.kt$@OptIn(ExperimentalFoundationApi::class) @Composable fun AslTextField( value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, label: String? = null, placeholder: String? = null, helper: String? = null, error: String? = null, disabled: Boolean = false, type: AslTextFieldType = AslTextFieldType.Text, leadingIcon: String? = null, trailingIcon: String? = null, onTrailingClick: (() -> Unit)? = null, onFocusChanged: ((Boolean) -> Unit)? = null, ) CyclomaticComplexMethod:ToolCallCard.kt$private fun computeLineDiff(old: String?, new: String): List<DiffLine> - ForbiddenImport:ApiKeyCard.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:AslMarkdownText.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:AslThinkingBlock.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Badge.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Banner.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:BottomSheet.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:BottomToolPanel.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Button.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ChatBubble.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ChatCodeBlock.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Checkbox.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Chip.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Dialog.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Dropdown.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:EditorToolbar.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:EmptyState.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ErrorState.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Fab.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:FileTabBar.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:FileTree.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:IconButton.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:LinearProgress.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ListItem.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:MemoryChartMini.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Menu.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:NavRail.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:PermissionCard.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ProjectCard.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:RadioGroup.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:SegmentedButton.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Slider.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Snackbar.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:SplitButton.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:StatusChip.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:Switch.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:TemplateCard.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:TextField.kt$import androidx.compose.material3.MaterialTheme ForbiddenImport:Theme.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ThemeSwatchPicker.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ToolCallCard.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ToolWindowPanel.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:TopAppBar.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:WizardStepper.kt$import androidx.compose.material3.MaterialTheme LongMethod:ApiKeyCard.kt$@Composable fun AslApiKeyCard( provider: String, value: String, onValueChange: (String) -> Unit, modifier: Modifier = Modifier, providerIcon: String = "sparkles", description: String? = null, placeholder: String = "sk-…", status: AslApiKeyStatus = AslApiKeyStatus.None, errorMessage: String? = null, onTest: (String) -> Unit = {}, testing: Boolean = false, onCollapse: (() -> Unit)? = null, ) LongMethod:AslMarkdownText.kt$@Composable fun AslMarkdownText( markdown: String, modifier: Modifier = Modifier, onCopyCode: (String) -> Unit = {}, ) LongMethod:AutocompletePopup.kt$@Composable fun AslAutocompletePopup( suggestions: List<AslSuggestion>, modifier: Modifier = Modifier, activeIndex: Int = 0, onSelect: (AslSuggestion, Int) -> Unit = { _, _ -> }, ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Button.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Button.kt index fd5d6e9a..92415704 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Button.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Button.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.widthIn import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedButton import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -32,6 +31,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.PreviewAslCompone import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslButtonVariant { Primary, Secondary, Tertiary, Destructive } @@ -68,7 +68,7 @@ fun AslButton( ) icon != null -> AslIcon(name = icon, size = 18.dp) } - Text(text = label, style = MaterialTheme.typography.labelLarge) + Text(text = label, style = AslTypography.labelLarge) if (trailingIcon != null) { AslIcon(name = trailingIcon, size = 18.dp) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Fab.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Fab.kt index 8b37881f..1b367a03 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Fab.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/Fab.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExtendedFloatingActionButton import androidx.compose.material3.LocalContentColor -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -17,6 +16,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.modifier.pressScale import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslFab( @@ -46,6 +46,6 @@ fun AslFab( AslIcon(name = icon, size = 22.dp) } }, - text = { Text(text = label, style = MaterialTheme.typography.labelLarge) }, + text = { Text(text = label, style = AslTypography.labelLarge) }, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/IconButton.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/IconButton.kt index 2629dd67..abb6d6ae 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/IconButton.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/IconButton.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -28,6 +27,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslIconButtonVariant { Ghost, Filled, Outlined } @@ -94,7 +94,7 @@ fun AslIconButton( ) { Text( text = badge, - style = MaterialTheme.typography.labelSmall.copy(fontSize = 9.sp), + style = AslTypography.labelSmall.copy(fontSize = 9.sp), color = Color.White, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/SplitButton.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/SplitButton.kt index 3e0baba2..25f4715e 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/SplitButton.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/buttons/SplitButton.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -24,6 +23,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.feedback.AslDro import com.ahmadkharfan.androidstudiolite.designsystem.component.feedback.AslDropdownMenuItem import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography data class AslSplitButtonItem(val label: String, val icon: String? = null) @@ -53,7 +53,7 @@ fun AslSplitButton( horizontalArrangement = Arrangement.spacedBy(8.dp), ) { AslIcon(name = icon, size = 18.dp, tint = contentColor) - Text(text = label, style = MaterialTheme.typography.labelLarge, color = contentColor) + Text(text = label, style = AslTypography.labelLarge, color = contentColor) } Row( modifier = Modifier diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslMarkdownText.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslMarkdownText.kt index 57ae1ba8..2c469425 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslMarkdownText.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslMarkdownText.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.text.BasicText -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -33,6 +32,7 @@ import androidx.compose.ui.unit.sp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslMarkdownText( @@ -47,17 +47,17 @@ fun AslMarkdownText( when (block) { is MdBlock.Heading -> { val style = when (block.level) { - 1 -> MaterialTheme.typography.titleLarge - 2 -> MaterialTheme.typography.titleMedium - 3 -> MaterialTheme.typography.titleSmall - else -> MaterialTheme.typography.bodyLarge.copy(fontWeight = FontWeight.SemiBold) + 1 -> AslTypography.titleLarge + 2 -> AslTypography.titleMedium + 3 -> AslTypography.titleSmall + else -> AslTypography.bodyLarge.copy(fontWeight = FontWeight.SemiBold) } InlineMarkdown(text = block.text, color = colors.textPrimary, style = style) } is MdBlock.Paragraph -> InlineMarkdown( text = block.text, color = colors.textPrimary, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, ) is MdBlock.Quote -> { Row( @@ -76,7 +76,7 @@ fun AslMarkdownText( InlineMarkdown( text = block.text, color = colors.textSecondary, - style = MaterialTheme.typography.bodyMedium.copy(fontStyle = FontStyle.Italic), + style = AslTypography.bodyMedium.copy(fontStyle = FontStyle.Italic), modifier = Modifier.weight(1f), ) } @@ -102,19 +102,19 @@ fun AslMarkdownText( ) block.ordered -> Text( text = "${index + 1}.", - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, ) else -> Text( text = "•", - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, ) } InlineMarkdown( text = item.text, color = colors.textPrimary, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, modifier = Modifier.weight(1f), ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslThinkingBlock.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslThinkingBlock.kt index df3d7daa..e73ccbae 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslThinkingBlock.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/AslThinkingBlock.kt @@ -20,7 +20,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -34,6 +33,7 @@ import androidx.compose.ui.draw.alpha import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslThinkingBlock( @@ -73,7 +73,7 @@ fun AslThinkingBlock( ) Text( text = if (streaming) thinkingLabel else thoughtLabel, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textTertiary, ) } @@ -85,7 +85,7 @@ fun AslThinkingBlock( SelectionContainer { Text( text = text, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textSecondary, modifier = Modifier .fillMaxWidth() diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatBubble.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatBubble.kt index 2bfe1b7f..532daa11 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatBubble.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatBubble.kt @@ -7,13 +7,13 @@ import androidx.compose.foundation.layout.ColumnScope import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslChatRole { User, Ai } @@ -46,7 +46,7 @@ fun AslChatBubble( if (timestamp != null) { Text( text = timestamp, - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, color = colors.textTertiary, modifier = Modifier.padding(horizontal = 4.dp, vertical = 2.dp), ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatCodeBlock.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatCodeBlock.kt index 13151bdf..218ee690 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatCodeBlock.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ChatCodeBlock.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -26,6 +25,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslChatCodeBlock( @@ -86,6 +86,6 @@ private fun ChatCodeButton(icon: String, label: String, tint: Color, onClick: () horizontalArrangement = Arrangement.spacedBy(4.dp), ) { AslIcon(name = icon, size = 14.dp, tint = tint) - Text(text = label, style = MaterialTheme.typography.labelSmall, color = tint) + Text(text = label, style = AslTypography.labelSmall, color = tint) } } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/EmptyState.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/EmptyState.kt index 119806e7..b7bc0e80 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/EmptyState.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/EmptyState.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -24,6 +23,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.preview.PreviewAslComponent import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslEmptyState( @@ -53,7 +53,7 @@ fun AslEmptyState( } Text( text = title, - style = MaterialTheme.typography.titleLarge, + style = AslTypography.titleLarge, color = colors.textPrimary, textAlign = TextAlign.Center, modifier = Modifier.padding(top = 8.dp), @@ -61,7 +61,7 @@ fun AslEmptyState( if (subtitle != null) { Text( text = subtitle, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, textAlign = TextAlign.Center, modifier = Modifier.widthIn(max = 320.dp), diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ErrorState.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ErrorState.kt index 39addd95..afd9b31c 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ErrorState.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ErrorState.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -28,6 +27,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslErrorState( @@ -57,7 +57,7 @@ fun AslErrorState( } Text( text = title, - style = MaterialTheme.typography.titleLarge, + style = AslTypography.titleLarge, color = colors.textPrimary, textAlign = TextAlign.Center, modifier = Modifier.padding(top = 8.dp), @@ -65,7 +65,7 @@ fun AslErrorState( if (explanation != null) { Text( text = explanation, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, textAlign = TextAlign.Center, modifier = Modifier.widthIn(max = 340.dp), diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/FileTree.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/FileTree.kt index 832afaf9..cef68f55 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/FileTree.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/FileTree.kt @@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable @@ -52,6 +51,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslGitStatus(val letter: String) { Modified("M"), Added("A"), Deleted("D"), Untracked("?"), Conflicted("!") } @@ -321,7 +321,7 @@ private fun RowScope.FileTreeRowLabel( Spacer(Modifier.width(6.dp)) Text( text = node.name, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, fontWeight = if (selected) FontWeight.Medium else FontWeight.Normal, color = node.git?.let { gitTint(it, colors) } ?: colors.textPrimary, maxLines = 1, diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ListItem.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ListItem.kt index f223af90..ace04bd3 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ListItem.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ListItem.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.width import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.ripple import androidx.compose.runtime.Composable @@ -30,6 +29,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.PreviewAslCompone import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslListItem( @@ -91,7 +91,7 @@ fun AslListItem( Column(modifier = Modifier.weight(1f)) { Text( text = title, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = if (disabled) colors.textDisabled else colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -99,7 +99,7 @@ fun AslListItem( if (subtitle != null) { Text( text = subtitle, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = if (disabled) colors.textDisabled else colors.textTertiary, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ProjectCard.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ProjectCard.kt index d65120b5..5c77f6cc 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ProjectCard.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ProjectCard.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -32,6 +31,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.modifier.pressScale import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography private val languageColors = mapOf( "Kotlin" to Color(0xFF7F52FF), @@ -85,7 +85,7 @@ fun AslProjectCard( Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(8.dp)) { Text( text = name, - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, color = colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -104,7 +104,7 @@ fun AslProjectCard( .size(7.dp) .background(languageColors[language] ?: colors.textTertiary, CircleShape), ) - Text(text = language, style = MaterialTheme.typography.labelSmall, color = colors.textSecondary) + Text(text = language, style = AslTypography.labelSmall, color = colors.textSecondary) } } Text( @@ -118,7 +118,7 @@ fun AslProjectCard( if (lastOpened != null) { Text( text = stringResource(R.string.asl_project_opened, lastOpened), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, modifier = Modifier.padding(top = 2.dp), ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/TemplateCard.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/TemplateCard.kt index 48615075..931819c9 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/TemplateCard.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/TemplateCard.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -40,6 +39,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.modifier.pressScale import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslTemplateCard( @@ -105,7 +105,7 @@ fun AslTemplateCard( } Text( text = name, - style = MaterialTheme.typography.titleSmall, + style = AslTypography.titleSmall, color = colors.textPrimary, textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth(), diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ToolCallCard.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ToolCallCard.kt index 31b4a178..6b119398 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ToolCallCard.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/content/ToolCallCard.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.selection.SelectionContainer import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.remember @@ -33,6 +32,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslToolCallState { Pending, Running, Done, Failed, Rejected } @@ -64,7 +64,7 @@ fun AslToolCallCard( AslIcon(name = icon, size = 16.dp, tint = colors.textSecondary) Text( text = title, - style = MaterialTheme.typography.labelLarge, + style = AslTypography.labelLarge, color = colors.textPrimary, modifier = Modifier.weight(1f), ) @@ -118,7 +118,7 @@ private fun ToolStatusChip(state: AslToolCallState) { val statusSpec = toolStatusSpec(state, colors) Text( text = stringResource(statusSpec.labelRes), - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, fontWeight = FontWeight.SemiBold, color = statusSpec.foreground, modifier = Modifier diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Badge.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Badge.kt index 7538bb6b..1937ff0d 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Badge.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Badge.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.sizeIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -15,6 +14,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslBadgeTone { Error, Accent, Neutral } @@ -44,7 +44,7 @@ fun AslBadge( text = count, color = Color.White, fontSize = 10.sp, - style = MaterialTheme.typography.labelSmall.copy(fontSize = 10.sp), + style = AslTypography.labelSmall.copy(fontSize = 10.sp), ) } } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Banner.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Banner.kt index abee3cb1..505117be 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Banner.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Banner.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -18,6 +17,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslBannerTone { Info, Warning, Error, Success } @@ -57,14 +57,14 @@ fun AslBanner( AslIcon(name = toneIcon(tone), size = 17.dp, tint = fg) Text( text = message, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textPrimary, modifier = Modifier.weight(1f), ) if (actionLabel != null) { Text( text = actionLabel, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, fontWeight = FontWeight.SemiBold, color = fg, modifier = Modifier diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Dialog.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Dialog.kt index 0e173833..38e1ac29 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Dialog.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Dialog.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -36,6 +35,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslDialogVariant { Alert, Confirm, Input } @@ -73,7 +73,7 @@ fun AslDialog( .padding(24.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Text(text = title, style = MaterialTheme.typography.headlineSmall, color = colors.textPrimary) + Text(text = title, style = AslTypography.headlineSmall, color = colors.textPrimary) Column( @@ -85,7 +85,7 @@ fun AslDialog( verticalArrangement = Arrangement.spacedBy(12.dp), ) { if (body != null) { - Text(text = body, style = MaterialTheme.typography.bodyMedium, color = colors.textSecondary) + Text(text = body, style = AslTypography.bodyMedium, color = colors.textSecondary) } if (variant == AslDialogVariant.Input && inputContent != null) { inputContent() diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/LinearProgress.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/LinearProgress.kt index 80eee9b2..4f732e81 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/LinearProgress.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/LinearProgress.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.material3.LinearProgressIndicator -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -14,6 +13,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslLinearProgress( @@ -31,7 +31,7 @@ fun AslLinearProgress( verticalAlignment = Alignment.Bottom, ) { if (label != null) { - Text(text = label, style = MaterialTheme.typography.labelMedium, color = colors.textSecondary) + Text(text = label, style = AslTypography.labelMedium, color = colors.textSecondary) } if (detail != null) { Text(text = detail, style = AslCode.codeTiny, color = colors.textTertiary) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Menu.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Menu.kt index 3c6ff949..8c0d035e 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Menu.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Menu.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.widthIn import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -16,6 +15,7 @@ import androidx.compose.ui.window.PopupProperties import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslDropdownMenu( @@ -66,13 +66,13 @@ fun AslDropdownMenuItem( DropdownMenuItem( modifier = modifier, text = { - Text(label, style = MaterialTheme.typography.bodyMedium, color = textColor) + Text(label, style = AslTypography.bodyMedium, color = textColor) }, leadingIcon = icon?.let { iconName -> { AslIcon(name = iconName, size = 16.dp, tint = iconTint) } }, trailingIcon = shortcut?.let { sc -> - { Text(text = sc, style = MaterialTheme.typography.labelSmall, color = colors.textTertiary) } + { Text(text = sc, style = AslTypography.labelSmall, color = colors.textTertiary) } } ?: trailingIcon, enabled = enabled, onClick = onClick, diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Snackbar.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Snackbar.kt index 81e45225..1ecd70a1 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Snackbar.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/Snackbar.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.defaultMinSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.widthIn -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -16,6 +15,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslSnackbarTone { Neutral, Success, Error } @@ -49,14 +49,14 @@ fun AslSnackbar( } Text( text = message, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.bgBase, modifier = Modifier.weight(1f), ) if (actionLabel != null) { Text( text = actionLabel, - style = MaterialTheme.typography.labelLarge, + style = AslTypography.labelLarge, color = colors.accentPrimary, modifier = Modifier .clickable(onClick = onAction) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/StatusChip.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/StatusChip.kt index 682a7d51..37f4cb6e 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/StatusChip.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/feedback/StatusChip.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -22,6 +21,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.PreviewAslCompone import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslStatus { Building, Syncing, Indexing, Success, Failed } @@ -65,7 +65,7 @@ fun AslStatusChip( } Text( text = label ?: stringResource(s.labelRes), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, fontWeight = FontWeight.SemiBold, color = fg, maxLines = 2, diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ApiKeyCard.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ApiKeyCard.kt index 91c0c7d6..9f88c8ae 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ApiKeyCard.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ApiKeyCard.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -33,6 +32,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslTextF import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslApiKeyStatus { None, Valid, Invalid } @@ -92,19 +92,19 @@ fun AslApiKeyCard( AslIcon(name = providerIcon, size = 18.dp, tint = colors.textSecondary) } Column(modifier = Modifier.weight(1f)) { - Text(text = provider, style = MaterialTheme.typography.titleMedium, color = colors.textPrimary) + Text(text = provider, style = AslTypography.titleMedium, color = colors.textPrimary) if (description != null) { - Text(text = description, style = MaterialTheme.typography.bodySmall, color = colors.textTertiary) + Text(text = description, style = AslTypography.bodySmall, color = colors.textTertiary) } } when (status) { AslApiKeyStatus.Valid -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { AslIcon(name = "check", size = 14.dp, tint = colors.success) - Text(text = stringResource(R.string.asl_api_key_valid), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.SemiBold, color = colors.success) + Text(text = stringResource(R.string.asl_api_key_valid), style = AslTypography.labelMedium, fontWeight = FontWeight.SemiBold, color = colors.success) } AslApiKeyStatus.Invalid -> Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { AslIcon(name = "x", size = 14.dp, tint = colors.error) - Text(text = stringResource(R.string.asl_api_key_invalid), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.SemiBold, color = colors.error) + Text(text = stringResource(R.string.asl_api_key_invalid), style = AslTypography.labelMedium, fontWeight = FontWeight.SemiBold, color = colors.error) } AslApiKeyStatus.None -> Unit } @@ -148,7 +148,7 @@ fun AslApiKeyCard( if (status == AslApiKeyStatus.Invalid && !errorMessage.isNullOrBlank()) { Text( text = errorMessage, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.error, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/GradleTaskRow.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/GradleTaskRow.kt index d1a9e5ec..cb3e26f6 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/GradleTaskRow.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/GradleTaskRow.kt @@ -18,6 +18,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslCheck import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslGradleTaskRow( @@ -51,7 +52,7 @@ fun AslGradleTaskRow( if (group != null) { Text( text = group, - style = androidx.compose.material3.MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, color = colors.textTertiary, modifier = Modifier.padding(top = 1.dp), ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/MemoryChartMini.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/MemoryChartMini.kt index ced7b6e8..6b73070f 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/MemoryChartMini.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/MemoryChartMini.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -17,6 +16,7 @@ import androidx.compose.ui.graphics.drawscope.Stroke import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslMemoryChartTone { Normal, Warning, Error } @@ -37,7 +37,7 @@ fun AslMemoryChartMini( } Column(modifier = modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(6.dp)) { Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween, verticalAlignment = Alignment.Bottom) { - Text(text = label, style = MaterialTheme.typography.labelMedium, color = colors.textSecondary) + Text(text = label, style = AslTypography.labelMedium, color = colors.textSecondary) Text(text = "$value / $max MB", style = AslCode.codeTiny, color = lineColor) } Canvas(modifier = Modifier.fillMaxWidth().height(40.dp)) { diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/PermissionCard.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/PermissionCard.kt index 16c4d2cb..30f9cd7f 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/PermissionCard.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/PermissionCard.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -32,6 +31,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslPermissionCard( @@ -69,10 +69,10 @@ fun AslPermissionCard( AslIcon(name = "check", size = 22.dp, tint = colors.success, modifier = Modifier.alpha(g)) } Column(modifier = Modifier.weight(1f)) { - Text(text = title, style = MaterialTheme.typography.titleMedium, color = colors.textPrimary) + Text(text = title, style = AslTypography.titleMedium, color = colors.textPrimary) Text( text = reason, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textSecondary, modifier = Modifier.padding(top = 4.dp, bottom = 12.dp), ) @@ -81,7 +81,7 @@ fun AslPermissionCard( Box(modifier = Modifier.animateContentSize(AslMotion.standardSpec())) { AslStateCrossfade(targetState = granted, label = "permCta") { isGranted -> if (isGranted) { - Text(text = stringResource(R.string.asl_permission_granted), style = MaterialTheme.typography.labelMedium, fontWeight = FontWeight.SemiBold, color = colors.success) + Text(text = stringResource(R.string.asl_permission_granted), style = AslTypography.labelMedium, fontWeight = FontWeight.SemiBold, color = colors.success) } else { AslButton(label = stringResource(R.string.asl_permission_grant_access), onClick = onGrant) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ThemeSwatchPicker.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ThemeSwatchPicker.kt index 3082a863..1f70c9b8 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ThemeSwatchPicker.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/ide/ThemeSwatchPicker.kt @@ -13,7 +13,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -26,6 +25,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography data class AslThemeSwatch(val id: String, val name: String, val colors: List) @@ -42,7 +42,7 @@ fun AslThemeSwatchPicker( if (label != null) { Text( text = label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.padding(bottom = 10.dp), ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Checkbox.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Checkbox.kt index 719f2836..aafee2c9 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Checkbox.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Checkbox.kt @@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.ripple import androidx.compose.runtime.Composable @@ -33,6 +32,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslCheckbox( @@ -104,7 +104,7 @@ fun AslCheckbox( Spacer(Modifier.width(8.dp)) Text( text = label, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = if (disabled) colors.textDisabled else colors.textPrimary, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Chip.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Chip.kt index 08551e1d..bd76b1c2 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Chip.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Chip.kt @@ -10,7 +10,6 @@ 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.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -26,6 +25,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslChipKind { Filter, Input, Assist, Status } enum class AslChipStatus { Neutral, Success, Error, Warning, Info } @@ -70,7 +70,7 @@ fun AslChip( } else if (icon != null) { AslIcon(name = icon, size = 14.dp, tint = fg) } - Text(text = label, style = MaterialTheme.typography.labelMedium, color = fg) + Text(text = label, style = AslTypography.labelMedium, color = fg) if (kind == AslChipKind.Input && onRemove != null) { androidx.compose.foundation.layout.Box( modifier = Modifier diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Dropdown.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Dropdown.kt index 95e58f37..ffd4b458 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Dropdown.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Dropdown.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -27,6 +26,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMetrics import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography data class AslDropdownOption(val label: String, val value: String) @@ -48,7 +48,7 @@ fun AslDropdown( if (label != null) { Text( text = label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = if (disabled) colors.textDisabled else colors.textSecondary, ) Spacer(Modifier.height(6.dp)) @@ -67,7 +67,7 @@ fun AslDropdown( ) { Text( text = current?.label ?: placeholder, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = when { disabled -> colors.textDisabled current != null -> colors.textPrimary diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/RadioGroup.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/RadioGroup.kt index 5038ee49..74c8bd42 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/RadioGroup.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/RadioGroup.kt @@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectableGroup import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.ripple import androidx.compose.runtime.Composable @@ -32,6 +31,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography data class AslRadioOption( val label: String, @@ -55,7 +55,7 @@ fun AslRadioGroup( if (label != null) { Text( text = label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.padding(bottom = 4.dp), ) @@ -87,13 +87,13 @@ fun AslRadioGroup( Column { Text( text = option.label, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = if (rowDisabled) colors.textDisabled else colors.textPrimary, ) if (option.description != null) { Text( text = option.description, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = if (rowDisabled) colors.textDisabled else colors.textTertiary, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/SegmentedButton.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/SegmentedButton.kt index e013a199..28c3b761 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/SegmentedButton.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/SegmentedButton.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.layout.wrapContentWidth import androidx.compose.foundation.selection.selectable import androidx.compose.foundation.selection.selectableGroup -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -29,6 +28,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography data class AslSegmentedOption( val label: String, @@ -103,7 +103,7 @@ fun AslSegmentedButton( AslIcon(name = option.icon, size = 16.dp, tint = fg) Spacer(Modifier.width(6.dp)) } - Text(text = option.label, style = MaterialTheme.typography.labelLarge, color = fg) + Text(text = option.label, style = AslTypography.labelLarge, color = fg) } } } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Slider.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Slider.kt index 1b99d47e..11318185 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Slider.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Slider.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Slider import androidx.compose.material3.SliderDefaults import androidx.compose.material3.Text @@ -15,6 +14,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslSlider( @@ -39,7 +39,7 @@ fun AslSlider( ) { Text( text = label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = if (disabled) colors.textDisabled else colors.textSecondary, ) Text( diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Switch.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Switch.kt index 04a9ca1b..b011418c 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Switch.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/Switch.kt @@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.size import androidx.compose.foundation.selection.toggleable import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.ripple import androidx.compose.runtime.Composable @@ -29,6 +28,7 @@ import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslSwitch( @@ -87,7 +87,7 @@ fun AslSwitch( if (label != null) { Text( text = label, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = if (disabled) colors.textDisabled else colors.textPrimary, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/TextField.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/TextField.kt index 306d9fd6..c3bd1768 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/TextField.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/TextField.kt @@ -18,7 +18,6 @@ import androidx.compose.foundation.relocation.BringIntoViewRequester import androidx.compose.foundation.relocation.bringIntoViewRequester import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.text.KeyboardOptions -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -40,6 +39,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.preview.AslPreview import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMetrics import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import kotlinx.coroutines.launch enum class AslTextFieldType { Text, Password, Email, Url, Number } @@ -70,13 +70,13 @@ fun AslTextField( focused -> colors.accentPrimary else -> colors.borderStrong } - val fieldTextStyle = if (type == AslTextFieldType.Password) AslTheme.code.codeBody else MaterialTheme.typography.bodyMedium + val fieldTextStyle = if (type == AslTextFieldType.Password) AslTheme.code.codeBody else AslTypography.bodyMedium Column(modifier = modifier) { if (label != null) { Text( text = label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = if (disabled) colors.textDisabled else colors.textSecondary, ) Spacer(Modifier.height(6.dp)) @@ -144,7 +144,7 @@ fun AslTextField( Spacer(Modifier.height(4.dp)) Text( text = message, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = if (error != null) colors.error else colors.textTertiary, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/WizardStepper.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/WizardStepper.kt index d896cdfe..b14ef8f3 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/WizardStepper.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/inputs/WizardStepper.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.widthIn import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -27,6 +26,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import kotlin.math.abs @Composable @@ -78,7 +78,7 @@ fun AslWizardStepper( Text( text = "${index + 1}", - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = lerp(colors.textTertiary, colors.accentOnPrimary, filled), modifier = Modifier.alpha(1f - done), ) @@ -92,7 +92,7 @@ fun AslWizardStepper( Spacer(Modifier.height(6.dp)) Text( text = step, - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, fontWeight = if (halo > 0.5f) FontWeight.SemiBold else FontWeight.Medium, color = lerp(lerp(colors.textTertiary, colors.textSecondary, filled), colors.textPrimary, halo), textAlign = TextAlign.Center, diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomSheet.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomSheet.kt index 664e951f..5c1c4980 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomSheet.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomSheet.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.heightIn import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.ModalBottomSheet import androidx.compose.material3.Text import androidx.compose.material3.rememberModalBottomSheetState @@ -13,6 +12,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.layout.aslImePadding import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography enum class AslBottomSheetSize { Peek, Half, Full } @@ -45,7 +45,7 @@ fun AslBottomSheet( if (title != null) { Text( text = title, - style = MaterialTheme.typography.titleLarge, + style = AslTypography.titleLarge, color = colors.textPrimary, modifier = Modifier.padding(horizontal = 20.dp, vertical = 8.dp), ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomToolPanel.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomToolPanel.kt index f6083e2d..5d99dcb3 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomToolPanel.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/BottomToolPanel.kt @@ -22,7 +22,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -46,6 +45,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import kotlin.math.min data class AslBottomPanelTab( @@ -204,7 +204,7 @@ fun AslBottomToolPanel( } Text( text = tab.label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, fontWeight = if (active) FontWeight.SemiBold else FontWeight.Medium, color = tabFg, ) @@ -220,7 +220,7 @@ fun AslBottomToolPanel( ) { Text( text = "${tab.count}", - style = MaterialTheme.typography.labelSmall.copy(fontSize = 10.sp), + style = AslTypography.labelSmall.copy(fontSize = 10.sp), color = if (tab.error) Color.White else colors.textSecondary, ) } diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/EditorToolbar.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/EditorToolbar.kt index 5d102f23..e6234b98 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/EditorToolbar.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/EditorToolbar.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -28,6 +27,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.buttons.AslOver import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslEditorToolbar( @@ -59,7 +59,7 @@ fun AslEditorToolbar( AslIcon(name = "smartphone", size = 16.dp, tint = colors.textTertiary) Text( text = projectName, - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, color = colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -84,7 +84,7 @@ fun AslEditorToolbar( ) Text( text = stringResource(if (running) R.string.asl_action_stop else R.string.asl_action_run), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, fontWeight = FontWeight.SemiBold, color = if (running) Color.White else colors.accentOnPrimary, ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/FileTabBar.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/FileTabBar.kt index c86cdb3f..6c2ab874 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/FileTabBar.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/FileTabBar.kt @@ -17,7 +17,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable @@ -36,6 +35,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslFileIcons import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMetrics import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Immutable data class AslFileTab(val id: String, val name: String, val icon: String? = null, val modified: Boolean = false) @@ -108,7 +108,7 @@ private fun AslFileTabItem( } Text( text = tab.name, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, fontWeight = if (active) FontWeight.SemiBold else FontWeight.Medium, color = if (active) colors.textPrimary else colors.textSecondary, ) diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/NavRail.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/NavRail.kt index 4f11d3a7..7a27215b 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/NavRail.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/NavRail.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.VerticalDivider import androidx.compose.runtime.Composable @@ -21,6 +20,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography data class AslNavRailItem(val id: String, val icon: String, val label: String) @@ -59,7 +59,7 @@ fun AslNavRail( } Text( text = item.label, - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, fontWeight = if (active) FontWeight.SemiBold else FontWeight.Medium, color = if (active) colors.textPrimary else colors.textSecondary, modifier = Modifier.padding(top = 4.dp), diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/ToolWindowPanel.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/ToolWindowPanel.kt index f71820c9..3b9389fe 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/ToolWindowPanel.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/ToolWindowPanel.kt @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.VerticalDivider import androidx.compose.runtime.Composable @@ -27,6 +26,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.R import com.ahmadkharfan.androidstudiolite.designsystem.component.buttons.AslIconButton import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMetrics import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun rememberAslToolWindowWidth(): Dp { @@ -64,7 +64,7 @@ fun AslToolWindowPanel( ) { Text( text = title, - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, color = colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/TopAppBar.kt b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/TopAppBar.kt index 389b49c7..8905b947 100644 --- a/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/TopAppBar.kt +++ b/designsystem/src/main/java/com/ahmadkharfan/androidstudiolite/designsystem/component/navigation/TopAppBar.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawing import androidx.compose.foundation.layout.windowInsetsPadding import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment @@ -25,6 +24,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.R import com.ahmadkharfan.androidstudiolite.designsystem.component.buttons.AslIconButton import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun AslTopAppBar( @@ -69,7 +69,7 @@ fun AslTopAppBar( ) { Text( text = title, - style = MaterialTheme.typography.titleLarge, + style = AslTypography.titleLarge, color = colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -77,7 +77,7 @@ fun AslTopAppBar( if (subtitle != null) { Text( text = subtitle, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, maxLines = 1, overflow = TextOverflow.Ellipsis, diff --git a/feature/editor/detekt-baseline.xml b/feature/editor/detekt-baseline.xml index 31453613..9cf08a87 100644 --- a/feature/editor/detekt-baseline.xml +++ b/feature/editor/detekt-baseline.xml @@ -20,11 +20,6 @@ CyclomaticComplexMethod:SmartEdit.kt$SmartEdit$private fun xmlTagToClose(doc: EditorDocument, pos: Int): String? CyclomaticComplexMethod:SyntaxLexer.kt$CLikeLexer$override fun tokenizeLine(line: String, entryState: LexerState): LineResult CyclomaticComplexMethod:SyntaxLexer.kt$XmlLexer$private fun tokenizeTag(line: String, start: Int, end: Int, tokens: MutableList<SyntaxToken>) - ForbiddenImport:AiChatScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:AssetThumbnail.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:AssetsScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:FileTreeSearchPanel.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:VariantsScreen.kt$import androidx.compose.material3.MaterialTheme LongMethod:AiChatScreen.kt$@Composable private fun AiChatScreen( uiState: AiChatUiState, interactionListener: AiChatInteractionListener, onClose: () -> Unit, onOpenAiAgentSettings: () -> Unit, ) LongMethod:AiChatScreen.kt$@Composable private fun ChatControlsSheet( uiState: AiChatUiState, interactionListener: AiChatInteractionListener, ) LongMethod:AslEditableCodeEditor.kt$@Composable fun AslEditableCodeEditor( session: EditorSession, fontSizeSp: Int, tabSize: Int, onEdited: () -> Unit, onCaretMoved: (line: Int, column: Int) -> Unit, modifier: Modifier = Modifier, colorSchemeId: String = "darcula", fontFamilyId: String = "jetbrains", gitLineStatus: Map<Int, AslLineGit> = emptyMap(), breakpoints: Set<Int> = emptySet(), findQuery: String = "", findCurrentMatch: Int = 0, revealNonce: Int = 0, revealOffset: Int = 0, enableVolumeKeys: Boolean = true, projectIndex: ProjectSymbolIndex = ProjectSymbolIndex.EMPTY, ) diff --git a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/aichat/AiChatScreen.kt b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/aichat/AiChatScreen.kt index 9a96e7f0..0975c48a 100644 --- a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/aichat/AiChatScreen.kt +++ b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/aichat/AiChatScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -60,6 +59,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.reme import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.layout.aslImePadding import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.domain.model.ChatMode @Composable @@ -167,7 +167,7 @@ private fun PlanReviewSheet( ) { Text( text = stringResource(CommonR.string.ai_plan_review_sheet_subtitle), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textSecondary, ) AslTextField( @@ -177,7 +177,7 @@ private fun PlanReviewSheet( ) Text( text = stringResource(CommonR.string.ai_plan_review_sheet_hint), - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, color = colors.textTertiary, ) AslButton( @@ -210,7 +210,7 @@ private fun ChatControlsSheet( Column(verticalArrangement = Arrangement.spacedBy(6.dp)) { Text( text = stringResource(CommonR.string.ai_chat_mode), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, ) AslSegmentedButton( @@ -225,7 +225,7 @@ private fun ChatControlsSheet( ) Text( text = stringResource(uiState.mode.descriptionRes()), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) } @@ -243,7 +243,7 @@ private fun ChatControlsSheet( Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(4.dp)) { Text( text = stringResource(CommonR.string.ai_chat_model), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.weight(1f), ) @@ -353,14 +353,14 @@ private fun ChatHistoryRow( Column(modifier = Modifier.weight(1f)) { Text( text = thread.title, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, ) Text( text = thread.subtitle, - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, color = colors.textTertiary, ) } @@ -428,7 +428,7 @@ private fun ChatMessageList( if (uiState.sending && !hasLiveContent) { Text( text = stringResource(CommonR.string.ai_chat_typing), - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, color = colors.textTertiary, ) } @@ -523,7 +523,7 @@ private fun ChatMessageBubble(message: ChatMessageUiModel, interactionListener: SelectionContainer { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { if (message.isUser) { - Text(text = message.text, style = MaterialTheme.typography.bodyMedium, color = colors.textPrimary) + Text(text = message.text, style = AslTypography.bodyMedium, color = colors.textPrimary) } else { AslMarkdownText( markdown = message.text, diff --git a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetThumbnail.kt b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetThumbnail.kt index 0da9b0a5..ae3ec053 100644 --- a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetThumbnail.kt +++ b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetThumbnail.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.border import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.size -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -24,6 +23,7 @@ import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -95,7 +95,7 @@ private fun FontThumbnail(path: String) { } Text( text = "Aa", - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, fontFamily = typeface?.let { FontFamily(it) }, color = AslTheme.colors.textPrimary, ) diff --git a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetsScreen.kt b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetsScreen.kt index 7a300147..97d470f8 100644 --- a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetsScreen.kt +++ b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/assets/AssetsScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -43,6 +42,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.reme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.koin.androidx.compose.koinViewModel @@ -122,8 +122,8 @@ private fun AssetDetailView( Row(verticalAlignment = Alignment.CenterVertically) { AslIconButton(icon = "arrow-left", contentDescription = stringResource(CommonR.string.action_back), onClick = onBack, size = 32.dp, iconSize = 16.dp) Column(modifier = Modifier.weight(1f).padding(start = 4.dp)) { - Text(text = asset.name, style = MaterialTheme.typography.titleSmall, color = colors.textPrimary) - Text(text = asset.subtitle, style = MaterialTheme.typography.bodySmall, color = colors.textTertiary) + Text(text = asset.name, style = AslTypography.titleSmall, color = colors.textPrimary) + Text(text = asset.subtitle, style = AslTypography.bodySmall, color = colors.textTertiary) } } AssetDetailPreview(asset = asset) @@ -187,13 +187,13 @@ private fun AssetDetailFont(path: String) { Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(8.dp)) { Text( text = stringResource(R.string.editor_assets_font_sample), - style = MaterialTheme.typography.headlineSmall, + style = AslTypography.headlineSmall, fontFamily = typeface?.let { FontFamily(it) }, color = AslTheme.colors.textPrimary, ) Text( text = stringResource(R.string.editor_assets_font_characters), - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, fontFamily = typeface?.let { FontFamily(it) }, color = AslTheme.colors.textSecondary, ) @@ -237,7 +237,7 @@ private fun EmptyAssets() { Box(modifier = Modifier.fillMaxSize().padding(24.dp), contentAlignment = Alignment.Center) { Text( text = stringResource(R.string.editor_assets_empty), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = AslTheme.colors.textTertiary, ) } diff --git a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/filetree/FileTreeSearchPanel.kt b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/filetree/FileTreeSearchPanel.kt index 840d2d0b..6ab11cd3 100644 --- a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/filetree/FileTreeSearchPanel.kt +++ b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/filetree/FileTreeSearchPanel.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue @@ -21,6 +20,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.content.AslList import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslSearchField import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.editor.EditorFileNodeUiModel import com.ahmadkharfan.androidstudiolite.feature.editor.R import com.ahmadkharfan.androidstudiolite.feature.editor.fileIconFor @@ -60,7 +60,7 @@ fun FileTreeSearchPanel( ) { Text( text = stringResource(R.string.editor_search_files_hint), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) } @@ -73,7 +73,7 @@ fun FileTreeSearchPanel( ) { Text( text = stringResource(R.string.editor_search_no_matches, query), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) } diff --git a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/variants/VariantsScreen.kt b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/variants/VariantsScreen.kt index ef2da77d..87da4881 100644 --- a/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/variants/VariantsScreen.kt +++ b/feature/editor/src/main/java/com/ahmadkharfan/androidstudiolite/feature/editor/variants/VariantsScreen.kt @@ -2,7 +2,6 @@ package com.ahmadkharfan.androidstudiolite.feature.editor.variants import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -13,6 +12,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslDropd import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.AslToolWindowPanel import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.rememberAslToolWindowWidth import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.editor.R @Composable @@ -41,7 +41,7 @@ fun VariantsRoute( } else { stringResource(R.string.editor_variants_release_hint) }, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, modifier = Modifier.padding(top = 10.dp), ) diff --git a/feature/onboarding/detekt-baseline.xml b/feature/onboarding/detekt-baseline.xml index 8f37cc4a..6b52f35f 100644 --- a/feature/onboarding/detekt-baseline.xml +++ b/feature/onboarding/detekt-baseline.xml @@ -2,10 +2,6 @@ - ForbiddenImport:CompleteScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:HowItWorksScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:PermissionsScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:WelcomeScreen.kt$import androidx.compose.material3.MaterialTheme LongMethod:HowItWorksScreen.kt$@Composable private fun HowItWorksScreen(onContinue: () -> Unit) ParameterNaming:WelcomeScreen.kt$onGetStarted diff --git a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/complete/CompleteScreen.kt b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/complete/CompleteScreen.kt index 0506d27c..78fabf56 100644 --- a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/complete/CompleteScreen.kt +++ b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/complete/CompleteScreen.kt @@ -8,7 +8,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -23,6 +22,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.buttons.AslButt import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslWizardStepper import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.onboarding.common.ONBOARDING_STEPS import com.ahmadkharfan.androidstudiolite.feature.onboarding.R @@ -60,14 +60,14 @@ private fun CompleteScreen(onOpen: () -> Unit) { } Text( text = stringResource(R.string.onboarding_complete_title), - style = MaterialTheme.typography.headlineLarge, + style = AslTypography.headlineLarge, color = colors.textPrimary, textAlign = TextAlign.Center, modifier = Modifier.padding(top = 18.dp), ) Text( text = stringResource(R.string.onboarding_complete_body), - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, textAlign = TextAlign.Center, modifier = Modifier.padding(top = 4.dp), diff --git a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/howitworks/HowItWorksScreen.kt b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/howitworks/HowItWorksScreen.kt index acc1c616..84eeaf06 100644 --- a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/howitworks/HowItWorksScreen.kt +++ b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/howitworks/HowItWorksScreen.kt @@ -15,7 +15,6 @@ import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -31,6 +30,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslWizar import com.ahmadkharfan.androidstudiolite.designsystem.icon.AslIcon import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.onboarding.R import com.ahmadkharfan.androidstudiolite.feature.onboarding.common.ONBOARDING_STEPS @@ -108,12 +108,12 @@ private fun HowItWorksHeader(colors: AslColorScheme) { Column(modifier = Modifier.padding(horizontal = 4.dp, vertical = 22.dp)) { Text( text = stringResource(R.string.onboarding_how_title), - style = MaterialTheme.typography.headlineMedium, + style = AslTypography.headlineMedium, color = colors.textPrimary, ) Text( text = stringResource(R.string.onboarding_how_subtitle), - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, modifier = Modifier.padding(top = 6.dp), ) @@ -154,19 +154,19 @@ private fun HowStepRow( Column(modifier = Modifier.padding(bottom = if (isLast) 0.dp else 22.dp)) { Text( text = stringResource(R.string.onboarding_how_step_label, number).uppercase(), - style = MaterialTheme.typography.labelSmall, + style = AslTypography.labelSmall, color = colors.textTertiary, letterSpacing = 1.sp, ) Text( text = step.title, - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, color = colors.textPrimary, modifier = Modifier.padding(top = 2.dp), ) Text( text = step.text, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, modifier = Modifier.padding(top = 3.dp), ) diff --git a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/permissions/PermissionsScreen.kt b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/permissions/PermissionsScreen.kt index 2b77de79..2cb0832c 100644 --- a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/permissions/PermissionsScreen.kt +++ b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/permissions/PermissionsScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -35,6 +34,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.ide.AslPermissi import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslWizardStepper import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.onboarding.common.ONBOARDING_STEPS import com.ahmadkharfan.androidstudiolite.feature.onboarding.R @@ -118,12 +118,12 @@ private fun PermissionsHeader(colors: AslColorScheme) { Column(modifier = Modifier.padding(horizontal = 4.dp, vertical = 18.dp)) { Text( text = stringResource(R.string.onboarding_permissions_title), - style = MaterialTheme.typography.headlineMedium, + style = AslTypography.headlineMedium, color = colors.textPrimary, ) Text( text = stringResource(R.string.onboarding_permissions_subtitle), - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, modifier = Modifier.padding(top = 6.dp), ) @@ -171,7 +171,7 @@ private fun PermissionsContinueSection( if (!uiState.canContinue) { Text( text = stringResource(R.string.onboarding_permissions_required), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, textAlign = TextAlign.Center, modifier = Modifier diff --git a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/welcome/WelcomeScreen.kt b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/welcome/WelcomeScreen.kt index b0b6973b..f12003c2 100644 --- a/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/welcome/WelcomeScreen.kt +++ b/feature/onboarding/src/main/java/com/ahmadkharfan/androidstudiolite/feature/onboarding/welcome/WelcomeScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -30,6 +29,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslAppTheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @Composable fun WelcomeRoute(onGetStarted: () -> Unit) { @@ -87,13 +87,13 @@ private fun WelcomeHero(colors: AslColorScheme, modifier: Modifier = Modifier) { Column(horizontalAlignment = Alignment.CenterHorizontally) { Text( text = stringResource(CommonR.string.onboarding_welcome_title), - style = MaterialTheme.typography.displaySmall, + style = AslTypography.displaySmall, textAlign = TextAlign.Center, color = colors.textPrimary, ) Text( text = stringResource(CommonR.string.onboarding_welcome_subtitle), - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, textAlign = TextAlign.Center, modifier = Modifier.padding(top = 10.dp), @@ -140,10 +140,10 @@ private fun WelcomeBullet(icon: String, title: String, text: String) { AslIcon(name = icon, size = 20.dp, tint = colors.accentPrimary) } Column { - Text(text = title, style = MaterialTheme.typography.titleMedium, color = colors.textPrimary) + Text(text = title, style = AslTypography.titleMedium, color = colors.textPrimary) Text( text = text, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textSecondary, modifier = Modifier.padding(top = 2.dp), ) diff --git a/feature/projects/detekt-baseline.xml b/feature/projects/detekt-baseline.xml index 01518266..6fa2697e 100644 --- a/feature/projects/detekt-baseline.xml +++ b/feature/projects/detekt-baseline.xml @@ -2,9 +2,6 @@ - ForbiddenImport:CloneRepoScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:ConfigureStep.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:HubScreen.kt$import androidx.compose.material3.MaterialTheme LongMethod:FolderPickerScreen.kt$@Composable private fun FolderPickerScreen( uiState: FolderPickerUiState, interactionListener: FolderPickerInteractionListener, onCancel: () -> Unit, onSelect: () -> Unit, ) LongParameterList:ConfigureStep.kt$( projectName: String, packageName: String, location: String, minSdk: String, language: String, supportsJava: Boolean, nameError: String?, packageError: String?, onNameChanged: (String) -> Unit, onPackageChanged: (String) -> Unit, onLocationChanged: (String) -> Unit, onMinSdkChanged: (String) -> Unit, onLanguageChanged: (String) -> Unit, onBrowseLocation: () -> Unit, modifier: Modifier = Modifier, ) ModifierMissing:HubScreen.kt$HubRoute diff --git a/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/clonerepo/CloneRepoScreen.kt b/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/clonerepo/CloneRepoScreen.kt index ba896aa3..35dfe15e 100644 --- a/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/clonerepo/CloneRepoScreen.kt +++ b/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/clonerepo/CloneRepoScreen.kt @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.FlowRow -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -27,6 +26,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslChipK import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslTextField import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.AslBottomSheet import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.projects.R @Composable @@ -137,7 +137,7 @@ private fun CloneRepoOptions( Column { Text( text = stringResource(R.string.projects_options), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, ) FlowRow( diff --git a/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/createproject/components/ConfigureStep.kt b/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/createproject/components/ConfigureStep.kt index 9608cadf..686cf9f3 100644 --- a/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/createproject/components/ConfigureStep.kt +++ b/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/createproject/components/ConfigureStep.kt @@ -6,13 +6,13 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslDropdown import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslDropdownOption import com.ahmadkharfan.androidstudiolite.designsystem.component.inputs.AslSegmentedButton @@ -79,7 +79,7 @@ fun ConfigureStep( if (!supportsJava) { Text( text = stringResource(R.string.projects_kotlin_required), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = AslTheme.colors.textSecondary, ) } @@ -102,7 +102,7 @@ private fun LabeledSegmented( Column { Text( text = label, - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = AslTheme.colors.textSecondary, modifier = Modifier.padding(bottom = 6.dp), ) diff --git a/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/hub/HubScreen.kt b/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/hub/HubScreen.kt index c1d45f24..7b928e7e 100644 --- a/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/hub/HubScreen.kt +++ b/feature/projects/src/main/java/com/ahmadkharfan/androidstudiolite/feature/hub/HubScreen.kt @@ -21,7 +21,6 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -64,6 +63,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.openproject.OpenProjectRoute import com.ahmadkharfan.androidstudiolite.feature.clonerepo.CloneRepoRoute @@ -282,11 +282,11 @@ private fun HubTopBar( .background(colors.bgBase, RoundedCornerShape(8.dp)), contentAlignment = Alignment.Center, ) { - Text(text = "{ }", color = colors.accentPrimary, fontFamily = AslCode.codeBody.fontFamily, fontWeight = FontWeight.Bold, style = MaterialTheme.typography.labelSmall) + Text(text = "{ }", color = colors.accentPrimary, fontFamily = AslCode.codeBody.fontFamily, fontWeight = FontWeight.Bold, style = AslTypography.labelSmall) } Text( text = stringResource(CommonR.string.app_name), - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, color = colors.textPrimary, modifier = Modifier.weight(1f), ) @@ -306,7 +306,7 @@ private fun HubGreeting( ) { Text( text = uiState.greeting, - style = if (isTablet) MaterialTheme.typography.displayMedium else MaterialTheme.typography.headlineLarge, + style = if (isTablet) AslTypography.displayMedium else AslTypography.headlineLarge, color = colors.textPrimary, modifier = Modifier .padding(horizontal = HubHorizontalPadding) diff --git a/feature/settings/detekt-baseline.xml b/feature/settings/detekt-baseline.xml index 246a95f1..239cfb8a 100644 --- a/feature/settings/detekt-baseline.xml +++ b/feature/settings/detekt-baseline.xml @@ -2,12 +2,6 @@ - ForbiddenImport:AboutScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:AiAgentSettingsScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:BuildRunSettingsScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:EditorSettingsScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:GeneralScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:GitAuthSettingsScreen.kt$import androidx.compose.material3.MaterialTheme LongMethod:BuildRunSettingsScreen.kt$@Composable private fun ReleaseKeystoreDialog( mode: KeystoreDialogMode, suggestedPath: String, isBusy: Boolean, error: String?, onDismiss: () -> Unit, onSubmit: (KeystoreForm) -> Unit, ) LongMethod:GitAuthSettingsScreen.kt$@Composable private fun GitAuthSettingsScreen( uiState: GitAuthSettingsUiState, interactionListener: GitAuthSettingsInteractionListener, onBack: () -> Unit, ) LongParameterList:SettingsRootScreen.kt$( onBack: () -> Unit, onOpenGeneral: () -> Unit, onOpenEditor: () -> Unit, onOpenAiAgent: () -> Unit, onOpenBuildRun: () -> Unit, onOpenGitAuth: () -> Unit, onOpenAbout: () -> Unit, viewModel: SettingsRootViewModel = koinViewModel(), ) diff --git a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/about/AboutScreen.kt b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/about/AboutScreen.kt index d2f0999c..f6bcde4b 100644 --- a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/about/AboutScreen.kt +++ b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/about/AboutScreen.kt @@ -16,7 +16,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -43,6 +42,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography private const val REPO_URL = "https://github.com/AhmadKharfan/Android-Studio-Lite" @@ -75,7 +75,7 @@ private fun AboutScreen(onBack: () -> Unit) { AboutHeader(colors = colors) Text( text = stringResource(CommonR.string.about_description), - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textSecondary, textAlign = TextAlign.Center, modifier = Modifier.fillMaxWidth().padding(horizontal = 8.dp), @@ -117,13 +117,13 @@ private fun AboutHeader(colors: AslColorScheme) { } Text( text = stringResource(CommonR.string.app_name), - style = MaterialTheme.typography.headlineMedium, + style = AslTypography.headlineMedium, color = colors.textPrimary, textAlign = TextAlign.Center, ) Text( text = stringResource(CommonR.string.app_tagline), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) AslChip( @@ -149,13 +149,13 @@ private fun OpenSourceCard(colors: AslColorScheme, onContribute: () -> Unit) { AslIcon(name = "heart-handshake", size = 18.dp, tint = colors.accentPrimary) Text( text = stringResource(CommonR.string.about_open_source_title), - style = MaterialTheme.typography.titleSmall, + style = AslTypography.titleSmall, color = colors.textPrimary, ) } Text( text = stringResource(CommonR.string.about_open_source_body), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textSecondary, modifier = Modifier.padding(bottom = 6.dp), ) diff --git a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/aiagent/AiAgentSettingsScreen.kt b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/aiagent/AiAgentSettingsScreen.kt index d297167c..6a07d45e 100644 --- a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/aiagent/AiAgentSettingsScreen.kt +++ b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/aiagent/AiAgentSettingsScreen.kt @@ -24,7 +24,6 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -59,6 +58,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.layout.aslImePadding import com.ahmadkharfan.androidstudiolite.designsystem.modifier.aslCard import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslMotion import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.domain.model.ApiKeyStatus @Composable @@ -233,14 +233,14 @@ private fun AiAgentCollapsedProviderRow( Column(modifier = Modifier.weight(1f)) { Text( text = provider.name, - style = MaterialTheme.typography.bodyMedium, + style = AslTypography.bodyMedium, color = colors.textPrimary, maxLines = 1, overflow = TextOverflow.Ellipsis, ) Text( text = provider.description, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, maxLines = 1, overflow = TextOverflow.Ellipsis, @@ -269,7 +269,7 @@ private fun AiAgentModelPicker( Row(verticalAlignment = Alignment.CenterVertically) { Text( text = stringResource(CommonR.string.ai_chat_model), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.weight(1f), ) diff --git a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/buildrun/BuildRunSettingsScreen.kt b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/buildrun/BuildRunSettingsScreen.kt index 89c1a408..3d60839c 100644 --- a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/buildrun/BuildRunSettingsScreen.kt +++ b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/buildrun/BuildRunSettingsScreen.kt @@ -11,7 +11,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.SnackbarHost import androidx.compose.material3.SnackbarHostState @@ -39,6 +38,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.layout.aslImePadding import com.ahmadkharfan.androidstudiolite.designsystem.modifier.aslCard import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.core.common.R as CommonR import com.ahmadkharfan.androidstudiolite.feature.settings.R import org.koin.androidx.compose.koinViewModel @@ -120,7 +120,7 @@ private fun BuildRunOutputSection( } Text( text = stringResource(R.string.settings_build_aab_hint), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, modifier = Modifier.padding(top = 8.dp, start = 4.dp, end = 4.dp), ) @@ -136,18 +136,18 @@ private fun BuildRunSigningSection( AslSectionHeader(stringResource(R.string.settings_build_signing)) SectionCard { Column(modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp)) { - Text(stringResource(R.string.settings_build_debug_keystore), style = MaterialTheme.typography.labelMedium, color = colors.textSecondary) + Text(stringResource(R.string.settings_build_debug_keystore), style = AslTypography.labelMedium, color = colors.textSecondary) Text( text = uiState.debugKeystorePath.ifBlank { stringResource(R.string.settings_build_debug_keystore_auto) }, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) Spacer(modifier = Modifier.height(12.dp)) - Text(stringResource(R.string.settings_build_release_keystore), style = MaterialTheme.typography.labelMedium, color = colors.textSecondary) + Text(stringResource(R.string.settings_build_release_keystore), style = AslTypography.labelMedium, color = colors.textSecondary) if (uiState.hasReleaseKeystore) { Text( text = uiState.releaseKeystoreSummary.orEmpty(), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textPrimary, ) Spacer(modifier = Modifier.height(8.dp)) @@ -159,7 +159,7 @@ private fun BuildRunSigningSection( } else { Text( text = stringResource(R.string.settings_build_release_blocked), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) Spacer(modifier = Modifier.height(8.dp)) @@ -273,7 +273,7 @@ private fun ReleaseKeystoreDialog( AslTextField(value = validity, onValueChange = { validity = it }, label = stringResource(R.string.settings_build_validity_years), type = AslTextFieldType.Number) } if (error != null) { - Text(text = error, style = MaterialTheme.typography.bodySmall, color = AslTheme.colors.error) + Text(text = error, style = AslTypography.bodySmall, color = AslTheme.colors.error) } } }, diff --git a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/editor/EditorSettingsScreen.kt b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/editor/EditorSettingsScreen.kt index f94e925f..24a6f893 100644 --- a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/editor/EditorSettingsScreen.kt +++ b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/editor/EditorSettingsScreen.kt @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -40,6 +39,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.AslT import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.core.common.R as CommonR import com.ahmadkharfan.androidstudiolite.feature.settings.R @@ -106,7 +106,7 @@ private fun EditorFontFamilySection( ) { Text( text = stringResource(R.string.settings_editor_font_family), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.padding(bottom = 8.dp), ) @@ -182,7 +182,7 @@ private fun EditorColorSchemeSection( if (!EditorPalette.isDarkScheme(colorSchemeId)) { Text( text = stringResource(R.string.settings_editor_light_scheme_hint), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, modifier = Modifier.padding(top = 8.dp), ) @@ -197,7 +197,7 @@ private fun EditorTabSizeSection( ) { Text( text = stringResource(R.string.settings_editor_tab_size), - style = MaterialTheme.typography.labelMedium, + style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.padding(top = 18.dp, bottom = 8.dp), ) diff --git a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/general/GeneralScreen.kt b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/general/GeneralScreen.kt index e55c0f8e..532cbf5f 100644 --- a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/general/GeneralScreen.kt +++ b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/general/GeneralScreen.kt @@ -5,7 +5,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -27,6 +26,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.layout.aslImePadding import com.ahmadkharfan.androidstudiolite.designsystem.modifier.aslCard import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.domain.model.AppThemeMode @Composable @@ -80,7 +80,7 @@ private fun GeneralUiModeSection( interactionListener: GeneralInteractionListener, colors: AslColorScheme, ) { - Text(text = stringResource(CommonR.string.general_ui_mode), style = MaterialTheme.typography.labelMedium, color = colors.textSecondary, modifier = Modifier.padding(bottom = 8.dp)) + Text(text = stringResource(CommonR.string.general_ui_mode), style = AslTypography.labelMedium, color = colors.textSecondary, modifier = Modifier.padding(bottom = 8.dp)) AslSegmentedButton( options = listOf( AslSegmentedOption(stringResource(CommonR.string.general_theme_light), "light", "sun"), diff --git a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/gitauth/GitAuthSettingsScreen.kt b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/gitauth/GitAuthSettingsScreen.kt index 73c0b582..6970698b 100644 --- a/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/gitauth/GitAuthSettingsScreen.kt +++ b/feature/settings/src/main/java/com/ahmadkharfan/androidstudiolite/feature/settings/gitauth/GitAuthSettingsScreen.kt @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.runtime.Composable @@ -27,6 +26,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.navigation.AslT import com.ahmadkharfan.androidstudiolite.designsystem.layout.aslImePadding import com.ahmadkharfan.androidstudiolite.designsystem.modifier.aslCard import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography import com.ahmadkharfan.androidstudiolite.feature.editor.git.git.GitHubAuthDialog import com.ahmadkharfan.androidstudiolite.core.common.R as CommonR import com.ahmadkharfan.androidstudiolite.feature.settings.R @@ -73,7 +73,7 @@ private fun GitAuthSettingsScreen( AslSectionHeader(stringResource(R.string.settings_git_author)) Text( text = stringResource(R.string.settings_git_author_hint), - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) Spacer(Modifier.height(8.dp)) @@ -101,7 +101,7 @@ private fun GitAuthSettingsScreen( Spacer(Modifier.height(12.dp)) Text( text = uiState.statusMessage, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = if (uiState.isError) colors.error else colors.success, ) } @@ -126,7 +126,7 @@ private fun GitHubAccountCard( ) { Text( text = stringResource(if (uiState.gitHubConnected) R.string.settings_git_connected else R.string.settings_git_not_connected), - style = MaterialTheme.typography.titleSmall, + style = AslTypography.titleSmall, color = if (uiState.gitHubConnected) colors.success else colors.textSecondary, ) Spacer(Modifier.height(4.dp)) @@ -138,7 +138,7 @@ private fun GitHubAccountCard( } else { stringResource(R.string.settings_git_token_hint) }, - style = MaterialTheme.typography.bodySmall, + style = AslTypography.bodySmall, color = colors.textTertiary, ) Spacer(Modifier.height(12.dp)) diff --git a/feature/terminal/detekt-baseline.xml b/feature/terminal/detekt-baseline.xml index 66bbb289..45417e8a 100644 --- a/feature/terminal/detekt-baseline.xml +++ b/feature/terminal/detekt-baseline.xml @@ -7,8 +7,6 @@ CyclomaticComplexMethod:TerminalEmulator.kt$TerminalEmulator$private fun dispatchCsi(final: Char) CyclomaticComplexMethod:TerminalEmulatorView.kt$@Composable fun TerminalEmulatorView( screen: TerminalScreen, background: Color, foreground: Color, cursorColor: Color, onKey: (String) -> Unit, onSpecialKey: (TerminalKey) -> Unit, onResize: (rows: Int, cols: Int) -> Unit, modifier: Modifier = Modifier, enableVolumeKeys: Boolean = true, requestKeyboardOnAttach: Boolean = true, ) EmptyFunctionBlock:TerminalSessionManagerTest.kt$TerminalSessionManagerTest.FakeTerminalRepository${} - ForbiddenImport:TerminalScreen.kt$import androidx.compose.material3.MaterialTheme - ForbiddenImport:TerminalSettingsSheet.kt$import androidx.compose.material3.MaterialTheme LongMethod:TerminalEmulatorView.kt$@Composable fun TerminalEmulatorView( screen: TerminalScreen, background: Color, foreground: Color, cursorColor: Color, onKey: (String) -> Unit, onSpecialKey: (TerminalKey) -> Unit, onResize: (rows: Int, cols: Int) -> Unit, modifier: Modifier = Modifier, enableVolumeKeys: Boolean = true, requestKeyboardOnAttach: Boolean = true, ) LongMethod:TerminalSettingsSheet.kt$@OptIn(ExperimentalMaterial3Api::class) @Composable fun TerminalSettingsSheet( linux: LinuxStatus, onDismiss: () -> Unit, onInstallLinux: () -> Unit, onReinstallLinux: () -> Unit, ) LongParameterList:TerminalEmulatorView.kt$( native: android.graphics.Canvas, paint: Paint, builder: StringBuilder, cells: List<TerminalCell>, top: Float, baseline: Float, charWidthPx: Float, lineHeightPx: Float, foreground: Color, background: Color, cursorColor: Color, cursorCol: Int, lightBackground: Boolean, ) diff --git a/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalScreen.kt b/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalScreen.kt index 4484527c..f0c4645a 100644 --- a/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalScreen.kt +++ b/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalScreen.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Text import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable @@ -31,6 +30,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslColorScheme import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslShape import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography private val EXTRA_KEYS = listOf("Esc", "Tab", "Ctrl+C", "←", "↑", "↓", "→", "/", "|", "~", "-") @@ -104,7 +104,7 @@ private fun TerminalTopBar( AslIconButton(icon = "arrow-left", contentDescription = stringResource(CommonR.string.action_back), onClick = onBack) Text( text = stringResource(R.string.terminal_title), - style = MaterialTheme.typography.titleMedium, + style = AslTypography.titleMedium, color = colors.textPrimary, modifier = Modifier.weight(1f).padding(start = 4.dp), ) diff --git a/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalSettingsSheet.kt b/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalSettingsSheet.kt index b26a55c2..6a7e7338 100644 --- a/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalSettingsSheet.kt +++ b/feature/terminal/src/main/java/com/ahmadkharfan/androidstudiolite/feature/terminal/TerminalSettingsSheet.kt @@ -17,7 +17,7 @@ import com.ahmadkharfan.androidstudiolite.designsystem.component.buttons.AslButt import com.ahmadkharfan.androidstudiolite.designsystem.component.buttons.AslButtonVariant import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslCode import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTheme -import androidx.compose.material3.MaterialTheme +import com.ahmadkharfan.androidstudiolite.designsystem.theme.AslTypography @OptIn(ExperimentalMaterial3Api::class) @Composable @@ -41,7 +41,7 @@ fun TerminalSettingsSheet( .padding(bottom = 28.dp), verticalArrangement = Arrangement.spacedBy(12.dp), ) { - Text(text = stringResource(R.string.terminal_settings_title), style = MaterialTheme.typography.titleMedium, color = colors.textPrimary) + Text(text = stringResource(R.string.terminal_settings_title), style = AslTypography.titleMedium, color = colors.textPrimary) Text( text = stringResource(R.string.terminal_settings_volume_hint), style = AslCode.codeSmall,