Read the type scale from AslTypography

app/detekt-baseline.xml

@@ -2,8 +2,6 @@
 <SmellBaseline>
   <ManuallySuppressedIssues/>
   <CurrentIssues>
-    <ID>ForbiddenImport:AcsMissingScreen.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:CrashReportScreen.kt$import androidx.compose.material3.MaterialTheme</ID>
     <ID>LongMethod:AslNavHost.kt$@Composable fun AslNavHost( startDestination: String, openProjectId: String? = null, onOpenProjectConsumed: () -&gt; Unit = {}, navController: NavHostController = rememberNavController(), )</ID>
     <ID>MatchingDeclarationName:BlockingErrorScreen.kt$BlockingErrorType</ID>
     <ID>ParameterNaming:AslNavHost.kt$onOpenProjectConsumed</ID>

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()

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),
         )

designsystem/detekt-baseline.xml

@@ -12,49 +12,7 @@
     <ID>CyclomaticComplexMethod:ListItem.kt$@Composable fun AslListItem( title: String, modifier: Modifier = Modifier, subtitle: String? = null, icon: String? = null, iconColor: Color? = null, leading: (@Composable () -&gt; Unit)? = null, trailing: (@Composable () -&gt; Unit)? = null, divider: Boolean = true, selected: Boolean = false, disabled: Boolean = false, onClick: (() -&gt; Unit)? = null, )</ID>
     <ID>CyclomaticComplexMethod:TextField.kt$@OptIn(ExperimentalFoundationApi::class) @Composable fun AslTextField( value: String, onValueChange: (String) -&gt; 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: (() -&gt; Unit)? = null, onFocusChanged: ((Boolean) -&gt; Unit)? = null, )</ID>
     <ID>CyclomaticComplexMethod:ToolCallCard.kt$private fun computeLineDiff(old: String?, new: String): List&lt;DiffLine&gt;</ID>
-    <ID>ForbiddenImport:ApiKeyCard.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:AslMarkdownText.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:AslThinkingBlock.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Badge.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Banner.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:BottomSheet.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:BottomToolPanel.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Button.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ChatBubble.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ChatCodeBlock.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Checkbox.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Chip.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Dialog.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Dropdown.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:EditorToolbar.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:EmptyState.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ErrorState.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Fab.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:FileTabBar.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:FileTree.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:IconButton.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:LinearProgress.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ListItem.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:MemoryChartMini.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Menu.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:NavRail.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:PermissionCard.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ProjectCard.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:RadioGroup.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:SegmentedButton.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Slider.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Snackbar.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:SplitButton.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:StatusChip.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:Switch.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:TemplateCard.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:TextField.kt$import androidx.compose.material3.MaterialTheme</ID>
     <ID>ForbiddenImport:Theme.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ThemeSwatchPicker.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ToolCallCard.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:ToolWindowPanel.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:TopAppBar.kt$import androidx.compose.material3.MaterialTheme</ID>
-    <ID>ForbiddenImport:WizardStepper.kt$import androidx.compose.material3.MaterialTheme</ID>
     <ID>LongMethod:ApiKeyCard.kt$@Composable fun AslApiKeyCard( provider: String, value: String, onValueChange: (String) -&gt; Unit, modifier: Modifier = Modifier, providerIcon: String = "sparkles", description: String? = null, placeholder: String = "sk-…", status: AslApiKeyStatus = AslApiKeyStatus.None, errorMessage: String? = null, onTest: (String) -&gt; Unit = {}, testing: Boolean = false, onCollapse: (() -&gt; Unit)? = null, )</ID>
     <ID>LongMethod:AslMarkdownText.kt$@Composable fun AslMarkdownText( markdown: String, modifier: Modifier = Modifier, onCopyCode: (String) -&gt; Unit = {}, )</ID>
     <ID>LongMethod:AutocompletePopup.kt$@Composable fun AslAutocompletePopup( suggestions: List&lt;AslSuggestion&gt;, modifier: Modifier = Modifier, activeIndex: Int = 0, onSelect: (AslSuggestion, Int) -&gt; Unit = { _, _ -&gt; }, )</ID>

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)
         }

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) },
     )
 }

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,
                 )
             }

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

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),
                             )
                         }

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()