Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support for albums channel tab, drop discontinued channels tab #5735

Merged
merged 1 commit into from
Mar 13, 2024
Merged

feat: support for albums channel tab, drop discontinued channels tab #5735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/libretube/obj/ChannelTabs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
object Playlists : ChannelTabs("playlists", R.id.playlists)
object Shorts : ChannelTabs("shorts", R.id.shorts)
object Livestreams : ChannelTabs("livestreams", R.id.livestreams)
object Channels : ChannelTabs("channels", R.id.channels)
object Albums : ChannelTabs("albums", R.id.albums)

Check failure on line 13 in app/src/main/java/com/github/libretube/obj/ChannelTabs.kt

View workflow job for this annotation

GitHub Actions / Check Code Quality 

[ktlint] reported by reviewdog 🐶
Expected a blank line for this declaration

Raw Output:
app/src/main/java/com/github/libretube/obj/ChannelTabs.kt:13:5: error: Expected a blank line for this declaration (standard:blank-line-before-declaration)
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
ChannelTabs.Shorts,
ChannelTabs.Livestreams,
ChannelTabs.Playlists,
ChannelTabs.Channels
ChannelTabs.Albums

Check failure on line 57 in app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt

View workflow job for this annotation

GitHub Actions / Check Code Quality 

[ktlint] reported by reviewdog 🐶
Missing trailing comma before ")"

Raw Output:
app/src/main/java/com/github/libretube/ui/fragments/ChannelFragment.kt:57:27: error: Missing trailing comma before ")" (standard:trailing-comma-on-call-site)
)
private var channelTabs: List<ChannelTab> = emptyList()
private var nextPages = Array<String?>(5) { null }
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_channel.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,9 @@
android:text="@string/playlists" />

<com.google.android.material.chip.Chip
android:id="@+id/channels"
android:id="@+id/albums"
style="@style/channelChip"
android:text="@string/channels" />
android:text="@string/albums" />

</com.google.android.material.chip.ChipGroup>

Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
<string name="comments_count">Comments (%1$s)</string>
<string name="replies">Replies</string>
<string name="channels">Channels</string>
<string name="albums">Albums</string>
<string name="all">All</string>
<string name="playlists">Playlists</string>
<string name="okay">OK</string>
Expand Down
Loading