diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 1260 |
1 files changed, 631 insertions, 629 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 339f2c989..941f584c8 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -1,729 +1,731 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<layout 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="wrap_content" - android:background="@color/grey200"> + xmlns:tools="http://schemas.android.com/tools"> - <ScrollView - android:layout_width="fill_parent" + <RelativeLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_above="@+id/button_bar" - android:layout_alignParentTop="true"> + android:background="?attr/color_background_secondary"> - <LinearLayout - android:id="@+id/account_main_layout" - android:layout_width="match_parent" + <ScrollView + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"> + android:layout_above="@+id/button_bar" + android:layout_alignParentTop="true"> - <RelativeLayout - android:id="@+id/editor" - android:layout_width="fill_parent" + <LinearLayout + android:id="@+id/account_main_layout" + android:layout_width="match_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: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:padding="1dp" - app:riv_corner_radius="5dp" /> + android:orientation="vertical"> - <LinearLayout + <RelativeLayout + android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_below="@+id/avater" - android:orientation="vertical"> - - <android.support.design.widget.TextInputLayout - android:id="@+id/account_jid_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/account_settings_jabber_id"> - - <AutoCompleteTextView - android:id="@+id/account_jid" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:inputType="textEmailAddress" - android:textColor="?attr/color_text_primary" - android:textColorHint="?attr/color_text_secondary" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> + 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:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding"> - <android.support.design.widget.TextInputLayout - android:id="@+id/account_password_layout" - android:layout_width="match_parent" + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/avater" + android:layout_width="wrap_content" android:layout_height="wrap_content" - app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" - app:passwordToggleEnabled="true" - app:passwordToggleTint="?attr/color_text_secondary"> - - <android.support.design.widget.TextInputEditText - android:id="@+id/account_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> + 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:padding="1dp" + app:riv_corner_radius="5dp" /> <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"> + android:layout_below="@+id/avater" + android:orientation="vertical"> - <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.8" - android:orientation="vertical"> + <android.support.design.widget.TextInputLayout + android:id="@+id/account_jid_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/account_settings_jabber_id"> - <android.support.design.widget.TextInputLayout - android:id="@+id/hostname_layout" + <AutoCompleteTextView + android:id="@+id/account_jid" android:layout_width="match_parent" android:layout_height="wrap_content" - android:hint="@string/account_settings_hostname"> + android:imeOptions="actionNext" + android:inputType="textEmailAddress" + android:textColor="?attr/color_text_primary" + android:textColorHint="?attr/color_text_secondary" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> + + <android.support.design.widget.TextInputLayout + android:id="@+id/account_password_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:passwordToggleDrawable="@drawable/visibility_toggle_drawable" + app:passwordToggleEnabled="true" + app:passwordToggleTint="?attr/color_text_secondary"> - <EditText - android:id="@+id/hostname" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:inputType="textNoSuggestions" - android:textColor="?attr/color_text_primary" - android:textColorHint="?attr/color_text_secondary" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> - </LinearLayout> + <android.support.design.widget.TextInputEditText + android:id="@+id/account_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> <LinearLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="0.2" - android:orientation="vertical"> + 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"> - <android.support.design.widget.TextInputLayout - android:id="@+id/port_layout" - android:layout_width="match_parent" + <LinearLayout + android:layout_width="0dp" android:layout_height="match_parent" - android:hint="@string/account_settings_port"> + android:layout_weight="0.8" + android:orientation="vertical"> - <EditText - android:id="@+id/port" + <android.support.design.widget.TextInputLayout + android:id="@+id/hostname_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/account_settings_hostname"> + + <EditText + android:id="@+id/hostname" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:inputType="textNoSuggestions" + android:textColor="?attr/color_text_primary" + android:textColorHint="?attr/color_text_secondary" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="0.2" + android:orientation="vertical"> + + <android.support.design.widget.TextInputLayout + android:id="@+id/port_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:inputType="number" - android:maxLength="5" - android:textColor="?attr/color_text_primary" - android:textColorHint="?attr/color_text_secondary" - android:textSize="?attr/TextSizeBody" /> - </android.support.design.widget.TextInputLayout> + android:hint="@string/account_settings_port"> + + <EditText + android:id="@+id/port" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:inputType="number" + android:maxLength="5" + android:textColor="?attr/color_text_primary" + android:textColorHint="?attr/color_text_secondary" + android:textSize="?attr/TextSizeBody" /> + </android.support.design.widget.TextInputLayout> + </LinearLayout> </LinearLayout> - </LinearLayout> - - <CheckBox - android:id="@+id/account_register_new" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/register_account" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - - <TextView - android:id="@+id/account_confirm_password_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/account_settings_confirm_password" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:visibility="gone" /> - - <EditText - android:id="@+id/account_password_confirm" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:hint="@string/confirm_password" - android:inputType="textPassword" - android:textColor="@color/black87" - android:textColorHint="@color/black54" - android:textSize="?attr/TextSizeBody" - android:visibility="gone" /> - </LinearLayout> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/os_optimization" - 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:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TextView - android:id="@+id/os_optimization_headline" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/battery_optimizations_enabled" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> - - <TextView - android:id="@+id/os_optimization_body" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/os_optimization_headline" - android:layout_marginBottom="8dp" - android:layout_marginTop="8dp" - android:text="@string/battery_optimizations_enabled_explained" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - - <Button - android:id="@+id/os_optimization_disable" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_below="@+id/os_optimization_body" - android:layout_marginRight="-8dp" - android:text="@string/disable" - android:textColor="@color/accent" /> - </RelativeLayout> - - <LinearLayout - 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:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TableLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:shrinkColumns="0" - android:stretchColumns="1"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content" - tools:ignore="UselessParent"> - <TextView + <CheckBox + android:id="@+id/account_register_new" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_session_established" + android:layout_marginTop="8dp" + android:text="@string/register_account" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> <TextView - android:id="@+id/session_est" + android:id="@+id/account_confirm_password_desc" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" + android:text="@string/account_settings_confirm_password" android:textColor="@color/black87" 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:shrinkColumns="0" - android:stretchColumns="1" - android:visibility="gone"> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_pep" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" /> - <TextView - android:id="@+id/server_info_pep" - android:layout_width="wrap_content" + <EditText + android:id="@+id/account_password_confirm" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" + android:layout_marginTop="8dp" + android:hint="@string/confirm_password" + android:inputType="textPassword" android:textColor="@color/black87" + android:textColorHint="@color/black54" 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:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_blocking" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" /> + </LinearLayout> + </RelativeLayout> - <TextView - android:id="@+id/server_info_blocking" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + <RelativeLayout + android:id="@+id/os_optimization" + 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:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TextView + android:id="@+id/os_optimization_headline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/battery_optimizations_enabled" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_stream_management" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TextView + android:id="@+id/os_optimization_body" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/os_optimization_headline" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:text="@string/battery_optimizations_enabled_explained" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TextView - android:id="@+id/server_info_sm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + <Button + android:id="@+id/os_optimization_disable" + style="?android:attr/borderlessButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_below="@+id/os_optimization_body" + android:layout_marginRight="-8dp" + android:text="@string/disable" + android:textColor="@color/accent" /> + </RelativeLayout> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <LinearLayout + 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:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_roster_version" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TableLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="0" + android:stretchColumns="1"> - <TextView - android:id="@+id/server_info_roster_version" - android:layout_width="wrap_content" + <TableRow + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> - - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + tools:ignore="UselessParent"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_carbon_messages" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_session_established" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/session_est" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> - <TextView - android:id="@+id/server_info_carbons" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + </TableLayout> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TableLayout + android:id="@+id/server_info_more" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:shrinkColumns="0" + android:stretchColumns="1" + android:visibility="gone"> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_mam" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> - <TextView - android:id="@+id/server_info_mam" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_pep" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_pep" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + 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:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_blocking" + android:textColor="@color/black87" + 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:paddingLeft="4dp" + android:textColor="@color/black87" + 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:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_stream_management" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_sm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + 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:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_roster_version" + android:textColor="@color/black87" + 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:paddingLeft="4dp" + android:textColor="@color/black87" + 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:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_carbon_messages" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_carbons" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + 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:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_mam" + android:textColor="@color/black87" + 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:paddingLeft="4dp" + android:textColor="@color/black87" + 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:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_csi" + android:textColor="@color/black87" + 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:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + tools:ignore="RtlHardcoded" /> + </TableRow> + + <TableRow + android:id="@+id/push_row" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_push" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_push" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/server_info_http_upload" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/server_info_http_upload" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:paddingLeft="4dp" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + </TableRow> + </TableLayout> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_csi" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <RelativeLayout + android:id="@+id/pgp_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="32dp"> - <TextView - android:id="@+id/server_info_csi" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - tools:ignore="RtlHardcoded" /> - </TableRow> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/action_delete_pgp" + android:orientation="vertical"> - <TableRow - android:id="@+id/push_row" - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TextView + android:id="@+id/pgp_fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="monospace" + android:textColor="@color/primary" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + <TextView + android:id="@+id/pgp_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/openpgp_key_id" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + </LinearLayout> - <TextView + <ImageButton + android:id="@+id/action_delete_pgp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_push" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:alpha="1.0" + android:background="?attr/selectableItemBackgroundBorderless" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_remove" + android:visibility="visible" /> + </RelativeLayout> - <TextView - android:id="@+id/server_info_push" + <RelativeLayout + android:id="@+id/otr_fingerprint_box" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_marginTop="24dp"> + + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - </TableRow> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/action_copy_to_clipboard" + android:orientation="vertical"> - <TableRow - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + <TextView + 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" /> + + <TextView + android:id="@+id/otr_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/otr_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="end" - android:singleLine="true" - android:text="@string/server_info_http_upload" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + </LinearLayout> - <TextView - android:id="@+id/server_info_http_upload" + <ImageButton + android:id="@+id/action_copy_to_clipboard" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:paddingLeft="4dp" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> - - </TableRow> - </TableLayout> - - <RelativeLayout - android:id="@+id/pgp_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="32dp"> + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_otr_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + </RelativeLayout> - <LinearLayout + <RelativeLayout + android:id="@+id/axolotl_fingerprint_box" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/action_delete_pgp" - android:orientation="vertical"> - - <TextView - android:id="@+id/pgp_fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:fontFamily="monospace" - android:textColor="@color/primary" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> + android:layout_height="match_parent" + android:layout_marginTop="24dp"> - <TextView - android:id="@+id/pgp_fingerprint_desc" + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/openpgp_key_id" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> - </LinearLayout> - - <ImageButton - android:id="@+id/action_delete_pgp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:alpha="1.0" - android:background="?attr/selectableItemBackgroundBorderless" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_remove" - android:visibility="visible" /> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/otr_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="24dp"> + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/axolotl_actions" + android:orientation="vertical"> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/action_copy_to_clipboard" - android:orientation="vertical"> + <TextView + 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" /> + + <TextView + android:id="@+id/own_fingerprint_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/omemo_fingerprint" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo" /> + </LinearLayout> - <TextView - android:id="@+id/otr_fingerprint" + <LinearLayout + android:id="@+id/axolotl_actions" 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:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:orientation="vertical"> - <TextView - android:id="@+id/otr_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/otr_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> + <ImageButton + android:id="@+id/action_copy_axolotl_to_clipboard" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_omemo_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + + <ImageButton + android:id="@+id/action_regenerate_omemo_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/regenerate_omemo_key" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_refresh" + android:visibility="gone" /> + </LinearLayout> + </RelativeLayout> + </LinearLayout> - </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:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="@dimen/infocard_padding" + android:visibility="gone"> - <ImageButton - android:id="@+id/action_copy_to_clipboard" + <TextView + android:id="@+id/other_device_keys_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_otr_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> - </RelativeLayout> - - <RelativeLayout - android:id="@+id/axolotl_fingerprint_box" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginTop="24dp"> + android:text="@string/other_devices" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> <LinearLayout - android:layout_width="wrap_content" + android:id="@+id/other_device_keys" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/axolotl_actions" - android:orientation="vertical"> + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:showDividers="middle"></LinearLayout> - <TextView - 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" /> - - <TextView - android:id="@+id/own_fingerprint_desc" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/omemo_fingerprint" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/axolotl_actions" + <Button + android:id="@+id/clear_devices" + style="?android:attr/borderlessButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:orientation="vertical"> - - <ImageButton - android:id="@+id/action_copy_axolotl_to_clipboard" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_omemo_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> - - <ImageButton - android:id="@+id/action_regenerate_omemo_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/regenerate_omemo_key" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_refresh" - android:visibility="gone" /> - </LinearLayout> - </RelativeLayout> + android:layout_gravity="center_horizontal" + android:text="@string/clear_other_devices" + android:textColor="@color/accent" /> + </LinearLayout> </LinearLayout> + </ScrollView> - <LinearLayout - android:id="@+id/other_device_keys_card" - android:layout_width="fill_parent" + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentEnd="true" + android:layout_alignParentLeft="true" + android:layout_alignParentRight="true" + android:layout_alignParentStart="true"> + + <Button + android:id="@+id/cancel_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" 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:background="@drawable/infocard_border" - android:orientation="vertical" - android:padding="@dimen/infocard_padding" - android:visibility="gone"> - - <TextView - 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:layout_weight="1" + android:text="@string/cancel" + android:textColor="@color/black87" /> - <LinearLayout - android:id="@+id/other_device_keys" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:divider="?android:dividerHorizontal" - android:orientation="vertical" - android:showDividers="middle"></LinearLayout> - - <Button - android:id="@+id/clear_devices" - style="?android:attr/borderlessButtonStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:text="@string/clear_other_devices" - android:textColor="@color/accent" /> - </LinearLayout> + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:background="@color/black12" /> + + <Button + android:id="@+id/save_button" + style="?android:attr/borderlessButtonStyle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:enabled="false" + android:text="@string/save" + android:textColor="@color/black54" /> </LinearLayout> - </ScrollView> - - <LinearLayout - android:id="@+id/button_bar" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - android:layout_alignParentStart="true"> - - <Button - android:id="@+id/cancel_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/cancel" - android:textColor="@color/black87" /> - - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:background="@color/black12" /> - - <Button - android:id="@+id/save_button" - style="?android:attr/borderlessButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:enabled="false" - android:text="@string/save" - android:textColor="@color/black54" /> - </LinearLayout> - -</RelativeLayout>
\ No newline at end of file + </RelativeLayout> +</layout>
\ No newline at end of file |