aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable/message_border.xml15
-rw-r--r--src/main/res/drawable/message_border_dark.xml15
-rw-r--r--src/main/res/drawable/message_bubble_received_light.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_light_dark.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_warning.xml2
-rw-r--r--src/main/res/drawable/message_bubble_received_warning_dark.xml2
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue.xml2
-rw-r--r--src/main/res/drawable/message_bubble_sent_blue_dark.xml2
-rw-r--r--src/main/res/layout/activity_contact_details.xml267
-rw-r--r--src/main/res/layout/activity_muc_details.xml9
-rw-r--r--src/main/res/values/attrs.xml2
-rw-r--r--src/main/res/values/themes.xml6
12 files changed, 158 insertions, 168 deletions
diff --git a/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml
deleted file mode 100644
index cee834e98..000000000
--- a/src/main/res/drawable/message_border.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
-
- <corners android:radius="5dp" />
-
- <padding
- android:bottom="1.5dp"
- android:left="1.5dp"
- android:right="1.5dp"
- android:top="1.5dp" />
-
- <solid android:color="@color/grey800" />
-
-</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_border_dark.xml b/src/main/res/drawable/message_border_dark.xml
deleted file mode 100644
index 83eef8eb8..000000000
--- a/src/main/res/drawable/message_border_dark.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
-
- <corners android:radius="5dp" />
-
- <padding
- android:bottom="1.5dp"
- android:left="1.5dp"
- android:right="1.5dp"
- android:top="1.5dp" />
-
- <solid android:color="@color/grey500" />
-
-</shape> \ No newline at end of file
diff --git a/src/main/res/drawable/message_bubble_received_light.xml b/src/main/res/drawable/message_bubble_received_light.xml
index 6e8e95e1d..32e146460 100644
--- a/src/main/res/drawable/message_bubble_received_light.xml
+++ b/src/main/res/drawable/message_bubble_received_light.xml
@@ -13,7 +13,7 @@
android:top="2dp" />
<stroke
android:width="1dp"
- android:color="@color/grey800">
+ android:color="@color/grey500">
</stroke>
<solid
android:color="@color/lightwhite">
diff --git a/src/main/res/drawable/message_bubble_received_light_dark.xml b/src/main/res/drawable/message_bubble_received_light_dark.xml
index edd1e62ce..8f9132566 100644
--- a/src/main/res/drawable/message_bubble_received_light_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_light_dark.xml
@@ -13,7 +13,7 @@
android:top="2dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="@color/grey700">
</stroke>
<solid
android:color="@color/darkwhite">
diff --git a/src/main/res/drawable/message_bubble_received_warning.xml b/src/main/res/drawable/message_bubble_received_warning.xml
index c3d553a7d..b3bf6d451 100644
--- a/src/main/res/drawable/message_bubble_received_warning.xml
+++ b/src/main/res/drawable/message_bubble_received_warning.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey800">
+ android:color="@color/grey500">
</stroke>
<solid
android:color="@color/lightred">
diff --git a/src/main/res/drawable/message_bubble_received_warning_dark.xml b/src/main/res/drawable/message_bubble_received_warning_dark.xml
index 5d8a270ab..5867f67ce 100644
--- a/src/main/res/drawable/message_bubble_received_warning_dark.xml
+++ b/src/main/res/drawable/message_bubble_received_warning_dark.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="@color/grey700">
</stroke>
<solid
android:color="@color/darkred">
diff --git a/src/main/res/drawable/message_bubble_sent_blue.xml b/src/main/res/drawable/message_bubble_sent_blue.xml
index 0f1424d21..1ee3ad0c8 100644
--- a/src/main/res/drawable/message_bubble_sent_blue.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey800">
+ android:color="@color/grey500">
</stroke>
<solid
android:color="@color/lightblue">
diff --git a/src/main/res/drawable/message_bubble_sent_blue_dark.xml b/src/main/res/drawable/message_bubble_sent_blue_dark.xml
index 3d1b72042..d9853bf74 100644
--- a/src/main/res/drawable/message_bubble_sent_blue_dark.xml
+++ b/src/main/res/drawable/message_bubble_sent_blue_dark.xml
@@ -13,7 +13,7 @@
android:top="4dp" />
<stroke
android:width="1dp"
- android:color="@color/grey500">
+ android:color="@color/grey700">
</stroke>
<solid
android:color="@color/darkblue">
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f6a2b1069..dd3ff2c31 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -33,143 +33,162 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:orientation="vertical"
- android:padding="@dimen/card_padding_regular">
-
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/contact_display_name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:paddingBottom="5dp"
- android:text="@string/contact"
- android:textAlignment="center"
- android:textAppearance="@style/TextAppearance.Conversations.Title"
- android:textIsSelectable="false"
- android:textStyle="bold" />
-
- <QuickContactBadge
- android:id="@+id/details_contact_badge"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@+id/contact_display_name"
- android:layout_centerHorizontal="true"
- android:adjustViewBounds="true"
- android:background="?attr/message_border"
- android:maxHeight="384dp"
- android:maxWidth="384dp"
- android:padding="1dp"
- android:scaleType="centerCrop" />
+ android:orientation="vertical">
- <LinearLayout
- android:id="@+id/details_jidbox"
+ <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/details_contact_badge"
- android:layout_marginTop="16dp"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/details_contactjid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="@string/account_settings_example_jabber_id"
- android:textAppearance="@style/TextAppearance.Conversations.Title"
- android:textIsSelectable="true"
- android:visibility="gone" />
-
- <com.wefika.flowlayout.FlowLayout
- android:id="@+id/tags"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
- android:layout_marginLeft="-2dp"
- android:layout_marginTop="4dp"
- android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout>
-
- <TextView
- android:id="@+id/details_lastseen"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp"
- android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+ android:gravity="center_horizontal"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
<android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/status_message"
+ android:id="@+id/contact_display_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp"
- android:gravity="center_horizontal"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+ android:textAppearance="@style/TextAppearance.Conversations.Title" />
+ </RelativeLayout>
- <android.support.text.emoji.widget.EmojiTextView
- android:id="@+id/resource"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp"
- android:gravity="center_horizontal"
- android:textSize="?attr/TextSizeBody"
- android:textStyle="italic" />
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
- <Button
- android:id="@+id/add_contact_button"
+ <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center_horizontal"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp"
- android:text="@string/add_contact" />
-
- <CheckBox
- android:id="@+id/details_send_presence"
- style="@style/Widget.Conversations.CheckBox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/add_contact_button"
- android:layout_marginTop="4dp"
- android:text="@string/send_presence_updates"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
-
- <CheckBox
- android:id="@+id/details_receive_presence"
- style="@style/Widget.Conversations.CheckBox"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/details_send_presence"
- android:text="@string/receive_presence_updates"
- android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+ android:gravity="center_horizontal"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_regular">
- </LinearLayout>
+ <QuickContactBadge
+ android:id="@+id/details_contact_badge"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@+id/contact_display_name"
+ android:layout_centerHorizontal="true"
+ android:adjustViewBounds="true"
+ android:background="?attr/color_border"
+ android:maxHeight="384dp"
+ android:maxWidth="384dp"
+ android:padding="1dp"
+ android:scaleType="centerCrop" />
- <TextView
- android:id="@+id/details_account"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/details_jidbox"
- android:layout_marginTop="32dp"
- android:text="@string/using_account"
- android:textAppearance="@style/TextAppearance.Conversations.Caption"
- android:visibility="gone" />
+ <LinearLayout
+ android:id="@+id/details_jidbox"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/details_contact_badge"
+ android:layout_marginTop="16dp"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/details_contactjid"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/account_settings_example_jabber_id"
+ android:textAppearance="@style/TextAppearance.Conversations.Title"
+ android:textIsSelectable="true"
+ android:visibility="gone" />
+
+ <com.wefika.flowlayout.FlowLayout
+ android:id="@+id/tags"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginLeft="-2dp"
+ android:layout_marginTop="4dp"
+ android:orientation="horizontal">
+ </com.wefika.flowlayout.FlowLayout>
+
+ <TextView
+ android:id="@+id/details_lastseen"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:textAppearance="@style/TextAppearance.Conversations.Subhead" />
+
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/status_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:gravity="center_horizontal"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ <android.support.text.emoji.widget.EmojiTextView
+ android:id="@+id/resource"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:gravity="center_horizontal"
+ android:textSize="?attr/TextSizeBody"
+ android:textStyle="italic" />
+
+ <Button
+ android:id="@+id/add_contact_button"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginBottom="4dp"
+ android:layout_marginTop="4dp"
+ android:text="@string/add_contact" />
+
+ <CheckBox
+ android:id="@+id/details_send_presence"
+ style="@style/Widget.Conversations.CheckBox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/add_contact_button"
+ android:layout_marginTop="4dp"
+ android:text="@string/send_presence_updates"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ <CheckBox
+ android:id="@+id/details_receive_presence"
+ style="@style/Widget.Conversations.CheckBox"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/details_send_presence"
+ android:text="@string/receive_presence_updates"
+ android:textAppearance="@style/TextAppearance.Conversations.Body1" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:padding="@dimen/card_padding_list">
+
+ <TextView
+ android:id="@+id/details_account"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="right"
+ android:layout_marginTop="24dp"
+ android:text="@string/using_account"
+ android:textAppearance="@style/TextAppearance.Conversations.Caption"
+ android:visibility="visible" />
+ </LinearLayout>
+ </LinearLayout>
+ </RelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 6a514052a..2a450f964 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -51,7 +51,9 @@
android:id="@+id/muc_display"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
+ android:layout_toLeftOf="@+id/edit_muc_name_button"
android:layout_toStartOf="@+id/edit_muc_name_button"
android:orientation="vertical">
@@ -85,9 +87,10 @@
android:id="@+id/muc_editor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
+ android:layout_toLeftOf="@+id/edit_muc_name_button"
android:layout_toStartOf="@+id/edit_muc_name_button"
-
android:orientation="vertical"
android:visibility="gone">
@@ -126,6 +129,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
+ android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:alpha="?attr/icon_alpha"
android:background="?attr/selectableItemBackgroundBorderless"
@@ -145,6 +149,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/avatar_item_distance"
+ android:layout_marginRight="@dimen/avatar_item_distance"
android:adjustViewBounds="true"
android:maxHeight="384dp"
android:maxWidth="384dp"
@@ -267,7 +272,7 @@
android:layout_marginTop="24dp"
android:text="@string/using_account"
android:textAppearance="@style/TextAppearance.Conversations.Caption"
- android:visibility="visible" />
+ android:visibility="gone" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 11b461812..b261ea28a 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -99,8 +99,6 @@
<attr name="color_border" format="reference|color" />
- <attr name="message_border" format="reference" />
-
<!-- settings -->
<attr name="ic_settings_ui" format="reference" />
<attr name="ic_settings_notifications" format="reference" />
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index a4d4209c5..f1b66319f 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -28,8 +28,7 @@
<item name="color_bubble_date">@color/lightgreen</item>
<item name="color_bubble_warning">@color/lightred</item>
- <item name="color_border">@color/grey800</item>
- <item name="message_border">@drawable/message_border</item>
+ <item name="color_border">@color/grey500</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>
@@ -166,8 +165,7 @@
<item name="color_bubble_date">@color/darkgreen</item>
<item name="color_bubble_warning">@color/darkred</item>
- <item name="color_border">@color/grey500</item>
- <item name="message_border">@drawable/message_border_dark</item>
+ <item name="color_border">@color/grey700</item>
<item name="windowActionModeOverlay">true</item>
<item name="android:actionModeBackground">@color/accent</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-20 15:55:55 +0000