From 2bb521fae81ff95d3decfcabcebc68bff4112f7b Mon Sep 17 00:00:00 2001
From: Chris Banes <chris@banes.me>
Date: Tue, 17 Dec 2019 12:43:22 +1100
Subject: [PATCH 1/2] Change continuation indent to 4 chars

---
 .idea/codeStyles/Project.xml                  |  5 ++
 .../tivi/appinitializers/EmojiInitializer.kt  | 10 +--
 .../main/java/app/tivi/home/HomeActivity.kt   | 10 +--
 .../main/java/app/tivi/inject/AppModule.kt    | 34 ++++----
 .../settings/SettingsPreferenceFragment.kt    |  8 +-
 .../tivi/showdetails/ShowDetailsActivity.kt   | 10 +--
 .../java/app/tivi/util/TiviDateFormatter.kt   | 16 ++--
 .../tivi/extensions/CoroutineExtensions.kt    | 19 +++--
 .../java/app/tivi/TiviFragmentWithBinding.kt  |  4 +-
 .../tivi/databinding/TiviBindingMethods.kt    | 16 ++--
 .../app/tivi/util/EntryGridEpoxyController.kt |  2 +-
 .../java/app/tivi/util/EntryGridFragment.kt   | 12 +--
 .../main/java/app/tivi/util/EntryViewModel.kt | 10 +--
 .../app/tivi/common/epoxy/EpoxyExtensions.kt  |  4 +-
 .../ImageLoadingBindingAdapters.kt            | 48 +++++------
 .../main/java/app/tivi/TiviMvRxViewModel.kt   | 14 ++--
 .../tivi/extensions/MotionLayoutExtensions.kt |  2 +-
 .../MultipleBackStackNavigationExtensions.kt  | 72 ++++++++---------
 .../tivi/extensions/RecyclerViewExtensions.kt | 12 +--
 .../extensions/SharedElementExtensions.kt     |  8 +-
 .../java/app/tivi/home/HomeTextCreator.kt     |  4 +-
 .../app/tivi/ui/AuthStateMenuItemBinder.kt    |  6 +-
 .../src/main/java/app/tivi/ui/ScrimUtil.kt    | 16 ++--
 .../ui/graphics/ImageLoadingColorMatrix.kt    | 12 ++-
 .../motionlayout/TransitionListenerAdapter.kt |  3 +-
 .../recyclerview/TiviLinearSmoothScroller.kt  |  2 +-
 .../java/app/tivi/ui/transitions/BabySlide.kt | 22 ++---
 .../ui/transitions/ColumnedChangeBounds.kt    | 15 ++--
 .../ui/transitions/DrawableAlphaProperty.kt   |  4 +-
 .../ui/transitions/GridToGridTransitioner.kt  |  2 +-
 .../tivi/ui/transitions/ViewChangeBounds.kt   | 50 ++++++------
 .../app/tivi/ui/transitions/ViewGroupUtils.kt |  2 +-
 .../tivi/ui/widget/BaselineGridTextView.kt    |  8 +-
 .../tivi/ui/widget/HeaderHolderFrameLayout.kt |  6 +-
 .../widget/MaterialShapeConstraintLayout.kt   |  4 +-
 .../tivi/ui/widget/NestedChildMotionLayout.kt | 22 ++---
 .../ui/widget/TopLeftCutoutBackgroundView.kt  |  8 +-
 .../main/java/app/tivi/data/DatabaseInject.kt |  4 +-
 .../app/tivi/data/FlowPagedListBuilder.kt     | 12 +--
 .../java/app/tivi/data/TiviRoomDatabase.kt    | 44 +++++-----
 .../java/app/tivi/data/TiviTypeConverters.kt  |  4 +-
 .../java/app/tivi/data/TestDatabaseInject.kt  |  4 +-
 .../tivi/data/dao/EpisodeWatchEntryTest.kt    | 10 +--
 .../java/app/tivi/data/dao/EpisodesTest.kt    | 14 ++--
 .../java/app/tivi/data/dao/SeasonsTest.kt     |  8 +-
 .../FollowedShowRepositoryTest.kt             | 24 +++---
 .../SeasonsEpisodesRepositoryTest.kt          | 24 +++---
 .../test/java/app/tivi/utils/SampleData.kt    | 38 ++++-----
 .../java/app/tivi/utils/TiviTestDatabase.kt   | 46 +++++------
 .../java/app/tivi/data/daos/EpisodesDao.kt    |  6 +-
 .../java/app/tivi/data/entities/Episode.kt    | 24 +++---
 .../tivi/data/entities/EpisodeWatchEntry.kt   | 26 +++---
 .../tivi/data/entities/FollowedShowEntry.kt   | 24 +++---
 .../app/tivi/data/entities/LastRequest.kt     |  4 +-
 .../tivi/data/entities/PopularShowEntry.kt    | 22 ++---
 .../data/entities/RecommendedShowEntry.kt     | 22 ++---
 .../tivi/data/entities/RelatedShowEntry.kt    | 40 +++++-----
 .../java/app/tivi/data/entities/Season.kt     | 22 ++---
 .../app/tivi/data/entities/ShowTmdbImage.kt   | 20 ++---
 .../java/app/tivi/data/entities/TiviEntity.kt |  5 +-
 .../java/app/tivi/data/entities/TiviShow.kt   | 11 +--
 .../java/app/tivi/data/entities/TraktUser.kt  |  4 +-
 .../tivi/data/entities/TrendingShowEntry.kt   | 22 ++---
 .../tivi/data/entities/WatchedShowEntry.kt    | 22 ++---
 .../data/mappers/EpisodeIdToTraktIdMapper.kt  |  3 +-
 .../data/mappers/SeasonIdToTraktIdMapper.kt   |  3 +-
 .../tivi/data/mappers/ShowIdToTmdbIdMapper.kt |  2 +-
 .../data/mappers/TmdbBaseShowToTiviShow.kt    |  6 +-
 .../tivi/data/mappers/TmdbEpisodeToEpisode.kt | 12 +--
 .../data/mappers/TmdbImagesToShowImages.kt    | 20 ++---
 .../mappers/TmdbShowResultsPageToTiviShows.kt | 16 ++--
 .../tivi/data/mappers/TmdbShowToTiviShow.kt   | 14 ++--
 .../data/mappers/TraktBaseShowToTiviShow.kt   |  2 +-
 .../data/mappers/TraktEpisodeToEpisode.kt     | 18 ++---
 .../TraktHistoryItemToEpisodeWatchEntry.kt    |  6 +-
 .../TraktListEntryToFollowedShowEntry.kt      |  6 +-
 .../tivi/data/mappers/TraktSeasonToSeason.kt  | 22 ++---
 .../tivi/data/mappers/TraktShowToTiviShow.kt  | 72 ++++++++---------
 .../app/tivi/data/mappers/UserToTraktUser.kt  | 14 ++--
 .../episodes/EpisodeWatchStore.kt             |  8 +-
 .../episodes/SeasonsEpisodesRepository.kt     | 80 +++++++++----------
 .../episodes/SeasonsEpisodesStore.kt          | 22 ++---
 .../episodes/TmdbEpisodeDataSource.kt         |  6 +-
 .../episodes/TraktEpisodeDataSource.kt        |  6 +-
 .../TraktSeasonsEpisodesDataSource.kt         | 34 ++++----
 .../followedshows/FollowedShowsRepository.kt  |  8 +-
 .../followedshows/FollowedShowsStore.kt       | 10 +--
 .../TraktFollowedShowsDataSource.kt           | 28 +++----
 .../TraktPopularShowsDataSource.kt            |  4 +-
 .../TraktRecommendedShowsDataSource.kt        |  4 +-
 .../TmdbRelatedShowsDataSource.kt             |  4 +-
 .../TraktRelatedShowsDataSource.kt            |  6 +-
 .../search/TmdbSearchDataSource.kt            |  4 +-
 .../data/repositories/shows/ShowRepository.kt |  8 +-
 .../tivi/data/repositories/shows/ShowStore.kt | 48 +++++------
 .../repositories/shows/TmdbShowDataSource.kt  |  4 +-
 .../shows/TmdbShowImagesDataSource.kt         |  4 +-
 .../repositories/shows/TraktShowDataSource.kt | 20 ++---
 .../traktusers/TraktUsersDataSource.kt        |  4 +-
 .../TraktTrendingShowsDataSource.kt           |  4 +-
 .../TraktWatchedShowsDataSource.kt            |  4 +-
 .../java/app/tivi/data/syncers/ItemSyncer.kt  | 28 +++----
 .../main/java/app/tivi/domain/Interactor.kt   |  4 +-
 .../interactors/ChangeSeasonWatchedStatus.kt  |  6 +-
 .../domain/interactors/UpdateFollowedShows.kt |  8 +-
 .../observers/ObservePagedFollowedShows.kt    |  6 +-
 .../observers/ObservePagedPopularShows.kt     |  6 +-
 .../observers/ObservePagedRecommendedShows.kt |  6 +-
 .../observers/ObservePagedTrendingShows.kt    |  6 +-
 .../observers/ObservePagedWatchedShows.kt     |  6 +-
 .../main/java/app/tivi/tasks/ShowTasksImpl.kt | 46 +++++------
 .../app/tivi/tasks/SyncShowWatchedProgress.kt |  4 +-
 .../java/app/tivi/tasks/inject/TasksModule.kt |  4 +-
 .../tivi/tasks/inject/TiviWorkerFactory.kt    |  2 +-
 .../main/java/app/tivi/tmdb/TmdbImageSizes.kt | 36 ++++-----
 .../main/java/app/tivi/tmdb/TmdbManager.kt    |  8 +-
 .../java/app/tivi/trakt/TraktAuthModule.kt    | 14 ++--
 .../main/java/app/tivi/trakt/TraktManager.kt  | 10 +--
 .../tivi/home/discover/DiscoverFragment.kt    | 40 +++++-----
 .../EpisodeDetailsEpoxyController.kt          |  2 +-
 .../episodedetails/EpisodeDetailsFragment.kt  | 26 +++---
 .../home/followed/FollowedEpoxyController.kt  |  2 +-
 .../tivi/home/followed/FollowedFragment.kt    | 14 ++--
 .../tivi/home/followed/FollowedViewModel.kt   | 48 +++++------
 .../tivi/home/popular/PopularShowsFragment.kt | 34 ++++----
 .../recommended/RecommendedShowsFragment.kt   | 34 ++++----
 .../app/tivi/home/search/SearchFragment.kt    |  6 +-
 .../app/tivi/home/search/SearchViewModel.kt   | 16 ++--
 .../details/ShowDetailsEpoxyController.kt     | 14 ++--
 .../details/ShowDetailsFragment.kt            | 24 +++---
 .../details/ShowDetailsFragmentViewModel.kt   | 18 ++---
 .../details/ShowDetailsTextCreator.kt         | 20 ++---
 .../home/trending/TrendingShowsFragment.kt    | 34 ++++----
 .../home/watched/WatchedEpoxyController.kt    |  2 +-
 .../app/tivi/home/watched/WatchedFragment.kt  | 14 ++--
 .../app/tivi/home/watched/WatchedViewModel.kt | 44 +++++-----
 136 files changed, 1079 insertions(+), 1057 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 64e46cf350..8c2ca30ef1 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -130,6 +130,11 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="FIELD_ANNOTATION_WRAP" value="1" />
+      <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
     </codeStyleSettings>
   </code_scheme>
 </component>
\ No newline at end of file
diff --git a/app/src/main/java/app/tivi/appinitializers/EmojiInitializer.kt b/app/src/main/java/app/tivi/appinitializers/EmojiInitializer.kt
index 977db6f6cb..3abb37bc8e 100644
--- a/app/src/main/java/app/tivi/appinitializers/EmojiInitializer.kt
+++ b/app/src/main/java/app/tivi/appinitializers/EmojiInitializer.kt
@@ -26,13 +26,13 @@ import javax.inject.Inject
 class EmojiInitializer @Inject constructor() : AppInitializer {
     override fun init(application: Application) {
         val fontRequest = FontRequest(
-                "com.google.android.gms.fonts",
-                "com.google.android.gms",
-                "Noto Color Emoji Compat",
-                R.array.com_google_android_gms_fonts_certs)
+            "com.google.android.gms.fonts",
+            "com.google.android.gms",
+            "Noto Color Emoji Compat",
+            R.array.com_google_android_gms_fonts_certs)
 
         val config = FontRequestEmojiCompatConfig(application, fontRequest)
-                .setReplaceAll(true)
+            .setReplaceAll(true)
 
         EmojiCompat.init(config)
     }
