diff options
Diffstat (limited to '')
| -rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 4 | ||||
| -rw-r--r-- | src/main/res/layout/message_received.xml | 6 | ||||
| -rw-r--r-- | src/main/res/layout/message_sent.xml | 7 | ||||
| -rw-r--r-- | src/main/res/values-de/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 |
6 files changed, 14 insertions, 8 deletions
diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index cde94087..9f040676 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,6 +1,6 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" @@ -88,7 +88,7 @@ android:text="This is a placeholder text to show the last messages" android:textColor="@color/primaryText" android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="20sp" /> + app:emojiconSize="20sp" /> <com.makeramen.roundedimageview.RoundedImageView android:id="@+id/conversation_lastimage" diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 389b0f48..b68cc532 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -34,7 +34,7 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="fill_parent" - android:background="@color/primarybackground" + android:background="@color/primaryBackground" android:gravity="center_vertical" android:orientation="vertical" android:padding="2dp"> @@ -58,7 +58,7 @@ android:textColor="@color/white" android:textColorHighlight="@color/grey800" android:textSize="?attr/TextSizeBody" - emojicon:emojiconSize="28sp" /> + app:emojiconSize="28sp" /> <Button android:id="@+id/download_button" diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index d75f4bdb..58511f25 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:emojicon="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -49,7 +49,7 @@ android:background="@color/primaryText" android:scaleType="centerCrop" /> - <TextView + <github.ankushsachdeva.emojicon.EmojiconTextView android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -57,7 +57,8 @@ android:textColorLink="@color/primaryText" android:textColor="@color/primaryText" android:textColorHighlight="@color/grey500" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + app:emojiconSize="28sp"/> <Button android:id="@+id/download_button" diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 9ceeaec7..732cc200 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -115,6 +115,8 @@ <string name="pref_vibrate_summary">Vibrieren bei Erhalt einer neuen Nachricht</string> <string name="pref_sound">Benachrichtigungston</string> <string name="pref_sound_summary">Benachrichtigungston wiedergeben</string> + <string name="pref_conference_notifications">Konferenz-Benachrichtigungen</string> + <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenz-Nachricht und nicht nur, wenn ich angesprochen werde</string> <string name="pref_notification_grace_period">Gnadenfrist</string> <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string> <string name="pref_advanced_options">Erweiterte Optionen</string> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 3ecc2225..2d744395 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -26,4 +26,5 @@ <color name="red800">#ffc62828</color> <color name="orange500">#ffff9800</color> <color name="green500">#ff259b24</color> + <color name="green700">#ff0a7e07</color> </resources>
\ No newline at end of file diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index a7ded490..9fe8e28a 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -117,6 +117,8 @@ <string name="pref_vibrate_summary">Also vibrate when a new message arrives</string> <string name="pref_sound">Sound</string> <string name="pref_sound_summary">Play ringtone with notification</string> + <string name="pref_conference_notifications">Conference notifications</string> + <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</string> <string name="pref_notification_grace_period">Notification grace period</string> <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string> <string name="pref_advanced_options">Advanced Options</string> |