Skip to content

fix: status emptiness check #2901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2025
Merged

fix: status emptiness check #2901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc9f953
fix: status emptiness check
alperozturk96 Nov 3, 2025
fea48db
style(status): Add cut-out backgroudn for reguular status icon
AndyScherzinger Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/src/main/java/it/niedermann/owncloud/notes/accountswitcher/AccountSwitcherDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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);
}
}
7 changes: 7 additions & 0 deletions app/src/main/java/it/niedermann/owncloud/notes/branding/NotesViewThemeUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}.
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/res/layout/dialog_account_switcher.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading