Skip to content

Commit

Permalink
fixes: Bottom nav-bar flex issue and UI fixes (#188)
Browse files Browse the repository at this point in the history 
* Added rive asset to Splash Screen

* bottom nav-bar fixed

* HackNITR event card
  • Loading branch information
@asutoshranjan
asutoshranjan authored Mar 10, 2023
1 parent e78b539 commit 1a80d6a
Show file tree
Hide file tree
Showing 9 changed files with 137 additions and 83 deletions.
10 changes: 2 additions & 8 deletions elaichi/assets/icons/avenue_logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added elaichi/assets/images/hack_nitr.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions elaichi/lib/presentation/components/buttons/back_button.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ class CustomBackButton extends StatelessWidget {
Widget build(BuildContext context) {
return Container(
height: 36,
width: 92,
width: 98,
decoration: BoxDecoration(
color: AppColors.translucentButton.withOpacity(0.4),
borderRadius: BorderRadius.circular(18),
),
child: GestureDetector(
onTap: () => Navigator.pop(context),
Expand All @@ -33,7 +34,8 @@ class CustomBackButton extends StatelessWidget {
fontSize: 15,
height: 1.33,
),
)
),
const SizedBox(width: 5),
],
),
),
Expand Down
1 change: 1 addition & 0 deletions elaichi/lib/presentation/core/utils/strings.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ abstract class Strings {
'https://images.hindustantimes.com/img/2022/06/29/1600x900/NIT_Rourkela_main_entrance_(1)_1656490094321_1656490107321.jpg';
static const String kNitrImage = 'assets/images/nitr.png';
static const String kShaderImage = 'assets/images/shader.png';
static const String hackNITR = 'assets/images/hack_nitr.png';
static const String kStoriesthisWeek = ' Stories this week';
static const String kToday = 'Today';
static const String kViewCalendar = 'View Calendar';
Expand Down
2 changes: 1 addition & 1 deletion elaichi/lib/presentation/home/fest/explore/explore_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class _ExplorePageState extends State<ExplorePage>
fit: BoxFit.fill,
placeholder: (context, url) => const Icon(Icons.circle),
height: 34,
width: 32,
width: 36,
),
),
),
Expand Down
52 changes: 45 additions & 7 deletions elaichi/lib/presentation/home/fest/fest_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ import 'package:elaichi/presentation/core/router/app_router.dart';
import 'package:elaichi/presentation/core/theme/base_theme.dart';
import 'package:elaichi/presentation/core/utils/sizeconfig.dart';
import 'package:elaichi/presentation/core/utils/strings.dart';
import 'package:elaichi/presentation/home/feed/widgets/announcements.dart';
import 'package:elaichi/presentation/home/feed/widgets/webmail_card.dart';
import 'package:elaichi/presentation/home/fest/bloc/fest_bloc.dart';
import 'package:elaichi/presentation/home/fest/explore/widgets/duration_dates.dart';
import 'package:elaichi/presentation/home/fest/explore/widgets/fest_event_card.dart';
import 'package:elaichi/presentation/home/fest/widgets/featured_events.dart';
import 'package:elaichi/presentation/home/fest/widgets/header_widget.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -71,10 +73,25 @@ class _FestPageState extends State<FestPage> {
return HeaderWidget(
imageUrl:
fest.coverImg ?? Strings.placeholderImage,
leadingWidget: SvgPicture.asset(
Strings.avenueLogo,
height: 18,
color: Colors.white,
leadingWidget: Container(
margin: EdgeInsets.only(top: 8),
child: Row(
children: [
Image.asset(
"assets/images/avenue_logo.png",
color: Colors.white,
height: 14.5,
),
SizedBox(
width: 4,
),
SvgPicture.asset(
Strings.avenueLogo,
height: 12,
color: Colors.white,
),
],
),
),
trailingWidget: ClipRRect(
borderRadius: BorderRadius.circular(
Expand All @@ -86,7 +103,7 @@ class _FestPageState extends State<FestPage> {
placeholder: (context, url) =>
const Icon(Icons.circle),
height: 34,
width: 32,
width: 36,
),
),
bottomSubTitleWidget: duration != null
Expand Down Expand Up @@ -124,11 +141,32 @@ class _FestPageState extends State<FestPage> {
child: Column(
children: [
if (!_bloc.isVerified()) const WebMailCard(),
if (!_bloc.isVerified()) const SizedBox(height: 32),
if (!_bloc.isVerified()) const SizedBox(height: 36),
// const FeaturedEvents(),
],
),
)
),
Padding(
padding: const EdgeInsets.symmetric(
horizontal: 16,
),
child: Column(
children: [
Align(
alignment: Alignment.centerLeft,
child: Text(
"Featured Events",
style: interTextTheme.displayMedium!.copyWith(
letterSpacing: -0.41, color: Colors.white, fontSize: 26,
),
),
),
SizedBox(height: 30),
FeaturedEventCard(),
SizedBox(height: 40),
],
),
),
],
),
);
Expand Down
17 changes: 10 additions & 7 deletions elaichi/lib/presentation/home/fest/widgets/featured_events.dart
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:elaichi/presentation/core/theme/base_theme.dart';
import 'package:elaichi/presentation/core/theme/colors.dart';
import 'package:elaichi/presentation/core/utils/strings.dart';
import 'package:elaichi/presentation/core/utils/urlLauncher.dart';
import 'package:elaichi/presentation/home/fest/explore/widgets/duration_dates.dart';
import 'package:flutter/material.dart';

Expand Down Expand Up @@ -39,10 +40,10 @@ class FeaturedEventCard extends StatelessWidget {
shadowColor: Colors.grey,
child: Column(
children: [
Image.network(
Strings.placeholderImage,
Image.asset(
Strings.hackNITR,
height: 250,
fit: BoxFit.fill,
fit: BoxFit.cover,
),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16),
Expand All @@ -64,7 +65,7 @@ class FeaturedEventCard extends StatelessWidget {
SizedBox(
height: 28,
child: Text(
'INNOVISION 2K22',
'HackNITR 4.0',
style: interTextTheme.bodyText1!.copyWith(
fontSize: 22,
height: 1.27,
Expand All @@ -78,7 +79,7 @@ class FeaturedEventCard extends StatelessWidget {
SizedBox(
height: 32,
child: Text(
'Join us lorem ipusum dssdfesfwefesfsefesffefeffefefefefesvse',
'Explore further into your innovation journey with HackNITR 4.0 and manifest your skills.',
style: interTextTheme.bodyText2!.copyWith(
fontWeight: FontWeight.w500,
color: AppColors.grey11,
Expand All @@ -100,15 +101,17 @@ class FeaturedEventCard extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
const DurationDates(
text: 'Jan 03 - Jan 07 2023',
text: 'Jan 06 - Jan 08 2023',
color: AppColors.grey16,
fontSize: 14,
),
SizedBox(
height: 50,
width: 104,
child: TextButton(
onPressed: () {},
onPressed: () {
launchURL("https://www.hacknitr.com/");
},
style: TextButton.styleFrom(
backgroundColor: AppColors.lightBlue,
shape: RoundedRectangleBorder(
Expand Down
Loading

0 comments on commit 1a80d6a

Please sign in to comment.