Style improvements.

Author: hdweiss

Diff for: app/src/main/java/org/jellyfin/androidtv/integration/LeanbackChannelWorker.kt

@@ -341,7 +341,7 @@ class LeanbackChannelWorker(
 			else -> item.indexNumber?.toString().orEmpty()
 		}
 
-		val builder = PreviewProgram.Builder()
+		return PreviewProgram.Builder()
 			.setChannelId(ContentUris.parseId(channelUri))
 			.setType(
 				when (item.type) {
@@ -373,13 +373,6 @@ class LeanbackChannelWorker(
 				putExtra(StartupActivity.EXTRA_ITEM_ID, item.id.toString())
 				putExtra(StartupActivity.EXTRA_ITEM_IS_USER_VIEW, item.type == BaseItemKind.COLLECTION_FOLDER)
 			})
-
-		if ((item.parentIndexNumber ?: 0) > 0)
-			builder.setSeasonNumber(seasonString, item.parentIndexNumber!!)
-		if ((item.indexNumber ?: 0) > 0)
-			builder.setEpisodeNumber(episodeString, item.indexNumber!!)
-
-		builder
 			.setDurationMillis(
 				if (item.runTimeTicks?.ticks != null) {
 					// If we are resuming, we need to show remaining time, cause GoogleTV
@@ -390,8 +383,12 @@ class LeanbackChannelWorker(
 					(duration - playbackPosition).inWholeMilliseconds.toInt()
 				} else 0
 			)
-
-		return builder.build().toContentValues()
+			.apply {
+				if ((item.parentIndexNumber ?: 0) > 0)
+					setSeasonNumber(seasonString, item.parentIndexNumber!!)
+				if ((item.indexNumber ?: 0) > 0)
+					setEpisodeNumber(episodeString, item.indexNumber!!)
+			}.build().toContentValues()
 	}
 
 	/**
@@ -475,13 +472,9 @@ class LeanbackChannelWorker(
 				setTitle(item.seriesName)
 				setEpisodeTitle(item.name)
 
-				if ((item.indexNumber ?: 0) > 0)
-					setEpisodeNumber(item.indexNumber!!)
-
-				if ((item.parentIndexNumber ?: 0) > 0)
-					setSeasonNumber(item.parentIndexNumber!!)
-			}
-			else {
+				item.indexNumber?.takeIf { it > 0 }?.let { setEpisodeNumber(it) }
+				item.parentIndexNumber?.takeIf { it > 0 }?.let { setSeasonNumber(it) }
+			} else {
 				setTitle(item.name)
 			}
 
@@ -514,9 +507,7 @@ class LeanbackChannelWorker(
 			}
 
 			// Runtime has been determined
-			val runtime = item.runTimeTicks?.ticks?.inWholeMilliseconds?.toInt()
-			if (runtime != null)
-				setDurationMillis(runtime)
+			item.runTimeTicks?.ticks?.let { setDurationMillis(it.inWholeMilliseconds.toInt()) }
 
 			// Set intent to open the episode
 			setIntent(Intent(context, StartupActivity::class.java).apply {