Fixing automirrored icons. (#622)

dessalines · Jan 19, 2024 · ea0d849 · ea0d849
1 parent ae6f4c3
commit ea0d849
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 29 deletions.
diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/CommonKeys.kt
@@ -2,6 +2,10 @@ package com.dessalines.thumbkey.keyboards
 
 import android.view.KeyEvent
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.KeyboardBackspace
+import androidx.compose.material.icons.automirrored.outlined.KeyboardReturn
+import androidx.compose.material.icons.automirrored.outlined.Redo
+import androidx.compose.material.icons.automirrored.outlined.Undo
 import androidx.compose.material.icons.outlined.Abc
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
@@ -10,18 +14,14 @@ import androidx.compose.material.icons.outlined.ContentCut
 import androidx.compose.material.icons.outlined.ContentPaste
 import androidx.compose.material.icons.outlined.Copyright
 import androidx.compose.material.icons.outlined.Keyboard
-import androidx.compose.material.icons.outlined.KeyboardBackspace
 import androidx.compose.material.icons.outlined.KeyboardCapslock
-import androidx.compose.material.icons.outlined.KeyboardReturn
 import androidx.compose.material.icons.outlined.Language
 import androidx.compose.material.icons.outlined.LinearScale
 import androidx.compose.material.icons.outlined.Mic
 import androidx.compose.material.icons.outlined.Mood
 import androidx.compose.material.icons.outlined.Numbers
-import androidx.compose.material.icons.outlined.Redo
 import androidx.compose.material.icons.outlined.SelectAll
 import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.Undo
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -64,13 +64,13 @@ val NUMERIC_KEY_ITEM =
                     ),
                 SwipeDirection.LEFT to
                     KeyC(
-                        display = KeyDisplay.IconDisplay(Icons.Outlined.Undo),
+                        display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.Undo),
                         action = KeyAction.Undo,
                         color = ColorVariant.MUTED,
                     ),
                 SwipeDirection.RIGHT to
                     KeyC(
-                        display = KeyDisplay.IconDisplay(Icons.Outlined.Redo),
+                        display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.Redo),
                         action = KeyAction.Redo,
                         color = ColorVariant.MUTED,
                     ),
@@ -146,7 +146,7 @@ val BACKSPACE_KEY_ITEM =
     KeyItemC(
         center =
             KeyC(
-                display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardBackspace),
+                display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardBackspace),
                 action =
                     KeyAction.SendEvent(
                         KeyEvent(
@@ -311,7 +311,7 @@ val RETURN_KEY_ITEM =
     KeyItemC(
         center =
             KeyC(
-                display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardReturn),
+                display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardReturn),
                 action = KeyAction.IMECompleteAction,
                 size = FontSizeVariant.LARGE,
                 color = ColorVariant.SECONDARY,
@@ -513,7 +513,7 @@ val BACKSPACE_TYPESPLIT_KEY_ITEM =
     KeyItemC(
         center =
             KeyC(
-                display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardBackspace),
+                display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardBackspace),
                 action =
                     KeyAction.SendEvent(
                         KeyEvent(

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammer.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammer.kt
@@ -1,11 +1,11 @@
 package com.dessalines.thumbkey.keyboards
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.KeyboardTab
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
 import androidx.compose.material.icons.outlined.Copyright
 import androidx.compose.material.icons.outlined.KeyboardCapslock
-import androidx.compose.material.icons.outlined.KeyboardTab
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -270,7 +270,7 @@ val KB_EN_THUMBKEY_PROGRAMMER_MAIN =
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardTab),
+                                    display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
                                     action = KeyAction.CommitText("\t"),
                                     color = ColorVariant.MUTED,
                                 ),
@@ -671,7 +671,7 @@ val KB_EN_THUMBKEY_PROGRAMMER_SHIFTED =
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardTab),
+                                    display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
                                     action = KeyAction.CommitText("\t"),
                                     color = ColorVariant.MUTED,
                                 ),

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammerWide.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/ENThumbKeyProgrammerWide.kt
@@ -1,12 +1,12 @@
 package com.dessalines.thumbkey.keyboards
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.KeyboardTab
 import androidx.compose.material.icons.outlined.Abc
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
 import androidx.compose.material.icons.outlined.Copyright
 import androidx.compose.material.icons.outlined.KeyboardCapslock
-import androidx.compose.material.icons.outlined.KeyboardTab
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -273,7 +273,7 @@ val KB_EN_THUMBKEY_PROGRAMMER_WIDE_MAIN =
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardTab),
+                                    display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
                                     action = KeyAction.CommitText("\t"),
                                     color = ColorVariant.MUTED,
                                 ),
@@ -673,7 +673,7 @@ val KB_EN_THUMBKEY_PROGRAMMER_WIDE_SHIFTED =
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardTab),
+                                    display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
                                     action = KeyAction.CommitText("\t"),
                                     color = ColorVariant.MUTED,
                                 ),

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/T9.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/T9.kt
@@ -2,10 +2,10 @@ package com.dessalines.thumbkey.keyboards
 
 import android.view.KeyEvent
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.KeyboardReturn
 import androidx.compose.material.icons.outlined.ContentCopy
 import androidx.compose.material.icons.outlined.ContentCut
 import androidx.compose.material.icons.outlined.ContentPaste
-import androidx.compose.material.icons.outlined.KeyboardReturn
 import androidx.compose.material.icons.outlined.Language
 import androidx.compose.material.icons.outlined.SelectAll
 import androidx.compose.material.icons.outlined.Settings
