Skip to content

[Jetchat] Enables --android flag in ktlint #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoseAlcerreca merged 1 commit into from
Dec 16, 2020
Merged

[Jetchat] Enables --android flag in ktlint #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,9 @@ class NavigationTest {
// Check profile is displayed
assertEquals(navController.currentDestination?.id, R.id.nav_profile)
// Extra UI check
composeTestRule.onNodeWithText(activity.getString(R.string.textfield_hint)).assertIsDisplayed()
composeTestRule
.onNodeWithText(activity.getString(R.string.textfield_hint))
.assertIsDisplayed()

// Press back
Espresso.pressBack()
Expand Down
12 changes: 8 additions & 4 deletions Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,19 +138,23 @@ class UserInputTest {
}

private fun clickOnTextField() =
composeTestRule.onNodeWithContentDescription(activity.getString(R.string.textfield_desc))
composeTestRule
.onNodeWithContentDescription(activity.getString(R.string.textfield_desc))
.performClick()

private fun openEmojiSelector() =
composeTestRule.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_bt_desc))
composeTestRule
.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_bt_desc))
.performClick()

private fun assertEmojiSelectorIsDisplayed() =
composeTestRule.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_desc))
composeTestRule
.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_desc))
.assertIsDisplayed()

private fun assertEmojiSelectorDoesNotExist() =
composeTestRule.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_desc))
composeTestRule
.onNodeWithContentDescription(activity.getString(R.string.emoji_selector_desc))
.assertDoesNotExist()

private fun findSendButton() = composeTestRule.onNodeWithText(activity.getString(R.string.send))
Expand Down
4 changes: 3 additions & 1 deletion Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ fun ColumnScope.JetchatDrawer(onProfileClicked: (String) -> Unit, onChatClicked:
ChatItem("droidcon-nyc", false) { onChatClicked("droidcon-nyc") }
DrawerItemHeader("Recent Profiles")
ProfileItem("Ali Conors (you)", meProfile.photo) { onProfileClicked(meProfile.userId) }
ProfileItem("Taylor Brooks", colleagueProfile.photo) { onProfileClicked(colleagueProfile.userId) }
ProfileItem("Taylor Brooks", colleagueProfile.photo) {
onProfileClicked(colleagueProfile.userId)
}
}

@Composable
Expand Down
7 changes: 6 additions & 1 deletion Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,9 @@ class ConversationUiState(
}

@Immutable
data class Message(val author: String, val content: String, val timestamp: String, val image: Int? = null)
data class Message(
val author: String,
val content: String,
val timestamp: String,
val image: Int? = null
)
3 changes: 1 addition & 2 deletions Jetchat/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ subprojects {
target '**/*.kt'
targetExclude("$buildDir/**/*.kt")
targetExclude('bin/**/*.kt')

ktlint(Versions.ktlint)
ktlint(Versions.ktlint).userData([android: "true"])
licenseHeaderFile rootProject.file('spotless/copyright.kt')
}
}
Expand Down