Fix colors in setting fragments, cleanup

This commit is contained in:
krlvm 2021-03-29 21:19:17 +03:00
parent 24a264d78c
commit c906cb57ee
No known key found for this signature in database
GPG Key ID: B8552A91FD265536
7 changed files with 8 additions and 22 deletions

View File

@ -3,9 +3,6 @@ package org.schabi.newpipe.settings;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.Drawable;
import android.os.Bundle; import android.os.Bundle;
import android.text.InputType; import android.text.InputType;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -148,13 +145,8 @@ public class PeertubeInstanceListFragment extends Fragment {
final MenuItem restoreItem = menu final MenuItem restoreItem = menu
.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults); .add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults);
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
final Drawable icon = AppCompatResources.getDrawable(requireContext(), restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
R.drawable.ic_settings_backup_restore); R.drawable.ic_settings_backup_restore));
if (icon != null) {
icon.mutate();
icon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
}
restoreItem.setIcon(icon);
} }
@Override @Override

View File

@ -112,7 +112,6 @@ public class ChooseTabsFragment extends Fragment {
final MenuItem restoreItem = menu.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, final MenuItem restoreItem = menu.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE,
R.string.restore_defaults); R.string.restore_defaults);
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(), restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
R.drawable.ic_settings_backup_restore)); R.drawable.ic_settings_backup_restore));
} }

View File

@ -1,10 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M14,12c0,-1.1 -0.9,-2 -2,-2s-2,0.9 -2,2 0.9,2 2,2 2,-0.9 2,-2zM12,3c-4.97,0 -9,4.03 -9,9L0,12l4,4 4,-4L5,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.51,0 -2.91,-0.49 -4.06,-1.3l-1.42,1.44C8.04,20.3 9.94,21 12,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9z" />
</vector>

View File

@ -1,6 +1,7 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24.0" android:viewportWidth="24.0"
android:viewportHeight="24.0"> android:viewportHeight="24.0">
<path <path

View File

@ -44,7 +44,6 @@
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:tint="@color/white"
app:backgroundTint="?attr/colorPrimary" app:backgroundTint="?attr/colorPrimary"
app:fabSize="auto" app:fabSize="auto"
app:srcCompat="@drawable/ic_add" /> app:srcCompat="@drawable/ic_add" />

View File

@ -13,6 +13,7 @@
<!-- Base Theme --> <!-- Base Theme -->
<style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar"> <style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
<item name="toolbarSearchColor">@color/white</item> <item name="toolbarSearchColor">@color/white</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item> <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style> </style>

View File

@ -60,6 +60,10 @@
<item name="android:textColor">@color/white_secondary</item> <item name="android:textColor">@color/white_secondary</item>
</style> </style>
<style name="FloatingActionButtonTheme" parent="Widget.Design.FloatingActionButton">
<item name="tint">@color/white</item>
</style>
<style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/> <style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar"> <style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">