diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewAdapter.kt b/app/src/main/java/exh/ui/metadata/MetadataViewAdapter.kt index a121d12cd..40d7fe08d 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewAdapter.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import eu.kanade.tachiyomi.databinding.MetadataViewItemBinding import eu.kanade.tachiyomi.util.system.copyToClipboard -import exh.util.floor import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job @@ -36,28 +35,26 @@ class MetadataViewAdapter(private var data: List>) : } // total number of cells - override fun getItemCount(): Int = data.size * 2 + override fun getItemCount(): Int = data.size // stores and recycles views as they are scrolled off screen inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - private var dataPosition: Int? = null fun bind(position: Int) { - if (data.isEmpty() || !binding.infoText.text.isNullOrBlank()) return - dataPosition = (position / 2F).floor() - binding.infoText.text = if (position % 2 == 0) data[dataPosition!!].first else data[dataPosition!!].second + binding.infoTitle.text = data[position].first + binding.infoText.text = data[position].second binding.infoText.clicks() .onEach { - itemView.context.copyToClipboard(data[dataPosition!!].second, data[dataPosition!!].second) + itemView.context.copyToClipboard(data[position].second, data[position].second) } .launchIn(scope) } override fun equals(other: Any?): Boolean { - return dataPosition.hashCode() == other.hashCode() + return binding.infoText.hashCode() == other.hashCode() } override fun hashCode(): Int { - return dataPosition.hashCode() + return binding.infoText.hashCode() } } diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewController.kt b/app/src/main/java/exh/ui/metadata/MetadataViewController.kt index fd7b9c4cb..6b243f2b5 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewController.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewController.kt @@ -5,7 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import androidx.core.os.bundleOf -import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.LinearLayoutManager import eu.kanade.tachiyomi.data.database.DatabaseHelper import eu.kanade.tachiyomi.data.database.models.Manga import eu.kanade.tachiyomi.databinding.MetadataViewControllerBinding @@ -68,7 +68,7 @@ class MetadataViewController : NucleusController - - - \ No newline at end of file diff --git a/app/src/main/res/layout/metadata_view_item.xml b/app/src/main/res/layout/metadata_view_item.xml index a4a81e07b..1db3a7dab 100644 --- a/app/src/main/res/layout/metadata_view_item.xml +++ b/app/src/main/res/layout/metadata_view_item.xml @@ -2,14 +2,21 @@ + android:layout_margin="8dp"> + + + android:layout_marginStart="8dp" + style="@style/TextAppearance.Regular.Body1.Secondary" /> \ No newline at end of file