Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Commit

Permalink
Revert "belindas-closet-android_2_97_navigation-bar (#114)"
Browse files Browse the repository at this point in the history
This reverts commit 954a3d8.
  • Loading branch information
brinkbrink authored Nov 8, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 954a3d8 commit fe4c08c
Showing 4 changed files with 6 additions and 60 deletions.
9 changes: 4 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -49,10 +49,10 @@ android {

dependencies {

implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.22')
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.2'
implementation 'androidx.compose.ui:ui'
implementation 'androidx.compose.ui:ui-graphics'
implementation 'androidx.compose.ui:ui-tooling-preview'
@@ -65,7 +65,7 @@ dependencies {
debugImplementation 'androidx.compose.ui:ui-test-manifest'

// Navigation
implementation 'androidx.navigation:navigation-compose:2.7.5'
implementation 'androidx.navigation:navigation-compose:2.6.0'

// Material Design
implementation "androidx.compose.material3:material3:1.2.0-alpha03"
@@ -85,5 +85,4 @@ dependencies {

// Kotlin Reflection
implementation "org.jetbrains.kotlin:kotlin-reflect:1.8.22"

}
13 changes: 0 additions & 13 deletions app/src/main/java/com/example/belindas_closet/screen/Home.kt
Original file line number Diff line number Diff line change
@@ -1,30 +1,19 @@
package com.example.belindas_closet.screen

import android.graphics.drawable.Icon
import androidx.compose.foundation.Image
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.Button
import androidx.compose.material3.Card
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
@@ -46,10 +35,8 @@ import com.example.belindas_closet.data.Datasource
import com.example.belindas_closet.model.Product


@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun HomePage(navController: NavController) {

Row(
modifier = Modifier
.size(125.dp)
Original file line number Diff line number Diff line change
@@ -36,29 +36,17 @@ import com.example.belindas_closet.R
import com.example.belindas_closet.Routes
import com.example.belindas_closet.model.Product
import com.example.belindas_closet.data.Datasource
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.*
import androidx.compose.material3.TabRowDefaults.tabIndicatorOffset
import androidx.compose.runtime.*

@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun IndividualProductPage(navController: NavController, productId: String) {

var drawerState by remember { mutableStateOf(DrawerValue.Closed) }

Scaffold(

modifier = Modifier
.fillMaxSize(),
topBar = {
/* Back arrow that navigates back to login page */
TopAppBar(
title = { Text("Back") },
title = { Text("Home") },
navigationIcon = {
IconButton(
onClick = {
@@ -67,7 +55,7 @@ fun IndividualProductPage(navController: NavController, productId: String) {
) {
Icon(
imageVector = Icons.Default.ArrowBack,
contentDescription = "Back to Product page"
contentDescription = "Back to Home page"
)
}
},
@@ -79,13 +67,6 @@ fun IndividualProductPage(navController: NavController, productId: String) {
) {
Icon(imageVector = Icons.Default.Edit, contentDescription = "Edit")
}
IconButton(
onClick = {
drawerState = DrawerValue.Open
}
) {
Icon(imageVector = Icons.Default.Menu, contentDescription = "Menu")
}
}
)
},
Original file line number Diff line number Diff line change
@@ -15,24 +15,15 @@ import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.filled.Edit
import androidx.compose.material.icons.filled.Menu
import androidx.compose.material3.Card
import androidx.compose.material3.DrawerValue
import androidx.compose.material3.DropdownMenu
import androidx.compose.material3.DropdownMenuItem
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.rememberDrawerState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
@@ -53,9 +44,6 @@ import com.example.belindas_closet.data.Datasource
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ProductDetailPage(navController: NavController) {

var drawerState by remember { mutableStateOf(DrawerValue.Closed) }

Scaffold(
modifier = Modifier
.fillMaxSize(),
@@ -86,18 +74,9 @@ fun ProductDetailPage(navController: NavController) {
) {
Icon(imageVector = Icons.Default.Edit, contentDescription = "Edit")
}
IconButton(
onClick = {
drawerState = DrawerValue.Open
}
) {
Icon(imageVector = Icons.Default.Menu, contentDescription = "Menu")
}

}
)
},

) { innerPadding ->
val modifier = Modifier.padding(innerPadding)
Column(

0 comments on commit fe4c08c

Please sign in to comment.