diff --git a/app/src/main/java/com/codekotliners/memify/core/navigation/BottomNavigationBar.kt b/app/src/main/java/com/codekotliners/memify/core/navigation/BottomNavigationBar.kt index b35997de..7e6a5615 100644 --- a/app/src/main/java/com/codekotliners/memify/core/navigation/BottomNavigationBar.kt +++ b/app/src/main/java/com/codekotliners/memify/core/navigation/BottomNavigationBar.kt @@ -11,8 +11,6 @@ import androidx.compose.material3.NavigationBarItemDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.drawBehind -import androidx.compose.ui.geometry.Offset import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.unit.dp @@ -26,16 +24,8 @@ fun BottomNavigationBar(navController: NavController) { NavigationBar( modifier = Modifier - .height(60.dp) - .fillMaxWidth() - .drawBehind { - drawLine( - color = Color.LightGray, - start = Offset(0f, 0f), - end = Offset(size.width, 0f), - strokeWidth = 1.dp.toPx(), - ) - }, + .height(74.dp) + .fillMaxWidth(), containerColor = MaterialTheme.colorScheme.surface, contentColor = MaterialTheme.colorScheme.onSurface, ) { diff --git a/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavBarItems.kt b/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavBarItems.kt index d03c8f2b..111685d6 100644 --- a/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavBarItems.kt +++ b/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavBarItems.kt @@ -13,8 +13,8 @@ object NavBarItems { ), BarItem( title = "Create", - iconNotPressed = R.drawable.outline_add_24, - iconPressed = R.drawable.outline_add_24, + iconNotPressed = R.drawable.add_24dp, + iconPressed = R.drawable.add_24dp, route = NavRoutes.Create.createRoute(), ), BarItem( diff --git a/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavUtils.kt b/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavUtils.kt deleted file mode 100644 index 9c4142fb..00000000 --- a/app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavUtils.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.codekotliners.memify.core.navigation.entities - -object NavUtils { - private val bottomNavRoutes = - setOf( - NavRoutes.Home.route, - NavRoutes.Create.route, - NavRoutes.Profile.route, - ) - - fun shouldShowBottomBar(currentRoute: String?): Boolean = currentRoute in bottomNavRoutes -} diff --git a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/viewmodel/ProfileViewModel.kt b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/viewmodel/ProfileViewModel.kt index 0278fc1c..708c1153 100644 --- a/app/src/main/java/com/codekotliners/memify/features/profile/presentation/viewmodel/ProfileViewModel.kt +++ b/app/src/main/java/com/codekotliners/memify/features/profile/presentation/viewmodel/ProfileViewModel.kt @@ -70,6 +70,19 @@ class ProfileViewModel @Inject constructor( _state.value = _state.value.copy(isLoggedIn = isLoggedInActually) } + if (FirebaseAuth.getInstance().currentUser != null) { + _state.value = _state.value.copy(isLoggedIn = true) + viewModelScope.launch { + _likedPosts.value = likesRepository.getLikedPosts() + } + } + + viewModelScope.launch { + uriRepository.getAllUris().collect { + _savedUris.value = it + } + } + viewModelScope.launch(Dispatchers.IO) { val imageUri = updateProfileImageUseCase.getProfileImageUrl()?.toUri() diff --git a/app/src/main/res/drawable/add_24dp.xml b/app/src/main/res/drawable/add_24dp.xml new file mode 100644 index 00000000..a265c21e --- /dev/null +++ b/app/src/main/res/drawable/add_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/add_28dp.xml b/app/src/main/res/drawable/add_28dp.xml new file mode 100644 index 00000000..12a50fec --- /dev/null +++ b/app/src/main/res/drawable/add_28dp.xml @@ -0,0 +1,5 @@ + + + + +