From d253db54441b50056f2bd5561975f1e04948d602 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 16 Jan 2018 18:52:25 +1000 Subject: [PATCH] Revert "Merge pull request #1024 from neslihanturan/displayNotificationsUI" This reverts commit 031e53c988cd995ef1dbc4a9fdf2c29feee97966, reversing changes made to 0aa20effe0de188eddfaa351188cb4bfbd621886. revert UI notifications --- app/src/main/AndroidManifest.xml | 4 -- .../nrw/commons/di/ActivityBuilderModule.java | 3 - .../commons/notification/Notification.java | 26 ------- .../notification/NotificationActivity.java | 50 ------------- .../NotificationAdapterFactory.java | 30 -------- .../notification/NotificationController.java | 23 ------ .../notification/NotificationRenderer.java | 70 ------------------- .../commons/theme/NavigationBaseActivity.java | 5 -- .../drawable/ic_chat_bubble_black_24px.xml | 9 --- .../main/res/drawable/ic_edit_black_24dp.xml | 9 --- .../res/drawable/ic_message_black_24dp.xml | 9 --- .../drawable/ic_notifications_black_24dp.xml | 9 --- .../main/res/layout/activity_notification.xml | 34 --------- app/src/main/res/layout/item_notification.xml | 70 ------------------- app/src/main/res/menu/drawer.xml | 5 -- app/src/main/res/values/strings.xml | 1 - 16 files changed, 357 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/notification/Notification.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/notification/NotificationAdapterFactory.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/notification/NotificationController.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/notification/NotificationRenderer.java delete mode 100644 app/src/main/res/drawable/ic_chat_bubble_black_24px.xml delete mode 100644 app/src/main/res/drawable/ic_edit_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_message_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml delete mode 100644 app/src/main/res/layout/activity_notification.xml delete mode 100644 app/src/main/res/layout/item_notification.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 253bdaea8..e262e9088 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -87,10 +87,6 @@ android:label="@string/title_activity_nearby" android:parentActivityName=".contributions.ContributionsActivity" /> - - create(List notifications) { - RendererBuilder builder = new RendererBuilder() - .bind(Notification.class, new NotificationRenderer(listener)); - ListAdapteeCollection collection = new ListAdapteeCollection<>( - notifications != null ? notifications : Collections.emptyList()); - return new RVRendererAdapter<>(builder, collection); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationController.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationController.java deleted file mode 100644 index 84f5c15d8..000000000 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationController.java +++ /dev/null @@ -1,23 +0,0 @@ -package fr.free.nrw.commons.notification; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created by root on 19.12.2017. - */ - -public class NotificationController { - - public static List loadNotifications() { - List notifications = new ArrayList<>(); - notifications.add(new Notification(Notification.NotificationType.message, "notification 1")); - notifications.add(new Notification(Notification.NotificationType.edit, "notification 2")); - notifications.add(new Notification(Notification.NotificationType.mention, "notification 3")); - notifications.add(new Notification(Notification.NotificationType.message, "notification 4")); - notifications.add(new Notification(Notification.NotificationType.edit, "notification 5")); - notifications.add(new Notification(Notification.NotificationType.mention, "notification 6")); - notifications.add(new Notification(Notification.NotificationType.message, "notification 7")); - return notifications; - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationRenderer.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationRenderer.java deleted file mode 100644 index 36272d4a2..000000000 --- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationRenderer.java +++ /dev/null @@ -1,70 +0,0 @@ -package fr.free.nrw.commons.notification; - -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import com.pedrogomez.renderers.Renderer; - -import butterknife.BindView; -import butterknife.ButterKnife; -import fr.free.nrw.commons.R; - -/** - * Created by root on 19.12.2017. - */ - -public class NotificationRenderer extends Renderer { - @BindView(R.id.title) TextView title; - @BindView(R.id.description) TextView description; - @BindView(R.id.time) TextView time; - @BindView(R.id.icon) ImageView icon; - private NotificationClicked listener; - - - NotificationRenderer(NotificationClicked listener) { - this.listener = listener; - } - - @Override - protected void setUpView(View view) { } - - @Override - protected void hookListeners(View rootView) { - rootView.setOnClickListener(v -> listener.notificationClicked(getContent())); - } - - @Override - protected View inflate(LayoutInflater layoutInflater, ViewGroup viewGroup) { - View inflatedView = layoutInflater.inflate(R.layout.item_notification, viewGroup, false); - ButterKnife.bind(this, inflatedView); - return inflatedView; - } - - @Override - public void render() { - Notification notification = getContent(); - title.setText(notification.notificationText); - time.setText("3d"); - description.setText("Example notification description"); - switch (notification.notificationType) { - case edit: - icon.setImageResource(R.drawable.ic_edit_black_24dp); - break; - case message: - icon.setImageResource(R.drawable.ic_message_black_24dp); - break; - case mention: - icon.setImageResource(R.drawable.ic_chat_bubble_black_24px); - break; - default: - icon.setImageResource(R.drawable.round_icon_unknown); - } - } - - public interface NotificationClicked{ - void notificationClicked(Notification notification); - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java index 4e7cf767f..60ea325e4 100644 --- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java @@ -27,7 +27,6 @@ import fr.free.nrw.commons.auth.AccountUtil; import fr.free.nrw.commons.auth.LoginActivity; import fr.free.nrw.commons.contributions.ContributionsActivity; import fr.free.nrw.commons.nearby.NearbyActivity; -import fr.free.nrw.commons.notification.NotificationActivity; import fr.free.nrw.commons.settings.SettingsActivity; import timber.log.Timber; @@ -144,10 +143,6 @@ public abstract class NavigationBaseActivity extends BaseActivity .setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel()) .show(); return true; - case R.id.action_notifications: - drawerLayout.closeDrawer(navigationView); - startActivityWithFlags(this, NotificationActivity.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - return true; default: Timber.e("Unknown option [%s] selected from the navigation menu", itemId); return false; diff --git a/app/src/main/res/drawable/ic_chat_bubble_black_24px.xml b/app/src/main/res/drawable/ic_chat_bubble_black_24px.xml deleted file mode 100644 index 8d40c6d63..000000000 --- a/app/src/main/res/drawable/ic_chat_bubble_black_24px.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit_black_24dp.xml deleted file mode 100644 index 2ab2fb753..000000000 --- a/app/src/main/res/drawable/ic_edit_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_message_black_24dp.xml b/app/src/main/res/drawable/ic_message_black_24dp.xml deleted file mode 100644 index d2876bfad..000000000 --- a/app/src/main/res/drawable/ic_message_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index 7009a6763..000000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml deleted file mode 100644 index b2eb38475..000000000 --- a/app/src/main/res/layout/activity_notification.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml deleted file mode 100644 index d8f4dd8d4..000000000 --- a/app/src/main/res/layout/item_notification.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml index 83c1bf0ad..f0a0a5e29 100644 --- a/app/src/main/res/menu/drawer.xml +++ b/app/src/main/res/menu/drawer.xml @@ -35,9 +35,4 @@ android:icon="@drawable/ic_exit_to_app_black_24dp" android:title="@string/navigation_item_logout"/> - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bcc8c3242..3c9c67947 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,7 +194,6 @@ Feedback Logout Tutorial - Notifications Nearby places cannot be displayed without location permissions no description found Commons file page