Checkstyle and ktlint updates

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragment.kt

@@ -26,9 +26,11 @@ abstract class TopLevelFragment : Fragment(), TopLevelFragmentView {
         childFragmentManager.addOnBackStackChangedListener(this)
     }
 
-    final override fun onCreateView(inflater: LayoutInflater,
-                                    container: ViewGroup?,
-                                    savedInstanceState: Bundle?): View? {
+    final override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val layout: FrameLayout = inflater.inflate(R.layout.fragment_parent,
                 container, false) as FrameLayout
         val view: View? = onCreateFragmentView(inflater, layout, savedInstanceState)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragmentView.kt

@@ -23,9 +23,11 @@ interface TopLevelFragmentView : FragmentManager.OnBackStackChangedListener {
      * Inflate the fragment view and return to be added to the parent
      * container.
      */
-    fun onCreateFragmentView(inflater: LayoutInflater,
-                             container: ViewGroup?,
-                             savedInstanceState: Bundle?): View?
+    fun onCreateFragmentView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View?
 
     /**
      * Return the title that should appear in the action bar while this fragment is

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardFragment.kt

@@ -13,9 +13,11 @@ class DashboardFragment : TopLevelFragment() {
         fun newInstance() = DashboardFragment()
     }
 
-    override fun onCreateFragmentView(inflater: LayoutInflater,
-                                      container: ViewGroup?,
-                                      savedInstanceState: Bundle?): View? {
+    override fun onCreateFragmentView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return inflater.inflate(R.layout.fragment_dashboard, container, false)
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt

@@ -144,8 +144,12 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, HasSup
         slideInFragment(loginSiteAddressFragment, true, LoginSiteAddressFragment.TAG)
     }
 
-    override fun loginViaSocialAccount(email: String?, idToken: String?, service: String?,
-                                       isPasswordRequired: Boolean) {
+    override fun loginViaSocialAccount(
+        email: String?,
+        idToken: String?,
+        service: String?,
+        isPasswordRequired: Boolean
+    ) {
         val loginEmailPasswordFragment = LoginEmailPasswordFragment.newInstance(email, null, idToken,
                 service, isPasswordRequired)
         slideInFragment(loginEmailPasswordFragment, true, LoginEmailPasswordFragment.TAG)
@@ -190,8 +194,13 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, HasSup
         slideInFragment(login2FaFragment, true, Login2FaFragment.TAG)
     }
 
-    override fun needs2faSocial(email: String?, userId: String?, nonceAuthenticator: String?, nonceBackup: String?,
-                                nonceSms: String?) {
+    override fun needs2faSocial(
+        email: String?,
+        userId: String?,
+        nonceAuthenticator: String?,
+        nonceBackup: String?,
+        nonceSms: String?
+    ) {
         loginAnalyticsListener.trackLoginSocial2faNeeded()
         val login2FaFragment = Login2FaFragment.newInstanceSocial(email, userId,
                 nonceAuthenticator, nonceBackup, nonceSms)
@@ -225,8 +234,10 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, HasSup
         slideInFragment(loginUsernamePasswordFragment, true, LoginUsernamePasswordFragment.TAG)
     }
 
-    override fun handleSslCertificateError(memorizingTrustManager: MemorizingTrustManager?,
-                                           callback: LoginListener.SelfSignedSSLCallback?) {
+    override fun handleSslCertificateError(
+        memorizingTrustManager: MemorizingTrustManager?,
+        callback: LoginListener.SelfSignedSSLCallback?
+    ) {
         // TODO: Support self-signed SSL sites and show dialog (only needed when XML-RPC support is added)
     }
 
@@ -307,8 +318,12 @@ class LoginActivity : AppCompatActivity(), LoginListener, GoogleListener, HasSup
 
     // SmartLock
 
-    override fun saveCredentialsInSmartLock(username: String?, password: String?, displayName: String,
-                                            profilePicture: Uri?) {
+    override fun saveCredentialsInSmartLock(
+        username: String?,
+        password: String?,
+        displayName: String,
+        profilePicture: Uri?
+    ) {
         // TODO: Hook for smartlock, if using
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainPresenter.kt

@@ -18,10 +18,10 @@ import javax.inject.Inject
 
 @OpenClassOnDebug
 class MainPresenter @Inject constructor(
-        private val dispatcher: Dispatcher,
-        private val accountStore: AccountStore,
-        private val siteStore: SiteStore,
-        private val wooCommerceStore: WooCommerceStore
+    private val dispatcher: Dispatcher,
+    private val accountStore: AccountStore,
+    private val siteStore: SiteStore,
+    private val wooCommerceStore: WooCommerceStore
 ) : MainContract.Presenter {
     private var mainView: MainContract.View? = null
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/notifications/NotificationsFragment.kt

@@ -13,9 +13,11 @@ class NotificationsFragment : TopLevelFragment() {
         fun newInstance() = NotificationsFragment()
     }
 
-    override fun onCreateFragmentView(inflater: LayoutInflater,
-                                      container: ViewGroup?,
-                                      savedInstanceState: Bundle?): View? {
+    override fun onCreateFragmentView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return inflater.inflate(R.layout.fragment_notifications, container, false)
     }
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListFragment.kt

@@ -38,9 +38,11 @@ class OrderListFragment : TopLevelFragment(), OrderListContract.View {
         super.onAttach(context)
     }
 
-    override fun onCreateFragmentView(inflater: LayoutInflater,
-                                      container: ViewGroup?,
-                                      savedInstanceState: Bundle?): View? {
+    override fun onCreateFragmentView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         val view = inflater.inflate(R.layout.fragment_order_list, container, false)
         with(view) {
             orderRefreshLayout?.apply {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListPresenter.kt

@@ -10,8 +10,9 @@ import org.wordpress.android.fluxc.store.WCOrderStore.FetchOrdersPayload
 import org.wordpress.android.fluxc.store.WCOrderStore.OnOrderChanged
 import javax.inject.Inject
 
-class OrderListPresenter @Inject constructor(private val dispatcher: Dispatcher,
-                                             private val orderStore: WCOrderStore
+class OrderListPresenter @Inject constructor(
+    private val dispatcher: Dispatcher,
+    private val orderStore: WCOrderStore
 ) : OrderListContract.Presenter {
     private var orderView: OrderListContract.View? = null
 

WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/AlignedDividerDecoration.kt

@@ -55,11 +55,13 @@ import android.view.View
  * @param [clipToMargin] True if the divider should also clip itself to match the margins of the provided components.
  * Default is false.
  */
-class AlignedDividerDecoration @JvmOverloads constructor(ctx: Context,
-                                                         private val orientation: Int,
-                                                         private val alignStartToStartOf: Int = 0,
-                                                         private val alignEndToEndOf: Int = 0,
-                                                         private val clipToMargin: Boolean = false)
+class AlignedDividerDecoration @JvmOverloads constructor(
+    ctx: Context,
+    private val orientation: Int,
+    private val alignStartToStartOf: Int = 0,
+    private val alignEndToEndOf: Int = 0,
+    private val clipToMargin: Boolean = false
+)
     : RecyclerView.ItemDecoration() {
     companion object {
         const val HORIZONTAL = 0

WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/FlowLayout.kt

@@ -15,8 +15,10 @@ import com.woocommerce.android.R
  * @attr ref com.woocommerce.android.R.styleable#FlowLayout_horizontalSpacing
  * @attr ref com.woocommerce.android.R.styleable#FlowLayout_verticalSpacing
  */
-open class FlowLayout @JvmOverloads constructor(context: Context,
-                                                attrs: AttributeSet? = null) : ViewGroup(context, attrs) {
+open class FlowLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+) : ViewGroup(context, attrs) {
     private var mHorizontalSpacing: Int = 0
     private var mVerticalSpacing: Int = 0
 

WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/ScrollChildSwipeRefreshLayout.kt

@@ -14,8 +14,10 @@ import android.view.View
  *
  * see https://github.com/googlesamples/android-architecture
  */
-class ScrollChildSwipeRefreshLayout @JvmOverloads constructor(context: Context,
-                                                              attrs: AttributeSet? = null)
+class ScrollChildSwipeRefreshLayout @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null
+)
     : SwipeRefreshLayout(context, attrs) {
     var scrollUpChild: View? = null
 

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
-        classpath 'com.automattic.android:fetchstyle:1.0'
+        classpath 'com.automattic.android:fetchstyle:1.1'
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
     }
 }
@@ -53,7 +53,7 @@ subprojects {
     }
 
     dependencies {
-        ktlint 'com.github.shyiko:ktlint:0.14.0'
+        ktlint 'com.github.shyiko:ktlint:0.21.0'
     }
 
     task ktlint(type: JavaExec) {

config/checkstyle.xml

@@ -67,6 +67,12 @@
         <property name="severity" value="error"/>
     </module>
 
+    <module name="RegexpSingleline">
+        <property name="format" value="^(?!.*\bimport\b).*Store\.[A-Z][A-Za-z0-9]*[ );]"/>
+        <property name="message" value="Specific imports should be used for FluxC Store inner classes"/>
+        <property name="severity" value="error"/>
+    </module>
+
     <module name="RegexpMultiline">
         <property name="format" value="@Inject(\n|\r\n).*[^{,(]$"/>
         <property name="message" value="Inject annotation should be in-line with the annotated field or property"/>