From 79102a20d2dd8b0326b46d5522c258383fdfb857 Mon Sep 17 00:00:00 2001 From: magicfelix Date: Sun, 11 Jul 2021 13:08:10 +0200 Subject: [PATCH 01/34] Add Tubus (Invidious) and EduVid (PeerTube) --- app/src/main/AndroidManifest.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 75479345d..5f6071c97 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -224,6 +224,7 @@ + @@ -309,6 +310,7 @@ + From e6c56cacc657802d1cf2c982997042fd1635bc65 Mon Sep 17 00:00:00 2001 From: phigjm <39876427+phigjm@users.noreply.github.com> Date: Mon, 2 Aug 2021 00:46:13 +0200 Subject: [PATCH 02/34] Rearrange the play queue control elements from bottom to top: Playback_controls, progress bar, center, (seek display) --- .../layout/activity_player_queue_control.xml | 59 +++++++++++-------- 1 file changed, 36 insertions(+), 23 deletions(-) diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml index ec47992bb..043e39e5c 100644 --- a/app/src/main/res/layout/activity_player_queue_control.xml +++ b/app/src/main/res/layout/activity_player_queue_control.xml @@ -31,17 +31,44 @@ android:id="@+id/play_queue" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@id/center" + android:layout_above="@id/progress_bar" android:layout_below="@id/appbar" android:scrollbars="vertical" app:layoutManager="LinearLayoutManager" tools:listitem="@layout/play_queue_item" /> + + + + + + + android:layout_above="@id/progress_bar" + android:gravity="center"> - + android:paddingRight="12dp" + android:layout_above="@+id/playback_controls"> + + + From 4d50a66e40bf614ab14a9d968b32d2721a493f1b Mon Sep 17 00:00:00 2001 From: Stypox Date: Mon, 9 Aug 2021 20:05:33 +0200 Subject: [PATCH 03/34] Un-nest some text views in play queue activity --- .../layout/activity_player_queue_control.xml | 117 ++++++++---------- 1 file changed, 49 insertions(+), 68 deletions(-) diff --git a/app/src/main/res/layout/activity_player_queue_control.xml b/app/src/main/res/layout/activity_player_queue_control.xml index 043e39e5c..60beb75be 100644 --- a/app/src/main/res/layout/activity_player_queue_control.xml +++ b/app/src/main/res/layout/activity_player_queue_control.xml @@ -31,84 +31,69 @@ android:id="@+id/play_queue" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@id/progress_bar" + android:layout_above="@id/metadata" android:layout_below="@id/appbar" android:scrollbars="vertical" app:layoutManager="LinearLayoutManager" tools:listitem="@layout/play_queue_item" /> - - - - - + android:layout_centerInParent="true" + android:layout_above="@id/metadata" + android:background="#c0000000" + android:paddingLeft="30dp" + android:paddingTop="5dp" + android:paddingRight="30dp" + android:paddingBottom="5dp" + android:textColor="@android:color/white" + android:textSize="22sp" + android:textStyle="bold" + android:visibility="gone" + tools:ignore="RtlHardcoded" + tools:text="1:06:29" + tools:visibility="visible" /> - + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" + android:orientation="vertical" + android:padding="8dp" + tools:ignore="RtlHardcoded,RtlSymmetry"> - + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:marqueeRepeatLimit="marquee_forever" + android:scrollHorizontally="true" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="14sp" + tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis nec aliquam augue, eget cursus est. Ut id tristique enim, ut scelerisque tellus. Sed ultricies ipsum non mauris ultricies, commodo malesuada velit porta." /> - - - - - - + + - - - - From 669a35bc7875cee62229c1c75b2543e7b045147a Mon Sep 17 00:00:00 2001 From: evermind Date: Sun, 29 Aug 2021 08:23:56 +0200 Subject: [PATCH 04/34] check immediately for updates if user enables 'check for updates setting' - Convert CheckForNewAppVersion to IntentService - reset expire date to 0 after user enables check for updates setting --- app/src/main/AndroidManifest.xml | 3 + app/src/main/java/org/schabi/newpipe/App.java | 12 +- .../schabi/newpipe/CheckForNewAppVersion.java | 134 ++++++++++-------- .../settings/UpdateSettingsFragment.java | 13 +- 4 files changed, 89 insertions(+), 73 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 75479345d..1b16b26c5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -358,6 +358,9 @@ + diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index 9f4b6d550..6fa7bc347 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -5,7 +5,6 @@ import android.content.SharedPreferences; import android.util.Log; import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.core.app.NotificationChannelCompat; import androidx.core.app.NotificationManagerCompat; import androidx.multidex.MultiDexApplication; @@ -35,7 +34,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import io.reactivex.rxjava3.disposables.Disposable; import io.reactivex.rxjava3.exceptions.CompositeException; import io.reactivex.rxjava3.exceptions.MissingBackpressureException; import io.reactivex.rxjava3.exceptions.OnErrorNotImplementedException; @@ -43,6 +41,8 @@ import io.reactivex.rxjava3.exceptions.UndeliverableException; import io.reactivex.rxjava3.functions.Consumer; import io.reactivex.rxjava3.plugins.RxJavaPlugins; +import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService; + /* * Copyright (C) Hans-Christoph Steiner 2016 * App.java is part of NewPipe. @@ -66,9 +66,6 @@ public class App extends MultiDexApplication { private static final String TAG = App.class.toString(); private static App app; - @Nullable - private Disposable disposable = null; - @NonNull public static App getApp() { return app; @@ -110,14 +107,11 @@ public class App extends MultiDexApplication { configureRxJavaErrorHandler(); // Check for new version - disposable = CheckForNewAppVersion.checkNewVersion(this); + startNewVersionCheckService(); } @Override public void onTerminate() { - if (disposable != null) { - disposable.dispose(); - } super.onTerminate(); PicassoHelper.terminate(); } diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java index 37ca0e400..d5d672d29 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersion.java @@ -1,6 +1,7 @@ package org.schabi.newpipe; import android.app.Application; +import android.app.IntentService; import android.app.PendingIntent; import android.content.Intent; import android.content.SharedPreferences; @@ -25,8 +26,11 @@ import com.grack.nanojson.JsonParserException; import org.schabi.newpipe.error.ErrorActivity; import org.schabi.newpipe.error.ErrorInfo; import org.schabi.newpipe.error.UserAction; +import org.schabi.newpipe.extractor.downloader.Response; +import org.schabi.newpipe.extractor.exceptions.ReCaptchaException; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -35,13 +39,10 @@ import java.security.cert.CertificateException; import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers; -import io.reactivex.rxjava3.core.Maybe; -import io.reactivex.rxjava3.disposables.Disposable; -import io.reactivex.rxjava3.schedulers.Schedulers; - -public final class CheckForNewAppVersion { - private CheckForNewAppVersion() { } +public final class CheckForNewAppVersion extends IntentService { + public CheckForNewAppVersion() { + super("CheckForNewAppVersion"); + } private static final boolean DEBUG = MainActivity.DEBUG; private static final String TAG = CheckForNewAppVersion.class.getSimpleName(); @@ -165,78 +166,87 @@ public final class CheckForNewAppVersion { return getCertificateSHA1Fingerprint(app).equals(GITHUB_APK_SHA1); } - @Nullable - public static Disposable checkNewVersion(@NonNull final App app) { + private void checkNewVersion() throws IOException, ReCaptchaException { + final App app = App.getApp(); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app); final NewVersionManager manager = new NewVersionManager(); // Check if user has enabled/disabled update checking // and if the current apk is a github one or not. if (!prefs.getBoolean(app.getString(R.string.update_app_key), true) || !isGithubApk(app)) { - return null; + return; } // Check if the last request has happened a certain time ago // to reduce the number of API requests. final long expiry = prefs.getLong(app.getString(R.string.update_expiry_key), 0); if (!manager.isExpired(expiry)) { - return null; + return; } - return Maybe - .fromCallable(() -> { - if (!isConnected(app)) { - return null; - } + // Make a network request to get latest NewPipe data. + final Response response = DownloaderImpl.getInstance().get(NEWPIPE_API_URL); + handleResponse(response, manager, prefs, app); + } - // Make a network request to get latest NewPipe data. - return DownloaderImpl.getInstance().get(NEWPIPE_API_URL); - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe( - response -> { - try { - // Store a timestamp which needs to be exceeded, - // before a new request to the API is made. - final long newExpiry = manager - .coerceExpiry(response.getHeader("expires")); - prefs.edit() - .putLong(app.getString(R.string.update_expiry_key), newExpiry) - .apply(); - } catch (final Exception e) { - if (DEBUG) { - Log.w(TAG, "Could not extract and save new expiry date", e); - } - } + private void handleResponse(@NonNull final Response response, + @NonNull final NewVersionManager manager, + @NonNull final SharedPreferences prefs, + @NonNull final App app) { + try { + // Store a timestamp which needs to be exceeded, + // before a new request to the API is made. + final long newExpiry = manager + .coerceExpiry(response.getHeader("expires")); + prefs.edit() + .putLong(app.getString(R.string.update_expiry_key), newExpiry) + .apply(); + } catch (final Exception e) { + if (DEBUG) { + Log.w(TAG, "Could not extract and save new expiry date", e); + } + } - // Parse the json from the response. - try { - final JsonObject githubStableObject = JsonParser.object() - .from(response.responseBody()).getObject("flavors") - .getObject("github").getObject("stable"); + // Parse the json from the response. + try { + final JsonObject githubStableObject = JsonParser.object() + .from(response.responseBody()).getObject("flavors") + .getObject("github").getObject("stable"); - final String versionName = githubStableObject - .getString("version"); - final int versionCode = githubStableObject - .getInt("version_code"); - final String apkLocationUrl = githubStableObject - .getString("apk"); + final String versionName = githubStableObject + .getString("version"); + final int versionCode = githubStableObject + .getInt("version_code"); + final String apkLocationUrl = githubStableObject + .getString("apk"); + + compareAppVersionAndShowNotification(app, versionName, + apkLocationUrl, versionCode); + } catch (final JsonParserException e) { + // Most likely something is wrong in data received from NEWPIPE_API_URL. + // Do not alarm user and fail silently. + if (DEBUG) { + Log.w(TAG, "Could not get NewPipe API: invalid json", e); + } + } + } + + public static void startNewVersionCheckService() { + final Intent intent = new Intent(App.getApp().getApplicationContext(), + CheckForNewAppVersion.class); + App.getApp().startService(intent); + } + + @Override + protected void onHandleIntent(@Nullable final Intent intent) { + try { + checkNewVersion(); + } catch (final IOException e) { + Log.w(TAG, "Could not fetch NewPipe API: probably network problem", e); + } catch (final ReCaptchaException e) { + Log.e(TAG, "ReCaptchaException should never happen here.", e); + } - compareAppVersionAndShowNotification(app, versionName, - apkLocationUrl, versionCode); - } catch (final JsonParserException e) { - // connectivity problems, do not alarm user and fail silently - if (DEBUG) { - Log.w(TAG, "Could not get NewPipe API: invalid json", e); - } - } - }, - e -> { - // connectivity problems, do not alarm user and fail silently - if (DEBUG) { - Log.w(TAG, "Could not get NewPipe API: network problem", e); - } - }); } } 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 0ca15e245..70f73e4f1 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java @@ -6,11 +6,20 @@ import androidx.preference.Preference; import org.schabi.newpipe.R; +import static org.schabi.newpipe.CheckForNewAppVersion.startNewVersionCheckService; + public class UpdateSettingsFragment extends BasePreferenceFragment { private final Preference.OnPreferenceChangeListener updatePreferenceChange - = (preference, newValue) -> { + = (preference, checkForUpdates) -> { defaultPreferences.edit() - .putBoolean(getString(R.string.update_app_key), (boolean) newValue).apply(); + .putBoolean(getString(R.string.update_app_key), (boolean) checkForUpdates).apply(); + + if ((boolean) checkForUpdates) { + // Reset the expire time. This is necessary to check for an update immediately. + defaultPreferences.edit() + .putLong(getString(R.string.update_expiry_key), 0).apply(); + startNewVersionCheckService(); + } return true; }; From f36fd2f7b273ccd9fa80b79f345507430520e9d8 Mon Sep 17 00:00:00 2001 From: Jhon Baron <32346414+Jhooomn@users.noreply.github.com> Date: Wed, 22 Sep 2021 02:17:53 -0500 Subject: [PATCH 05/34] Simple Codebase Improvement (#7132) * feat: it was added a string variable to avoid replication one. * Update LocalPlaylistManagerTest.kt * Update LocalPlaylistManagerTest.kt * Update LocalPlaylistManagerTest.kt Co-authored-by: Jhon Camilo Baron Berdugo --- .../newpipe/local/playlist/LocalPlaylistManagerTest.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt b/app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt index 24563d1c1..0a00b0443 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt +++ b/app/src/androidTest/java/org/schabi/newpipe/local/playlist/LocalPlaylistManagerTest.kt @@ -43,10 +43,11 @@ class LocalPlaylistManagerTest { @Test fun createPlaylist() { + val NEWPIPE_URL = "https://newpipe.net/" val stream = StreamEntity( - serviceId = 1, url = "https://newpipe.net/", title = "title", + serviceId = 1, url = NEWPIPE_URL, title = "title", streamType = StreamType.VIDEO_STREAM, duration = 1, uploader = "uploader", - uploaderUrl = "https://newpipe.net/" + uploaderUrl = NEWPIPE_URL ) val result = manager.createPlaylist("name", listOf(stream)) From b61d44aaa6a71af2c8f0a17336cc875768110ed1 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Wed, 22 Sep 2021 19:08:03 -0400 Subject: [PATCH 06/34] Update Groupie to 2.9.0 --- app/build.gradle | 2 +- .../org/schabi/newpipe/info_list/StreamSegmentAdapter.kt | 5 ++--- .../java/org/schabi/newpipe/local/feed/FeedFragment.kt | 7 +++---- .../newpipe/local/subscription/dialog/FeedGroupDialog.kt | 9 ++++----- .../local/subscription/dialog/FeedGroupReorderDialog.kt | 5 ++--- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1c193ff34..68e5ac3e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -107,7 +107,7 @@ ext { icepickVersion = '3.2.0' exoPlayerVersion = '2.12.3' googleAutoServiceVersion = '1.0' - groupieVersion = '2.8.1' + groupieVersion = '2.9.0' markwonVersion = '4.6.2' leakCanaryVersion = '2.5' diff --git a/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt b/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt index 62a06e29b..9fb4bfbb3 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt +++ b/app/src/main/java/org/schabi/newpipe/info_list/StreamSegmentAdapter.kt @@ -1,8 +1,7 @@ package org.schabi.newpipe.info_list import android.util.Log -import com.xwray.groupie.GroupAdapter -import com.xwray.groupie.GroupieViewHolder +import com.xwray.groupie.GroupieAdapter import org.schabi.newpipe.extractor.stream.StreamInfo import kotlin.math.max @@ -11,7 +10,7 @@ import kotlin.math.max */ class StreamSegmentAdapter( private val listener: StreamSegmentListener -) : GroupAdapter() { +) : GroupieAdapter() { var currentIndex: Int = 0 private set diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt index b3619276d..965075bf3 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.kt @@ -40,8 +40,7 @@ import androidx.core.view.isVisible import androidx.lifecycle.ViewModelProvider import androidx.preference.PreferenceManager import androidx.recyclerview.widget.GridLayoutManager -import com.xwray.groupie.GroupAdapter -import com.xwray.groupie.GroupieViewHolder +import com.xwray.groupie.GroupieAdapter import com.xwray.groupie.Item import com.xwray.groupie.OnItemClickListener import com.xwray.groupie.OnItemLongClickListener @@ -91,7 +90,7 @@ class FeedFragment : BaseStateFragment() { private var groupName = "" private var oldestSubscriptionUpdate: OffsetDateTime? = null - private lateinit var groupAdapter: GroupAdapter + private lateinit var groupAdapter: GroupieAdapter @State @JvmField var showPlayedItems: Boolean = true private var onSettingsChangeListener: SharedPreferences.OnSharedPreferenceChangeListener? = null @@ -131,7 +130,7 @@ class FeedFragment : BaseStateFragment() { viewModel = ViewModelProvider(this, factory).get(FeedViewModel::class.java) viewModel.stateLiveData.observe(viewLifecycleOwner, { it?.let(::handleResult) }) - groupAdapter = GroupAdapter().apply { + groupAdapter = GroupieAdapter().apply { setOnItemClickListener(listenerStreamItem) setOnItemLongClickListener(listenerStreamItem) } diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt index 69d4c8819..851e84f9f 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupDialog.kt @@ -21,8 +21,7 @@ import androidx.lifecycle.Observer import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.xwray.groupie.GroupAdapter -import com.xwray.groupie.GroupieViewHolder +import com.xwray.groupie.GroupieAdapter import com.xwray.groupie.OnItemClickListener import com.xwray.groupie.Section import icepick.Icepick @@ -78,7 +77,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable { private val subscriptionMainSection = Section() private val subscriptionEmptyFooter = Section() - private lateinit var subscriptionGroupAdapter: GroupAdapter + private lateinit var subscriptionGroupAdapter: GroupieAdapter override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -153,7 +152,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable { } } - subscriptionGroupAdapter = GroupAdapter().apply { + subscriptionGroupAdapter = GroupieAdapter().apply { add(subscriptionMainSection) add(subscriptionEmptyFooter) spanCount = 4 @@ -379,7 +378,7 @@ class FeedGroupDialog : DialogFragment(), BackPressable { } private fun setupIconPicker() { - val groupAdapter = GroupAdapter() + val groupAdapter = GroupieAdapter() groupAdapter.addAll(FeedGroupIcon.values().map { PickerIconItem(it) }) feedGroupCreateBinding.iconSelector.apply { diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt index 57815ea90..58547afd2 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/dialog/FeedGroupReorderDialog.kt @@ -11,8 +11,7 @@ import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper.SimpleCallback import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.xwray.groupie.GroupAdapter -import com.xwray.groupie.GroupieViewHolder +import com.xwray.groupie.GroupieAdapter import com.xwray.groupie.TouchCallback import icepick.Icepick import icepick.State @@ -38,7 +37,7 @@ class FeedGroupReorderDialog : DialogFragment() { @State @JvmField var groupOrderedIdList = ArrayList() - private val groupAdapter = GroupAdapter() + private val groupAdapter = GroupieAdapter() private val itemTouchHelper = ItemTouchHelper(getItemTouchCallback()) override fun onCreate(savedInstanceState: Bundle?) { From 49fc57eee91a25baad8cb8e29c6efdad3c5022fc Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Wed, 22 Sep 2021 21:54:30 -0400 Subject: [PATCH 07/34] Remove unused drawables --- app/src/main/res/drawable-night/ic_edit.xml | 9 --------- app/src/main/res/drawable-night/ic_expand_less.xml | 10 ---------- app/src/main/res/drawable-night/ic_import_export.xml | 10 ---------- 3 files changed, 29 deletions(-) delete mode 100644 app/src/main/res/drawable-night/ic_edit.xml delete mode 100644 app/src/main/res/drawable-night/ic_expand_less.xml delete mode 100644 app/src/main/res/drawable-night/ic_import_export.xml diff --git a/app/src/main/res/drawable-night/ic_edit.xml b/app/src/main/res/drawable-night/ic_edit.xml deleted file mode 100644 index 85d32985f..000000000 --- a/app/src/main/res/drawable-night/ic_edit.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-night/ic_expand_less.xml b/app/src/main/res/drawable-night/ic_expand_less.xml deleted file mode 100644 index 4ff5565fa..000000000 --- a/app/src/main/res/drawable-night/ic_expand_less.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-night/ic_import_export.xml b/app/src/main/res/drawable-night/ic_import_export.xml deleted file mode 100644 index bab84a60d..000000000 --- a/app/src/main/res/drawable-night/ic_import_export.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - From 920695f90acea56324741d5fdc7967ab62d4a585 Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Wed, 22 Sep 2021 23:38:01 -0400 Subject: [PATCH 08/34] Regenerate some drawables to their latest design --- .../newpipe/local/subscription/FeedGroupIcon.kt | 2 +- app/src/main/res/drawable-night/ic_campaign.xml | 9 +++++++++ .../main/res/drawable-night/ic_drag_handle.xml | 6 +++--- .../main/res/drawable-night/ic_info_outline.xml | 6 +++--- app/src/main/res/drawable-night/ic_megaphone.xml | 9 --------- app/src/main/res/drawable-night/ic_motorcycle.xml | 6 +++--- app/src/main/res/drawable-night/ic_palette.xml | 6 +++--- .../main/res/drawable-night/ic_playlist_add.xml | 6 +++--- .../res/drawable-night/ic_playlist_add_check.xml | 15 ++++++++++++--- app/src/main/res/drawable-night/ic_search_add.xml | 6 +++--- app/src/main/res/drawable-night/ic_settings.xml | 2 +- app/src/main/res/drawable-night/ic_thumb_down.xml | 6 +++--- app/src/main/res/drawable-night/ic_thumb_up.xml | 6 +++--- .../main/res/drawable-night/ic_watch_later.xml | 6 +++--- app/src/main/res/drawable/ic_campaign.xml | 9 +++++++++ app/src/main/res/drawable/ic_drag_handle.xml | 6 +++--- app/src/main/res/drawable/ic_info_outline.xml | 6 +++--- app/src/main/res/drawable/ic_megaphone.xml | 9 --------- app/src/main/res/drawable/ic_motorcycle.xml | 6 +++--- app/src/main/res/drawable/ic_next.xml | 2 +- app/src/main/res/drawable/ic_palette.xml | 6 +++--- app/src/main/res/drawable/ic_playlist_add.xml | 6 +++--- .../main/res/drawable/ic_playlist_add_check.xml | 15 ++++++++++++--- app/src/main/res/drawable/ic_playlist_play.xml | 15 ++++++++++++--- app/src/main/res/drawable/ic_previous.xml | 2 +- app/src/main/res/drawable/ic_search_add.xml | 6 +++--- app/src/main/res/drawable/ic_settings.xml | 2 +- app/src/main/res/drawable/ic_thumb_down.xml | 6 +++--- app/src/main/res/drawable/ic_thumb_up.xml | 6 +++--- app/src/main/res/drawable/ic_watch_later.xml | 6 +++--- 30 files changed, 113 insertions(+), 86 deletions(-) create mode 100644 app/src/main/res/drawable-night/ic_campaign.xml delete mode 100644 app/src/main/res/drawable-night/ic_megaphone.xml create mode 100644 app/src/main/res/drawable/ic_campaign.xml delete mode 100644 app/src/main/res/drawable/ic_megaphone.xml diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt b/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt index 83a90213d..ac7197b48 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt @@ -22,7 +22,7 @@ enum class FeedGroupIcon( COMPUTER(5, R.drawable.ic_computer), GAMING(6, R.drawable.ic_videogame_asset), SPORTS(7, R.drawable.ic_directions_bike), - NEWS(8, R.drawable.ic_megaphone), + NEWS(8, R.drawable.ic_campaign), FAVORITES(9, R.drawable.ic_favorite), CAR(10, R.drawable.ic_directions_car), MOTORCYCLE(11, R.drawable.ic_motorcycle), diff --git a/app/src/main/res/drawable-night/ic_campaign.xml b/app/src/main/res/drawable-night/ic_campaign.xml new file mode 100644 index 000000000..eabaddaee --- /dev/null +++ b/app/src/main/res/drawable-night/ic_campaign.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable-night/ic_drag_handle.xml b/app/src/main/res/drawable-night/ic_drag_handle.xml index 9378f4b23..a6d3b5270 100644 --- a/app/src/main/res/drawable-night/ic_drag_handle.xml +++ b/app/src/main/res/drawable-night/ic_drag_handle.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z" /> diff --git a/app/src/main/res/drawable-night/ic_info_outline.xml b/app/src/main/res/drawable-night/ic_info_outline.xml index d772001df..085665e4b 100644 --- a/app/src/main/res/drawable-night/ic_info_outline.xml +++ b/app/src/main/res/drawable-night/ic_info_outline.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" /> diff --git a/app/src/main/res/drawable-night/ic_megaphone.xml b/app/src/main/res/drawable-night/ic_megaphone.xml deleted file mode 100644 index dd87fde17..000000000 --- a/app/src/main/res/drawable-night/ic_megaphone.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-night/ic_motorcycle.xml b/app/src/main/res/drawable-night/ic_motorcycle.xml index 2a42a1d09..4ffd8b451 100644 --- a/app/src/main/res/drawable-night/ic_motorcycle.xml +++ b/app/src/main/res/drawable-night/ic_motorcycle.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M17.42,10L13.41,6H9V8H12.59L14.59,10H6.5C4,10 2,12 2,14.5C2,17 4,19 6.5,19C8.72,19 10.56,17.38 10.92,15.27L13.04,14C13,14.17 13,14.33 13,14.5C13,17 15,19 17.5,19C20,19 22,17 22,14.5C22,12 20,10 17.5,10M8.84,15.26C8.5,16.27 7.58,17 6.47,17C5.09,17 3.97,15.88 3.97,14.5C3.97,13.12 5.09,12 6.47,12C7.59,12 8.5,12.74 8.84,13.75H6V15.25L8.84,15.26M17.47,17C16.09,17 14.97,15.88 14.97,14.5C14.97,13.12 16.09,12 17.47,12A2.5,2.5 0 0,1 19.97,14.5A2.5,2.5 0 0,1 17.47,17Z" /> diff --git a/app/src/main/res/drawable-night/ic_palette.xml b/app/src/main/res/drawable-night/ic_palette.xml index a6cdb536e..8edcceb76 100644 --- a/app/src/main/res/drawable-night/ic_palette.xml +++ b/app/src/main/res/drawable-night/ic_palette.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" /> diff --git a/app/src/main/res/drawable-night/ic_playlist_add.xml b/app/src/main/res/drawable-night/ic_playlist_add.xml index 1ea41dc22..bf86fd24a 100644 --- a/app/src/main/res/drawable-night/ic_playlist_add.xml +++ b/app/src/main/res/drawable-night/ic_playlist_add.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M14,10H3v2h11V10zM14,6H3v2h11V6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2H18zM3,16h7v-2H3V16z" /> diff --git a/app/src/main/res/drawable-night/ic_playlist_add_check.xml b/app/src/main/res/drawable-night/ic_playlist_add_check.xml index 0581bbe4b..a69d284a1 100644 --- a/app/src/main/res/drawable-night/ic_playlist_add_check.xml +++ b/app/src/main/res/drawable-night/ic_playlist_add_check.xml @@ -2,9 +2,18 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M3,10h11v2h-11z" /> + + + diff --git a/app/src/main/res/drawable-night/ic_search_add.xml b/app/src/main/res/drawable-night/ic_search_add.xml index 57c8a1ada..856433e41 100644 --- a/app/src/main/res/drawable-night/ic_search_add.xml +++ b/app/src/main/res/drawable-night/ic_search_add.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M19,17.59L17.59,19L7,8.41V15H5V5H15V7H8.41L19,17.59Z" /> diff --git a/app/src/main/res/drawable-night/ic_settings.xml b/app/src/main/res/drawable-night/ic_settings.xml index bc30c52d8..61ee02ee0 100644 --- a/app/src/main/res/drawable-night/ic_settings.xml +++ b/app/src/main/res/drawable-night/ic_settings.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" /> diff --git a/app/src/main/res/drawable-night/ic_thumb_down.xml b/app/src/main/res/drawable-night/ic_thumb_down.xml index 0303551c7..1ee3ed018 100644 --- a/app/src/main/res/drawable-night/ic_thumb_down.xml +++ b/app/src/main/res/drawable-night/ic_thumb_down.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v2c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z" /> diff --git a/app/src/main/res/drawable-night/ic_thumb_up.xml b/app/src/main/res/drawable-night/ic_thumb_up.xml index f83de1ecc..c4e387866 100644 --- a/app/src/main/res/drawable-night/ic_thumb_up.xml +++ b/app/src/main/res/drawable-night/ic_thumb_up.xml @@ -2,9 +2,9 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" /> diff --git a/app/src/main/res/drawable-night/ic_watch_later.xml b/app/src/main/res/drawable-night/ic_watch_later.xml index b7991f0c7..ff93ce2d7 100644 --- a/app/src/main/res/drawable-night/ic_watch_later.xml +++ b/app/src/main/res/drawable-night/ic_watch_later.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z" /> diff --git a/app/src/main/res/drawable/ic_campaign.xml b/app/src/main/res/drawable/ic_campaign.xml new file mode 100644 index 000000000..4a0e2ddbb --- /dev/null +++ b/app/src/main/res/drawable/ic_campaign.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml index 8f7f335a3..416631324 100644 --- a/app/src/main/res/drawable/ic_drag_handle.xml +++ b/app/src/main/res/drawable/ic_drag_handle.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4V15z" /> diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml index 9c51a4ffb..6c6060619 100644 --- a/app/src/main/res/drawable/ic_info_outline.xml +++ b/app/src/main/res/drawable/ic_info_outline.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M11,7h2v2h-2zM11,11h2v6h-2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" /> diff --git a/app/src/main/res/drawable/ic_megaphone.xml b/app/src/main/res/drawable/ic_megaphone.xml deleted file mode 100644 index f75a104db..000000000 --- a/app/src/main/res/drawable/ic_megaphone.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_motorcycle.xml b/app/src/main/res/drawable/ic_motorcycle.xml index 185d6992c..e354f8bda 100644 --- a/app/src/main/res/drawable/ic_motorcycle.xml +++ b/app/src/main/res/drawable/ic_motorcycle.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M17.42,10L13.41,6H9V8H12.59L14.59,10H6.5C4,10 2,12 2,14.5C2,17 4,19 6.5,19C8.72,19 10.56,17.38 10.92,15.27L13.04,14C13,14.17 13,14.33 13,14.5C13,17 15,19 17.5,19C20,19 22,17 22,14.5C22,12 20,10 17.5,10M8.84,15.26C8.5,16.27 7.58,17 6.47,17C5.09,17 3.97,15.88 3.97,14.5C3.97,13.12 5.09,12 6.47,12C7.59,12 8.5,12.74 8.84,13.75H6V15.25L8.84,15.26M17.47,17C16.09,17 14.97,15.88 14.97,14.5C14.97,13.12 16.09,12 17.47,12A2.5,2.5 0 0,1 19.97,14.5A2.5,2.5 0 0,1 17.47,17Z" /> diff --git a/app/src/main/res/drawable/ic_next.xml b/app/src/main/res/drawable/ic_next.xml index 1459bff0a..9f3462892 100644 --- a/app/src/main/res/drawable/ic_next.xml +++ b/app/src/main/res/drawable/ic_next.xml @@ -7,5 +7,5 @@ + android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z" /> diff --git a/app/src/main/res/drawable/ic_palette.xml b/app/src/main/res/drawable/ic_palette.xml index 71c37ddac..568f8e4de 100644 --- a/app/src/main/res/drawable/ic_palette.xml +++ b/app/src/main/res/drawable/ic_palette.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" /> diff --git a/app/src/main/res/drawable/ic_playlist_add.xml b/app/src/main/res/drawable/ic_playlist_add.xml index f30f29557..341894ba9 100644 --- a/app/src/main/res/drawable/ic_playlist_add.xml +++ b/app/src/main/res/drawable/ic_playlist_add.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M14,10H3v2h11V10zM14,6H3v2h11V6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2H18zM3,16h7v-2H3V16z" /> diff --git a/app/src/main/res/drawable/ic_playlist_add_check.xml b/app/src/main/res/drawable/ic_playlist_add_check.xml index d99e6e75c..de5924f60 100644 --- a/app/src/main/res/drawable/ic_playlist_add_check.xml +++ b/app/src/main/res/drawable/ic_playlist_add_check.xml @@ -1,9 +1,18 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M3,10h11v2h-11z" /> + + + diff --git a/app/src/main/res/drawable/ic_playlist_play.xml b/app/src/main/res/drawable/ic_playlist_play.xml index 4e31a4dde..34b0f05bf 100644 --- a/app/src/main/res/drawable/ic_playlist_play.xml +++ b/app/src/main/res/drawable/ic_playlist_play.xml @@ -2,9 +2,18 @@ android:width="24dp" android:height="24dp" android:tint="#FFFFFF" - android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M3,10h11v2h-11z" /> + + + diff --git a/app/src/main/res/drawable/ic_previous.xml b/app/src/main/res/drawable/ic_previous.xml index e9fe7448d..f18ad469e 100644 --- a/app/src/main/res/drawable/ic_previous.xml +++ b/app/src/main/res/drawable/ic_previous.xml @@ -7,5 +7,5 @@ + android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z" /> diff --git a/app/src/main/res/drawable/ic_search_add.xml b/app/src/main/res/drawable/ic_search_add.xml index 398f1407d..889ea4c6f 100644 --- a/app/src/main/res/drawable/ic_search_add.xml +++ b/app/src/main/res/drawable/ic_search_add.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M19,17.59L17.59,19L7,8.41V15H5V5H15V7H8.41L19,17.59Z" /> diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index a671514fc..e50f6fe3a 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" /> diff --git a/app/src/main/res/drawable/ic_thumb_down.xml b/app/src/main/res/drawable/ic_thumb_down.xml index 0484764da..103e5fea3 100644 --- a/app/src/main/res/drawable/ic_thumb_down.xml +++ b/app/src/main/res/drawable/ic_thumb_down.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M15,3L6,3c-0.83,0 -1.54,0.5 -1.84,1.22l-3.02,7.05c-0.09,0.23 -0.14,0.47 -0.14,0.73v2c0,1.1 0.9,2 2,2h6.31l-0.95,4.57 -0.03,0.32c0,0.41 0.17,0.79 0.44,1.06L9.83,23l6.59,-6.59c0.36,-0.36 0.58,-0.86 0.58,-1.41L17,5c0,-1.1 -0.9,-2 -2,-2zM19,3v12h4L23,3h-4z" /> diff --git a/app/src/main/res/drawable/ic_thumb_up.xml b/app/src/main/res/drawable/ic_thumb_up.xml index 58dbfafe4..2b9fbdf4c 100644 --- a/app/src/main/res/drawable/ic_thumb_up.xml +++ b/app/src/main/res/drawable/ic_thumb_up.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M1,21h4L5,9L1,9v12zM23,10c0,-1.1 -0.9,-2 -2,-2h-6.31l0.95,-4.57 0.03,-0.32c0,-0.41 -0.17,-0.79 -0.44,-1.06L14.17,1 7.59,7.59C7.22,7.95 7,8.45 7,9v10c0,1.1 0.9,2 2,2h9c0.83,0 1.54,-0.5 1.84,-1.22l3.02,-7.05c0.09,-0.23 0.14,-0.47 0.14,-0.73v-2z" /> diff --git a/app/src/main/res/drawable/ic_watch_later.xml b/app/src/main/res/drawable/ic_watch_later.xml index 5fe8273d9..72952bcaa 100644 --- a/app/src/main/res/drawable/ic_watch_later.xml +++ b/app/src/main/res/drawable/ic_watch_later.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M12,2C6.5,2 2,6.5 2,12s4.5,10 10,10s10,-4.5 10,-10S17.5,2 12,2zM16.2,16.2L11,13V7h1.5v5.2l4.5,2.7L16.2,16.2z" /> From a225ac5deb2c20e5eb188af538ef8196e7e7cb8d Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Thu, 23 Sep 2021 15:09:37 -0400 Subject: [PATCH 09/34] Remove deprecated preferenceTheme style attribute --- app/src/main/res/values/styles.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 95368b572..7c1265580 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -16,7 +16,6 @@ @color/white @style/FloatingActionButtonTheme @color/white - @style/PreferenceThemeOverlay.v14.Material ?attr/colorPrimary