From 4a5eab13c9ac50d7308e2db78bffdd0a44af9e76 Mon Sep 17 00:00:00 2001 From: aayush262 Date: Fri, 26 Jan 2024 10:32:02 +0530 Subject: [PATCH] removed quality selector --- .../ani/dantotsu/media/anime/ExoplayerView.kt | 24 ---- .../ani/dantotsu/settings/PlayerSettings.kt | 2 - .../settings/PlayerSettingsActivity.kt | 21 --- .../res/layout/activity_player_settings.xml | 128 ------------------ .../res/layout/exo_player_control_view.xml | 28 ---- 5 files changed, 203 deletions(-) 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 10420f21..f3844246 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt @@ -147,9 +147,7 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL private lateinit var skipTimeText: TextView private lateinit var timeStampText: TextView private lateinit var animeTitle: TextView - private lateinit var videoName: TextView private lateinit var videoInfo: TextView - private lateinit var serverInfo: TextView private lateinit var episodeTitle: Spinner private var orientationListener: OrientationEventListener? = null @@ -924,21 +922,9 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL title = media.userPreferredName episodes = media.anime?.episodes ?: return startMainActivity(this) - videoName = playerView.findViewById(R.id.exo_video_name) videoInfo = playerView.findViewById(R.id.exo_video_info) - serverInfo = playerView.findViewById(R.id.exo_server_info) - - if (!settings.videoInfo) { - videoName.visibility = View.GONE - videoInfo.visibility = View.GONE - serverInfo.visibility = View.GONE - } else { - videoName.isSelected = true - } model.watchSources = if (media.isAdult) HAnimeSources else AnimeSources - serverInfo.text = model.watchSources!!.names.getOrNull(media.selected!!.sourceIndex) - ?: model.watchSources!!.names[0] model.epChanged.observe(this) { epChanging = !it @@ -1408,10 +1394,6 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL .setRendererDisabled(TRACK_TYPE_VIDEO, false) .setRendererDisabled(C.TRACK_TYPE_AUDIO, false) .setRendererDisabled(C.TRACK_TYPE_TEXT, false) - .setMinVideoSize( - loadData("maxWidth", this) ?: 720, - loadData("maxHeight", this) ?: 480 - ) .setMaxVideoSize(1, 1) //.setOverrideForType( // TrackSelectionOverride(trackSelector, 2)) @@ -1613,14 +1595,8 @@ class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityL val height = (exoPlayer.videoFormat ?: return).height val width = (exoPlayer.videoFormat ?: return).width - if (video?.format != VideoType.CONTAINER) { - saveData("maxHeight", height) - saveData("maxWidth", width) - } - aspectRatio = Rational(width, height) - videoName.text = episode.selectedExtractor videoInfo.text = "$width x $height" if (exoPlayer.duration < playbackPosition) diff --git a/app/src/main/java/ani/dantotsu/settings/PlayerSettings.kt b/app/src/main/java/ani/dantotsu/settings/PlayerSettings.kt index 83037c4c..21d7a3b6 100644 --- a/app/src/main/java/ani/dantotsu/settings/PlayerSettings.kt +++ b/app/src/main/java/ani/dantotsu/settings/PlayerSettings.kt @@ -3,8 +3,6 @@ package ani.dantotsu.settings import java.io.Serializable data class PlayerSettings( - //Video - var videoInfo: Boolean = true, var defaultSpeed: Int = 5, var cursedSpeeds: Boolean = false, var resize: Int = 0, diff --git a/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt b/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt index 88167079..10130ee1 100644 --- a/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt +++ b/app/src/main/java/ani/dantotsu/settings/PlayerSettingsActivity.kt @@ -74,27 +74,6 @@ class PlayerSettingsActivity : AppCompatActivity() { } //Video - binding.playerSettingsVideoInfo.isChecked = settings.videoInfo - binding.playerSettingsVideoInfo.setOnCheckedChangeListener { _, isChecked -> - settings.videoInfo = isChecked - saveData(player, settings) - } - - binding.playerSettingsQualityHeight.setText( - (loadData("maxHeight", toast = false) ?: 480).toString() - ) - binding.playerSettingsQualityHeight.addTextChangedListener { - val height = binding.playerSettingsQualityHeight.text.toString().toIntOrNull() - saveData("maxHeight", height) - } - binding.playerSettingsQualityWidth.setText( - (loadData("maxWidth", toast = false) ?: 720).toString() - ) - binding.playerSettingsQualityWidth.addTextChangedListener { - val height = binding.playerSettingsQualityWidth.text.toString().toIntOrNull() - saveData("maxWidth", height) - } - val speeds = arrayOf( diff --git a/app/src/main/res/layout/activity_player_settings.xml b/app/src/main/res/layout/activity_player_settings.xml index 5a5da548..7c3eb840 100644 --- a/app/src/main/res/layout/activity_player_settings.xml +++ b/app/src/main/res/layout/activity_player_settings.xml @@ -90,134 +90,6 @@ android:paddingEnd="32dp" android:text="@string/video" /> - - - - - - - - - - - - - - - - - - - - - - - - - - -