Restore files to match upstream

Author: SttApollo

app/src/main/java/org/schabi/newpipe/player/mediabrowser/MediaBrowserPlaybackPreparer.kt

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.os.ResultReceiver
 import android.support.v4.media.session.PlaybackStateCompat
 import android.util.Log
+import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
 import com.google.android.exoplayer2.Player
 import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector.PlaybackPreparer
@@ -28,7 +29,6 @@ import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue
 import org.schabi.newpipe.player.playqueue.SinglePlayQueue
 import org.schabi.newpipe.util.ChannelTabHelper
 import org.schabi.newpipe.util.ExtractorHelper
-import org.schabi.newpipe.util.Localization
 import org.schabi.newpipe.util.NavigationHelper
 import java.util.function.BiConsumer
 import java.util.function.Consumer
@@ -111,7 +111,7 @@ class MediaBrowserPlaybackPreparer(
     //region Errors
     private fun onUnsupportedError() {
         setMediaSessionError.accept(
-            Localization.compatGetString(context, R.string.content_not_supported),
+            ContextCompat.getString(context, R.string.content_not_supported),
             PlaybackStateCompat.ERROR_CODE_NOT_SUPPORTED
         )
     }

app/src/main/java/org/schabi/newpipe/settings/viewmodel/SettingsViewModel.kt

@@ -3,13 +3,13 @@ package org.schabi.newpipe.settings.viewmodel
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.AndroidViewModel
 import dagger.hilt.android.lifecycle.HiltViewModel
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import org.schabi.newpipe.R
-import org.schabi.newpipe.util.Localization
 import javax.inject.Inject
 
 @HiltViewModel
@@ -20,12 +20,11 @@ class SettingsViewModel @Inject constructor(
 
     private var _settingsLayoutRedesignPref: Boolean
         get() = preferenceManager.getBoolean(
-            Localization.compatGetString(getApplication(), R.string.settings_layout_redesign_key),
-            false
+            ContextCompat.getString(getApplication(), R.string.settings_layout_redesign_key), false
         )
         set(value) {
             preferenceManager.edit().putBoolean(
-                Localization.compatGetString(getApplication(), R.string.settings_layout_redesign_key),
+                ContextCompat.getString(getApplication(), R.string.settings_layout_redesign_key),
                 value
             ).apply()
         }

app/src/main/java/org/schabi/newpipe/util/Localization.java

@@ -18,7 +18,6 @@
 import androidx.annotation.PluralsRes;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDelegate;
-import androidx.core.content.ContextCompat;
 import androidx.core.math.MathUtils;
 import androidx.core.os.LocaleListCompat;
 import androidx.preference.PreferenceManager;
@@ -72,46 +71,6 @@ public final class Localization {
 
     private Localization() { }
 
-    /**
-     * Gets a string like you would normally do with {@link Context#getString}, except that when
-     * Context is not an AppCompatActivity the correct locale is still used. The latter step uses
-     * {@link ContextCompat#getString}, which might fail if the Locale system service is not
-     * available (e.g. inside of Compose previews). In that case this method falls back to plain old
-     * {@link Context#getString}.
-     * <p>This method also supports format args (see {@link #compatGetString(Context, int,
-     * Object...)}, unlike {@link ContextCompat#getString}.</p>
-     *
-     * @param context any Android context, even the App context
-     * @param resId the string resource to resolve
-     * @return the resolved string
-     */
-    public static String compatGetString(final Context context, @StringRes final int resId) {
-        try {
-            return ContextCompat.getString(context, resId);
-        } catch (final Throwable e) {
-            return context.getString(resId);
-        }
-    }
-
-    /**
-     * @see #compatGetString(Context, int)
-     * @param context any Android context, even the App context
-     * @param resId the string resource to resolve
-     * @param formatArgs the formatting arguments
-     * @return the resolved string
-     */
-    public static String compatGetString(final Context context,
-                                         @StringRes final int resId,
-                                         final Object... formatArgs) {
-        try {
-            // ContextCompat.getString() with formatArgs does not exist, so we just
-            // replicate its source code but with formatArgs
-            return ContextCompat.getContextForLanguage(context).getString(resId, formatArgs);
-        } catch (final Throwable e) {
-            return context.getString(resId, formatArgs);
-        }
-    }
-
     @NonNull
     public static String concatenateStrings(final String... strings) {
         return concatenateStrings(DOT_SEPARATOR, Arrays.asList(strings));

app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java

@@ -641,9 +641,10 @@ public static void openAbout(final Context context) {
 
     public static void openSettings(final Context context) {
         final Class<?> settingsClass = PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(Localization.compatGetString(context,
-                                R.string.settings_layout_redesign_key), false)
-                ? SettingsV2Activity.class : SettingsActivity.class;
+                .getBoolean(
+                        ContextCompat.getString(context, R.string.settings_layout_redesign_key),
+                        false
+                ) ? SettingsV2Activity.class : SettingsActivity.class;
 
         final Intent intent = new Intent(context, settingsClass);
         context.startActivity(intent);

app/src/main/res/layout/fragment_video_detail.xml

@@ -214,6 +214,7 @@
                     android:layout_marginTop="@dimen/video_item_detail_error_panel_margin"
                     android:visibility="gone"
                     tools:visibility="gone" />
+
                 <!--HIDING ROOT-->
                 <LinearLayout
                     android:id="@+id/detail_content_root_hiding"