From b6c79dae406350bd1559cb6ea64c34bcd28003d2 Mon Sep 17 00:00:00 2001
From: Finnley Somdahl <87634197+rebelonion@users.noreply.github.com>
Date: Mon, 4 Dec 2023 22:16:05 -0600
Subject: [PATCH] Aayush's pr stuffs
---
.../download/manga/OfflineMangaFragment.kt | 2 +-
.../ani/dantotsu/media/anime/ExoplayerView.kt | 11 ++---
.../InstalledAnimeExtensionsFragment.kt | 8 +---
.../InstalledMangaExtensionsFragment.kt | 9 +---
app/src/main/res/color/chip_text_color.xml | 4 +-
.../res/drawable/ic_round_color_picker_24.xml | 5 ++
.../main/res/layout/activity_extensions.xml | 6 +--
app/src/main/res/layout/activity_settings.xml | 47 +++++++++++--------
app/src/main/res/layout/item_anime_watch.xml | 5 +-
app/src/main/res/layout/item_chip.xml | 1 +
.../ic_launcher_beta_round.xml | 1 +
app/src/main/res/values/colors.xml | 1 +
app/src/main/res/values/strings.xml | 6 ++-
app/src/main/res/values/style.xml | 19 ++++----
14 files changed, 65 insertions(+), 60 deletions(-)
create mode 100644 app/src/main/res/drawable/ic_round_color_picker_24.xml
diff --git a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
index 9e237dae..11d449ff 100644
--- a/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
+++ b/app/src/main/java/ani/dantotsu/download/manga/OfflineMangaFragment.kt
@@ -125,7 +125,7 @@ class OfflineMangaFragment : Fragment(), OfflineMangaSearchListener {
Download.Type.NOVEL
}
// Alert dialog to confirm deletion
- val builder = androidx.appcompat.app.AlertDialog.Builder(requireContext(), R.style.DialogTheme)
+ val builder = androidx.appcompat.app.AlertDialog.Builder(requireContext(), R.style.MyPopup)
builder.setTitle("Delete ${item.title}?")
builder.setMessage("Are you sure you want to delete ${item.title}?")
builder.setPositiveButton("Yes") { _, _ ->
diff --git a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
index 68a71cb2..f45d5740 100644
--- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
+++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt
@@ -62,7 +62,6 @@ import ani.dantotsu.R
import ani.dantotsu.connections.anilist.Anilist
import ani.dantotsu.connections.discord.Discord
import ani.dantotsu.connections.discord.DiscordService
-import ani.dantotsu.connections.discord.DiscordService.Companion.ACTION_STOP_SERVICE
import ani.dantotsu.connections.discord.DiscordServiceRunningSingleton
import ani.dantotsu.connections.discord.RPC
import ani.dantotsu.connections.updateProgress
@@ -816,14 +815,14 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
fun fastForward() {
isFastForwarding = true
exoPlayer.setPlaybackSpeed(exoPlayer.playbackParameters.speed * 2)
- snackString("Playing at 2x speed")
+ snackString("Playing at ${exoPlayer.playbackParameters.speed}x speed")
}
fun stopFastForward() {
if (isFastForwarding) {
isFastForwarding = false
exoPlayer.setPlaybackSpeed(exoPlayer.playbackParameters.speed / 2)
- snackString("Playing at normal speed")
+ snackString("Playing at default speed: ${exoPlayer.playbackParameters.speed}x")
}
}
@@ -1427,11 +1426,9 @@ class ExoplayerView : AppCompatActivity(), Player.Listener {
exoPlayer.release()
VideoCache.release()
mediaSession?.release()
- val stopIntent = Intent(this, DiscordService::class.java).apply {
- putExtra(ACTION_STOP_SERVICE, true)
- }
+ val stopIntent = Intent(this, DiscordService::class.java)
DiscordServiceRunningSingleton.running = false
- startService(stopIntent)
+ stopService(stopIntent)
}
diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
index b91f649d..7e257417 100644
--- a/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/InstalledAnimeExtensionsFragment.kt
@@ -57,10 +57,8 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
var selectedIndex = 0
AlertDialog.Builder(requireContext(), R.style.MyPopup)
.setTitle("Select a Source")
- .setSingleChoiceItems(names, selectedIndex) { _, which ->
+ .setSingleChoiceItems(names, selectedIndex) { dialog, which ->
selectedIndex = which
- }
- .setPositiveButton("OK") { dialog, _ ->
selectedSetting = allSettings[selectedIndex]
dialog.dismiss()
@@ -86,10 +84,6 @@ class InstalledAnimeExtensionsFragment : Fragment(), SearchQueryHandler {
.commit()
}
}
- .setNegativeButton("Cancel") { dialog, _ ->
- dialog.cancel()
- return@setNegativeButton
- }
.show()
} else {
// If there's only one setting, proceed with the fragment transaction
diff --git a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
index 8980c569..9b2741f2 100644
--- a/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
+++ b/app/src/main/java/ani/dantotsu/settings/InstalledMangaExtensionsFragment.kt
@@ -64,10 +64,8 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
var selectedIndex = 0
AlertDialog.Builder(requireContext(), R.style.MyPopup)
.setTitle("Select a Source")
- .setSingleChoiceItems(names, selectedIndex) { _, which ->
+ .setSingleChoiceItems(names, selectedIndex) { dialog, which ->
selectedIndex = which
- }
- .setPositiveButton("OK") { dialog, _ ->
selectedSetting = allSettings[selectedIndex]
dialog.dismiss()
@@ -82,11 +80,6 @@ class InstalledMangaExtensionsFragment : Fragment(), SearchQueryHandler {
.addToBackStack(null)
.commit()
}
- .setNegativeButton("Cancel") { dialog, _ ->
- dialog.cancel()
- changeUIVisibility(true)
- return@setNegativeButton
- }
.show()
} else {
// If there's only one setting, proceed with the fragment transaction
diff --git a/app/src/main/res/color/chip_text_color.xml b/app/src/main/res/color/chip_text_color.xml
index 7cc1a4af..c9f34f3a 100644
--- a/app/src/main/res/color/chip_text_color.xml
+++ b/app/src/main/res/color/chip_text_color.xml
@@ -1,7 +1,7 @@
-