From 5ab44332c4133800e0f8ed29d41b2afd9d5be90d Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 19 Apr 2021 21:37:06 +0200 Subject: [PATCH 1/6] tone down placeholders in dark mode Resolves #1140 Signed-off-by: Andy Scherzinger --- .../rv_item_conversation_with_last_message_shimmer.xml | 9 ++++++--- .../res/layout/user_info_details_table_item_shimmer.xml | 6 ++++-- app/src/main/res/values-night/colors.xml | 4 ++++ app/src/main/res/values/colors.xml | 4 ++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message_shimmer.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message_shimmer.xml index fc8275232..9f074f278 100644 --- a/app/src/main/res/layout/rv_item_conversation_with_last_message_shimmer.xml +++ b/app/src/main/res/layout/rv_item_conversation_with_last_message_shimmer.xml @@ -32,7 +32,8 @@ android:layout_centerVertical="true" android:layout_marginEnd="@dimen/double_margin_between_elements" android:contentDescription="@null" - app:corners="100" /> + app:corners="100" + app:custom_color="@color/nc_shimmer_default_color" /> + android:textStyle="bold" + app:custom_color="@color/nc_shimmer_default_color" /> + android:layout_marginTop="6dp" + app:custom_color="@color/nc_shimmer_darker_color" /> diff --git a/app/src/main/res/layout/user_info_details_table_item_shimmer.xml b/app/src/main/res/layout/user_info_details_table_item_shimmer.xml index 3482d1199..38984ed2a 100644 --- a/app/src/main/res/layout/user_info_details_table_item_shimmer.xml +++ b/app/src/main/res/layout/user_info_details_table_item_shimmer.xml @@ -28,13 +28,15 @@ android:layout_height="@dimen/iconized_single_line_item_icon_size" android:layout_gravity="center_vertical" android:layout_marginStart="@dimen/standard_margin" - app:corners="100" /> + app:corners="100" + app:custom_color="@color/nc_shimmer_default_color" /> + android:layout_marginEnd="@dimen/standard_margin" + app:custom_color="@color/nc_shimmer_default_color" /> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 71662a257..cca535763 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -58,4 +58,8 @@ #66484848 #8c8c8c + + + #4B4B4B + #282828 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 608cce367..cc4db82b8 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -76,4 +76,8 @@ #BF999999 #FFCC00 + + + #D7D7D7 + #B4B4B4 From bb1eb2fc1cf79fd50ed963826323fafd5e6049d1 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 19 Apr 2021 21:39:45 +0200 Subject: [PATCH 2/6] iconify upload bottom sheet Signed-off-by: Andy Scherzinger --- .../main/res/drawable/ic_share_variant.xml | 23 +++++ app/src/main/res/layout/dialog_attachment.xml | 86 ++++++++++++++++--- app/src/main/res/values/strings.xml | 1 + 3 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 app/src/main/res/drawable/ic_share_variant.xml diff --git a/app/src/main/res/drawable/ic_share_variant.xml b/app/src/main/res/drawable/ic_share_variant.xml new file mode 100644 index 000000000..caf4b5ecb --- /dev/null +++ b/app/src/main/res/drawable/ic_share_variant.xml @@ -0,0 +1,23 @@ + + + + diff --git a/app/src/main/res/layout/dialog_attachment.xml b/app/src/main/res/layout/dialog_attachment.xml index 63b566385..70ccc5e38 100644 --- a/app/src/main/res/layout/dialog_attachment.xml +++ b/app/src/main/res/layout/dialog_attachment.xml @@ -2,6 +2,8 @@ ~ Nextcloud Talk application ~ ~ @author Marcel Hibbe + ~ @author Andy Scherzinger + ~ Copyright (C) 2021 Andy Scherzinger ~ Copyright (C) 2021 Marcel Hibbe ~ ~ This program is free software: you can redistribute it and/or modify @@ -19,27 +21,85 @@ --> + android:paddingBottom="@dimen/standard_padding"> - + + + android:background="?android:attr/selectableItemBackground" + android:orientation="horizontal" + android:paddingLeft="@dimen/standard_padding" + android:paddingTop="@dimen/standard_half_padding" + android:paddingRight="@dimen/standard_padding" + android:paddingBottom="@dimen/standard_half_padding" + tools:ignore="UseCompoundDrawables"> - + + + + + + + android:background="?android:attr/selectableItemBackground" + android:orientation="horizontal" + android:paddingLeft="@dimen/standard_padding" + android:paddingTop="@dimen/standard_half_padding" + android:paddingRight="@dimen/standard_padding" + android:paddingBottom="@dimen/standard_padding" + tools:ignore="UseCompoundDrawables"> - \ No newline at end of file + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8633770d7..33297aa52 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -346,6 +346,7 @@ Open in Files app + Add to conversation Upload local file Share from %1$s Sorry, upload failed From 6810bc98d4f4e88b2846839d36b80f75e22e3e1e Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 19 Apr 2021 22:33:16 +0200 Subject: [PATCH 3/6] use outlined text view style Signed-off-by: Andy Scherzinger --- .../main/res/layout/controller_entry_menu.xml | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/app/src/main/res/layout/controller_entry_menu.xml b/app/src/main/res/layout/controller_entry_menu.xml index 09ad76d90..664af4045 100644 --- a/app/src/main/res/layout/controller_entry_menu.xml +++ b/app/src/main/res/layout/controller_entry_menu.xml @@ -20,9 +20,13 @@ + android:background="@color/bg_bottom_sheet" + android:paddingStart="@dimen/standard_padding" + android:paddingTop="@dimen/standard_padding" + android:paddingEnd="@dimen/standard_half_padding"> @@ -67,14 +68,15 @@ + android:tint="@color/emoji_icons" + android:visibility="gone" + tools:visibility="visible" /> From e1d4331f16ee925347a05dbcc17af5fe36c399fe Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 19 Apr 2021 22:52:30 +0200 Subject: [PATCH 4/6] properly set pull-to-refresh-spinner-background-color Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/controllers/ContactsController.java | 1 + .../nextcloud/talk/controllers/ConversationsListController.java | 1 + app/src/main/res/values-night/colors.xml | 1 + app/src/main/res/values/colors.xml | 1 + 4 files changed, 4 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java index 3bc52b54f..cde5fdbca 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -643,6 +643,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ swipeRefreshLayout.setOnRefreshListener(() -> fetchData(true)); swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary); + swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.refresh_spinner_background); fastScroller.addOnScrollStateChangeListener(this); adapter.setFastScroller(fastScroller); diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index cbb42b409..1b3b025de 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -522,6 +522,7 @@ public class ConversationsListController extends BaseController implements Searc swipeRefreshLayout.setOnRefreshListener(() -> fetchData(false)); swipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary); + swipeRefreshLayout.setProgressBackgroundColorSchemeResource(R.color.refresh_spinner_background); emptyLayoutView.setOnClickListener(v -> showNewConversationsScreen()); floatingActionButton.setOnClickListener(v -> { diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index cca535763..97450c3dd 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -31,6 +31,7 @@ #1E1E1E #FFFFFF + #222222 #deffffff diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index cc4db82b8..e1d0f2e44 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -32,6 +32,7 @@ @android:color/white #666666 #A5A5A5 + #ffffff #de000000 From 5aa28e4477e3cd5ae88b14795c3437d042168138 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 20 Apr 2021 00:46:09 +0200 Subject: [PATCH 5/6] Make sound choice icons simple radio buttons Signed-off-by: Andy Scherzinger --- .../adapters/items/NotificationSoundItem.java | 44 +++++-------------- .../ic_play_circle_outline_white_24dp.xml | 25 ----------- .../main/res/drawable/ic_stop_white_24dp.xml | 25 ----------- .../res/layout/rv_item_notification_sound.xml | 27 ++---------- 4 files changed, 14 insertions(+), 107 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_play_circle_outline_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_stop_white_24dp.xml diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java b/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java index ffa33fbcc..f4bfb199c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/NotificationSoundItem.java @@ -20,27 +20,24 @@ package com.nextcloud.talk.adapters.items; -import android.content.res.Resources; -import android.graphics.drawable.ColorDrawable; import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; + +import com.google.android.material.radiobutton.MaterialRadioButton; +import com.nextcloud.talk.R; + +import java.util.List; + import butterknife.BindView; import butterknife.ButterKnife; -import com.facebook.drawee.view.SimpleDraweeView; -import com.nextcloud.talk.R; -import com.nextcloud.talk.application.NextcloudTalkApplication; import eu.davidea.flexibleadapter.FlexibleAdapter; import eu.davidea.flexibleadapter.items.AbstractFlexibleItem; import eu.davidea.flexibleadapter.items.IFlexible; import eu.davidea.viewholders.FlexibleViewHolder; -import java.util.List; - public class NotificationSoundItem extends AbstractFlexibleItem { - private String notificationSoundName; - private String notificationSoundUri; + private final String notificationSoundName; + private final String notificationSoundUri; public NotificationSoundItem(String notificationSoundName, String notificationSoundUri) { this.notificationSoundName = notificationSoundName; @@ -73,31 +70,12 @@ public class NotificationSoundItem extends AbstractFlexibleItem adapter, NotificationSoundItemViewHolder holder, int position, List payloads) { holder.notificationName.setText(notificationSoundName); - - if (adapter.isSelected(position)) { - holder.checkedImageView.setVisibility(View.VISIBLE); - } else { - holder.checkedImageView.setVisibility(View.GONE); - } - - Resources resources = NextcloudTalkApplication.Companion.getSharedApplication().getResources(); - holder.simpleDraweeView.getHierarchy().setBackgroundImage(new ColorDrawable(resources.getColor(R.color.colorPrimary))); - if (position == 0) { - holder.simpleDraweeView.getHierarchy().setImage(resources.getDrawable(R.drawable.ic_stop_white_24dp), 100, - true); - } else { - holder.simpleDraweeView.getHierarchy().setImage(resources.getDrawable(R.drawable.ic_play_circle_outline_white_24dp), 100, - true); - } + holder.notificationName.setChecked(adapter.isSelected(position)); } static class NotificationSoundItemViewHolder extends FlexibleViewHolder { @BindView(R.id.notificationNameTextView) - public TextView notificationName; - @BindView(R.id.simpleDraweeView) - SimpleDraweeView simpleDraweeView; - @BindView(R.id.checkedImageView) - ImageView checkedImageView; + public MaterialRadioButton notificationName; /** * Default constructor. @@ -107,6 +85,4 @@ public class NotificationSoundItem extends AbstractFlexibleItem - ~ - ~ This 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 - ~ at your option) any later version. - ~ - ~ This program is distributed in the hope that it will be useful, - ~ but WITHOUT ANY WARRANTY; without even the implied warranty of - ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - ~ GNU General Public License for more details. - ~ - ~ You should have received a copy of the GNU General Public License - ~ along with this program. If not, see . - --> - - - - diff --git a/app/src/main/res/drawable/ic_stop_white_24dp.xml b/app/src/main/res/drawable/ic_stop_white_24dp.xml deleted file mode 100644 index fd64c8e55..000000000 --- a/app/src/main/res/drawable/ic_stop_white_24dp.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - diff --git a/app/src/main/res/layout/rv_item_notification_sound.xml b/app/src/main/res/layout/rv_item_notification_sound.xml index e3c9a4d8a..ac709ae46 100644 --- a/app/src/main/res/layout/rv_item_notification_sound.xml +++ b/app/src/main/res/layout/rv_item_notification_sound.xml @@ -21,7 +21,6 @@ --> - - - - - From 8eafd0a1632d2ec5a11732b1a47d266c565a409f Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 25 Apr 2021 21:55:58 +0200 Subject: [PATCH 6/6] unify text-colors for messages in chat Signed-off-by: Andy Scherzinger --- .../main/res/layout/item_custom_outcoming_text_message.xml | 7 +++++-- app/src/main/res/values-night/colors.xml | 1 - app/src/main/res/values/colors.xml | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/src/main/res/layout/item_custom_outcoming_text_message.xml b/app/src/main/res/layout/item_custom_outcoming_text_message.xml index 793eb42de..d19c0e670 100644 --- a/app/src/main/res/layout/item_custom_outcoming_text_message.xml +++ b/app/src/main/res/layout/item_custom_outcoming_text_message.xml @@ -20,6 +20,7 @@ + android:textIsSelectable="true" + tools:text="Talk to ayou later!" /> + app:layout_alignSelf="center" + tools:text="10:35" /> #484848 - #D8D8D8 @android:color/holo_purple #121212 #484848 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index e1d0f2e44..588b5bb8a 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -42,7 +42,7 @@ #FFFFFF - #37505D + @color/high_emphasis_text @color/high_emphasis_text