aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/activity_edit_account.xml
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/layout/activity_edit_account.xml')
-rw-r--r--src/main/res/layout/activity_edit_account.xml109
1 files changed, 65 insertions, 44 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d308b4ce7..d33c72bec 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -1,10 +1,10 @@
<?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="match_parent"
- android:layout_height="match_parent"
- android:background="@color/grey200">
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/grey200">
<ScrollView
android:layout_width="fill_parent"
@@ -29,26 +29,35 @@
android:background="@drawable/infocard_border"
android:orientation="vertical"
android:padding="@dimen/infocard_padding">
+
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/avater"
- android:layout_width="72dp"
- android:layout_height="72dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_marginRight="16dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="16dp"
+ android:adjustViewBounds="true"
+ android:background="@drawable/message_border"
android:contentDescription="@string/account_image_description"
- app:riv_corner_radius="2dp"/>
+ android:maxHeight="384dp"
+ android:maxWidth="384dp"
+ android:padding="1dp"
+ app:riv_corner_radius="5dp" />
+
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_toRightOf="@+id/avater"
+ android:layout_below="@+id/avater"
android:orientation="vertical">
+
<TextView
android:id="@+id/account_jid_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/account_settings_jabber_id"
android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<AutoCompleteTextView
android:id="@+id/account_jid"
@@ -58,7 +67,7 @@
android:inputType="textEmailAddress"
android:textColor="@color/black87"
android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<TextView
android:layout_width="wrap_content"
@@ -66,7 +75,7 @@
android:layout_marginTop="8dp"
android:text="@string/account_settings_password"
android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<EditText
android:id="@+id/account_password"
@@ -76,7 +85,7 @@
android:inputType="textPassword"
android:textColor="@color/black87"
android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<LinearLayout
android:id="@+id/name_port"
@@ -85,18 +94,21 @@
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"/>
+ android:textSize="?attr/TextSizeBody" />
+
<EditText
android:id="@+id/hostname"
android:layout_width="fill_parent"
@@ -105,20 +117,22 @@
android:inputType="textNoSuggestions"
android:textColor="@color/black87"
android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
</LinearLayout>
+
<LinearLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="0.2"
- android:orientation="vertical"
- >
+ 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"/>
+ android:textSize="?attr/TextSizeBody" />
+
<EditText
android:id="@+id/port"
android:layout_width="match_parent"
@@ -127,9 +141,10 @@
android:maxLength="5"
android:textColor="@color/black87"
android:textColorHint="@color/black54"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
</LinearLayout>
</LinearLayout>
+
<CheckBox
android:id="@+id/account_register_new"
android:layout_width="wrap_content"
@@ -137,7 +152,7 @@
android:layout_marginTop="8dp"
android:text="@string/register_account"
android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody" />
<TextView
android:id="@+id/account_confirm_password_desc"
@@ -146,7 +161,7 @@
android:text="@string/account_settings_confirm_password"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- android:visibility="gone"/>
+ android:visibility="gone" />
<EditText
android:id="@+id/account_password_confirm"
@@ -158,7 +173,7 @@
android:textColor="@color/black87"
android:textColorHint="@color/black54"
android:textSize="?attr/TextSizeBody"
- android:visibility="gone"/>
+ android:visibility="gone" />
</LinearLayout>
</RelativeLayout>
@@ -204,7 +219,6 @@
android:text="@string/disable" android:textColor="@color/accent"/>
</RelativeLayout>
-
<LinearLayout
android:id="@+id/stats"
android:layout_width="fill_parent"
@@ -242,10 +256,11 @@
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"
@@ -271,7 +286,7 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
@@ -292,7 +307,7 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
@@ -313,7 +328,7 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
@@ -334,7 +349,7 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
@@ -355,7 +370,7 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
@@ -376,7 +391,7 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
<TableRow
@@ -397,8 +412,9 @@
android:layout_gravity="right"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- tools:ignore="RtlHardcoded"/>
+ tools:ignore="RtlHardcoded" />
</TableRow>
+
<TableRow
android:id="@+id/push_row"
android:layout_width="fill_parent"
@@ -436,7 +452,9 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"/>
+ android:textSize="?attr/TextSizeBody"
+ tools:ignore="RtlHardcoded" />
+
</TableRow>
</TableLayout>
@@ -460,14 +478,15 @@
android:fontFamily="monospace"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- android:typeface="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:textSize="?attr/TextSizeInfo" />
+
</LinearLayout>
<ImageButton
@@ -480,8 +499,9 @@
android:contentDescription="@string/copy_otr_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
- android:visibility="visible"/>
+ android:visibility="visible" />
</RelativeLayout>
+
<RelativeLayout
android:id="@+id/axolotl_fingerprint_box"
android:layout_width="wrap_content"
@@ -502,14 +522,14 @@
android:fontFamily="monospace"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeBody"
- android:typeface="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:textSize="?attr/TextSizeInfo" />
</LinearLayout>
<LinearLayout
@@ -528,20 +548,21 @@
android:contentDescription="@string/copy_omemo_clipboard_description"
android:padding="@dimen/image_button_padding"
android:src="?attr/icon_copy"
- android:visibility="visible"/>
+ android:visibility="visible" />
+
<ImageButton
- android:id="@+id/action_regenerate_axolotl_key"
+ android:id="@+id/action_regenerate_omemo_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:visibility="gone" />
</LinearLayout>
</RelativeLayout>
</LinearLayout>
+
<LinearLayout
android:id="@+id/other_device_keys_card"
android:layout_width="fill_parent"
@@ -562,7 +583,7 @@
android:text="@string/other_devices"
android:textColor="@color/black87"
android:textSize="?attr/TextSizeHeadline"
- android:textStyle="bold"/>
+ android:textStyle="bold" />
<LinearLayout
android:id="@+id/other_device_keys"
@@ -613,4 +634,4 @@
android:textColor="@color/black54"/>
</LinearLayout>
-</RelativeLayout>
+</RelativeLayout> \ No newline at end of file