-
-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from UmairKhalid786/develop
Songs section added
- Loading branch information
Showing
8 changed files
with
219 additions
and
26 deletions.
There are no files selected for viewing
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
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
130 changes: 124 additions & 6 deletions
130
app/src/main/java/com/techlads/composetv/songs/SongsScreen.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 |
|---|---|---|
| @@ -1,23 +1,141 @@ | ||
| package com.techlads.composetv.songs | ||
|
|
||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.tv.material3.Text | ||
| import androidx.compose.foundation.Image | ||
| import androidx.compose.foundation.background | ||
| import androidx.compose.foundation.layout.* | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.draw.clipToBounds | ||
| import androidx.compose.ui.res.painterResource | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.tv.foundation.lazy.grid.TvGridCells | ||
| import androidx.tv.foundation.lazy.grid.TvLazyVerticalGrid | ||
| import androidx.tv.foundation.lazy.list.TvLazyRow | ||
| import androidx.tv.material3.MaterialTheme | ||
| import androidx.tv.material3.Text | ||
| import com.techlads.composetv.R | ||
| import com.techlads.composetv.songs.data.SongsTagsData.generateRandomColor | ||
| import com.techlads.composetv.widgets.TransparentBorderedFocusableItem | ||
|
|
||
| @Composable | ||
| fun SongsScreen(){ | ||
| Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { | ||
| Text(text = "Songs") | ||
| fun SongsScreen() { | ||
| Column(Modifier.fillMaxSize()) { | ||
| SongCategories(Modifier.weight(0.8f)) | ||
| RecentHistory(Modifier.weight(1.2f)) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun RecentHistory(modifier: Modifier = Modifier) { | ||
| Column(modifier) { | ||
| Text( | ||
| text = "Recent Songs", | ||
| style = MaterialTheme.typography.titleMedium, | ||
| modifier = Modifier.padding(horizontal = 32.dp) | ||
| ) | ||
| TvLazyRow(contentPadding = PaddingValues(horizontal = 32.dp, vertical = 8.dp)) { | ||
| items(12) { | ||
| TransparentBorderedFocusableItem(onClick = {}, Modifier.padding(4.dp)) { | ||
| SongItem(it) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun SongCategories(modifier: Modifier = Modifier) { | ||
| Column( | ||
| modifier | ||
| .fillMaxWidth() | ||
| .clipToBounds()) { | ||
| SongsHomeGreeting() | ||
| Spacer(modifier = Modifier.height(8.dp)) | ||
| TagsList() | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun TagsList(modifier: Modifier = Modifier) { | ||
| TvLazyVerticalGrid( | ||
| contentPadding = PaddingValues(horizontal = 32.dp, vertical = 8.dp), | ||
| columns = TvGridCells.Fixed(3), | ||
| modifier = modifier | ||
| .fillMaxSize() | ||
| ) { | ||
| items(6) { | ||
| TransparentBorderedFocusableItem(onClick = {}, Modifier.padding(4.dp)) { | ||
| TagItem(it) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun TagItem(it: Int) { | ||
| Row( | ||
| Modifier | ||
| .fillMaxWidth() | ||
| .background(generateRandomColor()), | ||
| verticalAlignment = Alignment.CenterVertically | ||
| ) { | ||
| Image( | ||
| painter = painterResource(id = R.drawable.song), | ||
| contentDescription = "Song image", | ||
| modifier = Modifier.size(50.dp) | ||
| ) | ||
| Text(text = "Song item $it", | ||
| Modifier | ||
| .weight(1f) | ||
| .padding(horizontal = 16.dp) | ||
| .fillMaxWidth() | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun SongItem(it: Int) { | ||
| Column( | ||
| Modifier | ||
| .width(150.dp) | ||
| .wrapContentHeight() | ||
| .background(generateRandomColor()) | ||
| ) { | ||
| Image( | ||
| painter = painterResource(id = R.drawable.song), | ||
| contentDescription = "Song image", | ||
| Modifier.fillMaxWidth() | ||
| ) | ||
| Text( | ||
| text = "Song item $it", | ||
| Modifier | ||
| .padding(16.dp) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| @Composable | ||
| fun SongsHomeGreeting() { | ||
| Text(text = "Good Morning", style = MaterialTheme.typography.titleLarge, modifier = Modifier.padding(start = 32.dp, top = 32.dp)) | ||
| } | ||
|
|
||
|
|
||
| @Preview | ||
| @Composable | ||
| fun SongsScreenPrev() { | ||
| SongsScreen() | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun SongItemPrev() { | ||
| SongItem(1) | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| fun TagItemPrev() { | ||
| TagItem(1) | ||
| } |
11 changes: 11 additions & 0 deletions
11
app/src/main/java/com/techlads/composetv/songs/data/SongsTagsData.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,11 @@ | ||
| package com.techlads.composetv.songs.data | ||
|
|
||
| import androidx.compose.ui.graphics.Color | ||
| import java.util.* | ||
|
|
||
| object SongsTagsData { | ||
| fun generateRandomColor() : Color { | ||
| val rnd = Random() | ||
| return Color(255, rnd.nextInt(256), rnd.nextInt(256), rnd.nextInt(256)) | ||
| } | ||
| } |
59 changes: 59 additions & 0 deletions
59
app/src/main/java/com/techlads/composetv/widgets/TransparentBorderedFocusableItem.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,59 @@ | ||
| package com.techlads.composetv.widgets | ||
|
|
||
| import androidx.compose.foundation.BorderStroke | ||
| import androidx.compose.foundation.layout.BoxScope | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.shape.RoundedCornerShape | ||
| import androidx.compose.material3.MaterialTheme.colorScheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.graphics.Color | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.compose.ui.unit.dp | ||
| import androidx.tv.material3.* | ||
|
|
||
| @OptIn(ExperimentalTvMaterial3Api::class) | ||
| @Composable | ||
| fun TransparentBorderedFocusableItem( | ||
| onClick: () -> Unit, | ||
| modifier: Modifier = Modifier, | ||
| content: @Composable (BoxScope.() -> Unit) | ||
| ) { | ||
| Surface( | ||
| onClick = { onClick() }, | ||
| scale = ClickableSurfaceDefaults.scale(focusedScale = 1.2f), | ||
| color = ClickableSurfaceDefaults.color( | ||
| color = Color.Transparent, | ||
| focusedColor = Color.Transparent | ||
| ), | ||
| contentColor = ClickableSurfaceDefaults.contentColor( | ||
| color = colorScheme.surface, | ||
| focusedColor = colorScheme.surface | ||
| ), | ||
| border = ClickableSurfaceDefaults.border( | ||
| focusedBorder = Border( | ||
| BorderStroke( | ||
| width = 2.dp, | ||
| color = colorScheme.surface | ||
| ), | ||
| shape = RoundedCornerShape(2.dp) | ||
| ) | ||
| ), | ||
| shape = ClickableSurfaceDefaults.shape( | ||
| shape = RoundedCornerShape(2.dp), | ||
| focusedShape = RoundedCornerShape(2.dp) | ||
| ), | ||
| modifier = modifier | ||
| .fillMaxWidth() | ||
| ) { | ||
| content() | ||
| } | ||
| } | ||
|
|
||
| @Preview | ||
| @Composable | ||
| private fun BorderedFocusableItemPrev() { | ||
| TransparentBorderedFocusableItem(onClick = {}) { | ||
| Text(text = "Preview Text") | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.