From 656fa733ad5ac15463936ea8d6814fd135e9d093 Mon Sep 17 00:00:00 2001
From: Alex Forcier <alex.forcier@automattic.com>
Date: Tue, 17 Apr 2018 10:25:20 -0400
Subject: [PATCH 1/4] Update IDEA style config files

---
 .idea/codeStyleSettings.xml                   |  2 +
 .idea/codeStyles/Project.xml                  | 39 +++++++++++++++++--
 .idea/inspectionProfiles/Project_Default.xml  |  4 +-
 build.gradle                                  |  2 +-
 config/checkstyle.xml                         |  6 +++
 libs/login/.idea/codeStyleSettings.xml        |  2 +
 libs/login/.idea/codeStyles/Project.xml       |  4 ++
 .../inspectionProfiles/Project_Default.xml    |  4 +-
 libs/login/build.gradle                       |  2 +-
 libs/login/config/checkstyle.xml              |  6 +++
 10 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 9e378a25608..c3f56acf6b1 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -47,6 +47,7 @@
           </option>
           <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
           <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+          <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
         </JetCodeStyleSettings>
         <Objective-C-extensions>
           <file>
@@ -264,6 +265,7 @@
         <codeStyleSettings language="kotlin">
           <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
           <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
         </codeStyleSettings>
       </value>
     </option>
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 46969759198..d19bccf030a 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -4,6 +4,10 @@
       <option name="USE_CUSTOM_SETTINGS" value="true" />
     </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
+      <option name="FIELD_NAME_PREFIX" value="m" />
+      <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
+      <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -40,6 +44,8 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="IMPORT_NESTED_CLASSES" value="true" />
+      <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
     </JetCodeStyleSettings>
     <MarkdownNavigatorCodeStyleSettings>
       <option name="RIGHT_MARGIN" value="120" />
@@ -70,10 +76,36 @@
       </extensions>
     </Objective-C-extensions>
     <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
+    <codeStyleSettings language="JAVA">
+      <option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
+      <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+      <option name="ALIGN_MULTILINE_METHOD_BRACKETS" value="true" />
+      <option name="CALL_PARAMETERS_WRAP" value="1" />
+      <option name="METHOD_PARAMETERS_WRAP" value="1" />
+      <option name="RESOURCE_LIST_WRAP" value="1" />
+      <option name="EXTENDS_LIST_WRAP" value="1" />
+      <option name="THROWS_LIST_WRAP" value="1" />
+      <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+      <option name="THROWS_KEYWORD_WRAP" value="1" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />
+      <option name="BINARY_OPERATION_WRAP" value="1" />
+      <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+      <option name="TERNARY_OPERATION_WRAP" value="1" />
+      <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+      <option name="FOR_STATEMENT_WRAP" value="1" />
+      <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+      <option name="ASSIGNMENT_WRAP" value="1" />
+      <option name="ASSERT_STATEMENT_WRAP" value="1" />
+      <option name="IF_BRACE_FORCE" value="3" />
+      <option name="DOWHILE_BRACE_FORCE" value="1" />
+      <option name="WHILE_BRACE_FORCE" value="1" />
+      <option name="FOR_BRACE_FORCE" value="3" />
+      <option name="WRAP_LONG_LINES" value="true" />
+      <option name="METHOD_ANNOTATION_WRAP" value="1" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+    </codeStyleSettings>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
@@ -234,6 +266,7 @@
     <codeStyleSettings language="kotlin">
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 711ee88a601..4e2b427ce8a 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <option name="myLocal" value="true" />
+    <inspection_tool class="ClassName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <scope name="Tests" level="INFORMATION" enabled="true" />
+    </inspection_tool>
     <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="ignoreSwitchStatementsWithDefault" value="false" />
     </inspection_tool>
diff --git a/build.gradle b/build.gradle
index b7f2e75a37b..73d4d2fb8fd 100644
--- a/build.gradle
+++ b/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"
     }
 }
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
index b6b4aa03924..5d670574062 100644
--- a/config/checkstyle.xml
+++ b/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"/>
diff --git a/libs/login/.idea/codeStyleSettings.xml b/libs/login/.idea/codeStyleSettings.xml
index 9e378a25608..c3f56acf6b1 100644
--- a/libs/login/.idea/codeStyleSettings.xml
+++ b/libs/login/.idea/codeStyleSettings.xml
@@ -47,6 +47,7 @@
           </option>
           <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
           <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+          <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
         </JetCodeStyleSettings>
         <Objective-C-extensions>
           <file>
@@ -264,6 +265,7 @@
         <codeStyleSettings language="kotlin">
           <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
           <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+          <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
         </codeStyleSettings>
       </value>
     </option>
