archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove subscription nag from WhatsNew

Browse Source
pull/1823/head
Alex Baker 2 years ago
parent 68700a7319
commit 437bb48d62
5 changed files with 1 additions and 95 deletions
Show Stats Download Patch File Download Diff File

51
app/src/main/java/org/tasks/dialogs/WhatsNewDialog.kt
Unescape Escape View File

@ -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),
)
}
}

35
app/src/main/res/layout/dialog_whats_new.xml
Unescape Escape View File

@ -30,39 +30,6 @@
<View style="@style/horizontal_divider" />
<TextView
android:id="@+id/action_question"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/keyline_first"
android:text="@string/enjoying_tasks"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
<TextView
android:id="@+id/action_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingTop="@dimen/half_keyline_first"
android:paddingStart="@dimen/keyline_first"
android:paddingEnd="@dimen/keyline_first"
android:text="@string/tell_me_how_im_doing"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance" />
<com.google.android.material.button.MaterialButton
android:id="@+id/action_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/keyline_first"
android:layout_marginStart="@dimen/keyline_first"
android:layout_marginEnd="@dimen/keyline_first"
android:textColor="?attr/colorOnSecondary"
app:backgroundTint="?attr/colorSecondary"
tools:text="@string/rate_tasks" />
<com.google.android.material.button.MaterialButton
android:id="@+id/dismiss_button"
style="@style/Widget.MaterialComponents.Button.TextButton"
@ -70,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/keyline_first"
android:layout_marginEnd="@dimen/keyline_first"
android:text="@string/no_thanks"
android:text="@string/got_it"
android:textColor="@color/text_secondary" />
</LinearLayout>

4
app/src/main/res/values-h600dp/bools.xml
Unescape Escape View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<bool name="whats_new_action">true</bool>
</resources>

1
app/src/main/res/values/bools.xml
Unescape Escape View File

@ -4,5 +4,4 @@
<bool name="default_bundle_notifications">true</bool>
<bool name="is_dark">false</bool>
<bool name="light_status_bar">true</bool>
<bool name="whats_new_action">false</bool>
</resources>

5
app/src/main/res/values/keys.xml
Unescape Escape View File

@ -421,11 +421,6 @@
<string name="p_install_date">install_date</string>
<string name="p_default_location">default_location</string>
<string name="event_whats_new">whats_new</string>
<string name="param_whats_new_display_rate">display_rate</string>
<string name="param_whats_new_display_subscribe">display_subscribe</string>
<string name="param_user_pro">user_pro</string>
<string name="param_click">click</string>
<string name="event_purchase_result">billing_flow_result</string>
<string name="param_sku">sku</string>
<string name="param_result">result</string>

Write Preview
Loading…
Cancel
Save