owen/TVTime
1
0
Fork 0
mirror of https://github.com/owenlejeune/TVTime.git synced 2025-11-22 19:50:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor tabs

Browse Source
This commit is contained in:
Owen LeJeune
2022-02-09 20:36:16 -05:00
parent 9eb5b76adf
commit da908df664
6 changed files with 102 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/owenlejeune/tvtime/MainActivity.kt
View File

@@ -3,12 +3,9 @@ package com.owenlejeune.tvtime
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.animation.rememberSplineBasedDecay
import androidx.compose.material.Scaffold
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.NavController
@@ -17,7 +14,11 @@ import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.rememberNavController
import com.owenlejeune.tvtime.ui.components.*
import com.owenlejeune.tvtime.ui.components.NavItems
import com.owenlejeune.tvtime.ui.screens.FavouritesTab
import com.owenlejeune.tvtime.ui.screens.MoviesTab
import com.owenlejeune.tvtime.ui.screens.SettingsTab
import com.owenlejeune.tvtime.ui.screens.TvTab
import com.owenlejeune.tvtime.ui.theme.TVTimeTheme
class MainActivity : ComponentActivity() {
@@ -57,15 +58,8 @@ fun MyApp() {
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun TopBar(title: MutableState<String>) {
val decayAnimationSpec = rememberSplineBasedDecay<Float>()
val scrollBehavior = remember(decayAnimationSpec) {
TopAppBarDefaults.exitUntilCollapsedScrollBehavior(decayAnimationSpec)
}
LargeTopAppBar(
modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
title = { Text(text = title.value) },
scrollBehavior = scrollBehavior
title = { Text(text = title.value) }
)
}

66
app/src/main/java/com/owenlejeune/tvtime/ui/components/NavScreens.kt
View File

@@ -1,66 +0,0 @@
package com.owenlejeune.tvtime.ui.components
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@Composable
fun MoviesTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "Movies Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}
@Composable
fun TvTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "TV Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}
@Composable
fun FavouritesTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "Favourites Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}
@Composable
fun SettingsTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "Settings Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}

24
app/src/main/java/com/owenlejeune/tvtime/ui/screens/FavouritesTab.kt Normal file
View File

@@ -0,0 +1,24 @@
package com.owenlejeune.tvtime.ui.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@Composable
fun FavouritesTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "Favourites Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}

24
app/src/main/java/com/owenlejeune/tvtime/ui/screens/MoviesTab.kt Normal file
View File

@@ -0,0 +1,24 @@
package com.owenlejeune.tvtime.ui.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@Composable
fun MoviesTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "Movies Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}

24
app/src/main/java/com/owenlejeune/tvtime/ui/screens/SettingsTab.kt Normal file
View File

@@ -0,0 +1,24 @@
package com.owenlejeune.tvtime.ui.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@Composable
fun SettingsTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "Settings Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}

24
app/src/main/java/com/owenlejeune/tvtime/ui/screens/TvTab.kt Normal file
View File

@@ -0,0 +1,24 @@
package com.owenlejeune.tvtime.ui.screens
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
@Composable
fun TvTab() {
Column(
modifier = Modifier
.fillMaxSize()
.wrapContentSize(Alignment.Center)
) {
Text(
text = "TV Tab",
color = MaterialTheme.colorScheme.onBackground
)
}
}