Keep ComposeSample up-to-date (#41)

* Keep ComposeSample up-to-date * Update * Remove no necessary repo
microsoft · Sep 16, 2020 · d159eb3 · d159eb3
1 parent 1912950
commit d159eb3
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/ComposeSample/app/build.gradle b/ComposeSample/app/build.gradle
@@ -44,6 +44,7 @@ android {
 
 dependencies {
     implementation kotlinDependencies.kotlinStdlib
+
     implementation androidxDependencies.ktxCore
     implementation androidxDependencies.appCompat
     implementation androidxDependencies.window

diff --git a/...seSample/app/src/main/java/com/microsoft/device/display/samples/composesample/HomePage.kt b/...seSample/app/src/main/java/com/microsoft/device/display/samples/composesample/HomePage.kt
@@ -93,11 +93,24 @@ private fun ShowListColumn(models: List<ImageModel>, modifier: Modifier) {
             ) then Modifier.fillMaxWidth(),
             verticalGravity = Alignment.CenterVertically
         ) {
-            Image(asset = imageResource(item.image), modifier = Modifier.preferredHeight(100.dp).preferredWidth(150.dp))
-            Spacer(Modifier.preferredWidth(16.dp))
+            Image(
+                asset = imageResource(item.image),
+                modifier = Modifier.preferredHeight(100.dp).preferredWidth(150.dp)
+            )
+            Spacer(
+                Modifier.preferredWidth(16.dp)
+            )
             Column(modifier = Modifier.fillMaxHeight() then Modifier.padding(16.dp)) {
-                Text(item.id, modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center), fontSize = 20.sp, fontWeight = FontWeight.Bold)
-                Text(item.title, modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center))
+                Text(
+                    text = item.id,
+                    modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center),
+                    fontSize = 20.sp,
+                    fontWeight = FontWeight.Bold
+                )
+                Text(
+                    text = item.title,
+                    modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center)
+                )
             }
         }
         Divider(color = Color.LightGray)

diff --git a/ComposeSample/dependencies.gradle b/ComposeSample/dependencies.gradle
@@ -5,8 +5,8 @@
  */
 
 ext {
-    gradlePluginVersion = "4.2.0-alpha08"
-    kotlinVersion = "1.4.0"
+    gradlePluginVersion = "4.2.0-alpha10"
+    kotlinVersion = "1.4.10"
     compileSdkVersion = 29
     buildToolsVersion = '29.0.2'
     targetSdkVersion = compileSdkVersion
@@ -24,15 +24,15 @@ ext {
 
     //AndroidX versions
     appCompatVersion = "1.1.0"
-    ktxCoreVersion = "1.3.0"
+    ktxCoreVersion = "1.5.0-alpha02"
     constraintLayoutVersion = "1.1.3"
     recyclerViewVersion = "1.1.0"
     cardViewVersion = "1.0.0"
     ktxFragmentVersion = "1.2.4"
     viewPager2Version = "1.0.0"
     localBroadcastManagerVersion = "1.0.0"
     preferenceVersion = "1.1.1"
-    composeVersion = "1.0.0-alpha01"
+    composeVersion = "1.0.0-alpha02"
     windowVersion = "1.0.0-alpha01"
 
     androidxDependencies = [

diff --git a/ComposeSample/gradle/wrapper/gradle-wrapper.properties b/ComposeSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,14 +1,8 @@
-#
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-#
-#
-
-#Wed Nov 13 13:53:34 CST 2019
+#Wed Sep 09 15:17:47 PDT 2020
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
 android.useAndroidX=true
 android.enableJetifier=true
-distributionUrl=https://services.gradle.org/distributions/gradle-6.6-rc-6-bin.zip