Fullscreens some Settings views.

This commit is contained in:
jahorton 2019-06-26 11:54:55 +07:00
parent f2758f9e70
commit bdc4b98b3d
3 changed files with 79 additions and 67 deletions

View file

@ -41,13 +41,14 @@
android:name="com.tavultesoft.kmea.LanguagesSettingsActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat.Light.Dialog">
android:theme="@style/AppTheme.Base">
</activity>
<activity
android:name="com.tavultesoft.kmea.LanguageSettingsActivity"
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
android:label="@string/app_name"
android:theme="@style/Theme.AppCompat.Light.Dialog">
android:parentActivityName="com.tavultesoft.kmea.LanguagesSettingsActivity"
android:theme="@style/AppTheme.Base">
</activity>
<activity
android:name="com.tavultesoft.kmea.KeyboardSettingsActivity"

View file

@ -1,78 +1,89 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/list_toolbar" />
<!-- ListView of installed keyboards. TODO: calculate height -->
<include layout="@layout/list_layout"
<include
android:id="@+id/keyboard_list_layout"
layout="@layout/list_layout"
android:layout_width="match_parent"
android:layout_height="200dp"
android:layout_below="@id/list_appbar"
android:layout_alignParentBottom="false" />
android:layout_above="@+id/keyboard_linear_layout"
android:layout_below="@id/list_appbar" />
<LinearLayout
android:id="@+id/keyboard_linear_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_below="@id/keyboard_list_layout">
android:layout_above="@id/modeling_settings_layout"
android:orientation="horizontal">
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_gravity="center"/>
android:layout_gravity="center"
android:layout_weight="10" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_button"
style="?android:attr/actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="end|center_vertical"
android:layout_marginTop="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:layout_weight="1"
android:contentDescription="@string/image_button"
android:src="@drawable/ic_add_white"
app:fabSize="normal" />
</LinearLayout>
<View
android:id="@+id/separator"
<LinearLayout
android:id="@+id/modeling_settings_layout"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?attr/colorAccent"
android:layout_below="@+id/keyboard_linear_layout"/>
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
android:orientation="vertical">
<!-- Enable corrections toggle -->
<include
android:id="@+id/corrections_toggle"
layout="@layout/list_row_layout4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/separator" />
<View
android:id="@+id/separator"
android:layout_width="match_parent"
android:layout_height="2dp"
android:background="?attr/colorAccent" />
<include
android:id="@+id/predictions_toggle"
layout="@layout/list_row_layout4"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include
android:id="@+id/corrections_toggle"
layout="@layout/list_row_layout4"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<include
android:id="@+id/model_picker"
layout="@layout/list_row_layout2"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<!-- Enable corrections toggle -->
<!-- Enable predictions toggle -->
<include layout="@layout/list_row_layout4"
android:id="@+id/predictions_toggle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/corrections_toggle"/>
<!-- Model picker -->
<include layout="@layout/list_row_layout2"
android:id="@+id/model_picker"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/predictions_toggle"/>
<!-- Model dictionary -->
<!-- Currently a placeholder

View file

@ -1,44 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<include layout="@layout/list_toolbar" />
<include layout="@layout/list_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/keyboard_list_layout"
android:layout_below="@id/list_appbar"/>
<include
android:id="@+id/keyboard_list_layout"
layout="@layout/list_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/list_appbar" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
<Space
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="10"
android:layout_gravity="center"/>
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="10" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/add_button"
style="?android:attr/actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_gravity="end|center_vertical"
android:layout_marginTop="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:contentDescription="@string/image_button"
android:src="@drawable/ic_add_white"
app:fabSize="normal" />
android:id="@+id/add_button"
style="?android:attr/actionButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end|center_vertical"
android:layout_marginTop="@dimen/fab_margin"
android:layout_marginBottom="@dimen/fab_margin"
android:layout_weight="1"
android:contentDescription="@string/image_button"
android:src="@drawable/ic_add_white"
app:fabSize="normal" />
</LinearLayout>
</RelativeLayout>