From 8766bf2eb1e6e5b970d3a10f174751271583b9a0 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 2 May 2021 21:40:33 +0200 Subject: [PATCH 1/4] add contacts shimmer and improve link-based conversation creation items Signed-off-by: Andy Scherzinger --- .../talk/controllers/ContactsController.java | 55 ++++++++++++------- app/src/main/res/drawable/round_bgnd.xml | 24 ++++++++ .../res/layout/controller_contacts_rv.xml | 50 ++++++++++++----- .../layout/conversation_privacy_toggle.xml | 4 +- .../res/layout/join_conversation_via_link.xml | 4 +- .../res/layout/rv_item_contact_shimmer.xml | 48 ++++++++++++++++ 6 files changed, 151 insertions(+), 34 deletions(-) create mode 100644 app/src/main/res/drawable/round_bgnd.xml create mode 100644 app/src/main/res/layout/rv_item_contact_shimmer.xml 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 cde5fdbca..ecf9915c3 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -23,11 +23,11 @@ package com.nextcloud.talk.controllers; import android.app.SearchManager; import android.content.Context; import android.content.Intent; +import android.graphics.PorterDuff; import android.os.Build; import android.os.Bundle; import android.os.Handler; import android.text.InputType; -import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -36,7 +36,8 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.inputmethod.EditorInfo; -import android.widget.ProgressBar; +import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.RelativeLayout; import com.bluelinelabs.conductor.RouterTransaction; @@ -46,7 +47,6 @@ import com.kennyc.bottomsheet.BottomSheet; import com.nextcloud.talk.R; import com.nextcloud.talk.activities.MagicCallActivity; import com.nextcloud.talk.adapters.items.GenericTextHeaderItem; -import com.nextcloud.talk.adapters.items.ProgressItem; import com.nextcloud.talk.adapters.items.UserItem; import com.nextcloud.talk.api.NcApi; import com.nextcloud.talk.application.NextcloudTalkApplication; @@ -62,8 +62,6 @@ import com.nextcloud.talk.models.json.autocomplete.AutocompleteUser; import com.nextcloud.talk.models.json.conversations.Conversation; import com.nextcloud.talk.models.json.conversations.RoomOverall; import com.nextcloud.talk.models.json.participants.Participant; -import com.nextcloud.talk.models.json.sharees.Sharee; -import com.nextcloud.talk.models.json.sharees.ShareesOverall; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ConductorRemapping; import com.nextcloud.talk.utils.KeyboardUtils; @@ -90,6 +88,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.SearchView; import androidx.coordinatorlayout.widget.CoordinatorLayout; +import androidx.core.content.res.ResourcesCompat; import androidx.core.view.MenuItemCompat; import androidx.recyclerview.widget.RecyclerView; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; @@ -121,17 +120,14 @@ public class ContactsController extends BaseController implements SearchView.OnQ @Nullable @BindView(R.id.initial_relative_layout) RelativeLayout initialRelativeLayout; + @Nullable @BindView(R.id.secondary_relative_layout) RelativeLayout secondaryRelativeLayout; - @Inject - UserUtils userUtils; - @Inject - EventBus eventBus; - @Inject - AppPreferences appPreferences; - @BindView(R.id.progressBar) - ProgressBar progressBar; + + @BindView(R.id.loading_content) + LinearLayout loadingContent; + @BindView(R.id.recycler_view) RecyclerView recyclerView; @@ -147,11 +143,27 @@ public class ContactsController extends BaseController implements SearchView.OnQ @BindView(R.id.joinConversationViaLinkRelativeLayout) RelativeLayout joinConversationViaLinkLayout; + @BindView(R.id.joinConversationViaLinkImageView) + ImageView joinConversationViaLinkImageView; + + @BindView(R.id.public_call_link) + ImageView publicCallLinkImageView; + @BindView(R.id.generic_rv_layout) CoordinatorLayout genericRvLayout; @Inject NcApi ncApi; + + @Inject + UserUtils userUtils; + + @Inject + EventBus eventBus; + + @Inject + AppPreferences appPreferences; + private String credentials; private UserEntity currentUser; private Disposable contactsQueryDisposable; @@ -160,8 +172,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ private List contactItems; private BottomSheet bottomSheet; private View view; - private int currentPage; - private int currentSearchPage; private SmoothScrollLinearLayoutManager layoutManager; @@ -174,8 +184,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ private HashMap userHeaderItems = new HashMap<>(); private boolean alreadyFetching = false; - private boolean canFetchFurther = true; - private boolean canFetchSearchFurther = true; private MenuItem doneMenuItem; @@ -229,7 +237,6 @@ public class ContactsController extends BaseController implements SearchView.OnQ joinConversationViaLinkLayout.setVisibility(View.GONE); conversationPrivacyToogleLayout.setVisibility(View.GONE); } - } @Override @@ -658,12 +665,22 @@ public class ContactsController extends BaseController implements SearchView.OnQ } }); + joinConversationViaLinkImageView + .getBackground() + .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null), + PorterDuff.Mode.SRC_IN); + + publicCallLinkImageView + .getBackground() + .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null), + PorterDuff.Mode.SRC_IN); + disengageProgressBar(); } private void disengageProgressBar() { if (!alreadyFetching) { - progressBar.setVisibility(View.GONE); + loadingContent.setVisibility(View.GONE); genericRvLayout.setVisibility(View.VISIBLE); if (isNewConversationView) { diff --git a/app/src/main/res/drawable/round_bgnd.xml b/app/src/main/res/drawable/round_bgnd.xml new file mode 100644 index 000000000..f4f807528 --- /dev/null +++ b/app/src/main/res/drawable/round_bgnd.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/app/src/main/res/layout/controller_contacts_rv.xml b/app/src/main/res/layout/controller_contacts_rv.xml index fb917bbc2..e85dd4956 100644 --- a/app/src/main/res/layout/controller_contacts_rv.xml +++ b/app/src/main/res/layout/controller_contacts_rv.xml @@ -18,24 +18,48 @@ ~ along with this program. If not, see . --> - + + + + + + + + + + + + + + + + + + + app:tint="@color/white" /> + app:tint="@color/white" /> + + + + + + + + From beb7fdadba581ef4bc035a4e3e02c39101f6fee6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Sun, 2 May 2021 21:56:39 +0200 Subject: [PATCH 2/4] Update code check scores Signed-off-by: Andy Scherzinger --- scripts/analysis/findbugs-results.txt | 2 +- scripts/analysis/lint-results.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/analysis/findbugs-results.txt b/scripts/analysis/findbugs-results.txt index e1170b641..662106aa4 100644 --- a/scripts/analysis/findbugs-results.txt +++ b/scripts/analysis/findbugs-results.txt @@ -1 +1 @@ -489 \ No newline at end of file +485 \ No newline at end of file diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 7a97c565d..360bff57d 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 3 errors and 369 warnings + Lint Report: 3 errors and 371 warnings From 79e5c3bcaff7e18050da381a125a54a17a9bcb92 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 3 May 2021 08:54:12 +0200 Subject: [PATCH 3/4] change order/icon of public conversation creation item Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/controllers/ContactsController.java | 4 ++-- app/src/main/res/layout/controller_contacts_rv.xml | 4 ++-- app/src/main/res/layout/conversation_privacy_toggle.xml | 2 +- app/src/main/res/values-night/colors.xml | 2 ++ app/src/main/res/values/colors.xml | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) 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 ecf9915c3..735d0b68a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -667,12 +667,12 @@ public class ContactsController extends BaseController implements SearchView.OnQ joinConversationViaLinkImageView .getBackground() - .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null), + .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorBackgroundDarker, null), PorterDuff.Mode.SRC_IN); publicCallLinkImageView .getBackground() - .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null), + .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorBackgroundDarker, null), PorterDuff.Mode.SRC_IN); disengageProgressBar(); diff --git a/app/src/main/res/layout/controller_contacts_rv.xml b/app/src/main/res/layout/controller_contacts_rv.xml index e85dd4956..1a86acb33 100644 --- a/app/src/main/res/layout/controller_contacts_rv.xml +++ b/app/src/main/res/layout/controller_contacts_rv.xml @@ -62,11 +62,11 @@ #484848 + #2C2C2C + #121212 #484848 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 588b5bb8a..f847fe189 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -57,6 +57,7 @@ #E9FFFFFF #111111 #767676 + #DBDBDB #61000000 From e1ac6c2f0960ea7f65dc3b57f7568543c0c761eb Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 3 May 2021 13:47:17 +0200 Subject: [PATCH 4/4] use plus icon/primary for new group conversation Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/controllers/ContactsController.java | 2 +- app/src/main/res/layout/conversation_privacy_toggle.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 735d0b68a..4567d7f02 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java @@ -672,7 +672,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ publicCallLinkImageView .getBackground() - .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorBackgroundDarker, null), + .setColorFilter(ResourcesCompat.getColor(getResources(), R.color.colorPrimary, null), PorterDuff.Mode.SRC_IN); disengageProgressBar(); diff --git a/app/src/main/res/layout/conversation_privacy_toggle.xml b/app/src/main/res/layout/conversation_privacy_toggle.xml index cf600dc0e..e514cfedd 100644 --- a/app/src/main/res/layout/conversation_privacy_toggle.xml +++ b/app/src/main/res/layout/conversation_privacy_toggle.xml @@ -46,7 +46,7 @@ android:background="@drawable/round_bgnd" android:contentDescription="@null" android:padding="@dimen/standard_half_padding" - android:src="@drawable/ic_contacts" + android:src="@drawable/ic_add_white_24px" app:tint="@color/white" />