Skip to content

Commit

Permalink
Created Category Screen
Browse files Browse the repository at this point in the history
  • Loading branch information
aritra-tech committed Mar 15, 2024
1 parent b330805 commit 0fb9b10
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import com.geekymusketeers.uncrack.R
import com.geekymusketeers.uncrack.presentation.account.AccountScreen
import com.geekymusketeers.uncrack.presentation.account.PasswordGenerator
import com.geekymusketeers.uncrack.presentation.account.PasswordGeneratorViewModel
import com.geekymusketeers.uncrack.presentation.category.CategoryScreen
import com.geekymusketeers.uncrack.presentation.home.HomeScreen
import com.geekymusketeers.uncrack.presentation.masterKey.ConfirmMasterKeyScreen
import com.geekymusketeers.uncrack.presentation.masterKey.CreateMasterKeyScreen
Expand Down Expand Up @@ -63,7 +64,8 @@ fun Navigation(
"update_master_key_screen",
"create_new_master_key_screen",
"confirm_master_key_screen",
"password_generator_screen"
"password_generator_screen",
"category_screen"
)

BackPressHandler()
Expand All @@ -88,7 +90,9 @@ fun Navigation(
) {

composable(route = "home_screen") {
HomeScreen()
HomeScreen(
navController
)
}

composable(route = "password_screen") {
Expand Down Expand Up @@ -137,6 +141,12 @@ fun Navigation(
passwordGeneratorViewModel
)
}

composable(route = "category_screen") {
CategoryScreen(
navController
)
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package com.geekymusketeers.uncrack.presentation.category

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController
import com.geekymusketeers.uncrack.components.UCTopAppBar
import com.geekymusketeers.uncrack.ui.theme.BackgroundLight

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun CategoryScreen(
navController: NavHostController,
modifier: Modifier = Modifier
) {

Scaffold(
topBar = {
UCTopAppBar(
modifier = modifier.fillMaxWidth(),
title = "Category",
onBackPress = { navController.popBackStack() }
)
}
) { paddingValues ->
Column(
modifier = Modifier
.fillMaxWidth()
.padding(paddingValues)
.padding(16.dp)
.background(BackgroundLight)
) {

}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.heightIn
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
Expand All @@ -33,6 +32,8 @@ import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import com.geekymusketeers.uncrack.R
import com.geekymusketeers.uncrack.components.CategoryCard
import com.geekymusketeers.uncrack.ui.theme.BackgroundLight
Expand All @@ -43,6 +44,7 @@ import com.geekymusketeers.uncrack.ui.theme.normal16
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun HomeScreen(
navController: NavHostController,
modifier: Modifier = Modifier
) {

Expand Down Expand Up @@ -92,7 +94,12 @@ fun HomeScreen(
onSearch = {},
active = false,
onActiveChange = {},
placeholder = { Text(text = "Search here", style = normal16)},
placeholder = {
Text(
text = "Search here",
style = normal16
)
},
leadingIcon = { Icon(Icons.Default.Search, contentDescription = null) }
) { }

Expand All @@ -110,7 +117,9 @@ fun HomeScreen(
Text(
modifier = Modifier
.padding(top = 4.dp)
.clickable { },
.clickable {
navController.navigate("category_screen")
},
text = "See all",
style = normal14.copy(Color.Gray)
)
Expand Down Expand Up @@ -161,5 +170,8 @@ fun HomeScreen(
@Preview
@Composable
private fun HomeScreenPrev() {
HomeScreen(modifier = Modifier)
HomeScreen(
navController = rememberNavController(),
modifier = Modifier
)
}

0 comments on commit 0fb9b10

Please sign in to comment.