wzray/tt9
1
0
Fork 0
Code Activity

updated the Small MainView to use the Material 2 theme

Browse source
This commit is contained in:
sspanak 2025-01-15 12:06:07 +02:00 • committed by Dimo Karaivanov
parent 4b8ccdd2b1
commit b28d4cb458
42 changed files with 358 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/drawable/button_background.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="#989A98"
android:endColor="#E7EBE7"
android:angle="90" />
</shape>

9
app/src/main/res/drawable/button_background_dark.xml
View file

@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- Gradient Bg for button -->
<gradient
android:startColor="#181C18"
android:endColor="#6B6D6B"
android:angle="90" />
</shape>

8
app/src/main/res/drawable/button_separator.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="#686C68"
android:endColor="#B8BCB8"
android:angle="90" />
</shape>

8
app/src/main/res/drawable/button_separator_dark.xml
View file

@ -1,8 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="#2E322E"
android:endColor="#878B87"
android:angle="90" />
</shape>

3
app/src/main/res/drawable/ic_fn_add_word.xml Normal file
View file

@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M480,840Q463,840 451.5,828.5Q440,817 440,800L440,520L160,520Q143,520 131.5,508.5Q120,497 120,480Q120,463 131.5,451.5Q143,440 160,440L440,440L440,160Q440,143 451.5,131.5Q463,120 480,120Q497,120 508.5,131.5Q520,143 520,160L520,440L800,440Q817,440 828.5,451.5Q840,463 840,480Q840,497 828.5,508.5Q817,520 800,520L520,520L520,800Q520,817 508.5,828.5Q497,840 480,840Z"/>
</vector>

3
app/src/main/res/drawable/ic_fn_next_keyboard.xml Normal file
View file

@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M160,880Q127,880 103.5,856.5Q80,833 80,800L80,400Q80,367 103.5,343.5Q127,320 160,320L800,320Q833,320 856.5,343.5Q880,367 880,400L880,800Q880,833 856.5,856.5Q833,880 800,880L160,880ZM160,800L800,800Q800,800 800,800Q800,800 800,800L800,400Q800,400 800,400Q800,400 800,400L160,400Q160,400 160,400Q160,400 160,400L160,800Q160,800 160,800Q160,800 160,800ZM360,760L600,760Q617,760 628.5,748.5Q640,737 640,720Q640,703 628.5,691.5Q617,680 600,680L360,680Q343,680 331.5,691.5Q320,703 320,720Q320,737 331.5,748.5Q343,760 360,760ZM160,800Q160,800 160,800Q160,800 160,800L160,400Q160,400 160,400Q160,400 160,400L160,400Q160,400 160,400Q160,400 160,400L160,800Q160,800 160,800Q160,800 160,800ZM375,160L400,160Q417,160 428.5,171.5Q440,183 440,200Q440,217 428.5,228.5Q417,240 400,240L280,240Q263,240 251.5,228.5Q240,217 240,200L240,80Q240,63 251.5,51.5Q263,40 280,40Q297,40 308.5,51.5Q320,63 320,80L320,101Q352,72 393,56Q434,40 480,40Q560,40 623,87.5Q686,135 709,210Q713,223 702,231.5Q691,240 675,240Q659,240 645,234Q631,228 625,214Q605,172 566.5,146Q528,120 480,120Q450,120 423,130.5Q396,141 375,160ZM240,520Q257,520 268.5,508.5Q280,497 280,480Q280,463 268.5,451.5Q257,440 240,440Q223,440 211.5,451.5Q200,463 200,480Q200,497 211.5,508.5Q223,520 240,520ZM360,520Q377,520 388.5,508.5Q400,497 400,480Q400,463 388.5,451.5Q377,440 360,440Q343,440 331.5,451.5Q320,463 320,480Q320,497 331.5,508.5Q343,520 360,520ZM480,520Q497,520 508.5,508.5Q520,497 520,480Q520,463 508.5,451.5Q497,440 480,440Q463,440 451.5,451.5Q440,463 440,480Q440,497 451.5,508.5Q463,520 480,520ZM600,520Q617,520 628.5,508.5Q640,497 640,480Q640,463 628.5,451.5Q617,440 600,440Q583,440 571.5,451.5Q560,463 560,480Q560,497 571.5,508.5Q583,520 600,520ZM720,520Q737,520 748.5,508.5Q760,497 760,480Q760,463 748.5,451.5Q737,440 720,440Q703,440 691.5,451.5Q680,463 680,480Q680,497 691.5,508.5Q703,520 720,520ZM240,640Q257,640 268.5,628.5Q280,617 280,600Q280,583 268.5,571.5Q257,560 240,560Q223,560 211.5,571.5Q200,583 200,600Q200,617 211.5,628.5Q223,640 240,640ZM360,640Q377,640 388.5,628.5Q400,617 400,600Q400,583 388.5,571.5Q377,560 360,560Q343,560 331.5,571.5Q320,583 320,600Q320,617 331.5,628.5Q343,640 360,640ZM480,640Q497,640 508.5,628.5Q520,617 520,600Q520,583 508.5,571.5Q497,560 480,560Q463,560 451.5,571.5Q440,583 440,600Q440,617 451.5,628.5Q463,640 480,640ZM600,640Q617,640 628.5,628.5Q640,617 640,600Q640,583 628.5,571.5Q617,560 600,560Q583,560 571.5,571.5Q560,583 560,600Q560,617 571.5,628.5Q583,640 600,640ZM680,600Q680,617 691.5,628.5Q703,640 720,640Q737,640 748.5,628.5Q760,617 760,600Q760,583 748.5,571.5Q737,560 720,560Q703,560 691.5,571.5Q680,583 680,600Z"/>
</vector>

