Skip to content

Learn #11

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

Open
HuyVo117 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Learn #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c521a5c
impo]rove ui AI
HuyVo117 May 9, 2025
aac5f0d
fix: update API key in VoiceAssistantScreen for OpenAI integration
HuyVo117 May 10, 2025
f45e515
feat(auth): add resetRegisterState method and update signup navigatio…
HuyVo117 May 13, 2025
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
3 changes: 3 additions & 0 deletions .idea/deploymentTargetSelector.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
</intent-filter>
</activity>
<activity

android:name=".ui.MainActivity"
android:exported="true"
android:label="@string/app_name"
Expand Down
22 changes: 14 additions & 8 deletions app/src/main/java/com/example/deepsea/ui/screens/auth/SignupScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
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
Expand All @@ -47,6 +49,7 @@ import com.example.deepsea.ui.components.SignupTextField
import com.example.deepsea.ui.navigation.DeepSeaNavController
import com.example.deepsea.ui.theme.DeepSeaTheme
import com.example.deepsea.ui.viewmodel.auth.AuthViewModel
import com.example.deepsea.utils.RegisterState

@Composable
fun SignupPage(
Expand Down Expand Up @@ -75,14 +78,17 @@ fun SignupPage(
avatarUri = uri
}

// val registerState by authViewModel.registerState.collectAsState()
//
// LaunchedEffect(registerState) {
// if (registerState is RegisterState.Success) {
// onRegisterSuccess()
// authViewModel.resetRegisterState()
// }
// }
val registerState by authViewModel.registerState.collectAsState()

LaunchedEffect(registerState) {
if (registerState is RegisterState.Success) {
navController.navController.navigate("login") {
popUpTo("signup") { inclusive = true }
}
authViewModel.resetRegisterState()
}
}


DeepSeaTheme {
Box(modifier = Modifier.fillMaxSize()) {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/example/deepsea/ui/screens/feature/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ import kotlinx.coroutines.launch
* Hiển thị danh sách các đơn vị học tập với các ngôi sao tương tác
* Hỗ trợ vuốt ngang để chuyển giữa các section
*/

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun HomeScreen(sections: List<List<UnitData>> = emptyList(), navController: NavController) {
Expand Down Expand Up @@ -352,4 +353,4 @@ private fun HomeScreenPreview() {
}
val navController = rememberNavController()
HomeScreen(sections = sections, navController = navController)
}
}
Loading