aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2020-01-05 02:57:32 +0000
committerAlex Ning <chineseperson5@gmail.com>2020-01-05 02:57:32 +0000
commit35acef9f8de9614f9cd108aa6a443ce0ba2abae5 (patch)
treeef1ec95431940061e49660830bdb74ae57befeae /app/src/main/res
parenta143501f9f3571c9f6c28490e8e826ece3dfa205 (diff)
downloadinfinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.tar
infinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.tar.gz
infinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.tar.bz2
infinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.tar.lz
infinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.tar.xz
infinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.tar.zst
infinity-for-reddit-35acef9f8de9614f9cd108aa6a443ce0ba2abae5.zip
Mute videos by default is now available.
Diffstat (limited to '')
-rw-r--r--app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml9
-rw-r--r--app/src/main/res/drawable/ic_mute_24dp.xml9
-rw-r--r--app/src/main/res/drawable/ic_mute_preferences_24dp.xml9
-rw-r--r--app/src/main/res/drawable/ic_unmute_24dp.xml9
-rw-r--r--app/src/main/res/layout/exo_playback_control_view.xml11
-rw-r--r--app/src/main/res/values/strings.xml1
-rw-r--r--app/src/main/res/xml/main_preferences.xml6
7 files changed, 51 insertions, 3 deletions
diff --git a/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml b/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml
new file mode 100644
index 00000000..ff764c78
--- /dev/null
+++ b/app/src/main/res/drawable-night/ic_mute_preferences_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4.34,2.93L2.93,4.34 7.29,8.7 7,9L3,9v6h4l5,5v-6.59l4.18,4.18c-0.65,0.49 -1.38,0.88 -2.18,1.11v2.06c1.34,-0.3 2.57,-0.92 3.61,-1.75l2.05,2.05 1.41,-1.41L4.34,2.93zM10,15.17L7.83,13L5,13v-2h2.83l0.88,-0.88L10,11.41v3.76zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM12,4l-1.88,1.88L12,7.76zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mute_24dp.xml b/app/src/main/res/drawable/ic_mute_24dp.xml
new file mode 100644
index 00000000..ff764c78
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mute_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4.34,2.93L2.93,4.34 7.29,8.7 7,9L3,9v6h4l5,5v-6.59l4.18,4.18c-0.65,0.49 -1.38,0.88 -2.18,1.11v2.06c1.34,-0.3 2.57,-0.92 3.61,-1.75l2.05,2.05 1.41,-1.41L4.34,2.93zM10,15.17L7.83,13L5,13v-2h2.83l0.88,-0.88L10,11.41v3.76zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM12,4l-1.88,1.88L12,7.76zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_mute_preferences_24dp.xml b/app/src/main/res/drawable/ic_mute_preferences_24dp.xml
new file mode 100644
index 00000000..c206c848
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mute_preferences_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FF000000"
+ android:pathData="M4.34,2.93L2.93,4.34 7.29,8.7 7,9L3,9v6h4l5,5v-6.59l4.18,4.18c-0.65,0.49 -1.38,0.88 -2.18,1.11v2.06c1.34,-0.3 2.57,-0.92 3.61,-1.75l2.05,2.05 1.41,-1.41L4.34,2.93zM10,15.17L7.83,13L5,13v-2h2.83l0.88,-0.88L10,11.41v3.76zM19,12c0,0.82 -0.15,1.61 -0.41,2.34l1.53,1.53c0.56,-1.17 0.88,-2.48 0.88,-3.87 0,-4.28 -2.99,-7.86 -7,-8.77v2.06c2.89,0.86 5,3.54 5,6.71zM12,4l-1.88,1.88L12,7.76zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v1.79l2.48,2.48c0.01,-0.08 0.02,-0.16 0.02,-0.24z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unmute_24dp.xml b/app/src/main/res/drawable/ic_unmute_24dp.xml
new file mode 100644
index 00000000..d2c9bb24
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unmute_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM10,8.83v6.34L7.83,13L5,13v-2h2.83L10,8.83zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77 0,-4.28 -2.99,-7.86 -7,-8.77z"/>
+</vector>
diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml
index ed305e41..d76c46fc 100644
--- a/app/src/main/res/layout/exo_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_playback_control_view.xml
@@ -18,16 +18,21 @@
android:orientation="horizontal">
<ImageButton android:id="@id/exo_rew"
- style="@style/ExoMediaButton.Rewind"/>
+ style="@style/ExoMediaButton.Rewind" />
<ImageButton android:id="@id/exo_play"
style="@style/ExoMediaButton.Play"/>
<ImageButton android:id="@id/exo_pause"
- style="@style/ExoMediaButton.Pause"/>
+ style="@style/ExoMediaButton.Pause" />
<ImageButton android:id="@id/exo_ffwd"
- style="@style/ExoMediaButton.FastForward"/>
+ style="@style/ExoMediaButton.FastForward" />
+
+ <ImageButton
+ android:id="@+id/mute_exo_playback_control_view"
+ style="@style/ExoMediaButton"
+ android:visibility="gone" />
</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 64cbedf9..dc6bcf92 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -298,6 +298,7 @@
<string name="settings_vote_buttons_on_the_right_title">Vote Buttons on the Right</string>
<string name="settings_volume_keys_navigate_comments_title">Use Volume Keys to Navigate Comments in Posts</string>
<string name="settings_volume_keys_navigate_posts_title">Use Volume Keys to Navigate Posts</string>
+ <string name="settings_mute_video_title">Mute Video</string>
<string name="settings_show_elapsed_time">Show Elapsed Time in Posts and Comments</string>
<string name="swipe_to_go_back_from_post_detail">Swipe Right to Go Back From Comments</string>
<string name="settings_lazy_mode_interval_title">Lazy Mode Interval</string>
diff --git a/app/src/main/res/xml/main_preferences.xml b/app/src/main/res/xml/main_preferences.xml
index 02c0f750..561222cd 100644
--- a/app/src/main/res/xml/main_preferences.xml
+++ b/app/src/main/res/xml/main_preferences.xml
@@ -56,6 +56,12 @@
app:key="volume_keys_navigate_posts"
app:title="@string/settings_volume_keys_navigate_posts_title" />
+ <SwitchPreference
+ app:defaultValue="false"
+ app:key="mute_video"
+ android:icon="@drawable/ic_mute_preferences_24dp"
+ app:title="@string/settings_mute_video_title" />
+
<Preference
app:title="@string/settings_font_size_title"
app:icon="@drawable/ic_font_size_24dp"