Skip to content

Commit 3ff908e

Browse files
Rename extension function
1 parent 0f7d72b commit 3ff908e

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

app/src/main/java/org/stepic/droid/ui/activities/MainFeedActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import org.stepic.droid.util.AppConstants
3131
import org.stepic.droid.util.DateTimeHelper
3232
import org.stepic.droid.util.commit
3333
import org.stepik.android.domain.base.analytic.BUNDLEABLE_ANALYTIC_EVENT
34-
import org.stepik.android.domain.base.analytic.toGenericAnalyticEvent
34+
import org.stepik.android.domain.base.analytic.toAnalyticEvent
3535
import org.stepik.android.domain.course.analytic.CourseViewSource
3636
import org.stepik.android.domain.streak.interactor.StreakInteractor
3737
import org.stepik.android.model.Course
@@ -177,7 +177,7 @@ class MainFeedActivity : BackToExitActivityWithSmartLockBase(),
177177
checkNotificationClick(intent)
178178
val analyticEvent = intent
179179
.getBundleExtra(BUNDLEABLE_ANALYTIC_EVENT)
180-
?.toGenericAnalyticEvent()
180+
?.toAnalyticEvent()
181181

182182
if (analyticEvent != null) {
183183
analytic.report(analyticEvent)

app/src/main/java/org/stepic/droid/ui/activities/SplashActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import org.stepic.droid.core.presenters.contracts.SplashView
2424
import org.stepic.droid.util.AppConstants
2525
import org.stepic.droid.util.defaultLocale
2626
import org.stepik.android.domain.base.analytic.BUNDLEABLE_ANALYTIC_EVENT
27-
import org.stepik.android.domain.base.analytic.toGenericAnalyticEvent
27+
import org.stepik.android.domain.base.analytic.toAnalyticEvent
2828
import org.stepik.android.view.routing.deeplink.BranchRoute
2929
import java.util.Arrays
3030
import javax.inject.Inject
@@ -60,7 +60,7 @@ class SplashActivity : BackToExitActivityBase(), SplashView {
6060
if (savedInstanceState == null) {
6161
val analyticEvent = intent
6262
.getBundleExtra(BUNDLEABLE_ANALYTIC_EVENT)
63-
?.toGenericAnalyticEvent()
63+
?.toAnalyticEvent()
6464

6565
if (analyticEvent != null) {
6666
analytics.report(analyticEvent)

app/src/main/java/org/stepik/android/domain/base/analytic/AnalyticEventExtensions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fun AnalyticEvent.toBundle(): Bundle =
1414
BUNDLEABLE_EVENT_PARAMS to bundleOf(*params.map { (a, b) -> a to b }.toTypedArray())
1515
)
1616

17-
fun Bundle.toGenericAnalyticEvent(): AnalyticEvent? {
17+
fun Bundle.toAnalyticEvent(): AnalyticEvent? {
1818
val eventName = getString(BUNDLEABLE_EVENT_NAME)
1919
val eventParams = getBundle(BUNDLEABLE_EVENT_PARAMS)
2020
return if (eventName == null) {

app/src/main/java/org/stepik/android/view/base/receiver/DismissedNotificationReceiver.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import org.stepic.droid.analytic.Analytic
88
import org.stepic.droid.base.App
99
import org.stepic.droid.preferences.SharedPreferenceHelper
1010
import org.stepik.android.domain.base.analytic.BUNDLEABLE_ANALYTIC_EVENT
11-
import org.stepik.android.domain.base.analytic.toGenericAnalyticEvent
11+
import org.stepik.android.domain.base.analytic.toAnalyticEvent
1212
import java.util.concurrent.ThreadPoolExecutor
1313
import javax.inject.Inject
1414

@@ -60,7 +60,7 @@ class DismissedNotificationReceiver : BroadcastReceiver() {
6060
private fun logAnalyticEvent(intent: Intent) {
6161
val analyticEvent = intent
6262
.getBundleExtra(BUNDLEABLE_ANALYTIC_EVENT)
63-
?.toGenericAnalyticEvent()
63+
?.toAnalyticEvent()
6464

6565
if (analyticEvent != null) {
6666
analytic.report(analyticEvent)

app/src/main/java/org/stepik/android/view/course/ui/activity/CourseActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ import org.stepic.droid.ui.util.snackbar
3434
import org.stepic.droid.util.ProgressHelper
3535
import org.stepic.droid.util.resolveColorAttribute
3636
import org.stepik.android.domain.base.analytic.BUNDLEABLE_ANALYTIC_EVENT
37-
import org.stepik.android.domain.base.analytic.toGenericAnalyticEvent
37+
import org.stepik.android.domain.base.analytic.toAnalyticEvent
3838
import org.stepik.android.domain.course.analytic.CourseJoinedEvent
3939
import org.stepik.android.domain.course.analytic.CourseViewSource
4040
import org.stepik.android.domain.course_news.analytic.CourseNewsScreenOpenedAnalyticEvent
@@ -214,7 +214,7 @@ class CourseActivity :
214214
if (savedInstanceState == null) {
215215
val analyticEvent = intent
216216
.getBundleExtra(BUNDLEABLE_ANALYTIC_EVENT)
217-
?.toGenericAnalyticEvent()
217+
?.toAnalyticEvent()
218218

219219
if (analyticEvent != null) {
220220
analytic.report(analyticEvent)

0 commit comments

Comments
 (0)