Commit 153e03a3 authored by Grigory Fedorov's avatar Grigory Fedorov

Add account: scroll view added to layout. (not to hide toolbar on small screens)

parent 202de8e4
...@@ -13,113 +13,114 @@ ...@@ -13,113 +13,114 @@
along with this program. If not, see http://www.gnu.org/licenses/. along with this program. If not, see http://www.gnu.org/licenses/.
--> -->
<LinearLayout <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
android:padding="16dp"
>
<TextView <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:text="@string/account_type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="match_parent"
<Spinner
android:id="@+id/account_type"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="4dip"
android:paddingBottom="8dip"
android:prompt="@string/account_type"
/>
<LinearLayout
android:id="@+id/auth_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:descendantFocusability="beforeDescendants" android:padding="16dp">
android:focusableInTouchMode="true" >
<TextView <TextView
android:text="@string/account_user_name"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
android:text="@string/account_type" />
<EditText <Spinner
android:id="@+id/account_user_name" android:id="@+id/account_type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textEmailAddress" android:paddingBottom="8dip"
android:singleLine="true" android:paddingTop="4dip"
android:text="" android:prompt="@string/account_type"
android:hint=""
/> />
<TextView
android:text="@string/account_password"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<EditText <LinearLayout
android:id="@+id/account_password" android:id="@+id/auth_panel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPassword" android:descendantFocusability="beforeDescendants"
android:singleLine="true" android:focusableInTouchMode="true"
android:text="" android:orientation="vertical">
/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/account_user_name" />
<EditText
android:id="@+id/account_user_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint=""
android:inputType="textEmailAddress"
android:singleLine="true"
android:text="" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/account_password" />
<EditText
android:id="@+id/account_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:text="" />
<CheckBox
android:id="@+id/store_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:checked="true"
android:text="@string/account_store_password" />
</LinearLayout>
<CheckBox <CheckBox
android:id="@+id/store_password" android:id="@+id/use_orbot"
android:layout_width="match_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:checked="true" android:checked="false"
android:text="@string/account_store_password" /> android:text="@string/account_use_orbot" />
</LinearLayout> <CheckBox
android:id="@+id/register_account"
<CheckBox android:layout_width="fill_parent"
android:id="@+id/use_orbot" android:layout_height="wrap_content"
android:layout_width="fill_parent" android:checked="false"
android:layout_height="wrap_content" android:text="@string/account_register" />
android:checked="false"
android:text="@string/account_use_orbot" />
<CheckBox
android:id="@+id/register_account"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:checked="false"
android:text="@string/account_register" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/confirm_password_layout"
android:visibility="gone">
<TextView <LinearLayout
android:text="@string/confirm_password" android:id="@+id/confirm_password_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/confirm_password" />
<EditText
android:id="@+id/confirm_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textPassword"
android:singleLine="true"
android:text="" />
</LinearLayout>
<EditText <TextView
android:id="@+id/confirm_password" android:id="@+id/account_help"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:inputType="textPassword" android:autoLink="all" />
android:singleLine="true"
android:text=""/>
</LinearLayout> </LinearLayout>
</ScrollView>
<TextView
android:id="@+id/account_help"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:autoLink="all"
/>
</LinearLayout>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment