1
0
Fork 0

* Candidates list no longer covers the application in use

* Changed the candidates list styles to match the application look and feel
This commit is contained in:
Dimo Karaivanov 2022-10-28 15:10:11 +03:00
parent 528ebb123b
commit 0126e3db64
12 changed files with 313 additions and 326 deletions

View file

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<size android:width="1dip" />
<solid android:color="@color/candidate_separator" />
</shape>

View file

@ -1,61 +1,72 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginLeft="0dp"
android:layout_marginTop="0dp"
android:layout_marginRight="0dp"
android:background="@drawable/bggradient"
android:baselineAligned="true"
android:gravity="bottom"
android:orientation="horizontal">
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/main_left"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_weight="3"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:text="⚙"
android:textColor="@color/button_text"
android:textSize="24sp" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/main_suggestions_list"
android:layout_width="fill_parent"
android:layout_height="@dimen/candidate_list_height"
android:orientation="horizontal"
android:scrollbars="none"
android:background="@color/candidate_background" />
<LinearLayout
android:id="@+id/softkey_view"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/bggradient"
android:baselineAligned="true"
android:orientation="horizontal">
<Button
android:id="@+id/main_left"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_weight="3"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:text="⚙"
android:textColor="@color/button_text"
android:textSize="24sp" />
<Button
android:id="@+id/main_mid"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_weight="5"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:text="@string/soft_key_mid"
android:textColor="@color/button_text" />
<Button
android:id="@+id/main_mid"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_weight="5"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:paddingLeft="2dp"
android:paddingRight="2dp"
android:text="@string/soft_key_mid"
android:textColor="@color/button_text" />
<Button
android:id="@+id/main_right"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_weight="3"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:text="⌫"
android:textColor="@color/button_text"
android:textSize="24sp" />
<Button
android:id="@+id/main_right"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginLeft="1px"
android:layout_marginRight="1px"
android:layout_weight="3"
android:background="@drawable/button_custom"
android:clickable="true"
android:focusable="false"
android:longClickable="true"
android:text="⌫"
android:textColor="@color/button_text"
android:textSize="24sp" />
</LinearLayout>
</LinearLayout>

View file

@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/suggestion_list_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/suggestion_list_item"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="@dimen/candidate_padding_horizontal"
android:paddingVertical="@dimen/candidate_padding_vertical"
android:text=""
android:textColor="@color/candidate_color"
android:textSize="@dimen/candidate_font_size" />
</LinearLayout>

View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="candidate_normal">#FF000000</color>
<color name="candidate_recommended">#ffc66ac3</color>
<color name="candidate_other">#ff68f0e9</color>
<color name="candidate_background">#e19185df</color>
<color name="button_text">#FFFFFFFF</color>
<color name="button_text">#EFEBE9</color>
<color name="candidate_background">#333333</color>
<color name="candidate_color">#CCCCCC</color>
<color name="candidate_selected">#555555</color>
<color name="candidate_separator">#888888</color>
</resources>

View file

@ -1,26 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2008, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<dimen name="candidate_list_height">25sp</dimen>
<dimen name="candidate_font_size">17sp</dimen>
<dimen name="candidate_padding_horizontal">6sp</dimen>
<dimen name="candidate_padding_vertical">1sp</dimen>
<dimen name="candidate_font_height">16sp</dimen>
<dimen name="candidate_vertical_padding">6sp</dimen>
<dimen name="soft_key_height">36dp</dimen>
<dimen name="soft_key_icon_size">24sp</dimen>
</resources>