Feature #14449

svuillet · svuillet · commit e0bc978a5f41 · 2024-10-17T15:46:58.000+02:00
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/comments/pages/CommentsPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/comments/pages/CommentsPage.java
@@ -33,7 +33,6 @@
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.uibinder.client.UiHandler;
 import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Anchor;
 import com.google.gwt.user.client.ui.HTMLPanel;
 import com.google.gwt.user.client.ui.TextArea;
@@ -46,7 +45,7 @@
 import org.silverpeas.mobile.client.common.EventBus;
 import org.silverpeas.mobile.client.common.Notification;
 import org.silverpeas.mobile.client.common.app.View;
-import org.silverpeas.mobile.client.components.PopinConfirmation;
+import org.silverpeas.mobile.client.components.Snackbar;
 import org.silverpeas.mobile.client.components.UnorderedList;
 import org.silverpeas.mobile.client.components.base.PageContent;
 import org.silverpeas.mobile.client.components.base.widgets.DeleteButton;
@@ -90,16 +89,12 @@ public CommentsPage() {
       @Override
       public void execute() {
 
-
-
-        PopinConfirmation popin = new PopinConfirmation(msg.deleteComment());
-        popin.setYesCallback(new Command() {
+        Snackbar.showConfirmation(msg.deleteComment(), new Command() {
           @Override
           public void execute() {
             EventBus.getInstance().fireEvent(new DeleteCommentEvent(getSelectedComment().getComment()));
           }
-        });
-        popin.show();
+        }, null);
       }
     });
     buttonEdit.setCallback(new Command() {
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/favorites/pages/FavoritesPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/favorites/pages/FavoritesPage.java
@@ -28,7 +28,6 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Widget;
 import org.silverpeas.mobile.client.apps.favorites.events.app.FavoritesDeleteEvent;
 import org.silverpeas.mobile.client.apps.favorites.events.app.FavoritesLoadEvent;
@@ -39,7 +38,7 @@
 import org.silverpeas.mobile.client.apps.favorites.resources.FavoritesMessages;
 import org.silverpeas.mobile.client.apps.navigation.pages.widgets.FavoriteItem;
 import org.silverpeas.mobile.client.common.EventBus;
-import org.silverpeas.mobile.client.components.PopinConfirmation;
+import org.silverpeas.mobile.client.components.Snackbar;
 import org.silverpeas.mobile.client.components.UnorderedList;
 import org.silverpeas.mobile.client.components.base.PageContent;
 import org.silverpeas.mobile.client.components.base.widgets.DeleteButton;
@@ -115,26 +114,26 @@ public void setSelectionMode(boolean selectionMode) {
   }
 
   private void deleteSelectedFavoris() {
-    PopinConfirmation popin = new PopinConfirmation(msgApp.deleteConfirmation());
-    popin.setYesCallback(new Command() {
+    Snackbar.showConfirmation(msgApp.deleteConfirmation(), new Command() {
       @Override
       public void execute() {
         List<MyLinkDTO> selection = getSelectedFavorites();
         FavoritesDeleteEvent deleteEvent = new FavoritesDeleteEvent();
         deleteEvent.setSelection(selection);
         if (!selection.isEmpty()) EventBus.getInstance().fireEvent(deleteEvent);
-        clearActions();
+        setSelectionMode(false);
       }
-    });
-    popin.show();
+    }, null);
   }
 
   private List<MyLinkDTO> getSelectedFavorites() {
     List<MyLinkDTO> selection = new ArrayList<>();
     for (int i = 0; i < favorites.getCount(); i++) {
-      FavoriteItem item = (FavoriteItem) favorites.getWidget(i);
-      if (item.isSelected()) {
-        selection.add(item.getData());
+      if (favorites.getWidget(i) instanceof FavoriteItem) {
+        FavoriteItem item = (FavoriteItem) favorites.getWidget(i);
+        if (item.isSelected()) {
+          selection.add(item.getData());
+        }
       }
     }
     return selection;
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/notificationsbox/pages/NotificationsBoxPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/notificationsbox/pages/NotificationsBoxPage.java
@@ -44,7 +44,7 @@
 import org.silverpeas.mobile.client.apps.notificationsbox.pages.widgets.NotificationItem;
 import org.silverpeas.mobile.client.apps.notificationsbox.resources.NotificationsMessages;
 import org.silverpeas.mobile.client.common.EventBus;
-import org.silverpeas.mobile.client.components.PopinConfirmation;
+import org.silverpeas.mobile.client.components.Snackbar;
 import org.silverpeas.mobile.client.components.UnorderedList;
 import org.silverpeas.mobile.client.components.base.PageContent;
 import org.silverpeas.mobile.client.components.base.widgets.DeleteButton;
@@ -172,17 +172,15 @@ private void markAsReadNotifications() {
   }
 
   private void deleteSelectedNotifications() {
-    PopinConfirmation popin = new PopinConfirmation(msgApp.deleteConfirmation());
-    popin.setYesCallback(new Command() {
+    Snackbar.showConfirmation(msgApp.deleteConfirmation(), new Command() {
       @Override
       public void execute() {
         List<NotificationBoxDTO> selection = getSelectedNotification();
         DeleteNotificationsEvent deleteEvent = new DeleteNotificationsEvent();
         deleteEvent.setSelection(selection);
         if (!selection.isEmpty()) EventBus.getInstance().fireEvent(deleteEvent);
-        clearActions();
+        setSelectionMode(false);
       }
-    });
-    popin.show();
+    }, null);
   }
 }
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/resourcesManager/pages/widgets/DeleteReservationButton.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/resourcesManager/pages/widgets/DeleteReservationButton.java
@@ -11,7 +11,7 @@
 import org.silverpeas.mobile.client.apps.resourcesManager.events.app.DeleteReservationEvent;
 import org.silverpeas.mobile.client.apps.resourcesManager.resources.ResourcesManagerMessages;
 import org.silverpeas.mobile.client.common.EventBus;
-import org.silverpeas.mobile.client.components.PopinConfirmation;
+import org.silverpeas.mobile.client.components.Snackbar;
 import org.silverpeas.mobile.client.components.base.ActionItem;
 import org.silverpeas.mobile.client.components.base.ActionsMenu;
 import org.silverpeas.mobile.shared.dto.reservations.ReservationDTO;
@@ -47,17 +47,16 @@ public DeleteReservationButton() {
   }
 
   @UiHandler("deleteReservation")
-  void displayReservationPage(ClickEvent event){
-    PopinConfirmation conf = new PopinConfirmation(msg.deleteReservationConfirmation());
-    conf.setYesCallback(new Command() {
+  void displayReservationPage(ClickEvent event) {
+
+    Snackbar.showConfirmation(msg.deleteReservationConfirmation(), new Command() {
       @Override
       public void execute() {
         DeleteReservationEvent ev = new DeleteReservationEvent();
         ev.setData(data);
         EventBus.getInstance().fireEvent(ev);
       }
-    });
-    conf.show();
+    }, null);
 
     // hide menu
     ActionsMenu.close(getElement());
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/sharesbox/pages/SharesBoxPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/sharesbox/pages/SharesBoxPage.java
@@ -28,7 +28,6 @@
 import com.google.gwt.uibinder.client.UiBinder;
 import com.google.gwt.uibinder.client.UiField;
 import com.google.gwt.user.client.Command;
-import com.google.gwt.user.client.Window;
 import com.google.gwt.user.client.ui.Widget;
 import org.silverpeas.mobile.client.apps.sharesbox.events.app.DeleteSharesEvent;
 import org.silverpeas.mobile.client.apps.sharesbox.events.pages.AbstractSharesBoxPagesEvent;
@@ -37,7 +36,6 @@
 import org.silverpeas.mobile.client.apps.sharesbox.pages.widgets.ShareItem;
 import org.silverpeas.mobile.client.apps.sharesbox.resources.ShareMessages;
 import org.silverpeas.mobile.client.common.EventBus;
-import org.silverpeas.mobile.client.components.PopinConfirmation;
 import org.silverpeas.mobile.client.components.Snackbar;
 import org.silverpeas.mobile.client.components.UnorderedList;
 import org.silverpeas.mobile.client.components.base.PageContent;
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/tasks/pages/TasksPage.java b/mobile-war/src/main/java/org/silverpeas/mobile/client/apps/tasks/pages/TasksPage.java
@@ -40,7 +40,7 @@
 import org.silverpeas.mobile.client.apps.tasks.resources.TasksMessages;
 import org.silverpeas.mobile.client.common.EventBus;
 import org.silverpeas.mobile.client.common.Notification;
-import org.silverpeas.mobile.client.components.PopinConfirmation;
+import org.silverpeas.mobile.client.components.Snackbar;
 import org.silverpeas.mobile.client.components.UnorderedList;
 import org.silverpeas.mobile.client.components.base.PageContent;
 import org.silverpeas.mobile.client.components.base.widgets.AddButton;
@@ -133,8 +133,7 @@ public void stop() {
   }
 
   private void deleteSelectedTasks() {
-    PopinConfirmation popin = new PopinConfirmation(msg.deleteConfirmation());
-    popin.setYesCallback(new Command() {
+    Snackbar.showConfirmation(msg.deleteConfirmation(), new Command() {
       @Override
       public void execute() {
         ArrayList<TaskDTO> selection = new ArrayList<>();
@@ -144,10 +143,10 @@ public void execute() {
             selection.add(item.getData());
           }
         }
+        setSelectionMode(false);
         EventBus.getInstance().fireEvent(new TasksDeleteEvent(selection));
       }
-    });
-    popin.show();
+    }, null);
   }
 
   @Override
diff --git a/mobile-war/src/main/java/org/silverpeas/mobile/public/components.css b/mobile-war/src/main/java/org/silverpeas/mobile/public/components.css
@@ -221,7 +221,7 @@ input[type="range"]::-webkit-slider-thumb {
     border-radius: 2px;
     padding: 16px;
     position: fixed;
-    z-index: 1;
+    z-index: 999;
     left: 50%;
     transform: translateX(-50%);
     bottom: 50px;

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`import org.silverpeas.mobile.client.apps.tasks.resources.TasksMessages;`
`41`	`41`	`import org.silverpeas.mobile.client.common.EventBus;`
`42`	`42`	`import org.silverpeas.mobile.client.common.Notification;`
`43`		`-import org.silverpeas.mobile.client.components.PopinConfirmation;`
	`43`	`+import org.silverpeas.mobile.client.components.Snackbar;`
`44`	`44`	`import org.silverpeas.mobile.client.components.UnorderedList;`
`45`	`45`	`import org.silverpeas.mobile.client.components.base.PageContent;`
`46`	`46`	`import org.silverpeas.mobile.client.components.base.widgets.AddButton;`
`@@ -133,8 +133,7 @@ public void stop() {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`private void deleteSelectedTasks() {`
`136`		`- PopinConfirmation popin = new PopinConfirmation(msg.deleteConfirmation());`
`137`		`- popin.setYesCallback(new Command() {`
	`136`	`+ Snackbar.showConfirmation(msg.deleteConfirmation(), new Command() {`
`138`	`137`	`@Override`
`139`	`138`	`public void execute() {`
`140`	`139`	`ArrayList<TaskDTO> selection = new ArrayList<>();`
`@@ -144,10 +143,10 @@ public void execute() {`
`144`	`143`	`selection.add(item.getData());`
`145`	`144`	`}`
`146`	`145`	`}`
	`146`	`+ setSelectionMode(false);`
`147`	`147`	`EventBus.getInstance().fireEvent(new TasksDeleteEvent(selection));`
`148`	`148`	`}`
`149`		`- });`
`150`		`- popin.show();`
	`149`	`+ }, null);`
`151`	`150`	`}`
`152`	`151`
`153`	`152`	`@Override`