Merge pull request #297 from PermanentOrg/feature/VSP-1437

Removed Legacy dialog and Welcome dialog.

app/src/main/java/org/permanent/permanent/ui/PreferencesHelper.kt

@@ -9,12 +9,8 @@ import org.permanent.permanent.models.ArchiveType
 
 const val PREFS_NAME = "permanent_preferences"
 const val IS_ONBOARDING_COMPLETED = "onboarding_completed"
-const val IS_ARCHIVE_ONBOARDING_IN_APP = "is_archive_onboarding_done_in_app"
 const val IS_USER_LOGGED_IN = "is_user_logged_in"
 const val IS_BIOMETRICS_LOG_IN = "is_biometrics_log_in"
-const val IS_WELCOME_SEEN = "is_welcome_seen"
-const val IS_LEGACY_SEEN = "is_legacy_seen"
-const val IS_ARCHIVE_ONBOARDING_DEFAULT_FLOW = "is_archive_onboarding_default_flow"
 const val IS_LIST_VIEW_MODE = "is_list_view_mode"
 const val SHOW_ARCHIVES_SCREEN = "should_show_archives_screen"
 const val SHOW_REDEEM_CODE_SCREEN = "should_redeem_code_screen"
@@ -45,54 +41,10 @@ const val PREFS_DEEP_LINK_FOLDER_LINK_ID = "preferences_deep_link_folder_link_id
 
 class PreferencesHelper(private val sharedPreferences: SharedPreferences) {
 
-    fun saveWelcomeDialogSeen(isSeen: Boolean) {
-        with(sharedPreferences.edit()) {
-            putBoolean(IS_WELCOME_SEEN, isSeen)
-            apply()
-        }
-    }
-
-    fun isWelcomeDialogSeen(): Boolean {
-        return sharedPreferences.getBoolean(IS_WELCOME_SEEN, false)
-    }
-
-    fun saveLegacyDialogSeen(isSeen: Boolean) {
-        with(sharedPreferences.edit()) {
-            putBoolean(IS_LEGACY_SEEN, isSeen)
-            apply()
-        }
-    }
-
-    fun isLegacyDialogSeen(): Boolean {
-        return sharedPreferences.getBoolean(IS_LEGACY_SEEN, false)
-    }
-
     fun isOnboardingCompleted(): Boolean {
         return sharedPreferences.getBoolean(IS_ONBOARDING_COMPLETED, false)
     }
 
-    fun saveArchiveOnboardingDefaultFlow(isDefault: Boolean) {
-        with(sharedPreferences.edit()) {
-            putBoolean(IS_ARCHIVE_ONBOARDING_DEFAULT_FLOW, isDefault)
-            apply()
-        }
-    }
-
-    fun isArchiveOnboardingDefaultFlow(): Boolean {
-        return sharedPreferences.getBoolean(IS_ARCHIVE_ONBOARDING_DEFAULT_FLOW, false)
-    }
-
-    fun saveArchiveOnboardingDoneInApp(isDoneInApp: Boolean) {
-        with(sharedPreferences.edit()) {
-            putBoolean(IS_ARCHIVE_ONBOARDING_IN_APP, isDoneInApp)
-            apply()
-        }
-    }
-
-    fun isArchiveOnboardingDoneInApp(): Boolean {
-        return sharedPreferences.getBoolean(IS_ARCHIVE_ONBOARDING_IN_APP, false)
-    }
-
     fun saveUserLoggedIn(isLoggedIn: Boolean) {
         with(sharedPreferences.edit()) {
             putBoolean(IS_USER_LOGGED_IN, isLoggedIn)

app/src/main/java/org/permanent/permanent/ui/activities/MainActivity.kt

@@ -13,7 +13,6 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.widget.Toolbar
 import androidx.core.os.bundleOf
 import androidx.databinding.DataBindingUtil
@@ -30,17 +29,14 @@ import androidx.navigation.ui.setupWithNavController
 import com.google.android.gms.common.ConnectionResult
 import com.google.android.gms.common.GoogleApiAvailability
 import org.permanent.permanent.Constants.Companion.REQUEST_CODE_GOOGLE_API_AVAILABILITY
-import org.permanent.permanent.CurrentArchivePermissionsManager
 import org.permanent.permanent.EventPage
 import org.permanent.permanent.EventsManager
 import org.permanent.permanent.R
 import org.permanent.permanent.RECIPIENT_ARCHIVE_NAME_KEY
 import org.permanent.permanent.RECIPIENT_ARCHIVE_NR_KEY
 import org.permanent.permanent.START_DESTINATION_FRAGMENT_ID_KEY
 import org.permanent.permanent.databinding.ActivityMainBinding
-import org.permanent.permanent.databinding.DialogLegacyPlanningBinding
 import org.permanent.permanent.databinding.DialogTitleTextTwoButtonsBinding
-import org.permanent.permanent.databinding.DialogWelcomeBinding
 import org.permanent.permanent.databinding.NavMainHeaderBinding
 import org.permanent.permanent.models.AccessRole
 import org.permanent.permanent.ui.PREFS_NAME
@@ -244,14 +240,6 @@ class MainActivity : PermanentBaseActivity(), Toolbar.OnMenuItemClickListener {
             }
         })
 
-        if (prefsHelper.isArchiveOnboardingDoneInApp() && !prefsHelper.isWelcomeDialogSeen()) {
-            showWelcomeDialog()
-        }
-
-        if (!prefsHelper.isLegacyDialogSeen()) {
-            showLegacyDialog()
-        }
-
         if (!isGooglePlayServicesAvailable(this)) GoogleApiAvailability.getInstance()
             .makeGooglePlayServicesAvailable(this)
     }
