240402/CheckTheethKids
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Atulização do quiz | Porcentagem na base de dados | Telas de Contrato com o usuario

Browse Source
This commit is contained in:
Carlos Correia
2026-07-13 22:28:01 +01:00
parent 824fdb8089
commit 4fcf3a475a
23 changed files with 2061 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
lib/auth_gate.dart
View File

@@ -6,9 +6,25 @@ import 'package:supabase_flutter/supabase_flutter.dart';
import 'main.dart' show supabase;
import 'home_screen.dart';
import 'logged_home.dart';
import 'privacy_gate_prefs.dart';
import 'screens/privacy_gate_screen.dart';
import 'screens/terms_gate_screen.dart';
import 'terms_gate_prefs.dart';
final ValueNotifier<bool> forceHomeScreen = ValueNotifier<bool>(false);
/// Quando um cadastro (signUp) acabou de acontecer, guarda o uid da conta
/// nova aqui — o AuthGate mostra o [TermsGateScreen] em vez do LoggedHome
/// enquanto este valor corresponder à sessão ativa. Aceitar limpa o valor
/// (avança para a Home); recusar apaga a conta e termina a sessão.
final ValueNotifier<String?> pendingTermsUserId = ValueNotifier<String?>(null);
/// Igual a [pendingTermsUserId], mas para o consentimento de privacidade
/// que o AuthGate mostra primeiro, antes do TermsGateScreen.
final ValueNotifier<String?> pendingPrivacyUserId = ValueNotifier<String?>(
null,
);
class AuthGate extends StatefulWidget {
const AuthGate({super.key});
@@ -20,6 +36,32 @@ class _AuthGateState extends State<AuthGate> {
String? _validatedUserId;
String? _validatingUserId;
@override
void initState() {
super.initState();
_loadPendingTermsUid();
_loadPendingPrivacyUid();
}
/// Recupera do disco o uid pendente de aceitação dos Termos (se existir),
/// para o caso de o processo ter sido morto entre o cadastro e a
/// aceitação — sem isto, reabrir a app perderia o estado "pendente" (que
/// por defeito vive só em memória) e o gate seria ignorado.
Future<void> _loadPendingTermsUid() async {
final uid = await TermsGatePrefs.getPendingUid();
if (uid != null && mounted) {
pendingTermsUserId.value = uid;
}
}
/// Igual a [_loadPendingTermsUid], para o consentimento de privacidade.
Future<void> _loadPendingPrivacyUid() async {
final uid = await PrivacyGatePrefs.getPendingUid();
if (uid != null && mounted) {
pendingPrivacyUserId.value = uid;
}
}
/// Confirma que a sessão ativa ainda corresponde a um perfil existente na
/// base de dados. Sessões do Supabase Auth sobrevivem mesmo que os dados
/// da conta tenham sido apagados (ex.: "Apagar dados da conta" ou remoção
@@ -61,43 +103,71 @@ class _AuthGateState extends State<AuthGate> {
return ValueListenableBuilder<bool>(
valueListenable: forceHomeScreen,
builder: (context, forcedHome, _) {
return StreamBuilder<AuthState>(
stream: supabase.auth.onAuthStateChange,
initialData: AuthState(AuthChangeEvent.initialSession, supabase.auth.currentSession),
builder: (context, snapshot) {
final user = snapshot.data?.session?.user;
return ValueListenableBuilder<String?>(
valueListenable: pendingPrivacyUserId,
builder: (context, pendingPrivacyUid, _) {
return ValueListenableBuilder<String?>(
valueListenable: pendingTermsUserId,
builder: (context, pendingUid, _) {
return StreamBuilder<AuthState>(
stream: supabase.auth.onAuthStateChange,
initialData: AuthState(AuthChangeEvent.initialSession, supabase.auth.currentSession),
builder: (context, snapshot) {
final user = snapshot.data?.session?.user;
if (user != null && user.id != _validatedUserId) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) _validateSession(user.id);
});
}
if (user != null && user.id != _validatedUserId) {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) _validateSession(user.id);
});
}
final Widget child;
if (snapshot.connectionState == ConnectionState.waiting) {
child = const SizedBox.shrink();
} else if (forcedHome || user == null || user.id != _validatedUserId) {
child = const HomeScreen(key: ValueKey('home_screen'));
} else {
child = const LoggedHomeScreen(key: ValueKey('logged_home_screen'));
}
final Widget child;
if (snapshot.connectionState == ConnectionState.waiting) {
child = const SizedBox.shrink();
} else if (forcedHome || user == null || user.id != _validatedUserId) {
child = const HomeScreen(key: ValueKey('home_screen'));
} else if (pendingPrivacyUid == user.id) {
child = PrivacyGateScreen(
key: const ValueKey('privacy_gate_screen'),
userId: user.id,
onAccepted: () {
pendingPrivacyUserId.value = null;
PrivacyGatePrefs.clearPendingUid();
},
);
} else if (pendingUid == user.id) {
child = TermsGateScreen(
key: const ValueKey('terms_gate_screen'),
userId: user.id,
onAccepted: () {
pendingTermsUserId.value = null;
TermsGatePrefs.clearPendingUid();
},
);
} else {
child = const LoggedHomeScreen(key: ValueKey('logged_home_screen'));
}
return AnimatedSwitcher(
duration: const Duration(milliseconds: 280),
reverseDuration: const Duration(milliseconds: 240),
switchInCurve: Curves.easeOutCubic,
switchOutCurve: Curves.easeInCubic,
transitionBuilder: (child, animation) {
final fade = CurvedAnimation(parent: animation, curve: Curves.easeOut);
return FadeTransition(
opacity: fade,
child: ScaleTransition(
scale: Tween<double>(begin: 0.985, end: 1.0).animate(fade),
child: child,
),
return AnimatedSwitcher(
duration: const Duration(milliseconds: 280),
reverseDuration: const Duration(milliseconds: 240),
switchInCurve: Curves.easeOutCubic,
switchOutCurve: Curves.easeInCubic,
transitionBuilder: (child, animation) {
final fade = CurvedAnimation(parent: animation, curve: Curves.easeOut);
return FadeTransition(
opacity: fade,
child: ScaleTransition(
scale: Tween<double>(begin: 0.985, end: 1.0).animate(fade),
child: child,
),
);
},
child: child,
);
},
);
},
child: child,
);
},
);