From 48a550f5fd48d510f453ed0a33e4bf0a71884afe Mon Sep 17 00:00:00 2001 From: neslihanturan Date: Sun, 12 May 2019 11:09:14 +0300 Subject: [PATCH] Create presenters for map and list and implement user actions accordingly --- .../commons/nearby/mvp/NearbyContract.java | 24 -------- .../nearby/mvp/NearbyListContract.java | 18 ------ .../commons/nearby/mvp/NearbyMapContract.java | 21 ------- .../mvp/presenter/NearbyListPresenter.java | 50 +++++++++++++++++ .../mvp/presenter/NearbyMapPresenter.java | 55 +++++++++++++++++++ 5 files changed, 105 insertions(+), 63 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyContract.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyListContract.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyMapContract.java create mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java create mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyContract.java deleted file mode 100644 index 41d52e392..000000000 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyContract.java +++ /dev/null @@ -1,24 +0,0 @@ -package fr.free.nrw.commons.nearby.mvp; - -/** - * General View and UserAction methods are defined under - * this interface. This interface can be considered parent - * of both NearbyMapContract and NearbyListContract - */ -public interface NearbyContract { - - interface View { - void showPlaces(); - } - - interface UserActions { - void uploadImageGallery(); - void uploadImageCamera(); - void bookmarkItem(); - void getDirections(); - void seeWikidataItem(); - void seeWikipediaArticle(); - void seeCommonsFilePage(); - void rotateScreen(); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyListContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyListContract.java deleted file mode 100644 index 27e0d6d30..000000000 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyListContract.java +++ /dev/null @@ -1,18 +0,0 @@ -package fr.free.nrw.commons.nearby.mvp; - -/** - * This interface defines specific View and UserActions for list - * part of the nearby. On the other hand both extends methods - * from parent View and UserActions where general methods are - * defined (in Nearby Contract) - */ -public interface NearbyListContract { - - interface View extends NearbyContract.View { - // Even if this is empty for now, I keep this one for code consistency - } - - interface UserActions extends NearbyContract.UserActions { - void expandItem(); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyMapContract.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyMapContract.java deleted file mode 100644 index 0459f0a18..000000000 --- a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/NearbyMapContract.java +++ /dev/null @@ -1,21 +0,0 @@ -package fr.free.nrw.commons.nearby.mvp; - -/** - * This interface defines specific View and UserActions for map - * part of the nearby. On the other hand both extends methods - * from parent View and UserActions where general methods are - * defined (in Nearby Contract) - */ -public interface NearbyMapContract { - - interface View extends NearbyContract.View{ - void showSearchThisAreaButton(); - void showInformationBottomSheet(); - void showFABs(); - } - - interface UserActions extends NearbyContract.UserActions { - void searchThisArea(); - void recenterMap(); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java new file mode 100644 index 000000000..bb28417b8 --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyListPresenter.java @@ -0,0 +1,50 @@ +package fr.free.nrw.commons.nearby.mvp.presenter; + +import fr.free.nrw.commons.nearby.mvp.contract.NearbyListContract; + +public class NearbyListPresenter implements NearbyListContract.UserActions { + @Override + public void expandItem() { + + } + + @Override + public void uploadImageGallery() { + + } + + @Override + public void uploadImageCamera() { + + } + + @Override + public void bookmarkItem() { + + } + + @Override + public void getDirections() { + + } + + @Override + public void seeWikidataItem() { + + } + + @Override + public void seeWikipediaArticle() { + + } + + @Override + public void seeCommonsFilePage() { + + } + + @Override + public void rotateScreen() { + + } +} diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java new file mode 100644 index 000000000..9e37b024a --- /dev/null +++ b/app/src/main/java/fr/free/nrw/commons/nearby/mvp/presenter/NearbyMapPresenter.java @@ -0,0 +1,55 @@ +package fr.free.nrw.commons.nearby.mvp.presenter; + +import fr.free.nrw.commons.nearby.mvp.contract.NearbyMapContract; + +public class NearbyMapPresenter implements NearbyMapContract.UserActions { + @Override + public void searchThisArea() { + + } + + @Override + public void recenterMap() { + + } + + @Override + public void uploadImageGallery() { + + } + + @Override + public void uploadImageCamera() { + + } + + @Override + public void bookmarkItem() { + + } + + @Override + public void getDirections() { + + } + + @Override + public void seeWikidataItem() { + + } + + @Override + public void seeWikipediaArticle() { + + } + + @Override + public void seeCommonsFilePage() { + + } + + @Override + public void rotateScreen() { + + } +}