Skip to content

Commit 3bd61cc

Browse files
JaimiesJaimies
committed
feat: remove analytics
Not a great idea to have Google harvesting user data.
1 parent bc96709 commit 3bd61cc

14 files changed

Lines changed: 13 additions & 82 deletions

File tree

‎app/build.gradle‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ dependencies {
127127
implementation "androidx.paging:paging-runtime-ktx:$Versions.paging"
128128

129129
implementation platform("com.google.firebase:firebase-bom:$Versions.firebase")
130-
implementation 'com.google.firebase:firebase-analytics-ktx'
131130
implementation 'com.google.firebase:firebase-crashlytics-ktx'
132131

133132
implementation "androidx.work:work-runtime-ktx:$Versions.workManager"

‎app/src/main/java/com/maxpoliakov/skillapp/shared/BaseFragment.kt‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
package com.maxpoliakov.skillapp.shared
22

33
import androidx.fragment.app.Fragment
4-
import com.maxpoliakov.skillapp.shared.analytics.logCurrentScreenToAnalytics
54

6-
abstract class BaseFragment : Fragment() {
7-
override fun onResume() {
8-
super.onResume()
9-
logCurrentScreenToAnalytics(this)
10-
}
11-
}
5+
abstract class BaseFragment : Fragment()

‎app/src/main/java/com/maxpoliakov/skillapp/shared/analytics/Analytics.kt‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎app/src/main/java/com/maxpoliakov/skillapp/ui/backup/BackupFragment.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ import com.google.api.services.drive.DriveScopes
1616
import com.maxpoliakov.skillapp.R
1717
import com.maxpoliakov.skillapp.databinding.BackupFragBinding
1818
import com.maxpoliakov.skillapp.shared.DataBindingFragment
19-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
2019
import com.maxpoliakov.skillapp.shared.dialog.showDialog
2120
import com.maxpoliakov.skillapp.shared.dialog.showSnackbar
2221
import com.maxpoliakov.skillapp.shared.dialog.showToast
23-
import com.maxpoliakov.skillapp.shared.fragment.observe
2422
import com.maxpoliakov.skillapp.shared.extensions.navigateAnimated
23+
import com.maxpoliakov.skillapp.shared.fragment.observe
2524
import dagger.hilt.android.AndroidEntryPoint
2625
import javax.inject.Inject
2726

@@ -83,7 +82,6 @@ class BackupFragment : DataBindingFragment<BackupFragBinding>() {
8382
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
8483
if (requestCode == REQUEST_APPDATA_CODE && resultCode == Activity.RESULT_OK) {
8584
viewModel.updateLastBackupDate()
86-
logEvent("grant_appdata_permission")
8785
}
8886
}
8987

‎app/src/main/java/com/maxpoliakov/skillapp/ui/backup/BackupViewModel.kt‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ import com.maxpoliakov.skillapp.domain.repository.AuthRepository
1212
import com.maxpoliakov.skillapp.domain.repository.BackupRepository
1313
import com.maxpoliakov.skillapp.domain.repository.NetworkUtil
1414
import com.maxpoliakov.skillapp.domain.usecase.backup.PerformBackupUseCase
15-
import com.maxpoliakov.skillapp.shared.util.dateTimeFormatter
16-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
1715
import com.maxpoliakov.skillapp.shared.lifecycle.SingleLiveEvent
1816
import com.maxpoliakov.skillapp.shared.lifecycle.SingleLiveEventWithoutData
17+
import com.maxpoliakov.skillapp.shared.util.dateTimeFormatter
1918
import dagger.hilt.android.lifecycle.HiltViewModel
2019
import kotlinx.coroutines.CoroutineScope
2120
import kotlinx.coroutines.launch
@@ -93,8 +92,6 @@ class BackupViewModel @Inject constructor(
9392
_requestAppDataPermission.call()
9493
else
9594
createBackupInBackground()
96-
97-
logEvent("sign_in")
9895
}
9996

10097
private fun createBackupInBackground() = scope.launch {
@@ -111,15 +108,13 @@ class BackupViewModel @Inject constructor(
111108
authRepository.signOut()
112109
_currentUser.value = null
113110
_lastBackupDate.value = R.string.loading_last_backup
114-
logEvent("sign_out")
115111
}
116112

117113
fun signIn() {
118114
_signIn.call()
119115
}
120116

121117
fun createBackup() = scope.launch {
122-
logEvent("create_backup")
123118
_backupCreating.value = true
124119
val result = performBackupUseCase.performBackup()
125120
handleResult(result)

‎app/src/main/java/com/maxpoliakov/skillapp/ui/history/recyclerview/record/RecordViewModel.kt‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,13 @@ package com.maxpoliakov.skillapp.ui.history.recyclerview.record
33
import androidx.lifecycle.LiveData
44
import androidx.lifecycle.MutableLiveData
55
import com.maxpoliakov.skillapp.domain.di.ApplicationScope
6-
import com.maxpoliakov.skillapp.domain.model.Record
76
import com.maxpoliakov.skillapp.domain.model.Change
8-
import com.maxpoliakov.skillapp.domain.usecase.records.DeleteRecordUseCase
9-
import com.maxpoliakov.skillapp.domain.usecase.records.EditRecordUseCase
107
import com.maxpoliakov.skillapp.domain.model.RangeChange
8+
import com.maxpoliakov.skillapp.domain.model.Record
119
import com.maxpoliakov.skillapp.domain.model.RecordChange
10+
import com.maxpoliakov.skillapp.domain.usecase.records.DeleteRecordUseCase
11+
import com.maxpoliakov.skillapp.domain.usecase.records.EditRecordUseCase
1212
import com.maxpoliakov.skillapp.model.HistoryUiModel
13-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
1413
import com.maxpoliakov.skillapp.shared.lifecycle.SingleLiveEventWithoutData
1514
import kotlinx.coroutines.CoroutineScope
1615
import kotlinx.coroutines.launch
@@ -36,17 +35,14 @@ class RecordViewModel @Inject constructor(
3635
scope.launch {
3736
deleteRecord.run(record.value!!.id)
3837
}
39-
logEvent("delete_record")
4038
}
4139

4240
fun changeRecordDate(newDate: LocalDate) {
4341
change(RecordChange.Date(newDate))
44-
logEvent("change_record_date")
4542
}
4643

4744
fun changeRecordTime(newCount: Long) {
4845
change(RecordChange.Count(newCount))
49-
logEvent("change_record_time")
5046
}
5147

5248
fun changeStartTime(newTime: LocalTime) {

‎app/src/main/java/com/maxpoliakov/skillapp/ui/restore/BackupViewHolder.kt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@ import androidx.lifecycle.map
77
import androidx.navigation.NavController
88
import androidx.recyclerview.widget.RecyclerView
99
import com.maxpoliakov.skillapp.R
10-
import com.maxpoliakov.skillapp.domain.di.ApplicationScope
1110
import com.maxpoliakov.skillapp.databinding.BackupListItemBinding
1211
import com.maxpoliakov.skillapp.di.SnackbarRoot
12+
import com.maxpoliakov.skillapp.domain.di.ApplicationScope
1313
import com.maxpoliakov.skillapp.domain.model.Backup
1414
import com.maxpoliakov.skillapp.domain.repository.NetworkUtil
1515
import com.maxpoliakov.skillapp.domain.usecase.backup.RestoreBackupUseCase
1616
import com.maxpoliakov.skillapp.domain.usecase.backup.RestoreBackupUseCase.RestorationState
17-
import com.maxpoliakov.skillapp.shared.util.dateTimeFormatter
18-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
1917
import com.maxpoliakov.skillapp.shared.dialog.showDialog
2018
import com.maxpoliakov.skillapp.shared.dialog.showSnackbar
2119
import com.maxpoliakov.skillapp.shared.dialog.showToast
20+
import com.maxpoliakov.skillapp.shared.util.dateTimeFormatter
2221
import dagger.assisted.Assisted
2322
import dagger.assisted.AssistedFactory
2423
import dagger.assisted.AssistedInject
@@ -63,7 +62,6 @@ class BackupViewHolder @AssistedInject constructor(
6362
}
6463

6564
private fun restoreBackup() {
66-
logEvent("restore_backup")
6765
val backup = backup.value ?: return
6866

6967
scope.launch {

‎app/src/main/java/com/maxpoliakov/skillapp/ui/settings/SettingsFragment.kt‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ import androidx.preference.PreferenceFragmentCompat
1111
import com.maxpoliakov.skillapp.R
1212
import com.maxpoliakov.skillapp.model.Theme
1313
import com.maxpoliakov.skillapp.shared.Dimension.Companion.dp
14-
import com.maxpoliakov.skillapp.shared.analytics.logCurrentScreenToAnalytics
15-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
1614
import com.maxpoliakov.skillapp.shared.dialog.showSnackbar
1715
import com.maxpoliakov.skillapp.shared.extensions.navigateAnimated
1816
import com.maxpoliakov.skillapp.shared.extensions.setTheme
@@ -28,7 +26,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
2826

2927
findPreference<ListPreference>("theme")!!.setOnPreferenceChangeListener { _, newValue ->
3028
setTheme(Theme.valueOf(newValue as String))
31-
logEvent("change_theme")
3229
true
3330
}
3431

@@ -95,9 +92,4 @@ class SettingsFragment : PreferenceFragmentCompat() {
9592
super.onViewCreated(view, savedInstanceState)
9693
listView.setPadding(12.dp.toPx(requireContext()), 0, 0, 0)
9794
}
98-
99-
override fun onResume() {
100-
super.onResume()
101-
logCurrentScreenToAnalytics(this)
102-
}
10395
}

‎app/src/main/java/com/maxpoliakov/skillapp/ui/skilldetail/SkillDetailFragment.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import androidx.navigation.fragment.findNavController
77
import com.maxpoliakov.skillapp.R
88
import com.maxpoliakov.skillapp.databinding.SkilldetailFragBinding
99
import com.maxpoliakov.skillapp.shared.DetailsFragment
10-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
1110
import com.maxpoliakov.skillapp.shared.dialog.showDialog
1211
import com.maxpoliakov.skillapp.shared.fragment.observe
1312
import com.maxpoliakov.skillapp.shared.permissions.PermissionRequester
@@ -53,8 +52,6 @@ class SkillDetailFragment : DetailsFragment<SkilldetailFragBinding>(R.menu.skill
5352
}
5453
}
5554

56-
override fun onSwitchToEditMode() = logEvent("edit_skill")
57-
5855
override fun onDeleteSelected() {
5956
requireContext().showDialog(R.string.delete_skill_title, R.string.delete_skill_message, R.string.delete) {
6057
deleteSkill()

‎app/src/main/java/com/maxpoliakov/skillapp/ui/skilldetail/SkillDetailViewModel.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.maxpoliakov.skillapp.domain.usecase.skill.ManageSkillUseCase
1717
import com.maxpoliakov.skillapp.model.ProductivitySummary
1818
import com.maxpoliakov.skillapp.model.mapToDomain
1919
import com.maxpoliakov.skillapp.shared.DetailsViewModel
20-
import com.maxpoliakov.skillapp.shared.analytics.logEvent
2120
import com.maxpoliakov.skillapp.shared.lifecycle.SingleLiveEvent
2221
import com.maxpoliakov.skillapp.shared.lifecycle.SingleLiveEventWithoutData
2322
import com.maxpoliakov.skillapp.shared.util.getZonedDateTime
@@ -93,7 +92,6 @@ class SkillDetailViewModel @Inject constructor(
9392

9493
fun deleteSkill() = skillStateFlow.value?.let { skill ->
9594
scope.launch { manageSkill.deleteSkill(skill) }
96-
logEvent("delete_skill")
9795
}
9896

9997
fun toggleTimer() = scope.launch {
@@ -102,12 +100,10 @@ class SkillDetailViewModel @Inject constructor(
102100
if (stateChange is StateChange.Start) {
103101
_stopwatchStarted.call()
104102
}
105-
logEvent("toggle_timer")
106103
}
107104

108105
fun showRecordDialog() {
109106
showRecordDialog.call()
110-
logEvent("add_time_manually")
111107
}
112108

113109
override suspend fun update(name: String) {

0 commit comments

Comments
 (0)