fix: Fix navigation flow of notificationsFragment (fossasia#2378)

Author: ParthivMangukiya

android/app/src/main/java/org/fossasia/openevent/core/notifications/NotificationsFragment.java

@@ -11,7 +11,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.fossasia.openevent.R;
 import org.fossasia.openevent.common.network.NetworkUtils;
@@ -40,6 +39,8 @@ public class NotificationsFragment extends BaseFragment {
     protected RecyclerView notificationRecyclerView;
     @BindView(R.id.txt_no_notification)
     protected TextView noNotificationView;
+    @BindView(R.id.btn_login)
+    protected TextView loginBtn;
 
     public static NotificationsFragment getInstance() {
         return new NotificationsFragment();
@@ -50,21 +51,23 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         setHasOptionsMenu(true);
         View view = super.onCreateView(inflater, container, savedInstanceState);
 
-        Utils.registerIfUrlValid(swipeRefreshLayout, this, this::refresh);
-
-        notificationsList = new ArrayList<>();
         notificationsFragmentViewModel = ViewModelProviders.of(this).get(NotificationsFragmentViewModel.class);
-        setUpRecyclerView();
 
         if(AuthUtil.isUserLoggedIn()) {
             if (NetworkUtils.haveNetworkConnection(getContext())) {
                 swipeRefreshLayout.setRefreshing(true);
                 downloadNotifications();
             }
+            showNotificationLayout(true);
+            Utils.registerIfUrlValid(swipeRefreshLayout, this, this::refresh);
+            notificationsList = new ArrayList<>();
+            setUpRecyclerView();
             loadNotifications();
             handleVisibility();
         } else {
-            redirectToLogin();
+            noNotificationView.setText(R.string.login_to_continue);
+            showNotificationLayout(false);
+            loginBtn.setOnClickListener(v -> redirectToLogin());
         }
 
         return view;
@@ -96,6 +99,16 @@ private void handleVisibility() {
         }
     }
 
+    private void showNotificationLayout(boolean showLayout) {
+        if (showLayout) {
+            swipeRefreshLayout.setVisibility(View.VISIBLE);
+            loginBtn.setVisibility(View.GONE);
+        } else {
+            swipeRefreshLayout.setVisibility(View.GONE);
+            loginBtn.setVisibility(View.VISIBLE);
+        }
+    }
+
     public void onNotificationsDownloadDone(boolean status) {
         if (!status) {
             Timber.d("Notifications download failed");
@@ -142,7 +155,6 @@ public void onDestroyView() {
     }
 
     private void redirectToLogin() {
-        Toast.makeText(getContext(), "Please login to see notifications!", Toast.LENGTH_SHORT).show();
         Intent intent = new Intent(getActivity(), LoginActivity.class);
         startActivity(intent);
     }

android/app/src/main/res/layout/list_notification.xml

@@ -29,4 +29,15 @@
             tools:listitem="@layout/item_notification" />
 
     </android.support.v4.widget.SwipeRefreshLayout>
+
+    <Button
+        android:id="@+id/btn_login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?android:actionBarSize"
+        android:layout_alignParentBottom="true"
+        android:background="@color/color_accent"
+        android:text="@string/login"
+        android:textColor="@color/white"/>
+
 </RelativeLayout>