-
-
Notifications
You must be signed in to change notification settings - Fork 3.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Migrate about channel fragment to Jetpack Compose
- Loading branch information
1 parent
de6285b
commit 2653787
Showing
7 changed files
with
133 additions
and
121 deletions.
There are no files selected for viewing
36 changes: 36 additions & 0 deletions
36
app/src/main/java/org/schabi/newpipe/fragments/list/channel/AboutChannelFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| package org.schabi.newpipe.fragments.list.channel | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Surface | ||
| import androidx.core.os.bundleOf | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.compose.content | ||
| import org.schabi.newpipe.extractor.channel.ChannelInfo | ||
| import org.schabi.newpipe.ktx.serializable | ||
| import org.schabi.newpipe.ui.components.channel.AboutChannelSection | ||
| import org.schabi.newpipe.ui.theme.AppTheme | ||
| import org.schabi.newpipe.util.KEY_INFO | ||
|
|
||
| class AboutChannelFragment : Fragment() { | ||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ) = content { | ||
| AppTheme { | ||
| Surface(color = MaterialTheme.colorScheme.background) { | ||
| AboutChannelSection(requireArguments().serializable(KEY_INFO)!!) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| @JvmStatic | ||
| fun getInstance(channelInfo: ChannelInfo) = AboutChannelFragment().apply { | ||
| arguments = bundleOf(KEY_INFO to channelInfo) | ||
| } | ||
| } | ||
| } |
94 changes: 0 additions & 94 deletions
94
app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelAboutFragment.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
app/src/main/java/org/schabi/newpipe/ui/components/channel/AboutChannelSection.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package org.schabi.newpipe.ui.components.channel | ||
|
|
||
| import android.content.res.Configuration | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.material3.Surface | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import org.schabi.newpipe.R | ||
| import org.schabi.newpipe.extractor.channel.ChannelInfo | ||
| import org.schabi.newpipe.ui.components.metadata.ImageMetadataItem | ||
| import org.schabi.newpipe.ui.components.metadata.MetadataItem | ||
| import org.schabi.newpipe.ui.theme.AppTheme | ||
| import org.schabi.newpipe.util.Localization | ||
| import org.schabi.newpipe.util.NO_SERVICE_ID | ||
| import org.schabi.newpipe.util.image.ImageStrategy | ||
|
|
||
| @Composable | ||
| fun AboutChannelSection(channelInfo: ChannelInfo) { | ||
| // This tab currently holds little information, so a lazy column isn't needed here. | ||
| Column( | ||
| modifier = Modifier.padding(12.dp), | ||
| verticalArrangement = Arrangement.spacedBy(4.dp) | ||
| ) { | ||
| val description = channelInfo.description | ||
| if (!description.isNullOrEmpty()) { | ||
| Text(text = description) | ||
| } | ||
|
|
||
| val count = channelInfo.subscriberCount | ||
| if (count != -1L) { | ||
| MetadataItem( | ||
| title = R.string.metadata_subscribers, | ||
| value = Localization.shortCount(LocalContext.current, count) | ||
| ) | ||
| } | ||
|
|
||
| ImageStrategy.choosePreferredImage(channelInfo.avatars)?.let { | ||
| ImageMetadataItem(R.string.metadata_avatars, channelInfo.avatars, it) | ||
| } | ||
|
|
||
| ImageStrategy.choosePreferredImage(channelInfo.banners)?.let { | ||
| ImageMetadataItem(R.string.metadata_banners, channelInfo.banners, it) | ||
| } | ||
|
|
||
| if (channelInfo.tags.isNotEmpty()) { | ||
| TagsSection(channelInfo.serviceId, channelInfo.tags) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Preview(name = "Light mode", uiMode = Configuration.UI_MODE_NIGHT_NO) | ||
| @Preview(name = "Dark mode", uiMode = Configuration.UI_MODE_NIGHT_YES) | ||
| @Composable | ||
| private fun AboutChannelSectionPreview() { | ||
| val info = ChannelInfo(NO_SERVICE_ID, "", "", "", "") | ||
| info.description = "This is an example description" | ||
| info.subscriberCount = 10 | ||
|
|
||
| AppTheme { | ||
| Surface(color = MaterialTheme.colorScheme.background) { | ||
| AboutChannelSection(info) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters