Updated jetpack compose to -beta01

tehras · Feb 27, 2021 · b1b29e5 · b1b29e5
1 parent 16be917
commit b1b29e5
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Compose Charts
 
 This is an exploratory playground library to figure out how to Draw and animate using Android Jetpack Compose library.
-Currently this is using `1.0.0-alpha12` library.
+Currently this is using `1.0.0-beta01` library.
 
 ## How it looks:
 

diff --git a/app/src/main/java/com/github/tehras/charts/ui/bar/BarChartScreen.kt b/app/src/main/java/com/github/tehras/charts/ui/bar/BarChartScreen.kt
@@ -48,8 +48,7 @@ fun BarChartScreen() {
         title = { Text(text = "Bar Chart") }
       )
     },
-    bodyContent = { BarChartScreenContent() }
-  )
+  ) { BarChartScreenContent() }
 }
 
 @Composable
@@ -80,13 +79,15 @@ fun DrawValueLocation(
   }
 
   Row(
-    modifier = Modifier.fillMaxWidth()
+    modifier = Modifier
+      .fillMaxWidth()
       .padding(top = Margins.verticalLarge),
     verticalAlignment = CenterVertically
   ) {
     Row(
       horizontalArrangement = Arrangement.SpaceEvenly,
-      modifier = Modifier.fillMaxWidth()
+      modifier = Modifier
+        .fillMaxWidth()
         .padding(horizontal = Margins.horizontal, vertical = Margins.vertical)
         .align(CenterVertically)
     ) {
@@ -146,7 +147,8 @@ fun AddOrRemoveBar(barChartDataModel: BarChartDataModel) {
 @Composable
 private fun BarChartRow(barChartDataModel: BarChartDataModel) {
   Row(
-    modifier = Modifier.fillMaxWidth()
+    modifier = Modifier
+      .fillMaxWidth()
       .height(250.dp)
       .padding(vertical = Margins.verticalLarge)
   ) {

diff --git a/app/src/main/java/com/github/tehras/charts/ui/line/LineChartScreen.kt b/app/src/main/java/com/github/tehras/charts/ui/line/LineChartScreen.kt
@@ -44,8 +44,7 @@ fun LineChartScreen() {
         title = { Text(text = "Line Chart") }
       )
     },
-    bodyContent = { LineChartScreenContent() }
-  )
+  ) { LineChartScreenContent() }
 }
 
 @Composable

diff --git a/app/src/main/java/com/github/tehras/charts/ui/pie/PieChartScreen.kt b/app/src/main/java/com/github/tehras/charts/ui/pie/PieChartScreen.kt
@@ -45,8 +45,7 @@ fun PieChartScreen() {
         title = { Text(text = "Pie Chart") }
       )
     },
-    bodyContent = { PieChartScreenContent() }
-  )
+  ) { PieChartScreenContent() }
 }
 
 @Composable

diff --git a/app/src/main/java/com/github/tehras/charts/ui/selector/SelectChartScreen.kt b/app/src/main/java/com/github/tehras/charts/ui/selector/SelectChartScreen.kt
@@ -23,9 +23,8 @@ import com.github.tehras.charts.ui.ChartScreenStatus
 @Composable
 fun SelectChartScreen() {
   Scaffold(
-    topBar = { TopAppBar(title = { Text(text = "Select Chart") }) },
-    bodyContent = { SelectChartScreenContent() }
-  )
+    topBar = { TopAppBar(title = { Text(text = "Select Chart") }) }
+  ) { SelectChartScreenContent() }
 }
 
 @Composable

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,33 +1,31 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 buildscript {
-    dependencies {
-        classpath("com.android.tools.build:gradle:7.0.0-alpha06")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
-    }
+  dependencies {
+    classpath("com.android.tools.build:gradle:7.0.0-alpha08")
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.kotlin}")
+  }
 
-    repositories {
-        google()
-        jcenter()
-        gradlePluginPortal()
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
-    }
+  repositories {
+    google()
+    gradlePluginPortal()
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+  }
 }
 
 subprojects {
-    repositories {
-        google()
-        jcenter()
-        gradlePluginPortal()
-        maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
-    }
+  repositories {
+    google()
+    gradlePluginPortal()
+    maven { url = uri("https://dl.bintray.com/kotlin/kotlin-eap") }
+  }
 
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            // Allow warnings when running from IDE, makes it easier to experiment.
-            allWarningsAsErrors = true
+  tasks.withType<KotlinCompile> {
+    kotlinOptions {
+      // Allow warnings when running from IDE, makes it easier to experiment.
+      allWarningsAsErrors = true
 
-            jvmTarget = "1.8"
-        }
+      jvmTarget = "1.8"
     }
+  }
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -2,7 +2,7 @@
 
 object Versions {
     const val composeCompilerVersion = "1.4.30"
-    const val compose = "1.0.0-alpha12"
+    const val compose = "1.0.0-beta01"
     const val kotlin = "1.4.30"
     const val targetSdk = 30
     const val buildVersion = "30.0.2"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sat Jun 13 09:37:52 PDT 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https://services.gradle.org/distributions/gradle-6.8.1-bin.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-6.8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists