Merge pull request android#329 from JoseAlcerreca/jetchat_ktlint

[Jetchat] Enables --android flag in ktlint
nunotani123 · Dec 16, 2020 · 4becf15 · 4becf15
2 parents 6c66083 + 0ef7f45
commit 4becf15
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/NavigationTest.kt
@@ -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()

diff --git a/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt b/Jetchat/app/src/androidTest/java/com/example/compose/jetchat/UserInputTest.kt
@@ -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))

diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/components/JetchatDrawer.kt
@@ -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

diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationUiState.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationUiState.kt
@@ -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
+)
diff --git a/Jetchat/build.gradle b/Jetchat/build.gradle
@@ -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')
         }
     }