diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-06-30 23:46:05 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-06-30 23:46:05 +0200 |
commit | 502ea4b891cd1e5abc08f9eaa80e8744f0059482 (patch) | |
tree | 680939c857332db5bba3c0f8e6a02c3a810aa304 /src/main/res | |
parent | 45f773d5bd488a9851dc1255b24ff451cee92db9 (diff) |
choose contact activity: start action mode on short press
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/drawable-hdpi/ic_forward_white_24dp.png | bin | 0 -> 193 bytes | |||
-rw-r--r-- | src/main/res/drawable-mdpi/ic_forward_white_24dp.png | bin | 0 -> 125 bytes | |||
-rw-r--r-- | src/main/res/drawable-xhdpi/ic_forward_white_24dp.png | bin | 0 -> 184 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png | bin | 0 -> 303 bytes | |||
-rw-r--r-- | src/main/res/drawable-xxxhdpi/ic_forward_white_24dp.png | bin | 0 -> 306 bytes | |||
-rw-r--r-- | src/main/res/drawable/list_item_background_dark.xml | 32 | ||||
-rw-r--r-- | src/main/res/drawable/list_item_background_light.xml | 32 | ||||
-rw-r--r-- | src/main/res/layout/contact.xml | 2 | ||||
-rw-r--r-- | src/main/res/menu/select_multiple.xml | 10 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 2 | ||||
-rw-r--r-- | src/main/res/values/colors.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 5 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 2 |
13 files changed, 71 insertions, 15 deletions
diff --git a/src/main/res/drawable-hdpi/ic_forward_white_24dp.png b/src/main/res/drawable-hdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..b40c6b780 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_forward_white_24dp.png diff --git a/src/main/res/drawable-mdpi/ic_forward_white_24dp.png b/src/main/res/drawable-mdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..ec881edda --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_forward_white_24dp.png diff --git a/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png b/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..551baf53b --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_forward_white_24dp.png diff --git a/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..6eadc2bbf --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_forward_white_24dp.png diff --git a/src/main/res/drawable-xxxhdpi/ic_forward_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..fae07bf4c --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_forward_white_24dp.png diff --git a/src/main/res/drawable/list_item_background_dark.xml b/src/main/res/drawable/list_item_background_dark.xml new file mode 100644 index 000000000..eca985306 --- /dev/null +++ b/src/main/res/drawable/list_item_background_dark.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (c) 2018, Daniel Gultsch All rights reserved. + ~ + ~ Redistribution and use in source and binary forms, with or without modification, + ~ are permitted provided that the following conditions are met: + ~ + ~ 1. Redistributions of source code must retain the above copyright notice, this + ~ list of conditions and the following disclaimer. + ~ + ~ 2. Redistributions in binary form must reproduce the above copyright notice, + ~ this list of conditions and the following disclaimer in the documentation and/or + ~ other materials provided with the distribution. + ~ + ~ 3. Neither the name of the copyright holder nor the names of its contributors + ~ may be used to endorse or promote products derived from this software without + ~ specific prior written permission. + ~ + ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ~ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + ~ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ~ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + ~ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + ~ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/grey700" android:state_activated="true" /> +</selector>
\ No newline at end of file diff --git a/src/main/res/drawable/list_item_background_light.xml b/src/main/res/drawable/list_item_background_light.xml new file mode 100644 index 000000000..f064403da --- /dev/null +++ b/src/main/res/drawable/list_item_background_light.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?><!-- + ~ Copyright (c) 2018, Daniel Gultsch All rights reserved. + ~ + ~ Redistribution and use in source and binary forms, with or without modification, + ~ are permitted provided that the following conditions are met: + ~ + ~ 1. Redistributions of source code must retain the above copyright notice, this + ~ list of conditions and the following disclaimer. + ~ + ~ 2. Redistributions in binary form must reproduce the above copyright notice, + ~ this list of conditions and the following disclaimer in the documentation and/or + ~ other materials provided with the distribution. + ~ + ~ 3. Neither the name of the copyright holder nor the names of its contributors + ~ may be used to endorse or promote products derived from this software without + ~ specific prior written permission. + ~ + ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + ~ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + ~ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + ~ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + ~ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + ~ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + ~ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + ~ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + --> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:drawable="@color/grey300" android:state_activated="true" /> +</selector>
\ No newline at end of file diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index c2e374356..0218e299b 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -5,7 +5,7 @@ <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" + android:background="?attr/list_item_background" android:padding="@dimen/list_padding"> <com.makeramen.roundedimageview.RoundedImageView diff --git a/src/main/res/menu/select_multiple.xml b/src/main/res/menu/select_multiple.xml deleted file mode 100644 index 51f05e21a..000000000 --- a/src/main/res/menu/select_multiple.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/selection_submit" - android:title="@string/invite_contact" - app:showAsAction="always" /> - -</menu> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 10690b682..1925f8cfe 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -25,6 +25,8 @@ <attr name="activity_background_search" format="reference" /> <attr name="activity_background_no_results" format="reference" /> + <attr name="list_item_background" format="reference" /> + <attr name="TextColorOnline" format="reference|color" /> <attr name="TextColorError" format="reference|color" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 56444212f..6ea10548f 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -22,6 +22,7 @@ <color name="grey200">#ffeeeeee</color> <color name="grey300">#ffe0e0e0</color> <color name="grey500">#ff9e9e9e</color> + <color name="grey700">#ff616161</color> <color name="grey800">#ff424242</color> <color name="grey900">#ff282828</color> <color name="red800">#ffc62828</color> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 57edf9ba6..8e2f3a313 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -21,6 +21,7 @@ <string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_start_conversation">Start Conversation</string> <string name="title_activity_choose_contact">Choose contact</string> + <string name="title_activity_choose_contacts">Choose Contacts</string> <string name="title_activity_block_list">Block list</string> <string name="just_now">just now</string> <string name="minute_ago">1 min ago</string> @@ -426,10 +427,6 @@ <item quantity="one">%d certificate deleted</item> <item quantity="other">%d certificates deleted</item> </plurals> - <plurals name="select_contact"> - <item quantity="one">Select %d contact</item> - <item quantity="other">Select %d contacts</item> - </plurals> <string name="pref_quick_action_summary">Replace send button with quick action</string> <string name="pref_quick_action">Quick Action</string> <string name="none">None</string> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 6eef29072..f6114cc23 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -18,6 +18,7 @@ <item name="activity_background_search">@drawable/search_background_light</item> <item name="activity_background_no_results">@drawable/no_results_background_light</item> + <item name="list_item_background">@drawable/list_item_background_light</item> <item name="EmojiColor">@color/realblack</item> @@ -152,6 +153,7 @@ <item name="activity_background_search">@drawable/search_background_dark</item> <item name="activity_background_no_results">@drawable/no_results_background_dark</item> + <item name="list_item_background">@drawable/list_item_background_dark</item> <item name="EmojiColor">@color/realwhite</item> |