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

chore: formatting changes

Browse source
This commit is contained in:
rebel onion 2025-05-14 21:40:06 -05:00
parent 7053a7b4b2
commit 69c44b7d20
9 changed files with 137 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle
View file

@ -17,9 +17,8 @@ android {
applicationId "ani.dantotsu" applicationId "ani.dantotsu"
minSdk 21 minSdk 21
targetSdk 35 targetSdk 35
versionCode((System.currentTimeMillis() / 60000).toInteger()) versionName "3.2.2"
versionName "3.2.1" versionCode 300200200
versionCode 300200100
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
} }

3
app/src/main/java/ani/dantotsu/connections/discord/RPC.kt
View file

@ -50,7 +50,8 @@ open class RPC(val token: String, val coroutineContext: CoroutineContext) {
val assetApi = RPCExternalAsset(data.applicationId, token!!, client, json) val assetApi = RPCExternalAsset(data.applicationId, token!!, client, json)
suspend fun String.discordUrl() = assetApi.getDiscordUri(this) suspend fun String.discordUrl() = assetApi.getDiscordUri(this)
return json.encodeToString(Presence.Response( return json.encodeToString(
Presence.Response(
3, 3,
Presence( Presence(
activities = listOf( activities = listOf(

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

@ -427,7 +427,8 @@ class ExoplayerView :
false -> 0f false -> 0f
} }
val textElevation = PrefManager.getVal<Float>(PrefName.SubBottomMargin) / 50 * resources.displayMetrics.heightPixels val textElevation =
PrefManager.getVal<Float>(PrefName.SubBottomMargin) / 50 * resources.displayMetrics.heightPixels
textView.translationY = -textElevation textView.translationY = -textElevation
} }
@ -1044,7 +1045,8 @@ class ExoplayerView :
} }
} }
override fun onSingleClick(event: MotionEvent) = if (isSeeking) doubleTap(false, event) else handleController() override fun onSingleClick(event: MotionEvent) =
if (isSeeking) doubleTap(false, event) else handleController()
}, },
) )
val rewindArea = playerView.findViewById<View>(R.id.exo_rewind_area) val rewindArea = playerView.findViewById<View>(R.id.exo_rewind_area)
@ -1079,7 +1081,8 @@ class ExoplayerView :
} }
} }
override fun onSingleClick(event: MotionEvent) = if (isSeeking) doubleTap(true, event) else handleController() override fun onSingleClick(event: MotionEvent) =
if (isSeeking) doubleTap(true, event) else handleController()
}, },
) )
val forwardArea = playerView.findViewById<View>(R.id.exo_forward_area) val forwardArea = playerView.findViewById<View>(R.id.exo_forward_area)
@ -1449,7 +1452,8 @@ class ExoplayerView :
else -> mutableListOf() else -> mutableListOf()
} }
val startTimestamp = Calendar.getInstance() val startTimestamp = Calendar.getInstance()
val durationInSeconds = if (exoPlayer.duration != C.TIME_UNSET) (exoPlayer.duration / 1000).toInt() else 1440 val durationInSeconds =
if (exoPlayer.duration != C.TIME_UNSET) (exoPlayer.duration / 1000).toInt() else 1440
val endTimestamp = val endTimestamp =
Calendar.getInstance().apply { Calendar.getInstance().apply {
@ -1567,7 +1571,11 @@ class ExoplayerView :
subtitle = intent.getSerialized("subtitle") subtitle = intent.getSerialized("subtitle")
?: when ( ?: when (
val subLang: String? = val subLang: String? =
PrefManager.getNullableCustomVal("subLang_${media.id}", null, String::class.java) PrefManager.getNullableCustomVal(
"subLang_${media.id}",
null,
String::class.java
)
) { ) {
null -> { null -> {
when (episode.selectedSubtitle) { when (episode.selectedSubtitle) {
@ -1575,8 +1583,12 @@ class ExoplayerView :
-1 -> -1 ->
ext.subtitles.find { ext.subtitles.find {
it.language.contains(lang, ignoreCase = true) || it.language.contains(lang, ignoreCase = true) ||
it.language.contains(getLanguageCode(lang), ignoreCase = true) it.language.contains(
getLanguageCode(lang),
ignoreCase = true
)
} }
else -> ext.subtitles.getOrNull(episode.selectedSubtitle!!) else -> ext.subtitles.getOrNull(episode.selectedSubtitle!!)
} }
} }
@ -1651,7 +1663,8 @@ class ExoplayerView :
}.build() }.build()
val dataSourceFactory = val dataSourceFactory =
DataSource.Factory { DataSource.Factory {
val dataSource: HttpDataSource = OkHttpDataSource.Factory(httpClient).createDataSource() val dataSource: HttpDataSource =
OkHttpDataSource.Factory(httpClient).createDataSource()
defaultHeaders.forEach { defaultHeaders.forEach {
dataSource.setRequestProperty(it.key, it.value) dataSource.setRequestProperty(it.key, it.value)
} }
@ -1719,12 +1732,14 @@ class ExoplayerView :
it.name?.endsWith(".mp4") == true || it.name?.endsWith(".mp4") == true ||
it.name?.endsWith(".mkv") == true || it.name?.endsWith(".mkv") == true ||
it.name?.endsWith( it.name?.endsWith(
".${Injekt ".${
Injekt
.get<DownloadAddonManager>() .get<DownloadAddonManager>()
.extension .extension
?.extension ?.extension
?.getFileExtension() ?.getFileExtension()
?.first ?: "ts"}", ?.first ?: "ts"
}",
) == ) ==
true true
} }
@ -1928,7 +1943,7 @@ class ExoplayerView :
if (PrefManager.getVal<Boolean>(PrefName.TextviewSubtitles)) { if (PrefManager.getVal<Boolean>(PrefName.TextviewSubtitles)) {
exoSubtitleView.visibility = View.GONE exoSubtitleView.visibility = View.GONE
customSubtitleView.visibility = View.VISIBLE customSubtitleView.visibility = View.VISIBLE
val newCues = cueGroup.cues.map { it.text.toString() ?: "" } val newCues = cueGroup.cues.map { it.text.toString() }
if (newCues.isEmpty()) { if (newCues.isEmpty()) {
customSubtitleView.text = "" customSubtitleView.text = ""
@ -1940,7 +1955,9 @@ class ExoplayerView :
val currentPosition = exoPlayer.currentPosition val currentPosition = exoPlayer.currentPosition
if ((lastSubtitle?.length ?: 0) < 20 || (lastPosition != 0L && currentPosition - lastPosition > 1500)) { if ((lastSubtitle?.length
?: 0) < 20 || (lastPosition != 0L && currentPosition - lastPosition > 1500)
) {
activeSubtitles.clear() activeSubtitles.clear()
} }
@ -2213,7 +2230,8 @@ class ExoplayerView :
override fun onTick(millisUntilFinished: Long) { override fun onTick(millisUntilFinished: Long) {
if (new == null) { if (new == null) {
skipTimeButton.visibility = View.GONE skipTimeButton.visibility = View.GONE
exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0 exoSkip.isVisible =
PrefManager.getVal<Int>(PrefName.SkipTime) > 0
disappeared = false disappeared = false
functionstarted = false functionstarted = false
cancelTimer() cancelTimer()
@ -2222,7 +2240,8 @@ class ExoplayerView :
override fun onFinish() { override fun onFinish() {
skipTimeButton.visibility = View.GONE skipTimeButton.visibility = View.GONE
exoSkip.isVisible = PrefManager.getVal<Int>(PrefName.SkipTime) > 0 exoSkip.isVisible =
PrefManager.getVal<Int>(PrefName.SkipTime) > 0
disappeared = true disappeared = true
functionstarted = false functionstarted = false
cancelTimer() cancelTimer()

16
app/src/main/java/ani/dantotsu/settings/SettingsCommonActivity.kt
View file

@ -193,7 +193,8 @@ class SettingsCommonActivity : AppCompatActivity() {
PrefManager.setVal(PrefName.OverridePassword, true) PrefManager.setVal(PrefName.OverridePassword, true)
} }
val password = view.passwordInput.text.toString() val password = view.passwordInput.text.toString()
val confirmPassword = view.confirmPasswordInput.text.toString() val confirmPassword =
view.confirmPasswordInput.text.toString()
if (password == confirmPassword && password.isNotEmpty()) { if (password == confirmPassword && password.isNotEmpty()) {
PrefManager.setVal(PrefName.AppPassword, password) PrefManager.setVal(PrefName.AppPassword, password)
if (view.biometricCheckbox.isChecked) { if (view.biometricCheckbox.isChecked) {
@ -205,7 +206,9 @@ class SettingsCommonActivity : AppCompatActivity() {
if (canBiometricPrompt) { if (canBiometricPrompt) {
val biometricPrompt = val biometricPrompt =
BiometricPromptUtils.createBiometricPrompt(this@SettingsCommonActivity) { _ -> BiometricPromptUtils.createBiometricPrompt(
this@SettingsCommonActivity
) { _ ->
val token = UUID.randomUUID().toString() val token = UUID.randomUUID().toString()
PrefManager.setVal( PrefManager.setVal(
PrefName.BiometricToken, PrefName.BiometricToken,
@ -235,12 +238,14 @@ class SettingsCommonActivity : AppCompatActivity() {
setOnShowListener { setOnShowListener {
view.passwordInput.requestFocus() view.passwordInput.requestFocus()
val canAuthenticate = val canAuthenticate =
BiometricManager.from(applicationContext).canAuthenticate( BiometricManager.from(applicationContext)
.canAuthenticate(
BiometricManager.Authenticators.BIOMETRIC_WEAK, BiometricManager.Authenticators.BIOMETRIC_WEAK,
) == BiometricManager.BIOMETRIC_SUCCESS ) == BiometricManager.BIOMETRIC_SUCCESS
view.biometricCheckbox.isVisible = canAuthenticate view.biometricCheckbox.isVisible = canAuthenticate
view.biometricCheckbox.isChecked = view.biometricCheckbox.isChecked =
PrefManager.getVal(PrefName.BiometricToken, "").isNotEmpty() PrefManager.getVal(PrefName.BiometricToken, "")
.isNotEmpty()
view.forgotPasswordCheckbox.isChecked = view.forgotPasswordCheckbox.isChecked =
PrefManager.getVal(PrefName.OverridePassword) PrefManager.getVal(PrefName.OverridePassword)
} }
@ -314,7 +319,8 @@ class SettingsCommonActivity : AppCompatActivity() {
setTitle(R.string.change_download_location) setTitle(R.string.change_download_location)
setMessage(R.string.download_location_msg) setMessage(R.string.download_location_msg)
setPosButton(R.string.ok) { setPosButton(R.string.ok) {
val oldUri = PrefManager.getVal<String>(PrefName.DownloadsDir) val oldUri =
PrefManager.getVal<String>(PrefName.DownloadsDir)
launcher.registerForCallback { success -> launcher.registerForCallback { success ->
if (success) { if (success) {
toast(getString(R.string.please_wait)) toast(getString(R.string.please_wait))

18
app/src/main/java/ani/dantotsu/settings/SettingsNotificationActivity.kt
View file

@ -82,9 +82,18 @@ class SettingsNotificationActivity : AppCompatActivity() {
setTitle(R.string.subscriptions_checking_time) setTitle(R.string.subscriptions_checking_time)
singleChoiceItems(timeNames, curTime) { i -> singleChoiceItems(timeNames, curTime) { i ->
curTime = i curTime = i
it.settingsTitle.text = getString(R.string.subscriptions_checking_time_s, timeNames[i]) it.settingsTitle.text = getString(
PrefManager.setVal(PrefName.SubscriptionNotificationInterval, curTime) R.string.subscriptions_checking_time_s,
TaskScheduler.create(context, PrefManager.getVal(PrefName.UseAlarmManager)).scheduleAllTasks(context) timeNames[i]
)
PrefManager.setVal(
PrefName.SubscriptionNotificationInterval,
curTime
)
TaskScheduler.create(
context,
PrefManager.getVal(PrefName.UseAlarmManager)
).scheduleAllTasks(context)
} }
show() show()
} }
@ -125,7 +134,8 @@ class SettingsNotificationActivity : AppCompatActivity() {
types.map { name -> types.map { name ->
name.replace("_", " ").lowercase().replaceFirstChar { name.replace("_", " ").lowercase().replaceFirstChar {
if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString() if (it.isLowerCase()) it.titlecase(Locale.ROOT) else it.toString()
} }.toTypedArray(), }
}.toTypedArray(),
selected selected
) { updatedSelected -> ) { updatedSelected ->
types.forEachIndexed { index, type -> types.forEachIndexed { index, type ->

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

@ -96,7 +96,8 @@ class SettingsThemeActivity : AppCompatActivity(), SimpleDialog.OnDialogResultLi
themeSwitcher.apply { themeSwitcher.apply {
setText(themeText) setText(themeText)
setAdapter( setAdapter(
ArrayAdapter(context, ArrayAdapter(
context,
R.layout.item_dropdown, R.layout.item_dropdown,
ThemeManager.Companion.Theme.entries.map { ThemeManager.Companion.Theme.entries.map {
it.theme.substring( it.theme.substring(

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

@ -52,7 +52,8 @@ class SubscriptionsBottomDialog : BottomSheetDialogFragment() {
} }
groupedSubscriptions.forEach { (parserName, mediaList) -> groupedSubscriptions.forEach { (parserName, mediaList) ->
adapter.add(SubscriptionSource( adapter.add(
SubscriptionSource(
parserName, parserName,
mediaList.toMutableList(), mediaList.toMutableList(),
adapter, adapter,

2
build.gradle
View file

@ -12,7 +12,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:8.7.3' classpath 'com.android.tools.build:gradle:8.9.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version" classpath "com.google.devtools.ksp:symbol-processing-api:$ksp_version"

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Wed Aug 30 19:57:04 IST 2023 #Wed Aug 30 19:57:04 IST 2023
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists