wzray/tt9
1
0
Fork 0
Code Activity

updated the Numpad view to use the Material 2 theme

Browse source
This commit is contained in:
sspanak 2025-01-21 21:49:31 +02:00 • committed by Dimo Karaivanov
parent 36932f55f9
commit 6a279838f9
67 changed files with 1235 additions and 954 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/res/values/colors.xml
View file

@ -8,34 +8,15 @@
<color name="key_num_background">#fff</color>
<color name="key_num_color">#333</color>
<color name="key_num_alternative_color">#666</color> <!-- 'hold' functions -->
<color name="key_num_alternative_color">#4d4d4f</color> <!-- 'hold' functions -->
<color name="key_fn_background">#ccced5</color>
<color name="key_fn_alternative_color">#888</color> <!-- 'hold' functions -->
<color name="key_fn_alternative_color">#4e4e50</color> <!-- 'hold' functions -->
<color name="key_ok_background">#1a73e8</color>
<color name="key_ok_color">#fff</color>
<color name="suggestion_selected_background">#8ab5f6</color> <!-- 8ed0fe / 7ecbff / #FFB27E / 73c7ff / 7ecfe2 / 8ac8f1 -->
<color name="suggestion_selected_background">#8cb7f9</color> <!-- 8ed0fe / 7ecbff / #FFB27E / 73c7ff / 7ecfe2 / 8ac8f1 -->
<color name="suggestion_selected_color">#000</color>
<color name="suggestion_separator">#888888</color>
<!-- legacy -->
<!-- Light theme -->
<color name="candidate_background">#D3D3D3</color>
<color name="candidate_color">#202020</color>
<color name="candidate_selected">#B8B8B8</color>
<color name="candidate_separator">#888888</color>
<color name="numpad_background">#E7E7E7</color>
<color name="numpad_separator">#CCC</color>
<!-- Dark theme -->
<color name="dark_candidate_background">#2C2C2C</color>
<color name="dark_candidate_color">#CCCCCC</color>
<color name="dark_candidate_selected">#555555</color>
<color name="dark_numpad_background">#353835</color>
<color name="dark_numpad_separator">#555</color>
</resources>

22
app/src/main/res/values/dimens.xml
View file

@ -2,12 +2,11 @@
<resources>
<dimen name="status_bar_height">26sp</dimen>
<dimen name="status_bar_font_size">16sp</dimen>
<dimen name="suggestion_font_size">18sp</dimen> <!-- for some reason the RecyclerView displays the text smaller than the TextView, so we to make the suggestions slightly bigger than the regular Status Bar text. -->
<dimen name="suggestion_padding_horizontal">6sp</dimen>
<dimen name="main_small_suggestion_font_size">18sp</dimen> <!-- for some reason the RecyclerView displays the text smaller than the TextView, so we to make the suggestions slightly bigger than the regular Status Bar text. -->
<dimen name="main_small_suggestion_padding_horizontal">6sp</dimen>
<dimen name="main_small_key_icon_size">32sp</dimen>
<dimen name="main_small_key_height">44dp</dimen>
<dimen name="main_small_key_wrapper_height">46dp</dimen>
<dimen name="main_small_key_wrapper_height">46dp</dimen> <!-- key height + margin -->
<dimen name="main_small_key_text_editing_height">65dp</dimen>
@ -27,18 +26,19 @@
<!-- Numpad -->
<dimen name="numpad_max_width">10000dp</dimen>
<dimen name="numpad_max_width">9999dp</dimen>
<dimen name="numpad_padding_bottom">6dp</dimen>
<dimen name="numpad_row_separator_margin">0dp</dimen>
<dimen name="numpad_key_height">56dp</dimen>
<dimen name="numpad_arrow_key_width">38dp</dimen>
<dimen name="numpad_function_key_layout_weight">0.675</dimen>
<dimen name="numpad_candidate_font_size">17sp</dimen>
<dimen name="numpad_candidate_height">40dp</dimen>
<dimen name="numpad_candidate_min_width">36dp</dimen>
<dimen name="numpad_key_overlay_z">666dp</dimen>
<dimen name="numpad_key_overlay_small_icon_size">13sp</dimen>
<dimen name="numpad_key_overlay_text_size">11sp</dimen>
<dimen name="numpad_key_overlay_side_text_margin">2dp</dimen>
<dimen name="numpad_text_editing_font_size">17sp</dimen>
<dimen name="soft_key_drawable_bottom_padding">6dp</dimen>
<dimen name="numpad_suggestion_font_size">17sp</dimen>
<dimen name="numpad_suggestion_height">40dp</dimen>
<dimen name="numpad_suggestion_min_width">36dp</dimen>
</resources>

3
app/src/main/res/values/strings.xml
View file

