Merge "[Jetchat] Adds ktlint" into jetapps

Author: JoseAlcerreca

JetChat/app/build.gradle

@@ -59,6 +59,10 @@ android {
 
 }
 
+configurations {
+    ktlint
+}
+
 dependencies {
 
     // TODO: Tidy up
@@ -91,4 +95,19 @@ dependencies {
     androidTestImplementation("androidx.ui:ui-core:$compose_version")
     androidTestImplementation("androidx.ui:ui-test:$compose_version")
 
-}
+    ktlint "com.pinterest:ktlint:0.37.0"
+}
+
+task ktlint(type: JavaExec, group: "verification") {
+    description = "Check Kotlin code style."
+    main = "com.pinterest.ktlint.Main"
+    classpath = configurations.ktlint
+    args "src/**/*.kt"
+}
+check.dependsOn ktlint
+task ktlintFormat(type: JavaExec, group: "formatting") {
+    description = "Fix Kotlin code style deviations."
+    main = "com.pinterest.ktlint.Main"
+    classpath = configurations.ktlint
+    args "-F", "src/**/*.kt"
+}

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

@@ -33,4 +33,4 @@ class ConversationTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.compose.jetchat", appContext.packageName)
     }
-}
+}

JetChat/app/src/main/java/com/example/compose/jetchat/NavActivity.kt

@@ -48,7 +48,8 @@ class NavActivity : AppCompatActivity() {
         appBarConfiguration = AppBarConfiguration(
             setOf(
                 R.id.nav_home, R.id.nav_profile
-            ), drawerLayout
+            ),
+            drawerLayout
         )
         navView.setupWithNavController(navController)
     }

JetChat/app/src/main/java/com/example/compose/jetchat/UiExtras.kt

@@ -22,7 +22,6 @@ import androidx.ui.material.AlertDialog
 import androidx.ui.material.MaterialTheme
 import androidx.ui.material.TextButton
 
-
 @Composable
 fun FunctionalityNotAvailablePopup(onDismiss: () -> Unit) {
     AlertDialog(

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

@@ -199,8 +199,8 @@ fun Messages(
     }
 
     // Scroll to last message
-    if (!userScrolled  // Don't scroll if the user triggered the scrolling
-        && scrollerPosition.atBottom() // Don't scroll if already at the bottom
+    if (!userScrolled && // Don't scroll if the user triggered the scrolling
+        scrollerPosition.atBottom() // Don't scroll if already at the bottom
     ) {
         // Scroll smoothly after the first scroll
         scrollerPosition.smoothScrollTo(scrollerPosition.maxPosition)
@@ -239,7 +239,7 @@ fun Messages(
         // Apply the threshold:
         val jumpToBottomButtonEnabled = (
             scrollerPosition.value < scrollerPosition.maxPosition - jumpThreshold
-        )
+            )
 
         JumpToBottom(
             // Only show if the scroller is not at the bottom
@@ -250,7 +250,6 @@ fun Messages(
             },
             modifier = Modifier.gravity(Alignment.BottomCenter)
         )
-
     }
 }
 
@@ -299,7 +298,9 @@ fun AuthorAndTextMessage(
     Column(modifier = modifier) {
         Row {
             ProvideEmphasis(emphasis = EmphasisAmbient.current.high) {
-                Text(text = msg.author, style = MaterialTheme.typography.subtitle1,
+                Text(
+                    text = msg.author,
+                    style = MaterialTheme.typography.subtitle1,
                     modifier = Modifier.alignWithSiblings(LastBaseline)
                 )
             }

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

@@ -34,7 +34,8 @@ import com.example.compose.jetchat.theme.JetchatTheme
 class ConversationFragment : Fragment() {
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
         return FrameLayout(requireContext()).apply {

JetChat/app/src/main/java/com/example/compose/jetchat/conversation/ConversationUiState.kt

@@ -89,4 +89,4 @@ val exampleUiState = ConversationUiState(
     initialMessages = initialMessages,
     channelName = "#composers",
     channelMembers = 42
-)
+)

JetChat/app/src/main/java/com/example/compose/jetchat/conversation/JumpToBottom.kt

@@ -56,7 +56,7 @@ private enum class Visibility {
 /**
  * Shows a button that lets the user scroll to the bottom.
  */
-//TODO: when a new message is added, the button shows up while the scroll is animating.
+// TODO: when a new message is added, the button shows up while the scroll is animating.
 @Composable
 fun JumpToBottom(
     enabled: Boolean,
@@ -84,7 +84,7 @@ fun JumpToBottom(
                 contentColor = MaterialTheme.colors.primary,
                 modifier = modifier
                     .padding(bottom = transition[bottomPadding]) // TODO: Replace with:
-                    //.offset(x = 0.dp, y = -transition[bottomPadding]) // b/155868092
+                    // .offset(x = 0.dp, y = -transition[bottomPadding]) // b/155868092
                     .preferredHeight(36.dp)
             ) {
                 Row(modifier = Modifier.padding(vertical = 10.dp, horizontal = 16.dp)) {

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

@@ -136,7 +136,7 @@ private fun SelectorExpanded(
     onCloseRequested: () -> Unit,
     onTextAdded: (String) -> Unit
 ) {
-    when(currentSelector) {
+    when (currentSelector) {
         InputSelector.MAP -> MapSelector()
         InputSelector.THUMBS_UP -> StickerSelector()
         InputSelector.EMOJI -> EmojiSelector(onTextAdded)
@@ -298,12 +298,14 @@ fun EmojiSelector(
                             onClick = { onTextAdded(emoji) },
                             modifier = Modifier
                                 .preferredSize(42.dp, 42.dp)
-                                .ripple()) {
+                                .ripple()
+                        ) {
                             Text(
                                 text = emoji,
                                 style = currentTextStyle().copy(
                                     fontSize = 18.sp,
-                                    textAlign = TextAlign.Center)
+                                    textAlign = TextAlign.Center
+                                )
                             )
                         }
                     }

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

@@ -81,7 +81,6 @@ fun ProfileScreen(userData: ProfileScreenState) {
                     )
                     ProfileButtonsRow()
                     UserInfoFields(userData)
-
                 }
             }
         }

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

@@ -42,7 +42,8 @@ class ProfileFragment : Fragment() {
     }
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
     ): View? {
 

Jetsnack/app/src/main/java/com/example/jetsnack/ui/theme/Shape.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.example.jetsnack.ui.theme
+package com.example.compose.jetchat.theme
 
 import androidx.ui.foundation.shape.corner.RoundedCornerShape
 import androidx.ui.material.Shapes
 import androidx.ui.unit.dp
 
-val Shapes = Shapes(
-    small = RoundedCornerShape(4.dp),
-    medium = RoundedCornerShape(4.dp),
+val JetchatShapes = Shapes(
+    small = RoundedCornerShape(28.dp),
+    medium = RoundedCornerShape(8.dp),
     large = RoundedCornerShape(0.dp)
 )