3
app/src/main/res/drawable/ic_fn_settings.xml Normal file
View file

@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
</vector>

3
app/src/main/res/drawable/ic_fn_voice.xml Normal file
View file

@ -0,0 +1,3 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
<path android:fillColor="@android:color/white" android:pathData="M12,14c1.66,0 2.99,-1.34 2.99,-3L15,5c0,-1.66 -1.34,-3 -3,-3S9,3.34 9,5v6c0,1.66 1.34,3 3,3zM17.3,11c0,3 -2.54,5.1 -5.3,5.1S6.7,14 6.7,11L5,11c0,3.41 2.72,6.23 6,6.72L11,21h2v-3.28c3.28,-0.48 6,-3.3 6,-6.72h-1.7z"/>
</vector>

12
app/src/main/res/drawable/suggestion_separator.xml
View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<size android:width="1px" />
<solid android:color="@color/candidate_separator" />
</shape>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:top="2dp" android:bottom="2dp"> <!-- padding -->
<shape>
<size android:width="1dp" />
<solid android:color="@color/suggestion_separator" />
</shape>
</item>
</layer-list>

4
app/src/main/res/layout/main_numpad.xml
View file

@ -40,7 +40,7 @@
android:layout_width="@dimen/numpad_arrow_key_width"
android:layout_height="match_parent"
android:text="@string/key_dpad_left"
android:textSize="@dimen/soft_key_icon_size" />
android:textSize="@dimen/main_small_key_icon_size" />
<View
android:id="@+id/separator_candidates_1"
@ -79,7 +79,7 @@
android:layout_width="@dimen/numpad_arrow_key_width"
android:layout_height="match_parent"
android:text="@string/key_dpad_right"
android:textSize="@dimen/soft_key_icon_size" />
android:textSize="@dimen/main_small_key_icon_size" />
</LinearLayout>

23
app/src/main/res/layout/main_small.xml
View file

