Merge pull request #132 from halilozercan/halilozercan/revert-linehei…

…ght-fix Revert LineHeight bug fix
halilozercan · Feb 12, 2024 · bfc8e6d · bfc8e6d
2 parents 1ca137b + 59c5c48
commit bfc8e6d
Show file tree

Hide file tree

Showing 15 changed files with 171 additions and 169 deletions.
diff --git a/android-sample/build.gradle.kts b/android-sample/build.gradle.kts
@@ -33,12 +33,12 @@ android {
 dependencies {
   implementation(project(":printing"))
   implementation(project(":richtext-commonmark"))
-  implementation(project(":richtext-ui-material"))
+  implementation(project(":richtext-ui-material3"))
   implementation(project(":slideshow"))
   implementation(AndroidX.appcompat)
   implementation(Compose.activity)
   implementation(compose.foundation)
   implementation(compose.materialIconsExtended)
-  implementation(compose.material)
+  implementation(compose.material3)
   implementation(compose.uiTooling)
 }
diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/Demo.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/Demo.kt
@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.LocalContentColor
-import androidx.compose.material.Text
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
@@ -28,7 +28,7 @@ import com.halilibo.richtext.ui.ListType.Unordered
 import com.halilibo.richtext.ui.RichTextScope
 import com.halilibo.richtext.ui.RichTextStyle
 import com.halilibo.richtext.ui.Table
-import com.halilibo.richtext.ui.material.RichText
+import com.halilibo.richtext.ui.material3.RichText
 
 @Preview(widthDp = 300, heightDp = 1000)
 @Composable fun RichTextDemoOnWhite() {

diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/DocumentSample.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/DocumentSample.kt
@@ -18,17 +18,17 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.Icon
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.OutlinedButton
-import androidx.compose.material.ProvideTextStyle
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Email
 import androidx.compose.material.icons.outlined.Phone
 import androidx.compose.material.icons.outlined.Print
-import androidx.compose.material.lightColors
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.ProvideTextStyle
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -54,7 +54,7 @@ import androidx.compose.ui.unit.offset
 import androidx.compose.ui.unit.sp
 import com.halilibo.richtext.ui.FormattedList
 import com.halilibo.richtext.ui.ListType.Unordered
-import com.halilibo.richtext.ui.material.RichText
+import com.halilibo.richtext.ui.material3.RichText
 import com.zachklipp.richtext.ui.printing.Printable
 import com.zachklipp.richtext.ui.printing.PrintableController
 import com.zachklipp.richtext.ui.printing.hideWhenPrinting
@@ -190,8 +190,8 @@ private val LargeGap = 96.dp
         Dp.Infinity to LargeGap
       )
     ) {
-      MaterialTheme(
-        colors = lightColors(
+      SampleTheme(
+        colorScheme = lightColorScheme(
           primary = Color.Black,
           secondary = Color(0x20, 0x79, 0xc7)
         )
@@ -205,7 +205,7 @@ private val LargeGap = 96.dp
 @Composable private fun Title(text: String) {
   Text(
     text,
-    style = MaterialTheme.typography.h3,
+    style = MaterialTheme.typography.headlineMedium,
     fontFamily = FontFamily.Serif,
     fontWeight = Bold
   )
@@ -247,7 +247,7 @@ private val LargeGap = 96.dp
       uppercaseTitle,
       color = Color(0x20, 0x79, 0xc7),
       fontWeight = Bold,
-      style = MaterialTheme.typography.caption,
+      style = MaterialTheme.typography.labelMedium,
       modifier = Modifier
         .keepOnPageWithNext()
         .padding(top = 32.dp, bottom = 8.dp)

diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/LazyMarkdownSample.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/LazyMarkdownSample.kt
@@ -10,14 +10,13 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.text.selection.SelectionContainer
-import androidx.compose.material.Card
-import androidx.compose.material.Checkbox
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ProvideTextStyle
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -28,10 +27,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.em
 import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
 import com.halilibo.richtext.commonmark.MarkdownParseOptions
 import com.halilibo.richtext.markdown.BasicMarkdown
@@ -40,7 +37,7 @@ import com.halilibo.richtext.markdown.node.AstNode
 import com.halilibo.richtext.ui.RichTextScope
 import com.halilibo.richtext.ui.RichTextStyle
 import com.halilibo.richtext.ui.currentRichTextStyle
-import com.halilibo.richtext.ui.material.RichText
+import com.halilibo.richtext.ui.material3.RichText
 import com.halilibo.richtext.ui.resolveDefaults
 
 @Preview
@@ -69,14 +66,14 @@ import com.halilibo.richtext.ui.resolveDefaults
     )
   }
 
-  val colors = if (isDarkModeEnabled) darkColors() else lightColors()
+  val colors = if (isDarkModeEnabled) darkColorScheme() else lightColorScheme()
   val context = LocalContext.current
 
-  MaterialTheme(colors = colors) {
+  SampleTheme(colorScheme = colors) {
     Surface {
       Column {
         // Config
-        Card(elevation = 4.dp) {
+        Card(elevation = CardDefaults.elevatedCardElevation()) {
           Column {
             FlowRow {
               CheckboxPreference(
@@ -110,24 +107,22 @@ import com.halilibo.richtext.ui.resolveDefaults
         }
 
         SelectionContainer {
-          ProvideTextStyle(TextStyle(lineHeight = 1.3.em)) {
-            val parser = remember(markdownParseOptions) {
-              CommonmarkAstNodeParser(markdownParseOptions)
-            }
+          val parser = remember(markdownParseOptions) {
+            CommonmarkAstNodeParser(markdownParseOptions)
+          }
 
-            val astNode = remember(parser) {
-              parser.parse(sampleMarkdown)
-            }
+          val astNode = remember(parser) {
+            parser.parse(sampleMarkdown)
+          }
 
-            RichText(
-              style = richTextStyle,
-              linkClickHandler = {
-                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-              },
-              modifier = Modifier.padding(8.dp),
-            ) {
-              LazyMarkdown(astNode)
-            }
+          RichText(
+            style = richTextStyle,
+            linkClickHandler = {
+              Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+            },
+            modifier = Modifier.padding(8.dp),
+          ) {
+            LazyMarkdown(astNode)
           }
         }
       }

diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/MarkdownSample.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/MarkdownSample.kt
@@ -11,14 +11,13 @@ 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.material.Card
-import androidx.compose.material.Checkbox
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.ProvideTextStyle
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -28,15 +27,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.em
 import com.halilibo.richtext.commonmark.CommonmarkAstNodeParser
 import com.halilibo.richtext.commonmark.MarkdownParseOptions
 import com.halilibo.richtext.markdown.BasicMarkdown
 import com.halilibo.richtext.ui.RichTextStyle
-import com.halilibo.richtext.ui.material.RichText
+import com.halilibo.richtext.ui.material3.RichText
 import com.halilibo.richtext.ui.resolveDefaults
 
 @Preview
@@ -65,14 +62,14 @@ import com.halilibo.richtext.ui.resolveDefaults
     )
   }
 
-  val colors = if (isDarkModeEnabled) darkColors() else lightColors()
+  val colors = if (isDarkModeEnabled) darkColorScheme() else lightColorScheme()
   val context = LocalContext.current
 
-  MaterialTheme(colors = colors) {
+  SampleTheme(colorScheme = colors) {
     Surface {
       Column {
         // Config
-        Card(elevation = 4.dp) {
+        Card(elevation = CardDefaults.elevatedCardElevation()) {
           Column {
             FlowRow {
               CheckboxPreference(
@@ -107,24 +104,22 @@ import com.halilibo.richtext.ui.resolveDefaults
 
         SelectionContainer {
           Column(Modifier.verticalScroll(rememberScrollState())) {
-            ProvideTextStyle(TextStyle(lineHeight = 1.3.em)) {
-              val parser = remember(markdownParseOptions) {
-                CommonmarkAstNodeParser(markdownParseOptions)
-              }
-
-              val astNode = remember(parser) {
-                parser.parse(sampleMarkdown)
-              }
-
-              RichText(
-                style = richTextStyle,
-                linkClickHandler = {
-                  Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
-                },
-                modifier = Modifier.padding(8.dp),
-              ) {
-                BasicMarkdown(astNode)
-              }
+            val parser = remember(markdownParseOptions) {
+              CommonmarkAstNodeParser(markdownParseOptions)
+            }
+
+            val astNode = remember(parser) {
+              parser.parse(sampleMarkdown)
+            }
+
+            RichText(
+              style = richTextStyle,
+              linkClickHandler = {
+                Toast.makeText(context, it, Toast.LENGTH_SHORT).show()
+              },
+              modifier = Modifier.padding(8.dp),
+            ) {
+              BasicMarkdown(astNode)
             }
           }
         }

diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/PagedSample.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/PagedSample.kt
@@ -5,10 +5,10 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.Checkbox
-import androidx.compose.material.Text
-import androidx.compose.material.TextButton
+import androidx.compose.material3.Button
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue

diff --git a/android-sample/src/main/java/com/zachklipp/richtext/sample/RichTextSample.kt b/android-sample/src/main/java/com/zachklipp/richtext/sample/RichTextSample.kt
@@ -8,14 +8,14 @@ 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.material.Card
-import androidx.compose.material.Checkbox
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Slider
-import androidx.compose.material.Surface
-import androidx.compose.material.Text
-import androidx.compose.material.darkColors
-import androidx.compose.material.lightColors
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.Slider
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
+import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -38,13 +38,13 @@ import com.halilibo.richtext.ui.resolveDefaults
   var richTextStyle by remember { mutableStateOf(RichTextStyle().resolveDefaults()) }
   var isDarkModeEnabled by remember { mutableStateOf(false) }
 
-  val colors = if (isDarkModeEnabled) darkColors() else lightColors()
+  val colors = if (isDarkModeEnabled) darkColorScheme() else lightColorScheme()
 
-  MaterialTheme(colors = colors) {
+  SampleTheme(colorScheme = colors) {
     Surface {
       Column {
         // Config
-        Card(elevation = 4.dp) {
+        Card(elevation = CardDefaults.elevatedCardElevation()) {
           Column {
             Row(
               Modifier