skipInterceptionOfElements = Arrays.asList(
- R.id.detail_content_root_layout, R.id.relatedStreamsLayout,
+ R.id.detail_content_root_layout, R.id.relatedItemsLayout,
R.id.itemsListPanel, R.id.view_pager, R.id.tab_layout, R.id.bottomControls,
R.id.playPauseButton, R.id.playPreviousButton, R.id.playNextButton);
diff --git a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
index a0b2e7eba..998324c9c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
+++ b/app/src/main/java/org/schabi/newpipe/player/event/PlayerGestureListener.java
@@ -147,10 +147,10 @@ public class PlayerGestureListener
player.getVolumeImageView().setImageDrawable(
AppCompatResources.getDrawable(service, currentProgressPercent <= 0
- ? R.drawable.ic_volume_off_white_24dp
- : currentProgressPercent < 0.25 ? R.drawable.ic_volume_mute_white_24dp
- : currentProgressPercent < 0.75 ? R.drawable.ic_volume_down_white_24dp
- : R.drawable.ic_volume_up_white_24dp)
+ ? R.drawable.ic_volume_off
+ : currentProgressPercent < 0.25 ? R.drawable.ic_volume_mute
+ : currentProgressPercent < 0.75 ? R.drawable.ic_volume_down
+ : R.drawable.ic_volume_up)
);
if (player.getVolumeRelativeLayout().getVisibility() != View.VISIBLE) {
@@ -189,10 +189,10 @@ public class PlayerGestureListener
player.getBrightnessImageView().setImageDrawable(
AppCompatResources.getDrawable(service,
currentProgressPercent < 0.25
- ? R.drawable.ic_brightness_low_white_24dp
+ ? R.drawable.ic_brightness_low
: currentProgressPercent < 0.75
- ? R.drawable.ic_brightness_medium_white_24dp
- : R.drawable.ic_brightness_high_white_24dp)
+ ? R.drawable.ic_brightness_medium
+ : R.drawable.ic_brightness_high)
);
if (player.getBrightnessRelativeLayout().getVisibility() != View.VISIBLE) {
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
index 13ee24e16..c4b21f203 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java
@@ -103,13 +103,13 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
animateAudio(DUCK_AUDIO_TO, 1.0f);
if (PlayerHelper.isResumeAfterAudioFocusGain(context)) {
- player.setPlayWhenReady(true);
+ player.play();
}
}
private void onAudioFocusLoss() {
Log.d(TAG, "onAudioFocusLoss() called");
- player.setPlayWhenReady(false);
+ player.pause();
}
private void onAudioFocusLossCanDuck() {
@@ -148,7 +148,7 @@ public class AudioReactor implements AudioManager.OnAudioFocusChangeListener, An
//////////////////////////////////////////////////////////////////////////*/
@Override
- public void onAudioSessionId(final EventTime eventTime, final int audioSessionId) {
+ public void onAudioSessionIdChanged(final EventTime eventTime, final int audioSessionId) {
if (!PlayerHelper.isUsingDSP()) {
return;
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java b/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java
index ba9a2f1ec..fe0233508 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java
@@ -4,7 +4,7 @@ import com.google.android.exoplayer2.DefaultLoadControl;
import com.google.android.exoplayer2.LoadControl;
import com.google.android.exoplayer2.Renderer;
import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
import com.google.android.exoplayer2.upstream.Allocator;
public class LoadController implements LoadControl {
@@ -33,7 +33,7 @@ public class LoadController implements LoadControl {
final DefaultLoadControl.Builder builder = new DefaultLoadControl.Builder();
builder.setBufferDurationsMs(minimumPlaybackBufferMs, optimalPlaybackBufferMs,
initialPlaybackBufferMs, initialPlaybackBufferMs);
- internalLoadControl = builder.createDefaultLoadControl();
+ internalLoadControl = builder.build();
}
/*//////////////////////////////////////////////////////////////////////////
@@ -47,9 +47,9 @@ public class LoadController implements LoadControl {
}
@Override
- public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroupArray,
- final TrackSelectionArray trackSelectionArray) {
- internalLoadControl.onTracksSelected(renderers, trackGroupArray, trackSelectionArray);
+ public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroups,
+ final ExoTrackSelection[] trackSelections) {
+ internalLoadControl.onTracksSelected(renderers, trackGroups, trackSelections);
}
@Override
@@ -92,11 +92,12 @@ public class LoadController implements LoadControl {
@Override
public boolean shouldStartPlayback(final long bufferedDurationUs, final float playbackSpeed,
- final boolean rebuffering) {
+ final boolean rebuffering, final long targetLiveOffsetUs) {
final boolean isInitialPlaybackBufferFilled
= bufferedDurationUs >= this.initialPlaybackBufferUs * playbackSpeed;
final boolean isInternalStartingPlayback = internalLoadControl
- .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering);
+ .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering,
+ targetLiveOffsetUs);
return isInitialPlaybackBufferFilled || isInternalStartingPlayback;
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
index b0c641433..c7f1f9c8c 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java
@@ -36,8 +36,6 @@ public class MediaSessionManager {
@NonNull final Player player,
@NonNull final MediaSessionCallback callback) {
mediaSession = new MediaSessionCompat(context, TAG);
- mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
- | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
mediaSession.setActive(true);
mediaSession.setPlaybackState(new PlaybackStateCompat.Builder()
diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
index 4324fcd0a..0a3ea908a 100644
--- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java
@@ -23,7 +23,7 @@ import com.google.android.exoplayer2.Player.RepeatMode;
import com.google.android.exoplayer2.SeekParameters;
import com.google.android.exoplayer2.text.CaptionStyleCompat;
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
import com.google.android.exoplayer2.util.MimeTypes;
@@ -180,10 +180,10 @@ public final class PlayerHelper {
* if a candidate next video's url already exists in the existing items.
*
*
- * The first item in {@link StreamInfo#getRelatedStreams()} is checked first.
+ * The first item in {@link StreamInfo#getRelatedItems()} is checked first.
* If it is non-null and is not part of the existing items, it will be used as the next stream.
- * Otherwise, a random item with non-repeating url will be selected
- * from the {@link StreamInfo#getRelatedStreams()}.
+ * Otherwise, a random stream with non-repeating url will be selected
+ * from the {@link StreamInfo#getRelatedItems()}. Non-stream items are ignored.
*
*
* @param info currently playing stream
@@ -198,7 +198,7 @@ public final class PlayerHelper {
urls.add(item.getUrl());
}
- final List relatedItems = info.getRelatedStreams();
+ final List relatedItems = info.getRelatedItems();
if (Utils.isNullOrEmpty(relatedItems)) {
return null;
}
@@ -323,7 +323,7 @@ public final class PlayerHelper {
return 60000;
}
- public static TrackSelection.Factory getQualitySelector() {
+ public static ExoTrackSelection.Factory getQualitySelector() {
return new AdaptiveTrackSelection.Factory(
1000,
AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
index d70707fdb..389be7062 100644
--- a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
+++ b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java
@@ -13,7 +13,7 @@ import com.google.android.exoplayer2.RendererCapabilities.Capabilities;
import com.google.android.exoplayer2.source.TrackGroup;
import com.google.android.exoplayer2.source.TrackGroupArray;
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
import com.google.android.exoplayer2.util.Assertions;
/**
@@ -28,7 +28,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
private String preferredTextLanguage;
public CustomTrackSelector(final Context context,
- final TrackSelection.Factory adaptiveTrackSelectionFactory) {
+ final ExoTrackSelection.Factory adaptiveTrackSelectionFactory) {
super(context, adaptiveTrackSelectionFactory);
}
@@ -50,7 +50,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
@Override
@Nullable
- protected Pair selectTextTrack(
+ protected Pair selectTextTrack(
final TrackGroupArray groups,
@NonNull final int[][] formatSupport,
@NonNull final Parameters params,
@@ -86,7 +86,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
}
}
return selectedGroup == null ? null
- : Pair.create(new TrackSelection.Definition(selectedGroup, selectedTrackIndex),
+ : Pair.create(new ExoTrackSelection.Definition(selectedGroup, selectedTrackIndex),
Assertions.checkNotNull(selectedTrackScore));
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
index e06c0ff82..a6dcadd5e 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
@@ -7,6 +7,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.util.Util;
@@ -43,13 +44,13 @@ public interface PlaybackResolver extends Resolver {
switch (type) {
case C.TYPE_SS:
return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
case C.TYPE_DASH:
return dataSource.getLiveDashMediaSourceFactory().setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
case C.TYPE_HLS:
return dataSource.getLiveHlsMediaSourceFactory().setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
default:
throw new IllegalStateException("Unsupported type: " + type);
}
@@ -68,16 +69,16 @@ public interface PlaybackResolver extends Resolver {
switch (type) {
case C.TYPE_SS:
return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
case C.TYPE_DASH:
return dataSource.getDashMediaSourceFactory().setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
case C.TYPE_HLS:
return dataSource.getHlsMediaSourceFactory().setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
case C.TYPE_OTHER:
return dataSource.getExtractorMediaSourceFactory(cacheKey).setTag(metadata)
- .createMediaSource(uri);
+ .createMediaSource(MediaItem.fromUri(uri));
default:
throw new IllegalStateException("Unsupported type: " + type);
}
diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
index a2b3a1d3d..245a85e71 100644
--- a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
+++ b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
@@ -6,7 +6,7 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.MediaItem;
import com.google.android.exoplayer2.source.MediaSource;
import com.google.android.exoplayer2.source.MergingMediaSource;
@@ -22,7 +22,6 @@ import org.schabi.newpipe.util.ListHelper;
import java.util.ArrayList;
import java.util.List;
-import static com.google.android.exoplayer2.C.SELECTION_FLAG_AUTOSELECT;
import static com.google.android.exoplayer2.C.TIME_UNSET;
public class VideoPlaybackResolver implements PlaybackResolver {
@@ -101,12 +100,12 @@ public class VideoPlaybackResolver implements PlaybackResolver {
if (mimeType == null) {
continue;
}
-
- final Format textFormat = Format.createTextSampleFormat(null, mimeType,
- SELECTION_FLAG_AUTOSELECT,
- PlayerHelper.captionLanguageOf(context, subtitle));
final MediaSource textSource = dataSource.getSampleMediaSourceFactory()
- .createMediaSource(Uri.parse(subtitle.getUrl()), textFormat, TIME_UNSET);
+ .createMediaSource(
+ new MediaItem.Subtitle(Uri.parse(subtitle.getUrl()),
+ mimeType,
+ PlayerHelper.captionLanguageOf(context, subtitle)),
+ TIME_UNSET);
mediaSources.add(textSource);
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
index e2ac2c20d..1e1b03b4f 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java
@@ -7,12 +7,12 @@ import android.os.Bundle;
import android.provider.Settings;
import android.widget.Toast;
-import androidx.annotation.Nullable;
import androidx.core.app.ActivityCompat;
import androidx.preference.Preference;
import org.schabi.newpipe.R;
import org.schabi.newpipe.util.Constants;
+import org.schabi.newpipe.util.ThemeHelper;
public class AppearanceSettingsFragment extends BasePreferenceFragment {
private static final boolean CAPTIONING_SETTINGS_ACCESSIBLE =
@@ -21,8 +21,8 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
private String captionSettingsKey;
@Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+ addPreferencesFromResource(R.xml.appearance_settings);
final String themeKey = getString(R.string.theme_key);
// the key of the active theme when settings were opened (or recreated after theme change)
@@ -58,11 +58,6 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
}
}
- @Override
- public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
- addPreferencesFromResource(R.xml.appearance_settings);
- }
-
@Override
public boolean onPreferenceTreeClick(final Preference preference) {
if (preference.getKey().equals(captionSettingsKey) && CAPTIONING_SETTINGS_ACCESSIBLE) {
@@ -89,6 +84,8 @@ public class AppearanceSettingsFragment extends BasePreferenceFragment {
defaultPreferences.edit().putBoolean(Constants.KEY_THEME_CHANGE, true).apply();
defaultPreferences.edit().putString(themeKey, newValue.toString()).apply();
+ ThemeHelper.setDayNightMode(getContext(), newValue.toString());
+
if (!newValue.equals(beginningThemeKey) && getActivity() != null) {
// if it's not the current theme
ActivityCompat.recreate(getActivity());
diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
index dbe05bbd2..3fd44c4d5 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -1,7 +1,6 @@
package org.schabi.newpipe.settings;
import android.app.Activity;
-import android.app.AlertDialog;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
@@ -10,7 +9,7 @@ import android.util.Log;
import android.widget.Toast;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
import androidx.core.content.ContextCompat;
import androidx.preference.Preference;
import androidx.preference.PreferenceManager;
@@ -50,8 +49,35 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
private String initialLanguage;
@Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+ final File homeDir = ContextCompat.getDataDir(requireContext());
+ manager = new ContentSettingsManager(new NewPipeFileLocator(homeDir));
+ manager.deleteSettingsFile();
+
+ addPreferencesFromResource(R.xml.content_settings);
+
+ final Preference importDataPreference = findPreference(getString(R.string.import_data));
+ importDataPreference.setOnPreferenceClickListener(p -> {
+ final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
+ .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
+ .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, false)
+ .putExtra(FilePickerActivityHelper.EXTRA_MODE,
+ FilePickerActivityHelper.MODE_FILE);
+ startActivityForResult(i, REQUEST_IMPORT_PATH);
+ return true;
+ });
+
+ final Preference exportDataPreference = findPreference(getString(R.string.export_data));
+ exportDataPreference.setOnPreferenceClickListener(p -> {
+ final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
+ .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
+ .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
+ .putExtra(FilePickerActivityHelper.EXTRA_MODE,
+ FilePickerActivityHelper.MODE_DIR);
+ startActivityForResult(i, REQUEST_EXPORT_PATH);
+ return true;
+ });
+
thumbnailLoadToggleKey = getString(R.string.download_thumbnail_key);
youtubeRestrictedModeEnabledKey = getString(R.string.youtube_restricted_mode_enabled);
@@ -103,37 +129,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
return super.onPreferenceTreeClick(preference);
}
- @Override
- public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
- final File homeDir = ContextCompat.getDataDir(requireContext());
- manager = new ContentSettingsManager(new NewPipeFileLocator(homeDir));
- manager.deleteSettingsFile();
-
- addPreferencesFromResource(R.xml.content_settings);
-
- final Preference importDataPreference = findPreference(getString(R.string.import_data));
- importDataPreference.setOnPreferenceClickListener(p -> {
- final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
- .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
- .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, false)
- .putExtra(FilePickerActivityHelper.EXTRA_MODE,
- FilePickerActivityHelper.MODE_FILE);
- startActivityForResult(i, REQUEST_IMPORT_PATH);
- return true;
- });
-
- final Preference exportDataPreference = findPreference(getString(R.string.export_data));
- exportDataPreference.setOnPreferenceClickListener(p -> {
- final Intent i = new Intent(getActivity(), FilePickerActivityHelper.class)
- .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_MULTIPLE, false)
- .putExtra(FilePickerActivityHelper.EXTRA_ALLOW_CREATE_DIR, true)
- .putExtra(FilePickerActivityHelper.EXTRA_MODE,
- FilePickerActivityHelper.MODE_DIR);
- startActivityForResult(i, REQUEST_EXPORT_PATH);
- return true;
- });
- }
-
@Override
public void onDestroy() {
super.onDestroy();
@@ -174,7 +169,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
final SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
exportDatabase(path + "/NewPipeData-" + sdf.format(new Date()) + ".zip");
} else {
- final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+ final AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity());
builder.setMessage(R.string.override_current_data)
.setPositiveButton(getString(R.string.finish),
(d, id) -> importDatabase(path))
@@ -220,7 +215,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
//If settings file exist, ask if it should be imported.
if (manager.extractSettings(filePath)) {
- final AlertDialog.Builder alert = new AlertDialog.Builder(getContext());
+ final AlertDialog.Builder alert = new AlertDialog.Builder(requireContext());
alert.setTitle(R.string.import_settings);
alert.setNegativeButton(android.R.string.no, (dialog, which) -> {
diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
index 8742f0937..913512644 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java
@@ -1,7 +1,6 @@
package org.schabi.newpipe.settings;
import android.app.Activity;
-import android.app.AlertDialog;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
@@ -11,8 +10,8 @@ import android.os.Bundle;
import android.util.Log;
import android.widget.Toast;
-import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
import com.nononsenseapps.filepicker.Utils;
@@ -46,8 +45,8 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
private Context ctx;
@Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+ addPreferencesFromResource(R.xml.download_settings);
downloadPathVideoPreference = getString(R.string.download_path_video_key);
downloadPathAudioPreference = getString(R.string.download_path_audio_key);
@@ -76,11 +75,6 @@ public class DownloadSettingsFragment extends BasePreferenceFragment {
});
}
- @Override
- public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
- addPreferencesFromResource(R.xml.download_settings);
- }
-
@Override
public void onAttach(final Context context) {
super.onAttach(context);
diff --git a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
index 89fabbdde..cb6ce263d 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java
@@ -5,7 +5,6 @@ import android.os.Bundle;
import android.widget.Toast;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.preference.Preference;
@@ -29,8 +28,9 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
private CompositeDisposable disposables;
@Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+ addPreferencesFromResource(R.xml.history_settings);
+
cacheWipeKey = getString(R.string.metadata_cache_wipe_key);
viewsHistoryClearKey = getString(R.string.clear_views_history_key);
playbackStatesClearKey = getString(R.string.clear_playback_states_key);
@@ -39,11 +39,6 @@ public class HistorySettingsFragment extends BasePreferenceFragment {
disposables = new CompositeDisposable();
}
- @Override
- public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
- addPreferencesFromResource(R.xml.history_settings);
- }
-
@Override
public boolean onPreferenceTreeClick(final Preference preference) {
if (preference.getKey().equals(cacheWipeKey)) {
diff --git a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
index bd3cbf79d..550e9be3f 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java
@@ -145,10 +145,8 @@ public class PeertubeInstanceListFragment extends Fragment {
final MenuItem restoreItem = menu
.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults);
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-
- final int restoreIcon = ThemeHelper
- .resolveResourceIdFromAttr(requireContext(), R.attr.ic_restore_defaults);
- restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(), restoreIcon));
+ restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
+ R.drawable.ic_settings_backup_restore));
}
@Override
@@ -188,7 +186,7 @@ public class PeertubeInstanceListFragment extends Fragment {
}
private void restoreDefaults() {
- new AlertDialog.Builder(requireContext(), ThemeHelper.getDialogTheme(requireContext()))
+ new AlertDialog.Builder(requireContext())
.setTitle(R.string.restore_defaults)
.setMessage(R.string.restore_defaults_confirmation)
.setNegativeButton(R.string.cancel, null)
diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
index 4de166a55..68908fc92 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java
@@ -56,11 +56,11 @@ public class SettingsActivity extends AppCompatActivity
SettingsLayoutBinding.inflate(getLayoutInflater());
setContentView(settingsLayoutBinding.getRoot());
- setSupportActionBar(settingsLayoutBinding.toolbarLayout.toolbar);
+ setSupportActionBar(settingsLayoutBinding.settingsToolbarLayout.toolbar);
if (savedInstanceBundle == null) {
getSupportFragmentManager().beginTransaction()
- .replace(R.id.fragment_holder, new MainSettingsFragment())
+ .replace(R.id.settings_fragment_holder, new MainSettingsFragment())
.commit();
}
@@ -102,7 +102,7 @@ public class SettingsActivity extends AppCompatActivity
getSupportFragmentManager().beginTransaction()
.setCustomAnimations(R.animator.custom_fade_in, R.animator.custom_fade_out,
R.animator.custom_fade_in, R.animator.custom_fade_out)
- .replace(R.id.fragment_holder, fragment)
+ .replace(R.id.settings_fragment_holder, fragment)
.addToBackStack(null)
.commit();
return true;
diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
index f25b25df2..0ca15e245 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java
@@ -2,7 +2,6 @@ package org.schabi.newpipe.settings;
import android.os.Bundle;
-import androidx.annotation.Nullable;
import androidx.preference.Preference;
import org.schabi.newpipe.R;
@@ -16,15 +15,10 @@ public class UpdateSettingsFragment extends BasePreferenceFragment {
};
@Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+ addPreferencesFromResource(R.xml.update_settings);
final String updateToggleKey = getString(R.string.update_app_key);
findPreference(updateToggleKey).setOnPreferenceChangeListener(updatePreferenceChange);
}
-
- @Override
- public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
- addPreferencesFromResource(R.xml.update_settings);
- }
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
index 5eca99822..c0d274fe0 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/VideoAudioSettingsFragment.java
@@ -8,7 +8,6 @@ import android.provider.Settings;
import android.text.format.DateUtils;
import android.widget.Toast;
-import androidx.annotation.Nullable;
import androidx.preference.ListPreference;
import com.google.android.material.snackbar.Snackbar;
@@ -23,8 +22,8 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
private SharedPreferences.OnSharedPreferenceChangeListener listener;
@Override
- public void onCreate(@Nullable final Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+ addPreferencesFromResource(R.xml.video_audio_settings);
updateSeekOptions();
@@ -104,11 +103,6 @@ public class VideoAudioSettingsFragment extends BasePreferenceFragment {
}
}
- @Override
- public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
- addPreferencesFromResource(R.xml.video_audio_settings);
- }
-
@Override
public void onResume() {
super.onResume();
diff --git a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
index e50c858ca..045e574be 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/custom/NotificationActionsPreference.java
@@ -17,6 +17,7 @@ import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.graphics.drawable.DrawableCompat;
@@ -41,9 +42,8 @@ public class NotificationActionsPreference extends Preference {
}
- private NotificationSlot[] notificationSlots;
-
- private List compactSlots;
+ @Nullable private NotificationSlot[] notificationSlots = null;
+ @Nullable private List compactSlots = null;
////////////////////////////////////////////////////////////////////////////
// Lifecycle
@@ -85,19 +85,22 @@ public class NotificationActionsPreference extends Preference {
////////////////////////////////////////////////////////////////////////////
private void saveChanges() {
- final SharedPreferences.Editor editor = getSharedPreferences().edit();
+ if (compactSlots != null && notificationSlots != null) {
+ final SharedPreferences.Editor editor = getSharedPreferences().edit();
- for (int i = 0; i < 3; i++) {
- editor.putInt(getContext().getString(NotificationConstants.SLOT_COMPACT_PREF_KEYS[i]),
- (i < compactSlots.size() ? compactSlots.get(i) : -1));
+ for (int i = 0; i < 3; i++) {
+ editor.putInt(getContext().getString(
+ NotificationConstants.SLOT_COMPACT_PREF_KEYS[i]),
+ (i < compactSlots.size() ? compactSlots.get(i) : -1));
+ }
+
+ for (int i = 0; i < 5; i++) {
+ editor.putInt(getContext().getString(NotificationConstants.SLOT_PREF_KEYS[i]),
+ notificationSlots[i].selectedAction);
+ }
+
+ editor.apply();
}
-
- for (int i = 0; i < 5; i++) {
- editor.putInt(getContext().getString(NotificationConstants.SLOT_PREF_KEYS[i]),
- notificationSlots[i].selectedAction);
- }
-
- editor.apply();
}
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
index 52e50fbba..e2e833fee 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
@@ -1,6 +1,5 @@
package org.schabi.newpipe.settings.tabs;
-import android.app.AlertDialog;
import android.content.Context;
import android.content.DialogInterface;
import android.view.LayoutInflater;
@@ -11,10 +10,10 @@ import android.widget.TextView;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.AppCompatImageView;
import org.schabi.newpipe.R;
-import org.schabi.newpipe.util.ThemeHelper;
public final class AddTabDialog {
private final AlertDialog dialog;
@@ -60,7 +59,7 @@ public final class AddTabDialog {
private DialogListAdapter(final Context context, final ChooseTabListItem[] items) {
this.inflater = LayoutInflater.from(context);
this.items = items;
- this.fallbackIcon = ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_kiosk_hot);
+ this.fallbackIcon = R.drawable.ic_whatshot;
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
index 572741d03..9c1a9bdd7 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java
@@ -112,10 +112,8 @@ public class ChooseTabsFragment extends Fragment {
final MenuItem restoreItem = menu.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE,
R.string.restore_defaults);
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-
- final int restoreIcon = ThemeHelper.resolveResourceIdFromAttr(requireContext(),
- R.attr.ic_restore_defaults);
- restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(), restoreIcon));
+ restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
+ R.drawable.ic_settings_backup_restore));
}
@Override
@@ -142,7 +140,7 @@ public class ChooseTabsFragment extends Fragment {
}
private void restoreDefaults() {
- new AlertDialog.Builder(requireContext(), ThemeHelper.getDialogTheme(requireContext()))
+ new AlertDialog.Builder(requireContext())
.setTitle(R.string.restore_defaults)
.setMessage(R.string.restore_defaults_confirmation)
.setNegativeButton(R.string.cancel, null)
@@ -241,7 +239,7 @@ public class ChooseTabsFragment extends Fragment {
case KIOSK:
returnList.add(new ChooseTabListItem(tab.getTabId(),
getString(R.string.kiosk_page_summary),
- ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_kiosk_hot)));
+ R.drawable.ic_whatshot));
break;
case CHANNEL:
returnList.add(new ChooseTabListItem(tab.getTabId(),
@@ -252,8 +250,7 @@ public class ChooseTabsFragment extends Fragment {
if (!tabList.contains(tab)) {
returnList.add(new ChooseTabListItem(tab.getTabId(),
getString(R.string.default_kiosk_page_summary),
- ThemeHelper.resolveResourceIdFromAttr(context,
- R.attr.ic_kiosk_hot)));
+ R.drawable.ic_whatshot));
}
break;
case PLAYLIST:
diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
index 0ffda2261..b289009ce 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
@@ -30,7 +30,6 @@ import org.schabi.newpipe.local.playlist.LocalPlaylistFragment;
import org.schabi.newpipe.local.subscription.SubscriptionFragment;
import org.schabi.newpipe.util.KioskTranslator;
import org.schabi.newpipe.util.ServiceHelper;
-import org.schabi.newpipe.util.ThemeHelper;
import java.util.Objects;
@@ -188,7 +187,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_blank_page);
+ return R.drawable.ic_crop_portrait;
}
@Override
@@ -213,7 +212,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_channel);
+ return R.drawable.ic_tv;
}
@Override
@@ -239,7 +238,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_rss);
+ return R.drawable.ic_rss_feed;
}
@Override
@@ -264,7 +263,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_bookmark);
+ return R.drawable.ic_bookmark;
}
@Override
@@ -289,7 +288,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_history);
+ return R.drawable.ic_history;
}
@Override
@@ -409,7 +408,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_channel);
+ return R.drawable.ic_tv;
}
@Override
@@ -541,7 +540,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
- return ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_bookmark);
+ return R.drawable.ic_bookmark;
}
@Override
diff --git a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
index 52069fd0e..91578f27e 100644
--- a/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
+++ b/app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java
@@ -20,6 +20,16 @@ public final class DeviceUtils {
private static final String AMAZON_FEATURE_FIRE_TV = "amazon.hardware.fire_tv";
private static Boolean isTV = null;
+ /*
+ * Devices that do not support media tunneling
+ */
+ // Formuler Z8 Pro, Z8, CC, Z Alpha, Z+ Neo
+ private static final boolean HI3798MV200 = Build.VERSION.SDK_INT == 24
+ && Build.DEVICE.equals("Hi3798MV200");
+ // Zephir TS43UHD-2
+ private static final boolean CVT_MT5886_EU_1G = Build.VERSION.SDK_INT == 24
+ && Build.DEVICE.equals("cvt_mt5886_eu_1g");
+
private DeviceUtils() {
}
@@ -88,4 +98,15 @@ public final class DeviceUtils {
sp,
context.getResources().getDisplayMetrics());
}
+
+ /**
+ * Some devices have broken tunneled video playback but claim to support it.
+ * See https://github.com/TeamNewPipe/NewPipe/issues/5911
+ * @return false if Kitkat (does not support tunneling) or affected device
+ */
+ public static boolean shouldSupportMediaTunneling() {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
+ && !HI3798MV200
+ && !CVT_MT5886_EU_1G;
+ }
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
index 2f0b3e132..f77aa0fda 100644
--- a/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
+++ b/app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
@@ -63,20 +63,20 @@ public final class KioskTranslator {
case "Top 50":
case "New & hot":
case "conferences":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_hot);
+ return R.drawable.ic_whatshot;
case "Local":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_local);
+ return R.drawable.ic_home;
case "Recently added":
case "recent":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_recent);
+ return R.drawable.ic_add_circle_outline;
case "Most liked":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_thumb_up);
+ return R.drawable.ic_thumb_up;
case "live":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_live_tv);
+ return R.drawable.ic_live_tv;
case "Featured":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_stars);
+ return R.drawable.ic_stars;
case "Radio":
- return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_radio);
+ return R.drawable.ic_radio;
default:
return 0;
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
index 4f4fd5283..df804136a 100644
--- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
@@ -62,7 +62,8 @@ public final class NavigationHelper {
public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
public static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag";
- private NavigationHelper() { }
+ private NavigationHelper() {
+ }
/*//////////////////////////////////////////////////////////////////////////
// Players
@@ -111,18 +112,22 @@ public final class NavigationHelper {
public static void playOnMainPlayer(final AppCompatActivity activity,
@NonNull final PlayQueue playQueue) {
final PlayQueueItem item = playQueue.getItem();
- assert item != null;
- openVideoDetailFragment(activity, activity.getSupportFragmentManager(),
- item.getServiceId(), item.getUrl(), item.getTitle(), playQueue, false);
+ if (item != null) {
+ openVideoDetailFragment(activity, activity.getSupportFragmentManager(),
+ item.getServiceId(), item.getUrl(), item.getTitle(), playQueue,
+ false);
+ }
}
public static void playOnMainPlayer(final Context context,
@NonNull final PlayQueue playQueue,
final boolean switchingPlayers) {
final PlayQueueItem item = playQueue.getItem();
- assert item != null;
- openVideoDetail(context,
- item.getServiceId(), item.getUrl(), item.getTitle(), playQueue, switchingPlayers);
+ if (item != null) {
+ openVideoDetail(context,
+ item.getServiceId(), item.getUrl(), item.getTitle(), playQueue,
+ switchingPlayers);
+ }
}
public static void playOnPopupPlayer(final Context context,
diff --git a/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java b/app/src/main/java/org/schabi/newpipe/util/RelatedItemInfo.java
similarity index 54%
rename from app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java
rename to app/src/main/java/org/schabi/newpipe/util/RelatedItemInfo.java
index 81e203b1f..f96bb0d54 100644
--- a/app/src/main/java/org/schabi/newpipe/util/RelatedStreamInfo.java
+++ b/app/src/main/java/org/schabi/newpipe/util/RelatedItemInfo.java
@@ -9,19 +9,19 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-public class RelatedStreamInfo extends ListInfo {
- public RelatedStreamInfo(final int serviceId, final ListLinkHandler listUrlIdHandler,
- final String name) {
+public class RelatedItemInfo extends ListInfo {
+ public RelatedItemInfo(final int serviceId, final ListLinkHandler listUrlIdHandler,
+ final String name) {
super(serviceId, listUrlIdHandler, name);
}
- public static RelatedStreamInfo getInfo(final StreamInfo info) {
+ public static RelatedItemInfo getInfo(final StreamInfo info) {
final ListLinkHandler handler = new ListLinkHandler(
info.getOriginalUrl(), info.getUrl(), info.getId(), Collections.emptyList(), null);
- final RelatedStreamInfo relatedStreamInfo = new RelatedStreamInfo(
+ final RelatedItemInfo relatedItemInfo = new RelatedItemInfo(
info.getServiceId(), handler, info.getName());
- final List streams = new ArrayList<>(info.getRelatedStreams());
- relatedStreamInfo.setRelatedItems(streams);
- return relatedStreamInfo;
+ final List relatedItems = new ArrayList<>(info.getRelatedItems());
+ relatedItemInfo.setRelatedItems(relatedItems);
+ return relatedItemInfo;
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
index ab28205fc..6ebdaee02 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java
@@ -72,10 +72,10 @@ public final class StateSaver {
}
/**
- * @see #tryToRestore(SavedState, WriteRead)
* @param outState
* @param writeRead
* @return the saved state
+ * @see #tryToRestore(SavedState, WriteRead)
*/
public static SavedState tryToRestore(final Bundle outState, final WriteRead writeRead) {
if (outState == null || writeRead == null) {
@@ -93,6 +93,7 @@ public final class StateSaver {
/**
* Try to restore the state from memory and disk,
* using the {@link StateSaver.WriteRead#readFrom(Queue)} from the writeRead.
+ *
* @param savedState
* @param writeRead
* @return the saved state
@@ -143,19 +144,18 @@ public final class StateSaver {
}
/**
- * @see #tryToSave(boolean, String, String, WriteRead)
* @param isChangingConfig
* @param savedState
* @param outState
* @param writeRead
* @return the saved state or {@code null}
+ * @see #tryToSave(boolean, String, String, WriteRead)
*/
@Nullable
public static SavedState tryToSave(final boolean isChangingConfig,
@Nullable final SavedState savedState, final Bundle outState,
final WriteRead writeRead) {
- @NonNull
- final String currentSavedPrefix;
+ @NonNull final String currentSavedPrefix;
if (savedState == null || TextUtils.isEmpty(savedState.getPrefixFileSaved())) {
// Generate unique prefix
currentSavedPrefix = System.nanoTime() - writeRead.hashCode() + "";
@@ -299,8 +299,11 @@ public final class StateSaver {
cacheDir = new File(cacheDir, CACHE_DIR_NAME);
if (cacheDir.exists()) {
- for (final File file : cacheDir.listFiles()) {
- file.delete();
+ final File[] list = cacheDir.listFiles();
+ if (list != null) {
+ for (final File file : list) {
+ file.delete();
+ }
}
}
}
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
index 73fee32f7..2d59febc2 100644
--- a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java
@@ -24,6 +24,12 @@ public enum StreamDialogEntry {
// enum values with DEFAULT actions //
//////////////////////////////////////
+ show_channel_details(R.string.show_channel_details, (fragment, item) ->
+ // For some reason `getParentFragmentManager()` doesn't work, but this does.
+ NavigationHelper.openChannelFragment(fragment.getActivity().getSupportFragmentManager(),
+ item.getServiceId(), item.getUploaderUrl(), item.getUploaderName())
+ ),
+
/**
* Enqueues the stream automatically to the current PlayerType.
*
diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
index dcfb7ed19..907bcf0ba 100644
--- a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
+++ b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
@@ -23,7 +23,6 @@ import android.app.Activity;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
-import android.content.res.TypedArray;
import android.util.TypedValue;
import androidx.annotation.AttrRes;
@@ -31,6 +30,7 @@ import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.ActionBar;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
import androidx.core.content.ContextCompat;
import androidx.preference.PreferenceManager;
@@ -47,6 +47,9 @@ public final class ThemeHelper {
* Apply the selected theme (on NewPipe settings) in the context
* with the default style (see {@link #setTheme(Context, int)}).
*
+ * ThemeHelper.setDayNightMode should be called before
+ * the applying theme for the first time in session
+ *
* @param context context that the theme will be applied
*/
public static void setTheme(final Context context) {
@@ -57,6 +60,9 @@ public final class ThemeHelper {
* Apply the selected theme (on NewPipe settings) in the context,
* themed according with the styles defined for the service .
*
+ * ThemeHelper.setDayNightMode should be called before
+ * the applying theme for the first time in session
+ *
* @param context context that the theme will be applied
* @param serviceId the theme will be styled to the service with this id,
* pass -1 to get the default style
@@ -120,6 +126,7 @@ public final class ThemeHelper {
final String selectedThemeKey = getSelectedThemeKey(context);
+
int baseTheme = R.style.DarkTheme; // default to dark theme
if (selectedThemeKey.equals(lightThemeKey)) {
baseTheme = R.style.LightTheme;
@@ -202,20 +209,6 @@ public final class ThemeHelper {
}
}
- /**
- * Get a resource id from a resource styled according to the context's theme.
- *
- * @param context Android app context
- * @param attr attribute reference of the resource
- * @return resource ID
- */
- public static int resolveResourceIdFromAttr(final Context context, @AttrRes final int attr) {
- final TypedArray a = context.getTheme().obtainStyledAttributes(new int[]{attr});
- final int attributeResourceId = a.getResourceId(0, 0);
- a.recycle();
- return attributeResourceId;
- }
-
/**
* Get a color from an attr styled according to the context's theme.
*
@@ -288,4 +281,21 @@ public final class ThemeHelper {
return false;
}
}
+
+ public static void setDayNightMode(final Context context) {
+ setDayNightMode(context, ThemeHelper.getSelectedThemeKey(context));
+ }
+
+ public static void setDayNightMode(final Context context, final String selectedThemeKey) {
+ final Resources res = context.getResources();
+
+ if (selectedThemeKey.equals(res.getString(R.string.light_theme_key))) {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
+ } else if (selectedThemeKey.equals(res.getString(R.string.dark_theme_key))
+ || selectedThemeKey.equals(res.getString(R.string.black_theme_key))) {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
+ } else {
+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
+ }
+ }
}
diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
index 3270b2b6f..c83eec819 100644
--- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
+++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java
@@ -1,7 +1,6 @@
package us.shandian.giga.ui.fragment;
import android.app.Activity;
-import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -19,6 +18,7 @@ import android.view.ViewGroup;
import android.widget.Toast;
import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.GridLayoutManager;
@@ -224,10 +224,9 @@ public class MissionsFragment extends Fragment {
mList.setAdapter(mAdapter);
if (mSwitch != null) {
- mSwitch.setIcon(ThemeHelper.resolveResourceIdFromAttr(
- requireContext(), mLinear
- ? R.attr.ic_grid
- : R.attr.ic_list));
+ mSwitch.setIcon(mLinear
+ ? R.drawable.ic_apps
+ : R.drawable.ic_list);
mSwitch.setTitle(mLinear ? R.string.grid : R.string.list);
mPrefs.edit().putBoolean("linear", mLinear).apply();
}
diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java
index c090c7211..ab584f0e6 100644
--- a/app/src/main/java/us/shandian/giga/util/Utility.java
+++ b/app/src/main/java/us/shandian/giga/util/Utility.java
@@ -182,12 +182,12 @@ public class Utility {
public static int getIconForFileType(FileType type) {
switch (type) {
case MUSIC:
- return R.drawable.ic_headset_white_24dp;
+ return R.drawable.ic_headset;
default:
case VIDEO:
- return R.drawable.ic_movie_white_24dp;
+ return R.drawable.ic_movie;
case SUBTITLE:
- return R.drawable.ic_subtitles_white_24dp;
+ return R.drawable.ic_subtitles;
}
}
diff --git a/app/src/main/res/drawable-hdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-hdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-hdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-hdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-hdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-hdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-hdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-mdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-mdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-mdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-mdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-mdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable-night/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_add_circle_outline_white_24dp.xml b/app/src/main/res/drawable-night/ic_add_circle_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_circle_outline_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_add_circle_outline.xml
diff --git a/app/src/main/res/drawable/ic_apps_white_24dp.xml b/app/src/main/res/drawable-night/ic_apps.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_apps_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_apps.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml b/app/src/main/res/drawable-night/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_asterisk_white_24dp.xml b/app/src/main/res/drawable-night/ic_asterisk.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_asterisk_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_asterisk.xml
diff --git a/app/src/main/res/drawable/ic_attach_money_white_24dp.xml b/app/src/main/res/drawable-night/ic_attach_money.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_attach_money_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_attach_money.xml
diff --git a/app/src/main/res/drawable/ic_backup_white_24dp.xml b/app/src/main/res/drawable-night/ic_backup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_backup_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_backup.xml
diff --git a/app/src/main/res/drawable/ic_bookmark_white_24dp.xml b/app/src/main/res/drawable-night/ic_bookmark.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bookmark_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_bookmark.xml
diff --git a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml b/app/src/main/res/drawable-night/ic_bug_report.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bug_report_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_bug_report.xml
diff --git a/app/src/main/res/drawable/ic_cast_white_24dp.xml b/app/src/main/res/drawable-night/ic_cast.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cast_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_cast.xml
diff --git a/app/src/main/res/drawable/ic_child_care_white_24dp.xml b/app/src/main/res/drawable-night/ic_child_care.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_child_care_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_child_care.xml
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable-night/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_cloud_download_white_24dp.xml b/app/src/main/res/drawable-night/ic_cloud_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cloud_download_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_cloud_download.xml
diff --git a/app/src/main/res/drawable/ic_computer_white_24dp.xml b/app/src/main/res/drawable-night/ic_computer.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_computer_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_computer.xml
diff --git a/app/src/main/res/drawable/ic_crop_portrait_white_24dp.xml b/app/src/main/res/drawable-night/ic_crop_portrait.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_crop_portrait_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_crop_portrait.xml
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable-night/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_directions_bike_white_24dp.xml b/app/src/main/res/drawable-night/ic_directions_bike.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_bike_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_directions_bike.xml
diff --git a/app/src/main/res/drawable/ic_directions_car_white_24dp.xml b/app/src/main/res/drawable-night/ic_directions_car.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_car_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_directions_car.xml
diff --git a/app/src/main/res/drawable/ic_done_white_24dp.xml b/app/src/main/res/drawable-night/ic_done.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_done_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_done.xml
diff --git a/app/src/main/res/drawable/ic_drag_handle_white_24dp.xml b/app/src/main/res/drawable-night/ic_drag_handle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_drag_handle_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_drag_handle.xml
diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable-night/ic_edit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_edit_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_edit.xml
diff --git a/app/src/main/res/drawable/ic_expand_less_white_24dp.xml b/app/src/main/res/drawable-night/ic_expand_less.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_expand_less.xml
diff --git a/app/src/main/res/drawable/ic_expand_more_white_24dp.xml b/app/src/main/res/drawable-night/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_explore_white_24dp.xml b/app/src/main/res/drawable-night/ic_explore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_explore_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_explore.xml
diff --git a/app/src/main/res/drawable/ic_fastfood_white_24dp.xml b/app/src/main/res/drawable-night/ic_fastfood.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fastfood_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_fastfood.xml
diff --git a/app/src/main/res/drawable/ic_favorite_white_24dp.xml b/app/src/main/res/drawable-night/ic_favorite.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_favorite_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_favorite.xml
diff --git a/app/src/main/res/drawable/ic_file_download_white_24dp.xml b/app/src/main/res/drawable-night/ic_file_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_file_download.xml
diff --git a/app/src/main/res/drawable/ic_filter_list_white_24dp.xml b/app/src/main/res/drawable-night/ic_filter_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_filter_list_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_filter_list.xml
diff --git a/app/src/main/res/drawable/ic_fitness_center_white_24dp.xml b/app/src/main/res/drawable-night/ic_fitness_center.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fitness_center_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_fitness_center.xml
diff --git a/app/src/main/res/drawable/ic_headset_white_24dp.xml b/app/src/main/res/drawable-night/ic_headset.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_headset_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_headset.xml
index 3ca2936b8..f23764766 100644
--- a/app/src/main/res/drawable/ic_headset_white_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_headset.xml
@@ -5,6 +5,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_help_white_24dp.xml b/app/src/main/res/drawable-night/ic_help.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_help_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_help.xml
diff --git a/app/src/main/res/drawable/ic_history_white_24dp.xml b/app/src/main/res/drawable-night/ic_history.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_history_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_history.xml
diff --git a/app/src/main/res/drawable/ic_home_white_24dp.xml b/app/src/main/res/drawable-night/ic_home.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_home_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_home.xml
diff --git a/app/src/main/res/drawable/ic_import_export_white_24dp.xml b/app/src/main/res/drawable-night/ic_import_export.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_import_export_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_import_export.xml
diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable-night/ic_info_outline.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_info_outline_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_info_outline.xml
index 2465f7808..d772001df 100644
--- a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_info_outline.xml
@@ -5,6 +5,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_insert_emoticon_white_24dp.xml b/app/src/main/res/drawable-night/ic_insert_emoticon.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_insert_emoticon_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_insert_emoticon.xml
diff --git a/app/src/main/res/drawable/ic_language_white_24dp.xml b/app/src/main/res/drawable-night/ic_language.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_language_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_language.xml
diff --git a/app/src/main/res/drawable/ic_list_white_24dp.xml b/app/src/main/res/drawable-night/ic_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_list_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_list.xml
diff --git a/app/src/main/res/drawable/ic_live_tv_white_24dp.xml b/app/src/main/res/drawable-night/ic_live_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_live_tv_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_live_tv.xml
diff --git a/app/src/main/res/drawable/ic_megaphone_white_24dp.xml b/app/src/main/res/drawable-night/ic_megaphone.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_megaphone_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_megaphone.xml
diff --git a/app/src/main/res/drawable/ic_mic_white_24dp.xml b/app/src/main/res/drawable-night/ic_mic.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_mic_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_mic.xml
diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable-night/ic_more_vert.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_vert_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_more_vert.xml
diff --git a/app/src/main/res/drawable/ic_motorcycle_white_24dp.xml b/app/src/main/res/drawable-night/ic_motorcycle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_motorcycle_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_motorcycle.xml
diff --git a/app/src/main/res/drawable/ic_movie_white_24dp.xml b/app/src/main/res/drawable-night/ic_movie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_movie_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_movie.xml
diff --git a/app/src/main/res/drawable/ic_music_note_white_24dp.xml b/app/src/main/res/drawable-night/ic_music_note.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_music_note_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_music_note.xml
diff --git a/app/src/main/res/drawable/ic_palette_white_24dp.xml b/app/src/main/res/drawable-night/ic_palette.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_palette_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_palette.xml
diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable-night/ic_pause.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pause_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_pause.xml
diff --git a/app/src/main/res/drawable/ic_people_white_24dp.xml b/app/src/main/res/drawable-night/ic_people.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_people_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_people.xml
diff --git a/app/src/main/res/drawable/ic_person_white_24dp.xml b/app/src/main/res/drawable-night/ic_person.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_person_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_person.xml
diff --git a/app/src/main/res/drawable/ic_pets_white_24dp.xml b/app/src/main/res/drawable-night/ic_pets.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pets_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_pets.xml
diff --git a/app/src/main/res/drawable/ic_picture_in_picture_white_24dp.xml b/app/src/main/res/drawable-night/ic_picture_in_picture.xml
similarity index 91%
rename from app/src/main/res/drawable/ic_picture_in_picture_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_picture_in_picture.xml
index f6b3205cc..1b01f3233 100644
--- a/app/src/main/res/drawable/ic_picture_in_picture_white_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_picture_in_picture.xml
@@ -5,6 +5,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable-night/ic_play_arrow.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_play_arrow.xml
index 098b71d1f..95cace1c8 100644
--- a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_play_arrow.xml
@@ -5,6 +5,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable-night/ic_playlist_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_playlist_add.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_check_white_24dp.xml b/app/src/main/res/drawable-night/ic_playlist_add_check.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_check_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_playlist_add_check.xml
diff --git a/app/src/main/res/drawable/ic_public_white_24dp.xml b/app/src/main/res/drawable-night/ic_public.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_public_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_public.xml
diff --git a/app/src/main/res/drawable/ic_radio_white_24dp.xml b/app/src/main/res/drawable-night/ic_radio.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_radio_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_radio.xml
diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable-night/ic_refresh.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_refresh_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_refresh.xml
diff --git a/app/src/main/res/drawable/ic_restaurant_white_24dp.xml b/app/src/main/res/drawable-night/ic_restaurant.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_restaurant_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_restaurant.xml
diff --git a/app/src/main/res/drawable/ic_rss_feed_white_24dp.xml b/app/src/main/res/drawable-night/ic_rss_feed.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_rss_feed_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_rss_feed.xml
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable-night/ic_save.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_save_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_save.xml
diff --git a/app/src/main/res/drawable/ic_school_white_24dp.xml b/app/src/main/res/drawable-night/ic_school.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_school_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_school.xml
diff --git a/app/src/main/res/drawable/ic_search_white_24dp.xml b/app/src/main/res/drawable-night/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_search_add_white_24dp.xml b/app/src/main/res/drawable-night/ic_search_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_add_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_search_add.xml
diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable-night/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_settings.xml
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable-night/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_shopping_cart_white_24dp.xml b/app/src/main/res/drawable-night/ic_shopping_cart.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shopping_cart_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_shopping_cart.xml
diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable-night/ic_sort.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sort_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_sort.xml
diff --git a/app/src/main/res/drawable/ic_stars_white_24dp.xml b/app/src/main/res/drawable-night/ic_stars.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_stars_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_stars.xml
diff --git a/app/src/main/res/drawable/ic_telescope_white_24dp.xml b/app/src/main/res/drawable-night/ic_telescope.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_telescope_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_telescope.xml
diff --git a/app/src/main/res/drawable/ic_thumb_down_white_24dp.xml b/app/src/main/res/drawable-night/ic_thumb_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_down_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_thumb_down.xml
diff --git a/app/src/main/res/drawable/ic_thumb_up_white_24dp.xml b/app/src/main/res/drawable-night/ic_thumb_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_up_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_thumb_up.xml
diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable-night/ic_trending_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_trending_up_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_trending_up.xml
diff --git a/app/src/main/res/drawable/ic_tv_white_24dp.xml b/app/src/main/res/drawable-night/ic_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_tv_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_tv.xml
diff --git a/app/src/main/res/drawable/ic_videogame_asset_white_24dp.xml b/app/src/main/res/drawable-night/ic_videogame_asset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_videogame_asset_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_videogame_asset.xml
diff --git a/app/src/main/res/drawable/ic_volume_off_black_24dp.xml b/app/src/main/res/drawable-night/ic_volume_off.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_volume_off_black_24dp.xml
rename to app/src/main/res/drawable-night/ic_volume_off.xml
index 19f166ddc..a2cabcee0 100644
--- a/app/src/main/res/drawable/ic_volume_off_black_24dp.xml
+++ b/app/src/main/res/drawable-night/ic_volume_off.xml
@@ -4,6 +4,7 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
+
diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable-night/ic_volume_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_up_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_volume_up.xml
diff --git a/app/src/main/res/drawable/ic_watch_later_white_24dp.xml b/app/src/main/res/drawable-night/ic_watch_later.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_watch_later_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_watch_later.xml
diff --git a/app/src/main/res/drawable/ic_wb_sunny_white_24dp.xml b/app/src/main/res/drawable-night/ic_wb_sunny.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_wb_sunny_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_wb_sunny.xml
diff --git a/app/src/main/res/drawable/ic_whatshot_white_24dp.xml b/app/src/main/res/drawable-night/ic_whatshot.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_whatshot_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_whatshot.xml
diff --git a/app/src/main/res/drawable/ic_work_white_24dp.xml b/app/src/main/res/drawable-night/ic_work.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_work_white_24dp.xml
rename to app/src/main/res/drawable-night/ic_work.xml
diff --git a/app/src/main/res/drawable-xhdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-xhdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-xhdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xhdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-xhdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-xhdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-xxhdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-xxhdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xxhdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxhdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-xxhdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_close_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_close_white_24dp_png.png
rename to app/src/main/res/drawable-xxxhdpi/ic_close_white.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white_24dp_png.png
rename to app/src/main/res/drawable-xxxhdpi/ic_hourglass_top_white.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png b/app/src/main/res/drawable-xxxhdpi/ic_replay_white.png
similarity index 100%
rename from app/src/main/res/drawable-xxxhdpi/ic_replay_white_24dp_png.png
rename to app/src/main/res/drawable-xxxhdpi/ic_replay_white.png
diff --git a/app/src/main/res/drawable/ic_add_black_24dp.xml b/app/src/main/res/drawable/ic_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_add.xml
diff --git a/app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml b/app/src/main/res/drawable/ic_add_circle_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_add_circle_outline_black_24dp.xml
rename to app/src/main/res/drawable/ic_add_circle_outline.xml
diff --git a/app/src/main/res/drawable/ic_apps_black_24dp.xml b/app/src/main/res/drawable/ic_apps.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_apps_black_24dp.xml
rename to app/src/main/res/drawable/ic_apps.xml
diff --git a/app/src/main/res/drawable/ic_arrow_back_black_24dp.xml b/app/src/main/res/drawable/ic_arrow_back.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_back_black_24dp.xml
rename to app/src/main/res/drawable/ic_arrow_back.xml
diff --git a/app/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_drop_down_white_24dp.xml
rename to app/src/main/res/drawable/ic_arrow_drop_down.xml
diff --git a/app/src/main/res/drawable/ic_arrow_drop_up_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_drop_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_arrow_drop_up_white_24dp.xml
rename to app/src/main/res/drawable/ic_arrow_drop_up.xml
diff --git a/app/src/main/res/drawable/ic_art_track_white_24dp.xml b/app/src/main/res/drawable/ic_art_track.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_art_track_white_24dp.xml
rename to app/src/main/res/drawable/ic_art_track.xml
diff --git a/app/src/main/res/drawable/ic_asterisk_black_24dp.xml b/app/src/main/res/drawable/ic_asterisk.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_asterisk_black_24dp.xml
rename to app/src/main/res/drawable/ic_asterisk.xml
diff --git a/app/src/main/res/drawable/ic_attach_money_black_24dp.xml b/app/src/main/res/drawable/ic_attach_money.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_attach_money_black_24dp.xml
rename to app/src/main/res/drawable/ic_attach_money.xml
diff --git a/app/src/main/res/drawable/ic_backup_black_24dp.xml b/app/src/main/res/drawable/ic_backup.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_backup_black_24dp.xml
rename to app/src/main/res/drawable/ic_backup.xml
diff --git a/app/src/main/res/drawable/ic_bookmark_black_24dp.xml b/app/src/main/res/drawable/ic_bookmark.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bookmark_black_24dp.xml
rename to app/src/main/res/drawable/ic_bookmark.xml
diff --git a/app/src/main/res/drawable/ic_brightness_high_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_high.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_brightness_high_white_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_high.xml
diff --git a/app/src/main/res/drawable/ic_brightness_low_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_low.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_brightness_low_white_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_low.xml
diff --git a/app/src/main/res/drawable/ic_brightness_medium_white_24dp.xml b/app/src/main/res/drawable/ic_brightness_medium.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_brightness_medium_white_24dp.xml
rename to app/src/main/res/drawable/ic_brightness_medium.xml
diff --git a/app/src/main/res/drawable/ic_bug_report_black_24dp.xml b/app/src/main/res/drawable/ic_bug_report.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_bug_report_black_24dp.xml
rename to app/src/main/res/drawable/ic_bug_report.xml
diff --git a/app/src/main/res/drawable/ic_cast_black_24dp.xml b/app/src/main/res/drawable/ic_cast.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cast_black_24dp.xml
rename to app/src/main/res/drawable/ic_cast.xml
diff --git a/app/src/main/res/drawable/ic_child_care_black_24dp.xml b/app/src/main/res/drawable/ic_child_care.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_child_care_black_24dp.xml
rename to app/src/main/res/drawable/ic_child_care.xml
diff --git a/app/src/main/res/drawable/ic_close_black_24dp.xml b/app/src/main/res/drawable/ic_close.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_close_black_24dp.xml
rename to app/src/main/res/drawable/ic_close.xml
diff --git a/app/src/main/res/drawable/ic_cloud_download_black_24dp.xml b/app/src/main/res/drawable/ic_cloud_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_cloud_download_black_24dp.xml
rename to app/src/main/res/drawable/ic_cloud_download.xml
diff --git a/app/src/main/res/drawable/ic_comment_white_24dp.xml b/app/src/main/res/drawable/ic_comment.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_comment_white_24dp.xml
rename to app/src/main/res/drawable/ic_comment.xml
diff --git a/app/src/main/res/drawable/ic_computer_black_24dp.xml b/app/src/main/res/drawable/ic_computer.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_computer_black_24dp.xml
rename to app/src/main/res/drawable/ic_computer.xml
diff --git a/app/src/main/res/drawable/ic_crop_portrait_black_24dp.xml b/app/src/main/res/drawable/ic_crop_portrait.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_crop_portrait_black_24dp.xml
rename to app/src/main/res/drawable/ic_crop_portrait.xml
diff --git a/app/src/main/res/drawable/ic_delete_black_24dp.xml b/app/src/main/res/drawable/ic_delete.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_delete_black_24dp.xml
rename to app/src/main/res/drawable/ic_delete.xml
diff --git a/app/src/main/res/drawable/ic_description_white_24dp.xml b/app/src/main/res/drawable/ic_description.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_description_white_24dp.xml
rename to app/src/main/res/drawable/ic_description.xml
diff --git a/app/src/main/res/drawable/ic_directions_bike_black_24dp.xml b/app/src/main/res/drawable/ic_directions_bike.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_bike_black_24dp.xml
rename to app/src/main/res/drawable/ic_directions_bike.xml
diff --git a/app/src/main/res/drawable/ic_directions_car_black_24dp.xml b/app/src/main/res/drawable/ic_directions_car.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_directions_car_black_24dp.xml
rename to app/src/main/res/drawable/ic_directions_car.xml
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_done_black_24dp.xml
rename to app/src/main/res/drawable/ic_done.xml
diff --git a/app/src/main/res/drawable/ic_drag_handle_black_24dp.xml b/app/src/main/res/drawable/ic_drag_handle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_drag_handle_black_24dp.xml
rename to app/src/main/res/drawable/ic_drag_handle.xml
diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_edit_black_24dp.xml
rename to app/src/main/res/drawable/ic_edit.xml
diff --git a/app/src/main/res/drawable/ic_expand_less_black_24dp.xml b/app/src/main/res/drawable/ic_expand_less.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_less_black_24dp.xml
rename to app/src/main/res/drawable/ic_expand_less.xml
diff --git a/app/src/main/res/drawable/ic_expand_more_black_24dp.xml b/app/src/main/res/drawable/ic_expand_more.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_expand_more_black_24dp.xml
rename to app/src/main/res/drawable/ic_expand_more.xml
diff --git a/app/src/main/res/drawable/ic_explore_black_24dp.xml b/app/src/main/res/drawable/ic_explore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_explore_black_24dp.xml
rename to app/src/main/res/drawable/ic_explore.xml
diff --git a/app/src/main/res/drawable/ic_fast_forward_white_24dp.xml b/app/src/main/res/drawable/ic_fast_forward.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fast_forward_white_24dp.xml
rename to app/src/main/res/drawable/ic_fast_forward.xml
diff --git a/app/src/main/res/drawable/ic_fast_rewind_white_24dp.xml b/app/src/main/res/drawable/ic_fast_rewind.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fast_rewind_white_24dp.xml
rename to app/src/main/res/drawable/ic_fast_rewind.xml
diff --git a/app/src/main/res/drawable/ic_fastfood_black_24dp.xml b/app/src/main/res/drawable/ic_fastfood.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fastfood_black_24dp.xml
rename to app/src/main/res/drawable/ic_fastfood.xml
diff --git a/app/src/main/res/drawable/ic_favorite_black_24dp.xml b/app/src/main/res/drawable/ic_favorite.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_favorite_black_24dp.xml
rename to app/src/main/res/drawable/ic_favorite.xml
diff --git a/app/src/main/res/drawable/ic_file_download_black_24dp.xml b/app/src/main/res/drawable/ic_file_download.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_file_download_black_24dp.xml
rename to app/src/main/res/drawable/ic_file_download.xml
diff --git a/app/src/main/res/drawable/ic_filter_list_black_24dp.xml b/app/src/main/res/drawable/ic_filter_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_filter_list_black_24dp.xml
rename to app/src/main/res/drawable/ic_filter_list.xml
diff --git a/app/src/main/res/drawable/ic_fitness_center_black_24dp.xml b/app/src/main/res/drawable/ic_fitness_center.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fitness_center_black_24dp.xml
rename to app/src/main/res/drawable/ic_fitness_center.xml
diff --git a/app/src/main/res/drawable/ic_format_list_numbered_white_24.xml b/app/src/main/res/drawable/ic_format_list_numbered.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_format_list_numbered_white_24.xml
rename to app/src/main/res/drawable/ic_format_list_numbered.xml
diff --git a/app/src/main/res/drawable/ic_fullscreen_white_24dp.xml b/app/src/main/res/drawable/ic_fullscreen.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fullscreen_white_24dp.xml
rename to app/src/main/res/drawable/ic_fullscreen.xml
diff --git a/app/src/main/res/drawable/ic_fullscreen_exit_white_24dp.xml b/app/src/main/res/drawable/ic_fullscreen_exit.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_fullscreen_exit_white_24dp.xml
rename to app/src/main/res/drawable/ic_fullscreen_exit.xml
diff --git a/app/src/main/res/drawable/ic_headset_black_24dp.xml b/app/src/main/res/drawable/ic_headset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_headset_black_24dp.xml
rename to app/src/main/res/drawable/ic_headset.xml
diff --git a/app/src/main/res/drawable/ic_help_black_24dp.xml b/app/src/main/res/drawable/ic_help.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_help_black_24dp.xml
rename to app/src/main/res/drawable/ic_help.xml
diff --git a/app/src/main/res/drawable/ic_history_black_24dp.xml b/app/src/main/res/drawable/ic_history.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_history_black_24dp.xml
rename to app/src/main/res/drawable/ic_history.xml
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_home_black_24dp.xml
rename to app/src/main/res/drawable/ic_home.xml
diff --git a/app/src/main/res/drawable/ic_hourglass_top_white_24dp.xml b/app/src/main/res/drawable/ic_hourglass_top.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_hourglass_top_white_24dp.xml
rename to app/src/main/res/drawable/ic_hourglass_top.xml
diff --git a/app/src/main/res/drawable/ic_import_export_black_24dp.xml b/app/src/main/res/drawable/ic_import_export.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_import_export_black_24dp.xml
rename to app/src/main/res/drawable/ic_import_export.xml
diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_info_outline_black_24dp.xml
rename to app/src/main/res/drawable/ic_info_outline.xml
diff --git a/app/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml b/app/src/main/res/drawable/ic_insert_emoticon.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_insert_emoticon_black_24dp.xml
rename to app/src/main/res/drawable/ic_insert_emoticon.xml
diff --git a/app/src/main/res/drawable/ic_language_black_24dp.xml b/app/src/main/res/drawable/ic_language.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_language_black_24dp.xml
rename to app/src/main/res/drawable/ic_language.xml
diff --git a/app/src/main/res/drawable/ic_list_black_24dp.xml b/app/src/main/res/drawable/ic_list.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_list_black_24dp.xml
rename to app/src/main/res/drawable/ic_list.xml
diff --git a/app/src/main/res/drawable/ic_live_tv_black_24dp.xml b/app/src/main/res/drawable/ic_live_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_live_tv_black_24dp.xml
rename to app/src/main/res/drawable/ic_live_tv.xml
diff --git a/app/src/main/res/drawable/ic_megaphone_black_24dp.xml b/app/src/main/res/drawable/ic_megaphone.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_megaphone_black_24dp.xml
rename to app/src/main/res/drawable/ic_megaphone.xml
diff --git a/app/src/main/res/drawable/ic_mic_black_24dp.xml b/app/src/main/res/drawable/ic_mic.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_mic_black_24dp.xml
rename to app/src/main/res/drawable/ic_mic.xml
diff --git a/app/src/main/res/drawable/ic_more_vert_black_24dp.xml b/app/src/main/res/drawable/ic_more_vert.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_more_vert_black_24dp.xml
rename to app/src/main/res/drawable/ic_more_vert.xml
diff --git a/app/src/main/res/drawable/ic_motorcycle_black_24dp.xml b/app/src/main/res/drawable/ic_motorcycle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_motorcycle_black_24dp.xml
rename to app/src/main/res/drawable/ic_motorcycle.xml
diff --git a/app/src/main/res/drawable/ic_movie_black_24dp.xml b/app/src/main/res/drawable/ic_movie.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_movie_black_24dp.xml
rename to app/src/main/res/drawable/ic_movie.xml
diff --git a/app/src/main/res/drawable/ic_music_note_black_24dp.xml b/app/src/main/res/drawable/ic_music_note.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_music_note_black_24dp.xml
rename to app/src/main/res/drawable/ic_music_note.xml
diff --git a/app/src/main/res/drawable/ic_next_white_24dp.xml b/app/src/main/res/drawable/ic_next.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_next_white_24dp.xml
rename to app/src/main/res/drawable/ic_next.xml
diff --git a/app/src/main/res/drawable/ic_palette_black_24dp.xml b/app/src/main/res/drawable/ic_palette.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_palette_black_24dp.xml
rename to app/src/main/res/drawable/ic_palette.xml
diff --git a/app/src/main/res/drawable/ic_pause_black_24dp.xml b/app/src/main/res/drawable/ic_pause.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pause_black_24dp.xml
rename to app/src/main/res/drawable/ic_pause.xml
diff --git a/app/src/main/res/drawable/ic_people_black_24dp.xml b/app/src/main/res/drawable/ic_people.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_people_black_24dp.xml
rename to app/src/main/res/drawable/ic_people.xml
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_person_black_24dp.xml
rename to app/src/main/res/drawable/ic_person.xml
diff --git a/app/src/main/res/drawable/ic_pets_black_24dp.xml b/app/src/main/res/drawable/ic_pets.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_pets_black_24dp.xml
rename to app/src/main/res/drawable/ic_pets.xml
diff --git a/app/src/main/res/drawable/ic_picture_in_picture_black_24dp.xml b/app/src/main/res/drawable/ic_picture_in_picture.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_picture_in_picture_black_24dp.xml
rename to app/src/main/res/drawable/ic_picture_in_picture.xml
diff --git a/app/src/main/res/drawable/ic_play_arrow_black_24dp.xml b/app/src/main/res/drawable/ic_play_arrow.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_play_arrow_black_24dp.xml
rename to app/src/main/res/drawable/ic_play_arrow.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_add.xml
diff --git a/app/src/main/res/drawable/ic_playlist_add_check_black_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_check.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_add_check_black_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_add_check.xml
diff --git a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_play.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_playlist_play_white_24dp.xml
rename to app/src/main/res/drawable/ic_playlist_play.xml
diff --git a/app/src/main/res/drawable/ic_previous_white_24dp.xml b/app/src/main/res/drawable/ic_previous.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_previous_white_24dp.xml
rename to app/src/main/res/drawable/ic_previous.xml
diff --git a/app/src/main/res/drawable/ic_public_black_24dp.xml b/app/src/main/res/drawable/ic_public.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_public_black_24dp.xml
rename to app/src/main/res/drawable/ic_public.xml
diff --git a/app/src/main/res/drawable/ic_radio_black_24dp.xml b/app/src/main/res/drawable/ic_radio.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_radio_black_24dp.xml
rename to app/src/main/res/drawable/ic_radio.xml
diff --git a/app/src/main/res/drawable/ic_refresh_black_24dp.xml b/app/src/main/res/drawable/ic_refresh.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_refresh_black_24dp.xml
rename to app/src/main/res/drawable/ic_refresh.xml
diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_repeat_white_24dp.xml
rename to app/src/main/res/drawable/ic_repeat.xml
diff --git a/app/src/main/res/drawable/ic_replay_white_24dp.xml b/app/src/main/res/drawable/ic_replay.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_replay_white_24dp.xml
rename to app/src/main/res/drawable/ic_replay.xml
diff --git a/app/src/main/res/drawable/ic_restaurant_black_24dp.xml b/app/src/main/res/drawable/ic_restaurant.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_restaurant_black_24dp.xml
rename to app/src/main/res/drawable/ic_restaurant.xml
diff --git a/app/src/main/res/drawable/ic_rss_feed_black_24dp.xml b/app/src/main/res/drawable/ic_rss_feed.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_rss_feed_black_24dp.xml
rename to app/src/main/res/drawable/ic_rss_feed.xml
diff --git a/app/src/main/res/drawable/ic_save_black_24dp.xml b/app/src/main/res/drawable/ic_save.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_save_black_24dp.xml
rename to app/src/main/res/drawable/ic_save.xml
diff --git a/app/src/main/res/drawable/ic_school_black_24dp.xml b/app/src/main/res/drawable/ic_school.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_school_black_24dp.xml
rename to app/src/main/res/drawable/ic_school.xml
diff --git a/app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml b/app/src/main/res/drawable/ic_screen_rotation.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_screen_rotation_white_24dp.xml
rename to app/src/main/res/drawable/ic_screen_rotation.xml
diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_black_24dp.xml
rename to app/src/main/res/drawable/ic_search.xml
diff --git a/app/src/main/res/drawable/ic_search_add_black_24dp.xml b/app/src/main/res/drawable/ic_search_add.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_search_add_black_24dp.xml
rename to app/src/main/res/drawable/ic_search_add.xml
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_black_24dp.xml
rename to app/src/main/res/drawable/ic_settings.xml
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_settings_backup_restore_white_24dp.xml
rename to app/src/main/res/drawable/ic_settings_backup_restore.xml
diff --git a/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml b/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml
deleted file mode 100644
index 57f966536..000000000
--- a/app/src/main/res/drawable/ic_settings_backup_restore_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_share_black_24dp.xml
rename to app/src/main/res/drawable/ic_share.xml
diff --git a/app/src/main/res/drawable/ic_shopping_cart_black_24dp.xml b/app/src/main/res/drawable/ic_shopping_cart.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shopping_cart_black_24dp.xml
rename to app/src/main/res/drawable/ic_shopping_cart.xml
diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_shuffle_white_24dp.xml
rename to app/src/main/res/drawable/ic_shuffle.xml
diff --git a/app/src/main/res/drawable/ic_sort_black_24dp.xml b/app/src/main/res/drawable/ic_sort.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_sort_black_24dp.xml
rename to app/src/main/res/drawable/ic_sort.xml
diff --git a/app/src/main/res/drawable/ic_stars_black_24dp.xml b/app/src/main/res/drawable/ic_stars.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_stars_black_24dp.xml
rename to app/src/main/res/drawable/ic_stars.xml
diff --git a/app/src/main/res/drawable/ic_subtitles_white_24dp.xml b/app/src/main/res/drawable/ic_subtitles.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_subtitles_white_24dp.xml
rename to app/src/main/res/drawable/ic_subtitles.xml
diff --git a/app/src/main/res/drawable/ic_telescope_black_24dp.xml b/app/src/main/res/drawable/ic_telescope.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_telescope_black_24dp.xml
rename to app/src/main/res/drawable/ic_telescope.xml
diff --git a/app/src/main/res/drawable/ic_thumb_down_black_24dp.xml b/app/src/main/res/drawable/ic_thumb_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_down_black_24dp.xml
rename to app/src/main/res/drawable/ic_thumb_down.xml
diff --git a/app/src/main/res/drawable/ic_thumb_up_black_24dp.xml b/app/src/main/res/drawable/ic_thumb_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_thumb_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_thumb_up.xml
diff --git a/app/src/main/res/drawable/ic_trending_up_black_24dp.xml b/app/src/main/res/drawable/ic_trending_up.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_trending_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_trending_up.xml
diff --git a/app/src/main/res/drawable/ic_tv_black_24dp.xml b/app/src/main/res/drawable/ic_tv.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_tv_black_24dp.xml
rename to app/src/main/res/drawable/ic_tv.xml
diff --git a/app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml b/app/src/main/res/drawable/ic_videogame_asset.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_videogame_asset_black_24dp.xml
rename to app/src/main/res/drawable/ic_videogame_asset.xml
diff --git a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml b/app/src/main/res/drawable/ic_volume_down.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_down_white_24dp.xml
rename to app/src/main/res/drawable/ic_volume_down.xml
diff --git a/app/src/main/res/drawable/ic_volume_mute_white_24dp.xml b/app/src/main/res/drawable/ic_volume_mute.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_volume_mute_white_24dp.xml
rename to app/src/main/res/drawable/ic_volume_mute.xml
diff --git a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml b/app/src/main/res/drawable/ic_volume_off.xml
similarity index 98%
rename from app/src/main/res/drawable/ic_volume_off_white_24dp.xml
rename to app/src/main/res/drawable/ic_volume_off.xml
index 2f8d6cfb4..7700239a3 100644
--- a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_volume_off.xml
@@ -7,4 +7,4 @@
-
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml b/app/src/main/res/drawable/ic_volume_up.xml
similarity index 94%
rename from app/src/main/res/drawable/ic_volume_up_black_24dp.xml
rename to app/src/main/res/drawable/ic_volume_up.xml
index 2ee5bce43..aaaf84983 100644
--- a/app/src/main/res/drawable/ic_volume_up_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_volume_up.xml
@@ -1,6 +1,7 @@
- -
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml
index b106e7437..4b79d92f6 100644
--- a/app/src/main/res/layout-land/activity_player_queue_control.xml
+++ b/app/src/main/res/layout-land/activity_player_queue_control.xml
@@ -12,8 +12,8 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
- app:popupTheme="@style/ThemeOverlay.AppCompat.ActionBar">
+ android:theme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar"
+ app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight.ActionBar">
@@ -138,7 +139,7 @@
android:focusable="true"
android:scaleType="fitCenter"
android:tint="?attr/colorAccent"
- app:srcCompat="@drawable/ic_pause_white_24dp"
+ app:srcCompat="@drawable/ic_pause"
tools:ignore="ContentDescription" />
@@ -263,7 +264,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:background="@drawable/player_controls_background"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="16dp"
diff --git a/app/src/main/res/layout-large-land/fragment_video_detail.xml b/app/src/main/res/layout-large-land/fragment_video_detail.xml
index b037ca584..d4f1ccc3d 100644
--- a/app/src/main/res/layout-large-land/fragment_video_detail.xml
+++ b/app/src/main/res/layout-large-land/fragment_video_detail.xml
@@ -199,7 +199,7 @@
android:layout_gravity="top|end"
android:layout_marginTop="11dp"
android:layout_marginEnd="10dp"
- app:srcCompat="@drawable/ic_expand_more_white_24dp"
+ app:srcCompat="@drawable/ic_expand_more"
tools:ignore="ContentDescription" />
-
+
-
+