diff --git a/app/src/main/assets/subfont.ttf b/app/src/main/assets/subfont.ttf new file mode 100644 index 00000000..9659afc6 Binary files /dev/null and b/app/src/main/assets/subfont.ttf differ diff --git a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/subtitle/SubtitleSettings.kt b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/subtitle/SubtitleSettings.kt index b09fd3bc..88521068 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/subtitle/SubtitleSettings.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/ui/preferences/subtitle/SubtitleSettings.kt @@ -281,11 +281,11 @@ object SubtitleSettings { } } - if (fontBold) { - MPVLib.setPropertyString("sub-font", "Roboto Bold") - } else { - MPVLib.setPropertyString("sub-font", "Roboto Regular") - } +// if (fontBold) { +// MPVLib.setPropertyString("sub-font", "Roboto Bold") +// } else { +// MPVLib.setPropertyString("sub-font", "Roboto Regular") +// } MPVLib.setPropertyBoolean("sub-bold", fontBold) MPVLib.setPropertyBoolean("sub-italic", fontItalic) diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt b/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt index ac750273..ccfd0e42 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/util/AppUpgradeHandler.kt @@ -63,28 +63,20 @@ class AppUpgradeHandler fun copySubfont(overwrite: Boolean) { try { - listOf("Roboto-Regular", "Roboto-Bold") - .forEach { font -> - val fontFileName = "font-roboto/$font.ttf" - val outputDir = File(context.filesDir, "fonts") - if (!outputDir.exists()) { - outputDir.mkdir() - } - val outputFile = File(outputDir, "$font.ttf") - if (!outputFile.exists() || overwrite) { - context.assets.open(fontFileName).use { input -> - outputFile.outputStream().use { output -> - input.copyTo(output) - } - } - Timber.i("Wrote font %s to local", fontFileName) + val fontFileName = "subfont.ttf" + val outputFile = File(context.filesDir, fontFileName) + if (!outputFile.exists() || overwrite) { + context.assets.open(fontFileName).use { input -> + outputFile.outputStream().use { output -> + input.copyTo(output) } } - val oldFont = File(context.filesDir, "subfont.ttf") - if (oldFont.exists()) { - Timber.w("Old subfont.tff exists, will delete it") - oldFont.delete() + Timber.i("Wrote font %s to local", fontFileName) } +// val oldFontDir = File(context.filesDir, "fonts") +// if (oldFontDir.exists()) { +// oldFontDir.deleteRecursively() +// } } catch (ex: Exception) { Timber.e(ex, "Exception copying subfont.tff") } diff --git a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt index 18a291dd..f19d2b2f 100644 --- a/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt +++ b/app/src/main/java/com/github/damontecres/wholphin/util/mpv/MpvPlayer.kt @@ -44,7 +44,6 @@ import com.github.damontecres.wholphin.util.mpv.MPVLib.MpvEvent.MPV_EVENT_FILE_L import com.github.damontecres.wholphin.util.mpv.MPVLib.MpvEvent.MPV_EVENT_PLAYBACK_RESTART import com.github.damontecres.wholphin.util.mpv.MPVLib.MpvEvent.MPV_EVENT_VIDEO_RECONFIG import timber.log.Timber -import java.io.File import kotlin.concurrent.atomics.ExperimentalAtomicApi import kotlin.time.Duration.Companion.seconds @@ -114,7 +113,7 @@ class MpvPlayer( MPVLib.setOptionString("force-window", "no") MPVLib.setOptionString("idle", "yes") - MPVLib.setOptionString("sub-fonts-dir", File(context.filesDir, "fonts").absolutePath) +// MPVLib.setOptionString("sub-fonts-dir", File(context.filesDir, "fonts").absolutePath) MPVLib.addObserver(this) MPVProperty.observedProperties.forEach(MPVLib::observeProperty)