SS-FCSC/uaestats_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:VinistanSS/FCSC into dev

Browse Source
This commit is contained in:
venbaittech 2025-01-21 12:31:59 +05:30
commit 1b03125858
2 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/presentation/routes/auth_routes/login_route.dart
View File

@ -21,6 +21,9 @@ import 'package:uae_stat/presentation/routes/bottom_bar_routes/tab_routes/home_r
import '../../Screens/auth_verification/registration.dart';
import 'package:pocketbase/pocketbase.dart';
import '../../components/indicators/locale_provider.dart';
import '../../components/my_toggle.dart';
class LoginRoute extends HookConsumerWidget {
final pb = PocketBase('https://pb.venbait.in');
// final _pb = PocketBase('http://127.0.0.1:8090');
@ -82,6 +85,7 @@ class LoginRoute extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final locale = ref.watch(localeProvider);
final emailCtl = useTextEditingController();
final pwCtl = useTextEditingController();
final forgotPwBtn = TextButton(
@ -514,9 +518,16 @@ class LoginRoute extends HookConsumerWidget {
),
children: [
36.verticalSpace,
const Align(
Align(
alignment: AlignmentDirectional.topEnd,
child: LangToggle(),
child: MyToggle(isOn: locale?.languageCode == 'en',
knobTextWhenOn: 'ع',
knobTextWhenOff: 'EN',
pathColorWhenOn: Colors.grey.shade300,
pathColorWhenOff: Colors.grey.shade300,
onTap: (){
ref.read(localeProvider.notifier).toggleLocale();
},),
),
16.verticalSpace,
helloAndPleaseLoginTexts,

42
lib/presentation/routes/drawer_routes/custom_drawer_routes.dart
View File

@ -1,11 +1,16 @@
import 'dart:convert';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:go_router/go_router.dart';
import 'package:pocketbase/pocketbase.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
class BaseScaffold extends StatefulWidget {
import '../../components/indicators/locale_provider.dart';
import '../../components/my_toggle.dart';
class BaseScaffold extends ConsumerStatefulWidget {
final Widget body;
final Widget title;
final bool? showBackButton;
@ -28,7 +33,7 @@ class BaseScaffold extends StatefulWidget {
_BaseScaffoldState createState() => _BaseScaffoldState();
}
class _BaseScaffoldState extends State<BaseScaffold> {
class _BaseScaffoldState extends ConsumerState<BaseScaffold> {
final _pb = PocketBase('https://pb.venbait.in');
String _avatarUrl = '';
dynamic userId;
@ -200,6 +205,8 @@ class _BaseScaffoldState extends State<BaseScaffold> {
@override
Widget build(BuildContext context) {
final locale = ref.watch(localeProvider);
final localeNotifier = ref.read(localeProvider.notifier);
String currentRoute = GoRouterState.of(context).matchedLocation;
double myheight = MediaQuery.of(context).size.height;
double mywidth = MediaQuery.of(context).size.width;
@ -210,10 +217,18 @@ class _BaseScaffoldState extends State<BaseScaffold> {
backgroundColor: widget.appbarColor,
actions: widget.actions ??
[
IconButton(
onPressed: () {},
icon: const Icon(Icons.toggle_off_outlined),
),
// IconButton(
// onPressed: () {},
// icon: const Icon(Icons.toggle_off_outlined),
// ),
MyToggle(isOn: locale?.languageCode == 'en',
knobTextWhenOn: 'ع',
knobTextWhenOff: 'EN',
pathColorWhenOn: Colors.grey.shade300,
pathColorWhenOff: Colors.grey.shade300,
onTap: (){
ref.read(localeProvider.notifier).toggleLocale();
},),
],
leading: Stack(
children: [
@ -317,7 +332,8 @@ class _BaseScaffoldState extends State<BaseScaffold> {
if (role == 'admin')
ListTile(
leading: Icon(Icons.manage_accounts),
title: const Text('Manage User'),
// title: Text('Manage User'),
title: Text(AppLocalizations.of(context)!.manage_user,),
onTap: () => context.go('/manageuser'),
),
ListTile(
@ -340,19 +356,23 @@ class _BaseScaffoldState extends State<BaseScaffold> {
items: [
BottomNavigationBarItem(
icon: Icon(Icons.home),
label: 'Home',
// label: 'Home',
label: AppLocalizations.of(context)!.nav_home,
),
BottomNavigationBarItem(
icon: Icon(Icons.map),
label: 'UAE Numbers',
// label: 'UAE Numbers'
label: AppLocalizations.of(context)!.nav_uae,
),
BottomNavigationBarItem(
icon: Icon(Icons.bar_chart),
label: 'Competitiveness',
// label: 'Competitiveness',
label: AppLocalizations.of(context)!.nav_competitiveness,
),
BottomNavigationBarItem(
icon: Icon(Icons.public),
label: 'Country Profile',
// label: 'Country Profile',
label: AppLocalizations.of(context)!.country_profile,
),
],
selectedItemColor: Colors.black,