Merge pull request #126 from halilozercan/0.20.0

0.20.0 Update

Author: halilozercan

.github/workflows/android.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v1
         with:
           path: ~/.gradle/caches
@@ -32,10 +32,10 @@ jobs:
           - 29
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v1
         with:
           path: ~/.gradle/caches

.github/workflows/docs.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: actions/setup-python@v2
         with:
           python-version: 3.x

.github/workflows/publish.yml

@@ -12,10 +12,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: gradle/wrapper-validation-action@v1
-      - name: set up JDK 11
+      - name: set up JDK 17
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v1
         with:
           path: ~/.gradle/caches

.idea/codeStyles/Project.xml

@@ -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.MaterialRichText
+import com.halilibo.richtext.ui.material.RichText
 
 @Preview(widthDp = 300, heightDp = 1000)
 @Composable fun RichTextDemoOnWhite() {
@@ -50,7 +50,7 @@ import com.halilibo.richtext.ui.material.MaterialRichText
   style: RichTextStyle? = null,
   header: String = ""
 ) {
-  MaterialRichText(
+  RichText(
     modifier = Modifier.padding(8.dp),
     style = style
   ) {

android-sample/src/main/java/com/zachklipp/richtext/sample/Demo.kt

@@ -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.MaterialRichText
+import com.halilibo.richtext.ui.material.RichText
 import com.zachklipp.richtext.ui.printing.Printable
 import com.zachklipp.richtext.ui.printing.PrintableController
 import com.zachklipp.richtext.ui.printing.hideWhenPrinting
@@ -286,7 +286,7 @@ private val LargeGap = 96.dp
 ) {
   LargeBlurb(organization, location, title, duration) {
     // RichText works seamlessly with printing!
-    MaterialRichText {
+    RichText {
       FormattedList(Unordered, listOf(*descriptionBulletPoints)) {
         Text(it, fontSize = 13.sp)
       }

android-sample/src/main/java/com/zachklipp/richtext/sample/DocumentSample.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.unit.em
 import com.halilibo.richtext.markdown.Markdown
 import com.halilibo.richtext.markdown.MarkdownParseOptions
 import com.halilibo.richtext.ui.RichTextStyle
-import com.halilibo.richtext.ui.material.MaterialRichText
+import com.halilibo.richtext.ui.material.RichText
 import com.halilibo.richtext.ui.resolveDefaults
 
 @Preview
@@ -104,7 +104,7 @@ import com.halilibo.richtext.ui.resolveDefaults
         SelectionContainer {
           Column(Modifier.verticalScroll(rememberScrollState())) {
             ProvideTextStyle(TextStyle(lineHeight = 1.3.em)) {
-              MaterialRichText(
+              RichText(
                 style = richTextStyle,
                 modifier = Modifier.padding(8.dp),
               ) {

android-sample/src/main/java/com/zachklipp/richtext/sample/MarkdownSample.kt

@@ -22,7 +22,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import com.halilibo.richtext.ui.FormattedList
 import com.halilibo.richtext.ui.ListType.Ordered
-import com.halilibo.richtext.ui.material.MaterialRichText
+import com.halilibo.richtext.ui.material.RichText
 import com.zachklipp.richtext.ui.slideshow.BodySlide
 import com.zachklipp.richtext.ui.slideshow.NavigableContentContainer
 import com.zachklipp.richtext.ui.slideshow.SlideDivider
@@ -90,7 +90,7 @@ import com.zachklipp.richtext.ui.slideshow.TitleSlide
 @OptIn(ExperimentalAnimationApi::class)
 @Composable private fun SlideScope.AnimatedOrderedListSlide() {
   NavigableContentContainer {
-    MaterialRichText {
+    RichText {
       FormattedList(
         listType = Ordered,
         items = listOf(

android-sample/src/main/java/com/zachklipp/richtext/sample/SlideshowSample.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.em
 import androidx.compose.ui.unit.sp
-import com.halilibo.richtext.ui.material.MaterialRichText
+import com.halilibo.richtext.ui.material.RichText
 import com.halilibo.richtext.ui.string.InlineContent
 import com.halilibo.richtext.ui.string.RichTextString.Builder
 import com.halilibo.richtext.ui.string.RichTextString.Format
@@ -96,7 +96,7 @@ import kotlinx.coroutines.launch
       }
     }
   }
-  MaterialRichText {
+  RichText {
     Text(text)
   }
 }

android-sample/src/main/java/com/zachklipp/richtext/sample/TextDemo.kt

@@ -10,8 +10,8 @@ plugins {
 
 dependencies {
   // keep in sync with Dependencies.BuildPlugins.androidGradlePlugin
-  implementation("com.android.tools.build:gradle:7.4.0")
+  implementation("com.android.tools.build:gradle:8.2.0")
   // keep in sync with Dependencies.Kotlin.gradlePlugin
-  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+  implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
   implementation(kotlin("script-runtime"))
 }