Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Niedermann <info@niedermann.it>2020-11-26 16:57:25 +0300
committerStefan Niedermann <info@niedermann.it>2020-11-26 16:57:25 +0300
commit7aaffb043b6c3f8ca45498c1b1a0f2d92db64dd1 (patch)
tree244d643601c53401e3fff1b68840fceaae832f84 /app/src/main/java/it/niedermann/nextcloud/deck
parent56d03fe68be4fb6e7fa1743d66d0a01d0dc30a9f (diff)
Provide edit and preview mode for card description
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck')
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java5
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java25
2 files changed, 26 insertions, 4 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
index 34d2eb3f3..b18f35de0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/assignee/CardAssigneeDialog.java
@@ -24,10 +24,13 @@ import it.niedermann.nextcloud.deck.model.User;
import it.niedermann.nextcloud.deck.ui.branding.BrandedDeleteAlertDialogBuilder;
import it.niedermann.nextcloud.deck.ui.branding.BrandedDialogFragment;
import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
+import it.niedermann.nextcloud.deck.ui.card.attachments.previewdialog.PreviewDialog;
import static it.niedermann.nextcloud.deck.DeckApplication.isDarkTheme;
-@Deprecated
+/**
+ * TODO maybe this can be merged with {@link PreviewDialog}
+ */
public class CardAssigneeDialog extends BrandedDialogFragment {
private static final String KEY_USER = "user";
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 1422620a7..0ad30eb87 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
@@ -69,6 +69,7 @@ public class CardDetailsFragment extends BrandedFragment implements OnDateSetLis
private final DateTimeFormatter dateFormatter = DateTimeFormatter.ofLocalizedDate(FormatStyle.MEDIUM);
private final DateTimeFormatter timeFormatter = DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT);
private AppCompatActivity activity;
+ boolean editorActive = true;
@Override
public void onAttach(@NonNull Context context) {
@@ -138,9 +139,23 @@ public class CardDetailsFragment extends BrandedFragment implements OnDateSetLis
}
private void setupDescription() {
- binding.description.setMarkdownString(viewModel.getFullCard().getCard().getDescription());
if (viewModel.canEdit()) {
- binding.description.getMarkdownString().observe(getViewLifecycleOwner(), (newText) -> {
+ binding.descriptionToggle.setVisibility(VISIBLE);
+ binding.descriptionToggle.setOnClickListener((v) -> {
+ editorActive = !editorActive;
+ if (editorActive) {
+ binding.descriptionEditor.setVisibility(VISIBLE);
+ binding.descriptionViewer.setVisibility(GONE);
+ binding.descriptionToggle.setImageResource(R.drawable.ic_baseline_eye_24);
+ } else {
+ binding.descriptionEditor.setVisibility(GONE);
+ binding.descriptionViewer.setVisibility(VISIBLE);
+ binding.descriptionViewer.setMarkdownString(viewModel.getFullCard().getCard().getDescription());
+ binding.descriptionToggle.setImageResource(R.drawable.ic_edit_grey600_24dp);
+ }
+ });
+ binding.descriptionEditor.setMarkdownString(viewModel.getFullCard().getCard().getDescription());
+ binding.descriptionEditor.getMarkdownString().observe(getViewLifecycleOwner(), (newText) -> {
if (viewModel.getFullCard() != null) {
viewModel.getFullCard().getCard().setDescription(newText == null ? "" : newText.toString());
} else {
@@ -148,7 +163,11 @@ public class CardDetailsFragment extends BrandedFragment implements OnDateSetLis
}
});
} else {
- binding.description.setEnabled(false);
+ binding.descriptionEditor.setEnabled(false);
+ binding.descriptionEditor.setVisibility(VISIBLE);
+ binding.descriptionViewer.setEnabled(false);
+ binding.descriptionViewer.setVisibility(GONE);
+ binding.descriptionViewer.setMarkdownString(viewModel.getFullCard().getCard().getDescription());
}
}