Merge pull request #108 from vanpra/0.6.0

Library version 0.6.0

Author: PranavMaganti

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+### 0.6.0 - 2021-09-10
+
+  -  [BREAKING CHANGE] Replace MaterialDialog class structure with composable function with state. See [docs](https://vanpra.github.io/compose-material-dialogs) and the [sample app](https://github.com/vanpra/compose-material-dialogs/tree/main/app/src/main/java/com/vanpra/composematerialdialogdemos/demos) for examples
+  -  Update compose to 1.1.0-alpha03
+-  Update kotlin to 1.5.30
+-  Fix bug which caused the year picker to fill the whole dialog
+
 ### 0.5.1 - 2021-07-29
 
   -  Update compose to 1.0.0

README.md

@@ -19,7 +19,7 @@
 ```gradle
 dependencies {
   ...
-  implementation "io.github.vanpra.compose-material-dialogs:core:0.5.1" 
+  implementation "io.github.vanpra.compose-material-dialogs:core:0.6.0" 
   ...
 }
 ```
@@ -35,7 +35,7 @@ dependencies {
 ```gradle
 dependencies {
   ...
-  implementation "io.github.vanpra.compose-material-dialogs:datetime:0.5.1"
+  implementation "io.github.vanpra.compose-material-dialogs:datetime:0.6.0"
   ...
 }
 ```
@@ -51,7 +51,7 @@ dependencies {
 ```gradle
 dependencies {
   ...
-  implementation "io.github.vanpra.compose-material-dialogs:color:0.5.1"
+  implementation "io.github.vanpra.compose-material-dialogs:color:0.6.0"
   ...
 }
 ```

app/build.gradle.kts

@@ -5,7 +5,7 @@ plugins {
 }
 
 android {
-    compileSdk = 30
+    compileSdk = 31
     buildToolsVersion = "30.0.3"
 
     defaultConfig {
@@ -52,20 +52,14 @@ dependencies {
 //    implementation(Dependencies.ComposeMaterialDialogs.color)
 
     implementation(Dependencies.Kotlin.stdlib)
+    implementation(Dependencies.Google.material)
 
     implementation(Dependencies.AndroidX.Compose.ui)
     implementation(Dependencies.AndroidX.Compose.material)
     implementation(Dependencies.AndroidX.Compose.materialIconsExtended)
     implementation(Dependencies.AndroidX.Compose.activity)
     implementation(Dependencies.AndroidX.Compose.navigation)
 
-    implementation(Dependencies.AndroidX.coreKtx)
-    implementation(Dependencies.AndroidX.appcompat)
-
-    implementation(Dependencies.material)
-
     implementation(kotlin("stdlib-jdk8"))
-
-    androidTestImplementation(Dependencies.AndroidX.Compose.testing)
     coreLibraryDesugaring(Dependencies.desugar)
 }

app/mirakle_build_file_stub

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.vanpra.composematerialdialogdemos"
     android:sharedUserId="com.vanpra.composematerialdialogs.uid">
 
@@ -10,15 +9,12 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Composematerialdialogs"
-        tools:replace="android:theme">
+        android:theme="@style/Theme.MaterialComponents.DayNight.NoActionBar">
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
-            android:theme="@style/Theme.Composematerialdialogs.NoActionBar">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

app/src/main/AndroidManifest.xml

@@ -1,8 +1,8 @@
 package com.vanpra.composematerialdialogdemos
 
 import android.os.Bundle
+import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -31,7 +31,7 @@ import com.vanpra.composematerialdialogdemos.ui.ComposeMaterialDialogsTheme
 /**
  * @brief MainActivity with material dialog samples
  */
-class MainActivity : AppCompatActivity() {
+class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContent {

app/src/main/java/com/vanpra/composematerialdialogdemos/MainActivity.kt

@@ -8,12 +8,13 @@ import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.material.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import com.vanpra.composematerialdialogs.MaterialDialog
 import com.vanpra.composematerialdialogs.MaterialDialogButtons
+import com.vanpra.composematerialdialogs.MaterialDialogScope
+import com.vanpra.composematerialdialogs.rememberMaterialDialogState
 
 /**
  * @brief Builds a dialog and adds button to the layout which shows the dialog on click
@@ -22,14 +23,16 @@ import com.vanpra.composematerialdialogs.MaterialDialogButtons
 fun DialogAndShowButton(
     buttonText: String,
     buttons: @Composable MaterialDialogButtons.() -> Unit = {},
-    content: @Composable MaterialDialog.() -> Unit
+    content: @Composable MaterialDialogScope.() -> Unit
 ) {
-    val dialog = remember { MaterialDialog() }
+    val dialogState = rememberMaterialDialogState()
 
-    dialog.build(content = content, buttons = buttons)
+    MaterialDialog(dialogState = dialogState, buttons = buttons) {
+        content()
+    }
 
     TextButton(
-        onClick = { dialog.show() },
+        onClick = { dialogState.show() },
         modifier = Modifier
             .fillMaxWidth()
             .padding(8.dp)

app/src/main/java/com/vanpra/composematerialdialogdemos/Util.kt

@@ -115,7 +115,7 @@ fun BasicDialogDemo() {
         input(
             label = "Name", hint = "Jon Smith",
             keyboardActions = KeyboardActions(
-                onDone = { this@DialogAndShowButton.submit() }
+                onDone = { submit() }
             ),
             keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done)
         ) {

app/src/main/java/com/vanpra/composematerialdialogdemos/demos/BasicDialog.kt

@@ -106,12 +106,15 @@ fun BasicListDialogDemo() {
 fun MultiSelectionDemo() {
     var initialSelection by remember { mutableStateOf(setOf(3, 5)) }
 
-    DialogAndShowButton(buttonText = "Multi-Selection Dialog", buttons = { defaultListDialogButtons() }) {
-    title(res = R.string.labels_dialog_title)
-    listItemsMultiChoice(labels) {
-        println(it)
+    DialogAndShowButton(
+        buttonText = "Multi-Selection Dialog",
+        buttons = { defaultListDialogButtons() }
+    ) {
+        title(res = R.string.labels_dialog_title)
+        listItemsMultiChoice(labels) {
+            println(it)
+        }
     }
-}
 
     DialogAndShowButton(
         buttonText = "Multi-Selection Dialog with disabled items",

app/src/main/java/com/vanpra/composematerialdialogdemos/demos/ListDialog.kt

@@ -1,25 +1,2 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.Composematerialdialogs" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-    </style>
-
-    <style name="Theme.Composematerialdialogs.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.Composematerialdialogs.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.Composematerialdialogs.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>