diff --git a/app/src/main/assets/fonts/PTSans-Narrow.ttf b/app/src/main/assets/fonts/PTSans-Narrow.ttf deleted file mode 100644 index df8ba71850..0000000000 Binary files a/app/src/main/assets/fonts/PTSans-Narrow.ttf and /dev/null differ diff --git a/app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.kt b/app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.kt deleted file mode 100644 index be672fde1b..0000000000 --- a/app/src/main/java/eu/kanade/tachiyomi/widget/PTSansTextView.kt +++ /dev/null @@ -1,45 +0,0 @@ -package eu.kanade.tachiyomi.widget - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Typeface -import android.util.AttributeSet -import androidx.appcompat.widget.AppCompatTextView -import eu.kanade.tachiyomi.R -import java.util.HashMap - -class PTSansTextView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : - AppCompatTextView(context, attrs) { - - companion object { - const val PTSANS_NARROW = 0 - const val PTSANS_NARROW_BOLD = 1 - - // Map where typefaces are cached - private val typefaces = HashMap(2) - } - - init { - if (attrs != null) { - val values = context.obtainStyledAttributes(attrs, R.styleable.PTSansTextView) - - val typeface = values.getInt(R.styleable.PTSansTextView_typeface, 0) - - setTypeface(typefaces.getOrPut(typeface) { - Typeface.createFromAsset(context.assets, when (typeface) { - PTSANS_NARROW -> "fonts/PTSans-Narrow.ttf" - PTSANS_NARROW_BOLD -> "fonts/PTSans-NarrowBold.ttf" - else -> throw IllegalArgumentException("Font not found $typeface") - }) - }) - - values.recycle() - } - } - - override fun onDraw(canvas: Canvas) { - // Draw two times for a more visible shadow around the text - super.onDraw(canvas) - super.onDraw(canvas) - } -} diff --git a/app/src/main/assets/fonts/PTSans-NarrowBold.ttf b/app/src/main/res/font/ptsans_narrow_bold.ttf similarity index 100% rename from app/src/main/assets/fonts/PTSans-NarrowBold.ttf rename to app/src/main/res/font/ptsans_narrow_bold.ttf diff --git a/app/src/main/res/layout/source_grid_item.xml b/app/src/main/res/layout/source_grid_item.xml index bbdf1e8c22..cfce17aec4 100644 --- a/app/src/main/res/layout/source_grid_item.xml +++ b/app/src/main/res/layout/source_grid_item.xml @@ -89,7 +89,7 @@ tools:visibility="visible" /> - - - - - - - - - -