Skip to content

Commit 453c92a

Browse files
TomicTomekTomicTomek
committed
[DIM-195] Keyboard with transparent background bar
1 parent a335bb0 commit 453c92a

5 files changed

Lines changed: 130 additions & 28 deletions

File tree

‎leankeykeyboard/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "org.liskovsoft.leankeykeyboard.pro.large"
99
minSdkVersion project.properties.minSdkVersion
1010
targetSdkVersion project.properties.targetSdkVersion
11-
versionCode 81
12-
versionName "4.4.0"
11+
versionCode 82
12+
versionName "4.5.0"
1313

1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515

‎leankeykeyboard/src/main/res/drawable/rounded_corner_shape_10_top_left.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<corners android:topLeftRadius="10dp"/>
5+
<solid android:color="@color/keyboard_background" />
6+
</shape>

‎leankeykeyboard/src/main/res/drawable/rounded_corner_shape_10_top_right.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<corners android:topRightRadius="10dp"/>
5+
<solid android:color="@color/keyboard_background" />
6+
</shape>

‎leankeykeyboard/src/main/res/layout/input_leanback.xml‎

Lines changed: 62 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,68 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- TODO: modified -->
3-
<RelativeLayout android:gravity="bottom" android:focusable="false" android:clipChildren="false" android:layout_width="fill_parent" android:layout_height="wrap_content"
4-
xmlns:android="http://schemas.android.com/apk/res/android"
5-
xmlns:leanbackime="http://schemas.android.com/apk/res-auto">
6-
<LinearLayout android:orientation="horizontal" android:id="@+id/keyboard" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerHorizontal="true">
7-
<com.google.android.leanback.ime.LeanbackKeyboardView android:id="@+id/main_keyboard" android:clipChildren="false" android:layout_width="wrap_content" android:layout_height="wrap_content" leanbackime:rowCount="5" leanbackime:columnCount="11" />
3+
<RelativeLayout
4+
xmlns:android="http://schemas.android.com/apk/res/android"
5+
xmlns:leanbackime="http://schemas.android.com/apk/res-auto"
6+
android:layout_width="fill_parent"
7+
android:layout_height="wrap_content"
8+
android:clipChildren="false"
9+
android:focusable="false"
10+
android:gravity="bottom"
11+
>
12+
13+
<LinearLayout
14+
android:id="@+id/keyboard"
15+
android:background="@drawable/rounded_corner_shape_10_top_left"
16+
android:layout_width="wrap_content"
17+
android:layout_height="wrap_content"
18+
android:layout_centerHorizontal="true"
19+
android:clipChildren="false"
20+
android:orientation="horizontal">
21+
22+
<com.google.android.leanback.ime.LeanbackKeyboardView
23+
android:id="@+id/main_keyboard"
24+
android:layout_width="wrap_content"
25+
android:layout_height="wrap_content"
26+
android:clipChildren="false"
27+
leanbackime:columnCount="11"
28+
leanbackime:rowCount="5" />
829
</LinearLayout>
9-
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_alignTop="@id/keyboard" android:layout_alignBottom="@id/keyboard" android:layout_centerHorizontal="true">
10-
<com.google.android.leanback.ime.voice.RecognizerView android:layout_gravity="center" android:id="@+id/voice" android:visibility="invisible" android:layout_width="@dimen/recognizer_size" android:layout_height="@dimen/recognizer_size" />
30+
31+
<FrameLayout
32+
android:layout_width="fill_parent"
33+
android:layout_height="wrap_content"
34+
android:layout_alignTop="@id/keyboard"
35+
android:layout_alignBottom="@id/keyboard"
36+
android:layout_centerHorizontal="true">
37+
38+
<com.google.android.leanback.ime.voice.RecognizerView
39+
android:id="@+id/voice"
40+
android:layout_width="@dimen/recognizer_size"
41+
android:layout_height="@dimen/recognizer_size"
42+
android:layout_gravity="center"
43+
android:visibility="invisible" />
1144
</FrameLayout>
12-
<FrameLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toRightOf="@id/keyboard" android:layout_alignTop="@id/keyboard" android:layout_alignBottom="@id/keyboard" android:layout_alignParentRight="true">
13-
<Button android:textSize="@dimen/enter_key_font_size" android:textColor="@color/enter_key_font_color" android:layout_gravity="center" android:id="@+id/enter" android:background="@null" android:paddingLeft="@dimen/enter_key_padding_horizontal" android:paddingRight="@dimen/enter_key_padding_horizontal" android:layout_width="wrap_content" android:layout_height="@dimen/enter_key_height" android:text="@string/label_next_key" android:fontFamily="sans-serif-regular" />
45+
46+
<FrameLayout
47+
android:background="@drawable/rounded_corner_shape_10_top_right"
48+
android:layout_width="wrap_content"
49+
android:layout_height="wrap_content"
50+
android:layout_alignTop="@id/keyboard"
51+
android:layout_alignBottom="@id/keyboard"
52+
android:layout_alignParentRight="false"
53+
android:layout_toRightOf="@id/keyboard">
54+
55+
<Button
56+
android:id="@+id/enter"
57+
android:layout_width="wrap_content"
58+
android:layout_height="@dimen/enter_key_height"
59+
android:layout_gravity="center"
60+
android:background="@null"
61+
android:fontFamily="sans-serif-regular"
62+
android:paddingLeft="@dimen/enter_key_padding_horizontal"
63+
android:paddingRight="@dimen/enter_key_padding_horizontal"
64+
android:text="@string/label_next_key"
65+
android:textColor="@color/enter_key_font_color"
66+
android:textSize="@dimen/enter_key_font_size" />
1467
</FrameLayout>
1568
</RelativeLayout>

