Enhancement/ktlint (#1259)

* Add spotless * Reformat code * Apply license header * Add remaining license headers
AllanWang · Dec 24, 2018 · 697d018 · 697d018
1 parent c45b30e
commit 697d018
Show file tree

Hide file tree

Showing 128 changed files with 3,870 additions and 1,354 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,6 +6,8 @@ apply plugin: 'kotlin-kapt'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'com.gladed.androidgitversion'
 
+apply from: '../spotless.gradle'
+
 android {
     compileSdkVersion kau.targetSdk
     buildToolsVersion kau.buildTools

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt b/app/src/main/kotlin/com/pitchedapps/frost/FrostApp.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.pitchedapps.frost
 
 import android.app.Activity
@@ -21,7 +37,11 @@ import com.pitchedapps.frost.facebook.FbCookie
 import com.pitchedapps.frost.glide.GlideApp
 import com.pitchedapps.frost.services.scheduleNotifications
 import com.pitchedapps.frost.services.setupNotificationChannels
-import com.pitchedapps.frost.utils.*
+import com.pitchedapps.frost.utils.BuildUtils
+import com.pitchedapps.frost.utils.FrostPglAdBlock
+import com.pitchedapps.frost.utils.L
+import com.pitchedapps.frost.utils.Prefs
+import com.pitchedapps.frost.utils.Showcase
 import com.raizlabs.android.dbflow.config.DatabaseConfig
 import com.raizlabs.android.dbflow.config.FlowConfig
 import com.raizlabs.android.dbflow.config.FlowManager
@@ -30,10 +50,9 @@ import io.reactivex.exceptions.UndeliverableException
 import io.reactivex.plugins.RxJavaPlugins
 import java.net.SocketTimeoutException
 import java.net.UnknownHostException
-import java.util.*
+import java.util.Random
 import kotlin.reflect.KClass
 
-
 /**
  * Created by Allan Wang on 2017-05-28.
  */
@@ -46,22 +65,26 @@ class FrostApp : Application() {
 //    lateinit var refWatcher: RefWatcher
 
     private fun FlowConfig.Builder.withDatabase(name: String, klass: KClass<*>) =
-            addDatabaseConfig(DatabaseConfig.builder(klass.java)
-                    .databaseName(name)
-                    .modelNotifier(ContentResolverNotifier("${BuildConfig.APPLICATION_ID}.dbflow.provider"))
-                    .build())
+        addDatabaseConfig(
+            DatabaseConfig.builder(klass.java)
+                .databaseName(name)
+                .modelNotifier(ContentResolverNotifier("${BuildConfig.APPLICATION_ID}.dbflow.provider"))
+                .build()
+        )
 
     override fun onCreate() {
         if (!buildIsLollipopAndUp) { // not supported
             super.onCreate()
             return
         }
 
-        FlowManager.init(FlowConfig.Builder(this)
+        FlowManager.init(
+            FlowConfig.Builder(this)
                 .withDatabase(CookiesDb.NAME, CookiesDb::class)
                 .withDatabase(FbTabsDb.NAME, FbTabsDb::class)
                 .withDatabase(NotificationDb.NAME, NotificationDb::class)
-                .build())
+                .build()
+        )
         Showcase.initialize(this, "${BuildConfig.APPLICATION_ID}.showcase")
         Prefs.initialize(this, "${BuildConfig.APPLICATION_ID}.prefs")
         //        if (LeakCanary.isInAnalyzerProcess(this)) return
@@ -95,9 +118,11 @@ class FrostApp : Application() {
                 val c = imageView.context
                 val request = GlideApp.with(c)
                 val old = request.load(uri).apply(RequestOptions().placeholder(placeholder))
-                request.load(uri).apply(RequestOptions()
-                        .signature(ApplicationVersionSignature.obtain(c)))
-                        .thumbnail(old).into(imageView)
+                request.load(uri).apply(
+                    RequestOptions()
+                        .signature(ApplicationVersionSignature.obtain(c))
+                )
+                    .thumbnail(old).into(imageView)
             }
         })
         if (BuildConfig.DEBUG)
@@ -127,7 +152,6 @@ class FrostApp : Application() {
                     L.e(it) { "RxJava error" }
             }
         }
-
     }
 
     private fun initBugsnag() {
@@ -136,7 +160,7 @@ class FrostApp : Application() {
         Bugsnag.disableExceptionHandler()
         if (!BuildConfig.APPLICATION_ID.startsWith("com.pitchedapps.frost")) return
         val version = BuildUtils.match(BuildConfig.VERSION_NAME)
-                ?: return L.d { "Bugsnag disabled for ${BuildConfig.VERSION_NAME}" }
+            ?: return L.d { "Bugsnag disabled for ${BuildConfig.VERSION_NAME}" }
         Bugsnag.enableExceptionHandler()
         Bugsnag.setNotifyReleaseStages(*BuildUtils.getAllStages())
         Bugsnag.setAppVersion(version.versionName)
@@ -157,5 +181,4 @@ class FrostApp : Application() {
             }
         }
     }
