mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2026-10-03 22:31:48 +00:00
Code Issues Releases Wiki Activity

merge RouterActivity and RouterVideoActivity

Browse Source 
change share title

fixed compatiblity issue

rename info_screen to show_info
This commit is contained in:
Christian Schabesberger
2018-02-12 23:07:17 +01:00
parent ba0be665ae
commit cbfe91f36f
24 changed files with 477 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java
+4 -4
View File
@@ -12,7 +12,7 @@ import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
public class ServiceHelper {
private static final StreamingService DEFAULT_FALLBACK_SERVICE = ServiceList.YouTube.getService();
private static final StreamingService DEFAULT_FALLBACK_SERVICE = ServiceList.YouTube;
@DrawableRes
public static int getIcon(int serviceId) {
@@ -45,9 +45,9 @@ public class ServiceHelper {
public static void setSelectedServiceId(Context context, int serviceId) {
String serviceName;
try {
serviceName = NewPipe.getService(serviceId).getServiceInfo().name;
serviceName = NewPipe.getService(serviceId).getServiceInfo().getName();
} catch (ExtractionException e) {
serviceName = DEFAULT_FALLBACK_SERVICE.getServiceInfo().name;
serviceName = DEFAULT_FALLBACK_SERVICE.getServiceInfo().getName();
}
setSelectedServicePreferences(context, serviceName);
@@ -55,7 +55,7 @@ public class ServiceHelper {
public static void setSelectedServiceId(Context context, String serviceName) {
int serviceId = NewPipe.getIdOfService(serviceName);
if (serviceId == -1) serviceName = DEFAULT_FALLBACK_SERVICE.getServiceInfo().name;
if (serviceId == -1) serviceName = DEFAULT_FALLBACK_SERVICE.getServiceInfo().getName();
setSelectedServicePreferences(context, serviceName);
}
app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java
+1 -1
View File
@@ -73,7 +73,7 @@ public class ThemeHelper {
else if (selectedTheme.equals(blackTheme)) themeName = "BlackTheme";
else if (selectedTheme.equals(darkTheme)) themeName = "DarkTheme";
themeName += "." + service.getServiceInfo().name;
themeName += "." + service.getServiceInfo().getName();
int resourceId = context.getResources().getIdentifier(themeName, "style", context.getPackageName());
if (resourceId > 0) {