@@ -636,7 +636,7 @@ val KB_T9_MAIN =
                 KeyItemC(
                     center =
                         KeyC(
-                            display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardReturn),
+                            display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardReturn),
                             action = KeyAction.IMECompleteAction,
                             size = FontSizeVariant.LARGE,
                             color = ColorVariant.SECONDARY,
@@ -1294,7 +1294,7 @@ val KB_T9_SHIFTED =
                 KeyItemC(
                     center =
                         KeyC(
-                            display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardReturn),
+                            display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardReturn),
                             action = KeyAction.IMECompleteAction,
                             size = FontSizeVariant.LARGE,
                             color = ColorVariant.SECONDARY,

diff --git a/app/src/main/java/com/dessalines/thumbkey/keyboards/TRThumbKey.kt b/app/src/main/java/com/dessalines/thumbkey/keyboards/TRThumbKey.kt
@@ -1,11 +1,11 @@
 package com.dessalines.thumbkey.keyboards
 
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.KeyboardTab
 import androidx.compose.material.icons.outlined.ArrowDropDown
 import androidx.compose.material.icons.outlined.ArrowDropUp
 import androidx.compose.material.icons.outlined.Copyright
 import androidx.compose.material.icons.outlined.KeyboardCapslock
-import androidx.compose.material.icons.outlined.KeyboardTab
 import com.dessalines.thumbkey.utils.ColorVariant
 import com.dessalines.thumbkey.utils.FontSizeVariant
 import com.dessalines.thumbkey.utils.KeyAction
@@ -285,7 +285,7 @@ val KB_TR_THUMBKEY_MAIN =
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardTab),
+                                    display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
                                     action = KeyAction.CommitText("\t"),
                                     color = ColorVariant.MUTED,
                                 ),
@@ -715,7 +715,7 @@ val KB_TR_THUMBKEY_SHIFTED =
                                 ),
                             SwipeDirection.RIGHT to
                                 KeyC(
-                                    display = KeyDisplay.IconDisplay(Icons.Outlined.KeyboardTab),
+                                    display = KeyDisplay.IconDisplay(Icons.AutoMirrored.Outlined.KeyboardTab),
                                     action = KeyAction.CommitText("\t"),
                                     color = ColorVariant.MUTED,
                                 ),

diff --git a/app/src/main/java/com/dessalines/thumbkey/ui/components/settings/SettingsActivity.kt b/app/src/main/java/com/dessalines/thumbkey/ui/components/settings/SettingsActivity.kt
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.HelpCenter
+import androidx.compose.material.icons.automirrored.outlined.HelpCenter
 import androidx.compose.material.icons.outlined.Info
 import androidx.compose.material.icons.outlined.InstallMobile
 import androidx.compose.material.icons.outlined.KeyboardAlt
@@ -212,7 +212,7 @@ fun SettingsActivity(
                     title = { Text(userGuideStr) },
                     icon = {
                         Icon(
-                            imageVector = Icons.Outlined.HelpCenter,
+                            imageVector = Icons.AutoMirrored.Outlined.HelpCenter,
                             contentDescription = userGuideStr,
                         )
                     },

diff --git a/app/src/main/java/com/dessalines/thumbkey/ui/components/settings/about/AboutActivity.kt b/app/src/main/java/com/dessalines/thumbkey/ui/components/settings/about/AboutActivity.kt
@@ -6,9 +6,9 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.Chat
 import androidx.compose.material.icons.outlined.AttachMoney
 import androidx.compose.material.icons.outlined.BugReport
-import androidx.compose.material.icons.outlined.Chat
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.NewReleases
 import androidx.compose.material.icons.outlined.TravelExplore
@@ -97,7 +97,7 @@ fun AboutActivity(navController: NavController) {
                     title = { Text(stringResource(R.string.developer_matrix_chatroom)) },
                     icon = {
                         Icon(
-                            imageVector = Icons.Outlined.Chat,
+                            imageVector = Icons.AutoMirrored.Outlined.Chat,
                             contentDescription = stringResource(R.string.developer_matrix_chatroom),
                         )
                     },

diff --git a/...src/main/java/com/dessalines/thumbkey/ui/components/settings/behavior/BehaviorActivity.kt b/...src/main/java/com/dessalines/thumbkey/ui/components/settings/behavior/BehaviorActivity.kt
@@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.Backspace
 import androidx.compose.material.icons.outlined.Abc
-import androidx.compose.material.icons.outlined.Backspace
 import androidx.compose.material.icons.outlined.SpaceBar
 import androidx.compose.material.icons.outlined.SwapHoriz
 import androidx.compose.material.icons.outlined.Swipe
@@ -317,7 +317,7 @@ fun BehaviorActivity(
                     enabled = slideEnabledState.value,
                     icon = {
                         Icon(
-                            imageVector = Icons.Outlined.Backspace,
+                            imageVector = Icons.AutoMirrored.Outlined.Backspace,
                             contentDescription = stringResource(R.string.slide_backspace_deadzone_enable),
                         )
                     },

diff --git a/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt b/app/src/main/java/com/dessalines/thumbkey/utils/Utils.kt
@@ -16,7 +16,7 @@ import android.view.inputmethod.InputMethodInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.ArrowBack
+import androidx.compose.material.icons.automirrored.outlined.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -859,7 +859,7 @@ fun SimpleTopAppBar(
             if (showBack) {
                 IconButton(onClick = { navController.navigate("settings") }) {
                     Icon(
-                        Icons.Outlined.ArrowBack,
+                        Icons.AutoMirrored.Outlined.ArrowBack,
                         contentDescription = stringResource(R.string.settings),
                     )
                 }