-
 }
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/StartActivity.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.pitchedapps.frost
 
 import android.content.Intent
@@ -21,7 +37,8 @@ import com.pitchedapps.frost.utils.EXTRA_COOKIES
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
 import com.pitchedapps.frost.utils.launchNewTask
-import java.util.*
+import java.util.ArrayList
+import java.util.IllegalFormatException
 
 /**
  * Created by Allan Wang on 2017-05-28.
@@ -46,7 +63,8 @@ class StartActivity : KauBaseActivity() {
                         if (Prefs.userId != -1L)
                             startActivity<MainActivity>(intentBuilder = {
                                 putParcelableArrayListExtra(EXTRA_COOKIES, cookies)
-                                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
+                                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or
+                                    Intent.FLAG_ACTIVITY_SINGLE_TOP
                             })
                         else
                             launchNewTask<SelectorActivity>(cookies)
@@ -57,11 +75,10 @@ class StartActivity : KauBaseActivity() {
         } catch (e: Exception) {
             showInvalidWebView()
         }
-
     }
 
     private fun showInvalidWebView() =
-            showInvalidView(R.string.error_webview)
+        showInvalidView(R.string.error_webview)
 
     private fun showInvalidSdkView() {
         val text = try {
@@ -73,12 +90,12 @@ class StartActivity : KauBaseActivity() {
     }
 
     private fun showInvalidView(textRes: Int) =
-            showInvalidView(string(textRes))
+        showInvalidView(string(textRes))
 
     private fun showInvalidView(text: String) {
         setContentView(R.layout.activity_invalid)
         findViewById<ImageView>(R.id.invalid_icon)
-                .setIcon(GoogleMaterial.Icon.gmd_adb, -1, Color.WHITE)
+            .setIcon(GoogleMaterial.Icon.gmd_adb, -1, Color.WHITE)
         findViewById<TextView>(R.id.invalid_text).text = text
     }
-}
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/AboutActivity.kt
@@ -1,17 +1,40 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.pitchedapps.frost.activities
 
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.constraintlayout.widget.ConstraintSet
-import androidx.recyclerview.widget.RecyclerView
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.constraintlayout.widget.ConstraintLayout
+import androidx.constraintlayout.widget.ConstraintSet
+import androidx.recyclerview.widget.RecyclerView
 import ca.allanwang.kau.about.AboutActivityBase
 import ca.allanwang.kau.about.LibraryIItem
 import ca.allanwang.kau.adapters.FastItemThemedAdapter
 import ca.allanwang.kau.adapters.ThemableIItem
 import ca.allanwang.kau.adapters.ThemableIItemDelegate
-import ca.allanwang.kau.utils.*
+import ca.allanwang.kau.utils.bindView
+import ca.allanwang.kau.utils.dimenPixelSize
+import ca.allanwang.kau.utils.resolveDrawable
+import ca.allanwang.kau.utils.startLink
+import ca.allanwang.kau.utils.string
+import ca.allanwang.kau.utils.toDrawable
+import ca.allanwang.kau.utils.toast
+import ca.allanwang.kau.utils.withMinAlpha
 import com.mikepenz.aboutlibraries.Libs
 import com.mikepenz.aboutlibraries.entity.Library
 import com.mikepenz.aboutlibraries.entity.License
@@ -25,7 +48,6 @@ import com.pitchedapps.frost.R
 import com.pitchedapps.frost.utils.L
 import com.pitchedapps.frost.utils.Prefs
 
-
 /**
  * Created by Allan Wang on 2017-06-26.
  */
