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

refactor screen packages #23

Merged
merged 1 commit into from
Mar 11, 2023
Merged

refactor screen packages #23

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
22 changes: 22 additions & 0 deletions app/src/main/java/com/jumrukovski/quotescompose/ui/feature/categories/CategoriesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.jumrukovski.quotescompose.ui.feature.categories

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor

@Composable
fun CategoriesScreen(navHostController: NavHostController) {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor)
) {
Text(text = "Categories screen")
}
}
22 changes: 22 additions & 0 deletions app/src/main/java/com/jumrukovski/quotescompose/ui/feature/favourites/FavouritesScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.jumrukovski.quotescompose.ui.feature.favourites

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor

@Composable
fun FavouritesScreen(navHostController: NavHostController) {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor)
) {
Text(text = "Favourites screen")
}
}
22 changes: 22 additions & 0 deletions app/src/main/java/com/jumrukovski/quotescompose/ui/feature/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package com.jumrukovski.quotescompose.ui.feature.home

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.navigation.NavHostController
import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor

@Composable
fun HomeScreen(navHostController: NavHostController) {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor)
) {
Text(text = "Home screen")
}
}
69 changes: 21 additions & 48 deletions app/src/main/java/com/jumrukovski/quotescompose/ui/feature/main/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,9 @@ package com.jumrukovski.quotescompose.ui.feature.main
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
Expand All @@ -21,45 +17,14 @@ import com.jumrukovski.quotescompose.R
import com.jumrukovski.quotescompose.ui.common.BottomNavigationBar
import com.jumrukovski.quotescompose.ui.common.Screen
import com.jumrukovski.quotescompose.ui.common.Toolbar
import com.jumrukovski.quotescompose.ui.feature.categories.CategoriesScreen
import com.jumrukovski.quotescompose.ui.feature.favourites.FavouritesScreen
import com.jumrukovski.quotescompose.ui.feature.home.HomeScreen
import com.jumrukovski.quotescompose.ui.feature.search.SearchActivity
import com.jumrukovski.quotescompose.ui.theme.PrimaryBackgroundColor
import com.jumrukovski.quotescompose.ui.theme.QuotesComposeTheme

class MainActivity : ComponentActivity() {

@Composable
private fun HomeScreen(navHostController: NavHostController) {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor)
) {
Text(text = "Home screen")
}
}

@Composable
private fun CategoriesScreen(navHostController: NavHostController) {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor)
) {
Text(text = "Categories screen")
}
}

@Composable
private fun FavouritesScreen(navHostController: NavHostController) {
Box(
modifier = Modifier
.fillMaxSize()
.background(MaterialTheme.colorScheme.PrimaryBackgroundColor)
) {
Text(text = "Favourites screen")
}
}

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContent {
Expand All @@ -78,20 +43,28 @@ class MainActivity : ComponentActivity() {
}
},
content = { innerPadding ->
NavHost(
navController,
startDestination = Screen.Home.route,
Modifier.padding(innerPadding)
) {
composable(Screen.Home.route) { HomeScreen(navController) }
composable(Screen.Categories.route) { CategoriesScreen(navController) }
composable(Screen.Favourites.route) { FavouritesScreen(navController) }
}
ContentNavigation(
navHostController = navController,
innerPadding = innerPadding
)
},
bottomBar = {
BottomNavigationBar(navController)
})
}
}
}

@Composable
private fun ContentNavigation(navHostController: NavHostController,innerPadding:PaddingValues){
NavHost(
navHostController,
startDestination = Screen.Home.route,
Modifier.padding(innerPadding)
) {
composable(Screen.Home.route) { HomeScreen(navHostController) }
composable(Screen.Categories.route) { CategoriesScreen(navHostController) }
composable(Screen.Favourites.route) { FavouritesScreen(navHostController) }
}
}
}