Skip to content

Fix navbar and some more minor fixes #114

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

Merged
mareliberum merged 1 commit into from
May 30, 2025
Merged

Fix navbar and some more minor fixes #114

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
14 changes: 2 additions & 12 deletions app/src/main/java/com/codekotliners/memify/core/navigation/BottomNavigationBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavBarItems.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
12 changes: 0 additions & 12 deletions app/src/main/java/com/codekotliners/memify/core/navigation/entities/NavUtils.kt
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions ...java/com/codekotliners/memify/features/profile/presentation/viewmodel/ProfileViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/add_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:pathData="M440,520L240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h200v-200q0,-17 11.5,-28.5T480,200q17,0 28.5,11.5T520,240v200h200q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L520,520v200q0,17 -11.5,28.5T480,760q-17,0 -28.5,-11.5T440,720v-200Z"
android:fillColor="#000000"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/add_28dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="28dp" android:viewportHeight="960" android:viewportWidth="960" android:width="28dp">

<path android:fillColor="#000000" android:pathData="M440,520L240,520q-17,0 -28.5,-11.5T200,480q0,-17 11.5,-28.5T240,440h200v-200q0,-17 11.5,-28.5T480,200q17,0 28.5,11.5T520,240v200h200q17,0 28.5,11.5T760,480q0,17 -11.5,28.5T720,520L520,520v200q0,17 -11.5,28.5T480,760q-17,0 -28.5,-11.5T440,720v-200Z"/>

</vector>