@@ -42,21 +64,21 @@ class AboutActivity : AboutActivityBase(null, {
 
     override fun getLibraries(libs: Libs): List<Library> {
         val include = arrayOf(
-                "AboutLibraries",
-                "AndroidIconics",
-                "androidin_appbillingv3",
-                "androidslidinguppanel",
-                "Crashlytics",
-                "dbflow",
-                "fastadapter",
-                "glide",
-                "Jsoup",
-                "kau",
-                "kotterknife",
-                "materialdialogs",
-                "materialdrawer",
-                "rxjava",
-                "subsamplingscaleimageview"
+            "AboutLibraries",
+            "AndroidIconics",
+            "androidin_appbillingv3",
+            "androidslidinguppanel",
+            "Crashlytics",
+            "dbflow",
+            "fastadapter",
+            "glide",
+            "Jsoup",
+            "kau",
+            "kotterknife",
+            "materialdialogs",
+            "materialdrawer",
+            "rxjava",
+            "subsamplingscaleimageview"
         )
 
         val l = libs.prepareLibraries(this, include, null, false, true, true)
@@ -136,11 +158,11 @@ class AboutActivity : AboutActivityBase(null, {
                 val c = itemView.context
                 val size = c.dimenPixelSize(R.dimen.kau_avatar_bounds)
                 images = arrayOf<Pair<IIcon, () -> Unit>>(
-                        GoogleMaterial.Icon.gmd_arrow_downward to { c.startLink(R.string.github_downloads_url) },
-                        CommunityMaterial.Icon2.cmd_reddit to { c.startLink(R.string.reddit_url) },
-                        CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) },
-                        CommunityMaterial.Icon2.cmd_slack to { c.startLink(R.string.slack_url) },
-                        CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) }
+                    GoogleMaterial.Icon.gmd_arrow_downward to { c.startLink(R.string.github_downloads_url) },
+                    CommunityMaterial.Icon2.cmd_reddit to { c.startLink(R.string.reddit_url) },
+                    CommunityMaterial.Icon.cmd_github_circle to { c.startLink(R.string.github_url) },
+                    CommunityMaterial.Icon2.cmd_slack to { c.startLink(R.string.slack_url) },
+                    CommunityMaterial.Icon2.cmd_xda to { c.startLink(R.string.xda_url) }
                 ).mapIndexed { i, (icon, onClick) ->
                     ImageView(c).apply {
                         layoutParams = ViewGroup.LayoutParams(size, size)
@@ -154,10 +176,16 @@ class AboutActivity : AboutActivityBase(null, {
                 }
                 val set = ConstraintSet()
                 set.clone(container)
-                set.createHorizontalChain(ConstraintSet.PARENT_ID, ConstraintSet.LEFT, ConstraintSet.PARENT_ID, ConstraintSet.RIGHT,
-                        images.map { it.id }.toIntArray(), null, ConstraintSet.CHAIN_SPREAD_INSIDE)
+                set.createHorizontalChain(ConstraintSet.PARENT_ID,
+                    ConstraintSet.LEFT,
+                    ConstraintSet.PARENT_ID,
+                    ConstraintSet.RIGHT,
+                    images.map { it.id }.toIntArray(),
+                    null,
+                    ConstraintSet.CHAIN_SPREAD_INSIDE
+                )
                 set.applyTo(container)
             }
         }
     }
-}
+}
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/BaseActivity.kt
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 Allan Wang
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 package com.pitchedapps.frost.activities
 
 import android.content.res.Configuration
@@ -80,7 +96,6 @@ abstract class BaseActivity : KauBaseActivity() {
 ////        disposeNetworkConnectivity()
 //    }
 
-
     override fun onStop() {
         if (this is VideoViewHolder) videoOnStop()
         super.onStop()
@@ -90,4 +105,4 @@ abstract class BaseActivity : KauBaseActivity() {
         super.onConfigurationChanged(newConfig)
         if (this is VideoViewHolder) videoViewer?.updateLocation()
     }
-}
+}