Skip to content

Commit c906cb5

Browse files
committed
Fix colors in setting fragments, cleanup
1 parent 24a264d commit c906cb5

7 files changed

Lines changed: 8 additions & 22 deletions

File tree

app/src/main/java/org/schabi/newpipe/settings/PeertubeInstanceListFragment.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
import android.annotation.SuppressLint;
44
import android.content.Context;
55
import android.content.SharedPreferences;
6-
import android.graphics.Color;
7-
import android.graphics.PorterDuff;
8-
import android.graphics.drawable.Drawable;
96
import android.os.Bundle;
107
import android.text.InputType;
118
import android.view.LayoutInflater;
@@ -148,13 +145,8 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
148145
final MenuItem restoreItem = menu
149146
.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE, R.string.restore_defaults);
150147
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
151-
final Drawable icon = AppCompatResources.getDrawable(requireContext(),
152-
R.drawable.ic_settings_backup_restore);
153-
if (icon != null) {
154-
icon.mutate();
155-
icon.setColorFilter(Color.WHITE, PorterDuff.Mode.SRC_ATOP);
156-
}
157-
restoreItem.setIcon(icon);
148+
restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
149+
R.drawable.ic_settings_backup_restore));
158150
}
159151

160152
@Override

app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
112112
final MenuItem restoreItem = menu.add(Menu.NONE, MENU_ITEM_RESTORE_ID, Menu.NONE,
113113
R.string.restore_defaults);
114114
restoreItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
115-
116115
restoreItem.setIcon(AppCompatResources.getDrawable(requireContext(),
117116
R.drawable.ic_settings_backup_restore));
118117
}

app/src/main/res/drawable-night/ic_settings_backup_restore.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/src/main/res/drawable/ic_settings_backup_restore.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<vector xmlns:android="http://schemas.android.com/apk/res/android"
22
android:width="24dp"
33
android:height="24dp"
4+
android:tint="#FFFFFF"
45
android:viewportWidth="24.0"
56
android:viewportHeight="24.0">
67
<path

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
android:layout_marginBottom="16dp"
4545
android:clickable="true"
4646
android:focusable="true"
47-
android:tint="@color/white"
4847
app:backgroundTint="?attr/colorPrimary"
4948
app:fabSize="auto"
5049
app:srcCompat="@drawable/ic_add" />

app/src/main/res/values/styles.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
<!-- Base Theme -->
1515
<style name="Base.V19" parent="Theme.AppCompat.DayNight.NoActionBar">
16+
<item name="floatingActionButtonStyle">@style/FloatingActionButtonTheme</item>
1617
<item name="toolbarSearchColor">@color/white</item>
1718
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
1819
</style>

app/src/main/res/values/styles_misc.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,10 @@
6060
<item name="android:textColor">@color/white_secondary</item>
6161
</style>
6262

63+
<style name="FloatingActionButtonTheme" parent="Widget.Design.FloatingActionButton">
64+
<item name="tint">@color/white</item>
65+
</style>
66+
6367
<style name="DarkPopupMenu" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
6468

6569
<style name="ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">

0 commit comments

Comments
 (0)