Tidy up some Kotlin implementation

Test: Existing tests pass
Change-Id: Id24d314798be483ea4682358882539bf9da72e7f

2 files changed, 22 insertions, 22 deletions

diff --git a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt
index 3da4e11e..dccf7398 100644
--- a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt
+++ b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/CustomTextView.kt
@@ -38,22 +38,8 @@ class CustomTextView @JvmOverloads constructor(
 
     private var mEmojiTextViewHelper: EmojiTextViewHelper? = null
 
-    init {
-        emojiTextViewHelper.updateTransformationMethod()
-    }
-
-    override fun setFilters(filters: Array<InputFilter>) {
-        super.setFilters(emojiTextViewHelper.getFilters(filters))
-    }
-
-    override fun setAllCaps(allCaps: Boolean) {
-        super.setAllCaps(allCaps)
-        emojiTextViewHelper.setAllCaps(allCaps)
-    }
-
     /**
      * Returns the [EmojiTextViewHelper] for this TextView.
-
      *
      * This property can be called from super constructors through [#setFilters] or [#setAllCaps].
      */
@@ -65,4 +51,17 @@ class CustomTextView @JvmOverloads constructor(
             return mEmojiTextViewHelper as EmojiTextViewHelper
         }
 
+    init {
+        emojiTextViewHelper.updateTransformationMethod()
+    }
+
+    override fun setFilters(filters: Array<InputFilter>) {
+        super.setFilters(emojiTextViewHelper.getFilters(filters))
+    }
+
+    override fun setAllCaps(allCaps: Boolean) {
+        super.setAllCaps(allCaps)
+        emojiTextViewHelper.setAllCaps(allCaps)
+    }
+
 }
diff --git a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt
index 3f03de08..f51a9455 100644
--- a/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt
+++ b/views/EmojiCompat/kotlinApp/app/src/main/java/com/example/android/emojicompat/EmojiCompatApplication.kt
@@ -29,6 +29,15 @@ import android.util.Log
  */
 class EmojiCompatApplication : Application() {
 
+    companion object {
+
+        private val TAG = "EmojiCompatApplication"
+
+        /** Change this to `false` when you want to use the downloadable Emoji font.  */
+        private val USE_BUNDLED_EMOJI = true
+
+    }
+
     override fun onCreate() {
         super.onCreate()
 
@@ -58,12 +67,4 @@ class EmojiCompatApplication : Application() {
         EmojiCompat.init(config)
     }
 
-    companion object {
-
-        private val TAG = "EmojiCompatApplication"
-
-        /** Change this to `false` when you want to use the downloadable Emoji font.  */
-        private val USE_BUNDLED_EMOJI = true
-    }
-
 }