aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/activity_edit_account.xml
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/activity_edit_account.xml191
1 files changed, 128 insertions, 63 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index c803dd20f..e126ade15 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
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:background="@color/grey200">
@@ -10,44 +10,47 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/button_bar"
- android:layout_alignParentTop="true" >
+ android:layout_alignParentTop="true">
<LinearLayout
android:id="@+id/account_main_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:orientation="vertical">
<RelativeLayout
android:id="@+id/editor"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">
+
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avater"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="16dp"
+ android:adjustViewBounds="true"
+ android:background="@drawable/message_border"
+ android:contentDescription="@string/account_image_description"
android:maxHeight="384dp"
android:maxWidth="384dp"
- android:contentDescription="@string/account_image_description"
- app:riv_corner_radius="2dp"
- android:background="@drawable/message_border"
android:padding="1dp"
- android:adjustViewBounds="true"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginBottom="16dp" />
+ app:riv_corner_radius="2dp" />
+
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:layout_below="@+id/avater">
+ android:layout_below="@+id/avater"
+ android:orientation="vertical">
+
<TextView
android:id="@+id/account_jid_label"
android:layout_width="wrap_content"
@@ -84,6 +87,64 @@
android:textColorHint="@color/black54"
android:textSize="?attr/TextSizeBody" />
+ <LinearLayout
+ android:id="@+id/name_port"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:orientation="horizontal"
+ android:weightSum="1">
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0.8"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/textView"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/account_settings_hostname"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
+
+ <EditText
+ android:id="@+id/hostname"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/hostname_or_onion"
+ android:inputType="textNoSuggestions"
+ android:textColor="@color/black87"
+ android:textColorHint="@color/black54"
+ android:textSize="?attr/TextSizeBody" />
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="0.2"
+ android:orientation="vertical">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/account_settings_port"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody" />
+
+ <EditText
+ android:id="@+id/port"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:inputType="number"
+ android:maxLength="5"
+ android:textColor="@color/black87"
+ android:textColorHint="@color/black54"
+ android:textSize="?attr/TextSizeBody" />
+ </LinearLayout>
+ </LinearLayout>
+
<CheckBox
android:id="@+id/account_register_new"
android:layout_width="wrap_content"
@@ -109,10 +170,10 @@
android:layout_marginTop="8dp"
android:hint="@string/confirm_password"
android:inputType="textPassword"
- android:visibility="gone"
android:textColor="@color/black87"
android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody" />
+ android:textSize="?attr/TextSizeBody"
+ android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
@@ -120,19 +181,19 @@
android:id="@+id/stats"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
- android:visibility="gone" >
+ android:visibility="gone">
<TableLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:stretchColumns="1" >
+ android:stretchColumns="1">
<TableRow
android:layout_width="fill_parent"
@@ -153,20 +214,21 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
</TableLayout>
+
<TableLayout
android:id="@+id/server_info_more"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:stretchColumns="1"
- android:visibility="gone" >
+ android:visibility="gone">
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -182,12 +244,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -203,12 +265,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -224,12 +286,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -245,12 +307,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -266,12 +328,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -287,12 +349,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -308,11 +370,12 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
+
<TableRow
android:layout_width="fill_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
@@ -328,14 +391,14 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
</TableLayout>
<RelativeLayout
+ android:id="@+id/otr_fingerprint_box"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:id="@+id/otr_fingerprint_box"
android:layout_marginTop="32dp">
<LinearLayout
@@ -349,17 +412,17 @@
android:id="@+id/otr_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:fontFamily="monospace"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:fontFamily="monospace"/>
+ android:typeface="monospace" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="@string/otr_fingerprint"
android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:text="@string/otr_fingerprint"/>
+ android:textSize="?attr/TextSizeInfo" />
</LinearLayout>
<ImageButton
@@ -369,15 +432,16 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/copy_otr_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
- android:visibility="visible"
- android:contentDescription="@string/copy_otr_clipboard_description"/>
+ android:visibility="visible" />
</RelativeLayout>
+
<RelativeLayout
+ android:id="@+id/axolotl_fingerprint_box"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:id="@+id/axolotl_fingerprint_box"
android:layout_marginTop="32dp">
<LinearLayout
@@ -391,25 +455,25 @@
android:id="@+id/axolotl_fingerprint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:fontFamily="monospace"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:fontFamily="monospace"/>
+ android:typeface="monospace" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="@string/this_device_omemo_fingerprint"
android:textColor="@color/black54"
- android:textSize="?attr/TextSizeInfo"
- android:text="@string/this_device_omemo_fingerprint"/>
+ android:textSize="?attr/TextSizeInfo" />
</LinearLayout>
<LinearLayout
+ android:id="@+id/axolotl_actions"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/axolotl_actions"
- android:layout_centerVertical="true"
android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
android:orientation="vertical">
<ImageButton
@@ -417,31 +481,33 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/copy_omemo_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
- android:visibility="visible"
- android:contentDescription="@string/copy_omemo_clipboard_description"/>
+ android:visibility="visible" />
+
<ImageButton
- android:id="@+id/action_regenerate_omemo_key"
+ android:id="@+id/action_regenerate_axolotl_key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="?android:selectableItemBackground"
+ android:contentDescription="@string/regenerate_omemo_key"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_refresh"
- android:visibility="gone"
- android:contentDescription="@string/regenerate_omemo_key"/>
+ android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
+
<LinearLayout
android:id="@+id/other_device_keys_card"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/activity_vertical_margin"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding"
@@ -451,10 +517,10 @@
android:id="@+id/other_device_keys_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:text="@string/other_devices"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"
- android:text="@string/other_devices"/>
+ android:textStyle="bold" />
<LinearLayout
android:id="@+id/other_device_keys"
@@ -462,8 +528,7 @@
android:layout_height="wrap_content"
android:divider="?android:dividerHorizontal"
android:orientation="vertical"
- android:showDividers="middle" >
- </LinearLayout>
+ android:showDividers="middle"></LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
@@ -473,10 +538,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true" >
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true">
<Button
android:id="@+id/cancel_button"
@@ -505,4 +570,4 @@
android:textColor="@color/black54" />
</LinearLayout>
-</RelativeLayout>
+</RelativeLayout> \ No newline at end of file