Calling ktlintFormat on the project

Change-Id: Idaeff9d5ebbac9276df0fd0ad9f0373caa891949
android · Sep 20, 2019 · a44a32c · a44a32c
1 parent 0217d29
commit a44a32c
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 46 deletions.
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/ArticleScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/ArticleScreen.kt
@@ -16,9 +16,8 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.ui.core.Text
 import androidx.ui.layout.FlexColumn
 import androidx.ui.material.AppBarIcon
@@ -47,4 +46,4 @@ fun ArticleScreen(icons: Icons, postId: String) {
             PostContent(post)
         }
     }
-}
+}
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/HomeScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/HomeScreen.kt
@@ -16,9 +16,8 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.compose.unaryPlus
 import androidx.ui.core.Opacity
 import androidx.ui.core.Text

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/ImageUtils.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/ImageUtils.kt
@@ -16,9 +16,8 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.compose.memo
 import androidx.compose.unaryPlus
 import androidx.ui.core.Draw

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/MainActivity.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/MainActivity.kt
@@ -16,35 +16,30 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import android.content.res.Resources
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.Composable
+import androidx.compose.Model
+import androidx.compose.composer
 import androidx.compose.state
 import androidx.compose.unaryPlus
-import androidx.compose.Model
-
 import androidx.ui.core.Text
-import androidx.ui.core.setContent
 import androidx.ui.core.dp
+import androidx.ui.core.setContent
 import androidx.ui.graphics.imageFromResource
-
 import androidx.ui.layout.Column
 import androidx.ui.layout.CrossAxisAlignment
-import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.HeightSpacer
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.MainAxisAlignment
 import androidx.ui.layout.Padding
 import androidx.ui.layout.Row
-
 import androidx.ui.material.Button
 import androidx.ui.material.DrawerState
 import androidx.ui.material.MaterialTheme
 import androidx.ui.material.ModalDrawerLayout
 import androidx.ui.material.TextButtonStyle