diff --git a/app/src/main/java/app/tivi/home/HomeActivity.kt b/app/src/main/java/app/tivi/home/HomeActivity.kt
index e841a612e8..cffdf9a1e9 100644
--- a/app/src/main/java/app/tivi/home/HomeActivity.kt
+++ b/app/src/main/java/app/tivi/home/HomeActivity.kt
@@ -86,11 +86,11 @@ class HomeActivity : TiviActivityMvRxView() {
 
     private fun setupBottomNavigationBar() {
         binding.homeBottomNavigation.setupWithNavController(
-                listOf(R.navigation.discover_nav_graph, R.navigation.watched_nav_graph,
-                        R.navigation.following_nav_graph, R.navigation.search_nav_graph),
-                supportFragmentManager,
-                R.id.home_nav_container,
-                intent
+            listOf(R.navigation.discover_nav_graph, R.navigation.watched_nav_graph,
+                R.navigation.following_nav_graph, R.navigation.search_nav_graph),
+            supportFragmentManager,
+            R.id.home_nav_container,
+            intent
         ).observe(this) { navController ->
             currentNavController = navController
 
diff --git a/app/src/main/java/app/tivi/inject/AppModule.kt b/app/src/main/java/app/tivi/inject/AppModule.kt
index cd76036d1b..e0725153ab 100644
--- a/app/src/main/java/app/tivi/inject/AppModule.kt
+++ b/app/src/main/java/app/tivi/inject/AppModule.kt
@@ -55,16 +55,16 @@ class AppModule {
     @Singleton
     @Provides
     fun provideCoroutineDispatchers() = AppCoroutineDispatchers(
-            io = Dispatchers.IO,
-            computation = Dispatchers.Default,
-            main = Dispatchers.Main
+        io = Dispatchers.IO,
+        computation = Dispatchers.Default,
+        main = Dispatchers.Main
     )
 
     @Singleton
     @Provides
     fun provideBackgroundExecutor(): Executor {
         val parallelism = (Runtime.getRuntime().availableProcessors() * 2)
-                .coerceIn(4, 32)
+            .coerceIn(4, 32)
         return if (Build.VERSION.SDK_INT < 24) {
             Executors.newFixedThreadPool(parallelism)
         } else {
@@ -105,9 +105,9 @@ class AppModule {
     fun provideMediumDateFormatter(application: TiviApplication): DateTimeFormatter {
         @Suppress("DEPRECATION")
         return (AndroidDateFormat.getMediumDateFormat(application) as SimpleDateFormat)
-                .toThreeTenDateTimeFormatter()
-                .withLocale(application.resources.configuration.locale)
-                .withZone(ZoneId.systemDefault())
+            .toThreeTenDateTimeFormatter()
+            .withLocale(application.resources.configuration.locale)
+            .withZone(ZoneId.systemDefault())
     }
 
     @Singleton
@@ -119,8 +119,8 @@ class AppModule {
 
         @Suppress("DEPRECATION")
         return DateTimeFormatter.ofPattern("${dateF.toPattern()} ${timeF.toPattern()}")
-                .withLocale(application.resources.configuration.locale)
-                .withZone(ZoneId.systemDefault())
+            .withLocale(application.resources.configuration.locale)
+            .withZone(ZoneId.systemDefault())
     }
 
     @Singleton
@@ -129,9 +129,9 @@ class AppModule {
     fun provideShortDateFormatter(application: TiviApplication): DateTimeFormatter {
         @Suppress("DEPRECATION")
         return (AndroidDateFormat.getDateFormat(application) as SimpleDateFormat)
-                .toThreeTenDateTimeFormatter()
-                .withLocale(application.resources.configuration.locale)
-                .withZone(ZoneId.systemDefault())
+            .toThreeTenDateTimeFormatter()
+            .withLocale(application.resources.configuration.locale)
+            .withZone(ZoneId.systemDefault())
     }
 
     @Singleton
@@ -140,7 +140,7 @@ class AppModule {
     fun provideShortTimeFormatter(application: TiviApplication): DateTimeFormatter {
         @Suppress("DEPRECATION")
         return (AndroidDateFormat.getTimeFormat(application) as SimpleDateFormat)
-                .toThreeTenDateTimeFormatter()
+            .toThreeTenDateTimeFormatter()
     }
 
     @Provides
@@ -152,9 +152,9 @@ class AppModule {
     @Provides
     @Singleton
     fun provideAppBarConfiguration() = AppBarConfiguration.Builder(
-            R.id.navigation_followed,
-            R.id.navigation_watched,
-            R.id.navigation_discover,
-            R.id.navigation_search
+        R.id.navigation_followed,
+        R.id.navigation_watched,
+        R.id.navigation_discover,
+        R.id.navigation_search
     ).build()
 }
diff --git a/app/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt b/app/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt
index 9c73054ca5..dae621e1e8 100644
--- a/app/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt
+++ b/app/src/main/java/app/tivi/settings/SettingsPreferenceFragment.kt
@@ -33,9 +33,9 @@ internal class SettingsPreferenceFragment : PreferenceFragmentCompat() {
 
         findPreference<Preference>("privacy_policy")?.setOnPreferenceClickListener {
             CustomTabsIntent.Builder()
-                    .setToolbarColor(requireContext().resolveThemeColor(R.attr.colorPrimaryVariant))
-                    .build()
-                    .launchUrl(requireContext(), getString(R.string.privacy_policy_url).toUri())
+                .setToolbarColor(requireContext().resolveThemeColor(R.attr.colorPrimaryVariant))
+                .build()
+                .launchUrl(requireContext(), getString(R.string.privacy_policy_url).toUri())
             true
         }
 
@@ -46,7 +46,7 @@ internal class SettingsPreferenceFragment : PreferenceFragmentCompat() {
 
         findPreference<Preference>("version")?.apply {
             summary = getString(R.string.settings_app_version_summary,
-                    BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
+                BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
         }
     }
 }
diff --git a/app/src/main/java/app/tivi/showdetails/ShowDetailsActivity.kt b/app/src/main/java/app/tivi/showdetails/ShowDetailsActivity.kt
index 0176416d2a..7c728ca8a4 100644
--- a/app/src/main/java/app/tivi/showdetails/ShowDetailsActivity.kt
+++ b/app/src/main/java/app/tivi/showdetails/ShowDetailsActivity.kt
@@ -33,13 +33,13 @@ class ShowDetailsActivity : TiviActivity() {
 
         findViewById<View>(R.id.details_root).apply {
             systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-                    View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-                    View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
+                View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
 
             doOnApplyWindowInsets { view, insets, initialState ->
                 view.updatePadding(
-                        left = insets.systemWindowInsetLeft + initialState.paddings.left,
-                        right = insets.systemWindowInsetRight + initialState.paddings.right
+                    left = insets.systemWindowInsetLeft + initialState.paddings.left,
+                    right = insets.systemWindowInsetRight + initialState.paddings.right
                 )
             }
         }
@@ -50,7 +50,7 @@ class ShowDetailsActivity : TiviActivity() {
     override fun handleIntent(intent: Intent) {
         supportFragmentManager.commit {
             replace(R.id.details_content,
-                    NavHostFragment.create(R.navigation.show_details_nav_graph, intent.extras))
+                NavHostFragment.create(R.navigation.show_details_nav_graph, intent.extras))
         }
     }
 }
diff --git a/base-android/src/main/java/app/tivi/util/TiviDateFormatter.kt b/base-android/src/main/java/app/tivi/util/TiviDateFormatter.kt
index 3324eaff81..cc19b9fa13 100644
--- a/base-android/src/main/java/app/tivi/util/TiviDateFormatter.kt
+++ b/base-android/src/main/java/app/tivi/util/TiviDateFormatter.kt
@@ -54,10 +54,10 @@ class TiviDateFormatter @Inject constructor(
             if (dateTime.year == now.year || dateTime.isAfter(now.minusDays(7))) {
                 // Within the past week
                 DateUtils.getRelativeTimeSpanString(
-                        dateTime.toInstant().toEpochMilli(),
-                        System.currentTimeMillis(),
-                        DateUtils.MINUTE_IN_MILLIS,
-                        DateUtils.FORMAT_SHOW_DATE)
+                    dateTime.toInstant().toEpochMilli(),
+                    System.currentTimeMillis(),
+                    DateUtils.MINUTE_IN_MILLIS,
+                    DateUtils.FORMAT_SHOW_DATE)
             } else {
                 // More than 7 days ago
                 formatShortDate(dateTime)
@@ -66,10 +66,10 @@ class TiviDateFormatter @Inject constructor(
             if (dateTime.year == now.year || dateTime.isBefore(now.plusDays(14))) {
                 // In the near future (next 2 weeks)
                 DateUtils.getRelativeTimeSpanString(
-                        dateTime.toInstant().toEpochMilli(),
-                        System.currentTimeMillis(),
-                        DateUtils.MINUTE_IN_MILLIS,
-                        DateUtils.FORMAT_SHOW_DATE)
+                    dateTime.toInstant().toEpochMilli(),
+                    System.currentTimeMillis(),
+                    DateUtils.MINUTE_IN_MILLIS,
+                    DateUtils.FORMAT_SHOW_DATE)
             } else {
                 // In the far future
                 formatShortDate(dateTime)
diff --git a/base/src/main/java/app/tivi/extensions/CoroutineExtensions.kt b/base/src/main/java/app/tivi/extensions/CoroutineExtensions.kt
index f229935fcd..a18716a784 100644
--- a/base/src/main/java/app/tivi/extensions/CoroutineExtensions.kt
+++ b/base/src/main/java/app/tivi/extensions/CoroutineExtensions.kt
@@ -77,8 +77,7 @@ suspend inline fun <T> asyncOrAwait(
     crossinline action: suspend CoroutineScope.() -> T
 ): T = coroutineScope {
     val deferred = deferreds[key]?.takeIf { it.isActive }
-            ?: async { action() }
-                    .also { deferreds[key] = it }
+        ?: async { action() }.also { deferreds[key] = it }
 
     if (deferreds.size > 100 && !deferredsCleanLaunched.getAndSet(true)) {
         launch {
@@ -100,8 +99,8 @@ suspend inline fun launchOrJoin(
     crossinline action: suspend CoroutineScope.() -> Unit
 ) = coroutineScope {
     val job = jobs[key]?.takeIf { it.isActive }
-            ?: launch { action() }
-                    .also { jobs[key] = it }
+        ?: launch { action() }
+            .also { jobs[key] = it }
 
     if (jobs.size > 100 && !jobsCleanLaunched.getAndSet(true)) {
         launch {
@@ -131,11 +130,11 @@ inline fun <T1, T2, T3, T4, T5, T6, R> combine(
     crossinline transform: suspend (T1, T2, T3, T4, T5, T6) -> R
 ): Flow<R> = kotlinx.coroutines.flow.combine(flow, flow2, flow3, flow4, flow5, flow6) { args: Array<*> ->
     transform(
-            args[0] as T1,
-            args[1] as T2,
-            args[2] as T3,
-            args[3] as T4,
-            args[4] as T5,
-            args[5] as T6
+        args[0] as T1,
+        args[1] as T2,
+        args[2] as T3,
+        args[3] as T4,
+        args[4] as T5,
+        args[5] as T6
     )
 }
diff --git a/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt b/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt
index 12b3659ec0..040dfa0b10 100644
--- a/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt
+++ b/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt
@@ -33,8 +33,8 @@ abstract class TiviFragmentWithBinding<V : ViewDataBinding> : TiviFragment() {
 
     final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return createBinding(inflater, container, savedInstanceState)
-                .also { binding = it }
-                .root
+            .also { binding = it }
+            .root
     }
 
     final override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
diff --git a/common-databinding/src/main/java/app/tivi/databinding/TiviBindingMethods.kt b/common-databinding/src/main/java/app/tivi/databinding/TiviBindingMethods.kt
index 96677dd364..d16f384969 100644
--- a/common-databinding/src/main/java/app/tivi/databinding/TiviBindingMethods.kt
+++ b/common-databinding/src/main/java/app/tivi/databinding/TiviBindingMethods.kt
@@ -23,13 +23,13 @@ import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import app.tivi.ui.widget.PopupMenuButton
 
 @BindingMethods(
-        BindingMethod(type = View::class, attribute = "outlineProviderInstance", method = "setOutlineProvider"),
-        BindingMethod(type = SwipeRefreshLayout::class, attribute = "isRefreshing", method = "setRefreshing"),
-        BindingMethod(type = View::class, attribute = "clipToOutline", method = "setClipToOutline"),
-        BindingMethod(type = View::class, attribute = "activated", method = "setActivated"),
-        BindingMethod(type = View::class, attribute = "selected", method = "setSelected"),
-        BindingMethod(type = View::class, attribute = "onLongClick", method = "setOnLongClickListener"),
-        BindingMethod(type = PopupMenuButton::class, attribute = "popupMenuClickListener", method = "setMenuItemClickListener"),
-        BindingMethod(type = PopupMenuButton::class, attribute = "popupMenuListener", method = "setPopupMenuListener")
+    BindingMethod(type = View::class, attribute = "outlineProviderInstance", method = "setOutlineProvider"),
+    BindingMethod(type = SwipeRefreshLayout::class, attribute = "isRefreshing", method = "setRefreshing"),
+    BindingMethod(type = View::class, attribute = "clipToOutline", method = "setClipToOutline"),
+    BindingMethod(type = View::class, attribute = "activated", method = "setActivated"),
+    BindingMethod(type = View::class, attribute = "selected", method = "setSelected"),
+    BindingMethod(type = View::class, attribute = "onLongClick", method = "setOnLongClickListener"),
+    BindingMethod(type = PopupMenuButton::class, attribute = "popupMenuClickListener", method = "setMenuItemClickListener"),
+    BindingMethod(type = PopupMenuButton::class, attribute = "popupMenuListener", method = "setPopupMenuListener")
 )
 class TiviBindingMethods
diff --git a/common-entrygrid/src/main/java/app/tivi/util/EntryGridEpoxyController.kt b/common-entrygrid/src/main/java/app/tivi/util/EntryGridEpoxyController.kt
index 97d57f8ca9..d3010f061c 100644
--- a/common-entrygrid/src/main/java/app/tivi/util/EntryGridEpoxyController.kt
+++ b/common-entrygrid/src/main/java/app/tivi/util/EntryGridEpoxyController.kt
@@ -70,6 +70,6 @@ abstract class EntryGridEpoxyController<LI : EntryWithShow<out Entry>> :
 
     protected open fun buildItemPlaceholder(index: Int): PosterGridItemBindingModel_ {
         return PosterGridItemBindingModel_()
-                .id("placeholder_$index")
+            .id("placeholder_$index")
     }
 }
diff --git a/common-entrygrid/src/main/java/app/tivi/util/EntryGridFragment.kt b/common-entrygrid/src/main/java/app/tivi/util/EntryGridFragment.kt
index dd699c1231..25f511936b 100644
--- a/common-entrygrid/src/main/java/app/tivi/util/EntryGridFragment.kt
+++ b/common-entrygrid/src/main/java/app/tivi/util/EntryGridFragment.kt
@@ -46,7 +46,7 @@ import kotlinx.coroutines.flow.collect
 
 @SuppressLint("ValidFragment")
 abstract class EntryGridFragment<LI, VM> : TiviFragmentWithBinding<FragmentEntryGridBinding>()
-        where LI : EntryWithShow<out Entry>, VM : EntryViewModel<LI, *> {
+    where LI : EntryWithShow<out Entry>, VM : EntryViewModel<LI, *> {
     protected abstract val viewModel: VM
 
     private lateinit var swipeRefreshLatch: ProgressTimeLatch
@@ -88,7 +88,7 @@ abstract class EntryGridFragment<LI, VM> : TiviFragmentWithBinding<FragmentEntry
         binding.gridAppbar.doOnSizeChange {
             binding.gridRecyclerview.updatePadding(top = it.height)
             binding.gridSwipeRefresh.setProgressViewOffset(true, 0,
-                    it.height + binding.gridSwipeRefresh.progressCircleDiameter / 2)
+                it.height + binding.gridSwipeRefresh.progressCircleDiameter / 2)
             true
         }
 
@@ -115,9 +115,9 @@ abstract class EntryGridFragment<LI, VM> : TiviFragmentWithBinding<FragmentEntry
             is UiError -> {
                 swipeRefreshLatch.refreshing = false
                 Snackbar.make(requireView(),
-                        status.exception?.localizedMessage
-                                ?: getString(R.string.error_generic),
-                        Snackbar.LENGTH_SHORT
+                    status.exception?.localizedMessage
+                        ?: getString(R.string.error_generic),
+                    Snackbar.LENGTH_SHORT
                 ).show()
             }
             is UiLoading -> swipeRefreshLatch.refreshing = status.fullRefresh
@@ -133,7 +133,7 @@ abstract class EntryGridFragment<LI, VM> : TiviFragmentWithBinding<FragmentEntry
 
         if (currentActionMode != null) {
             currentActionMode?.title = getString(R.string.selection_title,
-                    state.selectedShowIds.size)
+                state.selectedShowIds.size)
         }
 
         if (state.isLoaded) {
diff --git a/common-entrygrid/src/main/java/app/tivi/util/EntryViewModel.kt b/common-entrygrid/src/main/java/app/tivi/util/EntryViewModel.kt
index 1897ecb13c..9834787bf2 100644
--- a/common-entrygrid/src/main/java/app/tivi/util/EntryViewModel.kt
+++ b/common-entrygrid/src/main/java/app/tivi/util/EntryViewModel.kt
@@ -140,11 +140,11 @@ abstract class EntryViewModel<LI : EntryWithShow<out Entry>, PI : PagingInteract
 
     fun followSelectedShows() {
         changeShowFollowStatus(
-                ChangeShowFollowStatus.Params(
-                        showSelection.getSelectedShowIds(),
-                        ChangeShowFollowStatus.Action.FOLLOW,
-                        deferDataFetch = true
-                )
+            ChangeShowFollowStatus.Params(
+                showSelection.getSelectedShowIds(),
+                ChangeShowFollowStatus.Action.FOLLOW,
+                deferDataFetch = true
+            )
         )
         showSelection.clearSelection()
     }
diff --git a/common-epoxy/src/main/java/app/tivi/common/epoxy/EpoxyExtensions.kt b/common-epoxy/src/main/java/app/tivi/common/epoxy/EpoxyExtensions.kt
index 1c0fadb6b4..1e3393c50c 100644
--- a/common-epoxy/src/main/java/app/tivi/common/epoxy/EpoxyExtensions.kt
+++ b/common-epoxy/src/main/java/app/tivi/common/epoxy/EpoxyExtensions.kt
@@ -38,7 +38,7 @@ fun RecyclerView.syncSpanSizes(controller: EpoxyController) {
     val layout = layoutManager
     if (layout is GridLayoutManager) {
         if (controller.spanCount != layout.spanCount ||
-                layout.spanSizeLookup !== controller.spanSizeLookup) {
+            layout.spanSizeLookup !== controller.spanSizeLookup) {
             controller.spanCount = layout.spanCount
             layout.spanSizeLookup = controller.spanSizeLookup
         }
@@ -47,5 +47,5 @@ fun RecyclerView.syncSpanSizes(controller: EpoxyController) {
 
 fun EpoxyControllerAdapter.findPositionOfItemId(itemId: Long): Int {
     return (0 until itemCount).firstOrNull { getItemId(it) == itemId }
-            ?: RecyclerView.NO_POSITION
+        ?: RecyclerView.NO_POSITION
 }
diff --git a/common-imageloading/src/main/java/app/tivi/common/imageloading/ImageLoadingBindingAdapters.kt b/common-imageloading/src/main/java/app/tivi/common/imageloading/ImageLoadingBindingAdapters.kt
index baf7350b05..410eded603 100644
--- a/common-imageloading/src/main/java/app/tivi/common/imageloading/ImageLoadingBindingAdapters.kt
+++ b/common-imageloading/src/main/java/app/tivi/common/imageloading/ImageLoadingBindingAdapters.kt
@@ -26,9 +26,9 @@ import coil.transform.RoundedCornersTransformation
 import coil.transform.Transformation
 
 @BindingAdapter(
-        "tmdbBackdropPath",
-        "imageSaturateOnLoad",
-        requireAll = false
+    "tmdbBackdropPath",
+    "imageSaturateOnLoad",
+    requireAll = false
 )
 fun ImageView.loadBackdrop(
     oldPath: String?,
@@ -38,20 +38,20 @@ fun ImageView.loadBackdrop(
 ) {
     if (oldPath != path || oldSaturateOnLoad != saturateOnLoad) {
         loadImage(
-                null,
-                oldSaturateOnLoad,
-                0f,
-                path?.let { ShowTmdbImage(path = path, type = ImageType.BACKDROP, showId = 0) },
-                saturateOnLoad,
-                0f
+            null,
+            oldSaturateOnLoad,
+            0f,
+            path?.let { ShowTmdbImage(path = path, type = ImageType.BACKDROP, showId = 0) },
+            saturateOnLoad,
+            0f
         )
     }
 }
 
 @BindingAdapter(
-        "tmdbLogoPath",
-        "imageSaturateOnLoad",
-        requireAll = false
+    "tmdbLogoPath",
+    "imageSaturateOnLoad",
+    requireAll = false
 )
 fun ImageView.loadLogo(
     oldPath: String?,
@@ -61,21 +61,21 @@ fun ImageView.loadLogo(
 ) {
     if (oldPath != path || oldSaturateOnLoad != saturateOnLoad) {
         loadImage(
-                null,
-                oldSaturateOnLoad,
-                0f,
-                path?.let { ShowTmdbImage(path = path, type = ImageType.LOGO, showId = 0) },
-                saturateOnLoad,
-                0f
+            null,
+            oldSaturateOnLoad,
+            0f,
+            path?.let { ShowTmdbImage(path = path, type = ImageType.LOGO, showId = 0) },
+            saturateOnLoad,
+            0f
         )
     }
 }
 
 @BindingAdapter(
-        "image",
-        "imageSaturateOnLoad",
-        "imageCornerRadius",
-        requireAll = false
+    "image",
+    "imageSaturateOnLoad",
+    "imageCornerRadius",
+    requireAll = false
 )
 fun ImageView.loadImage(
     oldImage: TmdbImageEntity?,
@@ -86,8 +86,8 @@ fun ImageView.loadImage(
     cornerRadius: Float
 ) {
     if (oldImage == image &&
-            oldSaturateOnLoad == saturateOnLoad &&
-            oldCornerRadius == cornerRadius) return
+        oldSaturateOnLoad == saturateOnLoad &&
+        oldCornerRadius == cornerRadius) return
 
     loadAny(image) {
         if (saturateOnLoad == null || saturateOnLoad == true) {
diff --git a/common-ui-view/src/main/java/app/tivi/TiviMvRxViewModel.kt b/common-ui-view/src/main/java/app/tivi/TiviMvRxViewModel.kt
index 14fa9d1615..cafa54aa17 100644
--- a/common-ui-view/src/main/java/app/tivi/TiviMvRxViewModel.kt
+++ b/common-ui-view/src/main/java/app/tivi/TiviMvRxViewModel.kt
@@ -50,13 +50,13 @@ abstract class TiviMvRxViewModel<S : MvRxState>(
 
         @Suppress("USELESS_CAST")
         return map { Success(mapper(it)) as Async<V> }
-                .catch {
-                    if (BuildConfig.DEBUG) {
-                        Log.e(this@TiviMvRxViewModel::class.java.simpleName,
-                                "Exception during observe", it)
-                    }
-                    emit(Fail(it))
+            .catch {
+                if (BuildConfig.DEBUG) {
+                    Log.e(this@TiviMvRxViewModel::class.java.simpleName,
+                        "Exception during observe", it)
                 }
-                .collect { setState { stateReducer(it) } }
+                emit(Fail(it))
+            }
+            .collect { setState { stateReducer(it) } }
     }
 }
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/MotionLayoutExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/MotionLayoutExtensions.kt
index ddadc1affc..1654ef5542 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/MotionLayoutExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/MotionLayoutExtensions.kt
@@ -72,6 +72,6 @@ suspend fun TiviMotionLayout.awaitTransitionComplete(transitionId: Int, timeout:
         // exception to let the coroutine know
         listener?.let(::removeTransitionListener)
         throw CancellationException("Transition to state with id: $transitionId did not" +
-                " complete in timeout.", tex)
+            " complete in timeout.", tex)
     }
 }
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt
index 4dca72de73..cce710f990 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/MultipleBackStackNavigationExtensions.kt
@@ -53,10 +53,10 @@ fun BottomNavigationView.setupWithNavController(
 
         // Find or create the Navigation host fragment
         val navHostFragment = obtainNavHostFragment(
-                fragmentManager,
-                fragmentTag,
-                navGraphId,
-                containerId
+            fragmentManager,
+            fragmentTag,
+            navGraphId,
+            containerId
         )
 
         // Obtain its id
@@ -94,30 +94,30 @@ fun BottomNavigationView.setupWithNavController(
             if (selectedItemTag != newlySelectedItemTag) {
                 // Pop everything above the first fragment (the "fixed start destination")
                 fragmentManager.popBackStack(firstFragmentTag,
-                        FragmentManager.POP_BACK_STACK_INCLUSIVE)
+                    FragmentManager.POP_BACK_STACK_INCLUSIVE)
                 val selectedFragment = fragmentManager.findFragmentByTag(newlySelectedItemTag)
-                        as NavHostFragment
+                    as NavHostFragment
 
                 // Exclude the first fragment tag because it's always in the back stack.
                 if (firstFragmentTag != newlySelectedItemTag) {
                     // Commit a transaction that cleans the back stack and adds the first fragment
                     // to it, creating the fixed started destination.
                     fragmentManager.beginTransaction()
-                            .setCustomAnimations(R.anim.tivi_enter_anim, R.anim.tivi_exit_anim,
-                                    R.anim.tivi_pop_enter_anim, R.anim.tivi_pop_exit_anim)
-                            .attach(selectedFragment)
-                            .setPrimaryNavigationFragment(selectedFragment)
-                            .apply {
-                                // Detach all other Fragments
-                                graphIdToTagMap.forEach { _, fragmentTagIter ->
-                                    if (fragmentTagIter != newlySelectedItemTag) {
-                                        detach(fragmentManager.findFragmentByTag(firstFragmentTag)!!)
-                                    }
+                        .setCustomAnimations(R.anim.tivi_enter_anim, R.anim.tivi_exit_anim,
+                            R.anim.tivi_pop_enter_anim, R.anim.tivi_pop_exit_anim)
+                        .attach(selectedFragment)
+                        .setPrimaryNavigationFragment(selectedFragment)
+                        .apply {
+                            // Detach all other Fragments
+                            graphIdToTagMap.forEach { _, fragmentTagIter ->
+                                if (fragmentTagIter != newlySelectedItemTag) {
+                                    detach(fragmentManager.findFragmentByTag(firstFragmentTag)!!)
                                 }
                             }
-                            .addToBackStack(firstFragmentTag)
-                            .setReorderingAllowed(true)
-                            .commit()
+                        }
+                        .addToBackStack(firstFragmentTag)
+                        .setReorderingAllowed(true)
+                        .commit()
                 }
                 selectedItemTag = newlySelectedItemTag
                 isOnFirstFragment = selectedItemTag == firstFragmentTag
@@ -165,14 +165,14 @@ private fun BottomNavigationView.setupDeepLinks(
 
         // Find or create the Navigation host fragment
         val navHostFragment = obtainNavHostFragment(
-                fragmentManager,
-                fragmentTag,
-                navGraphId,
-                containerId
+            fragmentManager,
+            fragmentTag,
+            navGraphId,
+            containerId
         )
         // Handle Intent
         if (selectedItemId != navHostFragment.navController.graph.id &&
-                navHostFragment.navController.handleDeepLink(intent)) {
+            navHostFragment.navController.handleDeepLink(intent)) {
             selectedItemId = navHostFragment.navController.graph.id
         }
     }
@@ -185,11 +185,11 @@ private fun BottomNavigationView.setupItemReselected(
     setOnNavigationItemReselectedListener { item ->
         val newlySelectedItemTag = graphIdToTagMap[item.itemId]
         val selectedFragment = fragmentManager.findFragmentByTag(newlySelectedItemTag)
-                as NavHostFragment
+            as NavHostFragment
         val navController = selectedFragment.navController
         // Pop the back stack to the start destination of the current navController graph
         navController.popBackStack(
-                navController.graph.startDestination, false
+            navController.graph.startDestination, false
         )
     }
 }
@@ -199,8 +199,8 @@ private fun detachNavHostFragment(
     navHostFragment: NavHostFragment
 ) {
     fragmentManager.beginTransaction()
-            .detach(navHostFragment)
-            .commitNow()
+        .detach(navHostFragment)
+        .commitNow()
 }
 
 private fun attachNavHostFragment(
@@ -209,13 +209,13 @@ private fun attachNavHostFragment(
     isPrimaryNavFragment: Boolean
 ) {
     fragmentManager.beginTransaction()
-            .attach(navHostFragment)
-            .apply {
-                if (isPrimaryNavFragment) {
-                    setPrimaryNavigationFragment(navHostFragment)
-                }
+        .attach(navHostFragment)
+        .apply {
+            if (isPrimaryNavFragment) {
+                setPrimaryNavigationFragment(navHostFragment)
             }
-            .commitNow()
+        }
+        .commitNow()
 }
 
 private fun obtainNavHostFragment(
@@ -231,8 +231,8 @@ private fun obtainNavHostFragment(
     // Otherwise, create it and return it.
     val navHostFragment = NavHostFragment.create(navGraphId)
     fragmentManager.beginTransaction()
-            .add(containerId, navHostFragment, fragmentTag)
-            .commitNow()
+        .add(containerId, navHostFragment, fragmentTag)
+        .commitNow()
     return navHostFragment
 }
 
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt
index b21ce0cb92..13949cb873 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt
@@ -43,9 +43,9 @@ fun RecyclerView.scrollToItemId(itemId: Long, animatedScroll: Boolean = false):
 }
 
 fun RecyclerView.smoothScrollToViewHolder(vh: RecyclerView.ViewHolder) = TiviLinearSmoothScroller(
-        context,
-        snapPreference = LinearSmoothScroller.SNAP_TO_START,
-        scrollMsPerInch = 60f
+    context,
+    snapPreference = LinearSmoothScroller.SNAP_TO_START,
+    scrollMsPerInch = 60f
 ).apply {
     targetPosition = vh.adapterPosition
     targetOffset = vh.itemView.height / 3
@@ -54,9 +54,9 @@ fun RecyclerView.smoothScrollToViewHolder(vh: RecyclerView.ViewHolder) = TiviLin
 }
 
 fun RecyclerView.smoothScrollToItemPosition(position: Int) = TiviLinearSmoothScroller(
-        context,
-        snapPreference = LinearSmoothScroller.SNAP_TO_START,
-        scrollMsPerInch = 60f
+    context,
+    snapPreference = LinearSmoothScroller.SNAP_TO_START,
+    scrollMsPerInch = 60f
 ).apply {
     targetPosition = position
 }.also {
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/SharedElementExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/SharedElementExtensions.kt
index 39e038da83..480dd89930 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/SharedElementExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/SharedElementExtensions.kt
@@ -34,8 +34,8 @@ fun SharedElementHelper.toBundle(activity: Activity): Bundle? {
 fun SharedElementHelper.toActivityOptions(activity: Activity): ActivityOptionsCompat? {
     if (!isEmpty()) {
         return ActivityOptionsCompat.makeSceneTransitionAnimation(
-                activity,
-                *sharedElements.map { Pair(it.key, it.value) }.toTypedArray()
+            activity,
+            *sharedElements.map { Pair(it.key, it.value) }.toTypedArray()
         )
     }
     return null
@@ -49,8 +49,8 @@ fun SharedElementHelper.applyToTransaction(tx: FragmentTransaction) {
 
 fun SharedElementHelper.toFragmentNavigatorExtras(): Navigator.Extras {
     return FragmentNavigator.Extras.Builder()
-            .addSharedElements(sharedElements)
-            .build()
+        .addSharedElements(sharedElements)
+        .build()
 }
 
 fun SharedElementHelper.toActivityNavigatorExtras(activity: Activity): Navigator.Extras {
diff --git a/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt b/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt
index a67bd6ce44..9a6fbd5fd3 100644
--- a/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt
+++ b/common-ui-view/src/main/java/app/tivi/home/HomeTextCreator.kt
@@ -57,7 +57,7 @@ class HomeTextCreator @Inject constructor(
         show.firstAired?.also { firstAired ->
             append(" ")
             inSpans(textAppearanceSpanForAttribute(context, R.attr.textAppearanceCaption),
-                    TypefaceSpan(bodyTypeface)) {
+                TypefaceSpan(bodyTypeface)) {
                 append("(")
                 append(firstAired.year.toString())
                 append(")")
@@ -73,7 +73,7 @@ class HomeTextCreator @Inject constructor(
     fun followedShowEpisodeWatchStatus(stats: FollowedShowsWatchStats?): CharSequence {
         return if (stats != null && stats.watchedEpisodeCount < stats.episodeCount) {
             context.getString(R.string.followed_watch_stats_to_watch,
-                    stats.episodeCount - stats.watchedEpisodeCount).parseAsHtml()
+                stats.episodeCount - stats.watchedEpisodeCount).parseAsHtml()
         } else if (stats != null && stats.watchedEpisodeCount > 0) {
             context.getString(R.string.followed_watch_stats_complete)
         } else {
diff --git a/common-ui-view/src/main/java/app/tivi/ui/AuthStateMenuItemBinder.kt b/common-ui-view/src/main/java/app/tivi/ui/AuthStateMenuItemBinder.kt
index 0f9207f966..a9f757330c 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/AuthStateMenuItemBinder.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/AuthStateMenuItemBinder.kt
@@ -44,7 +44,7 @@ fun authStateToolbarMenuBinder(
     loginMenuItemId: Int,
     loadImageFunc: (MenuItem, url: String) -> Unit
 ) = AuthStateMenuItemBinder(
-        toolbar.menu.findItem(userMenuItemId),
-        toolbar.menu.findItem(loginMenuItemId),
-        loadImageFunc
+    toolbar.menu.findItem(userMenuItemId),
+    toolbar.menu.findItem(loginMenuItemId),
+    loadImageFunc
 )
diff --git a/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt b/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt
index 1a3562dfc1..9aafc250ad 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt
@@ -62,7 +62,7 @@ object ScrimUtil {
             val x = i * 1f / (numStops - 1)
             val opacity = x.toDouble().pow(3.0).toFloat()
             stopColors[i] = ColorUtils.setAlphaComponent(baseColor,
-                    (alpha * opacity).roundToInt().coerceIn(0, 255))
+                (alpha * opacity).roundToInt().coerceIn(0, 255))
         }
 
         val x0: Float
@@ -101,13 +101,13 @@ object ScrimUtil {
         paintDrawable.shaderFactory = object : ShapeDrawable.ShaderFactory() {
             override fun resize(width: Int, height: Int): Shader {
                 return LinearGradient(
-                        width * x0,
-                        height * y0,
-                        width * x1,
-                        height * y1,
-                        stopColors,
-                        null,
-                        Shader.TileMode.CLAMP)
+                    width * x0,
+                    height * y0,
+                    width * x1,
+                    height * y1,
+                    stopColors,
+                    null,
+                    Shader.TileMode.CLAMP)
             }
         }
         cache.put(cacheKeyHash, paintDrawable)
diff --git a/common-ui-view/src/main/java/app/tivi/ui/graphics/ImageLoadingColorMatrix.kt b/common-ui-view/src/main/java/app/tivi/ui/graphics/ImageLoadingColorMatrix.kt
index 42384c364f..2d6d168f01 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/graphics/ImageLoadingColorMatrix.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/graphics/ImageLoadingColorMatrix.kt
@@ -83,17 +83,23 @@ class ImageLoadingColorMatrix : ColorMatrix() {
     companion object {
         private val saturationFloatProp: FloatProp<ImageLoadingColorMatrix> = object : FloatProp<ImageLoadingColorMatrix>("saturation") {
             override operator fun get(o: ImageLoadingColorMatrix): Float = o.saturationFraction
-            override operator fun set(o: ImageLoadingColorMatrix, value: Float) { o.saturationFraction = value }
+            override operator fun set(o: ImageLoadingColorMatrix, value: Float) {
+                o.saturationFraction = value
+            }
         }
 
         private val alphaFloatProp: FloatProp<ImageLoadingColorMatrix> = object : FloatProp<ImageLoadingColorMatrix>("alpha") {
             override operator fun get(o: ImageLoadingColorMatrix): Float = o.alphaFraction
-            override operator fun set(o: ImageLoadingColorMatrix, value: Float) { o.alphaFraction = value }
+            override operator fun set(o: ImageLoadingColorMatrix, value: Float) {
+                o.alphaFraction = value
+            }
         }
 
         private val brightnessFloatProp: FloatProp<ImageLoadingColorMatrix> = object : FloatProp<ImageLoadingColorMatrix>("darken") {
             override operator fun get(o: ImageLoadingColorMatrix): Float = o.brightnessFraction
-            override operator fun set(o: ImageLoadingColorMatrix, value: Float) { o.brightnessFraction = value }
+            override operator fun set(o: ImageLoadingColorMatrix, value: Float) {
+                o.brightnessFraction = value
+            }
         }
 
         val PROP_SATURATION: Property<ImageLoadingColorMatrix, Float> = createFloatProperty(saturationFloatProp)
diff --git a/common-ui-view/src/main/java/app/tivi/ui/motionlayout/TransitionListenerAdapter.kt b/common-ui-view/src/main/java/app/tivi/ui/motionlayout/TransitionListenerAdapter.kt
index 3c6f7bdd39..439a54db00 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/motionlayout/TransitionListenerAdapter.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/motionlayout/TransitionListenerAdapter.kt
@@ -26,7 +26,8 @@ open class TransitionListenerAdapter : MotionLayout.TransitionListener {
         triggerId: Int,
         positive: Boolean,
         progress: Float
-    ) {}
+    ) {
+    }
 
     override fun onTransitionStarted(
         parent: MotionLayout,
diff --git a/common-ui-view/src/main/java/app/tivi/ui/recyclerview/TiviLinearSmoothScroller.kt b/common-ui-view/src/main/java/app/tivi/ui/recyclerview/TiviLinearSmoothScroller.kt
index 77bf963fb8..eb653739cd 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/recyclerview/TiviLinearSmoothScroller.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/recyclerview/TiviLinearSmoothScroller.kt
@@ -44,6 +44,6 @@ class TiviLinearSmoothScroller(
         snapPreference: Int
     ): Int {
         return targetOffset + super.calculateDtToFit(viewStart, viewEnd,
-                boxStart, boxEnd, snapPreference)
+            boxStart, boxEnd, snapPreference)
     }
 }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/BabySlide.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/BabySlide.kt
index 3b283ba6bb..2d63035fe7 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/BabySlide.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/BabySlide.kt
@@ -40,9 +40,9 @@ class BabySlide(
         view.alpha = 0f
 
         return ObjectAnimator.ofPropertyValuesHolder(view,
-                PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 0f),
-                PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0f),
-                PropertyValuesHolder.ofFloat(View.ALPHA, 1f))
+            PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 0f),
+            PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 0f),
+            PropertyValuesHolder.ofFloat(View.ALPHA, 1f))
     }
 
     override fun onDisappear(
@@ -52,17 +52,17 @@ class BabySlide(
         endValues: TransitionValues?
     ): Animator {
         return ObjectAnimator.ofPropertyValuesHolder(view,
-                translatePropValForGravity(view),
-                PropertyValuesHolder.ofFloat(View.ALPHA, 0f))
+            translatePropValForGravity(view),
+            PropertyValuesHolder.ofFloat(View.ALPHA, 0f))
     }
 
     private fun translatePropValForGravity(view: View): PropertyValuesHolder =
-            when (Gravity.getAbsoluteGravity(gravity, view.layoutDirection)) {
-                Gravity.TOP -> PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, -view.height / babyFraction)
-                Gravity.RIGHT -> PropertyValuesHolder.ofFloat(View.TRANSLATION_X, view.width / babyFraction)
-                Gravity.BOTTOM -> PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, view.height / babyFraction)
-                else -> PropertyValuesHolder.ofFloat(View.TRANSLATION_X, -view.width / babyFraction)
-            }
+        when (Gravity.getAbsoluteGravity(gravity, view.layoutDirection)) {
+            Gravity.TOP -> PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, -view.height / babyFraction)
+            Gravity.RIGHT -> PropertyValuesHolder.ofFloat(View.TRANSLATION_X, view.width / babyFraction)
+            Gravity.BOTTOM -> PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, view.height / babyFraction)
+            else -> PropertyValuesHolder.ofFloat(View.TRANSLATION_X, -view.width / babyFraction)
+        }
 
     private fun setupTranslation(view: View) {
         when (Gravity.getAbsoluteGravity(gravity, view.layoutDirection)) {
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/ColumnedChangeBounds.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/ColumnedChangeBounds.kt
index c7a13ff14c..dece66b917 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/ColumnedChangeBounds.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/ColumnedChangeBounds.kt
@@ -141,10 +141,10 @@ class ColumnedChangeBounds : ViewChangeBounds() {
         val newEndRight = startBounds.left - gap
         val newEndTop = endBounds.bottom + gap
         val newEndBounds = Rect(
-                newEndRight - endBounds.width(),
-                newEndTop,
-                newEndRight,
-                newEndTop + endBounds.height())
+            newEndRight - endBounds.width(),
+            newEndTop,
+            newEndRight,
+            newEndTop + endBounds.height())
 
         return createPointToPointAnimator(view, startBounds, newEndBounds, 1f, 0f, true)
     }
@@ -155,13 +155,14 @@ class ColumnedChangeBounds : ViewChangeBounds() {
         startBounds: Rect,
         endBounds: Rect
     ): Animator? {
-        val prevEndBounds = findPreviousItemViewWithGreaterRight(endParent, view, endBounds.right) ?: return null
+        val prevEndBounds = findPreviousItemViewWithGreaterRight(endParent, view, endBounds.right)
+            ?: return null
 
         val newEndLeft = prevEndBounds.right + endBounds.left
         val newEndTop = prevEndBounds.top
         val newEndBounds = Rect(newEndLeft, newEndTop,
-                newEndLeft + endBounds.width(),
-                newEndTop + endBounds.height())
+            newEndLeft + endBounds.width(),
+            newEndTop + endBounds.height())
 
         return createPointToPointAnimator(view, startBounds, newEndBounds, 1f, 0f, true)
     }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/DrawableAlphaProperty.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/DrawableAlphaProperty.kt
index 5d03f0c35a..06dbdfbf21 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/DrawableAlphaProperty.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/DrawableAlphaProperty.kt
@@ -20,7 +20,9 @@ import android.graphics.drawable.Drawable
 import android.util.Property
 
 object DrawableAlphaProperty : Property<Drawable, Int>(Int::class.java, "drawableAlpha") {
-    override fun set(d: Drawable, value: Int) { d.alpha = value }
+    override fun set(d: Drawable, value: Int) {
+        d.alpha = value
+    }
 
     override fun get(d: Drawable): Int = d.alpha
 }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt
index c0d4e51caa..ea3cec9078 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt
@@ -34,7 +34,7 @@ object GridToGridTransitioner {
     private const val RETURN_TRANSITION_FRACTION = 2 / 3f
     private const val GRID_SHARED_ELEMENT_ENTER_DURATION = CONTENT_TRANSITION_DURATION * 4 / 3
     private const val GRID_SHARED_ELEMENT_RETURN_DURATION =
-            (GRID_SHARED_ELEMENT_ENTER_DURATION * RETURN_TRANSITION_FRACTION).toLong()
+        (GRID_SHARED_ELEMENT_ENTER_DURATION * RETURN_TRANSITION_FRACTION).toLong()
 
     private val LINEAR_INTERPOLATOR = LinearInterpolator()
     private val FAST_OUT_SLOW_IN_INTERPOLATOR = FastOutSlowInInterpolator()
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt
index 99d37ed7cb..44d5d3d440 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt
@@ -125,19 +125,19 @@ open class ViewChangeBounds : Transition() {
         val originalAlpha = bounds.getAlpha()
 
         val outTopLeftPropVal = PropertyValuesHolder.ofObject<PointF>(
-                TOP_LEFT_PROPERTY,
-                null,
-                pathMotion.getPath(
-                        startBounds.left.toFloat(), startBounds.top.toFloat(),
-                        endBounds.left.toFloat(), endBounds.top.toFloat())
+            TOP_LEFT_PROPERTY,
+            null,
+            pathMotion.getPath(
+                startBounds.left.toFloat(), startBounds.top.toFloat(),
+                endBounds.left.toFloat(), endBounds.top.toFloat())
         )
 
         val outBottomRightPropVal = PropertyValuesHolder.ofObject<PointF>(
-                BOTTOM_RIGHT_PROPERTY,
-                null,
-                pathMotion.getPath(
-                        startBounds.right.toFloat(), startBounds.bottom.toFloat(),
-                        endBounds.right.toFloat(), endBounds.bottom.toFloat())
+            BOTTOM_RIGHT_PROPERTY,
+            null,
+            pathMotion.getPath(
+                startBounds.right.toFloat(), startBounds.bottom.toFloat(),
+                endBounds.right.toFloat(), endBounds.bottom.toFloat())
         )
 
         val alphaPropVal = PropertyValuesHolder.ofFloat(ALPHA_PROPERTY, startAlpha, endAlpha)
@@ -147,9 +147,9 @@ open class ViewChangeBounds : Transition() {
         bounds.setLeftTopRightBottom(startBounds.left, startBounds.top, startBounds.right, startBounds.bottom)
 
         return ObjectAnimator.ofPropertyValuesHolder(bounds,
-                outTopLeftPropVal,
-                outBottomRightPropVal,
-                alphaPropVal
+            outTopLeftPropVal,
+            outBottomRightPropVal,
+            alphaPropVal
         ).apply {
             doOnEnd {
                 bounds.setAlpha(originalAlpha)
@@ -253,21 +253,21 @@ open class ViewChangeBounds : Transition() {
         val TRANSITION_PROPS = arrayOf(PROPNAME_BOUNDS, PROPNAME_PARENT)
 
         val TOP_LEFT_PROPERTY: Property<PointFBounds, PointF> =
-                object : Property<PointFBounds, PointF>(PointF::class.java, "topLeft") {
-                    override fun set(bounds: PointFBounds, topLeft: PointF) = bounds.setTopLeft(topLeft)
-                    override fun get(bounds: PointFBounds): PointF? = bounds.getTopLeft()
-                }
+            object : Property<PointFBounds, PointF>(PointF::class.java, "topLeft") {
+                override fun set(bounds: PointFBounds, topLeft: PointF) = bounds.setTopLeft(topLeft)
+                override fun get(bounds: PointFBounds): PointF? = bounds.getTopLeft()
+            }
 
         val BOTTOM_RIGHT_PROPERTY: Property<PointFBounds, PointF> =
-                object : Property<PointFBounds, PointF>(PointF::class.java, "bottomRight") {
-                    override fun set(bounds: PointFBounds, bottomRight: PointF) = bounds.setBottomRight(bottomRight)
-                    override fun get(bounds: PointFBounds): PointF? = bounds.getBottomRight()
-                }
+            object : Property<PointFBounds, PointF>(PointF::class.java, "bottomRight") {
+                override fun set(bounds: PointFBounds, bottomRight: PointF) = bounds.setBottomRight(bottomRight)
+                override fun get(bounds: PointFBounds): PointF? = bounds.getBottomRight()
+            }
 
         val ALPHA_PROPERTY: Property<PointFBounds, Float> =
-                createFloatProperty(object : FloatProp<PointFBounds>("alpha") {
-                    override fun set(o: PointFBounds, value: Float) = o.setAlpha(value)
-                    override fun get(o: PointFBounds): Float = o.getAlpha()
-                })
+            createFloatProperty(object : FloatProp<PointFBounds>("alpha") {
+                override fun set(o: PointFBounds, value: Float) = o.setAlpha(value)
+                override fun get(o: PointFBounds): Float = o.getAlpha()
+            })
     }
 }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewGroupUtils.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewGroupUtils.kt
index d144480bc3..d19c9dc039 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewGroupUtils.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewGroupUtils.kt
@@ -28,7 +28,7 @@ fun ViewGroup.suppressLayoutInternal(suppress: Boolean) {
     if (!sSuppressLayoutMethodFetched) {
         try {
             sSuppressLayoutMethod = ViewGroup::class.java.getDeclaredMethod("suppressLayout",
-                    Boolean::class.javaPrimitiveType)
+                Boolean::class.javaPrimitiveType)
             sSuppressLayoutMethod!!.isAccessible = true
         } catch (e: NoSuchMethodException) {
             Log.i("ViewGroupTivi", "Failed to retrieve suppressLayout method", e)
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/BaselineGridTextView.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/BaselineGridTextView.kt
index d0251da894..d058f035e6 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/BaselineGridTextView.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/BaselineGridTextView.kt
@@ -74,14 +74,14 @@ class BaselineGridTextView @JvmOverloads constructor(
 
     init {
         val a = context.obtainStyledAttributes(
-                attrs, R.styleable.BaselineGridTextView, defStyleAttr, 0)
+            attrs, R.styleable.BaselineGridTextView, defStyleAttr, 0)
 
         // first check TextAppearance for line height & font attributes
         if (a.hasValue(R.styleable.BaselineGridTextView_android_textAppearance)) {
             val textAppearanceId = a.getResourceId(
-                    R.styleable.BaselineGridTextView_android_textAppearance, android.R.style.TextAppearance)
+                R.styleable.BaselineGridTextView_android_textAppearance, android.R.style.TextAppearance)
             val ta = context.obtainStyledAttributes(
-                    textAppearanceId, R.styleable.BaselineGridTextView)
+                textAppearanceId, R.styleable.BaselineGridTextView)
             parseTextAttrs(ta)
             ta.recycle()
         }
@@ -124,7 +124,7 @@ class BaselineGridTextView @JvmOverloads constructor(
         }
         if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightHint)) {
             lineHeightHint = a.getDimensionPixelSize(
-                    R.styleable.BaselineGridTextView_lineHeightHint, 0)
+                R.styleable.BaselineGridTextView_lineHeightHint, 0)
         }
     }
 
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/HeaderHolderFrameLayout.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/HeaderHolderFrameLayout.kt
index f00f3be38c..3c369a8ac2 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/HeaderHolderFrameLayout.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/HeaderHolderFrameLayout.kt
@@ -55,12 +55,12 @@ class HeaderHolderFrameLayout @JvmOverloads constructor(
 
     init {
         context.obtainStyledAttributes(attrs, R.styleable.HeaderHolderFrameLayout,
-                defStyle, R.style.Widget_Tivi_HeaderHolderFrameLayout).use {
+            defStyle, R.style.Widget_Tivi_HeaderHolderFrameLayout).use {
             dividerDrawable = it.getDrawable(R.styleable.HeaderHolderFrameLayout_dividerDrawable)
             dividerMarginStart = it.getDimensionPixelSize(
-                    R.styleable.HeaderHolderFrameLayout_dividerMarginStart, 0)
+                R.styleable.HeaderHolderFrameLayout_dividerMarginStart, 0)
             dividerMarginEnd = it.getDimensionPixelSize(
-                    R.styleable.HeaderHolderFrameLayout_dividerMarginEnd, 0)
+                R.styleable.HeaderHolderFrameLayout_dividerMarginEnd, 0)
             background = MaterialShapeDrawable.createWithElevationOverlay(context, elevation).apply {
                 fillColor = it.getColorStateList(R.styleable.HeaderHolderFrameLayout_materialBackgroundColor)
             }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/MaterialShapeConstraintLayout.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/MaterialShapeConstraintLayout.kt
index 0feaa7a748..bb95b1c53b 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/MaterialShapeConstraintLayout.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/MaterialShapeConstraintLayout.kt
@@ -40,12 +40,12 @@ class MaterialShapeConstraintLayout @JvmOverloads constructor(
                 val builder = shapeAppearanceModel.toBuilder()
 
                 val topLeft = ta.getDimension(
-                        R.styleable.MaterialShapeConstraintLayout_materialBackgroundTopLeftRadius, 0f)
+                    R.styleable.MaterialShapeConstraintLayout_materialBackgroundTopLeftRadius, 0f)
                 if (topLeft > 0) {
                     builder.setTopLeftCorner(CornerFamily.ROUNDED, topLeft)
                 }
                 val topRight = ta.getDimension(
-                        R.styleable.MaterialShapeConstraintLayout_materialBackgroundTopRightRadius, 0f)
+                    R.styleable.MaterialShapeConstraintLayout_materialBackgroundTopRightRadius, 0f)
                 if (topRight > 0) {
                     builder.setTopRightCorner(CornerFamily.ROUNDED, topRight)
                 }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/NestedChildMotionLayout.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/NestedChildMotionLayout.kt
index b432aee309..3a4f709290 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/NestedChildMotionLayout.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/NestedChildMotionLayout.kt
@@ -82,7 +82,7 @@ class NestedChildMotionLayout @JvmOverloads constructor(
             // If there is any dx/dy remaining, let MotionLayout handle it
             val innerConsumed = tmpArray
             super.onNestedPreScroll(target, dx - consumed[0], dy - consumed[1],
-                    innerConsumed, type)
+                innerConsumed, type)
             consumed[0] += innerConsumed[0]
             consumed[1] += innerConsumed[1]
         }
@@ -98,13 +98,13 @@ class NestedChildMotionLayout @JvmOverloads constructor(
         consumed: IntArray
     ) {
         super.onNestedScroll(target, dxConsumed, dyConsumed,
-                dxUnconsumed, dyUnconsumed,
-                type, consumed)
+            dxUnconsumed, dyUnconsumed,
+            type, consumed)
 
         dispatchNestedScroll(dxConsumed, dyConsumed,
-                dxUnconsumed, dyUnconsumed,
-                null,
-                type, tmpArray)
+            dxUnconsumed, dyUnconsumed,
+            null,
+            type, tmpArray)
     }
 
     override fun onNestedPreFling(
@@ -113,7 +113,7 @@ class NestedChildMotionLayout @JvmOverloads constructor(
         velocityY: Float
     ): Boolean {
         return dispatchNestedPreFling(velocityX, velocityY) ||
-                super.onNestedPreFling(target, velocityX, velocityY)
+            super.onNestedPreFling(target, velocityX, velocityY)
     }
 
     override fun onNestedFling(
@@ -123,7 +123,7 @@ class NestedChildMotionLayout @JvmOverloads constructor(
         consumed: Boolean
     ): Boolean {
         return dispatchNestedFling(velocityX, velocityY, consumed) ||
-                super.onNestedFling(target, velocityX, velocityY, consumed)
+            super.onNestedFling(target, velocityX, velocityY, consumed)
     }
 
     override fun onStopNestedScroll(
@@ -162,8 +162,8 @@ class NestedChildMotionLayout @JvmOverloads constructor(
         consumed: IntArray
     ) {
         helper.dispatchNestedScroll(dxConsumed, dyConsumed,
-                dxUnconsumed, dyUnconsumed,
-                offsetInWindow, type, consumed)
+            dxUnconsumed, dyUnconsumed,
+            offsetInWindow, type, consumed)
     }
 
     override fun dispatchNestedScroll(
@@ -174,7 +174,7 @@ class NestedChildMotionLayout @JvmOverloads constructor(
         offsetInWindow: IntArray?,
         type: Int
     ) = helper.dispatchNestedScroll(dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed,
-            offsetInWindow, type)
+        offsetInWindow, type)
 
     override fun dispatchNestedPreFling(
         velocityX: Float,
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt
index c46f6fbff7..be467435ed 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt
@@ -59,11 +59,13 @@ class TopLeftCutoutBackgroundView : View {
     @set:Keep
     var cutProgress: Float
         get() = shapeDrawable.interpolation
-        set(value) { shapeDrawable.interpolation = value }
+        set(value) {
+            shapeDrawable.interpolation = value
+        }
 
     private fun syncCutSize() {
         shapeDrawable.shapeAppearanceModel = shapeDrawable.shapeAppearanceModel.toBuilder()
-                .setTopLeftCorner(CornerFamily.CUT, lerp(0f, maxCutSize, cutProgress))
-                .build()
+            .setTopLeftCorner(CornerFamily.CUT, lerp(0f, maxCutSize, cutProgress))
+            .build()
     }
 }
diff --git a/data-android/src/main/java/app/tivi/data/DatabaseInject.kt b/data-android/src/main/java/app/tivi/data/DatabaseInject.kt
index be49231586..ff2a71eed7 100644
--- a/data-android/src/main/java/app/tivi/data/DatabaseInject.kt
+++ b/data-android/src/main/java/app/tivi/data/DatabaseInject.kt
@@ -38,8 +38,8 @@ class RoomDatabaseModule {
     @Provides
     fun provideDatabase(context: Context): TiviRoomDatabase {
         val builder = Room.databaseBuilder(context, TiviRoomDatabase::class.java, "shows.db")
-                .addMigrations(*TiviRoomDatabase_Migrations.build())
-                .fallbackToDestructiveMigration()
+            .addMigrations(*TiviRoomDatabase_Migrations.build())
+            .fallbackToDestructiveMigration()
         if (Debug.isDebuggerConnected()) {
             builder.allowMainThreadQueries()
         }
diff --git a/data-android/src/main/java/app/tivi/data/FlowPagedListBuilder.kt b/data-android/src/main/java/app/tivi/data/FlowPagedListBuilder.kt
index 2cff658432..5513f4bb67 100644
--- a/data-android/src/main/java/app/tivi/data/FlowPagedListBuilder.kt
+++ b/data-android/src/main/java/app/tivi/data/FlowPagedListBuilder.kt
@@ -123,12 +123,12 @@ class FlowPagedListBuilder<K, V>(
                     }
 
                     val list = PagedList.Builder(dataSource!!, config)
-                            .setNotifyExecutor(nExecutor)
-                            .setFetchExecutor(fExecutor)
-                            .setBoundaryCallback(boundaryCallback)
-                            .setInitialKey(prevList?.lastKey as? K ?: initialLoadKey)
-                            .build()
-                            .also { prevList = it }
+                        .setNotifyExecutor(nExecutor)
+                        .setFetchExecutor(fExecutor)
+                        .setBoundaryCallback(boundaryCallback)
+                        .setInitialKey(prevList?.lastKey as? K ?: initialLoadKey)
+                        .build()
+                        .also { prevList = it }
                 } while (list.isDetached)
 
                 return prevList!!
diff --git a/data-android/src/main/java/app/tivi/data/TiviRoomDatabase.kt b/data-android/src/main/java/app/tivi/data/TiviRoomDatabase.kt
index de65c1ec1f..7cd7726e34 100644
--- a/data-android/src/main/java/app/tivi/data/TiviRoomDatabase.kt
+++ b/data-android/src/main/java/app/tivi/data/TiviRoomDatabase.kt
@@ -39,28 +39,28 @@ import app.tivi.data.views.FollowedShowsWatchStats
 import dev.matrix.roomigrant.GenerateRoomMigrations
 
 @Database(
-        entities = [
-            TiviShow::class,
-            TiviShowFts::class,
-            TrendingShowEntry::class,
-            PopularShowEntry::class,
-            TraktUser::class,
-            WatchedShowEntry::class,
-            FollowedShowEntry::class,
-            Season::class,
-            Episode::class,
-            RelatedShowEntry::class,
-            EpisodeWatchEntry::class,
-            LastRequest::class,
-            ShowTmdbImage::class,
-            RecommendedShowEntry::class
-        ],
-        views = [
-            FollowedShowsWatchStats::class,
-            FollowedShowsLastWatched::class,
-            FollowedShowsNextToWatch::class
-        ],
-        version = 26
+    entities = [
+        TiviShow::class,
+        TiviShowFts::class,
+        TrendingShowEntry::class,
+        PopularShowEntry::class,
+        TraktUser::class,
+        WatchedShowEntry::class,
+        FollowedShowEntry::class,
+        Season::class,
+        Episode::class,
+        RelatedShowEntry::class,
+        EpisodeWatchEntry::class,
+        LastRequest::class,
+        ShowTmdbImage::class,
+        RecommendedShowEntry::class
+    ],
+    views = [
+        FollowedShowsWatchStats::class,
+        FollowedShowsLastWatched::class,
+        FollowedShowsNextToWatch::class
+    ],
+    version = 26
 )
 @TypeConverters(TiviTypeConverters::class)
 @GenerateRoomMigrations
diff --git a/data-android/src/main/java/app/tivi/data/TiviTypeConverters.kt b/data-android/src/main/java/app/tivi/data/TiviTypeConverters.kt
index 63553fe964..6e108371d9 100644
--- a/data-android/src/main/java/app/tivi/data/TiviTypeConverters.kt
+++ b/data-android/src/main/java/app/tivi/data/TiviTypeConverters.kt
@@ -64,7 +64,9 @@ object TiviTypeConverters {
     @TypeConverter
     @JvmStatic
     fun toDayOfWeek(value: Int?): DayOfWeek? {
-        return if (value != null) { dayOfWeekValues.firstOrNull { it.value == value } } else null
+        return if (value != null) {
+            dayOfWeekValues.firstOrNull { it.value == value }
+        } else null
     }
 
     @TypeConverter
diff --git a/data-android/src/test/java/app/tivi/data/TestDatabaseInject.kt b/data-android/src/test/java/app/tivi/data/TestDatabaseInject.kt
index e4033c3dda..6064b4c8fd 100644
--- a/data-android/src/test/java/app/tivi/data/TestDatabaseInject.kt
+++ b/data-android/src/test/java/app/tivi/data/TestDatabaseInject.kt
@@ -119,8 +119,8 @@ class TestRoomDatabaseModule {
     @Provides
     fun provideDatabase(context: Context): TiviDatabase {
         return Room.inMemoryDatabaseBuilder(context, TiviTestDatabase::class.java)
-                .allowMainThreadQueries()
-                .build()
+            .allowMainThreadQueries()
+            .build()
     }
 
     @Singleton
diff --git a/data-android/src/test/java/app/tivi/data/dao/EpisodeWatchEntryTest.kt b/data-android/src/test/java/app/tivi/data/dao/EpisodeWatchEntryTest.kt
index 5c5dd0416f..3bc9ed6ada 100644
--- a/data-android/src/test/java/app/tivi/data/dao/EpisodeWatchEntryTest.kt
+++ b/data-android/src/test/java/app/tivi/data/dao/EpisodeWatchEntryTest.kt
@@ -57,9 +57,9 @@ class EpisodeWatchEntryTest {
     @Before
     fun setup() {
         DaggerTestComponent.builder()
-                .testDataSourceModule(TestDataSourceModule())
-                .build()
-                .inject(this)
+            .testDataSourceModule(TestDataSourceModule())
+            .build()
+            .inject(this)
 
         runBlockingTest {
             // We'll assume that there's a show, season and s1_episodes in the db
@@ -87,7 +87,7 @@ class EpisodeWatchEntryTest {
     fun fetchEntries_WithPendingSendAction() = runBlockingTest {
         episodeWatchEntryDao.insertAll(s1e1w, episodeWatch2PendingSend)
         assertThat(episodeWatchEntryDao.entriesForShowIdWithSendPendingActions(showId),
-                `is`(listOf(episodeWatch2PendingSend))
+            `is`(listOf(episodeWatch2PendingSend))
         )
     }
 
@@ -95,7 +95,7 @@ class EpisodeWatchEntryTest {
     fun fetchEntries_WithPendingDeleteAction() = runBlockingTest {
         episodeWatchEntryDao.insertAll(s1e1w, episodeWatch2PendingDelete)
         assertThat(episodeWatchEntryDao.entriesForShowIdWithDeletePendingActions(showId),
-                `is`(listOf(episodeWatch2PendingDelete))
+            `is`(listOf(episodeWatch2PendingDelete))
         )
     }
 
diff --git a/data-android/src/test/java/app/tivi/data/dao/EpisodesTest.kt b/data-android/src/test/java/app/tivi/data/dao/EpisodesTest.kt
index 7179ded832..50c72e50bf 100644
--- a/data-android/src/test/java/app/tivi/data/dao/EpisodesTest.kt
+++ b/data-android/src/test/java/app/tivi/data/dao/EpisodesTest.kt
@@ -55,9 +55,9 @@ class EpisodesTest {
     @Before
     fun setup() {
         DaggerTestComponent.builder()
-                .testDataSourceModule(TestDataSourceModule())
-                .build()
-                .inject(this)
+            .testDataSourceModule(TestDataSourceModule())
+            .build()
+            .inject(this)
 
         runBlocking {
             // We'll assume that there's a show and season in the db
@@ -106,15 +106,15 @@ class EpisodesTest {
         episodeDao.insertAll(s1_episodes)
 
         assertThat(episodeDao.observeNextEpisodeForShowAfter(showId, 0, 0)
-                .first()?.episode, `is`(s1e1))
+            .first()?.episode, `is`(s1e1))
 
         assertThat(episodeDao.observeNextEpisodeForShowAfter(showId, 1, 0)
-                .first()?.episode, `is`(s1e2))
+            .first()?.episode, `is`(s1e2))
 
         assertThat(episodeDao.observeNextEpisodeForShowAfter(showId, 1, 1)
-                .first()?.episode, `is`(s1e3))
+            .first()?.episode, `is`(s1e3))
 
         assertThat(episodeDao.observeNextEpisodeForShowAfter(showId, 1, 2)
-                .first()?.episode, nullValue())
+            .first()?.episode, nullValue())
     }
 }
diff --git a/data-android/src/test/java/app/tivi/data/dao/SeasonsTest.kt b/data-android/src/test/java/app/tivi/data/dao/SeasonsTest.kt
index 5e741f118f..9a95be536a 100644
--- a/data-android/src/test/java/app/tivi/data/dao/SeasonsTest.kt
+++ b/data-android/src/test/java/app/tivi/data/dao/SeasonsTest.kt
@@ -51,9 +51,9 @@ class SeasonsTest {
     @Before
     fun setup() {
         DaggerTestComponent.builder()
-                .testDataSourceModule(TestDataSourceModule())
-                .build()
-                .inject(this)
+            .testDataSourceModule(TestDataSourceModule())
+            .build()
+            .inject(this)
 
         runBlockingTest {
             // We'll assume that there's a show in the db
@@ -86,7 +86,7 @@ class SeasonsTest {
 
         // Specials should always be last
         assertThat(seasonsDao.seasonsForShowId(showId),
-                `is`(listOf(s1, s2, s0))
+            `is`(listOf(s1, s2, s0))
         )
     }
 
diff --git a/data-android/src/test/java/app/tivi/data/repositories/FollowedShowRepositoryTest.kt b/data-android/src/test/java/app/tivi/data/repositories/FollowedShowRepositoryTest.kt
index 53613b2a37..bc9ba5631c 100644
--- a/data-android/src/test/java/app/tivi/data/repositories/FollowedShowRepositoryTest.kt
+++ b/data-android/src/test/java/app/tivi/data/repositories/FollowedShowRepositoryTest.kt
@@ -64,14 +64,14 @@ class FollowedShowRepositoryTest {
         val fakeShowDataSource = SuccessFakeShowDataSource()
 
         DaggerTestComponent.builder()
-                .testDataSourceModule(
-                        TestDataSourceModule(
-                                traktShowDataSource = fakeShowDataSource,
-                                tmdbShowDataSource = fakeShowDataSource
-                        )
+            .testDataSourceModule(
+                TestDataSourceModule(
+                    traktShowDataSource = fakeShowDataSource,
+                    tmdbShowDataSource = fakeShowDataSource
                 )
-                .build()
-                .inject(this)
+            )
+            .build()
+            .inject(this)
 
         runBlockingTest {
             // We'll assume that there's a show in the db
@@ -87,7 +87,7 @@ class FollowedShowRepositoryTest {
         repository.syncFollowedShows()
 
         assertThat(repository.getFollowedShows(),
-                `is`(listOf(followedShow1Local)))
+            `is`(listOf(followedShow1Local)))
     }
 
     @Test
@@ -100,7 +100,7 @@ class FollowedShowRepositoryTest {
         repository.syncFollowedShows()
 
         assertThat(repository.getFollowedShows(),
-                `is`(emptyList()))
+            `is`(emptyList()))
     }
 
     @Test
@@ -113,7 +113,7 @@ class FollowedShowRepositoryTest {
         repository.syncFollowedShows()
 
         assertThat(repository.getFollowedShows(),
-                `is`(listOf(followedShow2Local)))
+            `is`(listOf(followedShow2Local)))
     }
 
     @Test
@@ -126,7 +126,7 @@ class FollowedShowRepositoryTest {
         repository.syncFollowedShows()
 
         assertThat(repository.getFollowedShows(),
-                `is`(emptyList()))
+            `is`(emptyList()))
     }
 
     @Test
@@ -139,6 +139,6 @@ class FollowedShowRepositoryTest {
         repository.syncFollowedShows()
 
         assertThat(repository.getFollowedShows(),
-                `is`(listOf(followedShow1Local)))
+            `is`(listOf(followedShow1Local)))
     }
 }
diff --git a/data-android/src/test/java/app/tivi/data/repositories/SeasonsEpisodesRepositoryTest.kt b/data-android/src/test/java/app/tivi/data/repositories/SeasonsEpisodesRepositoryTest.kt
index 79bf755fe6..ac16c16e4b 100644
--- a/data-android/src/test/java/app/tivi/data/repositories/SeasonsEpisodesRepositoryTest.kt
+++ b/data-android/src/test/java/app/tivi/data/repositories/SeasonsEpisodesRepositoryTest.kt
@@ -71,9 +71,9 @@ class SeasonsEpisodesRepositoryTest {
     @Before
     fun setup() {
         DaggerTestComponent.builder()
-                .testDataSourceModule(TestDataSourceModule())
-                .build()
-                .inject(this)
+            .testDataSourceModule(TestDataSourceModule())
+            .build()
+            .inject(this)
 
         runBlockingTest {
             // We'll assume that there's a show in the db
@@ -88,7 +88,7 @@ class SeasonsEpisodesRepositoryTest {
 
         // Return a response with 2 items
         coEvery { seasonsDataSource.getShowEpisodeWatches(showId) } returns
-                Success(listOf(s1e1 to s1e1w, s1e1 to s1e1w2))
+            Success(listOf(s1e1 to s1e1w, s1e1 to s1e1w2))
         // Sync
         repository.syncEpisodeWatchesForShow(showId)
         // Assert that both are in the db
@@ -104,7 +104,7 @@ class SeasonsEpisodesRepositoryTest {
         episodeWatchDao.insertAll(s1e1w, s1e1w2)
         // Return a response with the same items
         coEvery { seasonsDataSource.getShowEpisodeWatches(showId) } returns
-                Success(listOf(s1e1 to s1e1w, s1e1 to s1e1w2))
+            Success(listOf(s1e1 to s1e1w, s1e1 to s1e1w2))
         // Now re-sync with the same response
         repository.syncEpisodeWatchesForShow(showId)
         // Assert that both are in the db
@@ -120,7 +120,7 @@ class SeasonsEpisodesRepositoryTest {
         episodeWatchDao.insertAll(s1e1w, s1e1w2)
         // Return a response with just the second item
         coEvery { seasonsDataSource.getShowEpisodeWatches(showId) } returns
-                Success(listOf(s1e1 to s1e1w2))
+            Success(listOf(s1e1 to s1e1w2))
         // Now re-sync
         repository.syncEpisodeWatchesForShow(showId)
         // Assert that only the second is in the db
@@ -136,7 +136,7 @@ class SeasonsEpisodesRepositoryTest {
         episodeWatchDao.insertAll(s1e1w, s1e1w2)
         // Return a empty response
         coEvery { seasonsDataSource.getShowEpisodeWatches(showId) } returns
-                Success(emptyList())
+            Success(emptyList())
         // Now re-sync
         repository.syncEpisodeWatchesForShow(showId)
         // Assert that the database is empty
@@ -147,7 +147,7 @@ class SeasonsEpisodesRepositoryTest {
     fun testSyncSeasonsEpisodes() = runBlockingTest {
         // Return a response with 2 items
         coEvery { seasonsDataSource.getSeasonsEpisodes(showId) } returns
-                Success(listOf(s1 to s1_episodes))
+            Success(listOf(s1 to s1_episodes))
         repository.updateSeasonsEpisodes(showId)
 
         // Assert that both are in the db
@@ -162,7 +162,7 @@ class SeasonsEpisodesRepositoryTest {
 
         // Return a response with the same items
         coEvery { seasonsDataSource.getSeasonsEpisodes(showId) } returns
-                Success(listOf(s1 to s1_episodes))
+            Success(listOf(s1 to s1_episodes))
         repository.updateSeasonsEpisodes(showId)
 
         // Assert that both are in the db
@@ -177,7 +177,7 @@ class SeasonsEpisodesRepositoryTest {
 
         // Return an empty response
         coEvery { seasonsDataSource.getSeasonsEpisodes(showId) } returns
-                Success(emptyList())
+            Success(emptyList())
         repository.updateSeasonsEpisodes(showId)
 
         // Assert the database is empty
@@ -193,7 +193,7 @@ class SeasonsEpisodesRepositoryTest {
 
         // Return a response with just the first season
         coEvery { seasonsDataSource.getSeasonsEpisodes(showId) } returns
-                Success(listOf(s1 to s1_episodes))
+            Success(listOf(s1 to s1_episodes))
         repository.updateSeasonsEpisodes(showId)
 
         // Assert that both are in the db
@@ -209,7 +209,7 @@ class SeasonsEpisodesRepositoryTest {
 
         // Return a response with both seasons, but just a single episodes in each
         coEvery { seasonsDataSource.getSeasonsEpisodes(showId) } returns
-                Success(listOf(s1 to listOf(s1e1), s2 to listOf(s2e1)))
+            Success(listOf(s1 to listOf(s1e1), s2 to listOf(s2e1)))
         repository.updateSeasonsEpisodes(showId)
 
         // Assert that both are in the db
diff --git a/data-android/src/test/java/app/tivi/utils/SampleData.kt b/data-android/src/test/java/app/tivi/utils/SampleData.kt
index ad232399ba..3733c7d520 100644
--- a/data-android/src/test/java/app/tivi/utils/SampleData.kt
+++ b/data-android/src/test/java/app/tivi/utils/SampleData.kt
@@ -38,29 +38,29 @@ internal suspend fun deleteShow(db: TiviDatabase) = db.showDao().delete(show)
 
 const val s1_id = 1L
 val s1 = Season(
-        id = s1_id,
-        showId = showId,
-        title = "Season 1",
-        number = 1,
-        traktId = 5443
+    id = s1_id,
+    showId = showId,
+    title = "Season 1",
+    number = 1,
+    traktId = 5443
 )
 
 const val s2_id = 2L
 val s2 = Season(
-        id = s2_id,
-        showId = showId,
-        title = "Season 2",
-        number = 2,
-        traktId = 5434
+    id = s2_id,
+    showId = showId,
+    title = "Season 2",
+    number = 2,
+    traktId = 5434
 )
 
 const val s0_id = 3L
 val s0 = Season(
-        id = s0_id,
-        showId = showId,
-        title = "Specials",
-        number = Season.NUMBER_SPECIALS,
-        traktId = 7042
+    id = s0_id,
+    showId = showId,
+    title = "Specials",
+    number = Season.NUMBER_SPECIALS,
+    traktId = 7042
 )
 
 private val s1e1AirDate = OffsetDateTime.of(2000, 7, 1, 18, 0, 0, 0, ZoneOffset.UTC)
@@ -77,10 +77,10 @@ val s2_episodes = listOf(s2e1, s2e2)
 
 const val s1e1w_id = 1L
 val s1e1w = EpisodeWatchEntry(
-        id = s1e1w_id,
-        watchedAt = OffsetDateTime.now(),
-        episodeId = s1e1.id,
-        traktId = 435214
+    id = s1e1w_id,
+    watchedAt = OffsetDateTime.now(),
+    episodeId = s1e1.id,
+    traktId = 435214
 )
 
 const val s1e1w2_id = 2L
diff --git a/data-android/src/test/java/app/tivi/utils/TiviTestDatabase.kt b/data-android/src/test/java/app/tivi/utils/TiviTestDatabase.kt
index bf53e7f718..979dd1d30f 100644
--- a/data-android/src/test/java/app/tivi/utils/TiviTestDatabase.kt
+++ b/data-android/src/test/java/app/tivi/utils/TiviTestDatabase.kt
@@ -41,29 +41,29 @@ import app.tivi.data.views.FollowedShowsNextToWatch
 import app.tivi.data.views.FollowedShowsWatchStats
 
 @Database(
-        entities = [
-            TiviShow::class,
-            TrendingShowEntry::class,
-            PopularShowEntry::class,
-            TraktUser::class,
-            WatchedShowEntry::class,
-            FollowedShowEntry::class,
-            Season::class,
-            Episode::class,
-            RelatedShowEntry::class,
-            EpisodeWatchEntry::class,
-            LastRequest::class,
-            ShowTmdbImage::class,
-            RecommendedShowEntry::class,
-            FakeTiviShowFts::class
-        ],
-        views = [
-            FollowedShowsWatchStats::class,
-            FollowedShowsLastWatched::class,
-            FollowedShowsNextToWatch::class
-        ],
-        version = 1,
-        exportSchema = false
+    entities = [
+        TiviShow::class,
+        TrendingShowEntry::class,
+        PopularShowEntry::class,
+        TraktUser::class,
+        WatchedShowEntry::class,
+        FollowedShowEntry::class,
+        Season::class,
+        Episode::class,
+        RelatedShowEntry::class,
+        EpisodeWatchEntry::class,
+        LastRequest::class,
+        ShowTmdbImage::class,
+        RecommendedShowEntry::class,
+        FakeTiviShowFts::class
+    ],
+    views = [
+        FollowedShowsWatchStats::class,
+        FollowedShowsLastWatched::class,
+        FollowedShowsNextToWatch::class
+    ],
+    version = 1,
+    exportSchema = false
 )
 @TypeConverters(TiviTypeConverters::class)
 abstract class TiviTestDatabase : RoomDatabase(), TiviDatabase {
diff --git a/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt b/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt
index 0e68f139df..febe5a54f1 100644
--- a/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt
+++ b/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt
@@ -50,9 +50,9 @@ abstract class EpisodesDao : EntityDao<Episode> {
     abstract fun episodeWithIdObservable(id: Long): Flow<EpisodeWithSeason>
 
     @Query("SELECT shows.id FROM shows" +
-            " INNER JOIN seasons AS s ON s.show_id = shows.id" +
-            " INNER JOIN episodes AS eps ON eps.season_id = s.id" +
-            " WHERE eps.id = :episodeId")
+        " INNER JOIN seasons AS s ON s.show_id = shows.id" +
+        " INNER JOIN episodes AS eps ON eps.season_id = s.id" +
+        " WHERE eps.id = :episodeId")
     abstract suspend fun showIdForEpisodeId(episodeId: Long): Long
 
     @Query(latestWatchedEpisodeForShowId)
diff --git a/data/src/main/java/app/tivi/data/entities/Episode.kt b/data/src/main/java/app/tivi/data/entities/Episode.kt
index de904edcf6..c903be407c 100644
--- a/data/src/main/java/app/tivi/data/entities/Episode.kt
+++ b/data/src/main/java/app/tivi/data/entities/Episode.kt
@@ -24,18 +24,18 @@ import androidx.room.PrimaryKey
 import org.threeten.bp.OffsetDateTime
 
 @Entity(
-        tableName = "episodes",
-        indices = [
-            Index(value = ["trakt_id"], unique = true),
-            Index(value = ["season_id"])
-        ],
-        foreignKeys = [
-            ForeignKey(entity = Season::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("season_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE)
-        ]
+    tableName = "episodes",
+    indices = [
+        Index(value = ["trakt_id"], unique = true),
+        Index(value = ["season_id"])
+    ],
+    foreignKeys = [
+        ForeignKey(entity = Season::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("season_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE)
+    ]
 )
 data class Episode(
     @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/EpisodeWatchEntry.kt b/data/src/main/java/app/tivi/data/entities/EpisodeWatchEntry.kt
index 5ed1ff1dc4..3cfaea95fc 100644
--- a/data/src/main/java/app/tivi/data/entities/EpisodeWatchEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/EpisodeWatchEntry.kt
@@ -24,19 +24,19 @@ import androidx.room.PrimaryKey
 import org.threeten.bp.OffsetDateTime
 
 @Entity(tableName = "episode_watch_entries",
-        indices = [
-            Index(value = ["episode_id"]),
-            Index(value = ["trakt_id"], unique = true)
-        ],
-        foreignKeys = [
-            ForeignKey(
-                    entity = Episode::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("episode_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["episode_id"]),
+        Index(value = ["trakt_id"], unique = true)
+    ],
+    foreignKeys = [
+        ForeignKey(
+            entity = Episode::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("episode_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class EpisodeWatchEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/FollowedShowEntry.kt b/data/src/main/java/app/tivi/data/entities/FollowedShowEntry.kt
index c35cc1b28a..71ce558dc1 100644
--- a/data/src/main/java/app/tivi/data/entities/FollowedShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/FollowedShowEntry.kt
@@ -25,18 +25,18 @@ import app.tivi.data.Entry
 import org.threeten.bp.OffsetDateTime
 
 @Entity(tableName = "myshows_entries",
-        indices = [
-            Index(value = ["show_id"], unique = true)
-        ],
-        foreignKeys = [
-            ForeignKey(
-                    entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["show_id"], unique = true)
+    ],
+    foreignKeys = [
+        ForeignKey(
+            entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class FollowedShowEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/LastRequest.kt b/data/src/main/java/app/tivi/data/entities/LastRequest.kt
index c53f01e61a..f99c37ca54 100644
--- a/data/src/main/java/app/tivi/data/entities/LastRequest.kt
+++ b/data/src/main/java/app/tivi/data/entities/LastRequest.kt
@@ -23,8 +23,8 @@ import androidx.room.PrimaryKey
 import org.threeten.bp.Instant
 
 @Entity(
-        tableName = "last_requests",
-        indices = [Index(value = ["request", "entity_id"], unique = true)]
+    tableName = "last_requests",
+    indices = [Index(value = ["request", "entity_id"], unique = true)]
 )
 data class LastRequest(
     @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/PopularShowEntry.kt b/data/src/main/java/app/tivi/data/entities/PopularShowEntry.kt
index e5cc07dc73..a354069540 100644
--- a/data/src/main/java/app/tivi/data/entities/PopularShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/PopularShowEntry.kt
@@ -24,17 +24,17 @@ import androidx.room.PrimaryKey
 import app.tivi.data.PaginatedEntry
 
 @Entity(tableName = "popular_shows",
-        indices = [
-            Index(value = ["show_id"], unique = true)
-        ],
-        foreignKeys = [
-            ForeignKey(entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["show_id"], unique = true)
+    ],
+    foreignKeys = [
+        ForeignKey(entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class PopularShowEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/RecommendedShowEntry.kt b/data/src/main/java/app/tivi/data/entities/RecommendedShowEntry.kt
index 1dbf33d5f7..3293f92212 100644
--- a/data/src/main/java/app/tivi/data/entities/RecommendedShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/RecommendedShowEntry.kt
@@ -24,17 +24,17 @@ import androidx.room.PrimaryKey
 import app.tivi.data.PaginatedEntry
 
 @Entity(tableName = "recommended_entries",
-        indices = [
-            Index(value = ["show_id"], unique = true)
-        ],
-        foreignKeys = [
-            ForeignKey(entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["show_id"], unique = true)
+    ],
+    foreignKeys = [
+        ForeignKey(entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class RecommendedShowEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/RelatedShowEntry.kt b/data/src/main/java/app/tivi/data/entities/RelatedShowEntry.kt
index 5f63466625..451a3ce1ec 100644
--- a/data/src/main/java/app/tivi/data/entities/RelatedShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/RelatedShowEntry.kt
@@ -24,26 +24,26 @@ import androidx.room.PrimaryKey
 import app.tivi.data.MultipleEntry
 
 @Entity(tableName = "related_shows",
-        indices = [
-            Index(value = ["show_id"]),
-            Index(value = ["other_show_id"])
-        ],
-        foreignKeys = [
-            ForeignKey(
-                    entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            ),
-            ForeignKey(
-                    entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("other_show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["show_id"]),
+        Index(value = ["other_show_id"])
+    ],
+    foreignKeys = [
+        ForeignKey(
+            entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        ),
+        ForeignKey(
+            entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("other_show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class RelatedShowEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/Season.kt b/data/src/main/java/app/tivi/data/entities/Season.kt
index f3ea37dc69..6a4bff8bc2 100644
--- a/data/src/main/java/app/tivi/data/entities/Season.kt
+++ b/data/src/main/java/app/tivi/data/entities/Season.kt
@@ -23,17 +23,17 @@ import androidx.room.Index
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "seasons",
-        indices = [
-            Index(value = ["trakt_id"], unique = true),
-            Index(value = ["show_id"])
-        ],
-        foreignKeys = [
-            ForeignKey(entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE)
-        ])
+    indices = [
+        Index(value = ["trakt_id"], unique = true),
+        Index(value = ["show_id"])
+    ],
+    foreignKeys = [
+        ForeignKey(entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE)
+    ])
 data class Season(
     @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") override val id: Long = 0,
     @ColumnInfo(name = "show_id") val showId: Long,
diff --git a/data/src/main/java/app/tivi/data/entities/ShowTmdbImage.kt b/data/src/main/java/app/tivi/data/entities/ShowTmdbImage.kt
index 8b195694a4..a3454dbb62 100644
--- a/data/src/main/java/app/tivi/data/entities/ShowTmdbImage.kt
+++ b/data/src/main/java/app/tivi/data/entities/ShowTmdbImage.kt
@@ -23,16 +23,16 @@ import androidx.room.Index
 import androidx.room.PrimaryKey
 
 @Entity(tableName = "show_images",
-        indices = [
-            Index(value = ["show_id"])
-        ],
-        foreignKeys = [
-            ForeignKey(entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE)
-        ])
+    indices = [
+        Index(value = ["show_id"])
+    ],
+    foreignKeys = [
+        ForeignKey(entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE)
+    ])
 data class ShowTmdbImage(
     @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") override val id: Long = 0,
     @ColumnInfo(name = "show_id") val showId: Long,
diff --git a/data/src/main/java/app/tivi/data/entities/TiviEntity.kt b/data/src/main/java/app/tivi/data/entities/TiviEntity.kt
index 57396de5b9..8717182dd0 100644
--- a/data/src/main/java/app/tivi/data/entities/TiviEntity.kt
+++ b/data/src/main/java/app/tivi/data/entities/TiviEntity.kt
@@ -44,9 +44,10 @@ enum class ImageType(val storageKey: String) {
 
 fun <T : TmdbImageEntity> Collection<T>.findHighestRatedPoster(): T? {
     return filter { it.type == ImageType.POSTER }
-            .maxBy { it.rating + (if (it.isPrimary) 10f else 0f) }
+        .maxBy { it.rating + (if (it.isPrimary) 10f else 0f) }
 }
+
 fun <T : TmdbImageEntity> Collection<T>.findHighestRatedBackdrop(): T? {
     return filter { it.type == ImageType.BACKDROP }
-            .maxBy { it.rating + (if (it.isPrimary) 10f else 0f) }
+        .maxBy { it.rating + (if (it.isPrimary) 10f else 0f) }
 }
diff --git a/data/src/main/java/app/tivi/data/entities/TiviShow.kt b/data/src/main/java/app/tivi/data/entities/TiviShow.kt
index 224ca7a193..2f61561121 100644
--- a/data/src/main/java/app/tivi/data/entities/TiviShow.kt
+++ b/data/src/main/java/app/tivi/data/entities/TiviShow.kt
@@ -27,10 +27,10 @@ import org.threeten.bp.OffsetDateTime
 import org.threeten.bp.ZoneId
 
 @Entity(tableName = "shows",
-        indices = [
-            Index(value = ["trakt_id"], unique = true),
-            Index(value = ["tmdb_id"])
-        ]
+    indices = [
+        Index(value = ["trakt_id"], unique = true),
+        Index(value = ["tmdb_id"])
+    ]
 )
 data class TiviShow(
     @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") override val id: Long = 0,
@@ -56,7 +56,8 @@ data class TiviShow(
     @ColumnInfo(name = "airs_time") val airsTime: LocalTime? = null,
     @ColumnInfo(name = "airs_tz") val airsTimeZone: ZoneId? = null
 ) : TiviEntity, TraktIdEntity, TmdbIdEntity {
-    @Ignore constructor() : this(0)
+    @Ignore
+    constructor() : this(0)
 
     @delegate:Ignore
     val genres by lazy(LazyThreadSafetyMode.NONE) {
diff --git a/data/src/main/java/app/tivi/data/entities/TraktUser.kt b/data/src/main/java/app/tivi/data/entities/TraktUser.kt
index 1f37b57dc3..aa21c60714 100644
--- a/data/src/main/java/app/tivi/data/entities/TraktUser.kt
+++ b/data/src/main/java/app/tivi/data/entities/TraktUser.kt
@@ -23,8 +23,8 @@ import androidx.room.PrimaryKey
 import org.threeten.bp.OffsetDateTime
 
 @Entity(
-        tableName = "users",
-        indices = [Index(value = ["username"], unique = true)]
+    tableName = "users",
+    indices = [Index(value = ["username"], unique = true)]
 )
 data class TraktUser(
     @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "id") override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/TrendingShowEntry.kt b/data/src/main/java/app/tivi/data/entities/TrendingShowEntry.kt
index 3afc418143..7e0c54732f 100644
--- a/data/src/main/java/app/tivi/data/entities/TrendingShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/TrendingShowEntry.kt
@@ -24,17 +24,17 @@ import androidx.room.PrimaryKey
 import app.tivi.data.PaginatedEntry
 
 @Entity(tableName = "trending_shows",
-        indices = [
-            Index(value = ["show_id"], unique = true)
-        ],
-        foreignKeys = [
-            ForeignKey(entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["show_id"], unique = true)
+    ],
+    foreignKeys = [
+        ForeignKey(entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class TrendingShowEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/entities/WatchedShowEntry.kt b/data/src/main/java/app/tivi/data/entities/WatchedShowEntry.kt
index dd9b623ca4..a660236092 100644
--- a/data/src/main/java/app/tivi/data/entities/WatchedShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/entities/WatchedShowEntry.kt
@@ -25,17 +25,17 @@ import app.tivi.data.Entry
 import org.threeten.bp.OffsetDateTime
 
 @Entity(tableName = "watched_entries",
-        indices = [
-            Index(value = ["show_id"], unique = true)
-        ],
-        foreignKeys = [
-            ForeignKey(entity = TiviShow::class,
-                    parentColumns = arrayOf("id"),
-                    childColumns = arrayOf("show_id"),
-                    onUpdate = ForeignKey.CASCADE,
-                    onDelete = ForeignKey.CASCADE
-            )
-        ]
+    indices = [
+        Index(value = ["show_id"], unique = true)
+    ],
+    foreignKeys = [
+        ForeignKey(entity = TiviShow::class,
+            parentColumns = arrayOf("id"),
+            childColumns = arrayOf("show_id"),
+            onUpdate = ForeignKey.CASCADE,
+            onDelete = ForeignKey.CASCADE
+        )
+    ]
 )
 data class WatchedShowEntry(
     @PrimaryKey(autoGenerate = true) override val id: Long = 0,
diff --git a/data/src/main/java/app/tivi/data/mappers/EpisodeIdToTraktIdMapper.kt b/data/src/main/java/app/tivi/data/mappers/EpisodeIdToTraktIdMapper.kt
index d9b6e25d8b..351f1c14a1 100644
--- a/data/src/main/java/app/tivi/data/mappers/EpisodeIdToTraktIdMapper.kt
+++ b/data/src/main/java/app/tivi/data/mappers/EpisodeIdToTraktIdMapper.kt
@@ -25,6 +25,7 @@ class EpisodeIdToTraktIdMapper @Inject constructor(
     private val dao: EpisodesDao
 ) : Mapper<Long, Int> {
     override suspend fun map(from: Long): Int {
-        return dao.episodeTraktIdForId(from) ?: throw IllegalArgumentException("Episode with id $from does not exist")
+        return dao.episodeTraktIdForId(from)
+            ?: throw IllegalArgumentException("Episode with id $from does not exist")
     }
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/SeasonIdToTraktIdMapper.kt b/data/src/main/java/app/tivi/data/mappers/SeasonIdToTraktIdMapper.kt
index fafa8d24c0..5665767885 100644
--- a/data/src/main/java/app/tivi/data/mappers/SeasonIdToTraktIdMapper.kt
+++ b/data/src/main/java/app/tivi/data/mappers/SeasonIdToTraktIdMapper.kt
@@ -25,6 +25,7 @@ class SeasonIdToTraktIdMapper @Inject constructor(
     private val dao: SeasonsDao
 ) : Mapper<Long, Int> {
     override suspend fun map(from: Long): Int {
-        return dao.traktIdForId(from) ?: throw IllegalArgumentException("Trakt Id for season id $from does not exist")
+        return dao.traktIdForId(from)
+            ?: throw IllegalArgumentException("Trakt Id for season id $from does not exist")
     }
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/ShowIdToTmdbIdMapper.kt b/data/src/main/java/app/tivi/data/mappers/ShowIdToTmdbIdMapper.kt
index 61ea04c6cf..e673bcd1ff 100644
--- a/data/src/main/java/app/tivi/data/mappers/ShowIdToTmdbIdMapper.kt
+++ b/data/src/main/java/app/tivi/data/mappers/ShowIdToTmdbIdMapper.kt
@@ -25,5 +25,5 @@ class ShowIdToTmdbIdMapper @Inject constructor(
     private val showDao: TiviShowDao
 ) : Mapper<Long, Int> {
     override suspend fun map(from: Long) = showDao.getTmdbIdForShowId(from)
-            ?: throw IllegalArgumentException("Show with id $from does not exist")
+        ?: throw IllegalArgumentException("Show with id $from does not exist")
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TmdbBaseShowToTiviShow.kt b/data/src/main/java/app/tivi/data/mappers/TmdbBaseShowToTiviShow.kt
index f68fa1de8a..502d35b4e8 100644
--- a/data/src/main/java/app/tivi/data/mappers/TmdbBaseShowToTiviShow.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TmdbBaseShowToTiviShow.kt
@@ -24,8 +24,8 @@ import javax.inject.Singleton
 @Singleton
 class TmdbBaseShowToTiviShow @Inject constructor() : Mapper<BaseTvShow, TiviShow> {
     override suspend fun map(from: BaseTvShow) = TiviShow(
-            tmdbId = from.id,
-            title = from.name,
-            summary = from.overview
+        tmdbId = from.id,
+        title = from.name,
+        summary = from.overview
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TmdbEpisodeToEpisode.kt b/data/src/main/java/app/tivi/data/mappers/TmdbEpisodeToEpisode.kt
index 80c73f5eee..16af60ceb8 100644
--- a/data/src/main/java/app/tivi/data/mappers/TmdbEpisodeToEpisode.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TmdbEpisodeToEpisode.kt
@@ -24,11 +24,11 @@ import javax.inject.Singleton
 @Singleton
 class TmdbEpisodeToEpisode @Inject constructor() : Mapper<TvEpisode, Episode> {
     override suspend fun map(from: TvEpisode) = Episode(
-            seasonId = 0,
-            tmdbId = from.id,
-            title = from.name,
-            number = from.episode_number,
-            summary = from.overview,
-            tmdbBackdropPath = from.still_path
+        seasonId = 0,
+        tmdbId = from.id,
+        title = from.name,
+        number = from.episode_number,
+        summary = from.overview,
+        tmdbBackdropPath = from.still_path
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TmdbImagesToShowImages.kt b/data/src/main/java/app/tivi/data/mappers/TmdbImagesToShowImages.kt
index c2459bd81f..25046e27c1 100644
--- a/data/src/main/java/app/tivi/data/mappers/TmdbImagesToShowImages.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TmdbImagesToShowImages.kt
@@ -28,16 +28,16 @@ class TmdbImagesToShowImages @Inject constructor() : Mapper<TvShow, List<ShowTmd
     override suspend fun map(from: TvShow): List<ShowTmdbImage> {
         fun mapImage(image: Image, type: ImageType): ShowTmdbImage {
             return ShowTmdbImage(
-                    showId = 0,
-                    path = image.file_path!!,
-                    type = type,
-                    language = image.iso_639_1,
-                    rating = image.vote_average?.toFloat() ?: 0f,
-                    isPrimary = when (type) {
-                        ImageType.BACKDROP -> image.file_path == from.backdrop_path
-                        ImageType.POSTER -> image.file_path == from.poster_path
-                        else -> false
-                    }
+                showId = 0,
+                path = image.file_path!!,
+                type = type,
+                language = image.iso_639_1,
+                rating = image.vote_average?.toFloat() ?: 0f,
+                isPrimary = when (type) {
+                    ImageType.BACKDROP -> image.file_path == from.backdrop_path
+                    ImageType.POSTER -> image.file_path == from.poster_path
+                    else -> false
+                }
             )
         }
 
diff --git a/data/src/main/java/app/tivi/data/mappers/TmdbShowResultsPageToTiviShows.kt b/data/src/main/java/app/tivi/data/mappers/TmdbShowResultsPageToTiviShows.kt
index 97d5b14809..b907dd13e6 100644
--- a/data/src/main/java/app/tivi/data/mappers/TmdbShowResultsPageToTiviShows.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TmdbShowResultsPageToTiviShows.kt
@@ -34,18 +34,18 @@ class TmdbShowResultsPageToTiviShows @Inject constructor(
             val images = ArrayList<ShowTmdbImage>()
             if (it.poster_path != null) {
                 images += ShowTmdbImage(
-                        showId = 0,
-                        path = it.poster_path,
-                        isPrimary = true,
-                        type = ImageType.POSTER
+                    showId = 0,
+                    path = it.poster_path,
+                    isPrimary = true,
+                    type = ImageType.POSTER
                 )
             }
             if (it.backdrop_path != null) {
                 images += ShowTmdbImage(
-                        showId = 0,
-                        path = it.backdrop_path,
-                        isPrimary = true,
-                        type = ImageType.BACKDROP
+                    showId = 0,
+                    path = it.backdrop_path,
+                    isPrimary = true,
+                    type = ImageType.BACKDROP
                 )
             }
             show to images
diff --git a/data/src/main/java/app/tivi/data/mappers/TmdbShowToTiviShow.kt b/data/src/main/java/app/tivi/data/mappers/TmdbShowToTiviShow.kt
index 425d9b4062..ed80a73321 100644
--- a/data/src/main/java/app/tivi/data/mappers/TmdbShowToTiviShow.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TmdbShowToTiviShow.kt
@@ -24,12 +24,12 @@ import javax.inject.Singleton
 @Singleton
 class TmdbShowToTiviShow @Inject constructor() : Mapper<TvShow, TiviShow> {
     override suspend fun map(from: TvShow) = TiviShow(
-            tmdbId = from.id,
-            imdbId = from.external_ids?.imdb_id,
-            title = from.name,
-            summary = from.overview,
-            homepage = from.homepage,
-            network = from.networks?.firstOrNull()?.name,
-            networkLogoPath = from.networks?.firstOrNull()?.logo_path
+        tmdbId = from.id,
+        imdbId = from.external_ids?.imdb_id,
+        title = from.name,
+        summary = from.overview,
+        homepage = from.homepage,
+        network = from.networks?.firstOrNull()?.name,
+        networkLogoPath = from.networks?.firstOrNull()?.logo_path
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TraktBaseShowToTiviShow.kt b/data/src/main/java/app/tivi/data/mappers/TraktBaseShowToTiviShow.kt
index e942cdaa76..630bf2fcd5 100644
--- a/data/src/main/java/app/tivi/data/mappers/TraktBaseShowToTiviShow.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TraktBaseShowToTiviShow.kt
@@ -28,7 +28,7 @@ class TraktBaseShowToTiviShow @Inject constructor(
     override suspend fun map(from: BaseShow): TiviShow {
         val mapped = showMapper.map(from.show)
         return mapped.copy(
-                traktDataUpdate = from.last_updated_at ?: mapped.traktDataUpdate
+            traktDataUpdate = from.last_updated_at ?: mapped.traktDataUpdate
         )
     }
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TraktEpisodeToEpisode.kt b/data/src/main/java/app/tivi/data/mappers/TraktEpisodeToEpisode.kt
index 1b57bb3567..9bacd6cec4 100644
--- a/data/src/main/java/app/tivi/data/mappers/TraktEpisodeToEpisode.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TraktEpisodeToEpisode.kt
@@ -24,14 +24,14 @@ import javax.inject.Singleton
 @Singleton
 class TraktEpisodeToEpisode @Inject constructor() : Mapper<TraktEpisode, Episode> {
     override suspend fun map(from: TraktEpisode) = Episode(
-            seasonId = 0,
-            traktId = from.ids.trakt,
-            tmdbId = from.ids.tmdb,
-            title = from.title,
-            number = from.number,
-            summary = from.overview,
-            firstAired = from.first_aired,
-            traktRating = from.rating?.toFloat() ?: 0f,
-            traktRatingVotes = from.votes
+        seasonId = 0,
+        traktId = from.ids.trakt,
+        tmdbId = from.ids.tmdb,
+        title = from.title,
+        number = from.number,
+        summary = from.overview,
+        firstAired = from.first_aired,
+        traktRating = from.rating?.toFloat() ?: 0f,
+        traktRatingVotes = from.votes
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TraktHistoryItemToEpisodeWatchEntry.kt b/data/src/main/java/app/tivi/data/mappers/TraktHistoryItemToEpisodeWatchEntry.kt
index bbac420e50..47944fea32 100644
--- a/data/src/main/java/app/tivi/data/mappers/TraktHistoryItemToEpisodeWatchEntry.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TraktHistoryItemToEpisodeWatchEntry.kt
@@ -24,8 +24,8 @@ import javax.inject.Singleton
 @Singleton
 class TraktHistoryItemToEpisodeWatchEntry @Inject constructor() : Mapper<HistoryEntry, EpisodeWatchEntry> {
     override suspend fun map(from: HistoryEntry) = EpisodeWatchEntry(
-            episodeId = 0,
-            traktId = from.id,
-            watchedAt = from.watched_at
+        episodeId = 0,
+        traktId = from.id,
+        watchedAt = from.watched_at
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TraktListEntryToFollowedShowEntry.kt b/data/src/main/java/app/tivi/data/mappers/TraktListEntryToFollowedShowEntry.kt
index 44b2cc82c9..d45d273b56 100644
--- a/data/src/main/java/app/tivi/data/mappers/TraktListEntryToFollowedShowEntry.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TraktListEntryToFollowedShowEntry.kt
@@ -24,8 +24,8 @@ import javax.inject.Singleton
 @Singleton
 class TraktListEntryToFollowedShowEntry @Inject constructor() : Mapper<ListEntry, FollowedShowEntry> {
     override suspend fun map(from: ListEntry) = FollowedShowEntry(
-            showId = 0,
-            followedAt = from.listed_at,
-            traktId = from.id
+        showId = 0,
+        followedAt = from.listed_at,
+        traktId = from.id
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TraktSeasonToSeason.kt b/data/src/main/java/app/tivi/data/mappers/TraktSeasonToSeason.kt
index 025cda1039..368f71b613 100644
--- a/data/src/main/java/app/tivi/data/mappers/TraktSeasonToSeason.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TraktSeasonToSeason.kt
@@ -24,16 +24,16 @@ import javax.inject.Singleton
 @Singleton
 class TraktSeasonToSeason @Inject constructor() : Mapper<TraktSeason, Season> {
     override suspend fun map(from: TraktSeason) = Season(
-            showId = 0,
-            traktId = from.ids?.trakt,
-            tmdbId = from.ids?.tmdb,
-            number = from.number,
-            title = from.title,
-            summary = from.overview,
-            traktRating = from.rating?.toFloat() ?: 0f,
-            traktRatingVotes = from.votes ?: 0,
-            episodeCount = from.episode_count,
-            episodesAired = from.aired_episodes,
-            network = from.network
+        showId = 0,
+        traktId = from.ids?.trakt,
+        tmdbId = from.ids?.tmdb,
+        number = from.number,
+        title = from.title,
+        summary = from.overview,
+        traktRating = from.rating?.toFloat() ?: 0f,
+        traktRatingVotes = from.votes ?: 0,
+        episodeCount = from.episode_count,
+        episodesAired = from.aired_episodes,
+        network = from.network
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/TraktShowToTiviShow.kt b/data/src/main/java/app/tivi/data/mappers/TraktShowToTiviShow.kt
index fbdbc2549d..823225ad99 100644
--- a/data/src/main/java/app/tivi/data/mappers/TraktShowToTiviShow.kt
+++ b/data/src/main/java/app/tivi/data/mappers/TraktShowToTiviShow.kt
@@ -31,42 +31,42 @@ class TraktShowToTiviShow @Inject constructor(
     private val statusMapper: TraktStatusToShowStatus
 ) : Mapper<Show, TiviShow> {
     override suspend fun map(from: Show) = TiviShow(
-            traktId = from.ids?.trakt,
-            tmdbId = from.ids?.tmdb,
-            imdbId = from.ids?.imdb,
-            title = from.title,
-            summary = from.overview,
-            homepage = from.homepage,
-            traktRating = from.rating?.toFloat(),
-            traktVotes = from.votes,
-            certification = from.certification,
-            runtime = from.runtime,
-            network = from.network,
-            country = from.country,
-            firstAired = from.first_aired,
-            _genres = from.genres?.joinToString(","),
-            traktDataUpdate = from.updated_at,
-            status = from.status?.let {
-                statusMapper.map(it)
-            },
-            airsDay = from.airs?.day?.let { dayString ->
-                DayOfWeek.values().firstOrNull { day ->
-                    dayString.equals(day.getDisplayName(TextStyle.FULL, Locale.getDefault()), true)
-                }
-            },
-            airsTime = from.airs?.time?.let {
-                try {
-                    LocalTime.parse(it)
-                } catch (e: Exception) {
-                    null
-                }
-            },
-            airsTimeZone = from.airs?.timezone?.let {
-                try {
-                    ZoneId.of(it)
-                } catch (e: Exception) {
-                    null
-                }
+        traktId = from.ids?.trakt,
+        tmdbId = from.ids?.tmdb,
+        imdbId = from.ids?.imdb,
+        title = from.title,
+        summary = from.overview,
+        homepage = from.homepage,
+        traktRating = from.rating?.toFloat(),
+        traktVotes = from.votes,
+        certification = from.certification,
+        runtime = from.runtime,
+        network = from.network,
+        country = from.country,
+        firstAired = from.first_aired,
+        _genres = from.genres?.joinToString(","),
+        traktDataUpdate = from.updated_at,
+        status = from.status?.let {
+            statusMapper.map(it)
+        },
+        airsDay = from.airs?.day?.let { dayString ->
+            DayOfWeek.values().firstOrNull { day ->
+                dayString.equals(day.getDisplayName(TextStyle.FULL, Locale.getDefault()), true)
             }
+        },
+        airsTime = from.airs?.time?.let {
+            try {
+                LocalTime.parse(it)
+            } catch (e: Exception) {
+                null
+            }
+        },
+        airsTimeZone = from.airs?.timezone?.let {
+            try {
+                ZoneId.of(it)
+            } catch (e: Exception) {
+                null
+            }
+        }
     )
 }
diff --git a/data/src/main/java/app/tivi/data/mappers/UserToTraktUser.kt b/data/src/main/java/app/tivi/data/mappers/UserToTraktUser.kt
index 24a2edc7a1..930c9a18af 100644
--- a/data/src/main/java/app/tivi/data/mappers/UserToTraktUser.kt
+++ b/data/src/main/java/app/tivi/data/mappers/UserToTraktUser.kt
@@ -24,12 +24,12 @@ import javax.inject.Singleton
 @Singleton
 class UserToTraktUser @Inject constructor() : Mapper<User, TraktUser> {
     override suspend fun map(from: User) = TraktUser(
-            username = from.username,
-            name = from.name,
-            location = from.location,
-            about = from.about,
-            avatarUrl = from.images?.avatar?.full,
-            joined = from.joined_at,
-            vip = from.vip
+        username = from.username,
+        name = from.name,
+        location = from.location,
+        about = from.about,
+        avatarUrl = from.images?.avatar?.full,
+        joined = from.joined_at,
+        vip = from.vip
     )
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt b/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt
index 2e1a5e9eb4..9cfb976fac 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt
@@ -33,10 +33,10 @@ class EpisodeWatchStore @Inject constructor(
     private val logger: Logger
 ) {
     private val episodeWatchSyncer = syncerForEntity(
-            episodeWatchEntryDao,
-            { it.traktId },
-            { entity, id -> entity.copy(id = id ?: 0) },
-            logger
+        episodeWatchEntryDao,
+        { it.traktId },
+        { entity, id -> entity.copy(id = id ?: 0) },
+        logger
     )
 
     fun observeEpisodeWatches(episodeId: Long): Flow<List<EpisodeWatchEntry>> {
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt
index 3aeb14027b..6fd84a9a6b 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt
@@ -72,12 +72,12 @@ class SeasonsEpisodesRepository @Inject constructor(
                 is Success -> {
                     result.data.distinctBy { it.first.number }.associate { (season, episodes) ->
                         val localSeason = seasonsEpisodesStore.getSeasonWithTraktId(season.traktId!!)
-                                ?: Season(showId = showId)
+                            ?: Season(showId = showId)
                         val mergedSeason = mergeSeason(localSeason, season, Season.EMPTY)
 
                         val mergedEpisodes = episodes.distinctBy(Episode::number).map {
                             val localEpisode = seasonsEpisodesStore.getEpisodeWithTraktId(it.traktId!!)
-                                    ?: Episode(seasonId = mergedSeason.id)
+                                ?: Episode(seasonId = mergedSeason.id)
                             mergeEpisode(localEpisode, it, Episode.EMPTY)
                         }
                         mergedSeason to mergedEpisodes
@@ -174,9 +174,9 @@ class SeasonsEpisodesRepository @Inject constructor(
                         ActionDate.AIR_DATE -> episode.firstAired ?: OffsetDateTime.now()
                     }
                     return@mapNotNull EpisodeWatchEntry(
-                            episodeId = episode.id,
-                            watchedAt = timestamp,
-                            pendingAction = PendingAction.UPLOAD
+                        episodeId = episode.id,
+                        watchedAt = timestamp,
+                        pendingAction = PendingAction.UPLOAD
                     )
                 }
             }
@@ -221,9 +221,9 @@ class SeasonsEpisodesRepository @Inject constructor(
 
     suspend fun addEpisodeWatch(episodeId: Long, timestamp: OffsetDateTime) {
         val entry = EpisodeWatchEntry(
-                episodeId = episodeId,
-                watchedAt = timestamp,
-                pendingAction = PendingAction.UPLOAD
+            episodeId = episodeId,
+            watchedAt = timestamp,
+            pendingAction = PendingAction.UPLOAD
         )
         episodeWatchStore.save(entry)
 
@@ -243,7 +243,7 @@ class SeasonsEpisodesRepository @Inject constructor(
         if (watchesForEpisode.isNotEmpty()) {
             // First mark them as pending deletion
             episodeWatchStore.updateWatchEntriesWithAction(
-                    watchesForEpisode.map { it.id }, PendingAction.DELETE)
+                watchesForEpisode.map { it.id }, PendingAction.DELETE)
             syncEpisodeWatches(episodeId)
         }
     }
@@ -274,7 +274,7 @@ class SeasonsEpisodesRepository @Inject constructor(
             is Success -> transactionRunner {
                 val watches = response.data.mapNotNull { (episode, watchEntry) ->
                     val epId = seasonsEpisodesStore.getEpisodeIdForTraktId(episode.traktId!!)
-                            ?: return@mapNotNull null // We don't have the episode, skip
+                        ?: return@mapNotNull null // We don't have the episode, skip
                     watchEntry.copy(episodeId = epId)
                 }
                 if (since != null) {
@@ -340,38 +340,38 @@ class SeasonsEpisodesRepository @Inject constructor(
     }
 
     private fun mergeSeason(local: Season, trakt: Season, tmdb: Season) = local.copy(
-            title = trakt.title ?: local.title,
-            summary = trakt.summary ?: local.summary,
-            number = trakt.number ?: local.number,
-
-            network = trakt.network ?: tmdb.network ?: local.network,
-            episodeCount = trakt.episodeCount ?: tmdb.episodeCount ?: local.episodeCount,
-            episodesAired = trakt.episodesAired ?: tmdb.episodesAired ?: local.episodesAired,
-
-            // Trakt specific stuff
-            traktId = trakt.traktId ?: local.traktId,
-            traktRating = trakt.traktRating ?: local.traktRating,
-            traktRatingVotes = trakt.traktRatingVotes ?: local.traktRatingVotes,
-
-            // TMDb specific stuff
-            tmdbId = tmdb.tmdbId ?: trakt.tmdbId ?: local.tmdbId,
-            tmdbPosterPath = tmdb.tmdbPosterPath ?: local.tmdbPosterPath,
-            tmdbBackdropPath = tmdb.tmdbBackdropPath ?: local.tmdbBackdropPath
+        title = trakt.title ?: local.title,
+        summary = trakt.summary ?: local.summary,
+        number = trakt.number ?: local.number,
+
+        network = trakt.network ?: tmdb.network ?: local.network,
+        episodeCount = trakt.episodeCount ?: tmdb.episodeCount ?: local.episodeCount,
+        episodesAired = trakt.episodesAired ?: tmdb.episodesAired ?: local.episodesAired,
+
+        // Trakt specific stuff
+        traktId = trakt.traktId ?: local.traktId,
+        traktRating = trakt.traktRating ?: local.traktRating,
+        traktRatingVotes = trakt.traktRatingVotes ?: local.traktRatingVotes,
+
+        // TMDb specific stuff
+        tmdbId = tmdb.tmdbId ?: trakt.tmdbId ?: local.tmdbId,
+        tmdbPosterPath = tmdb.tmdbPosterPath ?: local.tmdbPosterPath,
+        tmdbBackdropPath = tmdb.tmdbBackdropPath ?: local.tmdbBackdropPath
     )
 
     private fun mergeEpisode(local: Episode, trakt: Episode, tmdb: Episode) = local.copy(
-            title = trakt.title ?: tmdb.title ?: local.title,
-            summary = trakt.summary ?: tmdb.summary ?: local.summary,
-            number = trakt.number ?: tmdb.number ?: local.number,
-            firstAired = trakt.firstAired ?: tmdb.firstAired ?: local.firstAired,
-
-            // Trakt specific stuff
-            traktId = trakt.traktId ?: local.traktId,
-            traktRating = trakt.traktRating ?: local.traktRating,
-            traktRatingVotes = trakt.traktRatingVotes ?: local.traktRatingVotes,
-
-            // TMDb specific stuff
-            tmdbId = tmdb.tmdbId ?: trakt.tmdbId ?: local.tmdbId,
-            tmdbBackdropPath = tmdb.tmdbBackdropPath ?: local.tmdbBackdropPath
+        title = trakt.title ?: tmdb.title ?: local.title,
+        summary = trakt.summary ?: tmdb.summary ?: local.summary,
+        number = trakt.number ?: tmdb.number ?: local.number,
+        firstAired = trakt.firstAired ?: tmdb.firstAired ?: local.firstAired,
+
+        // Trakt specific stuff
+        traktId = trakt.traktId ?: local.traktId,
+        traktRating = trakt.traktRating ?: local.traktRating,
+        traktRatingVotes = trakt.traktRatingVotes ?: local.traktRatingVotes,
+
+        // TMDb specific stuff
+        tmdbId = tmdb.tmdbId ?: trakt.tmdbId ?: local.tmdbId,
+        tmdbBackdropPath = tmdb.tmdbBackdropPath ?: local.tmdbBackdropPath
     )
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt
index c92e91d591..b1583584ad 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt
@@ -38,17 +38,17 @@ class SeasonsEpisodesStore @Inject constructor(
     private val logger: Logger
 ) {
     private val seasonSyncer = syncerForEntity(
-            seasonsDao,
-            { it.traktId },
-            { entity, id -> entity.copy(id = id ?: 0) },
-            logger
+        seasonsDao,
+        { it.traktId },
+        { entity, id -> entity.copy(id = id ?: 0) },
+        logger
     )
 
     private val episodeSyncer = syncerForEntity(
-            episodesDao,
-            { it.traktId },
-            { entity, id -> entity.copy(id = id ?: 0) },
-            logger
+        episodesDao,
+        { it.traktId },
+        { entity, id -> entity.copy(id = id ?: 0) },
+        logger
     )
 
     fun observeEpisode(episodeId: Long): Flow<EpisodeWithSeason> {
@@ -62,9 +62,9 @@ class SeasonsEpisodesStore @Inject constructor(
     fun observeShowNextEpisodeToWatch(showId: Long): Flow<EpisodeWithSeason?> {
         return episodesDao.observeLatestWatchedEpisodeForShowId(showId).flatMapLatest {
             episodesDao.observeNextAiredEpisodeForShowAfter(
-                    showId,
-                    it?.season?.number ?: 0,
-                    it?.episode?.number ?: 0
+                showId,
+                it?.season?.number ?: 0,
+                it?.episode?.number ?: 0
             )
         }
     }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt
index 22c3758981..57521337fc 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt
@@ -33,8 +33,8 @@ class TmdbEpisodeDataSource @Inject constructor(
 ) : EpisodeDataSource {
     override suspend fun getEpisode(showId: Long, seasonNumber: Int, episodeNumber: Int): Result<Episode> {
         return tmdb.tvEpisodesService()
-                .episode(tmdbIdMapper.map(showId), seasonNumber, episodeNumber, null)
-                .executeWithRetry()
-                .toResult(episodeMapper.toLambda())
+            .episode(tmdbIdMapper.map(showId), seasonNumber, episodeNumber, null)
+            .executeWithRetry()
+            .toResult(episodeMapper.toLambda())
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt
index 4874cff84b..80f894e8ec 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt
@@ -36,10 +36,10 @@ class TraktEpisodeDataSource @Inject constructor(
 ) : EpisodeDataSource {
     override suspend fun getEpisode(showId: Long, seasonNumber: Int, episodeNumber: Int): Result<Episode> {
         val traktId = traktIdMapper.map(showId)
-                ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
+            ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
 
         return service.get().summary(traktId.toString(), seasonNumber, episodeNumber, Extended.FULL)
-                .executeWithRetry()
-                .toResult(episodeMapper.toLambda())
+            .executeWithRetry()
+            .toResult(episodeMapper.toLambda())
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt
index 0bbdc03e31..c8f854d56d 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt
@@ -59,50 +59,50 @@ class TraktSeasonsEpisodesDataSource @Inject constructor(
 ) : SeasonsEpisodesDataSource {
     override suspend fun getSeasonsEpisodes(showId: Long): Result<List<Pair<Season, List<Episode>>>> {
         return seasonsService.get().summary(showIdToTraktIdMapper.map(showId).toString(), Extended.FULLEPISODES)
-                .executeWithRetry()
-                .toResult(seasonMapper.toListMapper())
+            .executeWithRetry()
+            .toResult(seasonMapper.toListMapper())
     }
 
     override suspend fun getShowEpisodeWatches(showId: Long, since: OffsetDateTime?): Result<List<Pair<Episode, EpisodeWatchEntry>>> {
         val showTraktId = showIdToTraktIdMapper.map(showId)
-                ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
+            ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
 
         return usersService.get().history(UserSlug.ME, HistoryType.SHOWS, showTraktId,
-                0, 10000, Extended.NOSEASONS, since, null)
-                .executeWithRetry()
-                .toResult(pairMapperOf(episodeMapper, historyItemMapper))
+            0, 10000, Extended.NOSEASONS, since, null)
+            .executeWithRetry()
+            .toResult(pairMapperOf(episodeMapper, historyItemMapper))
     }
 
     override suspend fun getSeasonWatches(seasonId: Long, since: OffsetDateTime?): Result<List<Pair<Episode, EpisodeWatchEntry>>> {
         return usersService.get().history(UserSlug.ME, HistoryType.SEASONS, seasonIdToTraktIdMapper.map(seasonId),
-                0, 10000, Extended.NOSEASONS, since, null)
-                .executeWithRetry()
-                .toResult(pairMapperOf(episodeMapper, historyItemMapper))
+            0, 10000, Extended.NOSEASONS, since, null)
+            .executeWithRetry()
+            .toResult(pairMapperOf(episodeMapper, historyItemMapper))
     }
 
     override suspend fun getEpisodeWatches(episodeId: Long, since: OffsetDateTime?): Result<List<EpisodeWatchEntry>> {
         return usersService.get().history(UserSlug.ME, HistoryType.EPISODES, episodeIdToTraktIdMapper.map(episodeId),
-                0, 10000, Extended.NOSEASONS, since, null)
-                .executeWithRetry()
-                .toResult(historyItemMapper.toListMapper())
+            0, 10000, Extended.NOSEASONS, since, null)
+            .executeWithRetry()
+            .toResult(historyItemMapper.toListMapper())
     }
 
     override suspend fun addEpisodeWatches(watches: List<EpisodeWatchEntry>): Result<Unit> {
         val items = SyncItems()
         items.episodes = watches.map {
             SyncEpisode()
-                    .id(EpisodeIds.trakt(episodeIdToTraktIdMapper.map(it.episodeId)))!!
-                    .watchedAt(it.watchedAt.withOffsetSameInstant(ZoneOffset.UTC))
+                .id(EpisodeIds.trakt(episodeIdToTraktIdMapper.map(it.episodeId)))!!
+                .watchedAt(it.watchedAt.withOffsetSameInstant(ZoneOffset.UTC))
         }
         return syncService.get().addItemsToWatchedHistory(items)
-                .executeWithRetry()
-                .toResultUnit()
+            .executeWithRetry()
+            .toResultUnit()
     }
 
     override suspend fun removeEpisodeWatches(watches: List<EpisodeWatchEntry>): Result<Unit> {
         val items = SyncItems()
         items.ids = watches.mapNotNull { it.traktId }
         return syncService.get().deleteItemsFromWatchedHistory(items).executeWithRetry()
-                .toResultUnit()
+            .toResultUnit()
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt
index 1d089a705b..79c249f649 100644
--- a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt
@@ -69,10 +69,10 @@ class FollowedShowsRepository @Inject constructor(
         if (entry == null || entry.pendingAction == PendingAction.DELETE) {
             // If we don't have an entry, or it is marked for deletion, lets update it to be uploaded
             val newEntry = FollowedShowEntry(
-                    id = entry?.id ?: 0,
-                    showId = showId,
-                    followedAt = entry?.followedAt ?: OffsetDateTime.now(),
-                    pendingAction = PendingAction.UPLOAD
+                id = entry?.id ?: 0,
+                showId = showId,
+                followedAt = entry?.followedAt ?: OffsetDateTime.now(),
+                pendingAction = PendingAction.UPLOAD
             )
             val newEntryId = followedShowsStore.save(newEntry)
 
diff --git a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt
index 3f73288d4c..9f51e226da 100644
--- a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt
@@ -42,10 +42,10 @@ class FollowedShowsStore @Inject constructor(
     var traktListId: Int? = null
 
     private val syncer = syncerForEntity(
-            followedShowsDao,
-            { it.traktId },
-            { entity, id -> entity.copy(id = id ?: 0) },
-            logger
+        followedShowsDao,
+        { it.traktId },
+        { entity, id -> entity.copy(id = id ?: 0) },
+        logger
     )
 
     suspend fun getEntryForShowId(showId: Long): FollowedShowEntry? = followedShowsDao.entryWithShowId(showId)
@@ -98,7 +98,7 @@ class FollowedShowsStore @Inject constructor(
 
     fun observeIsShowFollowed(showId: Long): Flow<Boolean> {
         return followedShowsDao.entryCountWithShowIdNotPendingDeleteObservable(showId)
-                .map { it > 0 }
+            .map { it > 0 }
     }
 
     fun observeNextShowToWatch(): Flow<FollowedShowEntryWithShow?> {
diff --git a/data/src/main/java/app/tivi/data/repositories/followedshows/TraktFollowedShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/followedshows/TraktFollowedShowsDataSource.kt
index fa14c5b51f..5736da233c 100644
--- a/data/src/main/java/app/tivi/data/repositories/followedshows/TraktFollowedShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/followedshows/TraktFollowedShowsDataSource.kt
@@ -62,8 +62,8 @@ class TraktFollowedShowsDataSource @Inject constructor(
             }
         }
         return usersService.get().addListItems(UserSlug.ME, listId.toString(), syncItems)
-                .executeWithRetry()
-                .toResultUnit()
+            .executeWithRetry()
+            .toResultUnit()
     }
 
     override suspend fun removeShowIdsFromList(listId: Int, shows: List<TiviShow>): Result<Unit> {
@@ -78,23 +78,23 @@ class TraktFollowedShowsDataSource @Inject constructor(
             }
         }
         return usersService.get().deleteListItems(UserSlug.ME, listId.toString(), syncItems)
-                .executeWithRetry()
-                .toResultUnit()
+            .executeWithRetry()
+            .toResultUnit()
     }
 
     override suspend fun getListShows(listId: Int): Result<List<Pair<FollowedShowEntry, TiviShow>>> {
         return usersService.get().listItems(UserSlug.ME, listId.toString(), Extended.NOSEASONS)
-                .executeWithRetry()
-                .toResult(listShowsMapper)
+            .executeWithRetry()
+            .toResult(listShowsMapper)
     }
 
     override suspend fun getFollowedListId(): Result<Int> {
         val fetchResult: Result<Int>? = try {
             usersService.get().lists(UserSlug.ME)
-                    .executeWithRetry()
-                    .bodyOrThrow()
-                    .firstOrNull { it.name == LIST_NAME }
-                    ?.let { Success(it.ids.trakt) }
+                .executeWithRetry()
+                .bodyOrThrow()
+                .firstOrNull { it.name == LIST_NAME }
+                ?.let { Success(it.ids.trakt) }
         } catch (t: Throwable) {
             ErrorResult(t)
         }
@@ -105,10 +105,10 @@ class TraktFollowedShowsDataSource @Inject constructor(
 
         return try {
             usersService.get().createList(UserSlug.ME,
-                    TraktList().name(LIST_NAME).privacy(ListPrivacy.PRIVATE))
-                    .executeWithRetry()
-                    .bodyOrThrow()
-                    .let { Success(it.ids.trakt) }
+                TraktList().name(LIST_NAME).privacy(ListPrivacy.PRIVATE))
+                .executeWithRetry()
+                .bodyOrThrow()
+                .let { Success(it.ids.trakt) }
         } catch (t: Throwable) {
             ErrorResult(t)
         }
diff --git a/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt
index 7c65cb1a3f..ba5c25b0ba 100644
--- a/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt
@@ -44,7 +44,7 @@ class TraktPopularShowsDataSource @Inject constructor(
 
     override suspend fun getPopularShows(page: Int, pageSize: Int): Result<List<Pair<TiviShow, PopularShowEntry>>> {
         return showService.get().popular(page + 1, pageSize, Extended.NOSEASONS)
-                .executeWithRetry()
-                .toResult(resultsMapper)
+            .executeWithRetry()
+            .toResult(resultsMapper)
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/recommendedshows/TraktRecommendedShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/recommendedshows/TraktRecommendedShowsDataSource.kt
index 4414920875..3f4ea5da9e 100644
--- a/data/src/main/java/app/tivi/data/repositories/recommendedshows/TraktRecommendedShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/recommendedshows/TraktRecommendedShowsDataSource.kt
@@ -33,7 +33,7 @@ class TraktRecommendedShowsDataSource @Inject constructor(
     override suspend fun getRecommendedShows(page: Int, pageSize: Int): Result<List<TiviShow>> {
         // We add 1 because Trakt uses a 1-based index whereas we use a 0-based index
         return recommendationsService.get().shows(page + 1, pageSize, null)
-                .executeWithRetry()
-                .toResult(showMapper.toListMapper())
+            .executeWithRetry()
+            .toResult(showMapper.toListMapper())
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/relatedshows/TmdbRelatedShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/relatedshows/TmdbRelatedShowsDataSource.kt
index 742e82ee08..9e63956155 100644
--- a/data/src/main/java/app/tivi/data/repositories/relatedshows/TmdbRelatedShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/relatedshows/TmdbRelatedShowsDataSource.kt
@@ -45,7 +45,7 @@ class TmdbRelatedShowsDataSource @Inject constructor(
 
     override suspend fun getRelatedShows(showId: Long): Result<List<Pair<TiviShow, RelatedShowEntry>>> {
         return tmdb.tvService().similar(tmdbIdMapper.map(showId), 1, null)
-                .executeWithRetry()
-                .toResult(resultMapper)
+            .executeWithRetry()
+            .toResult(resultMapper)
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/relatedshows/TraktRelatedShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/relatedshows/TraktRelatedShowsDataSource.kt
index 811627e0c5..9e137cffca 100644
--- a/data/src/main/java/app/tivi/data/repositories/relatedshows/TraktRelatedShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/relatedshows/TraktRelatedShowsDataSource.kt
@@ -46,9 +46,9 @@ class TraktRelatedShowsDataSource @Inject constructor(
 
     override suspend fun getRelatedShows(showId: Long): Result<List<Pair<TiviShow, RelatedShowEntry>>> {
         val traktId = traktIdMapper.map(showId)
-                ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
+            ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
         return showService.get().related(traktId.toString(), 0, 10, Extended.NOSEASONS)
-                    .executeWithRetry()
-                    .toResult(resultMapper)
+            .executeWithRetry()
+            .toResult(resultMapper)
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/search/TmdbSearchDataSource.kt b/data/src/main/java/app/tivi/data/repositories/search/TmdbSearchDataSource.kt
index 6c392adb56..fca59ec803 100644
--- a/data/src/main/java/app/tivi/data/repositories/search/TmdbSearchDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/search/TmdbSearchDataSource.kt
@@ -33,8 +33,8 @@ class TmdbSearchDataSource @Inject constructor(
 ) : SearchDataSource {
     override suspend fun search(query: String): Result<List<Pair<TiviShow, List<ShowTmdbImage>>>> = try {
         tmdb.searchService().tv(query, 1, null, null)
-                .executeWithRetry()
-                .toResult(mapper.toLambda())
+            .executeWithRetry()
+            .toResult(mapper.toLambda())
     } catch (t: Throwable) {
         ErrorResult(t)
     }
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt b/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt
index b1ce21c9df..037b529b3e 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt
@@ -62,9 +62,9 @@ class ShowRepository @Inject constructor(
             val tmdbResult = tmdbDeferred.await()
 
             showStore.updateShowFromSources(
-                    showId,
-                    traktResult.get() ?: EMPTY_SHOW,
-                    tmdbResult.get() ?: EMPTY_SHOW
+                showId,
+                traktResult.get() ?: EMPTY_SHOW,
+                tmdbResult.get() ?: EMPTY_SHOW
             )
 
             if (traktResult is Success) {
@@ -77,7 +77,7 @@ class ShowRepository @Inject constructor(
     suspend fun updateShowImages(showId: Long) {
         asyncOrAwait("update_show_images_$showId") {
             val show = showStore.getShow(showId)
-                    ?: throw IllegalArgumentException("Show with ID $showId does not exist")
+                ?: throw IllegalArgumentException("Show with ID $showId does not exist")
             when (val result = tmdbShowImagesDataSource.getShowImages(show)) {
                 is Success -> {
                     showStore.saveImages(showId, result.get().map { it.copy(showId = showId) })
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt b/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt
index 3994441ce8..e4ad751dbb 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt
@@ -70,7 +70,7 @@ class ShowStore @Inject constructor(
 
                 showDao.delete(showForTmdbId)
                 return@transactionRunner saveShow(
-                        mergeShows(showForTraktId, showForTraktId, showForTmdbId)
+                    mergeShows(showForTraktId, showForTraktId, showForTmdbId)
                 )
             }
         }
@@ -106,28 +106,28 @@ class ShowStore @Inject constructor(
         trakt: TiviShow = TiviShow.EMPTY_SHOW,
         tmdb: TiviShow = TiviShow.EMPTY_SHOW
     ) = local.copy(
-            title = trakt.title ?: local.title,
-            summary = trakt.summary ?: local.summary,
-            homepage = trakt.homepage ?: local.homepage,
-            certification = trakt.certification ?: local.certification,
-            runtime = trakt.runtime ?: local.runtime,
-            country = trakt.country ?: local.country,
-            firstAired = trakt.firstAired ?: local.firstAired,
-            _genres = trakt._genres ?: local._genres,
-            status = trakt.status ?: local.status,
-            airsDay = trakt.airsDay ?: local.airsDay,
-            airsTimeZone = trakt.airsTimeZone ?: local.airsTimeZone,
-            airsTime = trakt.airsTime ?: local.airsTime,
-
-            // Trakt specific stuff
-            traktId = trakt.traktId ?: local.traktId,
-            traktRating = trakt.traktRating ?: local.traktRating,
-            traktVotes = trakt.traktVotes ?: local.traktVotes,
-            traktDataUpdate = trakt.traktDataUpdate ?: local.traktDataUpdate,
-
-            // TMDb specific stuff
-            tmdbId = tmdb.tmdbId ?: trakt.tmdbId ?: local.tmdbId,
-            network = tmdb.network ?: trakt.network ?: local.network,
-            networkLogoPath = tmdb.networkLogoPath ?: local.networkLogoPath
+        title = trakt.title ?: local.title,
+        summary = trakt.summary ?: local.summary,
+        homepage = trakt.homepage ?: local.homepage,
+        certification = trakt.certification ?: local.certification,
+        runtime = trakt.runtime ?: local.runtime,
+        country = trakt.country ?: local.country,
+        firstAired = trakt.firstAired ?: local.firstAired,
+        _genres = trakt._genres ?: local._genres,
+        status = trakt.status ?: local.status,
+        airsDay = trakt.airsDay ?: local.airsDay,
+        airsTimeZone = trakt.airsTimeZone ?: local.airsTimeZone,
+        airsTime = trakt.airsTime ?: local.airsTime,
+
+        // Trakt specific stuff
+        traktId = trakt.traktId ?: local.traktId,
+        traktRating = trakt.traktRating ?: local.traktRating,
+        traktVotes = trakt.traktVotes ?: local.traktVotes,
+        traktDataUpdate = trakt.traktDataUpdate ?: local.traktDataUpdate,
+
+        // TMDb specific stuff
+        tmdbId = tmdb.tmdbId ?: trakt.tmdbId ?: local.tmdbId,
+        network = tmdb.network ?: trakt.network ?: local.network,
+        networkLogoPath = tmdb.networkLogoPath ?: local.networkLogoPath
     )
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowDataSource.kt b/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowDataSource.kt
index 2cca88263d..335d5a604a 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowDataSource.kt
@@ -34,8 +34,8 @@ class TmdbShowDataSource @Inject constructor(
         val tmdbId = show.tmdbId
         return if (tmdbId != null) {
             tmdb.tvService().tv(tmdbId, null)
-                    .executeWithRetry()
-                    .toResult(mapper.toLambda())
+                .executeWithRetry()
+                .toResult(mapper.toLambda())
         } else {
             ErrorResult(IllegalArgumentException("TmdbId for show does not exist [$show]"))
         }
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowImagesDataSource.kt b/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowImagesDataSource.kt
index 7949e45a2b..8a8ed12382 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowImagesDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/TmdbShowImagesDataSource.kt
@@ -37,8 +37,8 @@ class TmdbShowImagesDataSource @Inject constructor(
         val tmdbId = show.tmdbId
         return if (tmdbId != null) {
             tmdb.tvService().tv(tmdbId, null, AppendToResponse(AppendToResponseItem.IMAGES))
-                    .executeWithRetry()
-                    .toResult(mapper.toLambda())
+                .executeWithRetry()
+                .toResult(mapper.toLambda())
         } else {
             ErrorResult(IllegalArgumentException("TmdbId for show does not exist [$show]"))
         }
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/TraktShowDataSource.kt b/data/src/main/java/app/tivi/data/repositories/shows/TraktShowDataSource.kt
index 95aa2a0312..7a4152aaf3 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/TraktShowDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/TraktShowDataSource.kt
@@ -42,9 +42,9 @@ class TraktShowDataSource @Inject constructor(
         if (traktId == null && show.tmdbId != null) {
             // We need to fetch the search for the trakt id
             val response = searchService.get().idLookup(IdType.TMDB, show.tmdbId.toString(),
-                    Type.SHOW, Extended.NOSEASONS, 1, 1)
-                    .execute()
-                    .toResult { it[0].show?.ids?.trakt }
+                Type.SHOW, Extended.NOSEASONS, 1, 1)
+                .execute()
+                .toResult { it[0].show?.ids?.trakt }
             if (response is Success) {
                 traktId = response.get()
             } else if (response is ErrorResult) {
@@ -54,11 +54,11 @@ class TraktShowDataSource @Inject constructor(
 
         if (traktId == null) {
             val response = searchService.get().textQueryShow(show.title, null /* years */, null /* genres */,
-                    null /* lang */, show.country /* countries */, null /* runtime */, null /* ratings */,
-                    null /* certs */, show.network /* networks */, null /* status */,
-                    Extended.NOSEASONS, 1, 1)
-                    .execute()
-                    .toResult { it[0].show?.ids?.trakt }
+                null /* lang */, show.country /* countries */, null /* runtime */, null /* ratings */,
+                null /* certs */, show.network /* networks */, null /* status */,
+                Extended.NOSEASONS, 1, 1)
+                .execute()
+                .toResult { it[0].show?.ids?.trakt }
             if (response is Success) {
                 traktId = response.get()
             } else if (response is ErrorResult) {
@@ -68,8 +68,8 @@ class TraktShowDataSource @Inject constructor(
 
         return if (traktId != null) {
             showService.get().summary(traktId.toString(), Extended.FULL)
-                    .execute()
-                    .toResult(mapper.toLambda())
+                .execute()
+                .toResult(mapper.toLambda())
         } else {
             ErrorResult(IllegalArgumentException("Trakt ID for show does not exist: [$show]"))
         }
diff --git a/data/src/main/java/app/tivi/data/repositories/traktusers/TraktUsersDataSource.kt b/data/src/main/java/app/tivi/data/repositories/traktusers/TraktUsersDataSource.kt
index 11c4c76e65..a7ec24c00b 100644
--- a/data/src/main/java/app/tivi/data/repositories/traktusers/TraktUsersDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/traktusers/TraktUsersDataSource.kt
@@ -34,7 +34,7 @@ class TraktUsersDataSource @Inject constructor(
 ) {
     suspend fun getUser(slug: String): Result<TraktUser> {
         return usersService.get().profile(UserSlug(slug), Extended.FULL)
-                    .executeWithRetry()
-                    .toResult(mapper.toLambda())
+            .executeWithRetry()
+            .toResult(mapper.toLambda())
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt
index 05a8e6f55e..d5ab6c7c92 100644
--- a/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt
@@ -44,7 +44,7 @@ class TraktTrendingShowsDataSource @Inject constructor(
     override suspend fun getTrendingShows(page: Int, pageSize: Int): Result<List<Pair<TiviShow, TrendingShowEntry>>> {
         // We add 1 because Trakt uses a 1-based index whereas we use a 0-based index
         return showService.get().trending(page + 1, pageSize, Extended.NOSEASONS)
-                .executeWithRetry()
-                .toResult(responseMapper)
+            .executeWithRetry()
+            .toResult(responseMapper)
     }
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/watchedshows/TraktWatchedShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/watchedshows/TraktWatchedShowsDataSource.kt
index 94278a94c2..b9d213653c 100644
--- a/data/src/main/java/app/tivi/data/repositories/watchedshows/TraktWatchedShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/watchedshows/TraktWatchedShowsDataSource.kt
@@ -43,7 +43,7 @@ class TraktWatchedShowsDataSource @Inject constructor(
 
     override suspend fun getWatchedShows(): Result<List<Pair<TiviShow, WatchedShowEntry>>> {
         return syncService.get().watchedShows(Extended.NOSEASONS)
-                .executeWithRetry()
-                .toResult(responseMapper)
+            .executeWithRetry()
+            .toResult(responseMapper)
     }
 }
diff --git a/data/src/main/java/app/tivi/data/syncers/ItemSyncer.kt b/data/src/main/java/app/tivi/data/syncers/ItemSyncer.kt
index 11a4d037ff..7d781249ab 100644
--- a/data/src/main/java/app/tivi/data/syncers/ItemSyncer.kt
+++ b/data/src/main/java/app/tivi/data/syncers/ItemSyncer.kt
@@ -105,13 +105,13 @@ fun <ET : TiviEntity, NT, NID> syncerForEntity(
     networkEntityToLocalEntityMapperFunc: suspend (NT, Long?) -> ET,
     logger: Logger
 ) = ItemSyncer(
-        entityDao::insert,
-        entityDao::update,
-        entityDao::delete,
-        localEntityToIdFunc,
-        networkEntityToIdFunc,
-        networkEntityToLocalEntityMapperFunc,
-        logger
+    entityDao::insert,
+    entityDao::update,
+    entityDao::delete,
+    localEntityToIdFunc,
+    networkEntityToIdFunc,
+    networkEntityToLocalEntityMapperFunc,
+    logger
 )
 
 fun <ET : TiviEntity, NID> syncerForEntity(
@@ -120,11 +120,11 @@ fun <ET : TiviEntity, NID> syncerForEntity(
     mapper: suspend (ET, Long?) -> ET,
     logger: Logger
 ) = ItemSyncer(
-        entityDao::insert,
-        entityDao::update,
-        entityDao::delete,
-        entityToIdFunc,
-        entityToIdFunc,
-        mapper,
-        logger
+    entityDao::insert,
+    entityDao::update,
+    entityDao::delete,
+    entityToIdFunc,
+    entityToIdFunc,
+    mapper,
+    logger
 )
diff --git a/domain/src/main/java/app/tivi/domain/Interactor.kt b/domain/src/main/java/app/tivi/domain/Interactor.kt
index 8bbc8d8531..59d2043a76 100644
--- a/domain/src/main/java/app/tivi/domain/Interactor.kt
+++ b/domain/src/main/java/app/tivi/domain/Interactor.kt
@@ -109,8 +109,8 @@ abstract class SubjectInteractor<P : Any, T> : ObservableInteractor<T> {
     protected abstract fun createObservable(params: P): Flow<T>
 
     override fun observe(): Flow<T> = channel.asFlow()
-            .distinctUntilChanged()
-            .flatMapLatest { createObservable(it) }
+        .distinctUntilChanged()
+        .flatMapLatest { createObservable(it) }
 }
 
 operator fun Interactor<Unit>.invoke() = invoke(Unit)
diff --git a/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonWatchedStatus.kt b/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonWatchedStatus.kt
index 05d0f73df5..22cbce07e7 100644
--- a/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonWatchedStatus.kt
+++ b/domain/src/main/java/app/tivi/domain/interactors/ChangeSeasonWatchedStatus.kt
@@ -35,9 +35,9 @@ class ChangeSeasonWatchedStatus @Inject constructor(
     override suspend fun doWork(params: Params) = when (params.action) {
         Action.WATCHED -> {
             seasonsEpisodesRepository.markSeasonWatched(
-                    params.seasonId,
-                    params.onlyAired,
-                    params.actionDate
+                params.seasonId,
+                params.onlyAired,
+                params.actionDate
             )
         }
         Action.UNWATCH -> {
diff --git a/domain/src/main/java/app/tivi/domain/interactors/UpdateFollowedShows.kt b/domain/src/main/java/app/tivi/domain/interactors/UpdateFollowedShows.kt
index 81be2654ec..4038891673 100644
--- a/domain/src/main/java/app/tivi/domain/interactors/UpdateFollowedShows.kt
+++ b/domain/src/main/java/app/tivi/domain/interactors/UpdateFollowedShows.kt
@@ -67,10 +67,10 @@ class UpdateFollowedShows @Inject constructor(
             }
 
             seasonEpisodeRepository.updateShowEpisodeWatches(
-                    it.showId,
-                    params.type,
-                    params.forceRefresh,
-                    showRepository.getShow(it.showId)?.traktDataUpdate
+                it.showId,
+                params.type,
+                params.forceRefresh,
+                showRepository.getShow(it.showId)?.traktDataUpdate
             )
         }
     }
diff --git a/domain/src/main/java/app/tivi/domain/observers/ObservePagedFollowedShows.kt b/domain/src/main/java/app/tivi/domain/observers/ObservePagedFollowedShows.kt
index c640d324d0..e9ef2fa2d0 100644
--- a/domain/src/main/java/app/tivi/domain/observers/ObservePagedFollowedShows.kt
+++ b/domain/src/main/java/app/tivi/domain/observers/ObservePagedFollowedShows.kt
@@ -35,9 +35,9 @@ class ObservePagedFollowedShows @Inject constructor(
 
     override fun createObservable(params: Parameters): Flow<PagedList<FollowedShowEntryWithShow>> {
         return FlowPagedListBuilder(
-                followedShowsRepository.observeFollowedShows(params.sort, params.filter),
-                params.pagingConfig,
-                boundaryCallback = params.boundaryCallback
+            followedShowsRepository.observeFollowedShows(params.sort, params.filter),
+            params.pagingConfig,
+            boundaryCallback = params.boundaryCallback
         ).buildFlow()
     }
 
diff --git a/domain/src/main/java/app/tivi/domain/observers/ObservePagedPopularShows.kt b/domain/src/main/java/app/tivi/domain/observers/ObservePagedPopularShows.kt
index 84ce92b26c..22c5e2ebb1 100644
--- a/domain/src/main/java/app/tivi/domain/observers/ObservePagedPopularShows.kt
+++ b/domain/src/main/java/app/tivi/domain/observers/ObservePagedPopularShows.kt
@@ -34,9 +34,9 @@ class ObservePagedPopularShows @Inject constructor(
 
     override fun createObservable(params: Params): Flow<PagedList<PopularEntryWithShow>> {
         return FlowPagedListBuilder(
-                popularShowsRepository.observeForPaging(),
-                params.pagingConfig,
-                boundaryCallback = params.boundaryCallback
+            popularShowsRepository.observeForPaging(),
+            params.pagingConfig,
+            boundaryCallback = params.boundaryCallback
         ).buildFlow()
     }
 
diff --git a/domain/src/main/java/app/tivi/domain/observers/ObservePagedRecommendedShows.kt b/domain/src/main/java/app/tivi/domain/observers/ObservePagedRecommendedShows.kt
index 481e6987ed..9faf1293ef 100644
--- a/domain/src/main/java/app/tivi/domain/observers/ObservePagedRecommendedShows.kt
+++ b/domain/src/main/java/app/tivi/domain/observers/ObservePagedRecommendedShows.kt
@@ -34,9 +34,9 @@ class ObservePagedRecommendedShows @Inject constructor(
 
     override fun createObservable(params: Params): Flow<PagedList<RecommendedEntryWithShow>> {
         return FlowPagedListBuilder(
-                recommendedShowsRepository.observeForPaging(),
-                params.pagingConfig,
-                boundaryCallback = params.boundaryCallback
+            recommendedShowsRepository.observeForPaging(),
+            params.pagingConfig,
+            boundaryCallback = params.boundaryCallback
         ).buildFlow()
     }
 
diff --git a/domain/src/main/java/app/tivi/domain/observers/ObservePagedTrendingShows.kt b/domain/src/main/java/app/tivi/domain/observers/ObservePagedTrendingShows.kt
index c7100a5d07..7d2e499e46 100644
--- a/domain/src/main/java/app/tivi/domain/observers/ObservePagedTrendingShows.kt
+++ b/domain/src/main/java/app/tivi/domain/observers/ObservePagedTrendingShows.kt
@@ -34,9 +34,9 @@ class ObservePagedTrendingShows @Inject constructor(
 
     override fun createObservable(params: Params): Flow<PagedList<TrendingEntryWithShow>> {
         return FlowPagedListBuilder(
-                trendingShowsRepository.observeForPaging(),
-                params.pagingConfig,
-                boundaryCallback = params.boundaryCallback
+            trendingShowsRepository.observeForPaging(),
+            params.pagingConfig,
+            boundaryCallback = params.boundaryCallback
         ).buildFlow()
     }
 
diff --git a/domain/src/main/java/app/tivi/domain/observers/ObservePagedWatchedShows.kt b/domain/src/main/java/app/tivi/domain/observers/ObservePagedWatchedShows.kt
index ffbf48028e..5e483a5233 100644
--- a/domain/src/main/java/app/tivi/domain/observers/ObservePagedWatchedShows.kt
+++ b/domain/src/main/java/app/tivi/domain/observers/ObservePagedWatchedShows.kt
@@ -35,9 +35,9 @@ class ObservePagedWatchedShows @Inject constructor(
 
     override fun createObservable(params: Params): Flow<PagedList<WatchedShowEntryWithShow>> {
         return FlowPagedListBuilder(
-                watchedShowsRepository.observeWatchedShowsPagedList(params.filter, params.sort),
-                params.pagingConfig,
-                boundaryCallback = params.boundaryCallback
+            watchedShowsRepository.observeWatchedShowsPagedList(params.filter, params.sort),
+            params.pagingConfig,
+            boundaryCallback = params.boundaryCallback
         ).buildFlow()
     }
 
diff --git a/tasks/src/main/java/app/tivi/tasks/ShowTasksImpl.kt b/tasks/src/main/java/app/tivi/tasks/ShowTasksImpl.kt
index 73f9af4190..edda2cf82a 100644
--- a/tasks/src/main/java/app/tivi/tasks/ShowTasksImpl.kt
+++ b/tasks/src/main/java/app/tivi/tasks/ShowTasksImpl.kt
@@ -31,48 +31,48 @@ class ShowTasksImpl @Inject constructor(
 ) : ShowTasks {
     override fun syncShowWatchedEpisodes(showId: Long) {
         val request = OneTimeWorkRequest.Builder(SyncShowWatchedProgress::class.java)
-                .addTag(SyncShowWatchedProgress.TAG)
-                .setInputData(SyncShowWatchedProgress.buildData(showId))
-                .build()
+            .addTag(SyncShowWatchedProgress.TAG)
+            .setInputData(SyncShowWatchedProgress.buildData(showId))
+            .build()
         workManager.enqueue(request)
     }
 
     override fun syncFollowedShows() {
         val request = OneTimeWorkRequest.Builder(SyncAllFollowedShows::class.java)
-                .addTag(SyncAllFollowedShows.TAG)
-                .build()
+            .addTag(SyncAllFollowedShows.TAG)
+            .build()
         workManager.enqueue(request)
     }
 
     override fun syncFollowedShowsWhenIdle() {
         val request = OneTimeWorkRequest.Builder(SyncAllFollowedShows::class.java)
-                .addTag(SyncAllFollowedShows.TAG)
-                .setConstraints(
-                        Constraints.Builder()
-                                .setRequiresDeviceIdle(true)
-                                .build()
-                )
-                .build()
+            .addTag(SyncAllFollowedShows.TAG)
+            .setConstraints(
+                Constraints.Builder()
+                    .setRequiresDeviceIdle(true)
+                    .build()
+            )
+            .build()
         workManager.enqueue(request)
     }
 
     override fun setupNightSyncs() {
         val request = PeriodicWorkRequest.Builder(
-                SyncAllFollowedShows::class.java,
-                24, TimeUnit.HOURS,
-                12, TimeUnit.HOURS
+            SyncAllFollowedShows::class.java,
+            24, TimeUnit.HOURS,
+            12, TimeUnit.HOURS
         ).setConstraints(
-                Constraints.Builder()
-                        .setRequiredNetworkType(NetworkType.CONNECTED)
-                        .setRequiresBatteryNotLow(true)
-                        .setRequiresDeviceIdle(true)
-                        .build()
+            Constraints.Builder()
+                .setRequiredNetworkType(NetworkType.CONNECTED)
+                .setRequiresBatteryNotLow(true)
+                .setRequiresDeviceIdle(true)
+                .build()
         ).build()
 
         workManager.enqueueUniquePeriodicWork(
-                SyncAllFollowedShows.NIGHTLY_SYNC_TAG,
-                ExistingPeriodicWorkPolicy.REPLACE,
-                request
+            SyncAllFollowedShows.NIGHTLY_SYNC_TAG,
+            ExistingPeriodicWorkPolicy.REPLACE,
+            request
         )
     }
 }
diff --git a/tasks/src/main/java/app/tivi/tasks/SyncShowWatchedProgress.kt b/tasks/src/main/java/app/tivi/tasks/SyncShowWatchedProgress.kt
index 376cfab824..b996bc1b59 100644
--- a/tasks/src/main/java/app/tivi/tasks/SyncShowWatchedProgress.kt
+++ b/tasks/src/main/java/app/tivi/tasks/SyncShowWatchedProgress.kt
@@ -37,8 +37,8 @@ class SyncShowWatchedProgress @AssistedInject constructor(
         private const val PARAM_SHOW_ID = "show-id"
 
         fun buildData(showId: Long) = Data.Builder()
-                .putLong(PARAM_SHOW_ID, showId)
-                .build()
+            .putLong(PARAM_SHOW_ID, showId)
+            .build()
     }
 
     override suspend fun doWork(): Result {
diff --git a/tasks/src/main/java/app/tivi/tasks/inject/TasksModule.kt b/tasks/src/main/java/app/tivi/tasks/inject/TasksModule.kt
index 5973be2ee7..031c36a499 100644
--- a/tasks/src/main/java/app/tivi/tasks/inject/TasksModule.kt
+++ b/tasks/src/main/java/app/tivi/tasks/inject/TasksModule.kt
@@ -32,7 +32,7 @@ class TasksModule {
     @Provides
     fun provideWorkConfiguration(workerFactory: TiviWorkerFactory): Configuration {
         return Configuration.Builder()
-                .setWorkerFactory(workerFactory)
-                .build()
+            .setWorkerFactory(workerFactory)
+            .build()
     }
 }
diff --git a/tasks/src/main/java/app/tivi/tasks/inject/TiviWorkerFactory.kt b/tasks/src/main/java/app/tivi/tasks/inject/TiviWorkerFactory.kt
index 2f2eb0db25..09ee27b889 100644
--- a/tasks/src/main/java/app/tivi/tasks/inject/TiviWorkerFactory.kt
+++ b/tasks/src/main/java/app/tivi/tasks/inject/TiviWorkerFactory.kt
@@ -34,7 +34,7 @@ class TiviWorkerFactory @Inject constructor(
         val workerClass = Class.forName(workerClassName)
         val foundEntry = creators.entries.find { workerClass.isAssignableFrom(it.key) }
         val factory = foundEntry?.value
-                ?: throw IllegalArgumentException("unknown worker class name: $workerClassName")
+            ?: throw IllegalArgumentException("unknown worker class name: $workerClassName")
         return factory.get().create(context, workerParameters)
     }
 }
diff --git a/tmdb/src/main/java/app/tivi/tmdb/TmdbImageSizes.kt b/tmdb/src/main/java/app/tivi/tmdb/TmdbImageSizes.kt
index 286a9601ca..38e34c9923 100644
--- a/tmdb/src/main/java/app/tivi/tmdb/TmdbImageSizes.kt
+++ b/tmdb/src/main/java/app/tivi/tmdb/TmdbImageSizes.kt
@@ -21,29 +21,29 @@ object TmdbImageSizes {
     const val baseImageUrl = "https://image.tmdb.org/t/p/"
 
     val posterSizes = listOf(
-            "w92",
-            "w154",
-            "w185",
-            "w342",
-            "w500",
-            "w780",
-            "original"
+        "w92",
+        "w154",
+        "w185",
+        "w342",
+        "w500",
+        "w780",
+        "original"
     )
 
     val backdropSizes = listOf(
-            "w300",
-            "w780",
-            "w1280",
-            "original"
+        "w300",
+        "w780",
+        "w1280",
+        "original"
     )
 
     val logoSizes = listOf(
-            "w45",
-            "w92",
-            "w154",
-            "w185",
-            "w300",
-            "w500",
-            "original"
+        "w45",
+        "w92",
+        "w154",
+        "w185",
+        "w300",
+        "w500",
+        "original"
     )
 }
diff --git a/tmdb/src/main/java/app/tivi/tmdb/TmdbManager.kt b/tmdb/src/main/java/app/tivi/tmdb/TmdbManager.kt
index 5b7f63ed55..51eecf26f7 100644
--- a/tmdb/src/main/java/app/tivi/tmdb/TmdbManager.kt
+++ b/tmdb/src/main/java/app/tivi/tmdb/TmdbManager.kt
@@ -58,10 +58,10 @@ class TmdbManager @Inject constructor(
         configuration.images?.let { images ->
             processScope.launch {
                 val newProvider = TmdbImageUrlProvider(
-                        images.secure_base_url!!,
-                        images.poster_sizes ?: emptyList(),
-                        images.backdrop_sizes ?: emptyList(),
-                        images.logo_sizes ?: emptyList()
+                    images.secure_base_url!!,
+                    images.poster_sizes ?: emptyList(),
+                    images.backdrop_sizes ?: emptyList(),
+                    images.logo_sizes ?: emptyList()
                 )
                 imageProviderSubject.send(newProvider)
             }
diff --git a/trakt-auth/src/main/java/app/tivi/trakt/TraktAuthModule.kt b/trakt-auth/src/main/java/app/tivi/trakt/TraktAuthModule.kt
index 22db28e6c6..fc0268c4bd 100644
--- a/trakt-auth/src/main/java/app/tivi/trakt/TraktAuthModule.kt
+++ b/trakt-auth/src/main/java/app/tivi/trakt/TraktAuthModule.kt
@@ -38,9 +38,9 @@ class TraktAuthModule {
     @Provides
     fun provideAuthConfig(): AuthorizationServiceConfiguration {
         return AuthorizationServiceConfiguration(
-                Uri.parse("https://trakt.tv/oauth/authorize"),
-                Uri.parse("https://trakt.tv/oauth/token"),
-                null)
+            Uri.parse("https://trakt.tv/oauth/authorize"),
+            Uri.parse("https://trakt.tv/oauth/token"),
+            null)
     }
 
     @Provides
@@ -55,10 +55,10 @@ class TraktAuthModule {
         @ApplicationId applicationId: String
     ): AuthorizationRequest {
         return AuthorizationRequest.Builder(
-                serviceConfig,
-                clientId,
-                ResponseTypeValues.CODE,
-                Uri.parse("$applicationId://${TraktConstants.URI_AUTH_CALLBACK_PATH}")
+            serviceConfig,
+            clientId,
+            ResponseTypeValues.CODE,
+            Uri.parse("$applicationId://${TraktConstants.URI_AUTH_CALLBACK_PATH}")
         ).build()
     }
 
diff --git a/trakt-auth/src/main/java/app/tivi/trakt/TraktManager.kt b/trakt-auth/src/main/java/app/tivi/trakt/TraktManager.kt
index 20dfbbce3a..f3052b85f9 100644
--- a/trakt-auth/src/main/java/app/tivi/trakt/TraktManager.kt
+++ b/trakt-auth/src/main/java/app/tivi/trakt/TraktManager.kt
@@ -94,16 +94,16 @@ class TraktManager @Inject constructor(
 
     fun startAuth(requestCode: Int, authService: AuthorizationService) {
         authService.performAuthorizationRequest(
-                requestProvider.get(),
-                appNavigator.provideAuthHandleResponseIntent(requestCode)
+            requestProvider.get(),
+            appNavigator.provideAuthHandleResponseIntent(requestCode)
         )
     }
 
     fun onAuthResponse(authService: AuthorizationService, response: AuthorizationResponse) {
         authService.performTokenRequest(
-                response.createTokenExchangeRequest(),
-                clientAuth.get(),
-                ::onTokenExchangeResponse
+            response.createTokenExchangeRequest(),
+            clientAuth.get(),
+            ::onTokenExchangeResponse
         )
     }
 
diff --git a/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt b/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt
index 1418625dd2..df6ebfe177 100644
--- a/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt
+++ b/ui-discover/src/main/java/app/tivi/home/discover/DiscoverFragment.kt
@@ -75,14 +75,14 @@ class DiscoverFragment : TiviFragmentWithBinding<FragmentDiscoverBinding>() {
         binding.followedAppBar.doOnSizeChange {
             binding.summaryRv.updatePadding(top = it.height)
             binding.summarySwipeRefresh.setProgressViewOffset(true, 0,
-                    it.height + binding.summarySwipeRefresh.progressCircleDiameter / 2)
+                it.height + binding.summarySwipeRefresh.progressCircleDiameter / 2)
             true
         }
 
         authStateMenuItemBinder = authStateToolbarMenuBinder(
-                binding.discoverToolbar,
-                R.id.home_menu_user_avatar,
-                R.id.home_menu_user_login
+            binding.discoverToolbar,
+            R.id.home_menu_user_avatar,
+            R.id.home_menu_user_login
         ) { menuItem, url -> menuItem.loadImageUrl(requireContext(), url) }
 
         binding.discoverToolbar.setOnMenuItemClickListener {
@@ -103,10 +103,10 @@ class DiscoverFragment : TiviFragmentWithBinding<FragmentDiscoverBinding>() {
                     val extras = binding.summaryRv.createSharedElementHelperForItems(state.trendingItems)
 
                     findNavController().navigate(
-                            R.id.navigation_trending,
-                            null,
-                            null,
-                            extras.toFragmentNavigatorExtras())
+                        R.id.navigation_trending,
+                        null,
+                        null,
+                        extras.toFragmentNavigatorExtras())
                 }
             }
 
@@ -115,10 +115,10 @@ class DiscoverFragment : TiviFragmentWithBinding<FragmentDiscoverBinding>() {
                     val extras = binding.summaryRv.createSharedElementHelperForItems(state.popularItems)
 
                     findNavController().navigate(
-                            R.id.navigation_popular,
-                            null,
-                            null,
-                            extras.toFragmentNavigatorExtras())
+                        R.id.navigation_popular,
+                        null,
+                        null,
+                        extras.toFragmentNavigatorExtras())
                 }
             }
 
@@ -127,10 +127,10 @@ class DiscoverFragment : TiviFragmentWithBinding<FragmentDiscoverBinding>() {
                     val extras = binding.summaryRv.createSharedElementHelperForItems(state.recommendedItems)
 
                     findNavController().navigate(
-                            R.id.navigation_recommended,
-                            null,
-                            null,
-                            extras.toFragmentNavigatorExtras())
+                        R.id.navigation_recommended,
+                        null,
+                        null,
+                        extras.toFragmentNavigatorExtras())
                 }
             }
 
@@ -139,9 +139,9 @@ class DiscoverFragment : TiviFragmentWithBinding<FragmentDiscoverBinding>() {
                     it.findViewById(R.id.show_poster)
                 }
                 findNavController().navigate(
-                        "app.tivi://show/${item.show.id}".toUri(),
-                        null,
-                        elements.toActivityNavigatorExtras(requireActivity())
+                    "app.tivi://show/${item.show.id}".toUri(),
+                    null,
+                    elements.toActivityNavigatorExtras(requireActivity())
                 )
             }
 
@@ -151,7 +151,7 @@ class DiscoverFragment : TiviFragmentWithBinding<FragmentDiscoverBinding>() {
                     val show = it.nextEpisodeWithShowToWatched.show
                     val episode = it.nextEpisodeWithShowToWatched.episode
                     findNavController().navigate(
-                            "app.tivi://show/${show.id}/episode/${episode.id}".toUri()
+                        "app.tivi://show/${show.id}/episode/${episode.id}".toUri()
                     )
                 }
             }
diff --git a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsEpoxyController.kt b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsEpoxyController.kt
index 47e6798695..0fda5d6240 100644
--- a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsEpoxyController.kt
+++ b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsEpoxyController.kt
@@ -44,7 +44,7 @@ internal class EpisodeDetailsEpoxyController @Inject constructor(
                     label(context.getString(R.string.percentage_format, ratingOutOfOneHundred))
                     icon(R.drawable.ic_details_rating)
                     contentDescription(context.getString(
-                            R.string.rating_content_description_format, ratingOutOfOneHundred))
+                        R.string.rating_content_description_format, ratingOutOfOneHundred))
                 }
             }
             episode?.firstAired?.also { firstAired ->
diff --git a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
index 8d615a154e..a7116137a2 100644
--- a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
+++ b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
@@ -31,7 +31,7 @@ import com.airbnb.mvrx.withState
 import javax.inject.Inject
 
 class EpisodeDetailsFragment : TiviFragmentWithBinding<FragmentEpisodeDetailsBinding>(),
-        EpisodeDetailsViewModel.FactoryProvider {
+    EpisodeDetailsViewModel.FactoryProvider {
     companion object {
         @JvmStatic
         fun create(id: Long): EpisodeDetailsFragment {
@@ -65,10 +65,10 @@ class EpisodeDetailsFragment : TiviFragmentWithBinding<FragmentEpisodeDetailsBin
 
         val context = requireContext()
         val swipeCallback = object : SwipeAwayCallbacks<EpisodeDetailsWatchItemBindingModel_>(
-                context.getDrawable(R.drawable.ic_eye_off_24dp)!!,
-                context.resources.getDimensionPixelSize(R.dimen.spacing_large),
-                context.getColor(R.color.swipe_away_background),
-                context.resolveThemeColor(R.attr.colorSecondary)
+            context.getDrawable(R.drawable.ic_eye_off_24dp)!!,
+            context.resources.getDimensionPixelSize(R.dimen.spacing_large),
+            context.getColor(R.color.swipe_away_background),
+            context.resolveThemeColor(R.attr.colorSecondary)
         ) {
             override fun onSwipeCompleted(
                 model: EpisodeDetailsWatchItemBindingModel_,
@@ -83,15 +83,15 @@ class EpisodeDetailsFragment : TiviFragmentWithBinding<FragmentEpisodeDetailsBin
         }
 
         EpoxyTouchHelper.initSwiping(binding.epDetailsRv)
-                .let {
-                    if (binding.epDetailsRv.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
-                        it.right()
-                    } else {
-                        it.left()
-                    }
+            .let {
+                if (binding.epDetailsRv.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+                    it.right()
+                } else {
+                    it.left()
                 }
-                .withTarget(EpisodeDetailsWatchItemBindingModel_::class.java)
-                .andCallbacks(swipeCallback)
+            }
+            .withTarget(EpisodeDetailsWatchItemBindingModel_::class.java)
+            .andCallbacks(swipeCallback)
     }
 
     override fun invalidate(binding: FragmentEpisodeDetailsBinding) = withState(viewModel) { state ->
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
index d6c4e6606b..35dc624135 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
@@ -66,7 +66,7 @@ internal class FollowedEpoxyController @Inject constructor(
                 popupMenuListener(SortPopupMenuListener(state.sort, state.availableSorts))
                 popupMenuClickListener {
                     val option = popupMenuItemIdToSortOption(it.itemId)
-                            ?: throw IllegalArgumentException("Selected sort option is null")
+                        ?: throw IllegalArgumentException("Selected sort option is null")
                     callbacks?.onSortSelected(option)
                     true
                 }
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
index bdca6809d5..b248beb6e1 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
@@ -64,9 +64,9 @@ class FollowedFragment : TiviFragmentWithBinding<FragmentFollowedBinding>() {
         postponeEnterTransitionWithTimeout()
 
         authStateMenuItemBinder = authStateToolbarMenuBinder(
-                binding.followedToolbar,
-                R.id.home_menu_user_avatar,
-                R.id.home_menu_user_login
+            binding.followedToolbar,
+            R.id.home_menu_user_avatar,
+            R.id.home_menu_user_login
         ) { menuItem, url -> menuItem.loadImageUrl(requireContext(), url) }
 
         binding.followedToolbar.setOnMenuItemClickListener {
@@ -84,7 +84,7 @@ class FollowedFragment : TiviFragmentWithBinding<FragmentFollowedBinding>() {
         binding.followedAppBar.doOnSizeChange {
             binding.followedRv.updatePadding(top = it.height)
             binding.followedSwipeRefresh.setProgressViewOffset(true, 0,
-                    it.height + binding.followedSwipeRefresh.progressCircleDiameter / 2)
+                it.height + binding.followedSwipeRefresh.progressCircleDiameter / 2)
             true
         }
 
@@ -100,9 +100,9 @@ class FollowedFragment : TiviFragmentWithBinding<FragmentFollowedBinding>() {
                 }
 
                 findNavController().navigate(
-                        "app.tivi://show/${item.show.id}".toUri(),
-                        null,
-                        extras.toActivityNavigatorExtras(requireActivity())
+                    "app.tivi://show/${item.show.id}".toUri(),
+                    null,
+                    extras.toActivityNavigatorExtras(requireActivity())
                 )
             }
 
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt
index a7ea1e172c..ee5717492a 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt
@@ -80,11 +80,11 @@ internal class FollowedViewModel @AssistedInject constructor(
     init {
         viewModelScope.launch {
             loadingState.observable
-                    .distinctUntilChanged()
-                    .debounce(2000)
-                    .execute {
-                        copy(isLoading = it() ?: false)
-                    }
+                .distinctUntilChanged()
+                .debounce(2000)
+                .execute {
+                    copy(isLoading = it() ?: false)
+                }
         }
 
         viewModelScope.launch {
@@ -116,10 +116,10 @@ internal class FollowedViewModel @AssistedInject constructor(
         // Set the available sorting options
         setState {
             copy(availableSorts = listOf(
-                    SortOption.SUPER_SORT,
-                    SortOption.LAST_WATCHED,
-                    SortOption.ALPHABETICAL,
-                    SortOption.DATE_ADDED
+                SortOption.SUPER_SORT,
+                SortOption.LAST_WATCHED,
+                SortOption.ALPHABETICAL,
+                SortOption.DATE_ADDED
             ))
         }
 
@@ -131,12 +131,12 @@ internal class FollowedViewModel @AssistedInject constructor(
 
     private fun updateDataSource(state: FollowedViewState) {
         observePagedFollowedShows(
-                ObservePagedFollowedShows.Parameters(
-                        sort = state.sort,
-                        filter = state.filter,
-                        pagingConfig = PAGING_CONFIG,
-                        boundaryCallback = boundaryCallback
-                )
+            ObservePagedFollowedShows.Parameters(
+                sort = state.sort,
+                filter = state.filter,
+                pagingConfig = PAGING_CONFIG,
+                boundaryCallback = boundaryCallback
+            )
         )
     }
 
@@ -145,8 +145,8 @@ internal class FollowedViewModel @AssistedInject constructor(
     private fun refresh(fromUser: Boolean) {
         viewModelScope.launch {
             observeTraktAuthState.observe()
-                    .first { it == TraktAuthState.LOGGED_IN }
-                    .also { refreshFollowed(fromUser) }
+                .first { it == TraktAuthState.LOGGED_IN }
+                .also { refreshFollowed(fromUser) }
         }
     }
 
@@ -173,9 +173,9 @@ internal class FollowedViewModel @AssistedInject constructor(
 
     fun unfollowSelectedShows() {
         changeShowFollowStatus(
-                ChangeShowFollowStatus.Params(
-                        showSelection.getSelectedShowIds(),
-                        ChangeShowFollowStatus.Action.UNFOLLOW)
+            ChangeShowFollowStatus.Params(
+                showSelection.getSelectedShowIds(),
+                ChangeShowFollowStatus.Action.UNFOLLOW)
         )
         showSelection.clearSelection()
     }
@@ -199,10 +199,10 @@ internal class FollowedViewModel @AssistedInject constructor(
 
     companion object : MvRxViewModelFactory<FollowedViewModel, FollowedViewState> {
         private val PAGING_CONFIG = PagedList.Config.Builder()
-                .setPageSize(60)
-                .setPrefetchDistance(20)
-                .setEnablePlaceholders(false)
-                .build()
+            .setPageSize(60)
+            .setPrefetchDistance(20)
+            .setEnablePlaceholders(false)
+            .build()
 
         override fun create(viewModelContext: ViewModelContext, state: FollowedViewState): FollowedViewModel? {
             val fragment: FollowedFragment = (viewModelContext as FragmentViewModelContext).fragment()
diff --git a/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt b/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt
index 8dfb189a32..e64fa5f6c4 100644
--- a/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt
+++ b/ui-popular/src/main/java/app/tivi/home/popular/PopularShowsFragment.kt
@@ -54,9 +54,9 @@ class PopularShowsFragment : EntryGridFragment<PopularEntryWithShow, PopularShow
         }
 
         findNavController().navigate(
-                "app.tivi://show/${item.show.id}".toUri(),
-                null,
-                sharedElements.toActivityNavigatorExtras(requireActivity())
+            "app.tivi://show/${item.show.id}".toUri(),
+            null,
+            sharedElements.toActivityNavigatorExtras(requireActivity())
         )
     }
 
@@ -64,20 +64,20 @@ class PopularShowsFragment : EntryGridFragment<PopularEntryWithShow, PopularShow
         return object : EntryGridEpoxyController<PopularEntryWithShow>() {
             override fun buildItemModel(item: PopularEntryWithShow): EpoxyModel<*> {
                 return PosterGridItemBindingModel_()
-                        .id(item.generateStableId())
-                        .posterImage(item.images.findHighestRatedPoster())
-                        .tiviShow(item.show)
-                        .transitionName(item.show.homepage)
-                        .selected(item.show.id in state.selectedShowIds)
-                        .clickListener(View.OnClickListener {
-                            if (viewModel.onItemClick(item.show)) {
-                                return@OnClickListener
-                            }
-                            onItemClicked(item)
-                        })
-                        .longClickListener(View.OnLongClickListener {
-                            viewModel.onItemLongClick(item.show)
-                        })
+                    .id(item.generateStableId())
+                    .posterImage(item.images.findHighestRatedPoster())
+                    .tiviShow(item.show)
+                    .transitionName(item.show.homepage)
+                    .selected(item.show.id in state.selectedShowIds)
+                    .clickListener(View.OnClickListener {
+                        if (viewModel.onItemClick(item.show)) {
+                            return@OnClickListener
+                        }
+                        onItemClicked(item)
+                    })
+                    .longClickListener(View.OnLongClickListener {
+                        viewModel.onItemLongClick(item.show)
+                    })
             }
         }
     }
diff --git a/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt b/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt
index 837e043ced..f7600808bb 100644
--- a/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt
+++ b/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsFragment.kt
@@ -51,20 +51,20 @@ class RecommendedShowsFragment : EntryGridFragment<RecommendedEntryWithShow, Rec
         return object : EntryGridEpoxyController<RecommendedEntryWithShow>() {
             override fun buildItemModel(item: RecommendedEntryWithShow): EpoxyModel<*> {
                 return PosterGridItemBindingModel_()
-                        .id(item.generateStableId())
-                        .posterImage(item.images.findHighestRatedPoster())
-                        .tiviShow(item.show)
-                        .transitionName(item.show.homepage)
-                        .selected(item.show.id in state.selectedShowIds)
-                        .clickListener(View.OnClickListener {
-                            if (viewModel.onItemClick(item.show)) {
-                                return@OnClickListener
-                            }
-                            onItemClicked(item)
-                        })
-                        .longClickListener(View.OnLongClickListener {
-                            viewModel.onItemLongClick(item.show)
-                        })
+                    .id(item.generateStableId())
+                    .posterImage(item.images.findHighestRatedPoster())
+                    .tiviShow(item.show)
+                    .transitionName(item.show.homepage)
+                    .selected(item.show.id in state.selectedShowIds)
+                    .clickListener(View.OnClickListener {
+                        if (viewModel.onItemClick(item.show)) {
+                            return@OnClickListener
+                        }
+                        onItemClicked(item)
+                    })
+                    .longClickListener(View.OnLongClickListener {
+                        viewModel.onItemLongClick(item.show)
+                    })
             }
         }
     }
@@ -76,9 +76,9 @@ class RecommendedShowsFragment : EntryGridFragment<RecommendedEntryWithShow, Rec
         }
 
         findNavController().navigate(
-                "app.tivi://show/${item.show.id}".toUri(),
-                null,
-                sharedElements.toActivityNavigatorExtras(requireActivity())
+            "app.tivi://show/${item.show.id}".toUri(),
+            null,
+            sharedElements.toActivityNavigatorExtras(requireActivity())
         )
     }
 
diff --git a/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt b/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt
index 8d5bb3e8f4..2193cd79ef 100644
--- a/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt
+++ b/ui-search/src/main/java/app/tivi/home/search/SearchFragment.kt
@@ -89,9 +89,9 @@ internal class SearchFragment : TiviFragmentWithBinding<FragmentSearchBinding>()
                     it.findViewById(R.id.show_poster)
                 }
                 findNavController().navigate(
-                        "app.tivi://show/${show.id}".toUri(),
-                        null,
-                        extras.toActivityNavigatorExtras(requireActivity()))
+                    "app.tivi://show/${show.id}".toUri(),
+                    null,
+                    extras.toActivityNavigatorExtras(requireActivity()))
             }
         }
     }
diff --git a/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt b/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt
index 83122df8de..79b7a0d91a 100644
--- a/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt
+++ b/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt
@@ -45,15 +45,15 @@ internal class SearchViewModel @AssistedInject constructor(
     init {
         viewModelScope.launch {
             searchQuery.asFlow()
-                    .debounce(300)
-                    .collectLatest { query ->
-                        loadingState.addLoader()
-                        val job = async(searchShows.dispatcher) {
-                            searchShows(SearchShows.Params(query))
-                        }
-                        job.invokeOnCompletion { loadingState.removeLoader() }
-                        job.await()
+                .debounce(300)
+                .collectLatest { query ->
+                    loadingState.addLoader()
+                    val job = async(searchShows.dispatcher) {
+                        searchShows(SearchShows.Params(query))
                     }
+                    job.invokeOnCompletion { loadingState.removeLoader() }
+                    job.await()
+                }
         }
 
         viewModelScope.launch {
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsEpoxyController.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsEpoxyController.kt
index fde6643f63..fca06caeef 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsEpoxyController.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsEpoxyController.kt
@@ -137,7 +137,7 @@ internal class ShowDetailsEpoxyController @Inject constructor(
             }
         }
         if (show.airsTime != null && show.airsDay != null && show.airsTimeZone != null &&
-                (show.status == null || show.status == ShowStatus.RETURNING)) {
+            (show.status == null || show.status == ShowStatus.RETURNING)) {
             badges += DetailsInfoAirsBindingModel_().apply {
                 id("airs")
                 tiviShow(show)
@@ -146,7 +146,7 @@ internal class ShowDetailsEpoxyController @Inject constructor(
         }
         if (badges.isNotEmpty()) {
             EpoxyModelGroup(R.layout.layout_show_details_info_holder, badges)
-                    .addTo(this)
+                .addTo(this)
         }
 
         vertSpacerSmall {
@@ -200,10 +200,10 @@ internal class ShowDetailsEpoxyController @Inject constructor(
                     withModelsFrom(related) { relatedEntry ->
                         val relatedShow = relatedEntry.show
                         DetailsRelatedItemBindingModel_()
-                                .id("related_${relatedShow.id}")
-                                .tiviShow(relatedShow)
-                                .posterImage(relatedEntry.images.findHighestRatedPoster())
-                                .clickListener { view -> callbacks?.onRelatedShowClicked(relatedShow, view) }
+                            .id("related_${relatedShow.id}")
+                            .tiviShow(relatedShow)
+                            .posterImage(relatedEntry.images.findHighestRatedPoster())
+                            .clickListener { view -> callbacks?.onRelatedShowClicked(relatedShow, view) }
                     }
                 }
             }
@@ -314,7 +314,7 @@ internal class ShowDetailsEpoxyController @Inject constructor(
                     }
                     R.id.season_mark_watched_aired -> {
                         item.isVisible = season.numberWatched < season.numberAired &&
-                                season.numberAired < season.numberEpisodes
+                            season.numberAired < season.numberEpisodes
                     }
                 }
             }
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
index 734c42e4cc..17c416de42 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
@@ -100,9 +100,9 @@ class ShowDetailsFragment : TiviFragmentWithBinding<FragmentShowDetailsBinding>(
         }
 
         viewModel.selectSubscribe(
-                viewLifecycleOwner,
-                ShowDetailsViewState::focusedSeason,
-                deliveryMode = uniqueOnly()
+            viewLifecycleOwner,
+            ShowDetailsViewState::focusedSeason,
+            deliveryMode = uniqueOnly()
         ) { focusedSeason ->
             if (focusedSeason != null) {
                 viewLifecycleOwner.lifecycleScope.launch {
@@ -115,9 +115,9 @@ class ShowDetailsFragment : TiviFragmentWithBinding<FragmentShowDetailsBinding>(
         }
 
         viewModel.selectSubscribe(
-                viewLifecycleOwner,
-                ShowDetailsViewState::openEpisodeUiEffect,
-                deliveryMode = uniqueOnly()
+            viewLifecycleOwner,
+            ShowDetailsViewState::openEpisodeUiEffect,
+            deliveryMode = uniqueOnly()
         ) { expandedEpisode ->
             if (expandedEpisode is ExecutableOpenEpisodeUiEffect) {
                 // We can add the fragment to the pane now while waiting for any animations/
@@ -152,10 +152,10 @@ class ShowDetailsFragment : TiviFragmentWithBinding<FragmentShowDetailsBinding>(
         controller.callbacks = object : ShowDetailsEpoxyController.Callbacks {
             override fun onRelatedShowClicked(show: TiviShow, itemView: View) {
                 findNavController().navigate(
-                        "app.tivi://show/${show.id}".toUri(),
-                        null,
-                        sharedElementHelperOf(itemView to "poster")
-                                .toActivityNavigatorExtras(requireActivity()))
+                    "app.tivi://show/${show.id}".toUri(),
+                    null,
+                    sharedElementHelperOf(itemView to "poster")
+                        .toActivityNavigatorExtras(requireActivity()))
             }
 
             override fun onEpisodeClicked(episode: Episode, itemView: View) {
@@ -197,8 +197,8 @@ class ShowDetailsFragment : TiviFragmentWithBinding<FragmentShowDetailsBinding>(
             setHasFixedSize(true)
 
             tintPainter = TintPainter.completeList(
-                    context.resolveThemeColor(R.attr.colorSurface),
-                    opacity = 0.7f
+                context.resolveThemeColor(R.attr.colorSurface),
+                opacity = 0.7f
             )
             expandablePage = binding.detailsExpandedPane
         }
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt
index 6dc331d53d..7f3efdfdca 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragmentViewModel.kt
@@ -172,7 +172,7 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
             if (episode != null) {
                 setState {
                     copy(expandedSeasonIds = expandedSeasonIds + episode.seasonId,
-                            openEpisodeUiEffect = ExecutableOpenEpisodeUiEffect(action.episodeId, episode.seasonId))
+                        openEpisodeUiEffect = ExecutableOpenEpisodeUiEffect(action.episodeId, episode.seasonId))
                 }
             }
         }
@@ -194,7 +194,7 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
         if (action.expanded) {
             setState {
                 copy(focusedSeason = FocusSeasonUiEffect(action.seasonId),
-                        expandedSeasonIds = expandedSeasonIds + action.seasonId)
+                    expandedSeasonIds = expandedSeasonIds + action.seasonId)
             }
         } else {
             setState {
@@ -209,18 +209,18 @@ internal class ShowDetailsFragmentViewModel @AssistedInject constructor(
 
     private fun onChangeSeasonFollowState(action: ChangeSeasonFollowedAction) {
         changeSeasonFollowStatus(ChangeSeasonFollowStatus.Params(
-                action.seasonId,
-                when {
-                    action.followed -> ChangeSeasonFollowStatus.Action.FOLLOW
-                    else -> ChangeSeasonFollowStatus.Action.IGNORE
-                }
+            action.seasonId,
+            when {
+                action.followed -> ChangeSeasonFollowStatus.Action.FOLLOW
+                else -> ChangeSeasonFollowStatus.Action.IGNORE
+            }
         ))
     }
 
     private fun onUnfollowPreviousSeasonsFollowState(action: UnfollowPreviousSeasonsFollowedAction) {
         changeSeasonFollowStatus(
-                ChangeSeasonFollowStatus.Params(action.seasonId,
-                        ChangeSeasonFollowStatus.Action.IGNORE_PREVIOUS)
+            ChangeSeasonFollowStatus.Params(action.seasonId,
+                ChangeSeasonFollowStatus.Action.IGNORE_PREVIOUS)
         )
     }
 
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsTextCreator.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsTextCreator.kt
index 223f34ad87..c7cb11cb6e 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsTextCreator.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsTextCreator.kt
@@ -68,8 +68,8 @@ internal class ShowDetailsTextCreator @Inject constructor(
             if (nextToAir != null) {
                 text.append(". ")
                 text.append(context.getString(
-                        R.string.next_prefix,
-                        tiviDateFormatter.formatShortRelativeTime(nextToAir.firstAired)
+                    R.string.next_prefix,
+                    tiviDateFormatter.formatShortRelativeTime(nextToAir.firstAired)
                 ))
             }
         }
@@ -120,7 +120,7 @@ internal class ShowDetailsTextCreator @Inject constructor(
     fun followedShowEpisodeWatchStatus(stats: FollowedShowsWatchStats?): CharSequence {
         return if (stats != null && stats.watchedEpisodeCount < stats.episodeCount) {
             context.getString(R.string.followed_watch_stats_to_watch,
-                    stats.episodeCount - stats.watchedEpisodeCount).parseAsHtml()
+                stats.episodeCount - stats.watchedEpisodeCount).parseAsHtml()
         } else if (stats != null && stats.watchedEpisodeCount > 0) {
             context.getString(R.string.followed_watch_stats_complete)
         } else {
@@ -139,15 +139,15 @@ internal class ShowDetailsTextCreator @Inject constructor(
         }
 
         val local = ZonedDateTime.now()
-                .withZoneSameLocal(airTz)
-                .with(show.airsDay)
-                .with(airTime)
-                .withZoneSameInstant(ZoneId.systemDefault())
+            .withZoneSameLocal(airTz)
+            .with(show.airsDay)
+            .with(airTime)
+            .withZoneSameInstant(ZoneId.systemDefault())
 
         return context.getString(
-                R.string.airs_text,
-                local.dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.getDefault()),
-                tiviDateFormatter.formatShortTime(local.toLocalTime())
+            R.string.airs_text,
+            local.dayOfWeek.getDisplayName(TextStyle.SHORT, Locale.getDefault()),
+            tiviDateFormatter.formatShortTime(local.toLocalTime())
         )
     }
 
diff --git a/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt b/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt
index 26f5b5a516..b59ea20aab 100644
--- a/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt
+++ b/ui-trending/src/main/java/app/tivi/home/trending/TrendingShowsFragment.kt
@@ -51,20 +51,20 @@ class TrendingShowsFragment : EntryGridFragment<TrendingEntryWithShow, TrendingS
         return object : EntryGridEpoxyController<TrendingEntryWithShow>() {
             override fun buildItemModel(item: TrendingEntryWithShow): EpoxyModel<*> {
                 return PosterGridItemBindingModel_()
-                        .id(item.generateStableId())
-                        .posterImage(item.images.findHighestRatedPoster())
-                        .tiviShow(item.show)
-                        .transitionName(item.show.homepage)
-                        .selected(item.show.id in state.selectedShowIds)
-                        .clickListener(View.OnClickListener {
-                            if (viewModel.onItemClick(item.show)) {
-                                return@OnClickListener
-                            }
-                            onItemClicked(item)
-                        })
-                        .longClickListener(View.OnLongClickListener {
-                            viewModel.onItemLongClick(item.show)
-                        })
+                    .id(item.generateStableId())
+                    .posterImage(item.images.findHighestRatedPoster())
+                    .tiviShow(item.show)
+                    .transitionName(item.show.homepage)
+                    .selected(item.show.id in state.selectedShowIds)
+                    .clickListener(View.OnClickListener {
+                        if (viewModel.onItemClick(item.show)) {
+                            return@OnClickListener
+                        }
+                        onItemClicked(item)
+                    })
+                    .longClickListener(View.OnLongClickListener {
+                        viewModel.onItemLongClick(item.show)
+                    })
             }
         }
     }
@@ -76,9 +76,9 @@ class TrendingShowsFragment : EntryGridFragment<TrendingEntryWithShow, TrendingS
         }
 
         findNavController().navigate(
-                "app.tivi://show/${item.show.id}".toUri(),
-                null,
-                sharedElements.toActivityNavigatorExtras(requireActivity())
+            "app.tivi://show/${item.show.id}".toUri(),
+            null,
+            sharedElements.toActivityNavigatorExtras(requireActivity())
         )
     }
 
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
index 31c855508b..c6f6799749 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
@@ -69,7 +69,7 @@ internal class WatchedEpoxyController @Inject constructor(
                 popupMenuListener(SortPopupMenuListener(state.sort, state.availableSorts))
                 popupMenuClickListener {
                     val option = popupMenuItemIdToSortOption(it.itemId)
-                            ?: throw IllegalArgumentException("Selected sort option is null")
+                        ?: throw IllegalArgumentException("Selected sort option is null")
                     callbacks?.onSortSelected(option)
                     true
                 }
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
index 5db798d84f..4b4ac2ba6f 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
@@ -64,9 +64,9 @@ class WatchedFragment : TiviFragmentWithBinding<FragmentWatchedBinding>() {
         postponeEnterTransitionWithTimeout()
 
         authStateMenuItemBinder = authStateToolbarMenuBinder(
-                binding.watchedToolbar,
-                R.id.home_menu_user_avatar,
-                R.id.home_menu_user_login
+            binding.watchedToolbar,
+            R.id.home_menu_user_avatar,
+            R.id.home_menu_user_login
         ) { menuItem, url -> menuItem.loadImageUrl(requireContext(), url) }
 
         binding.watchedToolbar.setOnMenuItemClickListener {
@@ -87,7 +87,7 @@ class WatchedFragment : TiviFragmentWithBinding<FragmentWatchedBinding>() {
         binding.watchedAppBar.doOnSizeChange {
             binding.watchedRv.updatePadding(top = it.height)
             binding.watchedSwipeRefresh.setProgressViewOffset(true, 0,
-                    it.height + binding.watchedSwipeRefresh.progressCircleDiameter / 2)
+                it.height + binding.watchedSwipeRefresh.progressCircleDiameter / 2)
             true
         }
 
@@ -103,9 +103,9 @@ class WatchedFragment : TiviFragmentWithBinding<FragmentWatchedBinding>() {
                 }
 
                 findNavController().navigate(
-                        "app.tivi://show/${item.show.id}".toUri(),
-                        null,
-                        extras.toActivityNavigatorExtras(requireActivity())
+                    "app.tivi://show/${item.show.id}".toUri(),
+                    null,
+                    extras.toActivityNavigatorExtras(requireActivity())
                 )
             }
 
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt
index c439e98546..4add4e0276 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt
@@ -79,9 +79,9 @@ internal class WatchedViewModel @AssistedInject constructor(
     init {
         viewModelScope.launch {
             loadingState.observable
-                    .distinctUntilChanged()
-                    .debounce(2000)
-                    .execute { copy(isLoading = it() ?: false) }
+                .distinctUntilChanged()
+                .debounce(2000)
+                .execute { copy(isLoading = it() ?: false) }
         }
 
         viewModelScope.launch {
@@ -125,12 +125,12 @@ internal class WatchedViewModel @AssistedInject constructor(
 
     private fun updateDataSource(state: WatchedViewState) {
         observePagedWatchedShows(
-                ObservePagedWatchedShows.Params(
-                        sort = state.sort,
-                        filter = state.filter,
-                        pagingConfig = PAGING_CONFIG,
-                        boundaryCallback = boundaryCallback
-                )
+            ObservePagedWatchedShows.Params(
+                sort = state.sort,
+                filter = state.filter,
+                pagingConfig = PAGING_CONFIG,
+                boundaryCallback = boundaryCallback
+            )
         )
     }
 
@@ -139,8 +139,8 @@ internal class WatchedViewModel @AssistedInject constructor(
     private fun refresh(fromUser: Boolean) {
         viewModelScope.launch {
             observeTraktAuthState.observe()
-                    .first { it == TraktAuthState.LOGGED_IN }
-                    .also { refreshWatched(fromUser) }
+                .first { it == TraktAuthState.LOGGED_IN }
+                .also { refreshWatched(fromUser) }
         }
     }
 
@@ -170,19 +170,19 @@ internal class WatchedViewModel @AssistedInject constructor(
 
     fun followSelectedShows() {
         changeShowFollowStatus(
-                ChangeShowFollowStatus.Params(
-                        showSelection.getSelectedShowIds(),
-                        ChangeShowFollowStatus.Action.FOLLOW,
-                        deferDataFetch = true)
+            ChangeShowFollowStatus.Params(
+                showSelection.getSelectedShowIds(),
+                ChangeShowFollowStatus.Action.FOLLOW,
+                deferDataFetch = true)
         )
         showSelection.clearSelection()
     }
 
     fun unfollowSelectedShows() {
         changeShowFollowStatus(
-                ChangeShowFollowStatus.Params(
-                        showSelection.getSelectedShowIds(),
-                        ChangeShowFollowStatus.Action.UNFOLLOW)
+            ChangeShowFollowStatus.Params(
+                showSelection.getSelectedShowIds(),
+                ChangeShowFollowStatus.Action.UNFOLLOW)
         )
         showSelection.clearSelection()
     }
@@ -202,10 +202,10 @@ internal class WatchedViewModel @AssistedInject constructor(
 
     companion object : MvRxViewModelFactory<WatchedViewModel, WatchedViewState> {
         private val PAGING_CONFIG = PagedList.Config.Builder()
-                .setPageSize(60)
-                .setPrefetchDistance(20)
-                .setEnablePlaceholders(false)
-                .build()
+            .setPageSize(60)
+            .setPrefetchDistance(20)
+            .setEnablePlaceholders(false)
+            .build()
 
         override fun create(viewModelContext: ViewModelContext, state: WatchedViewState): WatchedViewModel? {
             val fragment: WatchedFragment = (viewModelContext as FragmentViewModelContext).fragment()

From 1a50ed32a4a65c77945adb5915dec28bc8cd926d Mon Sep 17 00:00:00 2001
From: Chris Banes <chris@banes.me>
Date: Tue, 17 Dec 2019 12:50:27 +1100
Subject: [PATCH 2/2] Update function param multi-line code style

---
 .idea/codeStyles/Project.xml                  |  4 +++-
 .../app/tivi/home/HomeActivityViewModel.kt    |  5 ++++-
 .../app/tivi/extensions/LiveDataExtensions.kt |  5 ++++-
 .../src/main/java/app/tivi/util/Event.kt      |  5 ++++-
 .../java/app/tivi/TiviFragmentWithBinding.kt  |  6 +++++-
 .../tivi/databinding/TiviBindingAdapters.kt   |  6 +++++-
 .../epoxy/StickyHeaderScrollListener.kt       |  6 +++++-
 .../app/tivi/common/epoxy/spanOverrides.kt    |  6 +++++-
 .../tivi/extensions/RecyclerViewExtensions.kt |  5 ++++-
 .../src/main/java/app/tivi/ui/ScrimUtil.kt    |  6 +++++-
 .../app/tivi/ui/StatusBarHeightBehavior.kt    | 11 ++++++++--
 .../app/tivi/ui/animations/AnimationUtils.kt  |  6 +++++-
 .../ui/transitions/GridToGridTransitioner.kt  |  6 +++++-
 .../tivi/ui/transitions/ViewChangeBounds.kt   |  6 +++++-
 .../app/tivi/ui/widget/PopupMenuButton.kt     | 12 +++++++++--
 .../app/tivi/ui/widget/TiviMotionLayout.kt    | 14 +++++++++++--
 .../ui/widget/TopLeftCutoutBackgroundView.kt  |  6 +++++-
 .../app/tivi/ui/widget/TwoThreeImageView.kt   |  5 ++++-
 .../tivi/data/daos/EpisodeWatchEntryDao.kt    |  5 ++++-
 .../java/app/tivi/data/daos/EpisodesDao.kt    | 12 +++++++++--
 .../episodes/EpisodeWatchStore.kt             | 15 ++++++++++---
 .../episodes/SeasonsEpisodesDataSource.kt     | 18 +++++++++++++---
 .../episodes/SeasonsEpisodesRepository.kt     | 10 +++++++--
 .../episodes/SeasonsEpisodesStore.kt          |  5 ++++-
 .../episodes/TmdbEpisodeDataSource.kt         |  6 +++++-
 .../episodes/TraktEpisodeDataSource.kt        |  6 +++++-
 .../TraktSeasonsEpisodesDataSource.kt         | 15 ++++++++++---
 .../followedshows/FollowedShowsRepository.kt  |  5 ++++-
 .../followedshows/FollowedShowsStore.kt       |  5 ++++-
 .../popularshows/PopularShowsDataSource.kt    |  5 ++++-
 .../popularshows/PopularShowsStore.kt         | 10 +++++++--
 .../TraktPopularShowsDataSource.kt            |  5 ++++-
 .../recommendedshows/RecommendedShowsStore.kt |  5 ++++-
 .../relatedshows/RelatedShowsStore.kt         |  5 ++++-
 .../data/repositories/shows/ShowRepository.kt |  5 ++++-
 .../tivi/data/repositories/shows/ShowStore.kt |  6 +++++-
 .../TraktTrendingShowsDataSource.kt           |  5 ++++-
 .../trendingshows/TrendingShowsDataSource.kt  |  5 ++++-
 .../trendingshows/TrendingShowsStore.kt       | 10 +++++++--
 .../watchedshows/WatchedShowsRepository.kt    |  5 ++++-
 .../watchedshows/WatchedShowsStore.kt         |  5 ++++-
 .../tivi/home/discover/DiscoverViewModel.kt   |  5 ++++-
 .../episodedetails/EpisodeDetailsFragment.kt  | 11 ++++++++--
 .../home/followed/FollowedEpoxyController.kt  | 19 ++++++++++++++---
 .../tivi/home/followed/FollowedFragment.kt    |  6 +++++-
 .../tivi/home/followed/FollowedViewModel.kt   |  5 ++++-
 .../recommended/RecommendedShowsViewModel.kt  |  5 ++++-
 .../app/tivi/home/search/SearchViewModel.kt   |  5 ++++-
 .../showdetails/details/ShowDetailsAction.kt  | 19 ++++++++++++++---
 .../details/ShowDetailsFragment.kt            |  6 +++++-
 .../details/ShowDetailsViewState.kt           |  5 ++++-
 .../home/watched/WatchedEpoxyController.kt    | 21 ++++++++++++++++---
 .../app/tivi/home/watched/WatchedFragment.kt  |  6 +++++-
 .../app/tivi/home/watched/WatchedViewModel.kt |  5 ++++-
 54 files changed, 337 insertions(+), 74 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 8c2ca30ef1..8f3b801a35 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -8,7 +8,6 @@
       </option>
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
-      <option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
     </JetCodeStyleSettings>
     <XML>
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
@@ -130,6 +129,9 @@
       <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
+      <option name="METHOD_PARAMETERS_WRAP" value="5" />
+      <option name="METHOD_PARAMETERS_LPAREN_ON_NEXT_LINE" value="true" />
+      <option name="METHOD_PARAMETERS_RPAREN_ON_NEXT_LINE" value="true" />
       <option name="FIELD_ANNOTATION_WRAP" value="1" />
       <option name="VARIABLE_ANNOTATION_WRAP" value="1" />
       <indentOptions>
diff --git a/app/src/main/java/app/tivi/home/HomeActivityViewModel.kt b/app/src/main/java/app/tivi/home/HomeActivityViewModel.kt
index 186370ba0e..75f8c310e0 100644
--- a/app/src/main/java/app/tivi/home/HomeActivityViewModel.kt
+++ b/app/src/main/java/app/tivi/home/HomeActivityViewModel.kt
@@ -80,7 +80,10 @@ class HomeActivityViewModel @AssistedInject constructor(
     }
 
     companion object : MvRxViewModelFactory<HomeActivityViewModel, HomeActivityViewState> {
-        override fun create(viewModelContext: ViewModelContext, state: HomeActivityViewState): HomeActivityViewModel? {
+        override fun create(
+            viewModelContext: ViewModelContext,
+            state: HomeActivityViewState
+        ): HomeActivityViewModel? {
             val fragment: HomeActivity = viewModelContext.activity()
             return fragment.homeNavigationViewModelFactory.create(state)
         }
diff --git a/base-android/src/main/java/app/tivi/extensions/LiveDataExtensions.kt b/base-android/src/main/java/app/tivi/extensions/LiveDataExtensions.kt
index f0176ed096..d9a82f1fca 100644
--- a/base-android/src/main/java/app/tivi/extensions/LiveDataExtensions.kt
+++ b/base-android/src/main/java/app/tivi/extensions/LiveDataExtensions.kt
@@ -27,7 +27,10 @@ inline fun <T> LiveData<T>.observeK(owner: LifecycleOwner, crossinline observer:
     this.observe(owner, Observer { observer(it) })
 }
 
-inline fun <T> LiveData<T>.observeNotNull(owner: LifecycleOwner, crossinline observer: (T) -> Unit) {
+inline fun <T> LiveData<T>.observeNotNull(
+    owner: LifecycleOwner,
+    crossinline observer: (T) -> Unit
+) {
     this.observe(owner, Observer { it?.run(observer) })
 }
 
diff --git a/base-android/src/main/java/app/tivi/util/Event.kt b/base-android/src/main/java/app/tivi/util/Event.kt
index f8ecd5facc..e5cebe7e98 100644
--- a/base-android/src/main/java/app/tivi/util/Event.kt
+++ b/base-android/src/main/java/app/tivi/util/Event.kt
@@ -59,6 +59,9 @@ class EventObserver<T>(private val onEventUnhandledContent: (T) -> Unit) : Obser
     }
 }
 
-inline fun <T> LiveData<Event<T>>.observeEvent(owner: LifecycleOwner, crossinline observer: (T) -> Unit) {
+inline fun <T> LiveData<Event<T>>.observeEvent(
+    owner: LifecycleOwner,
+    crossinline observer: (T) -> Unit
+) {
     observe(owner, EventObserver { observer(it) })
 }
diff --git a/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt b/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt
index 040dfa0b10..5438a0599e 100644
--- a/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt
+++ b/common-databinding/src/main/java/app/tivi/TiviFragmentWithBinding.kt
@@ -31,7 +31,11 @@ abstract class TiviFragmentWithBinding<V : ViewDataBinding> : TiviFragment() {
     var binding: V? = null
         private set
 
-    final override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+    final override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
         return createBinding(inflater, container, savedInstanceState)
             .also { binding = it }
             .root
diff --git a/common-databinding/src/main/java/app/tivi/databinding/TiviBindingAdapters.kt b/common-databinding/src/main/java/app/tivi/databinding/TiviBindingAdapters.kt
index 8d455c5a99..d893ebfd85 100644
--- a/common-databinding/src/main/java/app/tivi/databinding/TiviBindingAdapters.kt
+++ b/common-databinding/src/main/java/app/tivi/databinding/TiviBindingAdapters.kt
@@ -114,7 +114,11 @@ fun roundedCornerOutlineProvider(view: View, oldRadius: Float, radius: Float) {
 }
 
 @BindingAdapter("textAppearanceAttr")
-fun textAppearanceAttr(view: TextView, oldTextAppearanceStyleAttr: Int, textAppearanceStyleAttr: Int) {
+fun textAppearanceAttr(
+    view: TextView,
+    oldTextAppearanceStyleAttr: Int,
+    textAppearanceStyleAttr: Int
+) {
     if (oldTextAppearanceStyleAttr != textAppearanceStyleAttr) {
         view.setTextAppearance(view.context.resolveThemeReferenceResId(textAppearanceStyleAttr))
     }
diff --git a/common-epoxy/src/main/java/app/tivi/common/epoxy/StickyHeaderScrollListener.kt b/common-epoxy/src/main/java/app/tivi/common/epoxy/StickyHeaderScrollListener.kt
index 39fffc6018..d80ec4114d 100644
--- a/common-epoxy/src/main/java/app/tivi/common/epoxy/StickyHeaderScrollListener.kt
+++ b/common-epoxy/src/main/java/app/tivi/common/epoxy/StickyHeaderScrollListener.kt
@@ -94,7 +94,11 @@ class StickyHeaderScrollListener(
         return false
     }
 
-    private fun getChildInContact(parent: RecyclerView, contactPoint: Int, currentHeaderPos: Int): View? {
+    private fun getChildInContact(
+        parent: RecyclerView,
+        contactPoint: Int,
+        currentHeaderPos: Int
+    ): View? {
         for (i in 0 until parent.childCount) {
             var heightTolerance = 0
             val child = parent.getChildAt(i)
diff --git a/common-epoxy/src/main/java/app/tivi/common/epoxy/spanOverrides.kt b/common-epoxy/src/main/java/app/tivi/common/epoxy/spanOverrides.kt
index 099295fb46..956a60296c 100644
--- a/common-epoxy/src/main/java/app/tivi/common/epoxy/spanOverrides.kt
+++ b/common-epoxy/src/main/java/app/tivi/common/epoxy/spanOverrides.kt
@@ -23,5 +23,9 @@ object TotalSpanOverride : EpoxyModel.SpanSizeOverrideCallback {
 }
 
 object HalfSpanOverride : EpoxyModel.SpanSizeOverrideCallback {
-    override fun getSpanSize(totalSpanCount: Int, position: Int, itemCount: Int) = (totalSpanCount / 2).coerceAtLeast(1)
+    override fun getSpanSize(
+        totalSpanCount: Int,
+        position: Int,
+        itemCount: Int
+    ) = (totalSpanCount / 2).coerceAtLeast(1)
 }
diff --git a/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt b/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt
index 13949cb873..3855698f81 100644
--- a/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt
+++ b/common-ui-view/src/main/java/app/tivi/extensions/RecyclerViewExtensions.kt
@@ -23,7 +23,10 @@ import app.tivi.ui.recyclerview.TiviLinearSmoothScroller
 import kotlin.coroutines.resume
 import kotlinx.coroutines.suspendCancellableCoroutine
 
-fun <VH : RecyclerView.ViewHolder> RecyclerView.Adapter<VH>.createAndBind(parent: ViewGroup, position: Int): VH {
+fun <VH : RecyclerView.ViewHolder> RecyclerView.Adapter<VH>.createAndBind(
+    parent: ViewGroup,
+    position: Int
+): VH {
     val vh = onCreateViewHolder(parent, getItemViewType(position))
     onBindViewHolder(vh, position)
     return vh
diff --git a/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt b/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt
index 9aafc250ad..930ac03bc9 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/ScrimUtil.kt
@@ -41,7 +41,11 @@ object ScrimUtil {
      * [this post](https://plus.google.com/+RomanNurik/posts/2QvHVFWrHZf) for more
      * details.
      */
-    fun makeCubicGradientScrimDrawable(@ColorInt baseColor: Int, numStops: Int, gravity: Int): Drawable {
+    fun makeCubicGradientScrimDrawable(
+        @ColorInt baseColor: Int,
+        numStops: Int,
+        gravity: Int
+    ): Drawable {
         // Generate a cache key by hashing together the inputs, based on the method described in the Effective Java book
         var cacheKeyHash = baseColor
         cacheKeyHash = 31 * cacheKeyHash + numStops
diff --git a/common-ui-view/src/main/java/app/tivi/ui/StatusBarHeightBehavior.kt b/common-ui-view/src/main/java/app/tivi/ui/StatusBarHeightBehavior.kt
index 9387cd3d87..13ff94d27e 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/StatusBarHeightBehavior.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/StatusBarHeightBehavior.kt
@@ -22,8 +22,15 @@ import android.view.View
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.view.WindowInsetsCompat
 
-class StatusBarHeightBehavior(context: Context, attrs: AttributeSet?) : CoordinatorLayout.Behavior<View>(context, attrs) {
-    override fun onApplyWindowInsets(coordinatorLayout: CoordinatorLayout, child: View, insets: WindowInsetsCompat): WindowInsetsCompat {
+class StatusBarHeightBehavior(
+    context: Context,
+    attrs: AttributeSet?
+) : CoordinatorLayout.Behavior<View>(context, attrs) {
+    override fun onApplyWindowInsets(
+        coordinatorLayout: CoordinatorLayout,
+        child: View,
+        insets: WindowInsetsCompat
+    ): WindowInsetsCompat {
         val lp = child.layoutParams
         lp.height = insets.systemWindowInsetTop
         child.layoutParams = lp
diff --git a/common-ui-view/src/main/java/app/tivi/ui/animations/AnimationUtils.kt b/common-ui-view/src/main/java/app/tivi/ui/animations/AnimationUtils.kt
index 092bac6320..9825cf8c13 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/animations/AnimationUtils.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/animations/AnimationUtils.kt
@@ -16,4 +16,8 @@
 
 package app.tivi.ui.animations
 
-fun lerp(startValue: Float, endValue: Float, fraction: Float) = startValue + fraction * (endValue - startValue)
+fun lerp(
+    startValue: Float,
+    endValue: Float,
+    fraction: Float
+) = startValue + fraction * (endValue - startValue)
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt
index ea3cec9078..5ab3b8cd10 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/GridToGridTransitioner.kt
@@ -73,7 +73,11 @@ object GridToGridTransitioner {
      * @param fragment The fragment to setup
      * @param fadeElementIds An array of view ids which will fade rather than slide. This will typically be your toolbar
      */
-    fun setupSecondFragment(fragment: Fragment, vararg fadeElementIds: Int, onTransitionEnd: () -> Unit) {
+    fun setupSecondFragment(
+        fragment: Fragment,
+        vararg fadeElementIds: Int,
+        onTransitionEnd: () -> Unit
+    ) {
         fragment.sharedElementEnterTransition = ColumnedChangeBounds().apply {
             interpolator = FAST_OUT_SLOW_IN_INTERPOLATOR
             duration = GRID_SHARED_ELEMENT_ENTER_DURATION
diff --git a/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt b/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt
index 44d5d3d440..caca2b0fc8 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/transitions/ViewChangeBounds.kt
@@ -260,7 +260,11 @@ open class ViewChangeBounds : Transition() {
 
         val BOTTOM_RIGHT_PROPERTY: Property<PointFBounds, PointF> =
             object : Property<PointFBounds, PointF>(PointF::class.java, "bottomRight") {
-                override fun set(bounds: PointFBounds, bottomRight: PointF) = bounds.setBottomRight(bottomRight)
+                override fun set(
+                    bounds: PointFBounds,
+                    bottomRight: PointF
+                ) = bounds.setBottomRight(bottomRight)
+
                 override fun get(bounds: PointFBounds): PointF? = bounds.getBottomRight()
             }
 
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/PopupMenuButton.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/PopupMenuButton.kt
index 1a4fd67d55..ddd608b49e 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/PopupMenuButton.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/PopupMenuButton.kt
@@ -30,8 +30,16 @@ import app.tivi.common.ui.R
 
 class PopupMenuButton : AppCompatImageButton {
     constructor(context: Context) : this(context, null)
-    constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, android.R.attr.actionOverflowButtonStyle)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(
+        context: Context,
+        attrs: AttributeSet?
+    ) : this(context, attrs, android.R.attr.actionOverflowButtonStyle)
+
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int
+    ) : super(context, attrs, defStyleAttr) {
         val a = context.obtainStyledAttributes(attrs, R.styleable.PopupMenuButton)
         val menuRes = a.getResourceId(R.styleable.PopupMenuButton_menu, -1)
         if (menuRes != -1) {
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/TiviMotionLayout.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/TiviMotionLayout.kt
index 9cd9d6bb1f..9c0b5db359 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/TiviMotionLayout.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/TiviMotionLayout.kt
@@ -41,7 +41,12 @@ class TiviMotionLayout @JvmOverloads constructor(
 
     init {
         super.setTransitionListener(object : TransitionListener {
-            override fun onTransitionTrigger(motionLayout: MotionLayout, triggerId: Int, positive: Boolean, progress: Float) {
+            override fun onTransitionTrigger(
+                motionLayout: MotionLayout,
+                triggerId: Int,
+                positive: Boolean,
+                progress: Float
+            ) {
                 listeners.forEach {
                     it.onTransitionTrigger(motionLayout, triggerId, positive, progress)
                 }
@@ -53,7 +58,12 @@ class TiviMotionLayout @JvmOverloads constructor(
                 }
             }
 
-            override fun onTransitionChange(motionLayout: MotionLayout, startId: Int, endId: Int, progress: Float) {
+            override fun onTransitionChange(
+                motionLayout: MotionLayout,
+                startId: Int,
+                endId: Int,
+                progress: Float
+            ) {
                 listeners.forEach {
                     it.onTransitionChange(motionLayout, startId, endId, progress)
                 }
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt
index be467435ed..a601881adc 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/TopLeftCutoutBackgroundView.kt
@@ -31,7 +31,11 @@ class TopLeftCutoutBackgroundView : View {
 
     constructor(context: Context) : this(context, null)
     constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
-    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+    constructor(
+        context: Context,
+        attrs: AttributeSet?,
+        defStyleAttr: Int
+    ) : super(context, attrs, defStyleAttr) {
         val a = context.obtainStyledAttributes(attrs, R.styleable.TopLeftCutoutBackgroundView)
         color = a.getColor(R.styleable.TopLeftCutoutBackgroundView_backgroundColor, Color.MAGENTA)
         maxCutSize = a.getDimension(R.styleable.TopLeftCutoutBackgroundView_topLeftCutSize, 0f)
diff --git a/common-ui-view/src/main/java/app/tivi/ui/widget/TwoThreeImageView.kt b/common-ui-view/src/main/java/app/tivi/ui/widget/TwoThreeImageView.kt
index 83dc1733c8..6b09e670c9 100644
--- a/common-ui-view/src/main/java/app/tivi/ui/widget/TwoThreeImageView.kt
+++ b/common-ui-view/src/main/java/app/tivi/ui/widget/TwoThreeImageView.kt
@@ -21,7 +21,10 @@ import android.util.AttributeSet
 import android.view.View.MeasureSpec.EXACTLY
 import androidx.appcompat.widget.AppCompatImageView
 
-class TwoThreeImageView(context: Context?, attrs: AttributeSet?) : AppCompatImageView(context, attrs) {
+class TwoThreeImageView(
+    context: Context?,
+    attrs: AttributeSet?
+) : AppCompatImageView(context, attrs) {
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
         val height = MeasureSpec.makeMeasureSpec(MeasureSpec.getSize(widthMeasureSpec) * 3 / 2, EXACTLY)
         super.onMeasure(widthMeasureSpec, height)
diff --git a/data/src/main/java/app/tivi/data/daos/EpisodeWatchEntryDao.kt b/data/src/main/java/app/tivi/data/daos/EpisodeWatchEntryDao.kt
index 44f589606e..5d9f4b784f 100644
--- a/data/src/main/java/app/tivi/data/daos/EpisodeWatchEntryDao.kt
+++ b/data/src/main/java/app/tivi/data/daos/EpisodeWatchEntryDao.kt
@@ -61,7 +61,10 @@ abstract class EpisodeWatchEntryDao : EntityDao<EpisodeWatchEntry> {
         INNER JOIN shows ON s.show_id = shows.id
         WHERE shows.id = :showId AND ew.pending_action = :pendingAction
     """)
-    internal abstract suspend fun entriesForShowIdWithPendingAction(showId: Long, pendingAction: String): List<EpisodeWatchEntry>
+    internal abstract suspend fun entriesForShowIdWithPendingAction(
+        showId: Long,
+        pendingAction: String
+    ): List<EpisodeWatchEntry>
 
     @Query("""
         SELECT ew.* FROM episode_watch_entries AS ew
diff --git a/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt b/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt
index febe5a54f1..fc1b5e5751 100644
--- a/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt
+++ b/data/src/main/java/app/tivi/data/daos/EpisodesDao.kt
@@ -59,10 +59,18 @@ abstract class EpisodesDao : EntityDao<Episode> {
     abstract fun observeLatestWatchedEpisodeForShowId(showId: Long): Flow<EpisodeWithSeason?>
 
     @Query(nextEpisodeForShowIdAfter)
-    abstract fun observeNextEpisodeForShowAfter(showId: Long, seasonNumber: Int, episodeNumber: Int): Flow<EpisodeWithSeason?>
+    abstract fun observeNextEpisodeForShowAfter(
+        showId: Long,
+        seasonNumber: Int,
+        episodeNumber: Int
+    ): Flow<EpisodeWithSeason?>
 
     @Query(nextAiredEpisodeForShowIdAfter)
-    abstract fun observeNextAiredEpisodeForShowAfter(showId: Long, seasonNumber: Int, episodeNumber: Int): Flow<EpisodeWithSeason?>
+    abstract fun observeNextAiredEpisodeForShowAfter(
+        showId: Long,
+        seasonNumber: Int,
+        episodeNumber: Int
+    ): Flow<EpisodeWithSeason?>
 
     companion object {
         const val latestWatchedEpisodeForShowId = """
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt b/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt
index 9cfb976fac..510c84ba4a 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/EpisodeWatchStore.kt
@@ -65,17 +65,26 @@ class EpisodeWatchStore @Inject constructor(
         return episodeWatchEntryDao.updateEntriesToPendingAction(ids, action.value)
     }
 
-    suspend fun addNewShowWatchEntries(showId: Long, watches: List<EpisodeWatchEntry>) = transactionRunner {
+    suspend fun addNewShowWatchEntries(
+        showId: Long,
+        watches: List<EpisodeWatchEntry>
+    ) = transactionRunner {
         val currentWatches = episodeWatchEntryDao.entriesForShowIdWithNoPendingAction(showId)
         episodeWatchSyncer.sync(currentWatches, watches, removeNotMatched = false)
     }
 
-    suspend fun syncShowWatchEntries(showId: Long, watches: List<EpisodeWatchEntry>) = transactionRunner {
+    suspend fun syncShowWatchEntries(
+        showId: Long,
+        watches: List<EpisodeWatchEntry>
+    ) = transactionRunner {
         val currentWatches = episodeWatchEntryDao.entriesForShowIdWithNoPendingAction(showId)
         episodeWatchSyncer.sync(currentWatches, watches)
     }
 
-    suspend fun syncEpisodeWatchEntries(episodeId: Long, watches: List<EpisodeWatchEntry>) = transactionRunner {
+    suspend fun syncEpisodeWatchEntries(
+        episodeId: Long,
+        watches: List<EpisodeWatchEntry>
+    ) = transactionRunner {
         val currentWatches = episodeWatchEntryDao.watchesForEpisode(episodeId)
         episodeWatchSyncer.sync(currentWatches, watches)
     }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesDataSource.kt
index 7113ca209f..4b4a2798dc 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesDataSource.kt
@@ -24,9 +24,21 @@ import org.threeten.bp.OffsetDateTime
 
 interface SeasonsEpisodesDataSource {
     suspend fun getSeasonsEpisodes(showId: Long): Result<List<Pair<Season, List<Episode>>>>
-    suspend fun getShowEpisodeWatches(showId: Long, since: OffsetDateTime? = null): Result<List<Pair<Episode, EpisodeWatchEntry>>>
-    suspend fun getEpisodeWatches(episodeId: Long, since: OffsetDateTime? = null): Result<List<EpisodeWatchEntry>>
-    suspend fun getSeasonWatches(seasonId: Long, since: OffsetDateTime? = null): Result<List<Pair<Episode, EpisodeWatchEntry>>>
+    suspend fun getShowEpisodeWatches(
+        showId: Long,
+        since: OffsetDateTime? = null
+    ): Result<List<Pair<Episode, EpisodeWatchEntry>>>
+
+    suspend fun getEpisodeWatches(
+        episodeId: Long,
+        since: OffsetDateTime? = null
+    ): Result<List<EpisodeWatchEntry>>
+
+    suspend fun getSeasonWatches(
+        seasonId: Long,
+        since: OffsetDateTime? = null
+    ): Result<List<Pair<Episode, EpisodeWatchEntry>>>
+
     suspend fun addEpisodeWatches(watches: List<EpisodeWatchEntry>): Result<Unit>
     suspend fun removeEpisodeWatches(watches: List<EpisodeWatchEntry>): Result<Unit>
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt
index 6fd84a9a6b..da2dba0610 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesRepository.kt
@@ -58,7 +58,10 @@ class SeasonsEpisodesRepository @Inject constructor(
 
     fun observeNextEpisodeToWatch(showId: Long) = seasonsEpisodesStore.observeShowNextEpisodeToWatch(showId)
 
-    suspend fun needShowSeasonsUpdate(showId: Long, expiry: Instant = instantInPast(days = 7)): Boolean {
+    suspend fun needShowSeasonsUpdate(
+        showId: Long,
+        expiry: Instant = instantInPast(days = 7)
+    ): Boolean {
         return seasonsLastRequestStore.isRequestBefore(showId, expiry)
     }
 
@@ -161,7 +164,10 @@ class SeasonsEpisodesRepository @Inject constructor(
         }
     }
 
-    suspend fun needShowEpisodeWatchesSync(showId: Long, expiry: Instant = instantInPast(hours = 1)): Boolean {
+    suspend fun needShowEpisodeWatchesSync(
+        showId: Long,
+        expiry: Instant = instantInPast(hours = 1)
+    ): Boolean {
         return episodeWatchLastLastRequestStore.isRequestBefore(showId, expiry)
     }
 
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt
index b1583584ad..af7e9fec71 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/SeasonsEpisodesStore.kt
@@ -91,7 +91,10 @@ class SeasonsEpisodesStore @Inject constructor(
         seasonsDao.updateSeasonIgnoreFlag(seasonId, !followed)
     }
 
-    suspend fun updatePreviousSeasonFollowed(seasonId: Long, followed: Boolean) = transactionRunner {
+    suspend fun updatePreviousSeasonFollowed(
+        seasonId: Long,
+        followed: Boolean
+    ) = transactionRunner {
         for (id in seasonsDao.showPreviousSeasonIds(seasonId)) {
             seasonsDao.updateSeasonIgnoreFlag(id, !followed)
         }
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt
index 57521337fc..4a8dc3f119 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/TmdbEpisodeDataSource.kt
@@ -31,7 +31,11 @@ class TmdbEpisodeDataSource @Inject constructor(
     private val tmdb: Tmdb,
     private val episodeMapper: TmdbEpisodeToEpisode
 ) : EpisodeDataSource {
-    override suspend fun getEpisode(showId: Long, seasonNumber: Int, episodeNumber: Int): Result<Episode> {
+    override suspend fun getEpisode(
+        showId: Long,
+        seasonNumber: Int,
+        episodeNumber: Int
+    ): Result<Episode> {
         return tmdb.tvEpisodesService()
             .episode(tmdbIdMapper.map(showId), seasonNumber, episodeNumber, null)
             .executeWithRetry()
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt
index 80f894e8ec..98f32b6123 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/TraktEpisodeDataSource.kt
@@ -34,7 +34,11 @@ class TraktEpisodeDataSource @Inject constructor(
     private val service: Provider<Episodes>,
     private val episodeMapper: TraktEpisodeToEpisode
 ) : EpisodeDataSource {
-    override suspend fun getEpisode(showId: Long, seasonNumber: Int, episodeNumber: Int): Result<Episode> {
+    override suspend fun getEpisode(
+        showId: Long,
+        seasonNumber: Int,
+        episodeNumber: Int
+    ): Result<Episode> {
         val traktId = traktIdMapper.map(showId)
             ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
 
diff --git a/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt b/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt
index c8f854d56d..87cfbbf768 100644
--- a/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/episodes/TraktSeasonsEpisodesDataSource.kt
@@ -63,7 +63,10 @@ class TraktSeasonsEpisodesDataSource @Inject constructor(
             .toResult(seasonMapper.toListMapper())
     }
 
-    override suspend fun getShowEpisodeWatches(showId: Long, since: OffsetDateTime?): Result<List<Pair<Episode, EpisodeWatchEntry>>> {
+    override suspend fun getShowEpisodeWatches(
+        showId: Long,
+        since: OffsetDateTime?
+    ): Result<List<Pair<Episode, EpisodeWatchEntry>>> {
         val showTraktId = showIdToTraktIdMapper.map(showId)
             ?: return ErrorResult(message = "No Trakt ID for show with ID: $showId")
 
@@ -73,14 +76,20 @@ class TraktSeasonsEpisodesDataSource @Inject constructor(
             .toResult(pairMapperOf(episodeMapper, historyItemMapper))
     }
 
-    override suspend fun getSeasonWatches(seasonId: Long, since: OffsetDateTime?): Result<List<Pair<Episode, EpisodeWatchEntry>>> {
+    override suspend fun getSeasonWatches(
+        seasonId: Long,
+        since: OffsetDateTime?
+    ): Result<List<Pair<Episode, EpisodeWatchEntry>>> {
         return usersService.get().history(UserSlug.ME, HistoryType.SEASONS, seasonIdToTraktIdMapper.map(seasonId),
             0, 10000, Extended.NOSEASONS, since, null)
             .executeWithRetry()
             .toResult(pairMapperOf(episodeMapper, historyItemMapper))
     }
 
-    override suspend fun getEpisodeWatches(episodeId: Long, since: OffsetDateTime?): Result<List<EpisodeWatchEntry>> {
+    override suspend fun getEpisodeWatches(
+        episodeId: Long,
+        since: OffsetDateTime?
+    ): Result<List<EpisodeWatchEntry>> {
         return usersService.get().history(UserSlug.ME, HistoryType.EPISODES, episodeIdToTraktIdMapper.map(episodeId),
             0, 10000, Extended.NOSEASONS, since, null)
             .executeWithRetry()
diff --git a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt
index 79c249f649..4e5a432639 100644
--- a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsRepository.kt
@@ -43,7 +43,10 @@ class FollowedShowsRepository @Inject constructor(
     private val traktAuthState: Provider<TraktAuthState>,
     private val logger: Logger
 ) {
-    fun observeFollowedShows(sort: SortOption, filter: String? = null) = followedShowsStore.observeForPaging(sort, filter)
+    fun observeFollowedShows(
+        sort: SortOption,
+        filter: String? = null
+    ) = followedShowsStore.observeForPaging(sort, filter)
 
     fun observeShowViewStats(showId: Long) = followedShowsStore.observeShowViewStats(showId)
 
diff --git a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt
index 9f51e226da..ed3a51417f 100644
--- a/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/followedshows/FollowedShowsStore.kt
@@ -62,7 +62,10 @@ class FollowedShowsStore @Inject constructor(
 
     suspend fun deleteEntriesInIds(ids: List<Long>) = followedShowsDao.deleteWithIds(ids)
 
-    fun observeForPaging(sort: SortOption, filter: String?): DataSource.Factory<Int, FollowedShowEntryWithShow> {
+    fun observeForPaging(
+        sort: SortOption,
+        filter: String?
+    ): DataSource.Factory<Int, FollowedShowEntryWithShow> {
         val filtered = filter != null && filter.isNotEmpty()
         return when (sort) {
             SortOption.SUPER_SORT -> {
diff --git a/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsDataSource.kt
index 3661b64711..bfef8eda0b 100644
--- a/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsDataSource.kt
@@ -21,5 +21,8 @@ import app.tivi.data.entities.Result
 import app.tivi.data.entities.TiviShow
 
 interface PopularShowsDataSource {
-    suspend fun getPopularShows(page: Int, pageSize: Int): Result<List<Pair<TiviShow, PopularShowEntry>>>
+    suspend fun getPopularShows(
+        page: Int,
+        pageSize: Int
+    ): Result<List<Pair<TiviShow, PopularShowEntry>>>
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsStore.kt
index 2598689e77..3516580357 100644
--- a/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/popularshows/PopularShowsStore.kt
@@ -27,13 +27,19 @@ class PopularShowsStore @Inject constructor(
     private val transactionRunner: DatabaseTransactionRunner,
     private val popularShowDao: PopularDao
 ) {
-    fun observeForObservable(count: Int, offset: Int) = popularShowDao.entriesObservable(count, offset)
+    fun observeForObservable(
+        count: Int,
+        offset: Int
+    ) = popularShowDao.entriesObservable(count, offset)
 
     fun observeForPaging(): DataSource.Factory<Int, PopularEntryWithShow> {
         return popularShowDao.entriesDataSource()
     }
 
-    suspend fun savePopularShowsPage(page: Int, entries: List<PopularShowEntry>) = transactionRunner {
+    suspend fun savePopularShowsPage(
+        page: Int,
+        entries: List<PopularShowEntry>
+    ) = transactionRunner {
         popularShowDao.deletePage(page)
         popularShowDao.insertAll(entries)
     }
diff --git a/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt
index ba5c25b0ba..cdd293bede 100644
--- a/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/popularshows/TraktPopularShowsDataSource.kt
@@ -42,7 +42,10 @@ class TraktPopularShowsDataSource @Inject constructor(
 
     private val resultsMapper = pairMapperOf(showMapper, entryMapper)
 
-    override suspend fun getPopularShows(page: Int, pageSize: Int): Result<List<Pair<TiviShow, PopularShowEntry>>> {
+    override suspend fun getPopularShows(
+        page: Int,
+        pageSize: Int
+    ): Result<List<Pair<TiviShow, PopularShowEntry>>> {
         return showService.get().popular(page + 1, pageSize, Extended.NOSEASONS)
             .executeWithRetry()
             .toResult(resultsMapper)
diff --git a/data/src/main/java/app/tivi/data/repositories/recommendedshows/RecommendedShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/recommendedshows/RecommendedShowsStore.kt
index a1b90bc2d5..b13190c4ae 100644
--- a/data/src/main/java/app/tivi/data/repositories/recommendedshows/RecommendedShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/recommendedshows/RecommendedShowsStore.kt
@@ -25,7 +25,10 @@ class RecommendedShowsStore @Inject constructor(
     private val transactionRunner: DatabaseTransactionRunner,
     private val recommendedDao: RecommendedDao
 ) {
-    fun observeForObservable(count: Int, offset: Int) = recommendedDao.entriesObservable(count, offset)
+    fun observeForObservable(
+        count: Int,
+        offset: Int
+    ) = recommendedDao.entriesObservable(count, offset)
 
     fun observeForPaging() = recommendedDao.entriesDataSource()
 
diff --git a/data/src/main/java/app/tivi/data/repositories/relatedshows/RelatedShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/relatedshows/RelatedShowsStore.kt
index b9903f807c..e7d1211b73 100644
--- a/data/src/main/java/app/tivi/data/repositories/relatedshows/RelatedShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/relatedshows/RelatedShowsStore.kt
@@ -35,7 +35,10 @@ class RelatedShowsStore @Inject constructor(
         return relatedShowsDao.entriesWithShowsObservable(showId)
     }
 
-    suspend fun saveRelatedShows(showId: Long, relatedShows: List<RelatedShowEntry>) = transactionRunner {
+    suspend fun saveRelatedShows(
+        showId: Long,
+        relatedShows: List<RelatedShowEntry>
+    ) = transactionRunner {
         relatedShowsDao.deleteWithShowId(showId)
         entityInserter.insertOrUpdate(relatedShowsDao, relatedShows)
     }
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt b/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt
index 037b529b3e..88c8cb463d 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/ShowRepository.kt
@@ -87,7 +87,10 @@ class ShowRepository @Inject constructor(
         }
     }
 
-    suspend fun needsImagesUpdate(showId: Long, expiry: Instant = instantInPast(days = 30)): Boolean {
+    suspend fun needsImagesUpdate(
+        showId: Long,
+        expiry: Instant = instantInPast(days = 30)
+    ): Boolean {
         return showImagesLastRequestStore.isRequestBefore(showId, expiry)
     }
 
diff --git a/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt b/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt
index e4ad751dbb..575997c91d 100644
--- a/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/shows/ShowStore.kt
@@ -42,7 +42,11 @@ class ShowStore @Inject constructor(
 
     suspend fun saveShow(show: TiviShow) = entityInserter.insertOrUpdate(showDao, show)
 
-    suspend fun updateShowFromSources(showId: Long, trakt: TiviShow, tmdb: TiviShow) = transactionRunner {
+    suspend fun updateShowFromSources(
+        showId: Long,
+        trakt: TiviShow,
+        tmdb: TiviShow
+    ) = transactionRunner {
         val localShow = getShowOrEmpty(showId)
         val merged = mergeShows(localShow, trakt, tmdb)
 
diff --git a/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt
index d5ab6c7c92..12bc28c476 100644
--- a/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/trendingshows/TraktTrendingShowsDataSource.kt
@@ -41,7 +41,10 @@ class TraktTrendingShowsDataSource @Inject constructor(
     }
     private val responseMapper = pairMapperOf(showMapper, entryMapper)
 
-    override suspend fun getTrendingShows(page: Int, pageSize: Int): Result<List<Pair<TiviShow, TrendingShowEntry>>> {
+    override suspend fun getTrendingShows(
+        page: Int,
+        pageSize: Int
+    ): Result<List<Pair<TiviShow, TrendingShowEntry>>> {
         // We add 1 because Trakt uses a 1-based index whereas we use a 0-based index
         return showService.get().trending(page + 1, pageSize, Extended.NOSEASONS)
             .executeWithRetry()
diff --git a/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsDataSource.kt b/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsDataSource.kt
index 5da185e978..cdaa0796a8 100644
--- a/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsDataSource.kt
+++ b/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsDataSource.kt
@@ -21,5 +21,8 @@ import app.tivi.data.entities.TiviShow
 import app.tivi.data.entities.TrendingShowEntry
 
 interface TrendingShowsDataSource {
-    suspend fun getTrendingShows(page: Int, pageSize: Int): Result<List<Pair<TiviShow, TrendingShowEntry>>>
+    suspend fun getTrendingShows(
+        page: Int,
+        pageSize: Int
+    ): Result<List<Pair<TiviShow, TrendingShowEntry>>>
 }
diff --git a/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsStore.kt
index 1a3efb6b5f..1c3c294072 100644
--- a/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/trendingshows/TrendingShowsStore.kt
@@ -27,11 +27,17 @@ class TrendingShowsStore @Inject constructor(
     private val transactionRunner: DatabaseTransactionRunner,
     private val trendingShowsDao: TrendingDao
 ) {
-    fun observeForObservable(count: Int, offset: Int) = trendingShowsDao.entriesObservable(count, offset)
+    fun observeForObservable(
+        count: Int,
+        offset: Int
+    ) = trendingShowsDao.entriesObservable(count, offset)
 
     fun observeForPaging(): DataSource.Factory<Int, TrendingEntryWithShow> = trendingShowsDao.entriesDataSource()
 
-    suspend fun saveTrendingShowsPage(page: Int, entries: List<TrendingShowEntry>) = transactionRunner {
+    suspend fun saveTrendingShowsPage(
+        page: Int,
+        entries: List<TrendingShowEntry>
+    ) = transactionRunner {
         trendingShowsDao.deletePage(page)
         trendingShowsDao.insertAll(entries)
     }
diff --git a/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsRepository.kt b/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsRepository.kt
index de3376ba4f..e52f4de7ca 100644
--- a/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsRepository.kt
+++ b/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsRepository.kt
@@ -35,7 +35,10 @@ class WatchedShowsRepository @Inject constructor(
     private val traktDataSource: TraktWatchedShowsDataSource,
     private val showRepository: ShowRepository
 ) {
-    fun observeWatchedShowsPagedList(filter: String?, sort: SortOption) = watchedShowsStore.observePagedList(filter, sort)
+    fun observeWatchedShowsPagedList(
+        filter: String?,
+        sort: SortOption
+    ) = watchedShowsStore.observePagedList(filter, sort)
 
     suspend fun needUpdate(expiry: Instant = instantInPast(hours = 12)): Boolean {
         return lastRequestStore.isRequestBefore(expiry)
diff --git a/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsStore.kt b/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsStore.kt
index 961bbe2ef8..92eac5a786 100644
--- a/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsStore.kt
+++ b/data/src/main/java/app/tivi/data/repositories/watchedshows/WatchedShowsStore.kt
@@ -34,7 +34,10 @@ class WatchedShowsStore @Inject constructor(
 
     suspend fun getWatchedShow(showId: Long) = watchedShowDao.entryWithShowId(showId)
 
-    fun observePagedList(filter: String?, sort: SortOption): DataSource.Factory<Int, WatchedShowEntryWithShow> {
+    fun observePagedList(
+        filter: String?,
+        sort: SortOption
+    ): DataSource.Factory<Int, WatchedShowEntryWithShow> {
         val filtered = filter != null && filter.isNotEmpty()
         return when (sort) {
             SortOption.LAST_WATCHED -> {
diff --git a/ui-discover/src/main/java/app/tivi/home/discover/DiscoverViewModel.kt b/ui-discover/src/main/java/app/tivi/home/discover/DiscoverViewModel.kt
index 5820ded905..7a1eef3f52 100644
--- a/ui-discover/src/main/java/app/tivi/home/discover/DiscoverViewModel.kt
+++ b/ui-discover/src/main/java/app/tivi/home/discover/DiscoverViewModel.kt
@@ -157,7 +157,10 @@ internal class DiscoverViewModel @AssistedInject constructor(
     }
 
     companion object : MvRxViewModelFactory<DiscoverViewModel, DiscoverViewState> {
-        override fun create(viewModelContext: ViewModelContext, state: DiscoverViewState): DiscoverViewModel? {
+        override fun create(
+            viewModelContext: ViewModelContext,
+            state: DiscoverViewState
+        ): DiscoverViewModel? {
             val fragment: DiscoverFragment = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.discoverViewModelFactory.create(state)
         }
diff --git a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
index a7116137a2..fb0bac7cd9 100644
--- a/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
+++ b/ui-episodedetails/src/main/java/app/tivi/episodedetails/EpisodeDetailsFragment.kt
@@ -47,11 +47,18 @@ class EpisodeDetailsFragment : TiviFragmentWithBinding<FragmentEpisodeDetailsBin
     @Inject internal lateinit var controller: EpisodeDetailsEpoxyController
     @Inject internal lateinit var textCreator: EpisodeDetailsTextCreator
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): FragmentEpisodeDetailsBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): FragmentEpisodeDetailsBinding {
         return FragmentEpisodeDetailsBinding.inflate(layoutInflater, container, false)
     }
 
-    override fun onViewCreated(binding: FragmentEpisodeDetailsBinding, savedInstanceState: Bundle?) {
+    override fun onViewCreated(
+        binding: FragmentEpisodeDetailsBinding,
+        savedInstanceState: Bundle?
+    ) {
         binding.epDetailsRv.setController(controller)
 
         binding.epDetailsFab.setOnClickListener {
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
index 35dc624135..111968ce91 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedEpoxyController.kt
@@ -58,9 +58,19 @@ internal class FollowedEpoxyController @Inject constructor(
                         callbacks?.onFilterChanged(s?.toString() ?: "")
                     }
 
-                    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                    override fun beforeTextChanged(
+                        s: CharSequence?,
+                        start: Int,
+                        count: Int,
+                        after: Int
+                    ) = Unit
 
-                    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                    override fun onTextChanged(
+                        s: CharSequence?,
+                        start: Int,
+                        before: Int,
+                        count: Int
+                    ) = Unit
                 })
 
                 popupMenuListener(SortPopupMenuListener(state.sort, state.availableSorts))
@@ -80,7 +90,10 @@ internal class FollowedEpoxyController @Inject constructor(
         }
     }
 
-    override fun buildItemModel(currentPosition: Int, item: FollowedShowEntryWithShow?): EpoxyModel<*> {
+    override fun buildItemModel(
+        currentPosition: Int,
+        item: FollowedShowEntryWithShow?
+    ): EpoxyModel<*> {
         return LibraryFollowedItemBindingModel_().apply {
             if (item != null) {
                 id(item.generateStableId())
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
index b248beb6e1..bdca015056 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedFragment.kt
@@ -56,7 +56,11 @@ class FollowedFragment : TiviFragmentWithBinding<FragmentFollowedBinding>() {
 
     private var authStateMenuItemBinder: AuthStateMenuItemBinder? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): FragmentFollowedBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): FragmentFollowedBinding {
         return FragmentFollowedBinding.inflate(inflater, container, false)
     }
 
diff --git a/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt b/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt
index ee5717492a..8882152e1b 100644
--- a/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt
+++ b/ui-followed/src/main/java/app/tivi/home/followed/FollowedViewModel.kt
@@ -204,7 +204,10 @@ internal class FollowedViewModel @AssistedInject constructor(
             .setEnablePlaceholders(false)
             .build()
 
-        override fun create(viewModelContext: ViewModelContext, state: FollowedViewState): FollowedViewModel? {
+        override fun create(
+            viewModelContext: ViewModelContext,
+            state: FollowedViewState
+        ): FollowedViewModel? {
             val fragment: FollowedFragment = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.followedViewModelFactory.create(state)
         }
diff --git a/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsViewModel.kt b/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsViewModel.kt
index 71be727832..fb3dad2a5d 100644
--- a/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsViewModel.kt
+++ b/ui-recommended/src/main/java/app/tivi/home/recommended/RecommendedShowsViewModel.kt
@@ -58,7 +58,10 @@ class RecommendedShowsViewModel @AssistedInject constructor(
     }
 
     companion object : MvRxViewModelFactory<RecommendedShowsViewModel, EntryViewState> {
-        override fun create(viewModelContext: ViewModelContext, state: EntryViewState): RecommendedShowsViewModel? {
+        override fun create(
+            viewModelContext: ViewModelContext,
+            state: EntryViewState
+        ): RecommendedShowsViewModel? {
             val fragment: RecommendedShowsFragment = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.recommendedShowsViewModelFactory.create(state)
         }
diff --git a/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt b/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt
index 79b7a0d91a..e5b95b0b09 100644
--- a/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt
+++ b/ui-search/src/main/java/app/tivi/home/search/SearchViewModel.kt
@@ -77,7 +77,10 @@ internal class SearchViewModel @AssistedInject constructor(
     }
 
     companion object : MvRxViewModelFactory<SearchViewModel, SearchViewState> {
-        override fun create(viewModelContext: ViewModelContext, state: SearchViewState): SearchViewModel? {
+        override fun create(
+            viewModelContext: ViewModelContext,
+            state: SearchViewState
+        ): SearchViewModel? {
             val fragment: SearchFragment = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.searchViewModelFactory.create(state)
         }
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt
index b8823b2e9d..88538d92cc 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsAction.kt
@@ -21,9 +21,22 @@ import app.tivi.data.entities.ActionDate
 internal sealed class ShowDetailsAction
 internal object RefreshAction : ShowDetailsAction()
 internal object FollowShowToggleAction : ShowDetailsAction()
-internal data class MarkSeasonWatchedAction(val seasonId: Long, val onlyAired: Boolean, val date: ActionDate) : ShowDetailsAction()
+internal data class MarkSeasonWatchedAction(
+    val seasonId: Long,
+    val onlyAired: Boolean,
+    val date: ActionDate
+) : ShowDetailsAction()
+
 internal data class MarkSeasonUnwatchedAction(val seasonId: Long) : ShowDetailsAction()
-internal data class ChangeSeasonFollowedAction(val seasonId: Long, val followed: Boolean) : ShowDetailsAction()
+internal data class ChangeSeasonFollowedAction(
+    val seasonId: Long,
+    val followed: Boolean
+) : ShowDetailsAction()
+
 internal data class UnfollowPreviousSeasonsFollowedAction(val seasonId: Long) : ShowDetailsAction()
-internal data class ChangeSeasonExpandedAction(val seasonId: Long, val expanded: Boolean) : ShowDetailsAction()
+internal data class ChangeSeasonExpandedAction(
+    val seasonId: Long,
+    val expanded: Boolean
+) : ShowDetailsAction()
+
 internal data class OpenEpisodeDetails(val episodeId: Long) : ShowDetailsAction()
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
index 17c416de42..de14ecb47f 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsFragment.kt
@@ -68,7 +68,11 @@ class ShowDetailsFragment : TiviFragmentWithBinding<FragmentShowDetailsBinding>(
         }
     }
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): FragmentShowDetailsBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): FragmentShowDetailsBinding {
         return FragmentShowDetailsBinding.inflate(inflater, container, false)
     }
 
diff --git a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt
index ecfeb0264f..d5365bba38 100644
--- a/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt
+++ b/ui-showdetails/src/main/java/app/tivi/showdetails/details/ShowDetailsViewState.kt
@@ -46,4 +46,7 @@ data class FocusSeasonUiEffect(val seasonId: Long)
 
 sealed class OpenEpisodeUiEffect
 data class PendingOpenEpisodeUiEffect(val episodeId: Long) : OpenEpisodeUiEffect()
-data class ExecutableOpenEpisodeUiEffect(val episodeId: Long, val seasonId: Long) : OpenEpisodeUiEffect()
+data class ExecutableOpenEpisodeUiEffect(
+    val episodeId: Long,
+    val seasonId: Long
+) : OpenEpisodeUiEffect()
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
index c6f6799749..97a7e6b3fd 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedEpoxyController.kt
@@ -61,9 +61,21 @@ internal class WatchedEpoxyController @Inject constructor(
                         callbacks?.onFilterChanged(s?.toString() ?: "")
                     }
 
-                    override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
+                    override fun beforeTextChanged(
+                        s: CharSequence?,
+                        start: Int,
+                        count: Int,
+                        after: Int
+                    ) {
+                    }
 
-                    override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {}
+                    override fun onTextChanged(
+                        s: CharSequence?,
+                        start: Int,
+                        before: Int,
+                        count: Int
+                    ) {
+                    }
                 })
 
                 popupMenuListener(SortPopupMenuListener(state.sort, state.availableSorts))
@@ -83,7 +95,10 @@ internal class WatchedEpoxyController @Inject constructor(
         }
     }
 
-    override fun buildItemModel(currentPosition: Int, item: WatchedShowEntryWithShow?): EpoxyModel<*> {
+    override fun buildItemModel(
+        currentPosition: Int,
+        item: WatchedShowEntryWithShow?
+    ): EpoxyModel<*> {
         return LibraryWatchedItemBindingModel_().apply {
             if (item != null) {
                 id(item.generateStableId())
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
index 4b4ac2ba6f..060d3e2b78 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedFragment.kt
@@ -56,7 +56,11 @@ class WatchedFragment : TiviFragmentWithBinding<FragmentWatchedBinding>() {
 
     private var currentActionMode: ActionMode? = null
 
-    override fun createBinding(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): FragmentWatchedBinding {
+    override fun createBinding(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): FragmentWatchedBinding {
         return FragmentWatchedBinding.inflate(inflater, container, false)
     }
 
diff --git a/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt b/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt
index 4add4e0276..3c0081be95 100644
--- a/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt
+++ b/ui-watched/src/main/java/app/tivi/home/watched/WatchedViewModel.kt
@@ -207,7 +207,10 @@ internal class WatchedViewModel @AssistedInject constructor(
             .setEnablePlaceholders(false)
             .build()
 
-        override fun create(viewModelContext: ViewModelContext, state: WatchedViewState): WatchedViewModel? {
+        override fun create(
+            viewModelContext: ViewModelContext,
+            state: WatchedViewState
+        ): WatchedViewModel? {
             val fragment: WatchedFragment = (viewModelContext as FragmentViewModelContext).fragment()
             return fragment.watchedViewModelFactory.create(state)
         }