@@ -336,8 +324,7 @@ class MainActivity : PermanentBaseActivity(), Toolbar.OnMenuItemClickListener {
             else -> {
                 settingsFragment = SettingsMenuFragment()
                 settingsFragment?.show(
-                    supportFragmentManager,
-                    settingsFragment?.tag
+                    supportFragmentManager, settingsFragment?.tag
                 ) // settings item
                 EventsManager(applicationContext).trackPageView(EventPage.AccountMenu)
             }
@@ -366,50 +353,6 @@ class MainActivity : PermanentBaseActivity(), Toolbar.OnMenuItemClickListener {
         }
     }
 
-    private fun showWelcomeDialog() {
-        val dialogBinding: DialogWelcomeBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(this), R.layout.dialog_welcome, null, false
-        )
-        val alert = AlertDialog.Builder(this).setView(dialogBinding.root).create()
-
-        dialogBinding.tvWelcomeTitleWelcomeDialog.text =
-            if (prefsHelper.isArchiveOnboardingDefaultFlow()) getString(R.string.welcome_title) else getString(
-                R.string.archive_onboarding_invitation_welcome_title
-            )
-        dialogBinding.tvWelcomeTextWelcomeDialog.text =
-            if (prefsHelper.isArchiveOnboardingDefaultFlow()) getString(
-                R.string.welcome_text, prefsHelper.getCurrentArchiveFullName()
-            ) else getString(
-                R.string.archive_onboarding_invitation_welcome_text,
-                prefsHelper.getCurrentArchiveFullName(),
-                prefsHelper.getCurrentArchiveAccessRole().toTitleCase(),
-                CurrentArchivePermissionsManager.instance.getPermissionsEnumerated()
-            )
-        dialogBinding.btnGetStartedWelcomeDialog.setOnClickListener {
-            prefsHelper.saveWelcomeDialogSeen(true)
-            alert.dismiss()
-        }
-        alert.show()
-    }
-
-    private fun showLegacyDialog() {
-        val dialogBinding: DialogLegacyPlanningBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(this), R.layout.dialog_legacy_planning, null, false
-        )
-        val alert = AlertDialog.Builder(this).setView(dialogBinding.root).create()
-        dialogBinding.ivClose.setOnClickListener {
-            prefsHelper.saveLegacyDialogSeen(true)
-            alert.dismiss()
-        }
-        dialogBinding.btnTryNow.setOnClickListener {
-            prefsHelper.saveLegacyDialogSeen(true)
-            navController.navigate(R.id.legacyLoadingFragment)
-            alert.dismiss()
-        }
-        alert.setCanceledOnTouchOutside(false)
-        alert.show()
-    }
-
     private fun isGooglePlayServicesAvailable(activity: Activity): Boolean {
         val googleApiAvailability: GoogleApiAvailability = GoogleApiAvailability.getInstance()
         val status = googleApiAvailability.isGooglePlayServicesAvailable(activity)

app/src/main/java/org/permanent/permanent/ui/activities/SplashActivity.kt

@@ -128,7 +128,6 @@ class SplashActivity : PermanentBaseActivity() {
     }
 
     private fun startArchiveOnboardingActivity() {
-        prefsHelper.saveArchiveOnboardingDoneInApp(true)
         startActivity(Intent(this@SplashActivity, ArchiveOnboardingActivity::class.java))
         finish()
     }

app/src/main/java/org/permanent/permanent/ui/login/CodeVerificationFragment.kt

@@ -73,7 +73,6 @@ class CodeVerificationFragment : PermanentBaseFragment() {
     }
 
     private fun startArchiveOnboardingActivity() {
-        prefsHelper.saveArchiveOnboardingDoneInApp(true)
         startActivity(Intent(context, ArchiveOnboardingActivity::class.java))
         activity?.finish()
     }

app/src/main/java/org/permanent/permanent/ui/login/LoginFragment.kt

@@ -61,7 +61,6 @@ class LoginFragment : PermanentBaseFragment() {
     }
 
     private val userMissingDefaultArchiveObserver = Observer<Void?> {
-        prefsHelper.saveArchiveOnboardingDoneInApp(true)
         startActivity(Intent(context, ArchiveOnboardingActivity::class.java))
         activity?.finish()
     }

app/src/main/java/org/permanent/permanent/ui/login/SignUpFragment.kt

@@ -64,7 +64,6 @@ class SignUpFragment : PermanentBaseFragment() {
 
     private val startArchiveOnboardingActivity = Observer<Void?> {
         logEvents()
-        prefsHelper.saveArchiveOnboardingDoneInApp(true)
         startActivity(Intent(context, ArchiveOnboardingActivity::class.java))
         activity?.finish()
     }