diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-21 16:22:01 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-12-23 12:44:30 -0500 |
| commit | 01107e31ae22d84922742717ad5b7d87581e4096 (patch) | |
| tree | e94f2cc0d58c904a7e748a02c1102f9aa33531b0 /src/main/res/layout/activity_edit_account.xml | |
| parent | 58437b6f0662025092395ead85411d8f26adc3ba (diff) | |
Add more server compatibility info.
Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info'
Diffstat (limited to 'src/main/res/layout/activity_edit_account.xml')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 106 |
1 files changed, 102 insertions, 4 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index ed83cb9a..a12766f9 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/secondarybackground" > @@ -118,7 +119,8 @@ <TableRow android:layout_width="fill_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + tools:ignore="UselessParent"> <TextView android:layout_width="wrap_content" @@ -133,9 +135,18 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + 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" > + <TableRow android:layout_width="fill_parent" android:layout_height="wrap_content" > @@ -153,7 +164,29 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_blocking" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_blocking" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> <TableRow @@ -173,7 +206,29 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_roster_version" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_roster_version" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> <TableRow @@ -193,11 +248,52 @@ android:layout_height="wrap_content" android:layout_gravity="right" android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_mam" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_mam" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> </TableRow> - </TableLayout> + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/server_info_csi" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + <TextView + android:id="@+id/server_info_csi" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded"/> + </TableRow> + </TableLayout> <RelativeLayout android:layout_width="wrap_content" @@ -251,6 +347,8 @@ 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" > @@ -281,4 +379,4 @@ android:textColor="@color/secondarytext" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> |