detekt, ktlint

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

src/androidTest/java/com/owncloud/android/ui/fragment/AvatarIT.kt

@@ -40,7 +40,7 @@ class AvatarIT : AbstractIT() {
     @ScreenshotTest
     fun showAvatars() {
         val avatarRadius = targetContext.resources.getDimension(R.dimen.list_item_avatar_icon_radius)
-        val width = DisplayUtils.convertDpToPixel(40f, targetContext)
+        val width = DisplayUtils.convertDpToPixel(2f * R.dimen.list_item_avatar_icon_radius, targetContext)
         val sut = testActivityRule.launchActivity(null)
         val fragment = AvatarTestFragment()
 

src/androidTest/java/com/owncloud/android/ui/fragment/AvatarTestFragment.kt

@@ -45,7 +45,7 @@ internal class AvatarTestFragment : Fragment() {
     }
 
     fun addAvatar(name: String, avatarRadius: Float, width: Int, targetContext: Context) {
-        val margin = 10
+        val margin = padding
         val imageView = ImageView(targetContext)
         imageView.setImageDrawable(TextDrawable.createNamedAvatar(name, avatarRadius))
 
@@ -56,4 +56,8 @@ internal class AvatarTestFragment : Fragment() {
 
         list.addView(imageView)
     }
+
+    companion object {
+        private const val padding = 10
+    }
 }

src/test/java/com/owncloud/android/ui/adapter/ShareeListAdapterTest.kt

@@ -42,30 +42,42 @@ class ShareeListAdapterTest {
         val resources = Mockito.mock(Resources::class.java)
         Mockito.`when`(context!!.resources).thenReturn(resources)
         val expectedSortOrder: MutableList<OCShare?> = ArrayList()
-        expectedSortOrder.add(OCShare("/1").apply {
-            shareType = ShareType.EMAIL
-            sharedDate = 1004
-        })
-        expectedSortOrder.add(OCShare("/2").apply {
-            shareType = ShareType.PUBLIC_LINK
-            sharedDate = 1003
-        })
-        expectedSortOrder.add(OCShare("/3").apply {
-            shareType = ShareType.PUBLIC_LINK
-            sharedDate = 1001
-        })
-        expectedSortOrder.add(OCShare("/4").apply {
-            shareType = ShareType.EMAIL
-            sharedDate = 1000
-        })
-        expectedSortOrder.add(OCShare("/5").apply {
-            shareType = ShareType.USER
-            sharedDate = 80
-        })
-        expectedSortOrder.add(OCShare("/6").apply {
-            shareType = ShareType.CIRCLE
-            sharedDate = 20
-        })
+        expectedSortOrder.add(
+            OCShare("/1").apply {
+                shareType = ShareType.EMAIL
+                sharedDate = 1004
+            }
+        )
+        expectedSortOrder.add(
+            OCShare("/2").apply {
+                shareType = ShareType.PUBLIC_LINK
+                sharedDate = 1003
+            }
+        )
+        expectedSortOrder.add(
+            OCShare("/3").apply {
+                shareType = ShareType.PUBLIC_LINK
+                sharedDate = 1001
+            }
+        )
+        expectedSortOrder.add(
+            OCShare("/4").apply {
+                shareType = ShareType.EMAIL
+                sharedDate = 1000
+            }
+        )
+        expectedSortOrder.add(
+            OCShare("/5").apply {
+                shareType = ShareType.USER
+                sharedDate = 80
+            }
+        )
+        expectedSortOrder.add(
+            OCShare("/6").apply {
+                shareType = ShareType.CIRCLE
+                sharedDate = 20
+            }
+        )
 
         val randomOrder: MutableList<OCShare?> = ArrayList(expectedSortOrder)
         randomOrder.shuffle()