Skip to content

Commit d159eb3

Browse files
authored
Keep ComposeSample up-to-date (#41)
* Keep ComposeSample up-to-date * Update * Remove no necessary repo
1 parent 1912950 commit d159eb3

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

ComposeSample/app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ android {
4444

4545
dependencies {
4646
implementation kotlinDependencies.kotlinStdlib
47+
4748
implementation androidxDependencies.ktxCore
4849
implementation androidxDependencies.appCompat
4950
implementation androidxDependencies.window

ComposeSample/app/src/main/java/com/microsoft/device/display/samples/composesample/HomePage.kt

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,24 @@ private fun ShowListColumn(models: List<ImageModel>, modifier: Modifier) {
9393
) then Modifier.fillMaxWidth(),
9494
verticalGravity = Alignment.CenterVertically
9595
) {
96-
Image(asset = imageResource(item.image), modifier = Modifier.preferredHeight(100.dp).preferredWidth(150.dp))
97-
Spacer(Modifier.preferredWidth(16.dp))
96+
Image(
97+
asset = imageResource(item.image),
98+
modifier = Modifier.preferredHeight(100.dp).preferredWidth(150.dp)
99+
)
100+
Spacer(
101+
Modifier.preferredWidth(16.dp)
102+
)
98103
Column(modifier = Modifier.fillMaxHeight() then Modifier.padding(16.dp)) {
99-
Text(item.id, modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center), fontSize = 20.sp, fontWeight = FontWeight.Bold)
100-
Text(item.title, modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center))
104+
Text(
105+
text = item.id,
106+
modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center),
107+
fontSize = 20.sp,
108+
fontWeight = FontWeight.Bold
109+
)
110+
Text(
111+
text = item.title,
112+
modifier = Modifier.fillMaxHeight().wrapContentSize(Alignment.Center)
113+
)
101114
}
102115
}
103116
Divider(color = Color.LightGray)

ComposeSample/dependencies.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66

77
ext {
8-
gradlePluginVersion = "4.2.0-alpha08"
9-
kotlinVersion = "1.4.0"
8+
gradlePluginVersion = "4.2.0-alpha10"
9+
kotlinVersion = "1.4.10"
1010
compileSdkVersion = 29
1111
buildToolsVersion = '29.0.2'
1212
targetSdkVersion = compileSdkVersion
@@ -24,15 +24,15 @@ ext {
2424

2525
//AndroidX versions
2626
appCompatVersion = "1.1.0"
27-
ktxCoreVersion = "1.3.0"
27+
ktxCoreVersion = "1.5.0-alpha02"
2828
constraintLayoutVersion = "1.1.3"
2929
recyclerViewVersion = "1.1.0"
3030
cardViewVersion = "1.0.0"
3131
ktxFragmentVersion = "1.2.4"
3232
viewPager2Version = "1.0.0"
3333
localBroadcastManagerVersion = "1.0.0"
3434
preferenceVersion = "1.1.1"
35-
composeVersion = "1.0.0-alpha01"
35+
composeVersion = "1.0.0-alpha02"
3636
windowVersion = "1.0.0-alpha01"
3737

3838
androidxDependencies = [
Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
#
2-
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License.
4-
#
5-
#
6-
7-
#Wed Nov 13 13:53:34 CST 2019
1+
#Wed Sep 09 15:17:47 PDT 2020
82
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
94
distributionPath=wrapper/dists
10-
zipStoreBase=GRADLE_USER_HOME
115
zipStorePath=wrapper/dists
6+
zipStoreBase=GRADLE_USER_HOME
127
android.useAndroidX=true
138
android.enableJetifier=true
14-
distributionUrl=https://services.gradle.org/distributions/gradle-6.6-rc-6-bin.zip

0 commit comments

Comments
 (0)