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-07-21 13:08:27 +0300
committerStefan Niedermann <info@niedermann.it>2020-07-21 13:08:27 +0300
commitf2e73963e8d130c4dcd5cf361fd5e2c809921c35 (patch)
tree08872729e99d0eb04fec9802bdfff952e18bc2d1 /app/src/main/java/it/niedermann/nextcloud/deck/ui/card
parentd2774bf18855f08c65a46355e059e5bcd812b262 (diff)
#573 projects - Enhance resources dialog
Diffstat (limited to 'app/src/main/java/it/niedermann/nextcloud/deck/ui/card')
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardProjectsAdapter.java2
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java10
2 files changed, 9 insertions, 3 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardProjectsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardProjectsAdapter.java
index f9b17560f..0c2d63d74 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardProjectsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardProjectsAdapter.java
@@ -42,7 +42,7 @@ public class CardProjectsAdapter extends RecyclerView.Adapter<CardProjectsViewHo
@Override
public void onBindViewHolder(@NonNull CardProjectsViewHolder holder, int position) {
final OcsProjectWithResources project = projects.get(position);
- holder.bind(project, (v) -> CardProjectResourcesDialog.newInstance(project.getResources()).show(fragmentManager, CardProjectResourcesDialog.class.getSimpleName()));
+ holder.bind(project, (v) -> CardProjectResourcesDialog.newInstance(project.getName(), project.getResources()).show(fragmentManager, CardProjectResourcesDialog.class.getSimpleName()));
}
@Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java
index a6464c247..fdd386f7e 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourcesDialog.java
@@ -7,6 +7,7 @@ import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.fragment.app.DialogFragment;
import androidx.lifecycle.ViewModelProvider;
@@ -23,11 +24,13 @@ import it.niedermann.nextcloud.deck.ui.card.EditCardViewModel;
public class CardProjectResourcesDialog extends BrandedDialogFragment {
private static final String KEY_RESOURCES = "resources";
+ private static final String KEY_PROJECT_NAME = "projectName";
private CardProjectResourceAdapter adapter;
private SyncManager syncManager;
private DialogProjectResourcesBinding binding;
private EditCardViewModel viewModel;
+ private String projectName;
@NonNull
private List<OcsProjectResource> resources = new ArrayList<>();
@@ -39,6 +42,7 @@ public class CardProjectResourcesDialog extends BrandedDialogFragment {
throw new IllegalArgumentException("Provide at least " + KEY_RESOURCES);
}
this.resources.addAll((ArrayList<OcsProjectResource>) args.getSerializable(KEY_RESOURCES));
+ this.projectName = args.getString(KEY_PROJECT_NAME);
}
@Override
@@ -60,7 +64,8 @@ public class CardProjectResourcesDialog extends BrandedDialogFragment {
// TODO parameter needed
adapter = new CardProjectResourceAdapter(viewModel.getAccount(), resources);
- binding.getRoot().setAdapter(adapter);
+ binding.recyclerView.setAdapter(adapter);
+ binding.projectName.setText(projectName);
return binding.getRoot();
}
@@ -69,9 +74,10 @@ public class CardProjectResourcesDialog extends BrandedDialogFragment {
}
- public static DialogFragment newInstance(@NonNull List<OcsProjectResource> resources) {
+ public static DialogFragment newInstance(@Nullable String projectName, @NonNull List<OcsProjectResource> resources) {
final DialogFragment fragment = new CardProjectResourcesDialog();
final Bundle args = new Bundle();
+ args.putString(KEY_PROJECT_NAME, projectName);
args.putSerializable(KEY_RESOURCES, new ArrayList<>(resources));
fragment.setArguments(args);
return fragment;