-
Notifications
You must be signed in to change notification settings - Fork 1
[Feat]: Add user profile screen and visit tracking #63
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.
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
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
12 changes: 12 additions & 0 deletions
12
app/src/main/java/com/appnotresponding/rumbo/models/visitedPlace.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package com.appnotresponding.rumbo.models | ||
|
|
||
| data class VisitedPlace( | ||
Check warningCode scanning / detekt If a source file contains only a single non-private top-level class or object, the file name should reflect the case-sensitive name plus the .kt extension. Warning
The file name 'visitedPlace' does not match the name of the single top-level declaration 'VisitedPlace'.
|
||
| val placeId: String = "", | ||
| val placeName: String = "", | ||
| val address: String = "", | ||
| val latitude: Double = 0.0, | ||
| val longitude: Double = 0.0, | ||
| val imageUrl: String? = null, | ||
| val city: String = "", | ||
| val visitedAt: Long = 0L | ||
| ) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
83 changes: 83 additions & 0 deletions
83
app/src/main/java/com/appnotresponding/rumbo/ui/screens/profile/ProfileScreen.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package com.appnotresponding.rumbo.ui.screens.profile | ||
|
|
||
| import android.net.Uri | ||
| import androidx.activity.compose.rememberLauncherForActivityResult | ||
| import androidx.activity.result.contract.ActivityResultContracts | ||
| import androidx.compose.foundation.layout.Box | ||
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.MaterialTheme | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.collectAsState | ||
| 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.lifecycle.viewmodel.compose.viewModel | ||
| import androidx.navigation.NavHostController | ||
| import com.appnotresponding.rumbo.auth | ||
| import com.appnotresponding.rumbo.navigation.AppScreens | ||
| import com.appnotresponding.rumbo.ui.templates.ProfileTemplate | ||
| import com.appnotresponding.rumbo.ui.viewModel.ProfileViewModel | ||
| import com.appnotresponding.rumbo.ui.viewModel.UserViewModel | ||
|
|
||
| @Composable | ||
| fun ProfileScreen( | ||
| controller: NavHostController, | ||
| userViewModel: UserViewModel, | ||
| profileViewModel: ProfileViewModel = viewModel() | ||
| ) { | ||
| val userState by userViewModel.currentUserState.collectAsState() | ||
| val profileState by profileViewModel.uiState.collectAsState() | ||
| var selectedPhotoUri by remember { mutableStateOf<Uri?>(null) } | ||
|
|
||
| val imagePicker = rememberLauncherForActivityResult( | ||
| contract = ActivityResultContracts.GetContent() | ||
| ) { uri -> | ||
| selectedPhotoUri = uri | ||
| } | ||
|
|
||
| val user = userState | ||
| if (user == null) { | ||
| Box(modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center) { | ||
| CircularProgressIndicator(color = MaterialTheme.colorScheme.primary) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| LaunchedEffect(user.id) { | ||
| profileViewModel.loadItineraryHistory(user.id) | ||
| profileViewModel.loadUserDropNotes(user.id) | ||
| } | ||
|
|
||
| ProfileTemplate( | ||
| user = user, | ||
| itineraryHistory = profileState.itineraryHistory, | ||
| dropNotes = profileState.userDropNotes, | ||
| selectedPhotoUri = selectedPhotoUri, | ||
| isSavingProfile = profileState.isSavingProfile, | ||
| profileError = profileState.profileError, | ||
| profileSuccess = profileState.profileSuccess, | ||
| controller = controller, | ||
| onBackClick = { controller.popBackStack() }, | ||
| onPickPhoto = { imagePicker.launch("image/*") }, | ||
| onSaveProfile = { name, lastname, phone -> | ||
| profileViewModel.updateProfile( | ||
| user = user, | ||
| name = name, | ||
| lastname = lastname, | ||
| phone = phone, | ||
| photoUri = selectedPhotoUri, | ||
| onSuccess = { selectedPhotoUri = null }) | ||
| }, | ||
| onSignOut = { | ||
| auth.signOut() | ||
| controller.navigate(AppScreens.Splash.name) { | ||
| popUpTo(controller.graph.startDestinationId) { inclusive = true } | ||
| launchSingleTop = true | ||
| } | ||
| }) | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.