feat: Navigation bar a bit higher for better rendering on IOS
This commit is contained in:
parent
325eec7c8f
commit
8295e5bf03
@ -59,10 +59,8 @@ class _SplashScreenState extends State<SplashScreen> {
|
|||||||
if (userData['activated'] == 0) {
|
if (userData['activated'] == 0) {
|
||||||
Navigator.of(context).pushReplacement(
|
Navigator.of(context).pushReplacement(
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
builder: (context) => EditProfileScreen(
|
builder: (context) =>
|
||||||
userData: userData,
|
EditProfileScreen(userData: userData, isOnboarding: true),
|
||||||
isOnboarding: true,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@ -365,10 +363,8 @@ class _SignInPageState extends State<SignInPage> {
|
|||||||
if (userData['activated'] == 0) {
|
if (userData['activated'] == 0) {
|
||||||
Navigator.of(context).pushReplacement(
|
Navigator.of(context).pushReplacement(
|
||||||
MaterialPageRoute(
|
MaterialPageRoute(
|
||||||
builder: (context) => EditProfileScreen(
|
builder: (context) =>
|
||||||
userData: userData,
|
EditProfileScreen(userData: userData, isOnboarding: true),
|
||||||
isOnboarding: true,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
@ -518,7 +514,9 @@ class _SignInPageState extends State<SignInPage> {
|
|||||||
),
|
),
|
||||||
focusedBorder: OutlineInputBorder(
|
focusedBorder: OutlineInputBorder(
|
||||||
borderRadius: BorderRadius.circular(12),
|
borderRadius: BorderRadius.circular(12),
|
||||||
borderSide: BorderSide(color: Color(0xFF6A4C93)),
|
borderSide: BorderSide(
|
||||||
|
color: Color(0xFF6A4C93),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
validator: (value) {
|
validator: (value) {
|
||||||
@ -558,7 +556,9 @@ class _SignInPageState extends State<SignInPage> {
|
|||||||
),
|
),
|
||||||
focusedBorder: OutlineInputBorder(
|
focusedBorder: OutlineInputBorder(
|
||||||
borderRadius: BorderRadius.circular(12),
|
borderRadius: BorderRadius.circular(12),
|
||||||
borderSide: BorderSide(color: Color(0xFF6A4C93)),
|
borderSide: BorderSide(
|
||||||
|
color: Color(0xFF6A4C93),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
validator: (value) {
|
validator: (value) {
|
||||||
|
|||||||
@ -81,7 +81,21 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
canPop: false, // Prevent going back to authentication screens
|
canPop: false, // Prevent going back to authentication screens
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
body: _pages[_currentIndex],
|
body: _pages[_currentIndex],
|
||||||
bottomNavigationBar: BottomNavigationBar(
|
bottomNavigationBar: Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
color: Colors.white,
|
||||||
|
boxShadow: [
|
||||||
|
BoxShadow(
|
||||||
|
color: Colors.black12,
|
||||||
|
blurRadius: 4,
|
||||||
|
offset: Offset(0, -2),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
child: SafeArea(
|
||||||
|
child: Container(
|
||||||
|
height: 80,
|
||||||
|
child: BottomNavigationBar(
|
||||||
currentIndex: _currentIndex,
|
currentIndex: _currentIndex,
|
||||||
onTap: (index) {
|
onTap: (index) {
|
||||||
setState(() {
|
setState(() {
|
||||||
@ -91,6 +105,8 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
type: BottomNavigationBarType.fixed,
|
type: BottomNavigationBarType.fixed,
|
||||||
selectedItemColor: Color(0xFF6A4C93),
|
selectedItemColor: Color(0xFF6A4C93),
|
||||||
unselectedItemColor: Colors.grey,
|
unselectedItemColor: Colors.grey,
|
||||||
|
backgroundColor: Colors.transparent,
|
||||||
|
elevation: 0,
|
||||||
items: [
|
items: [
|
||||||
BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Feed'),
|
BottomNavigationBarItem(icon: Icon(Icons.home), label: 'Feed'),
|
||||||
BottomNavigationBarItem(
|
BottomNavigationBarItem(
|
||||||
@ -101,6 +117,9 @@ class _HomeScreenState extends State<HomeScreen> {
|
|||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -200,6 +200,7 @@ class _ProfilePageState extends State<ProfilePage> {
|
|||||||
backgroundColor: Colors.white,
|
backgroundColor: Colors.white,
|
||||||
foregroundColor: Color(0xFF6A4C93),
|
foregroundColor: Color(0xFF6A4C93),
|
||||||
elevation: 0,
|
elevation: 0,
|
||||||
|
centerTitle: true,
|
||||||
actions: [
|
actions: [
|
||||||
if (userData != null)
|
if (userData != null)
|
||||||
IconButton(
|
IconButton(
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user