Peertube/TubeLab-App-Android
1
0
Fork 0
mirror of https://framagit.org/tom79/fedilab-tube synced 2025-06-05 21:09:11 +02:00
Code Issues Releases Wiki Activity

Add cache for videos

Browse Source
This commit is contained in:
Thomas
2020-10-03 10:59:31 +02:00
parent 731863ef6c
commit a8b17ce0b2
5 changed files with 71 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/acad/res/values/strings.xml
View File

@@ -186,17 +186,25 @@
<string name="edit_video">Modifier une vidéo</string> <string name="edit_video">Modifier une vidéo</string>
<string name="settings">Paramètres</string> <string name="settings">Paramètres</string>
<string name="video_settings">Paramètres des vidéos</string>
<string name="app_interface">Interface</string>
<string-array name="settings_video_mode"> <string-array name="settings_video_mode">
<item>Normal</item> <item>Normal</item>
<item>Streaming</item> <item>Streaming</item>
<item>Navigateur</item> <item>Navigateur</item>
</string-array> </string-array>
<string name="set_cache_mode">Cache</string>
<string name="set_video_cache_description">Set the cache for videos (default 100Mb)</string>
<string name="video_cache_value">Cache pour les vidéos: %d Mo</string>
<string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string> <string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string>
<string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string> <string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string>
<string name="set_video_language_choice" translatable="false">set_video_language_choice</string> <string name="set_video_language_choice" translatable="false">set_video_language_choice</string>
<string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string> <string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string>
<string name="set_video_cache_choice" translatable="false">set_video_cache_choice</string>
<string-array name="settings_video_quality"> <string-array name="settings_video_quality">
<item>Elevé</item> <item>Elevé</item>

8
app/src/full/res/values/strings.xml
View File

@@ -135,13 +135,19 @@
<string name="my_history">History</string> <string name="my_history">History</string>
<string name="edit">Edit</string> <string name="edit">Edit</string>
<string name="video_settings">Video settings</string>
<string name="app_interface">Interface</string>
<string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string> <string name="set_video_mode_choice" translatable="false">set_video_mode_choice</string>
<string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string> <string name="set_video_minimize_choice" translatable="false">set_video_minimize_choice</string>
<string name="set_video_language_choice" translatable="false">set_video_language_choice</string> <string name="set_video_language_choice" translatable="false">set_video_language_choice</string>
<string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string> <string name="set_video_quality_choice" translatable="false">set_video_quality_choice</string>
<string name="set_video_cache_choice" translatable="false">set_video_cache_choice</string>
<string name="set_cache_mode">Cache</string>
<string name="set_video_cache_description">Définir le cache pour les vidéos (défaut 100Mo)</string>
<string name="set_video_quality_description">Define a default quality for videos</string> <string name="set_video_quality_description">Define a default quality for videos</string>
<string name="set_quality_mode">Resolution for videos</string> <string name="set_quality_mode">Resolution for videos</string>
<string name="video_cache_value">Video cache: %d Mb</string>
<string name="captions">Captions</string> <string name="captions">Captions</string>
<string name="pickup_captions">Pick captions</string> <string name="pickup_captions">Pick captions</string>

14
app/src/main/java/app/fedilab/fedilabtube/fragment/SettingsFragment.java
View File

