Clean up code

grote · Nov 6, 2024 · c9d30b2 · c9d30b2
1 parent 17549a2
commit c9d30b2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/app/src/main/java/de/grobox/transportr/trips/BaseViewHolder.kt b/app/src/main/java/de/grobox/transportr/trips/BaseViewHolder.kt
@@ -89,7 +89,7 @@ internal abstract class BaseViewHolder(v: View) : RecyclerView.ViewHolder(v) {
         if (position == null) {
             visibility = GONE
         } else {
-            text = "${context.getString(R.string.platform, position.toString())}"
+            text = context.getString(R.string.platform, position.toString())
             visibility = VISIBLE
         }
     }

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripDrawer.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripDrawer.kt
@@ -135,8 +135,7 @@ internal class TripDrawer(context: Context) : MapDrawer(context) {
     @ColorInt
     private fun getBackgroundColor(leg: Leg): Int {
         if (leg is Public) {
-            val line = leg.line
-            return TransportrUtils.getLineColor(context, line)
+            return TransportrUtils.getLineColor(context, leg.line)
         }
         return ContextCompat.getColor(context, R.color.walking)
     }

diff --git a/app/src/main/java/de/grobox/transportr/trips/detail/TripUtils.kt b/app/src/main/java/de/grobox/transportr/trips/detail/TripUtils.kt
@@ -108,7 +108,7 @@ internal object TripUtils {
         if (leg is Trip.Public) {
             // show departure position if existing
             if (leg.departurePosition != null) {
-                str += " (" + context.getString(R.string.platform, leg.departurePosition.toString()) +")"
+                str += " (${context.getString(R.string.platform, leg.departurePosition.toString())})"
             }
             str += "\n  ${getEmojiForProduct(leg.line?.product)} "
             leg.line?.label?.let {

diff --git a/app/src/main/java/de/grobox/transportr/ui/LineView.kt b/app/src/main/java/de/grobox/transportr/ui/LineView.kt
@@ -57,7 +57,7 @@ class LineView(context: Context, attr: AttributeSet?) : AppCompatTextView(contex
 
         // set colored label
         text = line.label
-        if (foregroundColor != null) setTextColor(getTextColorBasedOnBackground(backgroundColor))
+        setTextColor(foregroundColor)
     }
 
     fun setWalk() {