From 272f02258a8f5a5e887131c9de3d254f4e8d8599 Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Wed, 14 Feb 2018 16:22:09 +0100
Subject: [PATCH] add setting for default video mute state

---
 .../org/floens/chan/core/presenter/ImageViewerPresenter.java  | 4 +++-
 .../main/java/org/floens/chan/core/settings/ChanSettings.java | 2 ++
 .../floens/chan/ui/controller/MediaSettingsController.java    | 4 ++++
 Clover/app/src/main/res/values/strings.xml                    | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
index 533be287..4d03b60d 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/presenter/ImageViewerPresenter.java
@@ -58,11 +58,13 @@ public class ImageViewerPresenter implements MultiImageView.Callback, ViewPager.
     private boolean viewPagerVisible = false;
     private boolean changeViewsOnInTransitionEnd = false;
 
-    private boolean muted = true;
+    private boolean muted;
 
     public ImageViewerPresenter(Callback callback) {
         this.callback = callback;
         inject(this);
+
+        muted = ChanSettings.videoDefaultMuted.get();
     }
 
     public void showImages(List<PostImage> images, int position, Loadable loadable) {
diff --git a/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java b/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
index ca13c3bc..1b6fdc88 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/settings/ChanSettings.java
@@ -131,6 +131,7 @@ public class ChanSettings {
     public static final BooleanSetting neverHideToolbar;
     public static final BooleanSetting controllerSwipeable;
     public static final BooleanSetting saveBoardFolder;
+    public static final BooleanSetting videoDefaultMuted;
 
     public static final BooleanSetting watchEnabled;
     public static final BooleanSetting watchCountdown;
@@ -207,6 +208,7 @@ public class ChanSettings {
         neverHideToolbar = new BooleanSetting(p, "preference_never_hide_toolbar", false);
         controllerSwipeable = new BooleanSetting(p, "preference_controller_swipeable", true);
         saveBoardFolder = new BooleanSetting(p, "preference_save_subboard", false);
+        videoDefaultMuted = new BooleanSetting(p, "preference_video_default_muted", true);
 
         watchEnabled = new BooleanSetting(p, "preference_watch_enabled", false);
         watchEnabled.addCallback((setting, value) ->
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MediaSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MediaSettingsController.java
index 35514e34..ec6253cc 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MediaSettingsController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MediaSettingsController.java
@@ -101,6 +101,10 @@ public class MediaSettingsController extends SettingsController {
                     R.string.setting_save_original_filename,
                     R.string.setting_save_original_filename_description));
 
+            media.add(new BooleanSettingView(this, ChanSettings.videoDefaultMuted,
+                    R.string.setting_video_default_muted,
+                    R.string.setting_video_default_muted_description));
+
             media.add(new BooleanSettingView(this, ChanSettings.videoOpenExternal,
                     R.string.setting_video_open_external,
                     R.string.setting_video_open_external_description));
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index f5976a9f..9771ab97 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -520,6 +520,8 @@ Re-enable this permission in the app settings if you permanently disabled it."</
     <string name="setting_save_original_filename">Save original filename</string>
     <string name="setting_save_original_filename_description">Save the image with the filename the site assigned.
         If disabled, save the image with the filename from the uploader.</string>
+    <string name="setting_video_default_muted">Start videos muted</string>
+    <string name="setting_video_default_muted_description">If a video has audio, mute it by default.</string>
     <string name="setting_video_open_external">Open videos external</string>
     <string name="setting_video_open_external_description">Open videos in an external media player</string>
     <string name="setting_share_url">Share url to image</string>