diff --git a/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt b/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt index c72464fca..b990b692b 100644 --- a/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt +++ b/app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt @@ -1,17 +1,12 @@ package org.tasks.dialogs import android.app.Dialog -import android.content.DialogInterface import android.content.Intent import android.os.Bundle import android.text.method.LinkMovementMethod -import android.view.View import androidx.fragment.app.DialogFragment import dagger.hilt.android.AndroidEntryPoint import org.tasks.R -import org.tasks.Tasks.Companion.IS_GENERIC -import org.tasks.analytics.Firebase -import org.tasks.billing.Inventory import org.tasks.billing.PurchaseActivity import org.tasks.databinding.DialogWhatsNewBinding import org.tasks.extensions.Context.openUri @@ -23,12 +18,8 @@ import javax.inject.Inject class WhatsNewDialog : DialogFragment() { @Inject lateinit var dialogBuilder: DialogBuilder - @Inject lateinit var firebase: Firebase - @Inject lateinit var inventory: Inventory @Inject lateinit var markdownProvider: MarkdownProvider - private var displayedSubscribe = false - override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val binding = DialogWhatsNewBinding.inflate(layoutInflater) @@ -39,34 +30,7 @@ class WhatsNewDialog : DialogFragment() { .markdown(linkify = true, force = true) .setMarkdown(binding.changelog, text) - when { - IS_GENERIC -> { - binding.actionQuestion.setText(R.string.enjoying_tasks) - binding.actionText.setText(R.string.tasks_needs_your_support) - binding.actionButton.text = getString(R.string.TLA_menu_donate) - binding.actionButton.setOnClickListener { onDonateClick() } - } - !inventory.hasPro -> { - displayedSubscribe = true - binding.actionQuestion.setText(R.string.tasks_needs_your_support) - binding.actionText.setText(R.string.support_development_subscribe) - binding.actionButton.setText(R.string.name_your_price) - binding.actionButton.setOnClickListener { onSubscribeClick() } - } - else -> { - binding.actionQuestion.visibility = View.GONE - binding.actionText.visibility = View.GONE - binding.actionButton.visibility = View.GONE - binding.dismissButton.text = getString(R.string.got_it) - } - } - - if (!resources.getBoolean(R.bool.whats_new_action)) { - binding.actionText.visibility = View.GONE - } - binding.dismissButton.setOnClickListener { - logClick(false) dismiss() } @@ -76,7 +40,6 @@ class WhatsNewDialog : DialogFragment() { } private fun onSubscribeClick() { - logClick(true) dismiss() startActivity(Intent(context, PurchaseActivity::class.java)) } @@ -85,18 +48,4 @@ class WhatsNewDialog : DialogFragment() { dismiss() context?.openUri(R.string.url_donate) } - - override fun onCancel(dialog: DialogInterface) { - logClick(false) - super.onCancel(dialog) - } - - private fun logClick(click: Boolean) { - firebase.logEvent( - R.string.event_whats_new, - Pair(R.string.param_click, click), - Pair(R.string.param_whats_new_display_subscribe, displayedSubscribe), - Pair(R.string.param_user_pro, inventory.hasPro), - ) - } } \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_whats_new.xml b/app/src/main/res/layout/dialog_whats_new.xml index 1d4d28dc9..840f56d0f 100644 --- a/app/src/main/res/layout/dialog_whats_new.xml +++ b/app/src/main/res/layout/dialog_whats_new.xml @@ -30,39 +30,6 @@ - - - - - - diff --git a/app/src/main/res/values-h600dp/bools.xml b/app/src/main/res/values-h600dp/bools.xml deleted file mode 100644 index 77101d694..000000000 --- a/app/src/main/res/values-h600dp/bools.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - true - \ No newline at end of file diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml index 3c27e0633..baeac3b04 100644 --- a/app/src/main/res/values/bools.xml +++ b/app/src/main/res/values/bools.xml @@ -4,5 +4,4 @@ true false true - false \ No newline at end of file diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index 2e883813d..5c0cbfddd 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -421,11 +421,6 @@ install_date default_location - whats_new - display_rate - display_subscribe - user_pro - click billing_flow_result sku result