Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Team UI🖌️ #125

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
41b84dd
.
TreavVasu Jan 20, 2021
b808da1
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Jan 20, 2021
3a9143d
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Feb 5, 2021
cb0215f
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Feb 9, 2021
dc74374
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Feb 12, 2021
3e1629a
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Feb 16, 2021
2294b80
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Feb 21, 2021
2cda41c
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Feb 27, 2021
743dff3
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Mar 7, 2021
1e7bbbc
Draft
TreavVasu Mar 7, 2021
a85da73
Staging UI backbone
TreavVasu Mar 8, 2021
f4fcddb
minor fix
TreavVasu Mar 9, 2021
42e172e
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Mar 10, 2021
ce4f4f1
Merge branch 'main' of https://github.com/ECellNitrr/ECellApp2021 int…
TreavVasu Mar 12, 2021
dca67e3
Final Staging
TreavVasu Mar 12, 2021
f12febd
check fix
TreavVasu Mar 12, 2021
e094f5d
Final Commit
TreavVasu Mar 12, 2021
0510903
Last changes
TreavVasu Mar 12, 2021
36532fa
UI fix
TreavVasu Mar 13, 2021
7c358fd
check fix
TreavVasu Mar 13, 2021
e563175
UI changes
TreavVasu Mar 14, 2021
b79aad1
UI fix
TreavVasu Mar 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Staging UI backbone
TreavVasu committed Mar 8, 2021
commit a85da7369ed4582dde4ba36578d2539354db92ad
Binary file added assets/teams-frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions lib/core/res/colors.dart
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@ class C {
/// background color gradient
static final Color backgroundTop = HexColor("#4F3FA0");
static final Color backgroundBottom = HexColor("#180C58");
static final Color teamsbackground = HexColor("#372981");

/// animated rings colors (1->4 increasingsize)
static final Color ring1 = HexColor("#2DFFF9");
1 change: 1 addition & 0 deletions lib/core/res/strings.dart
Original file line number Diff line number Diff line change
@@ -121,6 +121,7 @@ class S {
static const String phoneURL = "tel:+919406220952";
static const String emailURL = "mailto:ecell@nitrr.ac.in";
static const String assetEventFrame = "assets/event-frame.png";
static const String assetTeamsFrame = "assets/teams-frame.png";
static const String asset404Image = "assets/404.png";

// paragraphs
14 changes: 8 additions & 6 deletions lib/screens/about_us/tabs/team/team.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:ecellapp/core/res/colors.dart';
import 'package:ecellapp/core/res/dimens.dart';
import 'package:ecellapp/models/team_category.dart';
import 'package:ecellapp/widgets/ecell_animation.dart';
@@ -8,6 +9,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:ecellapp/widgets/stateful_wrapper.dart';
import 'package:google_fonts/google_fonts.dart';
import 'package:rxdart/rxdart.dart';

import 'cubit/team_cubit.dart';

@@ -38,11 +40,11 @@ class TeamScreen extends StatelessWidget {
BlocBuilder<TeamCubit, TeamState>(
builder: (context, state) {
if (state is TeamInitial)
return _buildLoading();
return _buildLoading(context);
else if (state is TeamSuccess)
return _buildSuccess(context, state.teamList);
else if (state is TeamLoading)
return _buildLoading();
return _buildLoading(context);
else
return ReloadOnErrorWidget(() => _getAllTeamMembers(context));
},
@@ -53,7 +55,7 @@ class TeamScreen extends StatelessWidget {
);
}

Widget _buildSuccess(BuildContext context, List<TeamCategory> teamList) {
Widget _buildSuccess(BuildContext context, List<TeamCategory> data) {
double top = MediaQuery.of(context).viewPadding.top;

// ignore: close_sinks
@@ -100,19 +102,19 @@ class TeamScreen extends StatelessWidget {
),
child: Container(
padding: EdgeInsets.only(top: top + 56),
color: C.sponsorPageBackground,
color: C.teamsbackground,
width: double.infinity,
child: Column(children: [
Text(
"Sponsors",
"Our Team",
style: TextStyle(
fontSize: 40,
color: Colors.white,
fontWeight: FontWeight.w800,
letterSpacing: 0.5,
),
),
...data[i].spons.map((e) => {
...data[i].members.map((e) => {
//TODO: TEAM CARD
}),
], mainAxisSize: MainAxisSize.max),
92 changes: 92 additions & 0 deletions lib/screens/about_us/tabs/team/widget/teams_card.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
import 'package:ecellapp/models/sponsor.dart';
import 'package:flutter/material.dart';

import 'package:ecellapp/core/res/colors.dart';
import 'package:ecellapp/core/res/dimens.dart';
import 'package:ecellapp/core/res/strings.dart';

class TeamsCard extends StatelessWidget {
final Sponsor sponsor;

const TeamsCard({Key key, this.sponsor}) : super(key: key);

@override
Widget build(BuildContext context) {
double ratio = MediaQuery.of(context).size.aspectRatio;
return Stack(
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: D.horizontalPaddingFrame),
child: Stack(
children: [
Padding(
padding: const EdgeInsets.fromLTRB(0, 20, 0, 20),
child: Container(
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(22),
),
child: Container(
height: ratio > 0.5 ? 140 : 160,
margin: EdgeInsets.only(left: 130),
decoration: BoxDecoration(
color: Colors.white,
borderRadius: BorderRadius.circular(22),
),
child: Padding(
padding: const EdgeInsets.fromLTRB(10, 30, 10, 0),
child: Text(
sponsor.name,
style: TextStyle(
fontSize: 20,
color: C.cardFontColor,
fontWeight: FontWeight.w600,
),
),
),
),
),
),
],
),
),
Positioned(
height: ratio > 0.5 ? 200 : 220,
width: ratio > 0.5 ? 150 : 170,
child: Stack(
children: [
Image.asset(
S.assetTeamsFrame,
fit: BoxFit.cover,
height: 220,
),
Center(
child: Container(
height: 100,
width: 100,
alignment: Alignment.center,
padding: EdgeInsets.only(bottom: 5),
decoration: BoxDecoration(
shape: BoxShape.circle,
boxShadow: [
BoxShadow(
color: Colors.black.withOpacity(0.25),
offset: Offset(0.0, 5),
blurRadius: 10,
),
],
),
child: CircleAvatar(
backgroundColor: Colors.blue,
backgroundImage: NetworkImage(sponsor.picUrl),
radius: 40,
),
),
),
],
),
),
],
);
}
}
126 changes: 80 additions & 46 deletions pubspec.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,27 @@
# Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile
packages:
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.13"
args:
dependency: transitive
description:
name: args
url: "https://pub.dartlang.org"
source: hosted
version: "1.6.0"
async:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.5.0-nullsafety.1"
version: "2.5.0-nullsafety.3"
bloc:
dependency: "direct main"
description:
@@ -21,35 +35,35 @@ packages:
name: boolean_selector
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0-nullsafety.1"
version: "2.1.0-nullsafety.3"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0-nullsafety.3"
version: "1.1.0-nullsafety.5"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0-nullsafety.1"
version: "1.2.0-nullsafety.3"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0-nullsafety.1"
version: "1.1.0-nullsafety.3"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
source: hosted
version: "1.15.0-nullsafety.3"
version: "1.15.0-nullsafety.5"
convert:
dependency: transitive
description:
@@ -91,7 +105,7 @@ packages:
name: fake_async
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0-nullsafety.1"
version: "1.2.0-nullsafety.3"
ffi:
dependency: transitive
description:
@@ -118,6 +132,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "6.1.1"
flutter_launcher_icons:
dependency: "direct main"
description:
name: flutter_launcher_icons
url: "https://pub.dartlang.org"
source: hosted
version: "0.8.1"
flutter_test:
dependency: "direct dev"
description: flutter
@@ -156,13 +177,27 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.4"
image:
dependency: transitive
description:
name: image
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.19"
intl:
dependency: transitive
description:
name: intl
url: "https://pub.dartlang.org"
source: hosted
version: "0.16.1"
js:
dependency: transitive
description:
name: js
url: "https://pub.dartlang.org"
source: hosted
version: "0.6.3-nullsafety.3"
logger:
dependency: "direct main"
description:
@@ -176,14 +211,14 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10-nullsafety.1"
version: "0.12.10-nullsafety.3"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0-nullsafety.6"
nested:
dependency: transitive
description:
@@ -197,7 +232,7 @@ packages:
name: path
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0-nullsafety.1"
version: "1.8.0-nullsafety.3"
path_provider:
dependency: transitive
description:
@@ -240,6 +275,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.9.2"
petitparser:
dependency: transitive
description:
name: petitparser
url: "https://pub.dartlang.org"
source: hosted
version: "3.1.0"
platform:
dependency: transitive
description:
@@ -268,6 +310,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "4.3.3"
rxdart:
dependency: "direct main"
description:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.26.0"
shared_preferences:
dependency: "direct main"
description:
@@ -321,49 +370,49 @@ packages:
name: source_span
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0-nullsafety.2"
version: "1.8.0-nullsafety.4"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.0-nullsafety.1"
version: "1.10.0-nullsafety.6"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0-nullsafety.1"
version: "2.1.0-nullsafety.3"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0-nullsafety.1"
version: "1.1.0-nullsafety.3"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0-nullsafety.1"
version: "1.2.0-nullsafety.3"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.19-nullsafety.2"
version: "0.2.19-nullsafety.6"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0-nullsafety.3"
version: "1.3.0-nullsafety.5"
url_launcher:
dependency: "direct main"
description:
@@ -412,21 +461,7 @@ packages:
name: vector_math
url: "https://pub.dartlang.org"
source: hosted
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
version: "2.1.0-nullsafety.5"
sdks:
dart: ">=2.12.0-0.0 <3.0.0"
flutter: ">=1.16.0"
=======
version: "2.1.0-nullsafety.3"
=======
version: "2.1.0-nullsafety.5"
>>>>>>> 136b89a39df782d63a55f2fc5b127552381e16b4
=======
version: "2.1.0-nullsafety.3"
>>>>>>> 05b87f88beeca873b74ba23bbe5d091b1676c248
win32:
dependency: transitive
description:
@@ -441,21 +476,20 @@ sdks:
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.2"
xml:
dependency: transitive
description:
name: xml
url: "https://pub.dartlang.org"
source: hosted
version: "4.5.1"
yaml:
dependency: transitive
description:
name: yaml
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.1"
sdks:
<<<<<<< HEAD
<<<<<<< HEAD
dart: ">=2.10.0-110 <2.11.0"
<<<<<<< HEAD
flutter: ">=1.17.0 <2.0.0"
>>>>>>> 24cc943c75c8886ad1315291ca408d1b159130d6
=======
flutter: ">=1.17.0 <2.0.0"
>>>>>>> 63a66ed70efb6c17625fca475468dc716766a8aa
=======
dart: ">=2.12.0-0.0 <3.0.0"
flutter: ">=1.22.0 <2.0.0"
>>>>>>> 136b89a39df782d63a55f2fc5b127552381e16b4
=======
dart: ">=2.10.0-110 <2.11.0"
flutter: ">=1.22.0 <2.0.0"
>>>>>>> 05b87f88beeca873b74ba23bbe5d091b1676c248
3 changes: 2 additions & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -16,14 +16,15 @@ dependencies:
data_connection_checker: ^0.3.4
equatable: ^1.2.5
flutter_bloc: ^6.1.0
flutter_launcher_icons: ^0.8.1
get_it: ^5.0.2
google_fonts: ^1.1.1
http: ^0.12.1
logger: ^0.9.4
provider: ^4.3.3
rxdart: ^0.26.0
shared_preferences: ^0.5.12+4
url_launcher: ^5.7.10
flutter_launcher_icons: ^0.8.1

dev_dependencies:
flutter_test: