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

Merge pull request #7 from WDI-Ideas/meet

Browse Source 
folder structure created
This commit is contained in:
meet2711
2024-05-30 13:58:26 +05:30
committed by GitHub
parent 61dc979768 84bf57ccce
commit e101a416bf
21 changed files with 203 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/images/bottom_bar/active/academy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
assets/images/bottom_bar/active/invest.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
assets/images/bottom_bar/active/portfolio.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
assets/images/bottom_bar/active/settings.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
assets/images/bottom_bar/active/wallet.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

0
assets/images/bottom_bar/inactive/academyinactive.png → assets/images/bottom_bar/inactive/academy.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

0
assets/images/bottom_bar/inactive/Investinactive.png → assets/images/bottom_bar/inactive/invest.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

0
assets/images/bottom_bar/inactive/portfolioinactive.png → assets/images/bottom_bar/inactive/portfolio.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

0
assets/images/bottom_bar/inactive/SettingInactive.png → assets/images/bottom_bar/inactive/settings.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
assets/images/bottom_bar/inactive/InactiveHome.png → assets/images/bottom_bar/inactive/wallet.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

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

@@ -2,7 +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/MainScreens/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';

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

@@ -1,22 +0,0 @@
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
View File

@@ -1,26 +0,0 @@
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],
);
}
}

15
lib/features/MainScreens/Academy/presentation/pages/academyScreen.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:flutter/material.dart';
class AcademyScreen extends StatefulWidget {
const AcademyScreen({super.key});
@override
State<AcademyScreen> createState() => _AcademyScreenState();
}
class _AcademyScreenState extends State<AcademyScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(body: Text('Academy'),);
}
}

15
lib/features/MainScreens/Invest/presentation/pages/investScreen.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:flutter/material.dart';
class InvestScreen extends StatefulWidget {
const InvestScreen({super.key});
@override
State<InvestScreen> createState() => _InvestScreenState();
}
class _InvestScreenState extends State<InvestScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(body: Text('Invest'),);
}
}

32
lib/features/MainScreens/MainScreen.dart Normal file
View File

@@ -0,0 +1,32 @@
import 'package:flutter/material.dart';
import 'package:tanami_app/features/MainScreens/Academy/presentation/pages/academyScreen.dart';
import 'package:tanami_app/features/MainScreens/Invest/presentation/pages/investScreen.dart';
import 'package:tanami_app/features/MainScreens/Portfolio/presentation/pages/portfolioScreen.dart';
import 'package:tanami_app/features/MainScreens/Settings/presentation/pages/settingsScreen.dart';
import 'package:tanami_app/features/MainScreens/Wallet/presentation/pages/walletScreen.dart';
import 'package:tanami_app/shared/components/common_bottom_navigation.dart';
var currentTab = [
const WalletScreen(),
const PortfolioScreen(),
const InvestScreen(),
const AcademyScreen(),
const SettingsScreen(),
];
var selectedIndex = 1;
void updateTab(int index) {
selectedIndex = index;
}
class MainScreen extends StatelessWidget {
const MainScreen({super.key});
@override
Widget build(BuildContext context) {
return Scaffold(
body: currentTab[selectedIndex],
bottomNavigationBar: bottomnavigationbar(selectedIndex),
);
}
}

15
lib/features/MainScreens/Portfolio/presentation/pages/portfolioScreen.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:flutter/material.dart';
class PortfolioScreen extends StatefulWidget {
const PortfolioScreen({super.key});
@override
State<PortfolioScreen> createState() => _PortfolioScreenState();
}
class _PortfolioScreenState extends State<PortfolioScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(body: Text('Portfolio'),);
}
}

17
lib/features/MainScreens/Settings/presentation/pages/settingsScreen.dart Normal file
View File

@@ -0,0 +1,17 @@
import 'package:flutter/material.dart';
class SettingsScreen extends StatefulWidget {
const SettingsScreen({super.key});
@override
State<SettingsScreen> createState() => _SettingsScreenState();
}
class _SettingsScreenState extends State<SettingsScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(
body: Text('Settings'),
);
}
}

15
lib/features/MainScreens/Wallet/presentation/pages/walletScreen.dart Normal file
View File

@@ -0,0 +1,15 @@
import 'package:flutter/material.dart';
class WalletScreen extends StatefulWidget {
const WalletScreen({super.key});
@override
State<WalletScreen> createState() => _WalletScreenState();
}
class _WalletScreenState extends State<WalletScreen> {
@override
Widget build(BuildContext context) {
return Scaffold(body: Text('Wallet'),);
}
}

336
lib/shared/components/common_bottom_navigation.dart
View File

@@ -1,251 +1,97 @@
import 'package:flutter/material.dart';
import 'package:flutter_screenutil/flutter_screenutil.dart';
import 'package:tanami_app/features/Home/presentation/pages/MainScreen.dart';
import 'package:tanami_app/features/MainScreens/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',
),
],
Widget bottomnavigationbar(selectedIndex) {
return BottomNavigationBar(
type: BottomNavigationBarType.fixed,
showUnselectedLabels: true,
selectedItemColor: Color(0xFF0B8933),
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(0xFF0B8933),
fontWeight: FontWeight.w400,
fontFamily: 'hiragino',
),
currentIndex: selectedIndex,
onTap: (index) {
updateTab(index);
},
items: [
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/wallet.png',
height: 26.h,
width: 26.w,
),
activeIcon: Image.asset(
'assets/images/bottom_bar/active/wallet.png',
height: 30.h,
width: 30.w,
),
label: 'Wallet',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/portfolio.png',
height: 26.h,
width: 26.w,
),
activeIcon: Image.asset(
'assets/images/bottom_bar/active/portfolio.png',
height: 30.h,
width: 30.w,
),
label: 'Portfolio',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/invest.png',
height: 24.h,
width: 24.w,
),
activeIcon: Image.asset(
'assets/images/bottom_bar/active/invest.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/academy.png',
height: 26.h,
width: 26.w,
),
activeIcon: Image.asset(
'assets/images/bottom_bar/active/academy.png',
height: 30.h,
width: 30.w,
),
label: 'Academy',
),
BottomNavigationBarItem(
icon: Image.asset(
'assets/images/bottom_bar/inactive/settings.png',
height: 26.h,
width: 26.w,
),
activeIcon: Image.asset(
'assets/images/bottom_bar/active/settings.png',
height: 30.h,
width: 30.w,
),
label: 'Settings',
),
],
);
}

5
pubspec.yaml
View File

@@ -90,9 +90,8 @@ flutter:
- assets/images/welcome_screen/png/
- assets/images/auth_screen/
- assets/images/auth_screen/svg/
- assets/images/auth_screen/png/
- assets/images/country_flag/
- assets/images/country_flag/svg/
- assets/images/country_flag/png/
- assets/images/bottom_bar/inactive
- assets/images/bottom_bar/active
- assets/images/bottom_bar/active/
- assets/images/bottom_bar/inactive/