From c671b8fb399e8868876d5688857f184290f6e5c4 Mon Sep 17 00:00:00 2001
From: Patrick Goldinger <patrick.goldinger@pm.me>
Date: Mon, 20 Apr 2020 16:07:10 +0200
Subject: [PATCH] Move KeyboardMode from .ime.key to .ime.keyboard

---
 .../java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt | 5 +++--
 .../florisboard/ime/{key => keyboard}/KeyboardMode.kt        | 2 +-
 .../dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt | 1 -
 .../dev/patrickgold/florisboard/ime/layout/LayoutData.kt     | 2 +-
 .../dev/patrickgold/florisboard/ime/layout/LayoutManager.kt  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename app/src/main/java/dev/patrickgold/florisboard/ime/{key => keyboard}/KeyboardMode.kt (66%)

diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt
index e82fcd20..9cffb230 100644
--- a/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt
+++ b/app/src/main/java/dev/patrickgold/florisboard/ime/core/FlorisBoard.kt
@@ -12,7 +12,7 @@ import dev.patrickgold.florisboard.ime.key.KeyCode
 import dev.patrickgold.florisboard.ime.key.KeyData
 import dev.patrickgold.florisboard.ime.key.KeyType
 import dev.patrickgold.florisboard.ime.keyboard.KeyboardView
-import dev.patrickgold.florisboard.ime.key.KeyboardMode
+import dev.patrickgold.florisboard.ime.keyboard.KeyboardMode
 import dev.patrickgold.florisboard.ime.layout.LayoutManager
 import java.util.*
 
@@ -20,7 +20,8 @@ class FlorisBoard : InputMethodService() {
 
     private var activeKeyboardMode: KeyboardMode? = null
     private var hasCapsRecentlyChanged: Boolean = false
-    private val keyboardViews = EnumMap<KeyboardMode, KeyboardView>(KeyboardMode::class.java)
+    private val keyboardViews = EnumMap<KeyboardMode, KeyboardView>(
+        KeyboardMode::class.java)
     private val osHandler = Handler()
 
     var caps: Boolean = false
diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyboardMode.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardMode.kt
similarity index 66%
rename from app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyboardMode.kt
rename to app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardMode.kt
index dca4b1eb..1702d003 100644
--- a/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyboardMode.kt
+++ b/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardMode.kt
@@ -1,4 +1,4 @@
-package dev.patrickgold.florisboard.ime.key
+package dev.patrickgold.florisboard.ime.keyboard
 
 enum class KeyboardMode {
     CHARACTERS,
diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt
index 8db4f078..761c459d 100644
--- a/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt
+++ b/app/src/main/java/dev/patrickgold/florisboard/ime/keyboard/KeyboardView.kt
@@ -8,7 +8,6 @@ import com.google.android.flexbox.FlexboxLayout
 import dev.patrickgold.florisboard.R
 import dev.patrickgold.florisboard.ime.core.FlorisBoard
 import dev.patrickgold.florisboard.ime.key.KeyView
-import dev.patrickgold.florisboard.ime.key.KeyboardMode
 import dev.patrickgold.florisboard.ime.layout.ComputedLayoutData
 
 @SuppressLint("ViewConstructor")
diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutData.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutData.kt
index f093ec1c..9b092454 100644
--- a/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutData.kt
+++ b/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutData.kt
@@ -1,7 +1,7 @@
 package dev.patrickgold.florisboard.ime.layout
 
 import dev.patrickgold.florisboard.ime.key.KeyData
-import dev.patrickgold.florisboard.ime.key.KeyboardMode
+import dev.patrickgold.florisboard.ime.keyboard.KeyboardMode
 
 typealias LayoutDataArrangement = List<List<KeyData>>
 data class LayoutData(
diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutManager.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutManager.kt
index b4f9c2f9..457256bf 100644
--- a/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutManager.kt
+++ b/app/src/main/java/dev/patrickgold/florisboard/ime/layout/LayoutManager.kt
@@ -5,7 +5,7 @@ import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import dev.patrickgold.florisboard.ime.key.KeyData
 import dev.patrickgold.florisboard.ime.key.KeyTypeAdapter
-import dev.patrickgold.florisboard.ime.key.KeyboardMode
+import dev.patrickgold.florisboard.ime.keyboard.KeyboardMode
 import java.util.*
 
 class LayoutManager(private val context: Context) {