@ -2,6 +2,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/TTheme.Keyboard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -11,46 +12,34 @@
style="@style/numRowSeparator" />
<FrameLayout
android:layout_width="fill_parent"
android:layout_height="@dimen/candidate_height"
style="@style/TTheme.MainSmall.StatusBar.Wrapper"
android:defaultFocusHighlightEnabled="false"
android:focusable="false"
android:focusableInTouchMode="false">
<TextView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/TTheme.MainSmall.StatusBar.Status"
android:defaultFocusHighlightEnabled="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center"
android:textStyle="italic"
tools:text="@tools:sample/lorem" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/suggestions_bar"
android:layout_width="match_parent"
android:layout_height="match_parent"
style="@style/TTheme.MainSmall.StatusBar.SuggestionList"
android:defaultFocusHighlightEnabled="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center_vertical"
android:orientation="horizontal"
android:scrollbars="none" />
android:focusableInTouchMode="false" />
</FrameLayout>
<View
android:id="@+id/separator_candidates_bottom"
style="@style/numRowSeparator" />
<include
layout="@layout/panel_small_function_keys"
android:id="@+id/main_soft_keys" />
<include
layout="@layout/panel_command_palette"
layout="@layout/panel_small_command_palette"
android:id="@+id/main_command_keys"
android:visibility="gone" />

65
app/src/main/res/layout/panel_command_palette.xml
View file

@ -1,65 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="@layout/main_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_1"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/numpad_key_height"
android:layout_weight="1"
android:textSize="@dimen/soft_key_icon_size" />
<View
android:id="@+id/separator_1_1"
style="@style/numSeparator" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_2"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/numpad_key_height"
android:layout_weight="1"
android:textSize="@dimen/soft_key_icon_size" />
<View
android:id="@+id/separator_1_2"
style="@style/numSeparator" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyF3
android:id="@+id/soft_key_3"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/numpad_key_height"
android:layout_weight="1"
android:textSize="@dimen/soft_key_icon_size" />
<View
android:id="@+id/separator_2_1"
style="@style/numSeparator" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyF5
android:id="@+id/soft_key_5"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/numpad_key_height"
android:layout_weight="1"
android:textSize="@dimen/soft_key_icon_size" />
<View
android:id="@+id/separator_2_2"
style="@style/numSeparator" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_8"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="@dimen/numpad_key_height"
android:layout_weight="1"
android:textSize="@dimen/soft_key_icon_size" />
</LinearLayout>

6
app/src/main/res/layout/panel_numpad.xml
View file

@ -21,7 +21,7 @@
android:layout_height="match_parent"
android:layout_weight="@dimen/numpad_function_key_layout_weight"
android:text="⚙"
android:textSize="@dimen/soft_key_icon_size" />
android:textSize="@dimen/main_small_key_icon_size" />
<View
android:id="@+id/separator_1_1"
@ -46,7 +46,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@dimen/numpad_function_key_layout_weight"
android:textSize="@dimen/soft_key_icon_size" />
android:textSize="@dimen/main_small_key_icon_size" />
</LinearLayout>
@ -63,7 +63,7 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="@dimen/numpad_function_key_layout_weight"
android:textSize="@dimen/soft_key_icon_size" />
android:textSize="@dimen/main_small_key_icon_size" />
<View
android:id="@+id/separator_2_1"

6
app/src/main/res/layout/panel_numpad_text_editing_row_1.xml
View file

@ -8,7 +8,7 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_dpad_left"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
@ -19,7 +19,7 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_select_none"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
@ -30,6 +30,6 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_dpad_right"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
</merge>

6
app/src/main/res/layout/panel_numpad_text_editing_row_2.xml
View file

@ -8,7 +8,7 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_word_back"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
@ -19,7 +19,7 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_select_all"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
@ -30,6 +30,6 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_word_forward"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
</merge>

6
app/src/main/res/layout/panel_numpad_text_editing_row_3.xml
View file

@ -8,7 +8,7 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_cut"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
@ -19,7 +19,7 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_copy"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
@ -31,6 +31,6 @@
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_paste"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size"
android:textSize="@dimen/numpad_text_editing_font_size"
android:visibility="gone" />
</merge>

