diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml index a492d6a4..cd4c449f 100644 --- a/.github/workflows/beta.yml +++ b/.github/workflows/beta.yml @@ -39,7 +39,7 @@ jobs: fi echo "Commits since $LAST_SHA:" # Accumulate commit logs in a shell variable - COMMIT_LOGS=$(git log $LAST_SHA..HEAD --pretty=format:"● %s") + COMMIT_LOGS=$(git log $LAST_SHA..HEAD --pretty=format:"● %s ~%an") # URL-encode the newline characters for GitHub Actions COMMIT_LOGS="${COMMIT_LOGS//'%'/'%25'}" COMMIT_LOGS="${COMMIT_LOGS//$'\n'/'%0A'}" diff --git a/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt b/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt index 0f26e174..cafdb4ff 100644 --- a/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt +++ b/app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt @@ -75,14 +75,7 @@ class MediaInfoFragment : Fragment() { if (media != null && !loaded) { loaded = true - //Youtube - if (media.anime?.youtube != null && PrefManager.getVal(PrefName.ShowYtButton)) { - binding.animeSourceYT.visibility = View.VISIBLE - binding.animeSourceYT.setOnClickListener { - val intent = Intent(Intent.ACTION_VIEW, Uri.parse(media.anime.youtube)) - requireContext().startActivity(intent) - } - } + binding.mediaInfoProgressBar.visibility = View.GONE binding.mediaInfoContainer.visibility = View.VISIBLE binding.mediaInfoName.text = "\t\t\t" + (media.name ?: media.nameRomaji) diff --git a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt index c9f0f920..07550739 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/AnimeWatchAdapter.kt @@ -2,6 +2,7 @@ package ani.dantotsu.media.anime import android.annotation.SuppressLint import android.content.Intent +import android.net.Uri import android.view.LayoutInflater import android.view.View import ani.dantotsu.settings.FAQActivity @@ -67,7 +68,14 @@ class AnimeWatchAdapter( null ) } - + //Youtube + if (media.anime?.youtube != null && PrefManager.getVal(PrefName.ShowYtButton)) { + binding.animeSourceYT.visibility = View.VISIBLE + binding.animeSourceYT.setOnClickListener { + val intent = Intent(Intent.ACTION_VIEW, Uri.parse(media.anime.youtube)) + fragment.requireContext().startActivity(intent) + } + } binding.animeSourceDubbed.isChecked = media.selected!!.preferDub binding.animeSourceDubbedText.text = if (media.selected!!.preferDub) currActivity()!!.getString(R.string.dubbed) else currActivity()!!.getString( diff --git a/app/src/main/res/layout/fragment_media_info.xml b/app/src/main/res/layout/fragment_media_info.xml index 2b4c2906..0cc14a6a 100644 --- a/app/src/main/res/layout/fragment_media_info.xml +++ b/app/src/main/res/layout/fragment_media_info.xml @@ -42,25 +42,7 @@ android:visibility="gone" tools:visibility="visible"> -