-
 import com.example.jetnews.R
 
 class Icons(resources: Resources) {

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/PostCardTop.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/PostCardTop.kt
@@ -16,10 +16,9 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
 import androidx.compose.ambient
+import androidx.compose.composer
 import androidx.compose.unaryPlus
 import androidx.ui.core.ContextAmbient
 import androidx.ui.core.Opacity
@@ -29,12 +28,12 @@ import androidx.ui.foundation.shape.corner.RoundedCornerShape
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
 import androidx.ui.layout.CrossAxisAlignment
-import androidx.ui.layout.LayoutSize
-import androidx.ui.material.themeTextStyle
 import androidx.ui.layout.HeightSpacer
-import androidx.ui.material.surface.Card
+import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.Padding
 import androidx.ui.material.MaterialTheme
+import androidx.ui.material.surface.Card
+import androidx.ui.material.themeTextStyle
 import com.android.tools.preview.Preview
 
 @Composable

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/PostCardYourNetwork.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/PostCardYourNetwork.kt
@@ -16,29 +16,28 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.compose.unaryPlus
 import androidx.ui.core.Opacity
 import androidx.ui.core.Text
 import androidx.ui.core.dp
 import androidx.ui.foundation.shape.corner.RoundedCornerShape
+import androidx.ui.graphics.Color
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
 import androidx.ui.layout.CrossAxisAlignment
 import androidx.ui.layout.LayoutSize
 import androidx.ui.layout.MainAxisAlignment
-import androidx.ui.material.themeTextStyle
-import androidx.ui.graphics.Color
+import androidx.ui.layout.Padding
 import androidx.ui.material.BaseButton
 import androidx.ui.material.surface.Card
-import androidx.ui.layout.Padding
+import androidx.ui.material.themeTextStyle
 import androidx.ui.text.style.TextOverflow
 
 @Composable
 fun PostCardPopular(post: Post, icons: Icons) {
-    Card (shape = RoundedCornerShape(4.dp)) {
+    Card(shape = RoundedCornerShape(4.dp)) {
         Container(width = 280.dp, height = 240.dp) {
             Column(
                 mainAxisAlignment = MainAxisAlignment.Start,
@@ -54,7 +53,6 @@ fun PostCardPopular(post: Post, icons: Icons) {
                     Column(crossAxisAlignment = CrossAxisAlignment.Start) {
                         BaseButton(onClick = {
                             navigateTo(Screen.Article(post.id))
-
                         }, color = Color.Transparent) {
                             Opacity(0.87f) {
                                 Text(

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/PostCards.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/PostCards.kt
@@ -16,9 +16,8 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.compose.unaryPlus
 import androidx.ui.core.Opacity
 import androidx.ui.core.Text
@@ -143,7 +142,6 @@ fun PostCardHistory(post: Post, icons: Icons) {
     }
 }
 
-
 @Composable
 fun BookmarkButton(post: Post, icons: Icons) {
     val bookmarked = jetNewsStatus.favorites.contains(post.id)
@@ -162,4 +160,3 @@ fun BookmarkButton(post: Post, icons: Icons) {
         }
     }
 }
-
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/PostContent.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/PostContent.kt
@@ -16,20 +16,19 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
-
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.compose.unaryPlus
-import androidx.ui.core.Text
-import androidx.ui.core.dp
 import androidx.ui.core.Px
+import androidx.ui.core.Text
 import androidx.ui.core.WithDensity
-import androidx.ui.graphics.vector.DrawVector
-import androidx.ui.graphics.vector.compat.vectorResource
+import androidx.ui.core.dp
 import androidx.ui.foundation.VerticalScroller
 import androidx.ui.foundation.shape.DrawShape
 import androidx.ui.foundation.shape.corner.CircleShape
 import androidx.ui.graphics.Color
+import androidx.ui.graphics.vector.DrawVector
+import androidx.ui.graphics.vector.compat.vectorResource
 import androidx.ui.layout.Column
 import androidx.ui.layout.Container
 import androidx.ui.layout.CrossAxisAlignment
@@ -203,4 +202,3 @@ val linkTextStyle = (+themeTextStyle { body1 }).copy(decoration = TextDecoration
 
 val bulletParagraphStyle = ParagraphStyle(textIndent = TextIndent(firstLine = Px(30f)))
 val metadataTextStyle = +themeTextStyle { caption.copy(color = Color.Gray) }
-
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/Themes.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/Themes.kt
@@ -17,7 +17,6 @@
 package com.example.jetnews.ui
 
 import androidx.compose.composer
-
 import androidx.ui.graphics.Color
 import androidx.ui.material.MaterialColors
 

diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/TopicsScreen.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/TopicsScreen.kt
@@ -16,21 +16,21 @@
 
 package com.example.jetnews.ui
 
-import androidx.compose.composer
 import androidx.compose.Composable
+import androidx.compose.composer
 import androidx.ui.core.Text
 import androidx.ui.layout.FlexColumn
 import androidx.ui.material.AppBarIcon
 import androidx.ui.material.TopAppBar
 
 @Composable
-fun TopicsScreen(icons:Icons, openDrawer: () -> Unit) {
+fun TopicsScreen(icons: Icons, openDrawer: () -> Unit) {
     val navigationIcon: @Composable() () -> Unit = {
         AppBarIcon(icons.menu) {
             openDrawer()
         }
     }
-    FlexColumn{
+    FlexColumn {
         inflexible {
             TopAppBar<Any>(
                 { Text("Interests") },
@@ -41,4 +41,4 @@ fun TopicsScreen(icons:Icons, openDrawer: () -> Unit) {
             Text("These are your Topics")
         }
     }
-}
+}
diff --git a/JetNews/app/src/main/java/com/example/jetnews/ui/Typography.kt b/JetNews/app/src/main/java/com/example/jetnews/ui/Typography.kt
@@ -24,10 +24,10 @@ import androidx.ui.text.font.FontFamily
 import androidx.ui.text.font.FontWeight
 
 val regular = Font("montserrat_regular.ttf")
-val medium =  Font("montserrat_medium.ttf", FontWeight.w500)
+val medium = Font("montserrat_medium.ttf", FontWeight.w500)
 val semibold = Font("montserrat_semibold.ttf", FontWeight.w600)
 
-val appFontFamily = FontFamily(fonts = listOf(regular, medium, semibold) )
+val appFontFamily = FontFamily(fonts = listOf(regular, medium, semibold))
 
 val bodyFontFamily = FontFamily(fonts = listOf(
     Font("domine_regular.ttf"),