aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2018-07-09 23:45:29 +0200
committerChristian Schneppe <christian@pix-art.de>2018-07-09 23:45:29 +0200
commit7e35c115c182692bf5063c773c5876bfb0ad8466 (patch)
treeb44dac57b5f70db43b866a01d20193e6961b906a /src/main/res/layout
parent4f612fc9bc50e8665c11cab59f502ace854a4a9f (diff)
some UI improvements
Diffstat (limited to 'src/main/res/layout')
-rw-r--r--src/main/res/layout/activity_contact_details.xml267
-rw-r--r--src/main/res/layout/activity_muc_details.xml9
2 files changed, 150 insertions, 126 deletions
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>