rebelonion/Dantotsu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
View file

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

3
app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt
View file

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

BIN
app/src/main/res/font/blocky.ttf Normal file
View file

Binary file not shown.