diff options
author | Stefan Niedermann <info@niedermann.it> | 2021-05-25 21:35:01 +0300 |
---|---|---|
committer | Stefan Niedermann <info@niedermann.it> | 2021-05-25 21:35:01 +0300 |
commit | 0e2370a3f28a2a2b1684d22b6c8877f435e6ed8b (patch) | |
tree | a6f2237f062833ae087ec4e3ef8179d5b8aceeec /app/src/main/java/it/niedermann | |
parent | 3272714ea46e38753d46ee0ec5ac032429becfe7 (diff) |
Simplify CardDetailsFragment
Signed-off-by: Stefan Niedermann <info@niedermann.it>
Diffstat (limited to 'app/src/main/java/it/niedermann')
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java | 4 | ||||
-rw-r--r-- | app/src/main/java/it/niedermann/nextcloud/deck/ui/card/details/CardDetailsFragment.java | 21 |
2 files changed, 6 insertions, 19 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java index 473ad06c1..3f6c62a52 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java @@ -22,8 +22,8 @@ import it.niedermann.nextcloud.deck.util.ViewUtil; public class UserAutoCompleteAdapter extends AutoCompleteAdapter<User> { @NonNull - private Account account; - private UserSearchLiveData liveSearchForACL; + private final Account account; + private final UserSearchLiveData liveSearchForACL; private LiveData<List<User>> liveData; private Observer<List<User>> observer; 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 a354a4ef0..db4b3f08c 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 @@ -1,6 +1,5 @@ package it.niedermann.nextcloud.deck.ui.card.details; -import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.Drawable; import android.os.Bundle; @@ -15,7 +14,6 @@ import androidx.annotation.ColorInt; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Px; -import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; import androidx.core.graphics.ColorUtils; import androidx.core.graphics.drawable.DrawableCompat; @@ -70,19 +68,8 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, private AssigneeAdapter adapter; 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) { - super.onAttach(context); - if (context instanceof AppCompatActivity) { - this.activity = (AppCompatActivity) context; - } else { - throw new ClassCastException("Calling context must be an " + AppCompatActivity.class.getCanonicalName()); - } - } - public static Fragment newInstance() { return new CardDetailsFragment(); } @@ -92,7 +79,7 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, ViewGroup container, Bundle savedInstanceState) { binding = FragmentCardEditTabDetailsBinding.inflate(inflater, container, false); - viewModel = new ViewModelProvider(activity).get(EditCardViewModel.class); + viewModel = new ViewModelProvider(requireActivity()).get(EditCardViewModel.class); // This might be a zombie fragment with an empty EditCardViewModel after Android killed the activity (but not the fragment instance // See https://github.com/stefan-niedermann/nextcloud-deck/issues/478 @@ -236,7 +223,7 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, if (viewModel.canEdit()) { Long localCardId = viewModel.getFullCard().getCard().getLocalId(); localCardId = localCardId == null ? -1 : localCardId; - binding.labels.setAdapter(new LabelAutoCompleteAdapter(activity, accountId, boardId, localCardId)); + binding.labels.setAdapter(new LabelAutoCompleteAdapter(requireActivity(), accountId, boardId, localCardId)); binding.labels.setOnItemClickListener((adapterView, view, position, id) -> { final Label label = (Label) adapterView.getItemAtPosition(position); if (LabelAutoCompleteAdapter.ITEM_CREATE == label.getLocalId()) { @@ -286,7 +273,7 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, } private Chip createChipFromLabel(Label label) { - final Chip chip = new Chip(activity); + final Chip chip = new Chip(requireContext()); chip.setText(label.getTitle()); if (viewModel.canEdit()) { chip.setCloseIcon(ContextCompat.getDrawable(requireContext(), R.drawable.ic_close_circle_grey600)); @@ -325,7 +312,7 @@ public class CardDetailsFragment extends Fragment implements OnDateSetListener, if (viewModel.canEdit()) { Long localCardId = viewModel.getFullCard().getCard().getLocalId(); localCardId = localCardId == null ? -1 : localCardId; - binding.people.setAdapter(new UserAutoCompleteAdapter(activity, viewModel.getAccount(), viewModel.getBoardId(), localCardId)); + binding.people.setAdapter(new UserAutoCompleteAdapter(requireActivity(), viewModel.getAccount(), viewModel.getBoardId(), localCardId)); binding.people.setOnItemClickListener((adapterView, view, position, id) -> { User user = (User) adapterView.getItemAtPosition(position); viewModel.getFullCard().getAssignedUsers().add(user); |