Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aayush262 2024-02-13 13:36:31 +05:30
commit 07e7456ed8
3 changed files with 3 additions and 1 deletions

View file

@ -312,6 +312,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
3 -> ResourcesCompat.getFont(this, R.font.poppins_thin)
4 -> ResourcesCompat.getFont(this, R.font.century_gothic_regular)
5 -> ResourcesCompat.getFont(this, R.font.century_gothic_bold)
6 -> ResourcesCompat.getFont(this, R.font.blocky)
else -> ResourcesCompat.getFont(this, R.font.poppins_semi_bold)
}
playerView.subtitleView?.setStyle(

View file

@ -442,7 +442,8 @@ class PlayerSettingsActivity : AppCompatActivity() {
"Poppins",
"Poppins Thin",
"Century Gothic",
"Century Gothic Bold"
"Century Gothic Bold",
"Blocky"
)
val fontDialog = AlertDialog.Builder(this, R.style.MyPopup)
.setTitle(getString(R.string.subtitle_font))

Binary file not shown.