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

fix for progress dialog

Browse source
This commit is contained in:
rebelonion 2024-02-03 01:52:39 -06:00
parent aa8d41eecf
commit 402e0576c8
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -81,8 +81,8 @@ import ani.dantotsu.others.ResettableTimer
import ani.dantotsu.others.getSerialized import ani.dantotsu.others.getSerialized
import ani.dantotsu.parsers.* import ani.dantotsu.parsers.*
import ani.dantotsu.settings.PlayerSettingsActivity import ani.dantotsu.settings.PlayerSettingsActivity
import ani.dantotsu.settings.saving.PrefName
import ani.dantotsu.settings.saving.PrefManager import ani.dantotsu.settings.saving.PrefManager
import ani.dantotsu.settings.saving.PrefName
import ani.dantotsu.themes.ThemeManager import ani.dantotsu.themes.ThemeManager
import com.bumptech.glide.Glide import com.bumptech.glide.Glide
import com.google.android.gms.cast.framework.CastButtonFactory import com.google.android.gms.cast.framework.CastButtonFactory
@ -1185,13 +1185,13 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
val incognito: Boolean = PrefManager.getVal(PrefName.Incognito) val incognito: Boolean = PrefManager.getVal(PrefName.Incognito)
val showProgressDialog = val showProgressDialog =
if (PrefManager.getVal(PrefName.AskIndividualPlayer)) PrefManager.getCustomVal( if (PrefManager.getVal(PrefName.AskIndividualPlayer)) PrefManager.getCustomVal(
"${media.id}_progressDialog", "${media.id}_ProgressDialog",
true true
) else false ) else false
if (!incognito && showProgressDialog && Anilist.userid != null && if (media.isAdult) PrefManager.getVal<Boolean>( if (!incognito && showProgressDialog && Anilist.userid != null && if (media.isAdult) PrefManager.getVal(
PrefName.UpdateForHPlayer PrefName.UpdateForHPlayer
) else true ) else true
) ) {
AlertDialog.Builder(this, R.style.MyPopup) AlertDialog.Builder(this, R.style.MyPopup)
.setTitle(getString(R.string.auto_update, media.userPreferredName)) .setTitle(getString(R.string.auto_update, media.userPreferredName))
.apply { .apply {
@ -1224,7 +1224,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL
} }
show() show()
} }
else model.setEpisode(episodes[media.anime!!.selectedEpisode!!]!!, "invoke") } else model.setEpisode(episodes[media.anime!!.selectedEpisode!!]!!, "invoke")
//Start the recursive Fun //Start the recursive Fun
if (PrefManager.getVal(PrefName.TimeStampsEnabled)) if (PrefManager.getVal(PrefName.TimeStampsEnabled))

8
app/src/main/res/layout/item_extension.xml
View file

@ -8,6 +8,14 @@
android:paddingTop="10dp" android:paddingTop="10dp"
android:paddingBottom="10dp"> android:paddingBottom="10dp">
<ImageView
android:id="@+id/extensionPinImageView"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_pin"
android:layout_marginEnd="3dp" />
<ImageView <ImageView
android:id="@+id/extensionIconImageView" android:id="@+id/extensionIconImageView"
android:layout_width="40dp" android:layout_width="40dp"