diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/contact.xml | 6 | ||||
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 12 | ||||
| -rw-r--r-- | src/main/res/values/defaults.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/xml/preferences.xml | 5 |
5 files changed, 26 insertions, 0 deletions
diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index e5b71d743..5eaf4944c 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -54,6 +54,12 @@ android:layout_height="wrap_content" android:textAppearance="@style/TextAppearance.Conversations.Fingerprint" android:visibility="gone" /> + <TextView + android:id="@+id/account" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@style/TextAppearance.Conversations.Status" + android:visibility="gone" /> </LinearLayout> </RelativeLayout> diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 3d03c3906..b8bc8fcb9 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -30,6 +30,7 @@ app:riv_corner_radius="@dimen/rounded_image_border" /> <RelativeLayout + android:id="@+id/message" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_centerVertical="true" @@ -192,7 +193,18 @@ android:paddingEnd="4dp" android:paddingRight="4dp" android:textAppearance="@style/TextAppearance.Conversations.Caption" /> + + <TextView + android:id="@+id/account" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/conversation_lastwrapper" + android:layout_alignParentBottom="true" + android:paddingTop="4dp" + android:textAppearance="@style/TextAppearance.Conversations.Status" + android:visibility="gone" /> </RelativeLayout> + </RelativeLayout> </FrameLayout> </FrameLayout> diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml index dc4f7ead3..59b759636 100644 --- a/src/main/res/values/defaults.xml +++ b/src/main/res/values/defaults.xml @@ -117,6 +117,7 @@ <bool name="show_links_inside">true</bool> <bool name="show_maps_inside">true</bool> <bool name="use_internal_updater">true</bool> + <bool name="show_own_accounts">true</bool> <string-array name="domains"> <item>pix-art.de</item> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index c04f926b5..496c84d0d 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -914,4 +914,6 @@ <string name="add_anway">Add anyway</string> <string name="this_looks_like_channel">This looks like a channel address</string> <string name="no_backup_available">No backup available</string> + <string name="pref_show_own_accounts_summary">Show own accounts in chats and contacts if you have multiple accounts.</string> + <string name="pref_show_own_accounts">Show own accounts</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index f42210417..d8dd6c89e 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -81,6 +81,11 @@ android:key="prefer_xmpp_avatar" android:summary="@string/pref_prefer_xmpp_avatar_summary" android:title="@string/pref_prefer_xmpp_avatar" /> + <CheckBoxPreference + android:defaultValue="@bool/show_own_accounts" + android:key="show_own_accounts" + android:summary="@string/pref_show_own_accounts_summary" + android:title="@string/pref_show_own_accounts" /> </PreferenceScreen> <!--Notifications--> <PreferenceScreen |