diff options
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_about.xml | 2 | ||||
| -rw-r--r-- | src/main/res/layout/contact_key.xml | 1 | ||||
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 26 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversation.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 5 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 3 |
6 files changed, 30 insertions, 11 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index 8f1113ad..142087c0 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,6 +1,6 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - tools:context="eu.siacs.conversations.ui.AboutActivity" + tools:context="de.thedevstack.conversationsplus.ui.AboutActivity" android:background="@color/grey50" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml index 03246ccb..bf818001 100644 --- a/src/main/res/layout/contact_key.xml +++ b/src/main/res/layout/contact_key.xml @@ -55,6 +55,7 @@ android:src="?attr/icon_remove" android:visibility="gone" /> + <Switch android:id="@+id/tgl_trust" android:visibility="invisible" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 74e84593..41fd1b90 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -25,7 +25,7 @@ android:layout_height="wrap_content" android:background="?android:selectableItemBackground" android:orientation="horizontal" - android:padding="8dp" + android:padding="4dp" android:id="@+id/conversationListRowContent"> <com.makeramen.roundedimageview.RoundedImageView @@ -50,7 +50,7 @@ android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_toRightOf="@+id/conversation_image" - android:paddingLeft="8dp"> + android:paddingLeft="4dp"> <TextView android:id="@+id/conversation_name" @@ -77,7 +77,8 @@ android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:layout_toLeftOf="@+id/notification_status" - android:orientation="vertical"> + android:orientation="vertical" + android:id="@+id/conversation_last"> <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/conversation_lastmsg" @@ -103,11 +104,22 @@ android:id="@+id/notification_status" android:layout_width="16sp" android:layout_height="16sp" - android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:layout_marginLeft="4dp" - android:src="@drawable/ic_notifications_grey600_24dp" - /> + android:layout_toLeftOf="@+id/conversation_unreadcount" + android:src="@drawable/ic_notifications_grey600_24dp" /> + + <TextView + android:id="@+id/conversation_unreadcount" + android:layout_width="16sp" + android:layout_height="16sp" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:gravity="right" + android:text="1" + android:textColor="@color/secondaryText" + android:textSize="?attr/TextSizeInfo" + android:textStyle="bold" + android:visibility="invisible"/> </RelativeLayout> <TextView diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 4145afb8..b0bf17c8 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -39,7 +39,7 @@ android:layout_alignParentLeft="true" android:background="@color/grey50" > - <eu.siacs.conversations.ui.EditMessage + <de.thedevstack.conversationsplus.ui.EditMessage android:id="@+id/textinput" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -59,7 +59,7 @@ app:emojiconSize="?attr/EmojiconSizeInput" > <requestFocus /> - </eu.siacs.conversations.ui.EditMessage> + </de.thedevstack.conversationsplus.ui.EditMessage> <ImageButton android:id="@+id/textSendButton" diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index d331b3ef..029b0d74 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -46,7 +46,8 @@ android:layout_marginTop="8dp" android:layout_marginBottom="4dp" android:adjustViewBounds="true" - android:background="@color/black87" + android:longClickable="true" + android:background="@color/primaryText" android:scaleType="centerCrop" /> <github.ankushsachdeva.emojicon.EmojiconTextView @@ -54,6 +55,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web|phone|email" + android:longClickable="true" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" app:emojiconSize="?attr/EmojiconSizeBody" /> @@ -61,6 +63,7 @@ <Button android:id="@+id/download_button" style="?android:attr/buttonStyleSmall" + android:longClickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="gone" /> diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 30003309..f59c51f3 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -48,6 +48,7 @@ android:layout_marginBottom="4dp" android:adjustViewBounds="true" android:background="@color/primaryText" + android:longClickable="true" android:scaleType="centerCrop" /> <github.ankushsachdeva.emojicon.EmojiconTextView @@ -55,6 +56,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web|phone|email" + android:longClickable="true" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" app:emojiconSize="?attr/EmojiconSizeBody"/> @@ -62,6 +64,7 @@ <Button android:id="@+id/download_button" style="?android:attr/buttonStyleSmall" + android:longClickable="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:visibility="gone" /> |