Skip to content

Commit f9f37e9

Browse files
All text migrated to tv material3
1 parent 6973773 commit f9f37e9

File tree

16 files changed

+67
-32
lines changed

16 files changed

+67
-32
lines changed

app/src/main/java/com/techlads/composetv/MainActivity.kt

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ import androidx.activity.ComponentActivity
66
import androidx.activity.compose.setContent
77
import androidx.activity.viewModels
88
import androidx.compose.animation.ExperimentalAnimationApi
9-
import androidx.compose.foundation.layout.fillMaxSize
10-
import androidx.compose.material3.MaterialTheme
11-
import androidx.compose.material3.Surface
129
import androidx.compose.runtime.Composable
1310
import androidx.compose.runtime.mutableStateOf
1411
import androidx.compose.runtime.remember
15-
import androidx.compose.ui.Modifier
1612
import androidx.lifecycle.lifecycleScope
1713
import androidx.navigation.NavHostController
1814
import com.google.accompanist.navigation.animation.rememberAnimatedNavController
@@ -58,12 +54,7 @@ class MainActivity : ComponentActivity() {
5854
@Composable
5955
fun App(navController: NavHostController, viewModel: HomeViewModel) {
6056
Material3Theme {
61-
Surface(
62-
modifier = Modifier.fillMaxSize(),
63-
color = MaterialTheme.colorScheme.background
64-
) {
65-
AppNavigation(navController, viewModel)
66-
}
57+
AppNavigation(navController, viewModel)
6758
}
6859
}
6960
}

app/src/main/java/com/techlads/composetv/favorites/FavoritesScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package com.techlads.composetv.favorites
33
import androidx.compose.foundation.layout.PaddingValues
44
import androidx.compose.foundation.layout.padding
55
import androidx.compose.material3.MaterialTheme
6-
import androidx.compose.material3.Text
6+
import androidx.tv.material3.Text
77
import androidx.compose.runtime.Composable
88
import androidx.compose.ui.Modifier
99
import androidx.compose.ui.tooling.preview.Preview

app/src/main/java/com/techlads/composetv/home/carousel/CarouselItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import androidx.compose.foundation.focusable
88
import androidx.compose.foundation.layout.*
99
import androidx.compose.material3.Card
1010
import androidx.compose.material3.MaterialTheme
11-
import androidx.compose.material3.Text
11+
import androidx.tv.material3.Text
1212
import androidx.compose.runtime.*
1313
import androidx.compose.ui.Alignment
1414
import androidx.compose.ui.Modifier

app/src/main/java/com/techlads/composetv/home/carousel/HorizontalCarouselItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.Column
44
import androidx.compose.foundation.layout.PaddingValues
55
import androidx.compose.foundation.layout.height
66
import androidx.compose.foundation.layout.padding
7-
import androidx.compose.material3.Text
7+
import androidx.tv.material3.Text
88
import androidx.compose.runtime.*
99
import androidx.compose.ui.Modifier
1010
import androidx.compose.ui.tooling.preview.Preview

app/src/main/java/com/techlads/composetv/leftmenu/LeftMenuItem.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import androidx.compose.foundation.layout.*
1111
import androidx.compose.material3.Icon
1212
import androidx.compose.material3.MaterialTheme
1313
import androidx.compose.material3.ShapeDefaults
14-
import androidx.compose.material3.Text
14+
import androidx.tv.material3.Text
1515
import androidx.compose.runtime.*
1616
import androidx.compose.ui.Alignment
1717
import androidx.compose.ui.Modifier

app/src/main/java/com/techlads/composetv/leftmenu/MenuHeader.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ import androidx.compose.foundation.layout.Column
66
import androidx.compose.foundation.layout.fillMaxWidth
77
import androidx.compose.foundation.layout.size
88
import androidx.compose.material3.Icon
9-
import androidx.compose.material3.Text
9+
import androidx.tv.material3.*
1010
import androidx.compose.runtime.Composable
1111
import androidx.compose.ui.Alignment
1212
import androidx.compose.ui.Modifier
1313
import androidx.compose.ui.draw.alpha
1414
import androidx.compose.ui.text.font.FontWeight
15+
import androidx.compose.ui.tooling.preview.Preview
1516
import androidx.compose.ui.unit.dp
1617
import androidx.compose.ui.unit.sp
1718
import compose.icons.LineAwesomeIcons
@@ -34,7 +35,8 @@ fun MenuHeader(expanded: Boolean = true) {
3435
Icon(
3536
modifier = Modifier.size(50.dp),
3637
imageVector = LineAwesomeIcons.TvSolid,
37-
contentDescription = "App icon"
38+
contentDescription = "App icon",
39+
tint = LocalContentColor.current
3840
)
3941
Text(
4042
text = "Compose Tv",
@@ -44,4 +46,10 @@ fun MenuHeader(expanded: Boolean = true) {
4446
maxLines = 1
4547
)
4648
}
49+
}
50+
51+
@Preview
52+
@Composable
53+
fun MenuHeaderPrev() {
54+
MenuHeader(true)
4755
}

