remove useless switch statements (all themes result in the same case)

This commit is contained in:
Helium314 2023-10-19 21:27:33 +02:00
parent ae8335d816
commit 94420f8c51
2 changed files with 28 additions and 98 deletions

View file

@ -72,57 +72,22 @@
</default>
</switch>
<!-- numpadKeyStyle -->
<switch>
<case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
<key-style
latin:styleName="numpadKeyStyle"
latin:keySpec="!icon/numpad_key|!code/key_numpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</case>
<default>
<key-style
latin:styleName="numpadKeyStyle"
latin:keySpec="!icon/numpad_key|!code/key_numpad"
latin:keyLabelFlags="keepBackgroundAspectRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default>
</switch>
<key-style
latin:styleName="numpadKeyStyle"
latin:keySpec="!icon/numpad_key|!code/key_numpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<!-- alphaNumpadKeyStyle -->
<switch>
<case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
<key-style
latin:styleName="alphaNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</case>
<default>
<key-style
latin:styleName="alphaNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
latin:keyLabelFlags="keepBackgroundAspectRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default>
</switch>
<key-style
latin:styleName="alphaNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<!-- symbolNumpadKeyStyle -->
<switch>
<case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
<key-style
latin:styleName="symbolNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
latin:keyActionFlags="noKeyPreview" />
</case>
<default>
<key-style
latin:styleName="symbolNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
latin:keyLabelFlags="keepBackgroundAspectRatio"
latin:keyActionFlags="noKeyPreview" />
</default>
</switch>
<key-style
latin:styleName="symbolNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
latin:keyActionFlags="noKeyPreview" />
<key-style
latin:styleName="deleteKeyStyle"
latin:keySpec="!icon/delete_key|!code/key_delete"

View file

@ -96,57 +96,22 @@
</default>
</switch>
<!-- numpadKeyStyle -->
<switch>
<case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
<key-style
latin:styleName="numpadKeyStyle"
latin:keySpec="!icon/numpad_key|!code/key_numpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</case>
<default>
<key-style
latin:styleName="numpadKeyStyle"
latin:keySpec="!icon/numpad_key|!code/key_numpad"
latin:keyLabelFlags="keepBackgroundAspectRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default>
</switch>
<key-style
latin:styleName="numpadKeyStyle"
latin:keySpec="!icon/numpad_key|!code/key_numpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<!-- alphaNumpadKeyStyle -->
<switch>
<case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
<key-style
latin:styleName="alphaNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</case>
<default>
<key-style
latin:styleName="alphaNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
latin:keyLabelFlags="keepBackgroundAspectRatio"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
</default>
</switch>
<key-style
latin:styleName="alphaNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_alpha|!code/key_alphaNumpad"
latin:keyActionFlags="noKeyPreview"
latin:backgroundType="functional" />
<!-- symbolNumpadKeyStyle -->
<switch>
<case latin:keyboardTheme="HoloBase|LXXBaseBorder|LXXBase">
<key-style
latin:styleName="symbolNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
latin:keyActionFlags="noKeyPreview" />
</case>
<default>
<key-style
latin:styleName="symbolNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
latin:keyLabelFlags="keepBackgroundAspectRatio"
latin:keyActionFlags="noKeyPreview" />
</default>
</switch>
<key-style
latin:styleName="symbolNumpadKeyStyle"
latin:keySpec="!text/keylabel_to_symbol|!code/key_symbolNumpad"
latin:keyActionFlags="noKeyPreview" />
<include
latin:keyboardLayout="@xml/key_styles_enter" />
<!-- TODO: Currently there is no way to specify icon alignment per theme. -->