34
app/src/main/res/layout/panel_small_command_palette.xml Normal file
View file

@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:showIn="@layout/main_small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
style="@style/TTheme.CommandPalette.Key"
android:id="@+id/soft_key_1"
android:drawableBottom="@drawable/ic_fn_settings" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
style="@style/TTheme.CommandPalette.Key"
android:id="@+id/soft_key_2"
android:drawableBottom="@drawable/ic_fn_add_word" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyF3
style="@style/TTheme.CommandPalette.Key"
android:id="@+id/soft_key_3"
android:drawableBottom="@drawable/ic_fn_voice" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyF5
style="@style/TTheme.CommandPalette.Key"
android:id="@+id/soft_key_5"
android:drawableBottom="@drawable/ic_txt_cut" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
style="@style/TTheme.CommandPalette.Key"
android:id="@+id/soft_key_8"
android:drawableBottom="@drawable/ic_fn_next_keyboard" />
</LinearLayout>

35
app/src/main/res/layout/panel_small_function_keys.xml
View file

@ -2,49 +2,28 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
style="@style/TTheme.MainSmall.Wrapper"
tools:ignore="HardcodedText,KeyboardInaccessibleWidget"
tools:showIn="@layout/main_small"
android:layout_width="match_parent"
android:layout_height="@dimen/soft_key_height"
android:baselineAligned="true"
android:orientation="horizontal">
tools:showIn="@layout/main_small">
<io.github.sspanak.tt9.ui.main.keys.SoftKeyCommandPalette
android:id="@+id/soft_key_command_palette"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
style="@style/TTheme.MainSmall.Key"
android:layout_weight="3"
android:focusable="false"
android:text="🛠"
android:textSize="@dimen/soft_key_icon_size" />
<View
android:id="@+id/main_separator_left"
style="@style/hSeparator"
android:background="@drawable/button_separator_dark" />
android:text="☰" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyOk
android:id="@+id/soft_key_ok"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
style="@style/TTheme.MainSmall.Key.OK"
android:layout_weight="5"
android:focusable="false"
android:text="@android:string/ok" />
<View
android:id="@+id/main_separator_right"
style="@style/hSeparator"
android:background="@drawable/button_separator_dark" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyBackspace
android:id="@+id/soft_key_backspace"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
style="@style/TTheme.MainSmall.Key"
android:layout_weight="3"
android:focusable="false"
android:text="⌫"
android:textSize="@dimen/soft_key_icon_size" />
android:text="⌫" />
</LinearLayout>

116
app/src/main/res/layout/panel_small_text_editing.xml
View file

@ -3,130 +3,52 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/numpad_key_height"
style="@style/TTheme.CommandPalette.Wrapper"
tools:showIn="@layout/main_small">
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_101"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_dpad_left"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_1"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_dpad_left" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_102"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_select_none"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_2"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_select_none" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_103"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_dpad_right"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_3"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_dpad_right" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_104"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_word_back"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_4"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_word_back" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_105"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_select_all"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_5"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_select_all" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_106"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_word_forward"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_6"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_word_forward" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_107"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_cut"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_7"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_cut" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_108"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_copy"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
<View
android:id="@+id/separator_10_8"
style="@style/numSeparator" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_copy" />
<io.github.sspanak.tt9.ui.main.keys.SoftKeyFn
android:id="@+id/soft_key_109"
style="@android:style/Widget.Holo.Button.Borderless"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableBottom="@drawable/ic_txt_paste"
android:paddingBottom="@dimen/soft_key_drawable_bottom_padding"
android:textSize="@dimen/soft_key_drawable_title_size" />
style="@style/TTheme.CommandPalette.Key"
android:drawableBottom="@drawable/ic_txt_paste" />
</LinearLayout>

2
app/src/main/res/layout/pref_deletable_word_large.xml
View file