app/src/main/java/com/techlads/composetv/login/withEmailPassword/LoginButton.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import androidx.compose.foundation.focusable
44
import androidx.compose.foundation.layout.*
55
import androidx.compose.material3.Button
66
import androidx.compose.material3.ButtonDefaults
7-
import androidx.compose.material3.Text
7+
import androidx.tv.material3.Text
88
import androidx.compose.runtime.Composable
99
import androidx.compose.runtime.mutableStateOf
1010
import androidx.compose.runtime.remember

app/src/main/java/com/techlads/composetv/login/withEmailPassword/LoginScreenContent.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import androidx.compose.ui.Alignment
88
import androidx.compose.ui.Modifier
99
import androidx.compose.ui.text.input.KeyboardType
1010
import androidx.compose.ui.text.input.PasswordVisualTransformation
11+
import androidx.compose.ui.tooling.preview.Preview
1112
import androidx.compose.ui.unit.dp
1213
@Composable
1314
fun LoginPage(
@@ -22,7 +23,7 @@ fun LoginPage(
2223
val username = remember { mutableStateOf("") }
2324
val password = remember { mutableStateOf("") }
2425

25-
ScreenHeading()
26+
ScreenHeading("LOGIN")
2627
Spacer(modifier = Modifier.height(20.dp))
2728
TvTextField(value = username.value, label = "Username") {
2829
username.value = it
@@ -41,3 +42,11 @@ fun LoginPage(
4142
}
4243
}
4344
}
45+
46+
@Preview
47+
@Composable
48+
fun LoginPagePrev() {
49+
LoginPage { u, p ->
50+
51+
}
52+
}
Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
package com.techlads.composetv.login.withEmailPassword
22

3-
import androidx.compose.material3.Text
3+
import androidx.tv.material3.Text
44
import androidx.compose.runtime.Composable
55
import androidx.compose.ui.text.TextStyle
66
import androidx.compose.ui.text.font.FontFamily
77
import androidx.compose.ui.text.font.FontWeight
8+
import androidx.compose.ui.tooling.preview.Preview
89
import androidx.compose.ui.unit.sp
910

1011
@Composable
11-
fun ScreenHeading() {
12+
fun ScreenHeading(heading: String) {
1213
Text(
13-
text = "LOGIN", style = TextStyle(
14+
text = heading, style = TextStyle(
1415
fontSize = 55.sp,
1516
fontFamily = FontFamily.SansSerif,
1617
fontWeight = FontWeight.Thin
1718
)
1819
)
20+
}
21+
22+
@Preview
23+
@Composable
24+
fun ScreenHeadingPrev() {
25+
ScreenHeading("LOGIN")
1926
}

app/src/main/java/com/techlads/composetv/login/withEmailPassword/TvTextField.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ package com.techlads.composetv.login.withEmailPassword
22

33
import androidx.compose.foundation.focusable
44
import androidx.compose.foundation.text.KeyboardOptions
5-
import androidx.compose.material3.*
5+
import androidx.compose.material3.ExperimentalMaterial3Api
6+
import androidx.compose.material3.OutlinedTextField
7+
import androidx.compose.material3.TextFieldDefaults
8+
import androidx.tv.material3.*
69
import androidx.compose.runtime.Composable
710
import androidx.compose.runtime.mutableStateOf
811
import androidx.compose.runtime.remember
@@ -14,6 +17,7 @@ import androidx.compose.ui.text.font.FontFamily
1417
import androidx.compose.ui.text.font.FontWeight
1518
import androidx.compose.ui.text.input.KeyboardType
1619
import androidx.compose.ui.text.input.VisualTransformation
20+
import androidx.compose.ui.tooling.preview.Preview
1721
import com.techlads.composetv.theme.LightBlue
1822

1923
@OptIn(ExperimentalMaterial3Api::class)
@@ -57,4 +61,12 @@ fun TvTextField(
5761
}
5862
.focusable(true)
5963
)
64+
}
65+
66+
@Preview
67+
@Composable
68+
fun TvTextFieldPrev() {
69+
TvTextField("Test", "Enter Test") {
70+
71+
}
6072
}

0 commit comments

Comments
 (0)