From f97a9fc2a38e55dfb48d4b0dba09b0324c52a9a4 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 26 Mar 2022 10:25:30 -0500
Subject: [PATCH] Add events for subscribe and beast banners

---
 .../main/java/com/todoroo/astrid/activity/TaskEditFragment.kt  | 2 ++
 .../main/java/com/todoroo/astrid/activity/TaskListFragment.kt  | 3 +++
 app/src/main/java/org/tasks/billing/PurchaseActivity.kt        | 3 ---
 app/src/main/res/values/keys.xml                               | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt
index bc792c3c1..c295750eb 100755
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt
@@ -266,10 +266,12 @@ class TaskEditFragment : Fragment(), Toolbar.OnMenuItemClickListener {
                         visible = false
                         preferences.shownBeastModeHint = true
                         beastMode.launch(Intent(context, BeastModePreferences::class.java))
+                        firebase.logEvent(R.string.event_banner_beast, R.string.param_click to true)
                     },
                     dismiss = {
                         visible = false
                         preferences.shownBeastModeHint = true
+                        firebase.logEvent(R.string.event_banner_beast, R.string.param_click to false)
                     }
                 )
             }
diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
index e7e0842b6..9ef67caf0 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt
@@ -194,11 +194,14 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
                         visible = showBanner,
                         subscribe = {
                             showBanner = false
+                            preferences.lastSubscribeRequest = now()
                             purchase()
+                            firebase.logEvent(R.string.event_banner_sub, R.string.param_click to true)
                         },
                         dismiss = {
                             showBanner = false
                             preferences.lastSubscribeRequest = now()
+                            firebase.logEvent(R.string.event_banner_sub, R.string.param_click to false)
                         },
                     )
                 }
diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt
index 998331652..715c749a5 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt
+++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt
@@ -9,7 +9,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.window.Dialog
 import androidx.lifecycle.lifecycleScope
 import com.google.android.material.composethemeadapter.MdcTheme
-import com.todoroo.andlib.utility.DateUtilities
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.launch
 import org.tasks.LocalBroadcastManager
@@ -41,8 +40,6 @@ class PurchaseActivity : InjectingAppCompatActivity(), OnPurchasesUpdated {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        preferences.lastSubscribeRequest = DateUtilities.now()
-
         val github = intent?.extras?.getBoolean(EXTRA_GITHUB) ?: false
 
         theme.applyToContext(this)
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 1e55b333a..75f3831ab 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -426,10 +426,13 @@
   <string name="param_sku">sku</string>
   <string name="param_result">result</string>
   <string name="param_state">state</string>
+  <string name="param_click">click</string>
   <string name="event_todoagenda">cp_todoagenda</string>
   <string name="event_astrid2taskprovider">cp_astrid2taskprovider</string>
   <string name="event_sync_add_account">sync_add_account</string>
   <string name="event_sync_unknown_access">sync_unknown_access</string>
+  <string name="event_banner_beast">banner_beast</string>
+  <string name="event_banner_sub">banner_subscribe</string>
   <string name="param_type">type</string>
   <string name="p_map_theme">map_theme</string>
   <string name="p_picker_mode_date">picker_mode_date</string>