@ -15,7 +15,7 @@
android:paddingEnd="15dp"
android:text="✕"
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.TextView"
android:textSize="@dimen/soft_key_icon_size"
android:textSize="@dimen/main_small_key_icon_size"
tools:ignore="HardcodedText,RtlSymmetry" />
<TextView

10
app/src/main/res/layout/suggestion_list.xml
View file

@ -4,17 +4,13 @@
android:layout_height="match_parent"
android:defaultFocusHighlightEnabled="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:orientation="horizontal">
android:focusableInTouchMode="false">
<TextView
android:id="@+id/suggestion_list_item"
android:layout_width="wrap_content"
android:layout_height="match_parent"
style="@style/TTheme.MainSmall.StatusBar.SuggestionList.Item"
android:defaultFocusHighlightEnabled="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:gravity="center"
android:paddingHorizontal="@dimen/candidate_padding_horizontal"
android:textSize="@dimen/candidate_font_size" />
/>
</LinearLayout>

2
app/src/main/res/layout/suggestion_list_numpad.xml
View file

@ -10,6 +10,6 @@
android:layout_height="match_parent"
android:gravity="center"
android:minWidth="@dimen/numpad_candidate_min_width"
android:paddingHorizontal="@dimen/candidate_padding_horizontal"
android:paddingHorizontal="@dimen/suggestion_padding_horizontal"
android:textSize="@dimen/numpad_candidate_font_size" />
</LinearLayout>

12
app/src/main/res/values-night-v31/styles.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TTheme" parent="Theme.Material3.DynamicColors.Dark">
<item name="preferenceTheme">@style/PreferenceOverlay</item>
<style name="TTheme" parent="Theme.Material3.DynamicColors.Dark" />
<style name="TTheme.Preferences" parent="Theme.Material3.DynamicColors.Dark">
<item name="preferenceTheme">@style/TTheme.PreferenceOverlay</item>
<!-- title bar -->
<item name="tint">@color/material_dynamic_neutral90</item> <!-- back button color -->
@ -15,8 +17,8 @@
<!-- <item name="android:popupMenuStyle">@style/AppDropDownStyle</item> &lt;!&ndash; dropdown background &ndash;&gt;-->
</style>
<style name="PreferenceOverlay" parent="@style/PreferenceThemeOverlay">
<item name="switchPreferenceCompatStyle">@style/AppSwitchStyle</item>
<style name="TTheme.PreferenceOverlay" parent="@style/PreferenceThemeOverlay">
<item name="switchPreferenceCompatStyle">@style/TTheme.Switch</item>
</style>
<!-- <style name="AppDropDownStyle" parent="Widget.AppCompat.ListPopupWindow">-->
@ -24,7 +26,7 @@
<!-- <item name="popupMenuBackground">@color/material_dynamic_neutral_variant30</item>-->
<!-- </style>-->
<style name="AppSwitchStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
<style name="TTheme.Switch" parent="@style/Preference.SwitchPreferenceCompat.Material">
<item name="widgetLayout">@layout/pref_switch_v31</item>
</style>

19
app/src/main/res/values-night/colors.xml Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="keyboard_background">#292e33</color>
<color name="keyboard_text_color">#d4d5d6</color>
<color name="key_num_background">#484c4f</color>
<color name="key_num_color">#fff</color>
<color name="key_num_alternative_color">#b6b7b9</color> <!-- 'hold' functions -->
<color name="key_fn_background">#373c41</color>
<color name="key_fn_alternative_color">#898c8f</color> <!-- 'hold' functions -->
<color name="key_ok_background">#5e97f6</color>
<color name="key_ok_color">#fff</color>
<color name="suggestion_selected_background">#007ACC</color>
<color name="suggestion_selected_color">#fff</color>
<color name="suggestion_separator">#888888</color>
</resources>

