Skip to content

Commit 9dba460

Browse files
JoseAlcerrecaJoseAlcerreca
authoredSep 16, 2020
[Jetchat] Bump to 6824694 and AGPa10 (android#170)
·
v1.0.0-alpha05v1.0.0-alpha03
1 parent 366c552 commit 9dba460

File tree

13 files changed

+74
-65
lines changed

13 files changed

+74
-65
lines changed
 

‎Jetchat/app/build.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ android {
4949

5050
kotlinOptions {
5151
jvmTarget = '1.8'
52-
allWarningsAsErrors = true
5352
}
5453

5554
buildFeatures {

‎Jetchat/app/src/androidTest/java/com/example/compose/jetchat/ConversationTest.kt

+9-13
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import androidx.compose.runtime.Providers
2121
import androidx.compose.runtime.collectAsState
2222
import androidx.compose.ui.geometry.Offset
2323
import androidx.compose.ui.unit.milliseconds
24-
import androidx.ui.test.android.createAndroidComposeRule
2524
import androidx.ui.test.assertIsDisplayed
2625
import androidx.ui.test.center
26+
import androidx.ui.test.createAndroidComposeRule
2727
import androidx.ui.test.onNodeWithLabel
2828
import androidx.ui.test.onNodeWithText
2929
import androidx.ui.test.performClick
@@ -35,7 +35,6 @@ import com.example.compose.jetchat.data.exampleUiState
3535
import com.example.compose.jetchat.theme.JetchatTheme
3636
import kotlinx.coroutines.flow.MutableStateFlow
3737
import org.junit.Before
38-
import org.junit.Ignore
3938
import org.junit.Rule
4039
import org.junit.Test
4140

@@ -75,15 +74,14 @@ class ConversationTest {
7574
@Test
7675
fun app_launches() {
7776
// Check that the conversation screen is visible on launch
78-
onNodeWithText(activity.getString(R.string.textfield_hint)).assertIsDisplayed()
77+
composeTestRule.onNodeWithText(activity.getString(R.string.textfield_hint)).assertIsDisplayed()
7978
}
8079

81-
@Ignore("https://issuetracker.google.com/166589947")
8280
@Test
8381
fun userScrollsUp_jumpToBottomAppears() {
8482
// Check list is snapped to bottom and swipe up
8583
findJumpToBottom().assertDoesNotExist()
86-
onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
84+
composeTestRule.onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
8785
this.swipe(
8886
start = this.center,
8987
end = Offset(this.center.x, this.center.y + 500),
@@ -94,11 +92,10 @@ class ConversationTest {
9492
findJumpToBottom().assertIsDisplayed()
9593
}
9694

97-
@Ignore("https://issuetracker.google.com/166589947")
9895
@Test
9996
fun jumpToBottom_snapsToBottomAndDisappears() {
10097
// When the scroll is not snapped to the bottom
101-
onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
98+
composeTestRule.onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
10299
this.swipe(
103100
start = this.center,
104101
end = Offset(this.center.x, this.center.y + 500),
@@ -112,11 +109,10 @@ class ConversationTest {
112109
findJumpToBottom().assertDoesNotExist()
113110
}
114111

115-
@Ignore("https://issuetracker.google.com/166589947")
116112
@Test
117113
fun jumpToBottom_snapsToBottomAfterUserInteracted() {
118114
// First swipe
119-
onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
115+
composeTestRule.onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
120116
this.swipe(
121117
start = this.center,
122118
end = Offset(this.center.x, this.center.y + 500),
@@ -133,11 +129,10 @@ class ConversationTest {
133129
findJumpToBottom().assertDoesNotExist()
134130
}
135131

136-
@Ignore("https://issuetracker.google.com/166589947")
137132
@Test
138133
fun changeTheme_scrollIsPersisted() {
139134
// Swipe to show the jump to bottom button
140-
onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
135+
composeTestRule.onNodeWithLabel(activity.getString(R.string.conversation_desc)).performGesture {
141136
this.swipe(
142137
start = this.center,
143138
end = Offset(this.center.x, this.center.y + 500),
@@ -155,8 +150,9 @@ class ConversationTest {
155150
findJumpToBottom().assertIsDisplayed()
156151
}
157152

158-
private fun findJumpToBottom() = onNodeWithText(activity.getString(R.string.jumpBottom))
153+
private fun findJumpToBottom() =
154+
composeTestRule.onNodeWithText(activity.getString(R.string.jumpBottom))
159155

160156
private fun openEmojiSelector() =
161-
onNodeWithLabel(activity.getString(R.string.emoji_selector_bt_desc)).performClick()
157+
composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_bt_desc)).performClick()
162158
}

‎Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt

+3-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ import androidx.compose.runtime.Providers
2222
import androidx.navigation.NavController
2323
import androidx.navigation.Navigation
2424
import androidx.test.espresso.Espresso
25-
import androidx.ui.test.android.createAndroidComposeRule
2625
import androidx.ui.test.assertIsDisplayed
26+
import androidx.ui.test.createAndroidComposeRule
2727
import androidx.ui.test.onNodeWithText
28-
import androidx.ui.test.runOnUiThread
2928
import com.example.compose.jetchat.conversation.BackPressedDispatcherAmbient
3029
import com.example.compose.jetchat.conversation.ConversationContent
3130
import com.example.compose.jetchat.data.exampleUiState
@@ -81,13 +80,13 @@ class NavigationTest {
8180
@Test
8281
fun profileScreen_back_conversationScreen() {
8382
// Navigate to profile
84-
runOnUiThread {
83+
composeTestRule.runOnUiThread {
8584
navController.navigate(R.id.nav_profile)
8685
}
8786
// Check profile is displayed
8887
assertEquals(navController.currentDestination?.id, R.id.nav_profile)
8988
// Extra UI check
90-
onNodeWithText(activity.getString(R.string.textfield_hint)).assertIsDisplayed()
89+
composeTestRule.onNodeWithText(activity.getString(R.string.textfield_hint)).assertIsDisplayed()
9190

9291
// Press back
9392
Espresso.pressBack()

‎Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt

+12-14
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,14 @@ import androidx.compose.runtime.Providers
2121
import androidx.test.espresso.Espresso
2222
import androidx.ui.test.SemanticsMatcher
2323
import androidx.ui.test.SemanticsNodeInteraction
24-
import androidx.ui.test.android.createAndroidComposeRule
2524
import androidx.ui.test.assertIsDisplayed
2625
import androidx.ui.test.assertIsEnabled
2726
import androidx.ui.test.assertIsNotEnabled
27+
import androidx.ui.test.createAndroidComposeRule
2828
import androidx.ui.test.hasAnyAncestor
2929
import androidx.ui.test.hasInputMethodsSupport
3030
import androidx.ui.test.hasLabel
31-
import androidx.ui.test.onNode
3231
import androidx.ui.test.onNodeWithLabel
33-
import androidx.ui.test.onNodeWithSubstring
3432
import androidx.ui.test.onNodeWithText
3533
import androidx.ui.test.performClick
3634
import androidx.ui.test.performTextInput
@@ -76,12 +74,12 @@ class UserInputTest {
7674

7775
@Test
7876
fun emojiSelector_isClosedWithBack() {
79-
// Click on text field
80-
onNodeWithSubstring(activity.getString(R.string.textfield_hint)).performClick()
8177
// Open emoji selector
8278
openEmojiSelector()
8379
// Check emoji selector is displayed
8480
assertEmojiSelectorIsDisplayed()
81+
82+
composeTestRule.onNode(SemanticsMatcher.expectValue(KeyboardShownKey, false)).assertExists()
8583
// Press back button
8684
Espresso.pressBack()
8785
// Check the emoji selector is not displayed
@@ -103,14 +101,14 @@ class UserInputTest {
103101
fun keyboardShown_emojiSelectorOpened_keyboardHides() {
104102
// Click on text field to open the soft keyboard
105103
clickOnTextField()
106-
onNode(SemanticsMatcher.expectValue(KeyboardShownKey, true)).assertExists()
104+
composeTestRule.onNode(SemanticsMatcher.expectValue(KeyboardShownKey, true)).assertExists()
107105

108106
// When the emoji selector is extended
109107
openEmojiSelector()
110108

111109
// Check that the keyboard is hidden
112-
dumpSemanticNodes() // TODO: Remove when flakiness is gone
113-
onNode(SemanticsMatcher.expectValue(KeyboardShownKey, false)).assertExists()
110+
composeTestRule.dumpSemanticNodes() // TODO: Remove when flakiness is gone
111+
composeTestRule.onNode(SemanticsMatcher.expectValue(KeyboardShownKey, false)).assertExists()
114112
}
115113

116114
@Test
@@ -127,22 +125,22 @@ class UserInputTest {
127125
}
128126

129127
private fun clickOnTextField() {
130-
onNodeWithLabel(activity.getString(R.string.textfield_desc)).performClick()
128+
composeTestRule.onNodeWithLabel(activity.getString(R.string.textfield_desc)).performClick()
131129
}
132130

133131
private fun openEmojiSelector() =
134-
onNodeWithLabel(activity.getString(R.string.emoji_selector_bt_desc)).performClick()
132+
composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_bt_desc)).performClick()
135133

136134
private fun assertEmojiSelectorIsDisplayed() =
137-
onNodeWithLabel(activity.getString(R.string.emoji_selector_desc)).assertIsDisplayed()
135+
composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_desc)).assertIsDisplayed()
138136

139137
private fun assertEmojiSelectorDoesNotExist() =
140-
onNodeWithLabel(activity.getString(R.string.emoji_selector_desc)).assertDoesNotExist()
138+
composeTestRule.onNodeWithLabel(activity.getString(R.string.emoji_selector_desc)).assertDoesNotExist()
141139

142-
private fun findSendButton() = onNodeWithText(activity.getString(R.string.send))
140+
private fun findSendButton() = composeTestRule.onNodeWithText(activity.getString(R.string.send))
143141

144142
private fun findTextInputField(): SemanticsNodeInteraction {
145-
return onNode(
143+
return composeTestRule.onNode(
146144
hasInputMethodsSupport() and
147145
hasAnyAncestor(hasLabel(activity.getString(R.string.textfield_desc)))
148146
)

‎Jetchat/app/src/androidTest/java/com/example/compose/jetchat/Utils.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.example.compose.jetchat
1818

19+
import androidx.ui.test.ComposeTestRule
1920
import androidx.ui.test.onRoot
2021
import androidx.ui.test.printToLog
2122

@@ -24,6 +25,6 @@ import androidx.ui.test.printToLog
2425
*
2526
* TODO: Replace with aosp/1355659
2627
*/
27-
fun dumpSemanticNodes() {
28-
onRoot().printToLog(tag = "JetchatLog")
28+
fun ComposeTestRule.dumpSemanticNodes() {
29+
this.onRoot().printToLog(tag = "JetchatLog")
2930
}

‎Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatAppBar.kt

+11-3
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,21 @@
1717
package com.example.compose.jetchat.components
1818

1919
import androidx.compose.foundation.Image
20+
import androidx.compose.foundation.Text
2021
import androidx.compose.foundation.clickable
2122
import androidx.compose.foundation.layout.Column
2223
import androidx.compose.foundation.layout.RowScope
23-
import androidx.compose.foundation.layout.RowScope.gravity
2424
import androidx.compose.foundation.layout.padding
2525
import androidx.compose.material.Divider
2626
import androidx.compose.material.MaterialTheme
2727
import androidx.compose.material.TopAppBar
2828
import androidx.compose.runtime.Composable
29-
import androidx.compose.ui.Alignment
3029
import androidx.compose.ui.Modifier
3130
import androidx.compose.ui.res.vectorResource
3231
import androidx.compose.ui.unit.dp
32+
import androidx.ui.tooling.preview.Preview
3333
import com.example.compose.jetchat.R
34+
import com.example.compose.jetchat.theme.JetchatTheme
3435
import com.example.compose.jetchat.theme.elevatedSurface
3536

3637
@Composable
@@ -56,7 +57,6 @@ fun JetchatAppBar(
5657
Image(
5758
asset = vectorResource(id = R.drawable.ic_jetchat),
5859
modifier = Modifier
59-
.gravity(Alignment.CenterVertically)
6060
.clickable(onClick = onNavIconPressed)
6161
.padding(horizontal = 16.dp)
6262
)
@@ -65,3 +65,11 @@ fun JetchatAppBar(
6565
Divider()
6666
}
6767
}
68+
69+
@Preview
70+
@Composable
71+
fun JetchatAppBarPreview() {
72+
JetchatTheme {
73+
JetchatAppBar(title = { Text("Preview!") })
74+
}
75+
}

‎Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/Conversation.kt

+5-6
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import androidx.compose.foundation.clickable
2727
import androidx.compose.foundation.layout.Column
2828
import androidx.compose.foundation.layout.ColumnScope.weight
2929
import androidx.compose.foundation.layout.Row
30-
import androidx.compose.foundation.layout.RowScope.gravity
30+
import androidx.compose.foundation.layout.RowScope.align
3131
import androidx.compose.foundation.layout.Spacer
3232
import androidx.compose.foundation.layout.Stack
3333
import androidx.compose.foundation.layout.fillMaxSize
@@ -111,7 +111,6 @@ fun ConversationContent(
111111
ChannelNameBar(
112112
channelName = uiState.channelName,
113113
channelMembers = uiState.channelMembers,
114-
modifier = Modifier.gravity(Alignment.TopCenter),
115114
onNavIconPressed = onNavIconPressed
116115
)
117116
}
@@ -131,7 +130,7 @@ fun ChannelNameBar(
131130
title = {
132131
Column(
133132
modifier = Modifier.weight(1f),
134-
horizontalGravity = Alignment.CenterHorizontally
133+
horizontalAlignment = Alignment.CenterHorizontally
135134
) {
136135
// Channel name
137136
Text(
@@ -229,7 +228,7 @@ fun Messages(
229228
onClicked = {
230229
scrollState.smoothScrollTo(BottomScrollState)
231230
},
232-
modifier = Modifier.gravity(Alignment.BottomCenter)
231+
modifier = Modifier.align(Alignment.BottomCenter)
233232
)
234233
}
235234
}
@@ -266,7 +265,7 @@ fun Message(
266265
.border(1.5.dp, borderColor, CircleShape)
267266
.border(3.dp, MaterialTheme.colors.surface, CircleShape)
268267
.clip(CircleShape)
269-
.gravity(Alignment.Top),
268+
.align(Alignment.Top),
270269
asset = image,
271270
contentScale = ContentScale.Crop
272271
)
@@ -351,7 +350,7 @@ fun DayHeader(dayString: String) {
351350
@Composable
352351
private fun DayHeaderLine() {
353352
Divider(
354-
modifier = Modifier.weight(1f).gravity(Alignment.CenterVertically),
353+
modifier = Modifier.weight(1f).align(Alignment.CenterVertically),
355354
color = MaterialTheme.colors.onSurface.copy(alpha = 0.12f)
356355
)
357356
}

‎Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationFragment.kt

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import android.view.View
2222
import android.view.ViewGroup
2323
import androidx.compose.runtime.Providers
2424
import androidx.compose.ui.platform.ComposeView
25-
import androidx.compose.ui.platform.setContent
2625
import androidx.core.os.bundleOf
2726
import androidx.fragment.app.Fragment
2827
import androidx.navigation.findNavController

‎Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt

+24-13
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import androidx.compose.foundation.contentColor
3131
import androidx.compose.foundation.currentTextStyle
3232
import androidx.compose.foundation.layout.Arrangement
3333
import androidx.compose.foundation.layout.Column
34-
import androidx.compose.foundation.layout.InnerPadding
34+
import androidx.compose.foundation.layout.PaddingValues
3535
import androidx.compose.foundation.layout.Row
3636
import androidx.compose.foundation.layout.Spacer
3737
import androidx.compose.foundation.layout.Stack
@@ -45,13 +45,15 @@ import androidx.compose.foundation.layout.wrapContentHeight
4545
import androidx.compose.foundation.rememberScrollState
4646
import androidx.compose.foundation.text.FirstBaseline
4747
import androidx.compose.material.Button
48+
import androidx.compose.material.ButtonConstants
4849
import androidx.compose.material.Divider
4950
import androidx.compose.material.EmphasisAmbient
5051
import androidx.compose.material.IconButton
5152
import androidx.compose.material.MaterialTheme
5253
import androidx.compose.material.ProvideEmphasis
5354
import androidx.compose.material.Surface
5455
import androidx.compose.material.TextButton
56+
import androidx.compose.material.contentColorFor
5557
import androidx.compose.material.icons.Icons
5658
import androidx.compose.material.icons.outlined.AlternateEmail
5759
import androidx.compose.material.icons.outlined.Duo
@@ -197,7 +199,7 @@ private fun SelectorExpanded(
197199
// If the selector is shown, always request focus to trigger a TextField.onFocusChange.
198200
onCommit {
199201
if (currentSelector == InputSelector.EMOJI) {
200-
focusRequester.captureFocus()
202+
focusRequester.requestFocus()
201203
}
202204
}
203205
val selectorExpandedColor = getSelectorExpandedColor()
@@ -221,7 +223,7 @@ fun FunctionalityNotAvailablePanel() {
221223
Column(
222224
modifier = Modifier.preferredHeight(320.dp).fillMaxWidth(),
223225
verticalArrangement = Arrangement.Center,
224-
horizontalGravity = Alignment.CenterHorizontally,
226+
horizontalAlignment = Alignment.CenterHorizontally,
225227
) {
226228
ProvideEmphasis(emphasis = EmphasisAmbient.current.high) {
227229
Text(
@@ -262,7 +264,7 @@ private fun UserInputSelector(
262264
.preferredHeight(56.dp)
263265
.wrapContentHeight()
264266
.padding(horizontal = 4.dp),
265-
verticalGravity = Alignment.CenterVertically
267+
verticalAlignment = Alignment.CenterVertically
266268
) {
267269
InputSelectorButton(
268270
onClick = { onSelectorChange(InputSelector.EMOJI) },
@@ -304,9 +306,18 @@ private fun UserInputSelector(
304306
null
305307
}
306308
Spacer(modifier = Modifier.weight(1f))
307-
val disableContentColor =
308-
EmphasisAmbient.current.disabled.applyEmphasis(MaterialTheme.colors.onSurface)
309309

310+
val backgroundColor = ButtonConstants.defaultButtonBackgroundColor(
311+
enabled = sendMessageEnabled,
312+
disabledColor = MaterialTheme.colors.surface
313+
)
314+
val disabledContentColor =
315+
EmphasisAmbient.current.disabled.applyEmphasis(MaterialTheme.colors.onSurface)
316+
val contentColor = ButtonConstants.defaultButtonContentColor(
317+
enabled = sendMessageEnabled,
318+
defaultColor = contentColorFor(backgroundColor),
319+
disabledColor = disabledContentColor
320+
)
310321
// Send button
311322
Button(
312323
modifier = Modifier
@@ -315,10 +326,10 @@ private fun UserInputSelector(
315326
elevation = 0.dp,
316327
enabled = sendMessageEnabled,
317328
onClick = onMessageSent,
318-
disabledBackgroundColor = MaterialTheme.colors.surface,
329+
contentColor = contentColor,
330+
backgroundColor = backgroundColor,
319331
border = border,
320-
disabledContentColor = disableContentColor,
321-
contentPadding = InnerPadding(0.dp) // TODO: Workaround for b/158830170
332+
contentPadding = PaddingValues(0.dp) // TODO: Workaround for b/158830170
322333
) {
323334
Text(
324335
stringResource(id = R.string.send),
@@ -391,7 +402,7 @@ private fun UserInputText(
391402
horizontalArrangement = Arrangement.End
392403
) {
393404
Stack(
394-
modifier = Modifier.preferredHeight(48.dp).weight(1f).gravity(Alignment.Bottom)
405+
modifier = Modifier.preferredHeight(48.dp).weight(1f).align(Alignment.Bottom)
395406
) {
396407
var lastFocusState by remember { mutableStateOf(FocusState.Inactive) }
397408
BaseTextField(
@@ -400,7 +411,7 @@ private fun UserInputText(
400411
modifier = Modifier
401412
.fillMaxWidth()
402413
.padding(start = 16.dp)
403-
.gravity(Alignment.CenterStart)
414+
.align(Alignment.CenterStart)
404415
.focusObserver { state ->
405416
if (lastFocusState != state) {
406417
onTextFieldFocused(state == FocusState.Active)
@@ -418,7 +429,7 @@ private fun UserInputText(
418429
if (textFieldValue.text.isEmpty() && !focusState) {
419430
Text(
420431
modifier = Modifier
421-
.gravity(Alignment.CenterStart)
432+
.align(Alignment.CenterStart)
422433
.padding(start = 16.dp),
423434
text = stringResource(id = R.string.textfield_hint),
424435
style = MaterialTheme.typography.body1.copy(color = disableContentColor)
@@ -492,7 +503,7 @@ fun ExtendedSelectorInnerButton(
492503
shape = MaterialTheme.shapes.medium,
493504
backgroundColor = backgroundColor,
494505
contentColor = color,
495-
contentPadding = InnerPadding(0.dp) // TODO: Workaround for b/158830170
506+
contentPadding = PaddingValues(0.dp) // TODO: Workaround for b/158830170
496507
) {
497508
Text(
498509
text = text,

‎Jetchat/app/src/main/java/com/example/compose/jetchat/profile/Profile.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fun ProfileScreen(userData: ProfileScreenState, onNavIconPressed: () -> Unit = {
104104
ProfileFab(
105105
extended = scrollState.value == 0f,
106106
userIsMe = userData.isMe(),
107-
modifier = Modifier.gravity(Alignment.BottomEnd)
107+
modifier = Modifier.align(Alignment.BottomEnd)
108108
)
109109
}
110110
}
@@ -188,7 +188,7 @@ private fun ProfileHeader(
188188
modifier = Modifier
189189
.fillMaxWidth()
190190
// Allow for landscape and portrait ratios
191-
.preferredHeightIn(maxHeight = 320.dp)
191+
.preferredHeightIn(max = 320.dp)
192192
.aspectRatio(ratioAsset),
193193
backgroundColor = Color.LightGray
194194

@@ -243,7 +243,7 @@ fun ProfileFab(extended: Boolean, userIsMe: Boolean, modifier: Modifier = Modifi
243243
modifier = modifier
244244
.padding(16.dp)
245245
.preferredHeight(48.dp)
246-
.widthIn(minWidth = 48.dp),
246+
.widthIn(min = 48.dp),
247247
backgroundColor = MaterialTheme.colors.primary,
248248
contentColor = MaterialTheme.colors.onPrimary
249249
) {

‎Jetchat/app/src/main/java/com/example/compose/jetchat/profile/ProfileFragment.kt

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import android.view.View
2323
import android.view.ViewGroup
2424
import androidx.compose.runtime.livedata.observeAsState
2525
import androidx.compose.ui.platform.ComposeView
26-
import androidx.compose.ui.platform.setContent
2726
import androidx.fragment.app.Fragment
2827
import androidx.fragment.app.viewModels
2928
import com.example.compose.jetchat.NavActivity

‎Jetchat/buildSrc/src/main/java/com/example/compose/jetchat/buildsrc/dependencies.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object Versions {
2121
}
2222

2323
object Libs {
24-
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha08"
24+
const val androidGradlePlugin = "com.android.tools.build:gradle:4.2.0-alpha10"
2525
const val jdkDesugar = "com.android.tools:desugar_jdk_libs:1.0.9"
2626

2727
const val junit = "junit:junit:4.13"
@@ -47,8 +47,8 @@ object Libs {
4747
const val coreKtx = "androidx.core:core-ktx:1.5.0-alpha01"
4848

4949
object Compose {
50-
const val snapshot = ""
51-
const val version = "1.0.0-alpha01"
50+
const val snapshot = "6824694"
51+
const val version = "1.0.0-SNAPSHOT"
5252

5353
const val core = "androidx.compose.ui:ui:$version"
5454
const val foundation = "androidx.compose.foundation:foundation:$version"

‎Jetchat/gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ distributionBase=GRADLE_USER_HOME
1919
distributionPath=wrapper/dists
2020
zipStoreBase=GRADLE_USER_HOME
2121
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
22+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip

0 commit comments

Comments
 (0)
Please sign in to comment.