diff options
Diffstat (limited to 'src/main/res')
22 files changed, 208 insertions, 7 deletions
diff --git a/src/main/res/drawable-hdpi/ic_search_background_black.png b/src/main/res/drawable-hdpi/ic_search_background_black.png Binary files differnew file mode 100644 index 000000000..85db4f1d2 --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_search_background_black.png diff --git a/src/main/res/drawable-hdpi/ic_search_background_white.png b/src/main/res/drawable-hdpi/ic_search_background_white.png Binary files differnew file mode 100644 index 000000000..6ea523d3d --- /dev/null +++ b/src/main/res/drawable-hdpi/ic_search_background_white.png diff --git a/src/main/res/drawable-mdpi/ic_search_background_black.png b/src/main/res/drawable-mdpi/ic_search_background_black.png Binary files differnew file mode 100644 index 000000000..9d40a03ee --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_search_background_black.png diff --git a/src/main/res/drawable-mdpi/ic_search_background_white.png b/src/main/res/drawable-mdpi/ic_search_background_white.png Binary files differnew file mode 100644 index 000000000..6b63fbd99 --- /dev/null +++ b/src/main/res/drawable-mdpi/ic_search_background_white.png diff --git a/src/main/res/drawable-xhdpi/ic_search_background_black.png b/src/main/res/drawable-xhdpi/ic_search_background_black.png Binary files differnew file mode 100644 index 000000000..bf9283d3d --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_search_background_black.png diff --git a/src/main/res/drawable-xhdpi/ic_search_background_white.png b/src/main/res/drawable-xhdpi/ic_search_background_white.png Binary files differnew file mode 100644 index 000000000..60ad729b0 --- /dev/null +++ b/src/main/res/drawable-xhdpi/ic_search_background_white.png diff --git a/src/main/res/drawable-xxhdpi/ic_search_background_black.png b/src/main/res/drawable-xxhdpi/ic_search_background_black.png Binary files differnew file mode 100644 index 000000000..97be6790a --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_search_background_black.png diff --git a/src/main/res/drawable-xxhdpi/ic_search_background_white.png b/src/main/res/drawable-xxhdpi/ic_search_background_white.png Binary files differnew file mode 100644 index 000000000..f71fe7e2d --- /dev/null +++ b/src/main/res/drawable-xxhdpi/ic_search_background_white.png diff --git a/src/main/res/drawable-xxxhdpi/ic_search_background_black.png b/src/main/res/drawable-xxxhdpi/ic_search_background_black.png Binary files differnew file mode 100644 index 000000000..37d065fd7 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_search_background_black.png diff --git a/src/main/res/drawable-xxxhdpi/ic_search_background_white.png b/src/main/res/drawable-xxxhdpi/ic_search_background_white.png Binary files differnew file mode 100644 index 000000000..7bf84c8d9 --- /dev/null +++ b/src/main/res/drawable-xxxhdpi/ic_search_background_white.png diff --git a/src/main/res/drawable/search_background_dark.xml b/src/main/res/drawable/search_background_dark.xml new file mode 100644 index 000000000..cb42396b4 --- /dev/null +++ b/src/main/res/drawable/search_background_dark.xml @@ -0,0 +1,40 @@ +<?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. + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:drawable="@color/grey800" /> + + <item> + <bitmap + android:alpha="0.12" + android:gravity="center" + android:src="@drawable/ic_search_background_white" /> + </item> +</layer-list>
\ No newline at end of file diff --git a/src/main/res/drawable/search_background_light.xml b/src/main/res/drawable/search_background_light.xml new file mode 100644 index 000000000..aecd39e9a --- /dev/null +++ b/src/main/res/drawable/search_background_light.xml @@ -0,0 +1,40 @@ +<?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. + --> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:drawable="@color/grey50" /> + + <item> + <bitmap + android:alpha="0.12" + android:gravity="center" + android:src="@drawable/ic_search_background_black" /> + </item> +</layer-list>
\ No newline at end of file diff --git a/src/main/res/drawable/white_cursor.xml b/src/main/res/drawable/white_cursor.xml new file mode 100644 index 000000000..d89e81235 --- /dev/null +++ b/src/main/res/drawable/white_cursor.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. + --> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <size android:width="1.75dp" /> + <solid android:color="@color/white87" /> +</shape>
\ No newline at end of file diff --git a/src/main/res/layout/activity_search.xml b/src/main/res/layout/activity_search.xml index eaafdf291..9fc9d15d5 100644 --- a/src/main/res/layout/activity_search.xml +++ b/src/main/res/layout/activity_search.xml @@ -43,7 +43,7 @@ android:id="@+id/search_results" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary" + android:background="?attr/activity_background_search" android:divider="@android:color/transparent" android:dividerHeight="0dp" /> </LinearLayout> diff --git a/src/main/res/menu/activity_conversations.xml b/src/main/res/menu/activity_conversations.xml index a396194c6..4f19bcbdd 100644 --- a/src/main/res/menu/activity_conversations.xml +++ b/src/main/res/menu/activity_conversations.xml @@ -4,6 +4,7 @@ <item android:id="@+id/action_scan_qr_code" android:icon="?attr/icon_scan_qr_code" + android:orderInCategory="10" android:title="@string/scan_qr_code" android:visible="@bool/show_qr_code_scan" app:showAsAction="always" /> @@ -19,12 +20,12 @@ app:showAsAction="never" /> <item android:id="@+id/action_check_updates" - app:showAsAction="never" - android:title="@string/action_check_update" /> + android:title="@string/action_check_update" + app:showAsAction="never" /> <item android:id="@+id/action_invite_user" android:orderInCategory="100" - app:showAsAction="never" - android:title="@string/invite_user" /> + android:title="@string/invite_user" + app:showAsAction="never" /> </menu>
\ No newline at end of file diff --git a/src/main/res/menu/activity_search.xml b/src/main/res/menu/activity_search.xml new file mode 100644 index 000000000..b758b0554 --- /dev/null +++ b/src/main/res/menu/activity_search.xml @@ -0,0 +1,39 @@ +<?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. + --> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/action_search" + android:icon="?attr/icon_search" + android:title="@string/search" + app:actionLayout="@layout/actionview_search" + app:showAsAction="always" /> +</menu>
\ No newline at end of file diff --git a/src/main/res/menu/fragment_conversations_overview.xml b/src/main/res/menu/fragment_conversations_overview.xml new file mode 100644 index 000000000..2d37afd1b --- /dev/null +++ b/src/main/res/menu/fragment_conversations_overview.xml @@ -0,0 +1,37 @@ +<!-- + ~ 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. + --> + +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/action_search" + android:orderInCategory="50" + android:title="@string/title_activity_search" + app:showAsAction="never" /> +</menu>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 6cb9893ea..655f80230 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -7,7 +7,7 @@ <attr name="TextSizeSubhead" format="dimension" /> <attr name="TextSizeBody1" format="dimension" /> <attr name="TextSizeBody2" format="dimension" /> - <attr name="TextSizeDisplay2" format="dimension"/> + <attr name="TextSizeDisplay2" format="dimension" /> <attr name="TextSizeInput" format="dimension" /> <attr name="TextSeparation" format="dimension" /> <attr name="TextSizeBody" format="dimension" /> @@ -20,7 +20,9 @@ <attr name="color_background_secondary" format="reference|color" /> <attr name="color_background_primary" format="reference|color" /> <attr name="color_warning" format="reference|color" /> - <attr name="EmojiColor" format="reference|color"/> + <attr name="EmojiColor" format="reference|color" /> + + <attr name="activity_background_search" format="reference" /> <attr name="ic_send_cancel_offline" format="reference" /> <attr name="ic_send_location_offline" format="reference" /> diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index ffb542fc1..c573107f1 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -12,6 +12,7 @@ <color name="white">#ffe2e7f1</color> <color name="white12">#1fffffff</color> <color name="white70">#b2e2e7f1</color> + <color name="white87">#deffffff</color> <color name="grey50">#fafafa</color> <color name="grey200">#ffeeeeee</color> <color name="grey300">#ffe0e0e0</color> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 876bf8f75..515e440c1 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -781,4 +781,6 @@ <string name="create_shortcut">Create Shortcut</string> <string name="not_encrypted_for_this_device">Message was not encrypted for this device.</string> <string name="no_microphone_permission">Conversations needs access to the microphone</string> + <string name="title_activity_search">Search</string> + <string name="search_messages">Search messages</string> </resources> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 3c6edba4f..11430e064 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -36,6 +36,7 @@ <item name="android:textColorHint">@color/white70</item> <item name="android:background">@android:color/transparent</item> <item name="android:textSize">18sp</item> + <item name="android:textCursorDrawable">@drawable/white_cursor</item> </style> <style name="Widget.Conversations.CheckBox" parent="Widget.AppCompat.CompoundButton.CheckBox"> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 2860b5c59..fec28b976 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -13,6 +13,9 @@ <item name="color_background_primary">@color/grey50</item> <item name="color_background_secondary">@color/grey200</item> <item name="color_warning">@color/red_a700</item> + + <item name="activity_background_search">@drawable/search_background_light</item> + <item name="EmojiColor">@color/realblack</item> <item name="color_bubble_light">@color/lightwhite</item> @@ -128,6 +131,9 @@ <item name="color_background_primary">@color/grey900</item> <item name="color_background_secondary">@color/realblack</item> <item name="color_warning">@color/red_a700</item> + + <item name="activity_background_search">@drawable/search_background_dark</item> + <item name="EmojiColor">@color/realwhite</item> <item name="color_bubble_light">@color/darkwhite</item> |