@ -219,14 +219,11 @@
<string name="virtual_numpad_alignment_left">Left</string>
<string name="virtual_numpad_alignment_right">Right</string>
<string name="virtual_key_change_keyboard" translatable="false">Kbd</string>
<string name="virtual_key_command_palette" translatable="false">Cmd</string>
<string name="virtual_key_del" translatable="false">Del</string>
<string name="virtual_key_input_mode" translatable="false">Mode</string>
<string name="virtual_key_settings" translatable="false">Cfg</string>
<string name="virtual_key_shift" translatable="false">Shift</string>
<string name="virtual_key_space_korean">Space (Korean)</string>
<string name="virtual_key_text_editing" translatable="false">Copy</string>
<string name="voice_input_listening">Speak</string>
<string name="voice_input_stopping">Turning off the microphone…</string>

231
app/src/main/res/values/styles.xml
View file

@ -13,6 +13,25 @@
<item name="android:background">@color/keyboard_background</item>
</style>
<style name="TTheme.MainSmall" parent="TTheme.Keyboard">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
</style>
<style name="TTheme.Keyboard.TopSeparator">
<item name="android:layout_margin">0dp</item>
<item name="android:layout_height">1dp</item>
<item name="android:layout_width">match_parent</item>
<item name="android:background">@color/key_fn_background</item>
</style>
<!--*******************************************
Status Bar
*******************************************-->
<!-- status bar -->
<style name="TTheme.MainSmall.StatusBar.Wrapper" parent="">
@ -42,20 +61,16 @@
<item name="android:gravity">center</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:paddingLeft">@dimen/suggestion_padding_horizontal</item>
<item name="android:paddingRight">@dimen/suggestion_padding_horizontal</item>
<item name="android:paddingLeft">@dimen/main_small_suggestion_padding_horizontal</item>
<item name="android:paddingRight">@dimen/main_small_suggestion_padding_horizontal</item>
<item name="android:textSize">@dimen/suggestion_font_size</item>
<item name="android:textSize">@dimen/main_small_suggestion_font_size</item>
</style>
<!-- general purpose key style -->
<style name="TTheme.Key" parent="Widget.MaterialComponents.Button">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
</style>
<!--*******************************************
Small Keys
*******************************************-->
<!-- Main Small view (backspace and OK) -->
<style name="TTheme.MainSmall.Wrapper" parent="">
@ -66,8 +81,10 @@
<item name="android:orientation">horizontal</item>
</style>
<style name="TTheme.MainSmall.Key" parent="TTheme.Key">
<style name="TTheme.MainSmall.Key" parent="Widget.MaterialComponents.Button">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
<item name="android:layout_marginLeft">6dp</item>
<item name="android:layout_marginRight">6dp</item>
<item name="android:layout_marginTop">1dp</item>
@ -77,7 +94,7 @@
<item name="android:paddingBottom">0dp</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
<item name="android:textColor">@color/keyboard_text_color</item>
<item name="android:textColor">@color/key_num_color</item>
<item name="backgroundTint">@color/key_num_background</item>
</style>
@ -107,31 +124,179 @@
<item name="android:textAppearance">@style/TextAppearance.AppCompat</item>
<item name="android:textSize">@dimen/status_bar_font_size</item>
<item name="drawableTint">@color/keyboard_text_color</item>
<item name="android:textColor">@color/key_num_color</item>
<item name="drawableTint">@color/key_num_color</item>
</style>
<!--*******************************************
Numpad
*******************************************-->
<!-- LEGACY -->
<style name="hSeparator">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">3dp</item>
<item name="android:layout_marginBottom">1dp</item>
<item name="android:layout_marginTop">1dp</item>
</style>
<style name="numSeparator">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">1dp</item>
</style>
<style name="numRowSeparator">
<item name="android:layout_marginBottom">@dimen/numpad_row_separator_margin</item>
<item name="android:layout_marginLeft">@dimen/numpad_row_separator_margin</item>
<item name="android:layout_marginRight">@dimen/numpad_row_separator_margin</item>
<item name="android:layout_height">1dp</item>
<!-- Full screen containers -->
<style name="TTheme.Numpad.FullScreenAlignmentContainer" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:background">@color/suggestion_separator</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center_horizontal</item>
</style>
<style name="TTheme.Numpad.FullScreenContainer" parent="">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:maxWidth">@dimen/numpad_max_width</item>
<item name="layout_constraintStart_toStartOf">parent</item>
<item name="layout_constraintTop_toTopOf">parent</item>
</style>
<!-- The keyboard itself -->
<style name="TTheme.Numpad" parent="TTheme.Keyboard">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:orientation">vertical</item>
<item name="layout_constraintEnd_toEndOf">parent</item>
<item name="layout_constraintStart_toStartOf">parent</item>
<item name="layout_constraintTop_toTopOf">parent</item>
<item name="android:paddingBottom">@dimen/numpad_padding_bottom</item>
</style>
<!-- Status Bar -->
<style name="TTheme.Numpad.StatusBar.Wrapper" parent="">
<item name="android:layout_height">@dimen/numpad_suggestion_height</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
</style>
<style name="TTheme.Numpad.StatusBar.SuggestionList.Item" parent="">
<item name="android:gravity">center</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:minWidth">@dimen/numpad_suggestion_min_width</item>
<item name="android:paddingLeft">@dimen/main_small_suggestion_padding_horizontal</item>
<item name="android:paddingRight">@dimen/main_small_suggestion_padding_horizontal</item>
<item name="android:textSize">@dimen/numpad_suggestion_font_size</item>
</style>
<!-- Key Columns -->
<style name="TTheme.Numpad.Column" parent="">
<item name="android:layout_width">0dp</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_weight">1</item>
<item name="android:orientation">vertical</item>
</style>
<style name="TTheme.Numpad.Column.Fn" parent="TTheme.Numpad.Column">
<item name="android:layout_weight">@dimen/numpad_function_key_layout_weight</item>
</style>
<!-- Key Overlay (allows for a central icon and corner labels or icons) -->
<style name="TTheme.Numpad.Key.Overlay.Wrapper" parent="">
<item name="android:layout_height">@dimen/numpad_key_height</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_margin">0dp</item>
<item name="android:padding">0dp</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Icon" parent="">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_centerInParent">true</item>
<item name="android:paddingTop">2dp</item>
<item name="android:translationZ">@dimen/numpad_key_overlay_z</item>
<item name="android:tint">@color/keyboard_text_color</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Element" parent="">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:translationZ">@dimen/numpad_key_overlay_z</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.HoldIcon.Wrapper" parent="TTheme.Numpad.Key.Overlay.Element">
<item name="android:gravity">top|right</item>
<item name="android:paddingRight">3dp</item>
<item name="android:paddingTop">7dp</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.HoldIcon" parent="TTheme.Numpad.Key.Overlay.Element">
<item name="android:layout_height">@dimen/numpad_key_overlay_small_icon_size</item>
<item name="android:layout_width">@dimen/numpad_key_overlay_small_icon_size</item>
<item name="android:tint">@color/key_fn_alternative_color</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Text" parent="TTheme.Numpad.Key.Overlay.Element">
<item name="android:textSize">@dimen/numpad_key_overlay_text_size</item>
<item name="android:textColor">@color/key_fn_alternative_color</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Text.Hold" parent="TTheme.Numpad.Key.Overlay.Text">
<item name="android:gravity">top|right</item>
<item name="android:layout_margin">5dp</item>
</style>
<style name="TTheme.Numpad.Key.Number.Overlay.Text.Hold" parent="TTheme.Numpad.Key.Overlay.Text.Hold">
<item name="android:textColor">@color/key_num_alternative_color</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Text.Top" parent="TTheme.Numpad.Key.Overlay.Text">
<item name="android:gravity">top|center</item>
<item name="android:layout_marginTop">@dimen/numpad_key_overlay_side_text_margin</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Text.Right" parent="TTheme.Numpad.Key.Overlay.Text">
<item name="android:gravity">center|right</item>
<item name="android:layout_marginRight">@dimen/numpad_key_overlay_side_text_margin</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Text.Bottom" parent="TTheme.Numpad.Key.Overlay.Text">
<item name="android:gravity">bottom|center</item>
<item name="android:layout_marginBottom">@dimen/numpad_key_overlay_side_text_margin</item>
</style>
<style name="TTheme.Numpad.Key.Overlay.Text.Left" parent="TTheme.Numpad.Key.Overlay.Text">
<item name="android:gravity">center|left</item>
<item name="android:layout_marginLeft">@dimen/numpad_key_overlay_side_text_margin</item>
</style>
<!-- General Purpose Key -->
<style name="TTheme.Numpad.Key" parent="Widget.MaterialComponents.Button">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/numpad_key_height</item>
<item name="android:layout_marginLeft">3dp</item>
<item name="android:layout_marginRight">3dp</item>
<item name="android:padding">0dp</item>
<item name="android:textAppearance">@style/TextAppearance.AppCompat.Medium</item>
<item name="android:textColor">@color/keyboard_text_color</item>
<item name="backgroundTint">@color/key_fn_background</item>
</style>
<!-- Suggestion arrow keys -->
<style name="TTheme.Numpad.Key.Arrow" parent="TTheme.Numpad.Key">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">@dimen/numpad_arrow_key_width</item>
<item name="android:padding">0dp</item>
</style>
<!-- Keypad keys -->
<style name="TTheme.Numpad.Key.Number" parent="TTheme.Numpad.Key">
<item name="android:textColor">@color/key_num_color</item>
<item name="backgroundTint">@color/key_num_background</item>
</style>
<style name="TTheme.Numpad.Key.OK" parent="TTheme.Numpad.Key">
<item name="android:textColor">@color/key_ok_color</item>
<item name="backgroundTint">@color/key_ok_background</item>
</style>
<style name="TTheme.Numpad.Key.Placeholder">
<item name="android:layout_height">0dp</item>
<item name="android:layout_width">0dp</item>
<item name="android:layout_weight">1</item>
</style>
</resources>