diff --git a/libs/login/.idea/codeStyles/Project.xml b/libs/login/.idea/codeStyles/Project.xml
index 054c27cc8e4..74a2d045891 100644
--- a/libs/login/.idea/codeStyles/Project.xml
+++ b/libs/login/.idea/codeStyles/Project.xml
@@ -7,6 +7,7 @@
       <option name="FIELD_NAME_PREFIX" value="m" />
       <option name="STATIC_FIELD_NAME_PREFIX" value="s" />
       <option name="DO_NOT_WRAP_AFTER_SINGLE_ANNOTATION" value="true" />
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
       <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
@@ -43,6 +44,8 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
+      <option name="IMPORT_NESTED_CLASSES" value="true" />
+      <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
     </JetCodeStyleSettings>
     <Objective-C-extensions>
       <file>
@@ -260,6 +263,7 @@
     <codeStyleSettings language="kotlin">
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/libs/login/.idea/inspectionProfiles/Project_Default.xml b/libs/login/.idea/inspectionProfiles/Project_Default.xml
index 711ee88a601..4e2b427ce8a 100644
--- a/libs/login/.idea/inspectionProfiles/Project_Default.xml
+++ b/libs/login/.idea/inspectionProfiles/Project_Default.xml
@@ -1,7 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
-    <option name="myLocal" value="true" />
+    <inspection_tool class="ClassName" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <scope name="Tests" level="INFORMATION" enabled="true" />
+    </inspection_tool>
     <inspection_tool class="EnumSwitchStatementWhichMissesCases" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="ignoreSwitchStatementsWithDefault" value="false" />
     </inspection_tool>
diff --git a/libs/login/build.gradle b/libs/login/build.gradle
index fa76ab8b7db..c758834bba8 100644
--- a/libs/login/build.gradle
+++ b/libs/login/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.automattic.android:fetchstyle:1.0'
+        classpath 'com.automattic.android:fetchstyle:1.1'
     }
 }
 
diff --git a/libs/login/config/checkstyle.xml b/libs/login/config/checkstyle.xml
index b6b4aa03924..5d670574062 100644
--- a/libs/login/config/checkstyle.xml
+++ b/libs/login/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"/>

From e68433ee8ab4a1daa6c1885c7dcc6fe2c08ed1b4 Mon Sep 17 00:00:00 2001
From: Alex Forcier <alex.forcier@automattic.com>
Date: Tue, 17 Apr 2018 10:27:14 -0400
Subject: [PATCH 2/4] Update inner import checkstyle violations in login
 library

---
 .../org/wordpress/android/login/SignupGoogleFragment.java  | 7 ++++---
 .../wordpress/android/login/SignupMagicLinkFragment.java   | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupGoogleFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupGoogleFragment.java
index 912e67fd626..9ab95b90c3e 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupGoogleFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupGoogleFragment.java
@@ -12,7 +12,8 @@
 import org.greenrobot.eventbus.Subscribe;
 import org.greenrobot.eventbus.ThreadMode;
 import org.wordpress.android.fluxc.generated.AccountActionBuilder;
-import org.wordpress.android.fluxc.store.AccountStore;
+import org.wordpress.android.fluxc.store.AccountStore.OnAuthenticationChanged;
+import org.wordpress.android.fluxc.store.AccountStore.OnSocialChanged;
 import org.wordpress.android.fluxc.store.AccountStore.PushSocialPayload;
 import org.wordpress.android.login.util.SiteUtils;
 import org.wordpress.android.util.AppLog;
