Extract more spannable string build extensions

kylecorry31 · Jun 7, 2023 · 6fc75c3 · 6fc75c3
1 parent ea96eaf
commit 6fc75c3
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/BaseAstroListItemProducer.kt
@@ -1,12 +1,9 @@
 package com.kylecorry.trail_sense.astronomy.ui.items
 
 import android.content.Context
-import android.text.Layout
-import android.text.style.AlignmentSpan
 import androidx.core.text.bold
 import androidx.core.text.buildSpannedString
 import androidx.core.text.color
-import androidx.core.text.inSpans
 import androidx.core.text.scale
 import com.google.android.flexbox.AlignItems
 import com.google.android.flexbox.JustifyContent
@@ -21,6 +18,7 @@ import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.appendImage
+import com.kylecorry.trail_sense.shared.center
 import java.time.LocalDate
 import java.time.ZonedDateTime
 
@@ -201,7 +199,7 @@ abstract class BaseAstroListItemProducer(protected val context: Context) :
     ): ListItemData {
         return ListItemData(
             buildSpannedString {
-                inSpans(AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER)) {
+                center {
                     bold { scale(textScale) { append(value) } }
                     if (label != null) {
                         append("\n")
@@ -221,15 +219,14 @@ abstract class BaseAstroListItemProducer(protected val context: Context) :
         id: Long,
         title: CharSequence,
         subtitle: CharSequence,
-        body: CharSequence?,
         icon: ListIcon,
         data: List<ListItemData> = listOf(),
         onClick: () -> Unit
     ): ListItem {
         return ListItem(
             id,
             title(title, subtitle),
-            body?.let { body(it) },
+            null,
             icon = icon,
             trailingIcon = ResourceListIcon(R.drawable.ic_keyboard_arrow_right),
             data = data,

diff --git a/...rc/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt b/...rc/main/java/com/kylecorry/trail_sense/astronomy/ui/items/LunarEclipseListItemProducer.kt
@@ -28,7 +28,6 @@ class LunarEclipseListItemProducer(context: Context) : BaseAstroListItemProducer
             context.getString(R.string.lunar_eclipse),
             EclipseFormatter.type(context, eclipse),
 //            timeRange(eclipse.start, eclipse.end, date),
-            null,
             ResourceListIcon(
                 if (eclipse.isTotal) {
                     R.drawable.ic_moon_total_eclipse

diff --git a/...rc/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt b/...rc/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MeteorShowerListItemProducer.kt
@@ -25,7 +25,6 @@ class MeteorShowerListItemProducer(context: Context) : BaseAstroListItemProducer
             3,
             context.getString(R.string.meteor_shower),
             context.getString(R.string.meteors_per_hour, shower.shower.rate),
-            null,
             ResourceListIcon(R.drawable.ic_meteor, secondaryColor),
             data = listOf(timeData(shower.peak, date))
         ) {

diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/MoonListItemProducer.kt
@@ -31,7 +31,6 @@ class MoonListItemProducer(context: Context) : BaseAstroListItemProducer(context
             2,
             context.getString(R.string.moon),
             percent(formatter.formatMoonPhase(phase.phase), phase.illumination),
-            null,
             ResourceListIcon(MoonPhaseImageMapper().getPhaseImage(phase.phase)),
             data = riseSetData(times.rise, times.set)
         ) {

diff --git a/...rc/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt b/...rc/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SolarEclipseListItemProducer.kt
@@ -27,7 +27,6 @@ class SolarEclipseListItemProducer(context: Context) : BaseAstroListItemProducer
             5,
             context.getString(R.string.solar_eclipse),
             EclipseFormatter.type(context, eclipse),
-            null,
             ResourceListIcon(
                 if (eclipse.isTotal) {
                     R.drawable.ic_total_solar_eclipse

diff --git a/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt b/app/src/main/java/com/kylecorry/trail_sense/astronomy/ui/items/SunListItemProducer.kt
@@ -40,7 +40,6 @@ class SunListItemProducer(context: Context) : BaseAstroListItemProducer(context)
                 R.string.daylight_duration,
                 formatter.formatDuration(daylight, false)
             ),
-            null,
             ResourceListIcon(R.drawable.circle, AppColor.Yellow.color),
             data = riseSetData(times.rise, times.set)
         ) {

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/Extensions.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/Extensions.kt
@@ -1,11 +1,14 @@
 package com.kylecorry.trail_sense.shared
 
 import android.content.Context
+import android.text.Layout
 import android.text.Spannable
 import android.text.SpannableStringBuilder
+import android.text.style.AlignmentSpan
 import android.text.style.ImageSpan
 import androidx.annotation.ColorInt
 import androidx.appcompat.content.res.AppCompatResources
+import androidx.core.text.inSpans
 import androidx.fragment.app.Fragment
 import com.kylecorry.andromeda.canvas.ICanvasDrawer
 import com.kylecorry.andromeda.core.system.GeoUri
@@ -106,6 +109,15 @@ fun ICanvasDrawer.getBounds(rotation: Float = 0f): Rectangle {
     return rectangle
 }
 
+inline fun SpannableStringBuilder.center(builderAction: SpannableStringBuilder.() -> Unit): SpannableStringBuilder =
+    inSpans(AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER), builderAction)
+
+inline fun SpannableStringBuilder.left(builderAction: SpannableStringBuilder.() -> Unit): SpannableStringBuilder =
+    inSpans(AlignmentSpan.Standard(Layout.Alignment.ALIGN_NORMAL), builderAction)
+
+inline fun SpannableStringBuilder.right(builderAction: SpannableStringBuilder.() -> Unit): SpannableStringBuilder =
+    inSpans(AlignmentSpan.Standard(Layout.Alignment.ALIGN_OPPOSITE), builderAction)
+
 inline fun SpannableStringBuilder.appendImage(
     context: Context,
     drawableRes: Int,