Add font size and padding options to the metadata shown in viewer/screensaver

Author: giejay

app/src/main/java/nl/giejay/android/tv/immich/settings/MetaDataCustomizerAdapter.kt

@@ -10,11 +10,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import nl.giejay.android.tv.immich.R
 import nl.giejay.mediaslider.adapter.AlignOption
-import nl.giejay.mediaslider.adapter.MetaDataClock
 import nl.giejay.mediaslider.adapter.MetaDataItem
-import nl.giejay.mediaslider.adapter.MetaDataMediaCount
-import nl.giejay.mediaslider.adapter.MetaDataSliderItem
-import nl.giejay.mediaslider.model.MetaDataType
 
 class MetaDataCustomizerAdapter(val context: Context, val metaData: MutableList<MetaDataItem>) : BaseAdapter() {
     private val layoutInflater: LayoutInflater = LayoutInflater.from(context)
@@ -62,15 +58,7 @@ class MetaDataCustomizerAdapter(val context: Context, val metaData: MutableList<
 //            notifyDataSetChanged()
 //        }
 
-        textView.text = when (metaDataItem) {
-            is MetaDataClock -> "Clock"
-            is MetaDataMediaCount -> "Media Count"
-            is MetaDataSliderItem -> {
-                if (metaDataItem.metaDataType == MetaDataType.ALBUM_NAME) {
-                    "Album Name"
-                } else metaDataItem.metaDataType.toString().lowercase().capitalize()
-            }
-        }
+        textView.text = metaDataItem.getTitle()
         return item
     }
 }

app/src/main/java/nl/giejay/android/tv/immich/settings/MetaDataCustomizerFragment.kt

@@ -59,7 +59,7 @@ class MetaDataCustomizerFragment : Fragment() {
         if (findFirstNotAddedMetaDataType.isEmpty()) {
             Toast.makeText(requireContext(), "You already added every possible meta data", Toast.LENGTH_SHORT).show()
         } else {
-            val newItem = MetaDataItem.create(findFirstNotAddedMetaDataType.first(), align)
+            val newItem = MetaDataItem.create(findFirstNotAddedMetaDataType.first(), align, MetaDataItem.DEFAULT_PADDING, findFirstNotAddedMetaDataType.first().defaultFontSize)
             allMetaData.add(newItem)
             findNavController().navigate(HomeFragmentDirections.actionGlobalToSettingsDialog("meta_data_item",
                 "",

app/src/main/java/nl/giejay/android/tv/immich/settings/MetaDataItemCustomizerFragment.kt

@@ -4,11 +4,13 @@ import android.os.Bundle
 import androidx.navigation.fragment.findNavController
 import androidx.preference.ListPreference
 import androidx.preference.Preference
+import androidx.preference.SeekBarPreference
 import arrow.core.Either
 import nl.giejay.android.tv.immich.R
 import nl.giejay.android.tv.immich.shared.prefs.MetaDataScreen
 import nl.giejay.android.tv.immich.shared.prefs.PrefScreen
 import nl.giejay.android.tv.immich.shared.prefs.PreferenceManager
+import nl.giejay.mediaslider.adapter.MetaDataClock
 import nl.giejay.mediaslider.adapter.MetaDataItem
 import nl.giejay.mediaslider.model.MetaDataType
 import nl.giejay.mediaslider.util.MetaDataConverter
@@ -36,17 +38,28 @@ class MetaDataItemInnerCustomizerFragment : SettingsScreenFragment.SettingsInner
         val currentIndex = allItems.indexOf(metaDataItem)
         metaDataItemOrder.setDefaultValue((currentIndex + 1).toString())
         metaDataItemOrder.value = (currentIndex + 1).toString()
-       
+
+        val fontSize = findPreference<SeekBarPreference>("meta_data_item_font_size")
+        fontSize!!.value = metaDataItem.fontSize
+
         // set types
         val type = findPreference<ListPreference>("meta_data_item_type")!!
-        type.entryValues = MetaDataType.entries.filterNot{e -> e != metaDataItem.type && allItems.any { it.type == e }}.map { it.toString() }.toTypedArray()
-        type.entries = type.entryValues.map { it.toString().lowercase().capitalize() }.toTypedArray()
+        type.setOnPreferenceChangeListener {
+            _, newVal -> fontSize.value = MetaDataType.valueOf(newVal as String).defaultFontSize
+            true
+        }
+        val filteredTypes = MetaDataType.entries.filterNot { e -> e != metaDataItem.type && allItems.any { it.type == e } }
+        type.entryValues = filteredTypes.map { it.toString() }.toTypedArray()
+        type.entries = filteredTypes.map { it.title }.toTypedArray()
         type.value = metaDataItem.type.toString()
 
-        findPreference<Preference>("meta_data_save")!!.setOnPreferenceClickListener { 
+        val padding = findPreference<SeekBarPreference>("meta_data_item_padding")
+        padding!!.value = metaDataItem.padding
+
+        findPreference<Preference>("meta_data_save")!!.setOnPreferenceClickListener {
             val updatedList = allItems.toMutableList()
             updatedList.remove(metaDataItem)
-            updatedList.add(metaDataItemOrder.value.toInt() - 1, MetaDataItem.create(MetaDataType.valueOf(type.value.toString()), metaDataItem.align))
+            updatedList.add(metaDataItemOrder.value.toInt() - 1, MetaDataItem.create(MetaDataType.valueOf(type.value.toString()), metaDataItem.align, padding.value, fontSize.value))
             PreferenceManager.saveMetaData(metaDataItem.align, screen, updatedList.toList())
             findNavController().popBackStack()
             false

app/src/main/res/xml/preferences_meta_data_item.xml

@@ -16,6 +16,28 @@
         android:title="Order of metadata"
         app:useSimpleSummaryProvider="true" />
 
+    <SeekBarPreference
+        android:key="meta_data_item_font_size"
+        android:title="Font size"
+        android:max="50"
+        android:min="12"
+        app:useSimpleSummaryProvider="true"
+        android:defaultValue="18"
+        android:dialogTitle="Font size"
+        >
+    </SeekBarPreference>
+
+    <SeekBarPreference
+        android:key="meta_data_item_padding"
+        android:title="Padding"
+        android:max="50"
+        android:min="0"
+        app:useSimpleSummaryProvider="true"
+        android:defaultValue="0"
+        android:dialogTitle="Padding above and below the item"
+        >
+    </SeekBarPreference>
+
 <!--    <ListPreference-->
 <!--        android:dialogTitle="Align"-->
 <!--        android:key="meta_data_item_align"-->