@@ -161,7 +162,7 @@ private String removeScaleFromGooglePhotoUrl(String photoUrl) {
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onAuthenticationChanged(AccountStore.OnAuthenticationChanged event) {
+    public void onAuthenticationChanged(OnAuthenticationChanged event) {
         if (event.isError()) {
             AppLog.e(T.API,
                     "SignupGoogleFragment.onAuthenticationChanged: " + event.error.type + " - " + event.error.message);
@@ -178,7 +179,7 @@ public void onAuthenticationChanged(AccountStore.OnAuthenticationChanged event)
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onSocialChanged(AccountStore.OnSocialChanged event) {
+    public void onSocialChanged(OnSocialChanged event) {
         if (event.isError()) {
             AppLog.e(T.API, "SignupGoogleFragment.onSocialChanged: " + event.error.type + " - " + event.error.message);
 
diff --git a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupMagicLinkFragment.java b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupMagicLinkFragment.java
index 103f7a92600..9412b1d19a8 100644
--- a/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupMagicLinkFragment.java
+++ b/libs/login/WordPressLoginFlow/src/main/java/org/wordpress/android/login/SignupMagicLinkFragment.java
@@ -23,7 +23,8 @@
 import org.greenrobot.eventbus.ThreadMode;
 import org.wordpress.android.fluxc.Dispatcher;
 import org.wordpress.android.fluxc.generated.AuthenticationActionBuilder;
-import org.wordpress.android.fluxc.store.AccountStore;
+import org.wordpress.android.fluxc.store.AccountStore.AuthEmailPayload;
+import org.wordpress.android.fluxc.store.AccountStore.OnAuthEmailSent;
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
 import org.wordpress.android.util.NetworkUtils;
@@ -179,7 +180,7 @@ protected void endProgress() {
     protected void sendMagicLinkEmail() {
         if (NetworkUtils.checkConnection(getActivity())) {
             startProgress(getString(R.string.signup_magic_link_progress));
-            AccountStore.AuthEmailPayload authEmailPayload = new AccountStore.AuthEmailPayload(mEmail, true);
+            AuthEmailPayload authEmailPayload = new AuthEmailPayload(mEmail, true);
             mDispatcher.dispatch(AuthenticationActionBuilder.newSendAuthEmailAction(authEmailPayload));
         }
     }
@@ -207,7 +208,7 @@ public void onClick(DialogInterface dialog, int which) {
 
     @SuppressWarnings("unused")
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void onAuthEmailSent(AccountStore.OnAuthEmailSent event) {
+    public void onAuthEmailSent(OnAuthEmailSent event) {
         if (mInProgress) {
             endProgress();
 

From e2d3a94cb8f65844b6e5c3d8e5593a804a238da4 Mon Sep 17 00:00:00 2001
From: Alex Forcier <alex.forcier@automattic.com>
Date: Tue, 17 Apr 2018 10:27:22 -0400
Subject: [PATCH 3/4] Update ktlint to 0.21.0

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 73d4d2fb8fd..ff801f237f8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -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) {

From 6125ad3e74252a8cbb0562bbb31dd533ca97f90a Mon Sep 17 00:00:00 2001
From: Alex Forcier <alex.forcier@automattic.com>
Date: Tue, 17 Apr 2018 10:28:47 -0400
Subject: [PATCH 4/4] Fix new ktlint violations

---
 .../android/ui/base/TopLevelFragment.kt       |  8 +++--
 .../android/ui/base/TopLevelFragmentView.kt   |  8 +++--
 .../android/ui/dashboard/DashboardFragment.kt |  8 +++--
 .../android/ui/login/LoginActivity.kt         | 31 ++++++++++++++-----
 .../android/ui/main/MainPresenter.kt          |  8 ++---
 .../ui/notifications/NotificationsFragment.kt |  8 +++--
 .../android/ui/orders/OrderListFragment.kt    |  8 +++--
 .../android/ui/orders/OrderListPresenter.kt   |  5 +--
 .../widgets/AlignedDividerDecoration.kt       | 12 ++++---
 .../woocommerce/android/widgets/FlowLayout.kt |  6 ++--
 .../widgets/ScrollChildSwipeRefreshLayout.kt  |  6 ++--
 11 files changed, 70 insertions(+), 38 deletions(-)

diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragment.kt
index 0a5370aa7d3..bef1375f699 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragment.kt
+++ b/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)
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragmentView.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragmentView.kt
index 0edeecd0730..916a9e82417 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/base/TopLevelFragmentView.kt
+++ b/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
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardFragment.kt
index c7e7a5a7520..42544f68878 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/DashboardFragment.kt
+++ b/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)
     }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
index d060ddbc2c7..6a00f38c07a 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/LoginActivity.kt
+++ b/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
     }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainPresenter.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainPresenter.kt
index 33de9452295..2016d18e8ee 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainPresenter.kt
+++ b/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
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/notifications/NotificationsFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/notifications/NotificationsFragment.kt
index 00c86288113..6695cf3b6b3 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/notifications/NotificationsFragment.kt
+++ b/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)
     }
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListFragment.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListFragment.kt
index d1dee97a98e..27cbcebd815 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListFragment.kt
+++ b/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 {
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListPresenter.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListPresenter.kt
index 4cd1d532f92..39adb985b08 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/OrderListPresenter.kt
+++ b/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
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/AlignedDividerDecoration.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/AlignedDividerDecoration.kt
index 2e9881c2fc3..49d794a98c9 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/AlignedDividerDecoration.kt
+++ b/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
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/FlowLayout.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/FlowLayout.kt
index 88351bbba9c..26a5bb78249 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/FlowLayout.kt
+++ b/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
 
diff --git a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/ScrollChildSwipeRefreshLayout.kt b/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/ScrollChildSwipeRefreshLayout.kt
index 02ed2daa104..d56a8b93c7e 100644
--- a/WooCommerce/src/main/kotlin/com/woocommerce/android/widgets/ScrollChildSwipeRefreshLayout.kt
+++ b/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