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.xml20
-rw-r--r--src/main/res/layout/message_received.xml12
-rw-r--r--src/main/res/layout/message_sent.xml12
3 files changed, 42 insertions, 2 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 9bacf9a2..4d0e6056 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -417,6 +417,26 @@
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:text="@string/server_info_push"
+ android:textColor="@color/primaryText"
+ 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:textColor="@color/primaryText"
+ android:textSize="?attr/TextSizeBody"/>
+ </TableRow>
+ <TableRow
android:layout_width="fill_parent"
android:layout_height="wrap_content">
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 61b1b669..9362a74a 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -93,7 +93,17 @@
android:layout_marginRight="4sp"
android:alpha="0.70"
android:gravity="center_vertical"
- android:src="@drawable/ic_secure_indicator_white" />
+ android:src="@drawable/ic_lock_white_18dp" />
+
+ <ImageView
+ android:id="@+id/edit_indicator"
+ android:layout_width="?attr/TextSizeInfo"
+ android:layout_height="?attr/TextSizeInfo"
+ android:layout_gravity="center_vertical"
+ android:layout_marginRight="4sp"
+ android:alpha="0.70"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_mode_edit_white_18dp" />
<TextView
android:id="@+id/message_time"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 58511f25..e5365a66 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -92,7 +92,17 @@
android:layout_marginLeft="4sp"
android:alpha="0.54"
android:gravity="center_vertical"
- android:src="@drawable/ic_secure_indicator" />
+ android:src="@drawable/ic_lock_black_18dp" />
+
+ <ImageView
+ android:id="@+id/edit_indicator"
+ android:layout_width="?attr/TextSizeInfo"
+ android:layout_height="?attr/TextSizeInfo"
+ android:layout_gravity="center_vertical"
+ android:layout_marginLeft="4sp"
+ android:alpha="0.54"
+ android:gravity="center_vertical"
+ android:src="@drawable/ic_mode_edit_black_18dp" />
<ImageView
android:id="@+id/indicator_received"