Jayesh.Jain/Tanami_App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6 from WDI-Ideas/home

Browse Source 
bottom navigation
This commit is contained in:
Raj
2024-05-30 12:39:07 +05:30
committed by GitHub
parent 93ec06ce99 4c82e3a75b
commit 61dc979768
13 changed files with 313 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/bottom_bar/inactive/InactiveHome.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
assets/images/bottom_bar/inactive/Investinactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
assets/images/bottom_bar/inactive/SettingInactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
assets/images/bottom_bar/inactive/academyinactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
assets/images/bottom_bar/inactive/portfolioinactive.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
lib/core/routes/route_name.dart
View File

@@ -17,4 +17,7 @@ class RouteName {
//choose country
static const String chooseCountryScreen = 'chooseCountryScreen';
//
static const String mainScreen = 'mainScreen';
}

8
lib/core/routes/routes.dart
View File

@@ -2,6 +2,7 @@
import 'package:go_router/go_router.dart';
import 'package:tanami_app/core/routes/route_name.dart';
import 'package:tanami_app/features/Home/presentation/pages/mainScreen.dart';
import 'package:tanami_app/features/countrySelection/presentation/pages/choose_country_screen.dart';
import 'package:tanami_app/features/welcome/presentation/pages/weclome_screen.dart';
@@ -51,6 +52,13 @@ final goRouter = GoRouter(
return const ChooseCountryScreen();
},
),
GoRoute(
name: RouteName.mainScreen,
path: RouteName.mainScreen,
builder: (context, state) {
return const MainScreen();
},
),
]),
// GoRoute(

22
lib/features/Home/presentation/pages/HomeScreen.dart Normal file
View File

@@ -0,0 +1,22 @@
import 'package:flutter/material.dart';
import 'package:tanami_app/features/Home/presentation/pages/mainScreen.dart';
import 'package:tanami_app/shared/components/common_bottom_navigation.dart';
class HomeScreen extends StatefulWidget {
const HomeScreen({super.key});
@override
State<HomeScreen> createState() => _HomeScreenState();
}
class _HomeScreenState extends State<HomeScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Column(
children: [Text("data")],
),
bottomNavigationBar: bottomnavigationbar(selectedIndex),
);
}
}

26
lib/features/Home/presentation/pages/MainScreen.dart Normal file
View File

@@ -0,0 +1,26 @@
import 'package:flutter/material.dart';
import 'package:tanami_app/features/Home/presentation/pages/HomeScreen.dart';
import 'package:tanami_app/shared/components/common_bottom_navigation.dart';
var currentTab = [
const HomeScreen(),
const SizedBox(),
const SizedBox(),
const SizedBox(),
];
var selectedIndex = 0;
void updateTab(int index) {
selectedIndex = index;
}
class MainScreen extends StatelessWidget {
const MainScreen({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
body: currentTab[selectedIndex],
);
}
}

1
lib/features/login/presentation/widgets/bottom_section.dart
View File

@@ -40,6 +40,7 @@ class BottomSection extends StatelessWidget {
Loader.loader(context);
} else if (state is LoginSuccess) {
goRouter.pop();
goRouter.goNamed('mainScreen');
successToastMessage(context, "login successful !");
} else if (state is LoginFailure) {
goRouter.pop();

2
lib/features/splash/presentation/widgets/bottom_version_widget.dart
View File

@@ -32,8 +32,6 @@ class BottomVersionWidget extends StatelessWidget {
TextWidget().text12W400(
'${AppText.splashVersionText}${state.version}'),
TextWidget().text12W400(AppText.splashCopyrightText),
//removethis
SizedBox()
],
));
// If the state is AppVersionError, display an error message

251
lib/shared/components/common_bottom_navigation.dart Normal file
View File

