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

Widget page {coderSquad team} #7

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions ios/Flutter/flutter_export_environment.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/sh
# This is a generated file; do not edit or check into version control.
export "FLUTTER_ROOT=/Users/suvink/Documents/Installed Software/flutter"
export "FLUTTER_APPLICATION_PATH=/Users/suvink/Documents/Workspace/EF/everything-flutter"
export "FLUTTER_TARGET=/Users/suvink/Documents/Workspace/EF/everything-flutter/lib/main.dart"
export "FLUTTER_ROOT=C:\src\flutter\flutter"
export "FLUTTER_APPLICATION_PATH=C:\Users\ASUS\Documents\flutter\everything-flutter"
export "FLUTTER_TARGET=lib\main.dart"
export "FLUTTER_BUILD_DIR=build"
export "SYMROOT=${SOURCE_ROOT}/../build/ios"
export "FLUTTER_FRAMEWORK_DIR=/Users/suvink/Documents/Installed Software/flutter/bin/cache/artifacts/engine/ios"
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
export "FLUTTER_FRAMEWORK_DIR=C:\src\flutter\flutter\bin\cache\artifacts\engine\ios"
export "FLUTTER_BUILD_NAME=1.0.0"
export "FLUTTER_BUILD_NUMBER=1"
12 changes: 12 additions & 0 deletions lib/constants/strings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,16 @@ List<String> eventCardSubtitles = [
"First Flutter Meetup",
"First Flutter Hackathon",
"First Flutter Hackathon",
];

List<String> widgetDays=[
"WednesDay",
"TuesDay",
"Monday",
];

List<String> widgetNames=[
"Animated Builder",
"ClipRRect",
"Silver List",
];
40 changes: 40 additions & 0 deletions lib/constants/test_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,43 @@ News newsItemThree = News(
image: "https://cdn.iconicto.com/EverythingFlutter/media/News/ef3.jpg",
source: Source(name: "Techcrunch"),
);

//past events
News pasteventsItemone = News(
title: "Flutter Meetup",
time: DateTime.parse("2019-05-30T22:49:51.764000+05:30"),
link:
"www.example.com",
image: "https://maps.googleapis.com/maps/api/staticmap?markers=size:tiny|-15.78,-47.91|50.06,19.96|60.17,24.94|1.300,103.8|30.22,-97.75|52.26,21.02|39.69,-104.9|55.58,9.760|38.83,-77.34|53.43,14.53|33.45,-112.1|42.35,-83.06|51.11,17.03|41.89,-87.64|43.65,-79.38|42.69,23.31|48.16,17.13|-37.81,145.0|-27.46,153.0|18.53,73.84|4.630,-74.09|37.56,127.0|3.160,101.7|23.61,58.54|48.14,11.58|49.00,8.400|45.80,15.97|-6.860,109.1|38.96,-77.23|51.24,6.790|52.40,16.90|33.37,6.860|43.17,-77.60|44.44,26.10|58.97,5.710|43.74,-79.36|40.11,-82.91|46.86,-114.0|12.97,77.56|39.75,-105.0|26.47,80.33|-8.080,-34.92|49.84,24.03|51.44,5.470|51.52,-0.1000|-30.04,-51.22|48.36,10.89|26.92,75.80|-22.91,-47.08|42.36,-71.07|43.58,39.74|35.23,-80.84|53.15,8.210|40.04,-105.3|40.75,-73.99|31.22,29.95|-33.93,18.46|36.19,44.02|54.81,56.07|31.33,75.57|34.15,-118.5|14.08,-87.22|59.91,10.75|33.65,-117.8|-27.60,-48.54|50.12,8.680|48.86,2.340|43.62,1.450|-16.50,-68.15|40.78,43.83|-8.580,116.1|54.32,10.12|50.08,14.43|48.22,16.37|49.87,8.640|49.80,9.940|-34.93,138.6|55.71,13.20|38.72,-9.140|48.11,-1.680|53.23,6.570|27.96,-82.46|-34.61,-58.37|-19.92,-43.94|51.77,19.46|39.70,-105.1|36.72,-4.420|35.67,139.8|41.32,-81.55|33.88,35.50|24.65,46.77|6.250,-75.59|44.83,20.50|50.00,8.260|54.36,18.64|22.57,88.36|37.98,23.73|50.88,4.700|-33.87,151.2|49.28,-123.0|6.520,3.300|13.09,80.27|23.03,72.58|51.72,39.26|36.19,5.410|67.29,14.37|53.55,10.00|33.52,-111.9|-31.40,-64.19|41.40,2.170|-1.940,30.06|9.600,6.550|52.37,4.890|51.50,7.630|48.79,9.190|49.45,11.05|-36.85,174.8|59.33,18.07|40.05,-105.2|-31.96,115.8|-7.230,-35.88|53.33,-6.250|14.62,121.0|42.47,-83.40|33.72,73.06|47.51,19.08|47.38,8.540|52.21,0.1300|-12.07,-77.05|50.64,3.070|45.65,-73.50|45.45,-75.69|18.46,-66.11|-6.910,107.6|-23.53,-46.63|32.07,34.77|46.52,6.620|29.72,-95.22|19.43,-99.14|-33.46,-70.64|52.52,13.38|37.35,-122.0&size=600x300&style=feature:administrative%7Cvisibility:off&style=feature:landscape%7Ccolor:0xffffff&style=feature:landscape%7Celement:labels%7Cvisibility:off&style=feature:landscape.man_made%7Celement:geometry%7Ccolor:0xffffff&style=feature:poi%7Cvisibility:off&style=feature:road%7Cvisibility:off&style=feature:transit%7Cvisibility:off&style=feature:water%7Ccolor:0xabd7df&scale=2&zoom=1&key=AIzaSyDmnawK5g8z5vh2itc7Qou7STaVkxocOtU",
source: Source(name: "READ MORE"),
);


