diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt index 663752f8..8a8b81dd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt @@ -27,15 +27,15 @@ import com.simplemobiletools.contacts.pro.BuildConfig import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.adapters.ViewPagerAdapter import com.simplemobiletools.contacts.pro.databases.ContactsDatabase -import com.simplemobiletools.contacts.pro.dialogs.ChangeSortingDialog -import com.simplemobiletools.contacts.pro.dialogs.ExportContactsDialog -import com.simplemobiletools.contacts.pro.dialogs.FilterContactSourcesDialog -import com.simplemobiletools.contacts.pro.dialogs.ImportContactsDialog +import com.simplemobiletools.contacts.pro.dialogs.* import com.simplemobiletools.contacts.pro.extensions.config import com.simplemobiletools.contacts.pro.extensions.getTempFile import com.simplemobiletools.contacts.pro.extensions.handleGenericContactClick import com.simplemobiletools.contacts.pro.fragments.MyViewPagerFragment -import com.simplemobiletools.contacts.pro.helpers.* +import com.simplemobiletools.contacts.pro.helpers.ALL_TABS_MASK +import com.simplemobiletools.contacts.pro.helpers.ContactsHelper +import com.simplemobiletools.contacts.pro.helpers.VcfExporter +import com.simplemobiletools.contacts.pro.helpers.tabsList import com.simplemobiletools.contacts.pro.interfaces.RefreshContactsListener import com.simplemobiletools.contacts.pro.models.Contact import kotlinx.android.synthetic.main.activity_main.* @@ -76,6 +76,7 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { checkContactPermissions() storeStateVariables() checkWhatsNewDialog() + checkDialerMigrationDialog() } private fun checkContactPermissions() { @@ -613,6 +614,17 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { private fun getAllFragments() = arrayListOf(contacts_fragment, favorites_fragment, groups_fragment) + private fun checkDialerMigrationDialog() { + if (config.appRunCount < 3) { + config.wasDialerMigrationShown = true + } + + if (!config.wasDialerMigrationShown) { + config.wasDialerMigrationShown = true + DialerMovedDialog(this) + } + } + private fun checkWhatsNewDialog() { arrayListOf().apply { add(Release(10, R.string.release_10)) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DialerMovedDialog.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DialerMovedDialog.kt new file mode 100644 index 00000000..d9258f8d --- /dev/null +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/dialogs/DialerMovedDialog.kt @@ -0,0 +1,30 @@ +package com.simplemobiletools.contacts.pro.dialogs + +import android.text.Html +import android.text.method.LinkMovementMethod +import androidx.appcompat.app.AlertDialog +import com.simplemobiletools.commons.activities.BaseSimpleActivity +import com.simplemobiletools.commons.extensions.launchViewIntent +import com.simplemobiletools.commons.extensions.setupDialogStuff +import com.simplemobiletools.contacts.pro.R +import kotlinx.android.synthetic.main.dialog_dialer_moved.view.* + +class DialerMovedDialog(val activity: BaseSimpleActivity) { + init { + val view = activity.layoutInflater.inflate(R.layout.dialog_dialer_moved, null).apply { + dialer_moved.text = Html.fromHtml(activity.getString(R.string.dialer_moved)) + dialer_moved.movementMethod = LinkMovementMethod.getInstance() + + dialer_moved_icon.setOnClickListener { + activity.launchViewIntent("https://play.google.com/store/apps/details?id=com.simplemobiletools.dialer") + } + } + + AlertDialog.Builder(activity) + .setPositiveButton(R.string.download) { dialog, which -> } + .setNegativeButton(R.string.cancel, null) + .create().apply { + activity.setupDialogStuff(view, this) + } + } +} diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt index 097447b3..98c5bea8 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt @@ -96,4 +96,8 @@ class Config(context: Context) : BaseConfig(context) { return speedDialValues } + + var wasDialerMigrationShown: Boolean + get() = prefs.getBoolean(WAS_DIALER_MIGRATION_SHOWN, false) + set(wasDialerMigrationShown) = prefs.edit().putBoolean(WAS_DIALER_MIGRATION_SHOWN, wasDialerMigrationShown).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt index 353e7175..6f61d448 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt @@ -25,6 +25,7 @@ const val LAST_EXPORT_PATH = "last_export_path" const val WAS_LOCAL_ACCOUNT_INITIALIZED = "was_local_account_initialized" const val REMEMBER_SIM_PREFIX = "remember_sim_" const val SHOW_PRIVATE_CONTACTS = "show_private_contacts" +const val WAS_DIALER_MIGRATION_SHOWN = "was_dialer_migration_shown" const val CONTACT_ID = "contact_id" const val SMT_PRIVATE = "smt_private" // used at the contact source of local contacts hidden from other apps diff --git a/app/src/main/res/drawable-hdpi/ic_launcher_dialer.png b/app/src/main/res/drawable-hdpi/ic_launcher_dialer.png new file mode 100644 index 00000000..e78912bb Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher_dialer.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher_dialer.png b/app/src/main/res/drawable-xhdpi/ic_launcher_dialer.png new file mode 100644 index 00000000..6e9714aa Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher_dialer.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher_dialer.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_dialer.png new file mode 100644 index 00000000..7a8e4a9b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher_dialer.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_launcher_dialer.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher_dialer.png new file mode 100644 index 00000000..832d540c Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_launcher_dialer.png differ diff --git a/app/src/main/res/layout/dialog_dialer_moved.xml b/app/src/main/res/layout/dialog_dialer_moved.xml new file mode 100644 index 00000000..e4a95ed4 --- /dev/null +++ b/app/src/main/res/layout/dialog_dialer_moved.xml @@ -0,0 +1,28 @@ + + + + + + + +