From 51d06c1ef47127efc296d28a2b3dd9db385a50d4 Mon Sep 17 00:00:00 2001
From: Ayan Sarkar <71203077+Ayan-10@users.noreply.github.com>
Date: Tue, 29 Jun 2021 14:42:30 +0530
Subject: [PATCH] Tutorial removed from log out state (#4479)

* tutorial removed from log out state

* Issue removed
---
 .../java/fr/free/nrw/commons/auth/LoginActivity.java  |  3 ---
 .../free/nrw/commons/contributions/MainActivity.java  |  6 ++++++
 .../navtab/MoreBottomSheetLoggedOutFragment.java      |  5 -----
 .../layout/fragment_more_bottom_sheet_logged_out.xml  | 11 -----------
 4 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
index daf18756a..edb02ebdd 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
@@ -208,9 +208,6 @@ public class LoginActivity extends AccountAuthenticatorActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        if (applicationKvStore.getBoolean("firstrun", true)) {
-            WelcomeActivity.startYourself(this);
-        }
 
         if (sessionManager.getCurrentAccount() != null
                 && sessionManager.isUserLoggedIn()) {
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
index d41379fe5..c357c5598 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
@@ -21,6 +21,7 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.auth.SessionManager;
 import fr.free.nrw.commons.bookmarks.BookmarkFragment;
 import fr.free.nrw.commons.explore.ExploreFragment;
@@ -356,6 +357,11 @@ public class MainActivity  extends BaseActivity
     @Override
     protected void onResume() {
         super.onResume();
+
+        if ((applicationKvStore.getBoolean("firstrun", true)) &&
+            (!applicationKvStore.getBoolean("login_skipped"))) {
+            WelcomeActivity.startYourself(this);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragment.java b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragment.java
index a11906bdb..1ff2306ec 100644
--- a/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragment.java
@@ -89,11 +89,6 @@ public class MoreBottomSheetLoggedOutFragment extends BottomSheetDialogFragment
         getActivity().startActivity(intent);
     }
 
-    @OnClick(R.id.more_tutorial)
-    public void onTutorialClicked() {
-        WelcomeActivity.startYourself(getActivity());
-    }
-
     @OnClick(R.id.more_settings)
     public void onSettingsClicked() {
         final Intent intent = new Intent(getActivity(), SettingsActivity.class);
diff --git a/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml b/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
index ecb56cee1..801686702 100644
--- a/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
+++ b/app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
@@ -26,17 +26,6 @@
               android:text="@string/menu_settings"
               android:textSize="18sp" />
 
-            <TextView
-              android:id="@+id/more_tutorial"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:layout_margin="12dp"
-              android:drawableStart="@drawable/ic_help_black_24dp"
-              android:drawablePadding="12dp"
-              android:padding="8dp"
-              android:text="@string/navigation_item_info"
-              android:textSize="18sp" />
-
             <TextView
               android:id="@+id/more_feedback"
               android:layout_width="match_parent"