diff options
Diffstat (limited to 'app/src')
17 files changed, 22 insertions, 22 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java b/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java index 4ac1b8f93..b54d3b5d6 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/database/migration/Migration_20_21.java @@ -33,8 +33,8 @@ public class Migration_20_21 extends Migration { @ColorInt int color1; @ColorInt int color2; try { - color1 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString1)); - color2 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString2)); + color1 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString1)); + color2 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString2)); } catch (Exception e) { color1 = Color.GRAY; color2 = Color.GRAY; @@ -64,7 +64,7 @@ public class Migration_20_21 extends Migration { @ColorInt int color1; try { - color1 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString1)); + color1 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString1)); } catch (Exception e) { color1 = Color.GRAY; } @@ -98,7 +98,7 @@ public class Migration_20_21 extends Migration { @ColorInt int color1; try { - color1 = Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(colorAsString1)); + color1 = Color.parseColor(ColorUtil.formatColorToParsableHexString(colorAsString1)); } catch (Exception e) { color1 = Color.GRAY; } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java index 317557a61..b2fba2063 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java @@ -97,7 +97,7 @@ public class Board extends AbstractRemoteEntity implements Serializable { public void setColor(String color) { try { - setColor(Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(color))); + setColor(Color.parseColor(ColorUtil.formatColorToParsableHexString(color))); } catch (Exception e) { DeckLog.logError(e); setColor(Color.GRAY); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java index b065f411c..4555faccc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java @@ -73,7 +73,7 @@ public class Label extends AbstractRemoteEntity implements Serializable { public void setColor(String color) { try { - setColor(Color.parseColor(ColorUtil.INSTANCE.formatColorToParsableHexString(color))); + setColor(Color.parseColor(ColorUtil.formatColorToParsableHexString(color))); } catch (Exception e) { DeckLog.logError(e); setColor(Color.GRAY); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java index 5c2a83dff..26327890c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/JsonToEntityParser.java @@ -585,7 +585,7 @@ public class JsonToEntityParser { String rawString = getNullAsEmptyString(element.get(field)); try { if (!rawString.trim().isEmpty()) { - String colorAsString = ColorUtil.INSTANCE.formatColorToParsableHexString(rawString); + String colorAsString = ColorUtil.formatColorToParsableHexString(rawString); return Color.parseColor(colorAsString); } } catch (Exception e) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java index 635344d0b..0855ef71e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/api/json/JsonColorSerializer.java @@ -14,7 +14,7 @@ public class JsonColorSerializer extends TypeAdapter<Integer> { if (value == null) { out.nullValue(); } else { - out.value(ColorUtil.INSTANCE.intColorToHexString(value)); + out.value(ColorUtil.intColorToHexString(value)); } } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java index 381a290e6..7a4d1a193 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsViewHolder.java @@ -23,7 +23,7 @@ public class ManageLabelsViewHolder extends RecyclerView.ViewHolder { binding.label.setText(label.getTitle()); final int labelColor = label.getColor(); binding.label.setChipBackgroundColor(ColorStateList.valueOf(labelColor)); - final int color = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor); + final int color = ColorUtil.getForegroundColorForBackgroundColor(labelColor); binding.label.setTextColor(color); binding.delete.setOnClickListener((v) -> listener.requestDelete(label)); binding.editText.setOnClickListener((v) -> listener.requestEdit(label)); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java index 0af489781..0f0b91b6c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/LabelAutoCompleteAdapter.java @@ -98,7 +98,7 @@ public class LabelAutoCompleteAdapter extends AutoCompleteAdapter<Label> { final var label = getItem(position); final int labelColor = label.getColor(); - final int color = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor); + final int color = ColorUtil.getForegroundColorForBackgroundColor(labelColor); if (label.getLocalId() == null) { binding.label.setText(String.format(context.getString(R.string.label_add, label.getTitle()))); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java index f78edd3f7..fd1cf6115 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/activities/CardActivityViewHolder.java @@ -32,7 +32,7 @@ public class CardActivityViewHolder extends RecyclerView.ViewHolder { itemView.setOnClickListener(View::showContextMenu); itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> { inflater.inflate(R.menu.activity_menu, menu); - menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.INSTANCE.copyToClipboard(context, activity.getSubject())); + menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(context, activity.getSubject())); }); final var type = ActivityType.findById(activity.getType()); setImageResource(binding.type, type); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java index 7b00f2a84..977035940 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/AttachmentViewHolder.java @@ -47,7 +47,7 @@ public abstract class AttachmentViewHolder extends RecyclerView.ViewHolder { menu.findItem(android.R.id.copyUrl).setVisible(false); } else { menu.findItem(android.R.id.copyUrl).setVisible(true); - menu.findItem(android.R.id.copyUrl).setOnMenuItemClickListener(item -> ClipboardUtil.INSTANCE.copyToClipboard(itemView.getContext(), attachment.getFilename(), attachmentUri)); + menu.findItem(android.R.id.copyUrl).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(itemView.getContext(), attachment.getFilename(), attachmentUri)); } }); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java index 7a4df435f..37e9497e4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/ItemCommentViewHolder.java @@ -61,7 +61,7 @@ public class ItemCommentViewHolder extends RecyclerView.ViewHolder { itemView.setOnClickListener(View::showContextMenu); itemView.setOnCreateContextMenuListener((menu, v, menuInfo) -> { inflater.inflate(R.menu.comment_menu, menu); - menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.INSTANCE.copyToClipboard(itemView.getContext(), comment.getComment().getMessage())); + menu.findItem(android.R.id.copy).setOnMenuItemClickListener(item -> ClipboardUtil.copyToClipboard(itemView.getContext(), comment.getComment().getMessage())); final var replyMenuItem = menu.findItem(R.id.reply); if (comment.getStatusEnum() != DBStatus.LOCAL_EDITED && account.getServerDeckVersionAsObject().supportsCommentsReplies()) { replyMenuItem.setOnMenuItemClickListener(item -> { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java index d86f9361a..1c1f737a9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java @@ -278,7 +278,7 @@ public class CardDetailsFragment extends Fragment implements CardDueDateView.Due try { final int labelColor = label.getColor(); chip.setChipBackgroundColor(ColorStateList.valueOf(labelColor)); - final int color = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor); + final int color = ColorUtil.getForegroundColorForBackgroundColor(labelColor); chip.setTextColor(color); if (chip.getCloseIcon() != null) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java index 0e558fb85..b6fd5a484 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionActivity.java @@ -37,14 +37,14 @@ public class ExceptionActivity extends AppCompatActivity { } final var adapter = new TipsAdapter(this::startActivity); - final String debugInfo = "Full Crash:\n\n" + ExceptionUtil.INSTANCE.getDebugInfos(this, throwable, BuildConfig.FLAVOR); + final String debugInfo = "Full Crash:\n\n" + ExceptionUtil.getDebugInfos(this, throwable, BuildConfig.FLAVOR); binding.tips.setAdapter(adapter); binding.tips.setNestedScrollingEnabled(false); binding.toolbar.setTitle(R.string.error); binding.message.setText(throwable.getMessage()); binding.stacktrace.setText(debugInfo); - binding.copy.setOnClickListener((v) -> ClipboardUtil.INSTANCE.copyToClipboard(this, getString(R.string.simple_exception), "```\n" + debugInfo + "\n```")); + binding.copy.setOnClickListener((v) -> ClipboardUtil.copyToClipboard(this, getString(R.string.simple_exception), "```\n" + debugInfo + "\n```")); binding.close.setOnClickListener((v) -> finish()); final var utils = ThemeUtils.defaultBrand(this); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java index a69ddf80e..54fa0912d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/exception/ExceptionDialogFragment.java @@ -53,7 +53,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment { final var adapter = new TipsAdapter((actionIntent) -> requireActivity().startActivity(actionIntent)); - final String debugInfos = ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), throwable, BuildConfig.FLAVOR, account == null ? null : account.getServerDeckVersion()); + final String debugInfos = ExceptionUtil.getDebugInfos(requireContext(), throwable, BuildConfig.FLAVOR, account == null ? null : account.getServerDeckVersion()); binding.tips.setAdapter(adapter); binding.stacktrace.setText(debugInfos); @@ -66,7 +66,7 @@ public class ExceptionDialogFragment extends AppCompatDialogFragment { .setView(binding.getRoot()) .setTitle(R.string.error_dialog_title) .setPositiveButton(android.R.string.copy, (a, b) -> { - ClipboardUtil.INSTANCE.copyToClipboard(requireContext(), getString(R.string.simple_exception), "```\n" + debugInfos + "\n```"); + ClipboardUtil.copyToClipboard(requireContext(), getString(R.string.simple_exception), "```\n" + debugInfos + "\n```"); a.dismiss(); }) .setNegativeButton(R.string.simple_close, null) diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java index 0a8dadfa2..ef8ce7c4d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/filter/FilterLabelsAdapter.java @@ -86,7 +86,7 @@ public class FilterLabelsAdapter extends RecyclerView.Adapter<FilterLabelsAdapte binding.label.setText(label.getTitle()); final int labelColor = label.getColor(); binding.label.setChipBackgroundColor(ColorStateList.valueOf(labelColor)); - final int textColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor); + final int textColor = ColorUtil.getForegroundColorForBackgroundColor(labelColor); binding.label.setTextColor(textColor); itemView.setSelected(selectedLabels.contains(label)); applyTheme(color); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java index e6d4693e0..4388d0ae3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/main/MainActivity.java @@ -520,7 +520,7 @@ public class MainActivity extends AppCompatActivity implements DeleteStackListen utils.deck.themeEmptyContentView(binding.emptyContentViewBoards); utils.platform.colorNavigationView(binding.navigationView, false); - @ColorInt final int headerTextColor = ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(accountColor); + @ColorInt final int headerTextColor = ColorUtil.getForegroundColorForBackgroundColor(accountColor); headerBinding.headerView.setBackgroundColor(accountColor); headerBinding.appName.setTextColor(headerTextColor); DrawableCompat.setTint(headerBinding.logo.getDrawable(), headerTextColor); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java index c0ab59e75..95fffe567 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareProgressDialogFragment.java @@ -70,7 +70,7 @@ public class ShareProgressDialogFragment extends ThemedDialogFragment { binding.errorReportButton.setOnClickListener((v) -> { final StringBuilder debugInfos = new StringBuilder(exceptionsCount + " attachments failed to upload:"); for (Throwable t : exceptions) { - debugInfos.append(ExceptionUtil.INSTANCE.getDebugInfos(requireContext(), t, BuildConfig.FLAVOR)); + debugInfos.append(ExceptionUtil.getDebugInfos(requireContext(), t, BuildConfig.FLAVOR)); } ExceptionDialogFragment.newInstance(new UploadAttachmentFailedException(debugInfos.toString()), null) .show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName()); diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java index d69ff2898..cd6a63a3d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/view/labelchip/LabelChip.java @@ -45,7 +45,7 @@ public class LabelChip extends Chip { int labelColor = label.getColor(); final var colorStateList = ColorStateList.valueOf(labelColor); setChipBackgroundColor(colorStateList); - setTextColor(ColorUtil.INSTANCE.getForegroundColorForBackgroundColor(labelColor)); + setTextColor(ColorUtil.getForegroundColorForBackgroundColor(labelColor)); } catch (IllegalArgumentException e) { DeckLog.logError(e); } |