From 17d0aeea0182995f74e917462a5279978d6de745 Mon Sep 17 00:00:00 2001 From: JohnVictoryz Date: Fri, 8 Mar 2024 17:20:26 +0200 Subject: [PATCH] Resolved Merge Conflicts and Removed Unnecessary Imports --- .../ani/dantotsu/media/anime/ExoplayerView.kt | 75 +++---------------- app/src/main/res/values/strings.xml | 17 +++++ 2 files changed, 28 insertions(+), 64 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 28e29d99..95d8e32a 100644 --- a/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt +++ b/app/src/main/java/ani/dantotsu/media/anime/ExoplayerView.kt @@ -16,12 +16,8 @@ import android.graphics.Color import android.graphics.drawable.Animatable import android.hardware.SensorManager import android.media.AudioManager -import android.media.AudioManager.AUDIOFOCUS_GAIN -import android.media.AudioManager.AUDIOFOCUS_LOSS -import android.media.AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -import android.media.AudioManager.STREAM_MUSIC +import android.media.AudioManager.* import android.net.Uri -import android.os.AsyncTask import android.os.Build import android.os.Bundle import android.os.CountDownTimer @@ -31,18 +27,8 @@ import android.provider.Settings.System import android.util.AttributeSet import android.util.Rational import android.util.TypedValue -import android.view.GestureDetector -import android.view.KeyEvent -import android.view.KeyEvent.ACTION_UP -import android.view.KeyEvent.KEYCODE_B -import android.view.KeyEvent.KEYCODE_DPAD_LEFT -import android.view.KeyEvent.KEYCODE_DPAD_RIGHT -import android.view.KeyEvent.KEYCODE_N -import android.view.KeyEvent.KEYCODE_SPACE -import android.view.MotionEvent -import android.view.OrientationEventListener -import android.view.View -import android.view.ViewGroup +import android.view.* +import android.view.KeyEvent.* import android.view.animation.AnimationUtils import android.widget.AdapterView import android.widget.ImageButton @@ -59,16 +45,9 @@ import androidx.core.view.updateLayoutParams import androidx.lifecycle.lifecycleScope import androidx.media3.cast.CastPlayer import androidx.media3.cast.SessionAvailabilityListener -import androidx.media3.common.C +import androidx.media3.common.* import androidx.media3.common.C.AUDIO_CONTENT_TYPE_MOVIE import androidx.media3.common.C.TRACK_TYPE_VIDEO -import androidx.media3.common.MediaItem -import androidx.media3.common.MimeTypes -import androidx.media3.common.PlaybackException -import androidx.media3.common.PlaybackParameters -import androidx.media3.common.Player -import androidx.media3.common.TrackSelectionOverride -import androidx.media3.common.Tracks import androidx.media3.common.util.UnstableApi import androidx.media3.common.util.Util import androidx.media3.datasource.DataSource @@ -76,27 +55,17 @@ import androidx.media3.datasource.DefaultDataSourceFactory import androidx.media3.datasource.HttpDataSource import androidx.media3.datasource.cache.CacheDataSource import androidx.media3.datasource.okhttp.OkHttpDataSource -import androidx.media3.exoplayer.DefaultLoadControl import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.source.DefaultMediaSourceFactory import androidx.media3.exoplayer.trackselection.DefaultTrackSelector import androidx.media3.exoplayer.util.EventLogger import androidx.media3.session.MediaSession -import androidx.media3.ui.AspectRatioFrameLayout -import androidx.media3.ui.CaptionStyleCompat -import androidx.media3.ui.CaptionStyleCompat.EDGE_TYPE_DEPRESSED -import androidx.media3.ui.CaptionStyleCompat.EDGE_TYPE_DROP_SHADOW -import androidx.media3.ui.CaptionStyleCompat.EDGE_TYPE_NONE -import androidx.media3.ui.CaptionStyleCompat.EDGE_TYPE_OUTLINE -import androidx.media3.ui.DefaultTimeBar -import androidx.media3.ui.PlayerView -import androidx.media3.ui.SubtitleView +import androidx.media3.ui.* +import androidx.media3.ui.CaptionStyleCompat.* +import androidx.media3.exoplayer.DefaultLoadControl import androidx.mediarouter.app.MediaRouteButton -import ani.dantotsu.GesturesListener -import ani.dantotsu.NoPaddingArrayAdapter +import ani.dantotsu.* import ani.dantotsu.R -import ani.dantotsu.brightnessConverter -import ani.dantotsu.circularReveal import ani.dantotsu.connections.anilist.Anilist import ani.dantotsu.connections.crashlytics.CrashlyticsInterface import ani.dantotsu.connections.discord.Discord @@ -105,38 +74,19 @@ import ani.dantotsu.connections.discord.DiscordServiceRunningSingleton import ani.dantotsu.connections.discord.RPC import ani.dantotsu.connections.updateProgress import ani.dantotsu.databinding.ActivityExoplayerBinding -import ani.dantotsu.defaultHeaders import ani.dantotsu.download.video.Helper -import ani.dantotsu.dp -import ani.dantotsu.getCurrentBrightnessValue -import ani.dantotsu.hideSystemBars -import ani.dantotsu.isOnline -import ani.dantotsu.logError -import ani.dantotsu.logger import ani.dantotsu.media.Media import ani.dantotsu.media.MediaDetailsViewModel import ani.dantotsu.media.SubtitleDownloader -import ani.dantotsu.okHttpClient import ani.dantotsu.others.AniSkip import ani.dantotsu.others.AniSkip.getType import ani.dantotsu.others.ResettableTimer import ani.dantotsu.others.getSerialized -import ani.dantotsu.parsers.AnimeSources -import ani.dantotsu.parsers.HAnimeSources -import ani.dantotsu.parsers.Subtitle -import ani.dantotsu.parsers.SubtitleType -import ani.dantotsu.parsers.Video -import ani.dantotsu.parsers.VideoExtractor -import ani.dantotsu.parsers.VideoType -import ani.dantotsu.px +import ani.dantotsu.parsers.* import ani.dantotsu.settings.PlayerSettingsActivity import ani.dantotsu.settings.saving.PrefManager import ani.dantotsu.settings.saving.PrefName -import ani.dantotsu.snackString -import ani.dantotsu.startMainActivity import ani.dantotsu.themes.ThemeManager -import ani.dantotsu.toast -import ani.dantotsu.tryWithSuspend import com.bumptech.glide.Glide import com.google.android.gms.cast.framework.CastButtonFactory import com.google.android.gms.cast.framework.CastContext @@ -151,15 +101,12 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get -import java.util.Calendar -import java.util.Timer -import java.util.TimerTask -import java.util.concurrent.TimeUnit +import java.util.* +import java.util.concurrent.* import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt - @UnstableApi @SuppressLint("SetTextI18n", "ClickableViewAccessibility") class ExoplayerView : AppCompatActivity(), Player.Listener, SessionAvailabilityListener { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f953efd..2e1f87cd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -670,6 +670,23 @@ View Following menu View Followers + + + + + + + + + + + + + + + + + Auto Hide Time Stamps Make the skip time stamp button disappear after 5 seconds