14
app/src/main/res/values-night/styles.xml Normal file
View file

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- <style name="TTheme" parent="Theme.AppCompat" />-->
<!-- <style name="TTheme.Colored.Key" parent="TTheme.Key">-->
<!-- <item name="android:textColor">@color/button_text</item>-->
<!-- <item name="android:color">@color/dark_button_color</item>-->
<!-- <item name="android:textColor">@color/dark_button_color</item>-->
<!-- <item name="android:textColorPrimary">@color/dark_button_color</item>-->
<!-- <item name="android:tint">@color/dark_button_color</item>-->
<!-- <item name="tint">@color/dark_button_color</item>-->
<!-- </style>-->
</resources>

12
app/src/main/res/values-v31/styles.xml
View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TTheme" parent="Theme.Material3.DynamicColors.Light">
<item name="preferenceTheme">@style/PreferenceOverlay</item>
<style name="TTheme" parent="Theme.Material3.DynamicColors.Light" />
<style name="TTheme.Preferences" parent="Theme.Material3.DynamicColors.Light">
<item name="preferenceTheme">@style/TTheme.PreferenceOverlay</item>
<!-- title bar -->
<item name="tint">@color/material_dynamic_neutral20</item> <!-- back button color -->
@ -28,11 +30,11 @@
-->
</style>
<style name="PreferenceOverlay" parent="@style/PreferenceThemeOverlay">
<item name="switchPreferenceCompatStyle">@style/AppSwitchStyle</item>
<style name="TTheme.PreferenceOverlay" parent="@style/PreferenceThemeOverlay">
<item name="switchPreferenceCompatStyle">@style/TTheme.Switch</item>
</style>
<style name="AppSwitchStyle" parent="@style/Preference.SwitchPreferenceCompat.Material">
<style name="TTheme.Switch" parent="@style/Preference.SwitchPreferenceCompat.Material">
<item name="widgetLayout">@layout/pref_switch_v31</item>
</style>

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

@ -1,8 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
What colors look good together: https://www.canva.com/colors/color-wheel/
-->
<resources>
<!-- Light theme -->
<color name="button_text">#242424</color>
<color name="keyboard_background">#e8eaed</color>
<color name="keyboard_text_color">#3d3d3f</color>
<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_fn_background">#ccced5</color>
<color name="key_fn_alternative_color">#888</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_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>
@ -12,8 +32,6 @@
<color name="numpad_separator">#CCC</color>
<!-- Dark theme -->
<color name="dark_button_text">#C0C0C0</color>
<color name="dark_candidate_background">#2C2C2C</color>
<color name="dark_candidate_color">#CCCCCC</color>
<color name="dark_candidate_selected">#555555</color>

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

@ -1,18 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="candidate_font_size">18sp</dimen>
<dimen name="candidate_height">26sp</dimen>
<dimen name="candidate_padding_horizontal">6sp</dimen>
<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_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_text_editing_height">65dp</dimen>
<!-- Preferences, default font size -->
<dimen name="preferences_text_min_height">48dp</dimen>
<dimen name="preference_search_height">72dp</dimen>
<dimen name="pref_padding_horizontal">16dp</dimen>
<dimen name="pref_padding_vertical">12dp</dimen>
<dimen name="soft_key_height">44dp</dimen>
<dimen name="soft_key_icon_size">24sp</dimen>
<dimen name="soft_key_drawable_bottom_padding">6dp</dimen>
<dimen name="soft_key_drawable_title_size">12sp</dimen>
<!-- Large font size -->
<!-- Preferences, large font size -->
<dimen name="pref_large_category_padding_top">30dp</dimen>
<dimen name="pref_large_category_padding_bottom">12dp</dimen>
<dimen name="pref_large_padding_horizontal">16dp</dimen>
@ -21,10 +26,6 @@
<dimen name="pref_large_summary_size">19sp</dimen>
<!-- Default font size -->
<dimen name="pref_padding_horizontal">16dp</dimen>
<dimen name="pref_padding_vertical">12dp</dimen>
<!-- Numpad -->
<dimen name="numpad_max_width">10000dp</dimen>
<dimen name="numpad_padding_bottom">6dp</dimen>
@ -37,4 +38,7 @@
<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_text_editing_font_size">17sp</dimen>
<dimen name="soft_key_drawable_bottom_padding">6dp</dimen>
</resources>

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

