From dc9f953abb828ac386b04742dd2106494b9ce9b9 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Mon, 3 Nov 2025 11:39:01 +0100 Subject: [PATCH 1/2] fix: status emptiness check Signed-off-by: alperozturk --- .../notes/accountswitcher/AccountSwitcherDialog.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java index 546fba440..12d4965e0 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java @@ -14,6 +14,7 @@ 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; @@ -21,7 +22,6 @@ 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 { From fea48db677c2027f6ad42f9296b75d0af8fbf6d3 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 3 Nov 2025 18:20:57 +0100 Subject: [PATCH 2/2] style(status): Add cut-out backgroudn for reguular status icon Signed-off-by: Andy Scherzinger --- .../notes/accountswitcher/AccountSwitcherDialog.java | 1 + .../owncloud/notes/branding/NotesViewThemeUtils.java | 7 +++++++ app/src/main/res/layout/dialog_account_switcher.xml | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java index 12d4965e0..1bdfcc97f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java @@ -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); } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java index 6192101fc..951216ead 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java +++ b/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}. diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml index beb9add50..862fe07a2 100644 --- a/app/src/main/res/layout/dialog_account_switcher.xml +++ b/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" />