mirror of
https://github.com/moparisthebest/k-9
synced 2024-11-14 05:25:07 -05:00
Made it scrollable for smaller screens.
This commit is contained in:
Sander Bogaert
Andrew Chen
parent
937c6a1280
commit
c39d1b34fe
@ -1,132 +1,179 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="fill_parent"
|
||||||
|
android:layout_height="fill_parent" >
|
||||||
|
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:orientation="vertical" >
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<TableLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:id="@+id/confirm_options"
|
android:id="@+id/confirm_options"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:stretchColumns="3"
|
android:padding="15dp"
|
||||||
android:padding="15dp">
|
android:stretchColumns="3" >
|
||||||
|
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TextView android:layout_column="1"
|
|
||||||
android:textSize="14sp"
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_column="1"
|
||||||
|
android:paddingRight="40dp"
|
||||||
android:text="Type:"
|
android:text="Type:"
|
||||||
android:paddingRight="40dp"/>
|
android:textSize="14sp" />
|
||||||
<Spinner android:id="@+id/spinner_protocol"
|
|
||||||
android:layout_column="2"
|
<Spinner
|
||||||
|
android:id="@+id/spinner_protocol"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_column="2"
|
||||||
android:drawSelectorOnTop="true"
|
android:drawSelectorOnTop="true"
|
||||||
android:prompt="@string/account_setup_basics_email_hint" />
|
android:prompt="@string/account_setup_basics_email_hint" />
|
||||||
<TextView android:layout_column="3"
|
|
||||||
|
<TextView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Extra information"
|
android:layout_column="3"
|
||||||
android:gravity="center_vertical|center_horizontal"/>
|
android:gravity="center_vertical|center_horizontal"
|
||||||
|
android:text="Extra information" />
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
|
||||||
<TableRow>
|
<TableRow>
|
||||||
<TextView android:layout_column="1"
|
|
||||||
android:textSize="16sp"
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_column="1"
|
||||||
|
android:text="Security:"
|
||||||
|
android:textSize="16sp" />
|
||||||
|
|
||||||
|
<Spinner
|
||||||
|
android:id="@+id/spinner_sockettype"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Security:" />
|
|
||||||
<Spinner android:id="@+id/spinner_sockettype"
|
|
||||||
android:layout_column="2"
|
android:layout_column="2"
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:drawSelectorOnTop="true"
|
android:drawSelectorOnTop="true"
|
||||||
android:prompt="@string/account_setup_basics_email_hint" />
|
android:prompt="@string/account_setup_basics_email_hint" />
|
||||||
<TextView android:layout_column="3"
|
|
||||||
|
<TextView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Extra information"
|
android:layout_column="3"
|
||||||
android:gravity="center_vertical|center_horizontal"/>
|
android:gravity="center_vertical|center_horizontal"
|
||||||
|
android:text="Extra information" />
|
||||||
</TableRow>
|
</TableRow>
|
||||||
</TableLayout>
|
</TableLayout>
|
||||||
|
|
||||||
<RelativeLayout android:id="@+id/server_information_header"
|
<RelativeLayout
|
||||||
|
android:id="@+id/server_information_header"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/confirm_options"
|
android:layout_below="@id/confirm_options"
|
||||||
android:layout_marginTop="3dp"
|
android:layout_marginTop="3dp"
|
||||||
|
android:background="#AAA"
|
||||||
android:padding="9dp"
|
android:padding="9dp"
|
||||||
android:textSize="16sp"
|
android:textSize="16sp" >
|
||||||
android:background="#AAA" >
|
|
||||||
<TextView android:text="Server information"
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentLeft="true"/>
|
android:layout_alignParentLeft="true"
|
||||||
<TextView android:id="@+id/server_count_label"
|
android:text="Server information" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/server_count_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentRight="true" />
|
android:layout_alignParentRight="true" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<TextView android:id="@+id/server_information"
|
<TextView
|
||||||
android:paddingLeft="8dp"
|
android:id="@+id/server_information"
|
||||||
android:paddingTop="8dp"
|
|
||||||
android:layout_below="@id/server_information_header"
|
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_below="@id/server_information_header"
|
||||||
|
android:paddingLeft="8dp"
|
||||||
|
android:paddingTop="8dp" />
|
||||||
|
|
||||||
<!-- ONLY SHOW WHEN USER HAS TO ENTER A USERNAME HIMSELF -->
|
<!-- ONLY SHOW WHEN USER HAS TO ENTER A USERNAME HIMSELF -->
|
||||||
<LinearLayout android:id="@+id/account_custom_username"
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/account_custom_username"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:padding="8dp" >
|
android:padding="8dp" >
|
||||||
<TextView android:id="@+id/account_username_label"
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/account_username_label"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="Please enter your username: " />
|
android:text="Please enter your username: " />
|
||||||
<EditText android:id="@+id/account_username_field"
|
|
||||||
android:singleLine="true"
|
<EditText
|
||||||
android:layout_height="wrap_content"
|
android:id="@+id/account_username_field"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="10dp"
|
android:layout_marginBottom="10dp"
|
||||||
android:hint="Username...... " />
|
android:hint="Username...... "
|
||||||
|
android:singleLine="true" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<!-- SHOULD ONLY BE MADE VISIBLE WHEN THERE ARE MULTIPLE MATCHING SERVERS
|
<!--
|
||||||
NOTE: see note at beginning of AbstractSetupConfirmActivity class -->
|
SHOULD ONLY BE MADE VISIBLE WHEN THERE ARE MULTIPLE MATCHING SERVERS
|
||||||
<RelativeLayout android:id="@+id/confirm_serverbrowse_buttons"
|
NOTE: see note at beginning of AbstractSetupConfirmActivity class
|
||||||
|
-->
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/confirm_serverbrowse_buttons"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_below="@id/server_information" >
|
android:layout_below="@id/server_information" >
|
||||||
<Button android:id="@+id/confirm_prev_server_button"
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/confirm_prev_server_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
android:text="Previous" />
|
android:text="Previous" />
|
||||||
<Button android:id="@+id/confirm_next_server_button"
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/confirm_next_server_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
android:layout_toRightOf="@id/confirm_prev_server_button"
|
android:layout_toRightOf="@id/confirm_prev_server_button"
|
||||||
android:text="Next" />
|
android:text="Next" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<!-- SHOULD ONLY BE MADE VISIBLE WHEN THE XML PROVIDES EXTRA INFORMATION LINKS -->
|
<!-- SHOULD ONLY BE MADE VISIBLE WHEN THE XML PROVIDES EXTRA INFORMATION LINKS -->
|
||||||
<RelativeLayout android:id="@+id/confirm_documentation_part"
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/confirm_documentation_part"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_below="@id/confirm_serverbrowse_buttons"
|
||||||
android:layout_below="@id/confirm_serverbrowse_buttons">
|
android:layout_marginTop="8dp" >
|
||||||
<TextView android:id="@+id/server_documentation_header"
|
|
||||||
android:text="Server documentation"
|
<TextView
|
||||||
|
android:id="@+id/server_documentation_header"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="9dp"
|
android:layout_alignParentLeft="true"
|
||||||
android:textSize="14sp"
|
|
||||||
android:background="#AAA"
|
android:background="#AAA"
|
||||||
android:layout_alignParentLeft="true"/>
|
android:padding="9dp"
|
||||||
<TextView android:id="@+id/server_documentation_content"
|
android:text="Server documentation"
|
||||||
|
android:textSize="14sp" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/server_documentation_content"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_below="@id/server_documentation_header"
|
android:layout_below="@id/server_documentation_header"
|
||||||
@ -136,12 +183,16 @@
|
|||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent" >
|
android:layout_height="fill_parent" >
|
||||||
<Button android:id="@+id/confirm_ok_button"
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/confirm_ok_button"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="10dp"
|
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
|
android:layout_centerHorizontal="true"
|
||||||
|
android:layout_marginBottom="10dp"
|
||||||
android:text="Ok go" />
|
android:text="Ok go" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
</ScrollView>
|
||||||
Loading…
Reference in New Issue
Block a user