diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-02-09 23:55:40 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-02-09 23:55:40 +0100 |
commit | ad7e8e76f0fad8b3887c332fbaddcc77daee8df0 (patch) | |
tree | 5540c85f0142c098eac0d4ec86205381cb80cbcc /src/main/res | |
parent | e7b636019c7e9813a5e33c4eabdb39080a94009f (diff) |
move (un)mute settings to contact-/conference details
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 97 | ||||
-rw-r--r-- | src/main/res/menu/conversations.xml | 25 |
2 files changed, 67 insertions, 55 deletions
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 46b0f1768..4c0e54955 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -72,18 +72,55 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + android:layout_marginBottom="4dp" + android:layout_marginTop="4dp" /> <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/status_message" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="8dp" + android:layout_marginTop="4dp" android:gravity="center_horizontal" android:textColor="@color/black54" android:textSize="?attr/TextSizeBody" - android:textStyle="italic" /> + android:textStyle="italic" + android:layout_marginBottom="4dp" /> + + <Button + android:id="@+id/add_contact_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:layout_gravity="center_horizontal" + android:text="@string/add_contact" + android:layout_marginBottom="4dp" + android:layout_marginTop="4dp" /> + + <CheckBox + android:id="@+id/details_send_presence" + 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:text="@string/send_presence_updates" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:layout_marginTop="4dp" /> + + <CheckBox + android:id="@+id/details_receive_presence" + 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:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> </LinearLayout> @@ -110,36 +147,36 @@ android:background="@drawable/infocard_border" android:padding="@dimen/infocard_padding"> - <Button - android:id="@+id/add_contact_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:layout_gravity="center_horizontal" - android:text="@string/add_contact" /> - - <CheckBox - android:id="@+id/details_send_presence" - android:layout_width="wrap_content" + <RelativeLayout + android:layout_width="fill_parent" android:layout_height="wrap_content" + android:touchscreenBlocksFocus="true" android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/add_contact_button" - android:text="@string/send_presence_updates" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + android:layout_alignParentStart="true" > - <CheckBox - android:id="@+id/details_receive_presence" - 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:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <TextView + android:id="@+id/notification_status_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/notify_on_all_messages" + android:layout_centerVertical="true" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@+id/notification_status_button" /> + + <ImageButton + android:id="@+id/notification_status_button" + style="?android:attr/buttonStyleSmall" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:background="?android:selectableItemBackground" + android:padding="@dimen/image_button_padding" + android:src="@drawable/ic_notifications_grey600_24dp" /> + </RelativeLayout> </RelativeLayout> diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml index 22d8a513a..35fc61990 100644 --- a/src/main/res/menu/conversations.xml +++ b/src/main/res/menu/conversations.xml @@ -18,19 +18,6 @@ android:orderInCategory="30" android:showAsAction="always" android:title="@string/attach_file" /> - <!-- <item - android:id="@+id/action_contact_details" - android:icon="?attr/icon_group" - android:orderInCategory="40" - android:showAsAction="never" - android:title="@string/action_contact_details"/> - <item - android:id="@+id/action_muc_details" - android:icon="?attr/icon_group" - android:orderInCategory="40" - android:showAsAction="never" - android:title="@string/action_muc_details"/> - --> <item android:id="@+id/action_invite" android:orderInCategory="45" @@ -52,18 +39,6 @@ android:showAsAction="never" android:title="@string/action_end_conversation_muc" /> <item - android:id="@+id/action_mute" - android:orderInCategory="70" - android:showAsAction="never" - android:title="@string/disable_notifications" /> - - <item - android:id="@+id/action_unmute" - android:orderInCategory="71" - android:showAsAction="never" - android:title="@string/enable_notifications" /> - - <item android:id="@+id/action_accounts" android:orderInCategory="90" android:showAsAction="never" |