be-gay-do-crimes
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

refactor: rename ChannelInfo to ChannelAbout 

fix: localize about tab name
This commit is contained in:
ThetaDev 2023-04-05 22:56:25 +02:00 committed by Stypox
parent 25e3031830
commit c03c344f49
No known key found for this signature in database
GPG Key ID: 4BDF1B40A49FDD23
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/fragments/detail/BaseInfoFragment.java → app/src/main/java/org/schabi/newpipe/fragments/detail/BaseDescriptionFragment.java
View File

@ -33,7 +33,7 @@ import java.util.List;
import io.reactivex.rxjava3.disposables.CompositeDisposable; import io.reactivex.rxjava3.disposables.CompositeDisposable;
public abstract class BaseInfoFragment extends BaseFragment { public abstract class BaseDescriptionFragment extends BaseFragment {
final CompositeDisposable descriptionDisposables = new CompositeDisposable(); final CompositeDisposable descriptionDisposables = new CompositeDisposable();
FragmentDescriptionBinding binding; FragmentDescriptionBinding binding;

2
app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
View File

@ -20,7 +20,7 @@ import java.util.List;
import icepick.State; import icepick.State;
public class DescriptionFragment extends BaseInfoFragment { public class DescriptionFragment extends BaseDescriptionFragment {
@State @State
StreamInfo streamInfo = null; StreamInfo streamInfo = null;

10
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelInfoFragment.java → app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelAboutFragment.java
View File

@ -12,24 +12,24 @@ import org.schabi.newpipe.R;
import org.schabi.newpipe.extractor.StreamingService; import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.channel.ChannelInfo; import org.schabi.newpipe.extractor.channel.ChannelInfo;
import org.schabi.newpipe.extractor.stream.Description; import org.schabi.newpipe.extractor.stream.Description;
import org.schabi.newpipe.fragments.detail.BaseInfoFragment; import org.schabi.newpipe.fragments.detail.BaseDescriptionFragment;
import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.Localization;
import java.util.List; import java.util.List;
import icepick.State; import icepick.State;
public class ChannelInfoFragment extends BaseInfoFragment { public class ChannelAboutFragment extends BaseDescriptionFragment {
@State @State
protected ChannelInfo channelInfo; protected ChannelInfo channelInfo;
public static ChannelInfoFragment getInstance(final ChannelInfo channelInfo) { public static ChannelAboutFragment getInstance(final ChannelInfo channelInfo) {
final ChannelInfoFragment fragment = new ChannelInfoFragment(); final ChannelAboutFragment fragment = new ChannelAboutFragment();
fragment.channelInfo = channelInfo; fragment.channelInfo = channelInfo;
return fragment; return fragment;
} }
public ChannelInfoFragment() { public ChannelAboutFragment() {
super(); super();
} }

5
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java
View File

@ -301,9 +301,10 @@ public class ChannelFragment extends BaseStateFragment<ChannelInfo>
final String description = currentInfo.getDescription(); final String description = currentInfo.getDescription();
if (description != null && !description.isEmpty() if (description != null && !description.isEmpty()
&& ChannelTabHelper.showChannelTab( && ChannelTabHelper.showChannelTab(
context, preferences, R.string.show_channel_tabs_info)) { context, preferences, R.string.show_channel_tabs_about)) {
tabAdapter.addFragment( tabAdapter.addFragment(
ChannelInfoFragment.getInstance(currentInfo), "Info"); ChannelAboutFragment.getInstance(currentInfo),
context.getString(R.string.channel_tab_about));
} }
} }
} }

6
app/src/main/res/values/settings_keys.xml
View File

@ -280,14 +280,14 @@
<string name="show_channel_tabs_shorts">show_channel_tabs_shorts</string> <string name="show_channel_tabs_shorts">show_channel_tabs_shorts</string>
<string name="show_channel_tabs_channels">show_channel_tabs_channels</string> <string name="show_channel_tabs_channels">show_channel_tabs_channels</string>
<string name="show_channel_tabs_albums">show_channel_tabs_albums</string> <string name="show_channel_tabs_albums">show_channel_tabs_albums</string>
<string name="show_channel_tabs_info">show_channel_tabs_info</string> <string name="show_channel_tabs_about">show_channel_tabs_about</string>
<string-array name="show_channel_tabs_value_list"> <string-array name="show_channel_tabs_value_list">
<item>@string/show_channel_tabs_playlists</item> <item>@string/show_channel_tabs_playlists</item>
<item>@string/show_channel_tabs_livestreams</item> <item>@string/show_channel_tabs_livestreams</item>
<item>@string/show_channel_tabs_shorts</item> <item>@string/show_channel_tabs_shorts</item>
<item>@string/show_channel_tabs_channels</item> <item>@string/show_channel_tabs_channels</item>
<item>@string/show_channel_tabs_albums</item> <item>@string/show_channel_tabs_albums</item>
<item>@string/show_channel_tabs_info</item> <item>@string/show_channel_tabs_about</item>
</string-array> </string-array>
<string-array name="show_channel_tabs_description_list"> <string-array name="show_channel_tabs_description_list">
<item>@string/channel_tab_playlists</item> <item>@string/channel_tab_playlists</item>
@ -295,7 +295,7 @@
<item>@string/channel_tab_shorts</item> <item>@string/channel_tab_shorts</item>
<item>@string/channel_tab_channels</item> <item>@string/channel_tab_channels</item>
<item>@string/channel_tab_albums</item> <item>@string/channel_tab_albums</item>
<item>@string/channel_tab_info</item> <item>@string/channel_tab_about</item>
</string-array> </string-array>
<string name="show_search_suggestions_key">show_search_suggestions</string> <string name="show_search_suggestions_key">show_search_suggestions</string>
<string name="show_local_search_suggestions_key">show_local_search_suggestions</string> <string name="show_local_search_suggestions_key">show_local_search_suggestions</string>

2
app/src/main/res/values/strings.xml
View File

@ -803,7 +803,7 @@
<string name="channel_tab_playlists">Playlists</string> <string name="channel_tab_playlists">Playlists</string>
<string name="channel_tab_channels">Channels</string> <string name="channel_tab_channels">Channels</string>
<string name="channel_tab_albums">Albums</string> <string name="channel_tab_albums">Albums</string>
<string name="channel_tab_info">Info</string> <string name="channel_tab_about">About</string>
<string name="show_channel_tabs">Channel tabs</string> <string name="show_channel_tabs">Channel tabs</string>
<string name="show_channel_tabs_summary">What tabs are shown on the channel pages</string> <string name="show_channel_tabs_summary">What tabs are shown on the channel pages</string>
</resources> </resources>