News pasteventItemtwo = News(
title: "Introduction To Flutter",
time: DateTime.parse("2019-04-20T22:49:51.764000+05:30"),
link:
"www.example.com",
image: "https://i.ytimg.com/vi/zmBvPcEjetA/maxresdefault.jpg",
source: Source(name: "READ MORE"),
);


//widgets
News widget1 = News(
title: "Scaffold",
time: DateTime.parse("2019-05-30T22:49:51.764000+05:30"),
link:
"https://api.flutter.dev/flutter/material/Scaffold-class.html",
image: "https://i.ytimg.com/vi/vb8YDD7KO00/maxresdefault.jpg",
source: Source(name: "READ MORE"),
);

News widget2 = News(
title: "Transform",
time: DateTime.parse("2019-05-30T22:49:51.764000+05:30"),
link:
"https://api.flutter.dev/flutter/widgets/Transform-class.html",
image: "https://i.ytimg.com/vi/9z_YNlRlWfA/maxresdefault.jpg",
source: Source(name: "READ MORE"),
);
7 changes: 6 additions & 1 deletion lib/model/event.dart
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
class Event {}
import 'dart:convert';



class Event {
}
98 changes: 75 additions & 23 deletions lib/ui/pages/event.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ import 'package:everything_flutter/constants/strings.dart';
import 'package:everything_flutter/constants/text_styles.dart';
import 'package:everything_flutter/constants/theme_data.dart';
import 'package:everything_flutter/helpers/screen_util.dart';
import 'package:everything_flutter/model/news.dart';
import 'package:everything_flutter/ui/widgets/menu_card.dart';
import 'package:everything_flutter/ui/widgets/news_item.dart';
import 'package:flutter/material.dart';
import 'package:functional_widget_annotation/functional_widget_annotation.dart';
import 'package:intl/intl.dart';
import 'package:snaplist/snaplist.dart';
import 'package:everything_flutter/constants/test_data.dart';


class EventPage extends StatelessWidget {
@override
Expand All @@ -18,18 +22,58 @@ class EventPage extends StatelessWidget {
}
}



@widget
Widget _buildBody() => SafeArea(
child: SingleChildScrollView(
child: Column(
children: <Widget>[
_eventsTitle,
_buildMenuCards(),
_buildPastEventBar(),
_buildEvents(events)
],
),
),
);

@widget
Widget _buildPastEventBar() => Padding(
padding: ScreenUtil.getPaddingLTRB(4, 2, 4, 0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: <Widget>[
Text(
"Past Events",
style: TextStyles.miniTitle,
),
// GestureDetector(
// onTap : () {
// _scaffoldKey.currentState.openDrawer(); // CHANGE THIS LINE
// },
// child: Icon(
// Icons.more_vert,
// size: ScreenUtil.getFullScreen(12),
// ),
// ),
],
),
);

List<News> events = [pasteventItemtwo, pasteventItemtwo];


@widget
Widget _buildEvents(List<News> newsList) {
List<Widget> _columnItems = [];
for (var event in newsList) {
_columnItems.add(NewsItem(event));
// _columnItems.add(Divider());
}
return Column(children: _columnItems);
}

@widget
Container _buildMenuCards() => Container(
height: ScreenUtil.getHeight(35),
Expand Down Expand Up @@ -74,31 +118,39 @@ Container _buildMenuCards() => Container(
),
),
SizedBox(height: ScreenUtil.getHeight(0.5)),
Align(
alignment: Alignment.bottomRight,
child: GestureDetector(
onTap: () =>
Navigator.pushNamed(context, menuCardTitles[index]),
child: Container(
padding: ScreenUtil.getPaddingAll(8),
decoration: BoxDecoration(
borderRadius:
ScreenUtil.getBorderRadiusCircular(12),
color: AppColors.buttonColors[index],
boxShadow: [
new BoxShadow(
color: AppColors.buttonColors[index],
blurRadius: 8.0,
),
],
),
child: Icon(
Icons.arrow_forward_ios,
size: ScreenUtil.getTextSize(12),
color: Colors.white,
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
GestureDetector(
onTap: () => Navigator.pushNamed(
context, menuCardTitles[index]),
child: Container(
padding: ScreenUtil.getPaddingAll(8),
decoration: BoxDecoration(
borderRadius:
ScreenUtil.getBorderRadiusCircular(12),
color: AppColors.buttonColors[index],
boxShadow: [
new BoxShadow(
color: AppColors.buttonColors[index],
blurRadius: 8.0,
),
],
),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: <Widget>[
Text("View",style: TextStyle(fontSize: ScreenUtil.getTextSize(11)),),
Icon(
Icons.arrow_forward_ios,
size: ScreenUtil.getTextSize(13),
color: Colors.white,
),
],
),
),
),
),
],
),
],
),
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/pages/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ class _HomePageState extends State<HomePage> {
);
}

List<News> news = [newsItem, newsItemTwo];
List<News> news = [newsItem, newsItemTwo,newsItemThree];


final _timelineTitle = Text(
Expand Down
Loading