Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

IssueFixed#5968

This commit is contained in:
camo0112 2021-03-31 20:48:02 +05:30
parent 43f85408be
commit 856a39855e
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.kt
View File

@ -58,19 +58,21 @@ object LicenseFragmentHelper {
*/ */
private fun getLicenseStylesheet(context: Context): String { private fun getLicenseStylesheet(context: Context): String {
val isLightTheme = ThemeHelper.isLightThemeSelected(context) val isLightTheme = ThemeHelper.isLightThemeSelected(context)
return ("body{padding:12px 15px;margin:0;" + "background:#" + getHexRGBColor( return (
context, "body{padding:12px 15px;margin:0;" + "background:#" + getHexRGBColor(
if (isLightTheme) R.color.light_license_background_color context,
else R.color.dark_license_background_color if (isLightTheme) R.color.light_license_background_color
) + ";" + "color:#" + getHexRGBColor( else R.color.dark_license_background_color
context, ) + ";" + "color:#" + getHexRGBColor(
if (isLightTheme) R.color.light_license_text_color context,
else R.color.dark_license_text_color if (isLightTheme) R.color.light_license_text_color
) + "}" + "a[href]{color:#" + getHexRGBColor( else R.color.dark_license_text_color
context, ) + "}" + "a[href]{color:#" + getHexRGBColor(
if (isLightTheme) R.color.light_youtube_primary_color context,
else R.color.dark_youtube_primary_color if (isLightTheme) R.color.light_youtube_primary_color
) + "}" + "pre{white-space:pre-wrap}") else R.color.dark_youtube_primary_color
) + "}" + "pre{white-space:pre-wrap}"
)
} }
/** /**

19
app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java
View File

@ -62,7 +62,8 @@ public final class NavigationHelper {
public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag"; public static final String MAIN_FRAGMENT_TAG = "main_fragment_tag";
public static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag"; public static final String SEARCH_FRAGMENT_TAG = "search_fragment_tag";
private NavigationHelper() { } private NavigationHelper() {
}
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
// Players // Players
@ -111,18 +112,22 @@ public final class NavigationHelper {
public static void playOnMainPlayer(final AppCompatActivity activity, public static void playOnMainPlayer(final AppCompatActivity activity,
@NonNull final PlayQueue playQueue) { @NonNull final PlayQueue playQueue) {
final PlayQueueItem item = playQueue.getItem(); final PlayQueueItem item = playQueue.getItem();
assert item != null; if (item != null) {
openVideoDetailFragment(activity, activity.getSupportFragmentManager(), openVideoDetailFragment(activity, activity.getSupportFragmentManager(),
item.getServiceId(), item.getUrl(), item.getTitle(), playQueue, false); item.getServiceId(), item.getUrl(), item.getTitle(), playQueue,
false);
}
} }
public static void playOnMainPlayer(final Context context, public static void playOnMainPlayer(final Context context,
@NonNull final PlayQueue playQueue, @NonNull final PlayQueue playQueue,
final boolean switchingPlayers) { final boolean switchingPlayers) {
final PlayQueueItem item = playQueue.getItem(); final PlayQueueItem item = playQueue.getItem();
assert item != null; if (item != null) {
openVideoDetail(context, openVideoDetail(context,
item.getServiceId(), item.getUrl(), item.getTitle(), playQueue, switchingPlayers); item.getServiceId(), item.getUrl(), item.getTitle(), playQueue,
switchingPlayers);
}
} }
public static void playOnPopupPlayer(final Context context, public static void playOnPopupPlayer(final Context context,