diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java index 2716fd63e9..92c72098ab 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadActivity.java @@ -109,9 +109,8 @@ public class UploadActivity extends BaseActivity implements UploadView, SimilarI @BindView(R.id.license_subtitle) TextView licenseSubtitle; @BindView(R.id.please_wait_text_view) TextView pleaseWaitTextView; - //Right Card - @BindView(R.id.right_card) CardView rightCard; - @BindView(R.id.right_card_expand_button) ImageView rightCardExpandButton; + + //@BindView(R.id.right_card_expand_button) ImageView rightCardExpandButton; @BindView(R.id.right_card_map_button) View rightCardMapButton; // Category Search @@ -325,7 +324,7 @@ public void setBottomCardVisibility(boolean visible) { @Override public void setRightCardVisibility(boolean visible) { - rightCard.setVisibility(visible ? View.VISIBLE : View.GONE); + rightCardMapButton.setVisibility(visible ? View.VISIBLE : View.GONE); } @Override @@ -358,12 +357,6 @@ public void setBottomCardState(boolean state) { updateCardState(state, bottomCardExpandButton, rvDescriptions, previous, next, bottomCardAddDescription); } - @Override - public void setRightCardState(boolean state) { - rightCardExpandButton.animate().rotation(rightCardExpandButton.getRotation() + (state ? -180 : 180)).start(); - //Add all items in rightCard here - rightCardMapButton.setVisibility(state ? View.VISIBLE : View.GONE); - } @Override public void setBackground(Uri mediaUri) { @@ -530,7 +523,6 @@ private void addNewDescription() { } private void configureRightCard() { - rightCardExpandButton.setOnClickListener(v -> presenter.toggleRightCardState()); rightCardMapButton.setOnClickListener(v -> presenter.openCoordinateMap()); } diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java index 7fc20e9210..51b7e32e1b 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadPresenter.java @@ -266,14 +266,6 @@ void toggleBottomCardState() { view.setBottomCardState(uploadModel.isBottomCardState()); } - /** - * Toggles the right card's state between open and closed. - */ - void toggleRightCardState() { - uploadModel.setRightCardState(!uploadModel.isRightCardState()); - view.setRightCardState(uploadModel.isRightCardState()); - } - /** * Sets all the cards' states to closed. */ @@ -284,7 +276,6 @@ void closeAllCards() { } if (uploadModel.isRightCardState()) { uploadModel.setRightCardState(false); - view.setRightCardState(false); } if (uploadModel.isBottomCardState()) { uploadModel.setBottomCardState(false); diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java index 4d46a4fc3a..855a9a810f 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadView.java @@ -42,8 +42,6 @@ public interface UploadView { void setBottomCardState(boolean state); - void setRightCardState(boolean bottomCardState); - void setBackground(Uri mediaUri); void setTopCardVisibility(boolean visible); diff --git a/app/src/main/res/layout/activity_upload_bottom_card.xml b/app/src/main/res/layout/activity_upload_bottom_card.xml index 5d529335a4..f61b3ba858 100644 --- a/app/src/main/res/layout/activity_upload_bottom_card.xml +++ b/app/src/main/res/layout/activity_upload_bottom_card.xml @@ -79,36 +79,8 @@ tools:ignore="UnusedAttribute" tools:showIn="@layout/activity_upload"> - - - - - - - - + +