diff options
author | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-01-10 15:48:38 +0100 |
commit | 1515d31682ad75a50c5c06b9569ac21dbd15070c (patch) | |
tree | ad068c0b693b7b02f786729b08ee59840570fc4e /src/main/res | |
parent | 5d0c80ee5bef204b1bdefcb45adc9f2cb283553e (diff) | |
parent | 95db6db935ff58ce2731ab535e3758a13dd5b68b (diff) |
Merge branch 'siacs/master' into development
Diffstat (limited to 'src/main/res')
25 files changed, 164 insertions, 98 deletions
diff --git a/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..96b329c4a --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_notifications_grey600_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..6cd4dfc90 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_notifications_none_grey600_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..09ebc5d25 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_notifications_off_grey600_24dp.png diff --git a/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e92d43acf --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_notifications_paused_grey600_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..d6c20c203 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_notifications_grey600_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..3e8b0805c --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_notifications_none_grey600_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..af3b63215 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_notifications_off_grey600_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9d6308d2c --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_notifications_paused_grey600_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..d441dc7c9 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_notifications_grey600_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..1123cea43 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_notifications_none_grey600_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..aef303a0d --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_notifications_off_grey600_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c68bedd38 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_notifications_paused_grey600_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7d58d25d8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_notifications_grey600_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..b8772d377 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_notifications_none_grey600_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e627b30a8 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_notifications_off_grey600_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e38f52179 --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_notifications_paused_grey600_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..98dff2f3c --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_notifications_grey600_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ffdb15a83 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_notifications_none_grey600_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ab65f4b22 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_notifications_off_grey600_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..53162e569 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_notifications_paused_grey600_24dp.png diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 1ff6f95d2..6fd62bb36 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -111,6 +111,34 @@ android:padding="@dimen/image_button_padding" android:src="?attr/icon_settings" /> </RelativeLayout> + + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + <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> + <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 575647f0a..5d69f965a 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -1,90 +1,111 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:descendantFocusability="blocksDescendants"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:descendantFocusability="blocksDescendants"> - <View - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@color/primary"/> + <View + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/primary"/> - <FrameLayout - android:id="@+id/swipeable_item" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@color/grey50"> + <FrameLayout + android:id="@+id/swipeable_item" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/grey50"> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="?android:selectableItemBackground" - android:orientation="horizontal" - android:padding="8dp" > + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:background="?android:selectableItemBackground" + android:orientation="horizontal" + android:padding="8dp"> - <com.makeramen.roundedimageview.RoundedImageView - android:id="@+id/conversation_image" - android:layout_width="56dp" - android:layout_height="56dp" - android:layout_alignParentLeft="true" - android:scaleType="centerCrop" - android:background="@drawable/message_border" - android:padding="1dp" - app:riv_corner_radius="2dp" /> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/conversation_image" + android:layout_width="56dp" + android:layout_height="56dp" + android:layout_alignParentLeft="true" + android:scaleType="centerCrop" + android:background="@drawable/message_border" + android:padding="1dp" + app:riv_corner_radius="2dp"/> - <RelativeLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toRightOf="@+id/conversation_image" - android:paddingLeft="8dp" > + <RelativeLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/conversation_image" + android:paddingLeft="8dp"> - <TextView - android:id="@+id/conversation_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@+id/conversation_lastwrapper" - android:layout_toLeftOf="@+id/conversation_lastupdate" - android:singleLine="true" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeHeadline" - android:typeface="sans" /> + <TextView + android:id="@+id/conversation_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignLeft="@+id/conversation_lastwrapper" + android:layout_toLeftOf="@+id/conversation_lastupdate" + android:paddingRight="4dp" + android:singleLine="true" + android:text="Awesome groupchat" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeHeadline" + android:typeface="sans"/> - <LinearLayout - android:id="@+id/conversation_lastwrapper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@id/conversation_name" - android:orientation="vertical" - android:paddingTop="3dp" > + <RelativeLayout + android:id="@+id/conversation_lastwrapper" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/conversation_name" + android:layout_marginTop="4dp"> - <TextView - android:id="@+id/conversation_lastmsg" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:scrollHorizontally="false" - android:singleLine="true" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" /> + <LinearLayout android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_toLeftOf="@+id/notification_status" + android:orientation="vertical"> + <TextView + android:id="@+id/conversation_lastmsg" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollHorizontally="false" + android:singleLine="true" + android:text="This is a placeholder text to show the last messages" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody"/> - <ImageView - android:id="@+id/conversation_lastimage" - android:layout_width="fill_parent" - android:layout_height="14dp" - android:background="@color/black87" - android:scaleType="centerCrop" /> - </LinearLayout> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/conversation_lastimage" + android:layout_width="fill_parent" + android:layout_height="36dp" + android:background="@color/black87" + android:scaleType="centerCrop" + android:visibility="gone" + app:riv_corner_radius="2dp"/> + </LinearLayout> + <ImageView + 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" + /> + </RelativeLayout> - <TextView - android:id="@+id/conversation_lastupdate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBaseline="@+id/conversation_name" - android:layout_alignParentRight="true" - android:gravity="right" - android:textColor="@color/black54" - android:textSize="?attr/TextSizeInfo" /> - </RelativeLayout> - </RelativeLayout> - </FrameLayout> + <TextView + android:id="@+id/conversation_lastupdate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignBaseline="@+id/conversation_name" + android:layout_alignParentRight="true" + android:gravity="right" + android:text="23:42" + android:textColor="@color/black54" + android:textSize="?attr/TextSizeInfo"/> + </RelativeLayout> + </RelativeLayout> + </FrameLayout> </FrameLayout>
\ No newline at end of file diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml index cc68ca424..0f2dbb1a4 100644 --- a/src/main/res/values/arrays.xml +++ b/src/main/res/values/arrays.xml @@ -57,4 +57,16 @@ <item>voice</item> <item>location</item> </string-array> + + <string-array name="picture_compression_values"> + <item>never</item> + <item>auto</item> + <item>always</item> + </string-array> + + <string-array name="picture_compression_entries"> + <item>@string/never</item> + <item>@string/automatically</item> + <item>@string/always</item> + </string-array> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index bbbc41534..50ec686e5 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -111,8 +111,6 @@ <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">Notifications in Public Conferences</string> - <string name="pref_conference_notifications_summary">Always notify when a message arrives in a public conference 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> @@ -268,7 +266,6 @@ <string name="skip">Skip</string> <string name="disable_notifications">Disable notifications</string> <string name="disable_notifications_for_this_conversation">Disable notifications for this conversation</string> - <string name="notifications_disabled">Notifications are disabled</string> <string name="enable">Enable</string> <string name="conference_requires_password">Conference requires password</string> <string name="enter_password">Enter password</string> @@ -290,7 +287,7 @@ <string name="pref_about_conversations_summary">Build and licensing information</string> <string name="pref_about_message" translatable="false">Pix-Art Messenger is a fork of Conversations. \n\nConversations • the very last word in instant messaging. - \n\nCopyright © 2014 Daniel Gultsch + \n\nCopyright © 2014-2016 Daniel Gultsch \n\nThis program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or @@ -590,4 +587,12 @@ <string name="certificate_sha1">SHA1</string> <string name="certicate_info_not_available">(Not available)</string> <string name="certificate_not_found">No certificate found</string> + <string name="notify_on_all_messages">Notify on all messages</string> + <string name="notify_only_when_highlighted">Notify only when highlighted</string> + <string name="notify_never">Notifications disabled</string> + <string name="notify_paused">Notifications paused</string> + <string name="pref_picture_compression">Compress Pictures</string> + <string name="pref_picture_compression_summary">Resize and compressed pictures</string> + <string name="always">Always</string> + <string name="automatically">Automatically</string> </resources> diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index 4cc22e097..aac580a98 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -15,7 +15,13 @@ android:key="auto_accept_file_size" android:summary="@string/pref_accept_files_summary" android:title="@string/pref_accept_files"/> - + <ListPreference + android:defaultValue="auto" + android:entries="@array/picture_compression_entries" + android:entryValues="@array/picture_compression_values" + android:key="picture_compression" + android:summary="@string/pref_picture_compression_summary" + android:title="@string/pref_picture_compression"/> <CheckBoxPreference android:defaultValue="true" android:key="confirm_messages" @@ -75,19 +81,13 @@ android:summary="@string/pref_sound_summary" android:title="@string/pref_sound"/> - <CheckBoxPreference - android:defaultValue="false" - android:dependency="show_notification" - android:key="always_notify_in_conference" - android:summary="@string/pref_conference_notifications_summary" - android:title="@string/pref_conference_notifications"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_ui_options"> <CheckBoxPreference android:defaultValue="false" android:key="use_white_background" - android:title="@string/pref_use_white_background" - android:summary="@string/pref_use_white_background_summary"/> + android:summary="@string/pref_use_white_background_summary" + android:title="@string/pref_use_white_background"/> <CheckBoxPreference android:defaultValue="false" android:key="use_larger_font" @@ -168,13 +168,13 @@ android:title="@string/pref_remove_trusted_certificates_title"/> </PreferenceCategory> <PreferenceCategory - android:title="@string/pref_connection_options" - android:key="connection_options"> + android:key="connection_options" + android:title="@string/pref_connection_options"> <CheckBoxPreference android:defaultValue="false" android:key="use_tor" - android:title="@string/pref_use_tor" - android:summary="@string/pref_use_tor_summary"/> + android:summary="@string/pref_use_tor_summary" + android:title="@string/pref_use_tor"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_input_options"> <CheckBoxPreference @@ -207,9 +207,9 @@ android:summary="@string/pref_keep_foreground_service_summary" android:title="@string/pref_keep_foreground_service"/> <eu.siacs.conversations.ui.ExportLogsPreference - android:key="export_logs" - android:title="@string/pref_export_logs" - android:summary="@string/pref_export_logs_summary"/> + android:key="export_logs" + android:summary="@string/pref_export_logs_summary" + android:title="@string/pref_export_logs"/> </PreferenceCategory> </PreferenceScreen> <CheckBoxPreference |