From 7293b9e75823441b921f6a1fb8c222a1528f6462 Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Fri, 9 Sep 2022 00:41:35 +1000
Subject: Update ExoPlayer.

---
 app/src/main/res/layout/toro_exo_control_view.xml | 181 ----------------------
 app/src/main/res/layout/toro_exo_player_view.xml  |  89 -----------
 app/src/main/res/values/strings.xml               |   7 -
 3 files changed, 277 deletions(-)
 delete mode 100644 app/src/main/res/layout/toro_exo_control_view.xml
 delete mode 100644 app/src/main/res/layout/toro_exo_player_view.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/toro_exo_control_view.xml b/app/src/main/res/layout/toro_exo_control_view.xml
deleted file mode 100644
index 481230bf..00000000
--- a/app/src/main/res/layout/toro_exo_control_view.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (c) 2018 Nam Nguyen, nam@ene.im
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<androidx.appcompat.widget.LinearLayoutCompat
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:layout_marginTop="4dp"
-    android:background="#CC000000"
-    android:gravity="center_vertical"
-    android:layoutDirection="ltr"
-    android:orientation="horizontal"
-    android:theme="@style/Theme.AppCompat"
-    tools:ignore="UnusedAttribute"
-    >
-
-  <!--<androidx.appcompat.widget.AppCompatImageButton
-      android:id="@id/exo_play"
-      tools:ignore="ContentDescription"
-      style="@style/ToroMediaButton.Play"
-      />
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@id/exo_pause"
-      tools:ignore="ContentDescription"
-      tools:visibility="gone"
-      style="@style/ToroMediaButton.Pause"
-      />
-
-  <androidx.appcompat.widget.AppCompatTextView
-      android:id="@id/exo_position"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:includeFontPadding="false"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:textColor="#FFBEBEBE"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      tools:text="1:25"
-      />
-
-  <androidx.appcompat.widget.AppCompatTextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:includeFontPadding="false"
-      android:text="/"
-      android:textColor="#FFBEBEBE"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      tools:ignore="HardcodedText"
-      />
-
-  <androidx.appcompat.widget.AppCompatTextView
-      android:id="@id/exo_duration"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:includeFontPadding="false"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:textColor="#FFBEBEBE"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      tools:text="5:25"
-      />
-
-  <com.google.android.exoplayer2.ui.DefaultTimeBar
-      android:id="@id/exo_progress"
-      android:layout_width="0dp"
-      android:layout_height="24dp"
-      android:layout_weight="1"
-      />
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@+id/exo_volume_up"
-      tools:ignore="ContentDescription"
-      style="@style/ToroMediaButton.VolumeUp"
-      />
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@+id/exo_volume_off"
-      tools:ignore="ContentDescription"
-      tools:visibility="gone"
-      style="@style/ToroMediaButton.VolumeOff"
-      />-->
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@id/exo_play"
-      tools:ignore="ContentDescription"
-      style="@style/ToroMediaButton.Play"
-      />
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@id/exo_pause"
-      tools:ignore="ContentDescription"
-      tools:visibility="gone"
-      style="@style/ToroMediaButton.Pause"
-      />
-
-  <androidx.appcompat.widget.AppCompatTextView
-      android:id="@id/exo_position"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:includeFontPadding="false"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:textColor="#FFBEBEBE"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      tools:text="1:25"
-      />
-
-  <androidx.appcompat.widget.AppCompatTextView
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:includeFontPadding="false"
-      android:text="/"
-      android:textColor="#FFBEBEBE"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      tools:ignore="HardcodedText"
-      />
-
-  <androidx.appcompat.widget.AppCompatTextView
-      android:id="@id/exo_duration"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:includeFontPadding="false"
-      android:paddingLeft="4dp"
-      android:paddingRight="4dp"
-      android:textColor="#FFBEBEBE"
-      android:textSize="14sp"
-      android:textStyle="bold"
-      tools:text="5:25"
-      />
-
-  <com.google.android.exoplayer2.ui.DefaultTimeBar
-      android:id="@id/exo_progress"
-      android:layout_width="0dp"
-      android:layout_height="24dp"
-      android:layout_weight="1"
-      />
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@+id/exo_volume_up"
-      tools:ignore="ContentDescription"
-      style="@style/ToroMediaButton.VolumeUp"
-      />
-
-  <androidx.appcompat.widget.AppCompatImageButton
-      android:id="@+id/exo_volume_off"
-      tools:ignore="ContentDescription"
-      tools:visibility="gone"
-      style="@style/ToroMediaButton.VolumeOff"
-      />
-
-  <com.google.android.exoplayer2.ui.DefaultTimeBar
-      android:id="@+id/volume_bar"
-      android:layout_width="80dp"
-      android:layout_height="24dp"
-      android:layout_marginEnd="8dp"
-      android:layout_marginRight="8dp"
-      />
-
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/toro_exo_player_view.xml b/app/src/main/res/layout/toro_exo_player_view.xml
deleted file mode 100644
index b318b954..00000000
--- a/app/src/main/res/layout/toro_exo_player_view.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2018 Nam Nguyen, nam@ene.im
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
-
-  <com.google.android.exoplayer2.ui.AspectRatioFrameLayout
-      android:id="@id/exo_content_frame"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:layout_gravity="center"
-      >
-
-    <!-- Video surface will be inserted as the first child of the content frame. -->
-
-    <View
-        android:id="@id/exo_shutter"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/black"
-        />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@id/exo_artwork"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="fitXY"
-        />
-
-    <com.google.android.exoplayer2.ui.SubtitleView
-        android:id="@id/exo_subtitles"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        />
-
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@id/exo_error_message"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="@color/exo_error_message_background_color"
-        android:gravity="center"
-        android:padding="16dp"
-        />
-
-  </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
-
-  <FrameLayout
-      android:id="@id/exo_ad_overlay"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      />
-
-  <FrameLayout
-      android:id="@id/exo_overlay"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      />
-
-  <ProgressBar
-      android:id="@id/exo_buffering"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:layout_gravity="center"
-      android:indeterminate="true"
-      />
-
-  <ml.docilealligator.infinityforreddit.videoautoplay.ui.ToroControlView
-      android:id="@id/exo_controller"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_gravity="bottom"
-      app:controller_layout_id="@layout/toro_exo_control_view" />
-
-</merge>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 29108bee..39cc538a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1297,13 +1297,6 @@
 
     <string name="unexpected_intent_action">Unexpected intent action: <xliff:g id="action">%1$s</xliff:g></string>
     <string name="enable_random_adaptation">Enable random adaptation</string>
-    <string name="error_drm_not_supported">Protected content not supported on API levels below 18</string>
-    <string name="error_drm_unsupported_scheme">This device does not support the required DRM scheme</string>
-    <string name="error_drm_unknown">An unknown DRM error occurred</string>
-    <string name="error_no_decoder">This device does not provide a decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
-    <string name="error_no_secure_decoder">This device does not provide a secure decoder for <xliff:g id="mime_type">%1$s</xliff:g></string>
-    <string name="error_querying_decoders">Unable to query device decoders</string>
-    <string name="error_instantiating_decoder">Unable to instantiate decoder <xliff:g id="decoder_name">%1$s</xliff:g></string>
     <string name="error_unsupported_video">Media includes video tracks, but none are playable by this device</string>
     <string name="error_unsupported_audio">Media includes audio tracks, but none are playable by this device</string>
     <string name="storage_permission_denied">Permission to access storage was denied</string>
-- 
cgit v1.2.3