aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/activity_edit_account.xml24
-rw-r--r--src/main/res/layout/contact_key.xml79
-rw-r--r--src/main/res/layout/message_received.xml5
-rw-r--r--src/main/res/layout/message_sent.xml5
4 files changed, 73 insertions, 40 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 64393b25..6c26a162 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -163,7 +163,7 @@
</RelativeLayout>
<RelativeLayout
- android:id="@+id/battery_optimization"
+ android:id="@+id/os_optimization"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/activity_vertical_margin"
@@ -175,7 +175,7 @@
android:padding="@dimen/infocard_padding"
android:visibility="gone">
<TextView
- android:id="@+id/batt_op_headline"
+ android:id="@+id/os_optimization_headline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/battery_optimizations_enabled"
@@ -183,25 +183,27 @@
android:textSize="?attr/TextSizeHeadline"
android:textStyle="bold"/>
<TextView
- android:id="@+id/batt_op_body"
+ android:id="@+id/os_optimization_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_below="@+id/batt_op_headline"
+ android:layout_below="@+id/os_optimization_headline"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:text="@string/battery_optimizations_enabled_explained"
android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"/>
<Button
- android:id="@+id/batt_op_disable"
+ android:id="@+id/os_optimization_disable"
style="?android:attr/borderlessButtonStyle"
android:layout_marginRight="-8dp"
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/batt_op_body"
- android:text="@string/disable" android:textColor="@color/accent"/>
+ android:layout_alignParentRight="true"
+ android:layout_below="@+id/os_optimization_body"
+ android:text="@string/disable"
+ android:textColor="@color/accent"/>
</RelativeLayout>
@@ -608,6 +610,14 @@
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:text="@string/clear_other_devices"
+ android:layout_gravity="center_horizontal"
+ android:textColor="@color/accent"/>
</LinearLayout>
</LinearLayout>
</ScrollView>
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7076dad2..c16d5e08 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -1,37 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:longClickable="true">
<RelativeLayout
android:id="@+id/key_data"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
- android:paddingTop="8dp"
+ android:paddingBottom="8dp"
android:paddingLeft="8dp"
- android:paddingBottom="8dp">
+ android:paddingTop="8dp">
<TextView
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="?attr/color_text_primary"
android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/tgl_trust"
+ android:layout_toLeftOf="@+id/action_container"
+ android:fontFamily="monospace"
+ android:textColor="?attr/color_text_primary"
android:textSize="?attr/TextSizeBody"
android:typeface="monospace"
- android:fontFamily="monospace"/>
+ android:longClickable="true"/>
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="?attr/color_text_secondary"
android:layout_alignParentLeft="true"
android:layout_below="@+id/key"
android:maxLines="1"
- android:textSize="?attr/TextSizeInfo"/>
+ android:textColor="?attr/color_text_secondary"
+ android:textSize="?attr/TextSizeInfo"
+ android:longClickable="true"/>
<TextView
android:id="@+id/key_trust"
@@ -39,32 +42,46 @@
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_below="@+id/key"
- android:visibility="gone"
android:textColor="?attr/color_text_secondary"
- android:textSize="?attr/TextSizeInfo"/>
-
- <ImageButton
- android:id="@+id/button_remove"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_toRightOf="@+id/key"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
- android:padding="@dimen/image_button_padding"
- android:alpha="?attr/icon_alpha"
- android:src="?attr/icon_remove"
- android:visibility="gone" />
+ android:textSize="?attr/TextSizeInfo"
+ android:visibility="gone"
+ android:longClickable="true"/>
+ <LinearLayout
+ android:id="@+id/action_container"
+ android:layout_width="96dp"
+ android:layout_marginRight="-32dp"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true">
+ <ImageButton
+ android:layout_gravity="center_horizontal"
+ android:id="@+id/button_remove"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:alpha="?attr/icon_alpha"
+ android:background="?android:selectableItemBackground"
+ android:padding="@dimen/image_button_padding"
+ android:src="?attr/icon_remove"
+ android:layout_marginRight="16dp"
+ android:visibility="gone" />
+ <ImageView
+ android:visibility="gone"
+ android:id="@+id/verified_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginRight="16dp"
+ android:src="@drawable/ic_verified_fingerprint" />
- <eu.siacs.conversations.ui.widget.Switch
- android:id="@+id/tgl_trust"
- android:visibility="invisible"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- style="@style/MD"/>
+ <eu.siacs.conversations.ui.widget.Switch
+ android:id="@+id/tgl_trust"
+ style="@style/MD"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone" />
+ </LinearLayout>
</RelativeLayout>
</RelativeLayout> \ No newline at end of file
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 466dd045..ea098b2d 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -45,14 +45,16 @@
android:layout_marginTop="8dp"
android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
+ android:longClickable="true"
android:background="@color/black87"
android:scaleType="centerCrop" />
- <TextView
+ <eu.siacs.conversations.ui.widget.CopyTextView
android:id="@+id/message_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
+ android:longClickable="true"
android:textColorLink="@color/white"
android:textColor="@color/white"
android:textColorHighlight="@color/grey800"
@@ -61,6 +63,7 @@
<Button
android:id="@+id/download_button"
style="?android:attr/buttonStyleSmall"
+ android:longClickable="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 37ab9da1..0f81c3f7 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -47,13 +47,15 @@
android:layout_marginBottom="4dp"
android:adjustViewBounds="true"
android:background="@color/black87"
+ android:longClickable="true"
android:scaleType="centerCrop" />
- <TextView
+ <eu.siacs.conversations.ui.widget.CopyTextView
android:id="@+id/message_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
+ android:longClickable="true"
android:textColorLink="@color/black87"
android:textColor="?attr/color_text_primary"
android:textColorHighlight="@color/grey500"
@@ -64,6 +66,7 @@
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:longClickable="true"
android:visibility="gone" />
<LinearLayout
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-26 18:45:51 +0000