@@ -9,6 +9,7 @@ import androidx.preference.ListPreference;
import androidx.preference.MultiSelectListPreference; import androidx.preference.MultiSelectListPreference;
import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import androidx.preference.SeekBarPreference;
import androidx.preference.SwitchPreference; import androidx.preference.SwitchPreference;
import java.util.ArrayList; import java.util.ArrayList;
@@ -16,6 +17,7 @@ import java.util.Arrays;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@@ -104,6 +106,13 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
} }
} }
} }
if (key.compareTo(getString(R.string.set_video_cache_choice)) == 0) {
SeekBarPreference set_video_cache_choice = findPreference(getString(R.string.set_video_cache_choice));
assert set_video_cache_choice != null;
final int progress = set_video_cache_choice.getValue();
set_video_cache_choice.setSummary(getActivity().getString(R.string.video_cache_value, progress*10));
editor.putInt(Helper.SET_VIDEO_CACHE, progress*10);
}
if (key.compareTo(getString(R.string.set_video_minimize_choice)) == 0) { if (key.compareTo(getString(R.string.set_video_minimize_choice)) == 0) {
SwitchPreference set_video_minimize_choice = findPreference(getString(R.string.set_video_minimize_choice)); SwitchPreference set_video_minimize_choice = findPreference(getString(R.string.set_video_minimize_choice));
assert set_video_minimize_choice != null; assert set_video_minimize_choice != null;
@@ -159,6 +168,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
set_video_quality_choice.setEntryValues(entryValuesQuality); set_video_quality_choice.setEntryValues(entryValuesQuality);
set_video_quality_choice.setValueIndex(video_quality); set_video_quality_choice.setValueIndex(video_quality);
} }
//****** Video cache *******
SeekBarPreference set_video_cache_choice = findPreference(getString(R.string.set_video_cache_choice));
int video_cache = sharedpref.getInt(Helper.SET_VIDEO_CACHE, Helper.DEFAULT_VIDEO_CACHE_MB);
assert set_video_cache_choice != null;
set_video_cache_choice.setValue(video_cache/10);
boolean minimized = sharedpref.getBoolean(getString(R.string.set_video_minimize_choice), true); boolean minimized = sharedpref.getBoolean(getString(R.string.set_video_minimize_choice), true);
SwitchPreference set_video_minimize_choice = findPreference(getString(R.string.set_video_minimize_choice)); SwitchPreference set_video_minimize_choice = findPreference(getString(R.string.set_video_minimize_choice));

10
app/src/main/res/drawable/ic_baseline_storage_24.xml Normal file
View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
</vector>

51
app/src/main/res/xml/main_preferences.xml
View File

@@ -3,27 +3,38 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:key="app_prefs"> android:key="app_prefs">
<androidx.preference.ListPreference <PreferenceCategory android:title="@string/video_settings">
android:icon="@drawable/ic_baseline_slow_motion_video_24" <androidx.preference.ListPreference
android:key="@string/set_video_mode_choice" android:icon="@drawable/ic_baseline_slow_motion_video_24"
android:summary="@string/set_video_mode_description" android:key="@string/set_video_mode_choice"
android:title="@string/set_video_mode" /> android:summary="@string/set_video_mode_description"
android:title="@string/set_video_mode" />
<androidx.preference.SwitchPreference
android:icon="@drawable/ic_baseline_featured_video_24"
android:key="@string/set_video_minimize_choice"
android:summary="@string/set_video_minimize_description"
android:title="@string/set_video_minimize" />
<androidx.preference.SwitchPreference <androidx.preference.ListPreference
android:icon="@drawable/ic_baseline_featured_video_24" android:icon="@drawable/ic_baseline_high_quality_24"
android:key="@string/set_video_minimize_choice" android:key="@string/set_video_quality_choice"
android:summary="@string/set_video_minimize_description" android:summary="@string/set_video_quality_description"
android:title="@string/set_video_minimize" /> android:title="@string/set_quality_mode" />
<androidx.preference.MultiSelectListPreference <androidx.preference.SeekBarPreference
android:icon="@drawable/ic_baseline_language_24" android:icon="@drawable/ic_baseline_storage_24"
android:key="@string/set_video_language_choice" android:defaultValue="10"
android:summary="@string/set_video_language_description" android:max="50"
android:title="@string/set_video_language" /> android:key="@string/set_video_cache_choice"
android:summary="@string/set_video_cache_description"
android:title="@string/set_cache_mode" />
</PreferenceCategory>
<androidx.preference.ListPreference <PreferenceCategory android:title="@string/app_interface">
android:icon="@drawable/ic_baseline_high_quality_24" <androidx.preference.MultiSelectListPreference
android:key="@string/set_video_quality_choice" android:icon="@drawable/ic_baseline_language_24"
android:summary="@string/set_video_quality_description" android:key="@string/set_video_language_choice"
android:title="@string/set_quality_mode" /> android:summary="@string/set_video_language_description"
android:title="@string/set_video_language" />
</PreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>