Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ic_hot in ic_kiosk_hot and improve getKioskIcon()

Browse source
This commit is contained in:
Stypox 2020-03-31 09:36:35 +02:00
parent 3dcd2468a2
commit c27a26c0aa
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
11 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/org/schabi/newpipe/MainActivity.java
View file

@ -165,8 +165,7 @@ public class MainActivity extends AppCompatActivity {
drawerItems.getMenu()
.add(R.id.menu_tabs_group, kioskId, 0, KioskTranslator
.getTranslatedKioskName(ks, this))
.setIcon(KioskTranslator.getKioskIcons(ks, this));
kioskId++;
.setIcon(KioskTranslator.getKioskIcon(ks, this));
}
drawerItems.getMenu()
@ -420,7 +419,7 @@ public class MainActivity extends AppCompatActivity {
drawerItems.getMenu()
.add(R.id.menu_tabs_group, kioskId, ORDER,
KioskTranslator.getTranslatedKioskName(ks, this))
.setIcon(KioskTranslator.getKioskIcons(ks, this));
.setIcon(KioskTranslator.getKioskIcon(ks, this));
kioskId++;
}

2
app/src/main/java/org/schabi/newpipe/local/subscription/FeedGroupIcon.kt
View file

@ -47,7 +47,7 @@ enum class FeedGroupIcon(
SHOPPING_CART(27, R.attr.ic_shopping_cart),
WATCH_LATER(28, R.attr.ic_watch_later),
WORK(29, R.attr.ic_work),
HOT(30, R.attr.ic_hot),
HOT(30, R.attr.ic_kiosk_hot),
CHANNEL(31, R.attr.ic_channel),
BOOKMARK(32, R.attr.ic_bookmark),
PETS(33, R.attr.ic_pets),

2
app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java
View file

@ -60,7 +60,7 @@ public final class AddTabDialog {
private DialogListAdapter(final Context context, final ChooseTabListItem[] items) {
this.inflater = LayoutInflater.from(context);
this.items = items;
this.fallbackIcon = ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_hot);
this.fallbackIcon = ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_kiosk_hot);
}
@Override

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

@ -233,7 +233,7 @@ public class ChooseTabsFragment extends Fragment {
case KIOSK:
returnList.add(new ChooseTabListItem(tab.getTabId(),
getString(R.string.kiosk_page_summary),
ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_hot)));
ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_kiosk_hot)));
break;
case CHANNEL:
returnList.add(new ChooseTabListItem(tab.getTabId(),
@ -244,7 +244,8 @@ public class ChooseTabsFragment extends Fragment {
if (!tabList.contains(tab)) {
returnList.add(new ChooseTabListItem(tab.getTabId(),
getString(R.string.default_kiosk_page_summary),
ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_hot)));
ThemeHelper.resolveResourceIdFromAttr(context,
R.attr.ic_kiosk_hot)));
}
break;
default:

4
app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java
View file

@ -323,7 +323,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
final int kioskIcon = KioskTranslator.getKioskIcons(kioskId, context);
final int kioskIcon = KioskTranslator.getKioskIcon(kioskId, context);
if (kioskIcon <= 0) {
throw new IllegalStateException("Kiosk ID is not valid: \"" + kioskId + "\"");
@ -459,7 +459,7 @@ public abstract class Tab {
@DrawableRes
@Override
public int getTabIconRes(final Context context) {
return KioskTranslator.getKioskIcons(getDefaultKioskId(context), context);
return KioskTranslator.getKioskIcon(getDefaultKioskId(context), context);
}
@Override

2
app/src/main/java/org/schabi/newpipe/util/KioskTranslator.java
View file

@ -55,7 +55,7 @@ public final class KioskTranslator {
case "Top 50":
case "New & hot":
case "conferences":
return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_hot);
return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_hot);
case "Local":
return ThemeHelper.resolveResourceIdFromAttr(c, R.attr.ic_kiosk_local);
case "Recently added":