diff --git a/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainScreen.kt b/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainScreen.kt index df39210..1808753 100644 --- a/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainScreen.kt +++ b/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainScreen.kt @@ -49,15 +49,15 @@ import kotlinx.coroutines.delay import kotlinx.coroutines.launch import timber.log.Timber -const val EVENT_DISMISS_DELAY_MS = 150L +private const val EVENT_DISMISS_DELAY_MS = 150L private val topLevelDestinations = listOf( - TopLevelDestination.PublicBets, TopLevelDestination.BetCreation, + TopLevelDestination.PublicBets, + TopLevelDestination.CurrentBets, TopLevelDestination.BetHistory, TopLevelDestination.Friends, TopLevelDestination.Ranking, - TopLevelDestination.CurrentBets ) @OptIn(ExperimentalMaterial3Api::class) diff --git a/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt b/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt index 5c9f5b7..2e5f3b2 100644 --- a/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt +++ b/src/app/src/main/java/fr/iut/alldev/allin/ui/main/MainViewModel.kt @@ -21,6 +21,7 @@ import fr.iut.alldev.allin.ui.main.event.WonBet import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext +import timber.log.Timber import javax.inject.Inject @HiltViewModel @@ -138,7 +139,11 @@ class MainViewModel @Inject constructor( ) - betRepository.participateToBet(participation, keystoreManager.getTokenOrEmpty()) + try { + betRepository.participateToBet(participation, keystoreManager.getTokenOrEmpty()) + } catch (e: Exception) { + Timber.e(e) + } } } loading.value = false diff --git a/src/app/src/main/res/values-fr/strings.xml b/src/app/src/main/res/values-fr/strings.xml index 6233038..abc94af 100644 --- a/src/app/src/main/res/values-fr/strings.xml +++ b/src/app/src/main/res/values-fr/strings.xml @@ -41,13 +41,13 @@ <string name="drawer_best_win">Meilleur gain</string> <string name="drawer_friends">Amis</string> <string name="drawer_friends_subtitle">Défiez vos proches en les ajoutant en amis.</string> - <string name="drawer_public_bets">Bets publiques</string> + <string name="drawer_public_bets">Participer</string> <string name="drawer_public_bets_subtitle">Parcourez les bets les plus populaires du moment.</string> - <string name="drawer_create_bet">Créer un bet</string> + <string name="drawer_create_bet">Nouveau Bet</string> <string name="drawer_create_bet_subtitle">Créez un nouveau bet et faites participer vos amis.</string> - <string name="drawer_bet_history">Historique des bets</string> + <string name="drawer_bet_history">Historique</string> <string name="drawer_bet_history_subtitle">Consultez vos paris en cours et terminés.</string> - <string name="drawer_current_bets">Bets en cours</string> + <string name="drawer_current_bets">Mes participations</string> <string name="drawer_current_bets_subtitle">Gérez vos bets et récompensez les gagnants.</string> <string name="drawer_ranking">Classement</string> <string name="drawer_ranking_subtitle">Consultez votre classement parmi vos amis.</string> diff --git a/src/app/src/main/res/values/strings.xml b/src/app/src/main/res/values/strings.xml index d4d29c9..ce26921 100644 --- a/src/app/src/main/res/values/strings.xml +++ b/src/app/src/main/res/values/strings.xml @@ -42,14 +42,14 @@ <string name="drawer_bets">Bets</string> <string name="drawer_best_win">Best win</string> <string name="drawer_friends">Friends</string> - <string name="drawer_public_bets">Public bets</string> + <string name="drawer_public_bets">Participate</string> <string name="drawer_public_bets_subtitle">Browse the most popular bets of the moment.</string> - <string name="drawer_create_bet">Create a bet</string> + <string name="drawer_create_bet">New Bet</string> <string name="drawer_create_bet_subtitle">Create a net bet and get your friends participating.</string> - <string name="drawer_bet_history">Bet history</string> + <string name="drawer_bet_history">History</string> <string name="drawer_bet_history_subtitle">View your current and finished bets.</string> <string name="drawer_friends_subtitle">Challenge your folks by adding them as friends.</string> - <string name="drawer_current_bets">Current bets</string> + <string name="drawer_current_bets">My participations</string> <string name="drawer_current_bets_subtitle">Manage your bets and reward the winners.</string> <string name="drawer_ranking">Ranking</string> <string name="drawer_ranking_subtitle">Browse your ranking with your friends.</string>