@ -1,7 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TTheme" parent="Theme.AppCompat.DayNight" />
<style name="TTheme" parent="Theme.MaterialComponents.DayNight" />
<style name="TTheme.Preferences" parent="Theme.AppCompat.DayNight" />
<style name="TTheme.AddWord" parent="Theme.AppCompat.Dialog.Alert">
<item name="windowNoTitle">true</item> <!-- hide some weird floating rectangle above the dialog -->
</style>
<style name="TTheme.Keyboard">
<item name="android:background">@color/keyboard_background</item>
</style>
<!-- status bar -->
<style name="TTheme.MainSmall.StatusBar.Wrapper" parent="">
<item name="android:layout_height">@dimen/status_bar_height</item>
<item name="android:layout_width">match_parent</item>
</style>
<style name="TTheme.MainSmall.StatusBar.Status" parent="">
<item name="android:gravity">center</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:textSize">@dimen/status_bar_font_size</item>
<item name="android:textStyle">italic</item>
<item name="android:textColor">@color/keyboard_text_color</item>
</style>
<style name="TTheme.MainSmall.StatusBar.SuggestionList" parent="">
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">match_parent</item>
<item name="android:orientation">horizontal</item>
<item name="android:scrollbars">none</item>
</style>
<style name="TTheme.MainSmall.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:paddingLeft">@dimen/suggestion_padding_horizontal</item>
<item name="android:paddingRight">@dimen/suggestion_padding_horizontal</item>
<item name="android:textSize">@dimen/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>
<!-- Main Small view (backspace and OK) -->
<style name="TTheme.MainSmall.Wrapper" parent="">
<item name="android:baselineAligned">true</item>
<item name="android:gravity">center</item>
<item name="android:layout_height">@dimen/main_small_key_wrapper_height</item>
<item name="android:layout_width">match_parent</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="TTheme.MainSmall.Key" parent="TTheme.Key">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_marginLeft">6dp</item>
<item name="android:layout_marginRight">6dp</item>
<item name="android:layout_marginTop">1dp</item>
<item name="android:layout_marginBottom">1dp</item>
<item name="android:paddingTop">0dp</item>
<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="backgroundTint">@color/key_num_background</item>
</style>
<style name="TTheme.MainSmall.Key.OK" parent="TTheme.MainSmall.Key">
<item name="android:textColor">@color/key_ok_color</item>
<item name="backgroundTint">@color/key_ok_background</item>
</style>
<!-- Fn keys (command palette or text-editing palette) -->
<style name="TTheme.CommandPalette.Wrapper" parent="">
<item name="android:layout_height">@dimen/main_small_key_text_editing_height</item>
<item name="android:layout_width">match_parent</item>
<item name="android:orientation">horizontal</item>
</style>
<style name="TTheme.CommandPalette.Key" parent="TTheme.MainSmall.Key">
<item name="android:drawablePadding">0dp</item>
<item name="android:layout_marginTop">0dp</item>
<item name="android:layout_marginBottom">0dp</item>
<item name="android:layout_marginLeft">1dp</item>
<item name="android:layout_marginRight">1dp</item>
<item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">2dp</item>
<item name="android:paddingLeft">0dp</item>
<item name="android:paddingRight">0dp</item>
<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>
</style>
<!-- LEGACY -->
<style name="hSeparator">
<item name="android:layout_height">match_parent</item>
<item name="android:layout_width">3dp</item>
@ -20,9 +131,7 @@
<item name="android:layout_marginRight">@dimen/numpad_row_separator_margin</item>
<item name="android:layout_height">1dp</item>
<item name="android:layout_width">match_parent</item>
</style>
<style name="TTheme.AddWord" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="windowNoTitle">true</item> <!-- hide some weird floating rectangle above the dialog -->
<item name="android:background">@color/suggestion_separator</item>
</style>
</resources>