@@ -0,0 +1,251 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:tanami_app/features/Home/presentation/pages/MainScreen.dart';
Container bottomnavigationbar(selectedIndex) {
return Container(
width: double.infinity,
height: 83.h,
color: Colors.white,
alignment: Alignment.center,
child: BottomNavigationBar(
// backgroundColor: ,
type: BottomNavigationBarType.fixed,
backgroundColor: const Color(0xFFFFFFFF).withOpacity(0),
showUnselectedLabels: true,
selectedItemColor: Colors.white,
unselectedItemColor: const Color(0xFF676767),
unselectedLabelStyle: TextStyle(
fontSize: 10.sp,
color: const Color(0xFF676767),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
selectedLabelStyle: TextStyle(
fontSize: 10.sp,
color: const Color(0xFFFFFFFF),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino'),
currentIndex: selectedIndex,
onTap: (index) {
updateTab(index);
},
items: [
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/InactiveHome.png',
height: 26.h,
width: 26.w,
),
// Icon(
// Icons.home,
// color: Color(0xFF676767),
// ),
activeIcon: Stack(
children: [
if (selectedIndex == 0)
Container(
height: 40.h,
width: 40.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: const Offset(0, 10),
),
],
),
),
Positioned(
top: 0,
bottom: 0,
right: 0,
left: 0,
child: Center(
child: Image.asset(
'assets/images/png/sidemenu/activehome.png',
height: 30.h,
width: 30.w,
),
),
)
],
),
// activeIcon: SvgPicture.asset('assets/image/svg/active_home.svg'),
label: 'Wallet',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/portfolioinactive.png',
height: 26.h,
width: 26.w,
),
activeIcon: Stack(
children: [
if (selectedIndex == 1)
Container(
height: 40.h,
width: 40.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: const Offset(0, 10),
),
],
),
),
Positioned(
left: 0,
right: 0,
top: 0,
bottom: 0,
child: Center(
child: Image.asset(
'assets/images/png/sidemenu/activetrade.png',
height: 30.h,
width: 30.w,
),
))
],
),
// SvgPicture.asset('assets/image/svg/active_shortTrade.svg'),
label: 'Portfolio',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/Investinactive.png',
height: 24.h,
width: 24.w,
),
activeIcon: Stack(
children: [
if (selectedIndex == 2)
Container(
height: 40.h,
width: 40.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: const Offset(0, 10),
),
],
),
),
Positioned(
left: 0,
right: 0,
top: 0,
bottom: 0,
child: Center(
child: Image.asset(
'assets/images/png/pastPerformanceactive.png',
height: 28.h,
width: 28.w,
),
))
],
),
// SvgPicture.asset('assets/image/svg/active_shortTrade.svg'),
label: 'Invest',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/academyinactive.png',
height: 26.h,
width: 26.w,
),
activeIcon: Stack(
children: [
if (selectedIndex == 3)
Container(
height: 40.h,
width: 40.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: const Offset(0, 10),
),
],
),
),
Positioned(
left: 0,
right: 0,
top: 0,
bottom: 0,
child: Center(
child: Image.asset(
'assets/images/png/sidemenu/activeprotfolio.png',
height: 30.h,
width: 30.w,
),
))
],
),
// SvgPicture.asset('assets/image/svg/active_protfolio.svg'),
label: 'Academy',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/SettingInactive.png',
height: 26.h,
width: 26.w,
),
activeIcon: Stack(
children: [
if (selectedIndex == 3)
Container(
height: 40.h,
width: 40.w,
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.grey.withOpacity(0.4),
spreadRadius: 15,
blurRadius: 10,
offset: const Offset(0, 10),
),
],
),
),
Positioned(
left: 0,
right: 0,
top: 0,
bottom: 0,
child: Center(
child: Image.asset(
'assets/images/png/sidemenu/activeprotfolio.png',
height: 30.h,
width: 30.w,
),
))
],
),
// SvgPicture.asset('assets/image/svg/active_protfolio.svg'),
label: 'Settings',
),
],
),
);
}

2
pubspec.yaml
View File

@@ -94,3 +94,5 @@ flutter:
- assets/images/country_flag/
- assets/images/country_flag/svg/
- assets/images/country_flag/png/
- assets/images/bottom_bar/inactive
- assets/images/bottom_bar/active