Merge pull request #2901 from nextcloud/fix/status-emptiness-check

fix: status emptiness check

Author: AndyScherzinger

app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java

@@ -14,14 +14,14 @@
 import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.owncloud.android.lib.resources.users.Status;
-import com.owncloud.android.lib.resources.users.StatusType;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -90,13 +90,13 @@ private void initRepositoryAndFetchCurrentStatus() {
                 currentStatus = repository.fetchUserStatus();
                 requireActivity().runOnUiThread(() -> {
                     final var message = currentStatus.getMessage();
-                    if (message != null) {
+                    if (!TextUtils.isEmpty(message)) {
                         binding.accountStatus.setVisibility(View.VISIBLE);
                         binding.accountStatus.setText(message);
                     }
 
                     final var emoji = currentStatus.getIcon();
-                    if (emoji != null) {
+                    if (!TextUtils.isEmpty(emoji)) {
                         binding.accountStatusEmoji.setVisibility(View.VISIBLE);
                         binding.accountStatusEmoji.setText(emoji);
                     } else {
@@ -193,5 +193,6 @@ public static DialogFragment newInstance(long currentAccountId) {
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, requireContext());
         util.notes.colorLayerDrawable((LayerDrawable) binding.check.getDrawable(), R.id.area, color);
+        util.notes.colorBackgroundDrawable(binding.accountStatusIcon);
     }
 }

app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java

@@ -69,6 +69,13 @@ public void colorNavigationViewItem(@NonNull View view) {
         });
     }
 
+    public void colorBackgroundDrawable(@NonNull ImageView view) {
+        withScheme(view, scheme -> {
+            view.setBackgroundTintList(ColorStateList.valueOf(dynamicColor.surface().getArgb(scheme)));
+            return view;
+        });
+    }
+
     /**
      * The Notes app uses custom navigation view items because they have several features which are
      * not covered by {@link NavigationItem}.

app/src/main/res/layout/dialog_account_switcher.xml

@@ -50,9 +50,10 @@
                 android:layout_width="@dimen/user_status_icon_size"
                 android:layout_height="@dimen/user_status_icon_size"
                 android:layout_gravity="bottom|end"
+                android:background="@drawable/round_bgnd"
                 android:visibility="gone"
                 app:srcCompat="@drawable/ic_user_status_away"
-                tools:visibility="visible"/>
+                tools:visibility="visible" />
         </FrameLayout>
 
         <LinearLayout