2014-10-22 16:38:44 +00:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
2018-02-17 06:09:21 +00:00
|
|
|
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="?attr/color_background_secondary">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<ScrollView
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_above="@+id/button_bar"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_alignParentTop="true">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<LinearLayout
|
2015-10-25 23:59:32 +00:00
|
|
|
android:id="@+id/account_main_layout"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:orientation="vertical">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
2014-11-04 16:38:41 +00:00
|
|
|
<RelativeLayout
|
2014-10-22 16:38:44 +00:00
|
|
|
android:id="@+id/editor"
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_marginBottom="@dimen/activity_vertical_margin"
|
2015-01-13 10:52:41 +00:00
|
|
|
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
|
|
|
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
|
|
|
android:layout_marginTop="@dimen/activity_vertical_margin"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:background="?attr/infocard_border"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:orientation="vertical"
|
2015-01-13 10:52:41 +00:00
|
|
|
android:padding="@dimen/infocard_padding">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2015-07-21 00:21:34 +00:00
|
|
|
<com.makeramen.roundedimageview.RoundedImageView
|
|
|
|
android:id="@+id/avater"
|
2014-11-04 16:38:41 +00:00
|
|
|
android:layout_width="72dp"
|
|
|
|
android:layout_height="72dp"
|
|
|
|
android:layout_alignParentTop="true"
|
2014-11-29 12:58:18 +00:00
|
|
|
android:layout_marginRight="16dp"
|
2015-07-21 00:21:34 +00:00
|
|
|
android:contentDescription="@string/account_image_description"
|
2018-02-17 06:09:21 +00:00
|
|
|
app:riv_corner_radius="2dp" />
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2014-11-04 16:38:41 +00:00
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_toRightOf="@+id/avater"
|
|
|
|
android:orientation="vertical">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2018-02-17 06:09:21 +00:00
|
|
|
<android.support.design.widget.TextInputLayout
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2018-02-17 06:09:21 +00:00
|
|
|
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>
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
|
2018-02-17 06:09:21 +00:00
|
|
|
<android.support.design.widget.TextInputLayout
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_width="match_parent"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:layout_height="wrap_content"
|
|
|
|
app:passwordToggleDrawable="@drawable/visibility_toggle_drawable"
|
|
|
|
app:passwordToggleEnabled="true"
|
|
|
|
app:passwordToggleTint="?attr/color_text_secondary">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2018-02-17 06:09:21 +00:00
|
|
|
<android.support.design.widget.TextInputEditText
|
2017-12-14 18:28:52 +00:00
|
|
|
android:id="@+id/account_password"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentTop="true"
|
|
|
|
android:hint="@string/password"
|
|
|
|
android:inputType="textPassword"
|
|
|
|
android:textColor="?attr/color_text_primary"
|
|
|
|
android:textColorHint="?attr/color_text_secondary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
|
|
|
</android.support.design.widget.TextInputLayout>
|
2014-10-22 16:38:44 +00:00
|
|
|
|
2015-11-28 19:11:38 +00:00
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/name_port"
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_marginTop="8dp"
|
|
|
|
android:orientation="horizontal"
|
2015-11-28 19:11:38 +00:00
|
|
|
android:weightSum="1">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2015-11-28 19:11:38 +00:00
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="0dp"
|
|
|
|
android:layout_height="match_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_weight="0.8"
|
|
|
|
android:orientation="vertical">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2018-02-17 06:09:21 +00:00
|
|
|
<android.support.design.widget.TextInputLayout
|
|
|
|
android:layout_width="match_parent"
|
2015-11-28 19:11:38 +00:00
|
|
|
android:layout_height="wrap_content"
|
2018-02-17 06:09:21 +00:00
|
|
|
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>
|
2015-11-28 19:11:38 +00:00
|
|
|
</LinearLayout>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2015-11-28 19:11:38 +00:00
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="0dp"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:layout_weight="0.2"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:orientation="vertical">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2018-02-17 06:09:21 +00:00
|
|
|
<android.support.design.widget.TextInputLayout
|
2015-11-28 19:11:38 +00:00
|
|
|
android:layout_width="match_parent"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:layout_height="wrap_content"
|
|
|
|
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>
|
2015-11-28 19:11:38 +00:00
|
|
|
</LinearLayout>
|
|
|
|
</LinearLayout>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2015-11-28 19:11:38 +00:00
|
|
|
<CheckBox
|
2016-01-11 10:17:45 +00:00
|
|
|
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"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2016-01-11 10:17:45 +00:00
|
|
|
</LinearLayout>
|
|
|
|
</RelativeLayout>
|
|
|
|
|
|
|
|
<RelativeLayout
|
2016-11-07 09:49:43 +00:00
|
|
|
android:id="@+id/os_optimization"
|
2016-01-11 10:17:45 +00:00
|
|
|
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"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:background="?attr/infocard_border"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:orientation="vertical"
|
|
|
|
android:padding="@dimen/infocard_padding"
|
|
|
|
android:visibility="gone">
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2014-10-22 16:38:44 +00:00
|
|
|
<TextView
|
2016-11-07 09:49:43 +00:00
|
|
|
android:id="@+id/os_optimization_headline"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:text="@string/battery_optimizations_enabled"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:textSize="?attr/TextSizeHeadline"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textStyle="bold" />
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2016-01-11 10:17:45 +00:00
|
|
|
<TextView
|
2016-11-07 09:49:43 +00:00
|
|
|
android:id="@+id/os_optimization_body"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_width="wrap_content"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_height="wrap_content"
|
2016-11-07 09:49:43 +00:00
|
|
|
android:layout_below="@+id/os_optimization_headline"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_marginBottom="8dp"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_marginTop="8dp"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:text="@string/battery_optimizations_enabled_explained"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2016-01-11 10:17:45 +00:00
|
|
|
<Button
|
2016-11-07 09:49:43 +00:00
|
|
|
android:id="@+id/os_optimization_disable"
|
2016-01-11 10:17:45 +00:00
|
|
|
style="?android:attr/borderlessButtonStyle"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentBottom="true"
|
|
|
|
android:layout_alignParentEnd="true"
|
2016-11-07 09:49:43 +00:00
|
|
|
android:layout_alignParentRight="true"
|
|
|
|
android:layout_below="@+id/os_optimization_body"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:layout_marginRight="-8dp"
|
2016-11-07 09:49:43 +00:00
|
|
|
android:text="@string/disable"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textColor="@color/accent" />
|
2014-11-04 16:38:41 +00:00
|
|
|
</RelativeLayout>
|
2014-10-22 16:38:44 +00:00
|
|
|
|
2016-01-11 10:17:45 +00:00
|
|
|
|
|
|
|
<LinearLayout
|
2014-10-22 16:38:44 +00:00
|
|
|
android:id="@+id/stats"
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_marginBottom="@dimen/activity_vertical_margin"
|
2015-01-13 10:52:41 +00:00
|
|
|
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
|
|
|
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
|
|
|
android:layout_marginTop="@dimen/activity_vertical_margin"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:background="?attr/infocard_border"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:orientation="vertical"
|
2015-01-13 10:52:41 +00:00
|
|
|
android:padding="@dimen/infocard_padding"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:visibility="gone">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TableLayout
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:shrinkColumns="0"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:stretchColumns="1">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:layout_height="wrap_content"
|
|
|
|
tools:ignore="UselessParent">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:text="@string/server_info_session_established"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/session_est"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-22 16:38:44 +00:00
|
|
|
</TableRow>
|
|
|
|
|
2014-10-21 20:22:01 +00:00
|
|
|
</TableLayout>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2014-10-21 20:22:01 +00:00
|
|
|
<TableLayout
|
|
|
|
android:id="@+id/server_info_more"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:shrinkColumns="0"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:stretchColumns="1"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:visibility="gone">
|
2014-10-21 20:22:01 +00:00
|
|
|
|
2014-10-22 16:38:44 +00:00
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:text="@string/server_info_pep"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_pep"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-21 20:22:01 +00:00
|
|
|
</TableRow>
|
|
|
|
|
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:text="@string/server_info_blocking"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_blocking"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-22 16:38:44 +00:00
|
|
|
</TableRow>
|
|
|
|
|
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:text="@string/server_info_stream_management"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_sm"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-21 20:22:01 +00:00
|
|
|
</TableRow>
|
|
|
|
|
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:text="@string/server_info_roster_version"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_roster_version"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-22 16:38:44 +00:00
|
|
|
</TableRow>
|
|
|
|
|
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:text="@string/server_info_carbon_messages"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_carbons"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-21 20:22:01 +00:00
|
|
|
</TableRow>
|
|
|
|
|
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:text="@string/server_info_mam"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_mam"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-22 16:38:44 +00:00
|
|
|
</TableRow>
|
|
|
|
|
2014-10-21 20:22:01 +00:00
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2014-10-21 20:22:01 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:text="@string/server_info_csi"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
2014-10-21 20:22:01 +00:00
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_csi"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
tools:ignore="RtlHardcoded" />
|
2014-10-21 20:22:01 +00:00
|
|
|
</TableRow>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2016-02-12 10:39:27 +00:00
|
|
|
<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"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2016-02-12 10:39:27 +00:00
|
|
|
android:text="@string/server_info_push"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2016-02-12 10:39:27 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_push"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2016-02-12 10:39:27 +00:00
|
|
|
</TableRow>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2015-08-14 20:24:05 +00:00
|
|
|
<TableRow
|
|
|
|
android:layout_width="fill_parent"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_height="wrap_content">
|
2015-08-14 20:24:05 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:ellipsize="end"
|
|
|
|
android:singleLine="true"
|
2015-08-14 20:24:05 +00:00
|
|
|
android:text="@string/server_info_http_upload"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2015-08-14 20:24:05 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/server_info_http_upload"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="right"
|
2016-09-19 23:18:50 +00:00
|
|
|
android:paddingLeft="4dp"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeBody" />
|
2015-08-14 20:24:05 +00:00
|
|
|
</TableRow>
|
2014-10-21 20:22:01 +00:00
|
|
|
</TableLayout>
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<RelativeLayout
|
2017-05-04 11:02:46 +00:00
|
|
|
android:id="@+id/pgp_fingerprint_box"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:layout_marginTop="32dp">
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentLeft="true"
|
2017-05-04 11:02:46 +00:00
|
|
|
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="?attr/color_text_primary"
|
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:typeface="monospace" />
|
2017-05-04 11:02:46 +00:00
|
|
|
|
|
|
|
<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="?attr/color_text_secondary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeInfo" />
|
2017-05-04 11:02:46 +00:00
|
|
|
</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"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:alpha="?attr/icon_alpha"
|
2018-02-17 21:53:54 +00:00
|
|
|
android:background="?attr/selectableItemBackgroundBorderless"
|
2017-05-04 11:02:46 +00:00
|
|
|
android:padding="@dimen/image_button_padding"
|
|
|
|
android:src="?attr/icon_remove"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:visibility="visible" />
|
2017-05-04 11:02:46 +00:00
|
|
|
</RelativeLayout>
|
|
|
|
|
|
|
|
<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_alignParentLeft="true"
|
|
|
|
android:layout_centerVertical="true"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_toLeftOf="@+id/action_copy_to_clipboard"
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/otr_fingerprint"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:fontFamily="monospace"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:typeface="monospace" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<TextView
|
2017-05-04 11:02:46 +00:00
|
|
|
android:id="@+id/otr_fingerprint_desc"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:text="@string/otr_fingerprint"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_secondary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeInfo" />
|
2014-10-22 16:38:44 +00:00
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<ImageButton
|
|
|
|
android:id="@+id/action_copy_to_clipboard"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentRight="true"
|
|
|
|
android:layout_centerVertical="true"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:alpha="?attr/icon_alpha"
|
2018-02-17 21:53:54 +00:00
|
|
|
android:background="?attr/selectableItemBackgroundBorderless"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:contentDescription="@string/copy_otr_clipboard_description"
|
2015-04-28 12:46:52 +00:00
|
|
|
android:padding="@dimen/image_button_padding"
|
2015-01-22 04:00:35 +00:00
|
|
|
android:src="?attr/icon_copy"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:visibility="visible" />
|
2016-01-11 10:17:45 +00:00
|
|
|
</RelativeLayout>
|
2018-02-17 06:09:21 +00:00
|
|
|
|
2016-01-11 10:17:45 +00:00
|
|
|
<RelativeLayout
|
|
|
|
android:id="@+id/axolotl_fingerprint_box"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="match_parent"
|
2017-05-04 11:02:46 +00:00
|
|
|
android:layout_marginTop="24dp">
|
2016-01-11 10:17:45 +00:00
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentLeft="true"
|
2017-05-04 11:02:46 +00:00
|
|
|
android:layout_centerVertical="true"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_toLeftOf="@+id/axolotl_actions"
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/axolotl_fingerprint"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:fontFamily="monospace"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:textSize="?attr/TextSizeBody"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:typeface="monospace" />
|
2016-01-11 10:17:45 +00:00
|
|
|
|
|
|
|
<TextView
|
2016-07-17 18:31:04 +00:00
|
|
|
android:id="@+id/own_fingerprint_desc"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-08-28 16:15:39 +00:00
|
|
|
android:text="@string/omemo_fingerprint"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_secondary"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textSize="?attr/TextSizeInfo" />
|
2016-01-11 10:17:45 +00:00
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/axolotl_actions"
|
|
|
|
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"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:alpha="?attr/icon_alpha"
|
2018-02-17 21:53:54 +00:00
|
|
|
android:background="?attr/selectableItemBackgroundBorderless"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:contentDescription="@string/copy_omemo_clipboard_description"
|
|
|
|
android:padding="@dimen/image_button_padding"
|
|
|
|
android:src="?attr/icon_copy"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:visibility="visible" />
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2016-01-11 10:17:45 +00:00
|
|
|
<ImageButton
|
|
|
|
android:id="@+id/action_regenerate_axolotl_key"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:alpha="?attr/icon_alpha"
|
2018-02-17 21:53:54 +00:00
|
|
|
android:background="?attr/selectableItemBackgroundBorderless"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:contentDescription="@string/regenerate_omemo_key"
|
|
|
|
android:padding="@dimen/image_button_padding"
|
|
|
|
android:src="?attr/icon_refresh"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:visibility="gone" />
|
2016-01-11 10:17:45 +00:00
|
|
|
|
|
|
|
</LinearLayout>
|
2014-10-22 16:38:44 +00:00
|
|
|
</RelativeLayout>
|
|
|
|
</LinearLayout>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2015-07-19 12:09:49 +00:00
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/other_device_keys_card"
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_marginBottom="@dimen/activity_vertical_margin"
|
2015-07-19 12:09:49 +00:00
|
|
|
android:layout_marginLeft="@dimen/activity_horizontal_margin"
|
|
|
|
android:layout_marginRight="@dimen/activity_horizontal_margin"
|
|
|
|
android:layout_marginTop="@dimen/activity_vertical_margin"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:background="?attr/infocard_border"
|
2015-07-19 12:09:49 +00:00
|
|
|
android:orientation="vertical"
|
|
|
|
android:padding="@dimen/infocard_padding"
|
2016-11-19 20:32:40 +00:00
|
|
|
android:visibility="gone">
|
2015-07-19 12:09:49 +00:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/other_device_keys_title"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:text="@string/other_devices"
|
Dark theme, theme switch, icons, style, strings
added some white icons,
changed hardcoded icons to theme attributes,
changed icon_edit_dark to icon_edit_body to reflect icons position,
grey message bubbles in dark theme,
misc
purged ic_action_chat as it wasn't used
preference use_white_background changed to use_green_background, default true
grey chat bubbles darker, text white
replaced all grey600 with black icons and 0.54 alpha attribute
highlightColor in dark grey chat bubble now darker than background
2016-05-12 18:00:18 +00:00
|
|
|
android:textColor="?attr/color_text_primary"
|
2015-07-19 12:09:49 +00:00
|
|
|
android:textSize="?attr/TextSizeHeadline"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textStyle="bold" />
|
2015-07-19 12:09:49 +00:00
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/other_device_keys"
|
|
|
|
android:layout_width="fill_parent"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:divider="?android:dividerHorizontal"
|
|
|
|
android:orientation="vertical"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:showDividers="middle"></LinearLayout>
|
2017-12-14 18:28:52 +00:00
|
|
|
|
2016-11-18 20:49:52 +00:00
|
|
|
<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"
|
2017-12-14 18:28:52 +00:00
|
|
|
android:text="@string/clear_other_devices"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textColor="@color/accent" />
|
2015-07-19 12:09:49 +00:00
|
|
|
</LinearLayout>
|
2014-10-22 16:38:44 +00:00
|
|
|
</LinearLayout>
|
|
|
|
</ScrollView>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/button_bar"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_alignParentBottom="true"
|
2014-10-21 20:22:01 +00:00
|
|
|
android:layout_alignParentEnd="true"
|
2014-10-22 16:38:44 +00:00
|
|
|
android:layout_alignParentLeft="true"
|
2016-01-11 10:17:45 +00:00
|
|
|
android:layout_alignParentRight="true"
|
|
|
|
android:layout_alignParentStart="true">
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<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"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textColor="?attr/color_text_primary" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<View
|
|
|
|
android:layout_width="1dp"
|
|
|
|
android:layout_height="fill_parent"
|
|
|
|
android:layout_marginBottom="7dp"
|
|
|
|
android:layout_marginTop="7dp"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:background="?attr/divider" />
|
2014-10-22 16:38:44 +00:00
|
|
|
|
|
|
|
<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"
|
2018-02-17 06:09:21 +00:00
|
|
|
android:textColor="?attr/color_text_secondary" />
|
2014-10-22 16:38:44 +00:00
|
|
|
</LinearLayout>
|
|
|
|
|
2014-10-21 20:22:01 +00:00
|
|
|
</RelativeLayout>
|