Optimize imports

7 files changed, 37 insertions, 42 deletions

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
index 139066a5..9b1d8e79 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/DebugActivity.kt
@@ -63,8 +63,7 @@ class DebugActivity : KauBaseActivity() {
 
         fab.visible().setIcon(GoogleMaterial.Icon.gmd_bug_report, Prefs.iconColor)
         fab.backgroundTintList = ColorStateList.valueOf(Prefs.accentColor)
-        fab.setOnClickListener {
-            _ ->
+        fab.setOnClickListener { _ ->
             fab.hide()
 
             val parent = baseDir(this)
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
index 2f0ef616..ab7e165a 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbCookie.kt
@@ -29,8 +29,7 @@ object FbCookie {
 
     private fun setWebCookie(cookie: String?, callback: (() -> Unit)?) {
         with(CookieManager.getInstance()) {
-            removeAllCookies {
-                _ ->
+            removeAllCookies { _ ->
                 if (cookie == null) {
                     callback?.invoke()
                     return@removeAllCookies
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbRegex.kt b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbRegex.kt
index 05467dfa..a57ced11 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbRegex.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/facebook/FbRegex.kt
@@ -1,7 +1,5 @@
 package com.pitchedapps.frost.facebook
 
-import org.apache.commons.text.StringEscapeUtils
-
 /**
  * Created by Allan Wang on 21/12/17.
  *
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt
index 512ea82c..4f597731 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/fragments/RecyclerFragments.kt
@@ -3,11 +3,11 @@ package com.pitchedapps.frost.fragments
 import com.mikepenz.fastadapter.IItem
 import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.facebook.FbItem
-import com.pitchedapps.frost.facebook.requests.*
-import com.pitchedapps.frost.iitems.*
 import com.pitchedapps.frost.facebook.parsers.FrostNotifs
 import com.pitchedapps.frost.facebook.parsers.NotifParser
 import com.pitchedapps.frost.facebook.parsers.ParseResponse
+import com.pitchedapps.frost.facebook.requests.*
+import com.pitchedapps.frost.iitems.*
 import com.pitchedapps.frost.utils.frostJsoup
 import com.pitchedapps.frost.views.FrostRecyclerView
 import org.jetbrains.anko.doAsync
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
index 185da4fd..61e8b6c4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/iitems/NotificationIItem.kt
@@ -14,9 +14,9 @@ import com.mikepenz.fastadapter.FastAdapter
 import com.mikepenz.fastadapter.adapters.ItemAdapter
 import com.mikepenz.fastadapter.commons.utils.DiffCallback
 import com.pitchedapps.frost.R
+import com.pitchedapps.frost.facebook.parsers.FrostNotif
 import com.pitchedapps.frost.glide.FrostGlide
 import com.pitchedapps.frost.glide.GlideApp
-import com.pitchedapps.frost.facebook.parsers.FrostNotif
 import com.pitchedapps.frost.services.FrostRunnable
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.launchWebOverlay
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
index 8a6b4a3f..2bb1b5c5 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/services/FrostNotifications.kt
@@ -150,42 +150,42 @@ enum class NotificationType(
      * Create and submit a new notification with the given [content]
      */
     private fun createNotification(context: Context, content: NotificationContent): FrostNotification =
-        with(content) {
-            val intent = Intent(context, FrostWebActivity::class.java)
-            intent.data = Uri.parse(href)
-            intent.putExtra(ARG_USER_ID, data.id)
-            overlayContext.put(intent)
-            bindRequest(intent, content, data.cookie)
+            with(content) {
+                val intent = Intent(context, FrostWebActivity::class.java)
+                intent.data = Uri.parse(href)
+                intent.putExtra(ARG_USER_ID, data.id)
+                overlayContext.put(intent)
+                bindRequest(intent, content, data.cookie)
 
-            val group = "${groupPrefix}_${data.id}"
-            val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
-            val notifBuilder = context.frostNotification(channelId)
-                    .setContentTitle(title ?: context.string(R.string.frost_name))
-                    .setContentText(text)
-                    .setContentIntent(pendingIntent)
-                    .setCategory(Notification.CATEGORY_SOCIAL)
-                    .setSubText(data.name)
-                    .setGroup(group)
+                val group = "${groupPrefix}_${data.id}"
+                val pendingIntent = PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT)
+                val notifBuilder = context.frostNotification(channelId)
+                        .setContentTitle(title ?: context.string(R.string.frost_name))
+                        .setContentText(text)
+                        .setContentIntent(pendingIntent)
+                        .setCategory(Notification.CATEGORY_SOCIAL)
+                        .setSubText(data.name)
+                        .setGroup(group)
 
-            if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000)
-            L.v { "Notif load $content" }
+                if (timestamp != -1L) notifBuilder.setWhen(timestamp * 1000)
+                L.v { "Notif load $content" }
 
-            if (profileUrl != null) {
-                try {
-                    val profileImg = GlideApp.with(context)
-                            .asBitmap()
-                            .load(profileUrl)
-                            .transform(FrostGlide.circleCrop)
-                            .submit(_40_DP, _40_DP)
-                            .get()
-                    notifBuilder.setLargeIcon(profileImg)
-                } catch (e: Exception) {
-                    L.e { "Failed to get image $profileUrl" }
+                if (profileUrl != null) {
+                    try {
+                        val profileImg = GlideApp.with(context)
+                                .asBitmap()
+                                .load(profileUrl)
+                                .transform(FrostGlide.circleCrop)
+                                .submit(_40_DP, _40_DP)
+                                .get()
+                        notifBuilder.setLargeIcon(profileImg)
+                    } catch (e: Exception) {
+                        L.e { "Failed to get image $profileUrl" }
+                    }
                 }
-            }
 
-             FrostNotification(group, notifId, notifBuilder)
-        }
+                FrostNotification(group, notifId, notifBuilder)
+            }
 
 
     /**
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
index 83f1f827..1f9411e4 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/settings/Notifications.kt
@@ -154,8 +154,7 @@ fun SettingsActivity.getNotificationPrefs(): KPrefAdapterBuilder.() -> Unit = {
     if (BuildConfig.DEBUG) {
         plainText(R.string.reset_notif_epoch) {
             onClick = {
-                loadFbCookiesAsync {
-                    cookies ->
+                loadFbCookiesAsync { cookies ->
                     cookies.map { NotificationModel(it.id) }.forEach { it.save() }
                 }
             }