‎leankeykeyboard/src/main/res/layout/root_leanback.xml‎

Lines changed: 54 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,60 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<RelativeLayout android:gravity="bottom|center" android:layout_gravity="bottom|center" android:orientation="vertical" android:id="@+id/root_ime"
3-
android:background="@color/keyboard_background" android:paddingBottom="@dimen/keyboard_bottom_spacing" android:focusable="true"
4-
android:clipChildren="false" android:clipToPadding="false" android:layout_width="fill_parent" android:layout_height="wrap_content"
5-
xmlns:android="http://schemas.android.com/apk/res/android">
6-
<HorizontalScrollView android:gravity="center" android:id="@+id/suggestions_container" android:scrollbars="none" android:clipChildren="false"
7-
android:layout_width="wrap_content" android:layout_height="@dimen/key_height"
8-
android:layout_marginLeft="@dimen/candidate_scroll_view_horz_spacing"
9-
android:layout_marginRight="@dimen/candidate_scroll_view_horz_spacing" android:fillViewport="false"
10-
android:layout_alignParentTop="true" android:layout_centerHorizontal="true">
11-
<LinearLayout android:gravity="center" android:orientation="horizontal" android:id="@+id/suggestions" android:clipChildren="false"
12-
android:layout_width="wrap_content" android:layout_height="wrap_content" android:divider="@null" android:showDividers="middle"/>
2+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:id="@+id/root_ime"
4+
android:layout_width="fill_parent"
5+
android:layout_height="wrap_content"
6+
android:layout_gravity="bottom|center"
7+
android:background="@android:color/transparent"
8+
android:clipChildren="false"
9+
android:clipToPadding="false"
10+
android:focusable="true"
11+
android:gravity="bottom|center"
12+
android:orientation="vertical"
13+
android:layout_marginBottom="@dimen/keyboard_bottom_spacing">
14+
15+
<HorizontalScrollView
16+
android:id="@+id/suggestions_container"
17+
android:layout_width="wrap_content"
18+
android:layout_height="@dimen/key_height"
19+
android:layout_alignParentTop="true"
20+
android:layout_centerHorizontal="true"
21+
android:layout_marginLeft="@dimen/candidate_scroll_view_horz_spacing"
22+
android:layout_marginRight="@dimen/candidate_scroll_view_horz_spacing"
23+
android:clipChildren="false"
24+
android:fillViewport="false"
25+
android:gravity="center"
26+
android:scrollbars="none">
27+
28+
<LinearLayout
29+
android:id="@+id/suggestions"
30+
android:layout_width="wrap_content"
31+
android:layout_height="wrap_content"
32+
android:clipChildren="false"
33+
android:divider="@null"
34+
android:gravity="center"
35+
android:orientation="horizontal"
36+
android:showDividers="middle" />
1337
</HorizontalScrollView>
1438
<!-- NOTE: moved below HorizontalScrollView because some ids not generated yet -->
15-
<View android:id="@+id/candidate_background" android:background="@color/candidate_background" android:layout_width="wrap_content"
16-
android:layout_height="wrap_content" android:layout_alignBottom="@id/suggestions_container" android:layout_alignParentLeft="true"
17-
android:layout_alignParentTop="true" android:layout_alignParentRight="true"/>
18-
<LinearLayout android:gravity="center" android:id="@+id/keyboard" android:paddingTop="@dimen/keyboard_top_spacing" android:clipChildren="false"
19-
android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_below="@id/suggestions_container"
20-
android:layout_centerHorizontal="true">
39+
<View
40+
android:id="@+id/candidate_background"
41+
android:layout_width="wrap_content"
42+
android:layout_height="wrap_content"
43+
android:layout_alignBottom="@id/suggestions_container"
44+
android:layout_alignParentLeft="true"
45+
android:layout_alignParentTop="true"
46+
android:layout_alignParentRight="true"
47+
android:background="@color/candidate_background" />
48+
49+
<LinearLayout
50+
android:id="@+id/keyboard"
51+
android:layout_width="fill_parent"
52+
android:layout_height="wrap_content"
53+
android:layout_below="@id/suggestions_container"
54+
android:layout_centerHorizontal="true"
55+
android:clipChildren="false"
56+
android:gravity="center"
57+
android:paddingTop="@dimen/keyboard_top_spacing">
2158
<include layout="@layout/input_leanback"/>
2259
</LinearLayout>
2360
<include layout="@layout/selector"/>

0 commit comments

Comments
 (0)