From 43e7b1b87b40bf46c86aaa1300fff167adfeae31 Mon Sep 17 00:00:00 2001 From: Hyun Woo Lee Date: Sun, 28 Feb 2021 19:39:40 +0900 Subject: [PATCH] =?UTF-8?q?#540=20[FEAT]=20:=20=ED=8C=8C=EC=9D=B4=EC=96=B4?= =?UTF-8?q?=EB=B2=A0=EC=9D=B4=EC=8A=A4=20=EB=A1=9C=EA=B7=B8=20=EB=8B=AC?= =?UTF-8?q?=EA=B8=B0(Login)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/teambeme/beme/login/view/LoginActivity.kt | 8 +++++++- .../beme/signup/view/ImageChooseFragment.kt | 6 ++---- .../beme/signup/view/PermissionInfoFragment.kt | 6 ++---- .../beme/signup/view/PersonalInfoFragment.kt | 6 ++---- .../com/teambeme/beme/signup/view/TermFragment.kt | 6 ++---- .../com/teambeme/beme/util/FirebaseEventUtil.kt | 13 +++++++++++++ app/src/main/res/layout/activity_login.xml | 2 ++ 7 files changed, 30 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/com/teambeme/beme/util/FirebaseEventUtil.kt diff --git a/app/src/main/java/com/teambeme/beme/login/view/LoginActivity.kt b/app/src/main/java/com/teambeme/beme/login/view/LoginActivity.kt index 8282667..14497f9 100644 --- a/app/src/main/java/com/teambeme/beme/login/view/LoginActivity.kt +++ b/app/src/main/java/com/teambeme/beme/login/view/LoginActivity.kt @@ -23,6 +23,7 @@ import com.teambeme.beme.main.view.MainActivity import com.teambeme.beme.signup.view.SignUpActivity import com.teambeme.beme.util.KeyboardVisibilityUtils import com.teambeme.beme.util.StatusBarUtil +import com.teambeme.beme.util.recordClickEvent class LoginActivity : BindingActivity(R.layout.activity_login) { private lateinit var keyboardVisibilityUtils: KeyboardVisibilityUtils @@ -47,7 +48,12 @@ class LoginActivity : BindingActivity(R.layout.activity_lo private fun setUIListener() { with(binding) { - btnLoginSignup.setOnClickListener { startActivity(Intent(this@LoginActivity, SignUpActivity::class.java)) } + btnLoginSignup.setOnClickListener { + recordClickEvent("BUTTON", "CLICK_SIGN_SIGN") + startActivity(Intent(this@LoginActivity, SignUpActivity::class.java)) + } + btnRegisterFindId.setOnClickListener { recordClickEvent("BUTTON", "CLICK_SEARCHID_LOGIN") } + btnRegisterFindPassword.setOnClickListener { recordClickEvent("BUTTON", "CLICK_FINDPWD_LOGIN") } txtlayoutLoginPassword.setEndIconOnClickListener { loginViewModel?.setShowPassword() } } keyboardVisibilityUtils = KeyboardVisibilityUtils(window, diff --git a/app/src/main/java/com/teambeme/beme/signup/view/ImageChooseFragment.kt b/app/src/main/java/com/teambeme/beme/signup/view/ImageChooseFragment.kt index 5be9e0b..fdabfd8 100644 --- a/app/src/main/java/com/teambeme/beme/signup/view/ImageChooseFragment.kt +++ b/app/src/main/java/com/teambeme/beme/signup/view/ImageChooseFragment.kt @@ -25,6 +25,7 @@ import com.gun0912.tedpermission.TedPermission import com.teambeme.beme.R import com.teambeme.beme.databinding.FragmentImageChooseBinding import com.teambeme.beme.signup.viewmodel.SignUpViewModel +import com.teambeme.beme.util.recordClickEvent import com.theartofdev.edmodo.cropper.CropImage import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers @@ -57,10 +58,7 @@ class ImageChooseFragment : Fragment() { binding.lifecycleOwner = viewLifecycleOwner binding.btnBack.setOnClickListener { view -> - Firebase.analytics.logEvent(FirebaseAnalytics.Event.SELECT_ITEM) { - param(FirebaseAnalytics.Param.CONTENT_TYPE, "BACK_PRESS") - param(FirebaseAnalytics.Param.ITEM_ID, "OUT_INF_SIGN") - } + recordClickEvent("BACK_PRESS", "OUT_PROFILE_SIGN") view.findNavController().popBackStack() } diff --git a/app/src/main/java/com/teambeme/beme/signup/view/PermissionInfoFragment.kt b/app/src/main/java/com/teambeme/beme/signup/view/PermissionInfoFragment.kt index a6d87a9..e18bb73 100644 --- a/app/src/main/java/com/teambeme/beme/signup/view/PermissionInfoFragment.kt +++ b/app/src/main/java/com/teambeme/beme/signup/view/PermissionInfoFragment.kt @@ -13,6 +13,7 @@ import com.google.firebase.analytics.ktx.logEvent import com.google.firebase.ktx.Firebase import com.teambeme.beme.R import com.teambeme.beme.databinding.FragmentPermissionInfoBinding +import com.teambeme.beme.util.recordClickEvent class PermissionInfoFragment : Fragment() { private var _binding: FragmentPermissionInfoBinding? = null @@ -34,10 +35,7 @@ class PermissionInfoFragment : Fragment() { view.findNavController().navigate(R.id.action_permissionInfoFragment_to_termFragment) } binding.btnPermissionBack.setOnClickListener { - Firebase.analytics.logEvent(FirebaseAnalytics.Event.SELECT_ITEM) { - param(FirebaseAnalytics.Param.CONTENT_TYPE, "BACK_PRESS") - param(FirebaseAnalytics.Param.ITEM_ID, "OUT_GUIDANCE_SIGN") - } + recordClickEvent("BACK_PRESS", "OUT_GUIDANCE_SIGN") requireActivity().finish() } return binding.root diff --git a/app/src/main/java/com/teambeme/beme/signup/view/PersonalInfoFragment.kt b/app/src/main/java/com/teambeme/beme/signup/view/PersonalInfoFragment.kt index b618b28..7eb4746 100644 --- a/app/src/main/java/com/teambeme/beme/signup/view/PersonalInfoFragment.kt +++ b/app/src/main/java/com/teambeme/beme/signup/view/PersonalInfoFragment.kt @@ -17,6 +17,7 @@ import com.google.firebase.ktx.Firebase import com.teambeme.beme.R import com.teambeme.beme.databinding.FragmentPersonalInfoBinding import com.teambeme.beme.signup.viewmodel.SignUpViewModel +import com.teambeme.beme.util.recordClickEvent class PersonalInfoFragment : Fragment() { private lateinit var binding: FragmentPersonalInfoBinding @@ -39,10 +40,7 @@ class PersonalInfoFragment : Fragment() { binding.lifecycleOwner = viewLifecycleOwner binding.signUpViewModel = signUpViewModel binding.btnPersonalBack.setOnClickListener { view -> - Firebase.analytics.logEvent(FirebaseAnalytics.Event.SELECT_ITEM) { - param(FirebaseAnalytics.Param.CONTENT_TYPE, "BACK_PRESS") - param(FirebaseAnalytics.Param.ITEM_ID, "OUT_INF_SIGN") - } + recordClickEvent("BACK_PRESS", "OUT_INF_SIGN") view.findNavController().popBackStack() } setDoubleCheckListener() diff --git a/app/src/main/java/com/teambeme/beme/signup/view/TermFragment.kt b/app/src/main/java/com/teambeme/beme/signup/view/TermFragment.kt index cbede3d..5dd5932 100644 --- a/app/src/main/java/com/teambeme/beme/signup/view/TermFragment.kt +++ b/app/src/main/java/com/teambeme/beme/signup/view/TermFragment.kt @@ -17,6 +17,7 @@ import com.google.firebase.ktx.Firebase import com.teambeme.beme.R import com.teambeme.beme.databinding.FragmentTermBinding import com.teambeme.beme.signup.viewmodel.SignUpViewModel +import com.teambeme.beme.util.recordClickEvent class TermFragment : Fragment() { private lateinit var binding: FragmentTermBinding @@ -38,10 +39,7 @@ class TermFragment : Fragment() { binding.viewModel = signUpViewModel binding.lifecycleOwner = viewLifecycleOwner binding.btnTermBack.setOnClickListener { view -> - Firebase.analytics.logEvent(FirebaseAnalytics.Event.SELECT_ITEM) { - param(FirebaseAnalytics.Param.CONTENT_TYPE, "BACK_PRESS") - param(FirebaseAnalytics.Param.ITEM_ID, "OUT_TERM_SIGN") - } + recordClickEvent("BACK_PRESS", "OUT_TERM_SIGN") view.findNavController().popBackStack() } doneButtonClickListener() diff --git a/app/src/main/java/com/teambeme/beme/util/FirebaseEventUtil.kt b/app/src/main/java/com/teambeme/beme/util/FirebaseEventUtil.kt new file mode 100644 index 0000000..4c8394b --- /dev/null +++ b/app/src/main/java/com/teambeme/beme/util/FirebaseEventUtil.kt @@ -0,0 +1,13 @@ +package com.teambeme.beme.util + +import com.google.firebase.analytics.FirebaseAnalytics +import com.google.firebase.analytics.ktx.analytics +import com.google.firebase.analytics.ktx.logEvent +import com.google.firebase.ktx.Firebase + +fun recordClickEvent(contentType: String, itemId: String) { + Firebase.analytics.logEvent(FirebaseAnalytics.Event.SELECT_ITEM) { + param(FirebaseAnalytics.Param.CONTENT_TYPE, contentType) + param(FirebaseAnalytics.Param.ITEM_ID, itemId) + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index bc57242..4c58929 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -148,6 +148,7 @@ app:layout_constraintBottom_toBottomOf="parent"> @@ -158,6 +159,7 @@ android:text="|" />