fix: Fix navigation flow of faq Fragment (fossasia#2377)

Author: ParthivMangukiya

android/app/src/main/java/org/fossasia/openevent/core/faqs/FAQFragment.java

@@ -13,7 +13,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;
@@ -37,6 +36,8 @@ public class FAQFragment extends BaseFragment {
     protected TextView tvEmptyFaqs;
     @BindView(R.id.faq_swiperefreshlayout)
     protected SwipeRefreshLayout swipeRefreshLayout;
+    @BindView(R.id.btn_login)
+    protected TextView loginBtn;
 
     private ArrayList<FAQ> faqArrayList;
     private FAQListAdapter faqListAdapter;
@@ -47,26 +48,28 @@ public class FAQFragment extends BaseFragment {
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 //        setHasOptionsMenu(true); TODO : ADD SEARCH OPTION
         View view = super.onCreateView(inflater, container, savedInstanceState);
-        Utils.registerIfUrlValid(swipeRefreshLayout, this, this::refresh);
-        faqArrayList = new ArrayList<>();
         faqViewModel = ViewModelProviders.of(this).get(FAQViewModel.class);
-        setUpRecyclerView();
 
         if (AuthUtil.isUserLoggedIn()) {
             if (NetworkUtils.haveNetworkConnection(getContext())) {
                 downloadFAQS();
             }
+            showFaqLayout(true);
+            Utils.registerIfUrlValid(swipeRefreshLayout, this, this::refresh);
+            faqArrayList = new ArrayList<>();
+            setUpRecyclerView();
             loadFAQs();
             handleVisibility();
         } else {
-            redirectToLogin();
+            showFaqLayout(false);
+            tvEmptyFaqs.setText(R.string.login_to_continue);
+            loginBtn.setOnClickListener(v -> redirectToLogin());
         }
 
         return view;
     }
 
     private void redirectToLogin() {
-        Toast.makeText(getContext(), R.string.login_to_see_faqs, Toast.LENGTH_SHORT).show();
         Intent intent = new Intent(getActivity(), LoginActivity.class);
         startActivity(intent);
     }
@@ -122,11 +125,13 @@ private void handleVisibility() {
         }
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (!AuthUtil.isUserLoggedIn()) {
-            tvEmptyFaqs.setText(R.string.login_to_view_faqs);
+    private void showFaqLayout(boolean showLayout) {
+        if (showLayout) {
+            swipeRefreshLayout.setVisibility(View.VISIBLE);
+            loginBtn.setVisibility(View.GONE);
+        } else {
+            swipeRefreshLayout.setVisibility(View.GONE);
+            loginBtn.setVisibility(View.VISIBLE);
         }
     }
 

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

@@ -20,6 +20,16 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:text="No FAQs to display." />
+        android:text="@string/no_faqs"/>
+
+    <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>

android/app/src/main/res/values/strings.xml

@@ -209,6 +209,7 @@
     <string name="noTracks">No Tracks yet!</string>
     <string name="noFeed">No Posts yet!</string>
     <string name="no_notification">No notifications yet!</string>
+    <string name="no_faqs">No faqs yet!</string>
     <string name="charges_warning">Data charges may apply</string>
     <string name="tracks">Track</string>
     <string name="type">Type</string>
@@ -334,8 +335,7 @@
 
     <string name="twitter_feed">Twitter Feed</string>
     <string name="featured_speakers_header">Featured Speakers</string>
-    <string name="login_to_see_faqs">Please login to see faqs!</string>
-    <string name="login_to_view_faqs">Sorry you need to log in to view the FAQs.</string>
+    <string name="login_to_continue">Please login to continue</string>
 
 
 </resources>