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

feat(YT): moved back to watch section

Browse source
This commit is contained in:
aayush262 2024-03-05 20:03:18 +05:30
parent ecbc7efebc
commit 4c4bbe3214
5 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/beta.yml vendored
View file

@ -39,7 +39,7 @@ jobs:
fi fi
echo "Commits since $LAST_SHA:" echo "Commits since $LAST_SHA:"
# Accumulate commit logs in a shell variable # 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 # URL-encode the newline characters for GitHub Actions
COMMIT_LOGS="${COMMIT_LOGS//'%'/'%25'}" COMMIT_LOGS="${COMMIT_LOGS//'%'/'%25'}"
COMMIT_LOGS="${COMMIT_LOGS//$'\n'/'%0A'}" COMMIT_LOGS="${COMMIT_LOGS//$'\n'/'%0A'}"

9
app/src/main/java/ani/dantotsu/media/MediaInfoFragment.kt
View file

@ -75,14 +75,7 @@ class MediaInfoFragment : Fragment() {
if (media != null && !loaded) { if (media != null && !loaded) {
loaded = true 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.mediaInfoProgressBar.visibility = View.GONE
binding.mediaInfoContainer.visibility = View.VISIBLE binding.mediaInfoContainer.visibility = View.VISIBLE
binding.mediaInfoName.text = "\t\t\t" + (media.name ?: media.nameRomaji) binding.mediaInfoName.text = "\t\t\t" + (media.name ?: media.nameRomaji)

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

@ -2,6 +2,7 @@ package ani.dantotsu.media.anime
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.net.Uri
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import ani.dantotsu.settings.FAQActivity import ani.dantotsu.settings.FAQActivity
@ -67,7 +68,14 @@ class AnimeWatchAdapter(
null 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.animeSourceDubbed.isChecked = media.selected!!.preferDub
binding.animeSourceDubbedText.text = binding.animeSourceDubbedText.text =
if (media.selected!!.preferDub) currActivity()!!.getString(R.string.dubbed) else currActivity()!!.getString( if (media.selected!!.preferDub) currActivity()!!.getString(R.string.dubbed) else currActivity()!!.getString(

20
app/src/main/res/layout/fragment_media_info.xml
View file

@ -42,25 +42,7 @@
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"> tools:visibility="visible">
<Button
android:id="@+id/animeSourceYT"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:backgroundTint="@color/yt_red"
android:fontFamily="@font/poppins_bold"
android:insetTop="0dp"
android:insetBottom="0dp"
android:text="@string/play_yt"
android:textColor="@color/bg_white"
android:visibility="gone"
app:cornerRadius="12dp"
app:icon="@drawable/ic_round_play_circle_24"
app:iconTint="@color/bg_white"
tools:ignore="TextContrastCheck"
tools:visibility="visible"/>
<TableLayout <TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"

20
app/src/main/res/layout/item_anime_watch.xml
View file

@ -19,6 +19,26 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="32dp"> android:padding="32dp">
<Button
android:id="@+id/animeSourceYT"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginEnd="32dp"
android:layout_marginStart="32dp"
android:backgroundTint="@color/yt_red"
android:fontFamily="@font/poppins_bold"
android:insetTop="0dp"
android:insetBottom="0dp"
android:text="@string/play_yt"
android:textColor="@color/bg_white"
android:visibility="gone"
app:cornerRadius="12dp"
app:icon="@drawable/ic_round_play_circle_24"
app:iconTint="@color/bg_white"
tools:ignore="TextContrastCheck"
tools:visibility="visible"/>
<TextView <TextView
android:id="@+id/animeSourceTitle" android:id="@+id/animeSourceTitle"
android:layout_width="match_parent" android:layout_width="match_parent"