Extra info updates

app/src/main/java/exh/ui/metadata/adapters/EHentaiDescriptionAdapter.kt

@@ -4,12 +4,14 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterEhBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.humanReadableByteCount
@@ -75,7 +77,7 @@ class EHentaiDescriptionAdapter(
             binding.visible.text = itemView.context.getString(R.string.is_visible, meta.visible ?: itemView.context.getString(R.string.unknown))
 
             binding.favorites.text = (meta.favorites ?: 0).toString()
-            val drawable = itemView.context.getDrawable(R.drawable.ic_book_24dp)
+            val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_book_24dp)
             drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
 
@@ -85,7 +87,7 @@ class EHentaiDescriptionAdapter(
             binding.size.text = humanReadableByteCount(meta.size ?: 0, true)
 
             binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
-            val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
+            val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
             pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
 
@@ -118,6 +120,11 @@ class EHentaiDescriptionAdapter(
                 itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (ratingFloat ?: 0F).toString())
             }
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             listOf(
                 binding.favorites,
                 binding.genre,

app/src/main/java/exh/ui/metadata/adapters/EightMusesDescriptionAdapter.kt

@@ -3,12 +3,15 @@ package exh.ui.metadata.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapter8mBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.EightMusesSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import kotlinx.coroutines.CoroutineScope
@@ -45,6 +48,11 @@ class EightMusesDescriptionAdapter(
 
             binding.title.text = meta.title ?: itemView.context.getString(R.string.unknown)
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             binding.title.longClicks()
                 .onEach {
                     itemView.context.copyToClipboard(

app/src/main/java/exh/ui/metadata/adapters/HBrowseDescriptionAdapter.kt

@@ -3,12 +3,14 @@ package exh.ui.metadata.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterHbBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.HBrowseSearchMetadata
 import exh.ui.metadata.MetadataViewController
@@ -45,10 +47,15 @@ class HBrowseDescriptionAdapter(
             if (meta == null || meta !is HBrowseSearchMetadata) return
 
             binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
-            val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
+            val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
             pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             binding.pages.longClicks()
                 .onEach {
                     itemView.context.copyToClipboard(

app/src/main/java/exh/ui/metadata/adapters/HentaiCafeDescriptionAdapter.kt

@@ -3,12 +3,15 @@ package exh.ui.metadata.adapters
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterHcBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.HentaiCafeSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import kotlinx.coroutines.CoroutineScope
@@ -45,6 +48,11 @@ class HentaiCafeDescriptionAdapter(
 
             binding.artist.text = meta.artist ?: itemView.context.getString(R.string.unknown)
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             binding.artist.longClicks()
                 .onEach {
                     itemView.context.copyToClipboard(

app/src/main/java/exh/ui/metadata/adapters/HitomiDescriptionAdapter.kt

@@ -4,12 +4,15 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterHiBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.metadata.HitomiSearchMetadata
 import exh.ui.metadata.MetadataViewController
@@ -73,6 +76,11 @@ class HitomiDescriptionAdapter(
             binding.group.text = meta.group ?: itemView.context.getString(R.string.unknown)
             binding.language.text = meta.language ?: itemView.context.getString(R.string.unknown)
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             listOf(
                 binding.genre,
                 binding.group,

app/src/main/java/exh/ui/metadata/adapters/MangaDexDescriptionAdapter.kt

@@ -1,15 +1,17 @@
 package exh.ui.metadata.adapters
 
-import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterMdBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.MangaDexSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import kotlinx.coroutines.CoroutineScope
@@ -46,9 +48,6 @@ class MangaDexDescriptionAdapter(
             val meta = controller.presenter.meta
             if (meta == null || meta !is MangaDexSearchMetadata) return
 
-            @SuppressLint("SetTextI18n")
-            binding.mdId.text = "#" + (meta.mdId ?: 0)
-
             val ratingFloat = meta.rating?.toFloatOrNull()?.div(2F)
             val name = when (((ratingFloat ?: 100F) * 2).roundToInt()) {
                 0 -> R.string.rating0
@@ -71,19 +70,19 @@ class MangaDexDescriptionAdapter(
                 itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (meta.rating?.toFloatOrNull() ?: 0F).toString())
             }
 
-            listOf(
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
-                binding.mdId,
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
-                binding.rating
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
-            ).forEach { textView ->
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
-                textView.longClicks()
+
-                    .onEach {
+            binding.rating.longClicks()
-                        itemView.context.copyToClipboard(
+                .onEach {
-                            textView.text.toString(),
+                    itemView.context.copyToClipboard(
-                            textView.text.toString()
+                        binding.rating.text.toString(),
-                        )
+                        binding.rating.text.toString()
-                    }
+                    )
-                    .launchIn(scope)
+                }
-            }
+                .launchIn(scope)
 
             binding.moreInfo.clicks()
                 .onEach {

app/src/main/java/exh/ui/metadata/adapters/NHentaiDescriptionAdapter.kt

@@ -5,12 +5,14 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterNhBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.EX_DATE_FORMAT
 import exh.metadata.metadata.NHentaiSearchMetadata
@@ -51,8 +53,8 @@ class NHentaiDescriptionAdapter(
             if (meta == null || meta !is NHentaiSearchMetadata) return
 
             var category: String? = null
-            meta.tags.filter { it.namespace == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE }.let {
+            meta.tags.filter { it.namespace == NHentaiSearchMetadata.NHENTAI_CATEGORIES_NAMESPACE }.let { tags ->
-                if (it.isNotEmpty()) category = it.joinToString(transform = { it.name })
+                if (tags.isNotEmpty()) category = tags.joinToString(transform = { it.name })
             }
 
             if (category != null) {
@@ -80,7 +82,7 @@ class NHentaiDescriptionAdapter(
                 if (it == 0L) return@let
                 binding.favorites.text = it.toString()
 
-                val drawable = itemView.context.getDrawable(R.drawable.ic_favorite_24dp)
+                val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_favorite_24dp)
                 drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
 
                 binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
@@ -89,13 +91,18 @@ class NHentaiDescriptionAdapter(
             binding.whenPosted.text = EX_DATE_FORMAT.format(Date((meta.uploadDate ?: 0) * 1000))
 
             binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.pageImageTypes.size, meta.pageImageTypes.size)
-            val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
+            val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
             pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
 
             @SuppressLint("SetTextI18n")
             binding.id.text = "#" + (meta.nhId ?: 0)
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             listOf(
                 binding.favorites,
                 binding.genre,

app/src/main/java/exh/ui/metadata/adapters/PervEdenDescriptionAdapter.kt

@@ -4,12 +4,15 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterPeBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
+import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.PervEdenSearchMetadata
 import exh.ui.metadata.MetadataViewController
 import exh.util.SourceTagsUtil
@@ -87,6 +90,11 @@ class PervEdenDescriptionAdapter(
             binding.ratingBar.rating = meta.rating ?: 0F
             binding.rating.text = itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (meta.rating ?: 0F).toString())
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             listOf(
                 binding.genre,
                 binding.language,

app/src/main/java/exh/ui/metadata/adapters/PururinDescriptionAdapter.kt

@@ -4,12 +4,14 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterPuBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.PururinSearchMetadata
 import exh.metadata.metadata.PururinSearchMetadata.Companion.TAG_NAMESPACE_CATEGORY
@@ -70,7 +72,7 @@ class PururinDescriptionAdapter(
             binding.size.text = meta.fileSize ?: itemView.context.getString(R.string.unknown)
 
             binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.pages ?: 0, meta.pages ?: 0)
-            val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
+            val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
             pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
 
@@ -96,6 +98,11 @@ class PururinDescriptionAdapter(
                 itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (ratingFloat ?: 0F).toString())
             }
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             listOf(
                 binding.genre,
                 binding.pages,

app/src/main/java/exh/ui/metadata/adapters/TsuminoDescriptionAdapter.kt

@@ -4,12 +4,14 @@ import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.databinding.DescriptionAdapterTsBinding
 import eu.kanade.tachiyomi.ui.base.controller.withFadeTransaction
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.system.copyToClipboard
+import eu.kanade.tachiyomi.util.system.dpToPx
 import eu.kanade.tachiyomi.util.system.getResourceColor
 import exh.metadata.metadata.TsuminoSearchMetadata
 import exh.ui.metadata.MetadataViewController
@@ -66,7 +68,7 @@ class TsuminoDescriptionAdapter(
             } else binding.genre.setText(R.string.unknown)
 
             binding.favorites.text = (meta.favorites ?: 0).toString()
-            val drawable = itemView.context.getDrawable(R.drawable.ic_favorite_24dp)
+            val drawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_favorite_24dp)
             drawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.favorites.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
 
@@ -75,7 +77,7 @@ class TsuminoDescriptionAdapter(
             binding.uploader.text = meta.uploader ?: itemView.context.getString(R.string.unknown)
 
             binding.pages.text = itemView.resources.getQuantityString(R.plurals.num_pages, meta.length ?: 0, meta.length ?: 0)
-            val pagesDrawable = itemView.context.getDrawable(R.drawable.ic_baseline_menu_book_24)
+            val pagesDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_baseline_menu_book_24)
             pagesDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
             binding.pages.setCompoundDrawablesWithIntrinsicBounds(pagesDrawable, null, null, null)
 
@@ -100,6 +102,11 @@ class TsuminoDescriptionAdapter(
                 itemView.context.getString(R.string.rating_view_no_count, itemView.context.getString(name), (meta.averageRating ?: 0F).toString())
             }
 
+            val infoDrawable = ContextCompat.getDrawable(itemView.context, R.drawable.ic_info_24dp)
+            infoDrawable?.setTint(itemView.context.getResourceColor(R.attr.colorAccent))
+            infoDrawable?.setBounds(0, 0, 20.dpToPx, 20.dpToPx)
+            binding.moreInfo.setCompoundDrawables(infoDrawable, null, null, null)
+
             listOf(
                 binding.favorites,
                 binding.genre,

app/src/main/res/layout/description_adapter_8m.xml

@@ -11,7 +11,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -24,7 +24,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/description_adapter_eh.xml

@@ -34,7 +34,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -47,7 +47,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/language"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -70,7 +70,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/size"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -79,7 +79,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/favorites"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -89,7 +89,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -100,7 +100,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/visible"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -110,7 +110,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/uploader"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -118,10 +118,18 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/when_posted" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        android:layout_gravity="center_horizontal">
+
         <me.zhanghai.android.materialratingbar.MaterialRatingBar
             android:id="@+id/rating_bar"
             android:layout_width="wrap_content"
-            android:layout_height="25dp"
+            android:layout_height="20dp"
             android:layout_gravity="center_horizontal"
             android:focusable="false"
             android:isIndicator="true"
@@ -130,19 +138,19 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/rating"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginStart="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
 
-
+    </LinearLayout>
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/rating"
-        style="@style/TextAppearance.Regular"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
 
 
 </LinearLayout>

app/src/main/res/layout/description_adapter_hb.xml

@@ -11,7 +11,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -23,7 +23,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/description_adapter_hc.xml

@@ -11,7 +11,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/artist"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -23,7 +23,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"

app/src/main/res/layout/description_adapter_hi.xml

@@ -35,7 +35,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"
@@ -49,7 +49,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/language"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -58,7 +58,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -68,7 +68,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/group"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="32dp"

app/src/main/res/layout/description_adapter_md.xml

@@ -1,59 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
+    android:layout_height="wrap_content">
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/mdId"
-            style="@style/TextAppearance.Regular"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"/>
-
-
-        <me.zhanghai.android.materialratingbar.MaterialRatingBar
-            android:id="@+id/rating_bar"
-            android:layout_width="wrap_content"
-            android:layout_height="25dp"
-            android:layout_gravity="center_horizontal"
-            android:focusable="false"
-            android:isIndicator="true"
-            android:numStars="5"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <Button
-            android:id="@+id/more_info"
-            style="@style/Theme.Widget.Button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:text="@string/more_info"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/rating"
-        style="@style/TextAppearance.Regular"
+        style="@style/TextAppearance.Regular.Body1.Secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/rating_bar"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+    <me.zhanghai.android.materialratingbar.MaterialRatingBar
+        android:id="@+id/rating_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="20dp"
         android:layout_gravity="center_horizontal"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:layout_marginStart="16dp"
+        android:focusable="false"
+        android:isIndicator="true"
+        android:numStars="5"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
+        app:layout_constraintTop_toTopOf="parent" />
 
+    <Button
+        android:id="@+id/more_info"
+        style="@style/Theme.Widget.Button"
+        android:layout_width="wrap_content"
+        android:layout_height="36dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/more_info"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/description_adapter_nh.xml

@@ -34,7 +34,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -47,7 +47,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/id"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -70,7 +70,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/favorites"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
@@ -79,7 +79,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"

app/src/main/res/layout/description_adapter_pe.xml

@@ -37,7 +37,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"
@@ -74,7 +74,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/rating"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"

app/src/main/res/layout/description_adapter_pu.xml

@@ -34,7 +34,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -47,7 +47,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"
@@ -61,7 +61,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/uploader"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -70,7 +70,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/size"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -94,7 +94,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/rating"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"

app/src/main/res/layout/description_adapter_ts.xml

@@ -35,7 +35,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/pages"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -48,7 +48,7 @@
             android:id="@+id/more_info"
             style="@style/Theme.Widget.Button"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="36dp"
             android:layout_marginEnd="16dp"
             android:text="@string/more_info"
             app:layout_constraintEnd_toEndOf="parent"
@@ -62,7 +62,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/favorites"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:layout_constraintEnd_toEndOf="parent"
@@ -71,7 +71,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/when_posted"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
@@ -81,7 +81,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/uploader"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
@@ -104,7 +104,7 @@
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/rating"
-            style="@style/TextAppearance.Regular"
+            style="@style/TextAppearance.Regular.Body1.Secondary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"

app/src/main/res/values/strings_sy.xml

@@ -462,7 +462,7 @@
     <string name="video">Video</string>
 
     <!-- More Info Menu -->
-    <string name="more_info">More Info</string>
+    <string name="more_info">More info</string>
     <string name="alt_title">Alt Title</string>
     <string name="id">Id</string>
     <string name="token">Token</string>