Merge pull request #157 from vanpra/0.8.1-rc

PranavMaganti · web-flow · commit c003db1b1b7b · 2022-07-10T15:08:46.000+01:00
Library Version 0.8.1-rc
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.8.1-rc - 2022-05-25
+
+- Update compose to 1.2.0-rc03 ([#156](https://github.com/vanpra/compose-material-dialogs/issues/156))
+- Update kotlin to 1.7.0
+- Remove `material-icons-extended` dependency ([#153](https://github.com/vanpra/compose-material-dialogs/issues/153))
+- Add parameter for changing title and message style and color ([#150](https://github.com/vanpra/compose-material-dialogs/issues/150))
+
 ### 0.8.0-beta - 2022-05-25
 
 - Update compose to 1.2.0-beta02 ([#149](https://github.com/vanpra/compose-material-dialogs/pull/149))
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 **Latest Stable Library Version: 0.7.2 (Supports Compose 1.1.1)**
 
-**Latest Beta Library Version: 0.8.0-beta (Supports Compose 1.2.0-beta02)**
+**Latest Beta Library Version: 0.8.1-rc (Supports Compose 1.2.0-rc03)**
 
 ### [See Releases and Changelog](https://github.com/vanpra/compose-material-dialogs/blob/main/CHANGELOG.md)
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,14 +5,12 @@ plugins {
 }
 
 android {
-    compileSdk = 31
-    buildToolsVersion = "30.0.3"
-
     defaultConfig {
 
         applicationId = "com.vanpra.composematerialdialogs"
         minSdk = 23
-        targetSdk = 30
+        targetSdk = 33
+        compileSdk = 33
 
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
@@ -38,7 +36,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion
     }
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -14,9 +14,9 @@ buildscript {
 
     dependencies {
         classpath(Dependencies.Kotlin.gradlePlugin)
-        classpath("com.android.tools.build:gradle:7.4.0-alpha02")
+        classpath("com.android.tools.build:gradle:7.3.0-beta05")
         classpath("com.vanniktech:gradle-maven-publish-plugin:0.19.0")
-        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")
+        classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.0")
         classpath(Dependencies.Shot.core)
     }
 }
diff --git a/buildSrc/src/main/kotlin/CommonModulePlugin.kt b/buildSrc/src/main/kotlin/CommonModulePlugin.kt
@@ -26,9 +26,8 @@ class CommonModulePlugin: Plugin<Project> {
 
             implementation(Dependencies.AndroidX.Compose.ui)
             implementation(Dependencies.AndroidX.Compose.material)
-            implementation(Dependencies.AndroidX.Compose.materialIconsExtended)
-            implementation(Dependencies.AndroidX.Compose.animation)
             implementation(Dependencies.AndroidX.Compose.foundationLayout)
+            implementation(Dependencies.AndroidX.Compose.animation)
 
             androidTestImplementation(Dependencies.AndroidX.Compose.activity)
             androidTestImplementation(Dependencies.AndroidX.Compose.testing)
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -1,8 +1,8 @@
 object Dependencies {
-    const val desugar = "com.android.tools:desugar_jdk_libs:1.1.5"
+    const val desugar = "com.android.tools:desugar_jdk_libs:1.2.0"
 
     object ComposeMaterialDialogs {
-        const val version = "0.6.3"
+        const val version = "0.7.0"
 
         const val core = "io.github.vanpra.compose-material-dialogs:core:$version"
         const val datetime = "io.github.vanpra.compose-material-dialogs:datetime:$version"
@@ -14,12 +14,12 @@ object Dependencies {
     }
 
     object Accompanist {
-        private const val version = "0.24.9-beta"
+        private const val version = "0.24.13-rc"
         const val pager = "com.google.accompanist:accompanist-pager:$version"
     }
 
     object Kotlin {
-        private const val version = "1.6.21"
+        private const val version = "1.7.0"
         const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
     }
 
@@ -30,11 +30,11 @@ object Dependencies {
     }
 
     object Google {
-        const val material = "com.google.android.material:material:1.6.0"
+        const val material = "com.google.android.material:material:1.6.1"
     }
 
     object AndroidX {
-        const val coreKtx = "androidx.core:core-ktx:1.7.0"
+        const val coreKtx = "androidx.core:core-ktx:1.8.0"
 
         object Testing {
             const val version = "1.4.0"
@@ -44,7 +44,8 @@ object Dependencies {
         }
 
         object Compose {
-            const val version = "1.2.0-beta02"
+            const val version = "1.2.0-rc03"
+            const val compilerVersion = "1.2.0"
 
             const val ui = "androidx.compose.ui:ui:$version"
             const val material = "androidx.compose.material:material:$version"
@@ -55,7 +56,7 @@ object Dependencies {
 
             const val testing = "androidx.compose.ui:ui-test-junit4:$version"
             const val activity = "androidx.activity:activity-compose:1.4.0"
-            const val navigation = "androidx.navigation:navigation-compose:2.4.2"
+            const val navigation = "androidx.navigation:navigation-compose:2.5.0"
         }
     }
 }
diff --git a/color/build.gradle.kts b/color/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 android {
     defaultConfig {
         minSdk = 21
-        compileSdk = 31
-        targetSdk = 31
+        compileSdk = 33
+        targetSdk = 33
 
         testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"
         testApplicationId = "com.vanpra.composematerialdialogs.color.test"
@@ -42,7 +42,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion
     }
 }
 
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -5,8 +5,8 @@ plugins {
 android {
     defaultConfig {
         minSdk = 21
-        compileSdk = 31
-        targetSdk = 31
+        compileSdk = 33
+        targetSdk = 33
 
         testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"
         testApplicationId = "com.vanpra.composematerialdialogs.test"
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion
     }
 }
 
diff --git a/core/src/main/java/com/vanpra/composematerialdialogs/MaterialDialogCore.kt b/core/src/main/java/com/vanpra/composematerialdialogs/MaterialDialogCore.kt
@@ -17,6 +17,8 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.dp
 
 /**
@@ -29,6 +31,8 @@ import androidx.compose.ui.unit.dp
 fun MaterialDialogScope.title(
     text: String? = null,
     @StringRes res: Int? = null,
+    color: Color = MaterialTheme.colors.onSurface,
+    style: TextStyle = MaterialTheme.typography.h6,
     center: Boolean = false
 ) {
     val titleText = getString(res, text)
@@ -50,8 +54,8 @@ fun MaterialDialogScope.title(
 
     Text(
         text = titleText,
-        color = MaterialTheme.colors.onSurface,
-        style = MaterialTheme.typography.h6,
+        color = color,
+        style = style,
         modifier = modifier
     )
 }
@@ -66,6 +70,8 @@ fun MaterialDialogScope.title(
 fun MaterialDialogScope.iconTitle(
     text: String? = null,
     @StringRes textRes: Int? = null,
+    color: Color = MaterialTheme.colors.onSurface,
+    style: TextStyle = MaterialTheme.typography.h6,
     icon: @Composable () -> Unit = {},
 ) {
     val titleText = getString(textRes, text)
@@ -79,8 +85,8 @@ fun MaterialDialogScope.iconTitle(
         Spacer(Modifier.width(14.dp))
         Text(
             text = titleText,
-            color = MaterialTheme.colors.onBackground,
-            style = MaterialTheme.typography.h6
+            color = color,
+            style = style
         )
     }
 }
@@ -91,13 +97,18 @@ fun MaterialDialogScope.iconTitle(
  * @param res message text from a string resource
  */
 @Composable
-fun MaterialDialogScope.message(text: String? = null, @StringRes res: Int? = null) {
+fun MaterialDialogScope.message(
+    text: String? = null,
+    color: Color = MaterialTheme.colors.onSurface,
+    style: TextStyle = MaterialTheme.typography.body1,
+    @StringRes res: Int? = null
+) {
     val messageText = getString(res, text)
 
     Text(
         text = messageText,
-        color = MaterialTheme.colors.onSurface,
-        style = MaterialTheme.typography.body1,
+        color = color,
+        style = style,
         modifier = Modifier
             .padding(bottom = 28.dp, start = 24.dp, end = 24.dp)
     )
diff --git a/datetime/build.gradle.kts b/datetime/build.gradle.kts
@@ -8,8 +8,8 @@ android {
     }
     defaultConfig {
         minSdk = 21
-        compileSdk = 31
-        targetSdk = 31
+        compileSdk = 33
+        targetSdk = 33
 
         testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"
         testApplicationId = "com.vanpra.composematerialdialogs.test"
@@ -45,7 +45,7 @@ android {
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version
+        kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion
     }
 
     kotlinOptions {
diff --git a/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt b/datetime/src/main/java/com/vanpra/composematerialdialogs/datetime/date/DatePicker.kt
@@ -31,8 +31,6 @@ import androidx.compose.material.ContentAlpha
 import androidx.compose.material.Icon
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowDropDown
-import androidx.compose.material.icons.filled.ArrowDropUp
 import androidx.compose.material.icons.filled.KeyboardArrowLeft
 import androidx.compose.material.icons.filled.KeyboardArrowRight
 import androidx.compose.runtime.Composable
@@ -45,6 +43,7 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight.Companion.W400
 import androidx.compose.ui.text.font.FontWeight.Companion.W600
@@ -56,6 +55,7 @@ import com.google.accompanist.pager.HorizontalPager
 import com.google.accompanist.pager.PagerState
 import com.google.accompanist.pager.rememberPagerState
 import com.vanpra.composematerialdialogs.MaterialDialogScope
+import com.vanpra.composematerialdialogs.datetime.R
 import com.vanpra.composematerialdialogs.datetime.util.getFullLocalName
 import com.vanpra.composematerialdialogs.datetime.util.getShortLocalName
 import com.vanpra.composematerialdialogs.datetime.util.isSmallDevice
@@ -124,9 +124,7 @@ internal fun DatePickerImpl(
         ) { page ->
             val viewDate = remember {
                 LocalDate.of(
-                    state.yearRange.first + page / 12,
-                    page % 12 + 1,
-                    1
+                    state.yearRange.first + page / 12, page % 12 + 1, 1
                 )
             }
 
@@ -158,7 +156,7 @@ private fun YearPicker(
     state: DatePickerState,
     pagerState: PagerState,
 ) {
-    val gridState = rememberLazyGridState((viewDate.year - state.yearRange.first) / 3)
+    val gridState = rememberLazyGridState(viewDate.year - state.yearRange.first)
     val coroutineScope = rememberCoroutineScope()
 
     LazyVerticalGrid(
@@ -205,8 +203,7 @@ private fun YearPickerItem(
             Text(
                 year.toString(),
                 style = TextStyle(
-                    color = colors.dateTextColor(selected).value,
-                    fontSize = 18.sp
+                    color = colors.dateTextColor(selected).value, fontSize = 18.sp
                 )
             )
         }
@@ -223,9 +220,8 @@ private fun CalendarViewHeader(
 ) {
     val coroutineScope = rememberCoroutineScope()
     val month = remember { viewDate.month.getFullLocalName(locale) }
-    val yearDropdownIcon = remember(state.yearPickerShowing) {
-        if (state.yearPickerShowing) Icons.Default.ArrowDropUp else Icons.Default.ArrowDropDown
-    }
+    val arrowDropUp = painterResource(id = R.drawable.baseline_arrow_drop_up_24)
+    val arrowDropDown = painterResource(id = R.drawable.baseline_arrow_drop_down_24)
 
     Box(
         Modifier
@@ -251,7 +247,7 @@ private fun CalendarViewHeader(
             Spacer(Modifier.width(4.dp))
             Box(Modifier.size(24.dp), contentAlignment = Alignment.Center) {
                 Icon(
-                    yearDropdownIcon,
+                    if (state.yearPickerShowing) arrowDropUp else arrowDropDown,
                     contentDescription = "Year Selector",
                     tint = state.colors.calendarHeaderTextColor
                 )
@@ -269,14 +265,13 @@ private fun CalendarViewHeader(
                 modifier = Modifier
                     .testTag("dialog_date_prev_month")
                     .size(24.dp)
-                    .clickable(
-                        onClick = {
-                            coroutineScope.launch {
-                                if (pagerState.currentPage - 1 >= 0)
-                                    pagerState.animateScrollToPage(pagerState.currentPage - 1)
-                            }
+                    .clickable(onClick = {
+                        coroutineScope.launch {
+                            if (pagerState.currentPage - 1 >= 0) pagerState.animateScrollToPage(
+                                pagerState.currentPage - 1
+                            )
                         }
-                    ),
+                    }),
                 tint = state.colors.calendarHeaderTextColor
             )
 
@@ -288,14 +283,13 @@ private fun CalendarViewHeader(
                 modifier = Modifier
                     .testTag("dialog_date_next_month")
                     .size(24.dp)
-                    .clickable(
-                        onClick = {
-                            coroutineScope.launch {
-                                if (pagerState.currentPage + 1 < pagerState.pageCount)
-                                    pagerState.animateScrollToPage(pagerState.currentPage + 1)
-                            }
+                    .clickable(onClick = {
+                        coroutineScope.launch {
+                            if (pagerState.currentPage + 1 < pagerState.pageCount) pagerState.animateScrollToPage(
+                                pagerState.currentPage + 1
+                            )
                         }
-                    ),
+                    }),
                 tint = state.colors.calendarHeaderTextColor
             )
         }
@@ -369,8 +363,7 @@ private fun DateSelectionBox(
                 .wrapContentSize(Alignment.Center)
                 .alpha(if (enabled) ContentAlpha.high else ContentAlpha.disabled),
             style = TextStyle(
-                color = colors.dateTextColor(selected).value,
-                fontSize = 12.sp
+                color = colors.dateTextColor(selected).value, fontSize = 12.sp
             )
         )
     }
diff --git a/datetime/src/main/res/drawable/baseline_arrow_drop_down_24.xml b/datetime/src/main/res/drawable/baseline_arrow_drop_down_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M7,10l5,5 5,-5z"/>
+</vector>
diff --git a/datetime/src/main/res/drawable/baseline_arrow_drop_up_24.xml b/datetime/src/main/res/drawable/baseline_arrow_drop_up_24.xml
diff --git a/gradle.properties b/gradle.properties
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,12 @@ plugins {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`android {`
`8`		`- compileSdk = 31`
`9`		`- buildToolsVersion = "30.0.3"`
`10`		`-`
`11`	`8`	`defaultConfig {`
`12`	`9`
`13`	`10`	`applicationId = "com.vanpra.composematerialdialogs"`
`14`	`11`	`minSdk = 23`
`15`		`- targetSdk = 30`
	`12`	`+ targetSdk = 33`
	`13`	`+ compileSdk = 33`
`16`	`14`
`17`	`15`	`versionName = "1.0"`
`18`	`16`	`testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"`
`@@ -38,7 +36,7 @@ android {`
`38`	`36`	`}`
`39`	`37`
`40`	`38`	`composeOptions {`
`41`		`- kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version`
	`39`	`+ kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion`
`42`	`40`	`}`
`43`	`41`	`}`
`44`	`42`
Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,9 @@ buildscript {`
`14`	`14`
`15`	`15`	`dependencies {`
`16`	`16`	`classpath(Dependencies.Kotlin.gradlePlugin)`
`17`		`- classpath("com.android.tools.build:gradle:7.4.0-alpha02")`
	`17`	`+ classpath("com.android.tools.build:gradle:7.3.0-beta05")`
`18`	`18`	`classpath("com.vanniktech:gradle-maven-publish-plugin:0.19.0")`
`19`		`- classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.6.21")`
	`19`	`+ classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.7.0")`
`20`	`20`	`classpath(Dependencies.Shot.core)`
`21`	`21`	`}`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`object Dependencies {`
`2`		`- const val desugar = "com.android.tools:desugar_jdk_libs:1.1.5"`
	`2`	`+ const val desugar = "com.android.tools:desugar_jdk_libs:1.2.0"`
`3`	`3`
`4`	`4`	`object ComposeMaterialDialogs {`
`5`		`- const val version = "0.6.3"`
	`5`	`+ const val version = "0.7.0"`
`6`	`6`
`7`	`7`	`const val core = "io.github.vanpra.compose-material-dialogs:core:$version"`
`8`	`8`	`const val datetime = "io.github.vanpra.compose-material-dialogs:datetime:$version"`
`@@ -14,12 +14,12 @@ object Dependencies {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`object Accompanist {`
`17`		`- private const val version = "0.24.9-beta"`
	`17`	`+ private const val version = "0.24.13-rc"`
`18`	`18`	`const val pager = "com.google.accompanist:accompanist-pager:$version"`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`object Kotlin {`
`22`		`- private const val version = "1.6.21"`
	`22`	`+ private const val version = "1.7.0"`
`23`	`23`	`const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"`
`24`	`24`	`}`
`25`	`25`
`@@ -30,11 +30,11 @@ object Dependencies {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`object Google {`
`33`		`- const val material = "com.google.android.material:material:1.6.0"`
	`33`	`+ const val material = "com.google.android.material:material:1.6.1"`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`object AndroidX {`
`37`		`- const val coreKtx = "androidx.core:core-ktx:1.7.0"`
	`37`	`+ const val coreKtx = "androidx.core:core-ktx:1.8.0"`
`38`	`38`
`39`	`39`	`object Testing {`
`40`	`40`	`const val version = "1.4.0"`
`@@ -44,7 +44,8 @@ object Dependencies {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`object Compose {`
`47`		`- const val version = "1.2.0-beta02"`
	`47`	`+ const val version = "1.2.0-rc03"`
	`48`	`+ const val compilerVersion = "1.2.0"`
`48`	`49`
`49`	`50`	`const val ui = "androidx.compose.ui:ui:$version"`
`50`	`51`	`const val material = "androidx.compose.material:material:$version"`
`@@ -55,7 +56,7 @@ object Dependencies {`
`55`	`56`
`56`	`57`	`const val testing = "androidx.compose.ui:ui-test-junit4:$version"`
`57`	`58`	`const val activity = "androidx.activity:activity-compose:1.4.0"`
`58`		`- const val navigation = "androidx.navigation:navigation-compose:2.4.2"`
	`59`	`+ const val navigation = "androidx.navigation:navigation-compose:2.5.0"`
`59`	`60`	`}`
`60`	`61`	`}`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@ plugins {`
`5`	`5`	`android {`
`6`	`6`	`defaultConfig {`
`7`	`7`	`minSdk = 21`
`8`		`- compileSdk = 31`
`9`		`- targetSdk = 31`
	`8`	`+ compileSdk = 33`
	`9`	`+ targetSdk = 33`
`10`	`10`
`11`	`11`	`testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"`
`12`	`12`	`testApplicationId = "com.vanpra.composematerialdialogs.color.test"`
`@@ -42,7 +42,7 @@ android {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`composeOptions {`
`45`		`- kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version`
	`45`	`+ kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ android {`
`8`	`8`	`}`
`9`	`9`	`defaultConfig {`
`10`	`10`	`minSdk = 21`
`11`		`- compileSdk = 31`
`12`		`- targetSdk = 31`
	`11`	`+ compileSdk = 33`
	`12`	`+ targetSdk = 33`
`13`	`13`
`14`	`14`	`testInstrumentationRunner = "com.karumi.shot.ShotTestRunner"`
`15`	`15`	`testApplicationId = "com.vanpra.composematerialdialogs.test"`
`@@ -45,7 +45,7 @@ android {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`composeOptions {`
`48`		`- kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.version`
	`48`	`+ kotlinCompilerExtensionVersion = Dependencies.AndroidX.Compose.compilerVersion`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`kotlinOptions {`