Skip to content

Commit 62f6d7f

Browse files
yashlambayashlamba
committed
Completely New Design
1 parent aa3c4e0 commit 62f6d7f

18 files changed

+461
-209
lines changed

‎fonts/UFL.txt

+96
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
-------------------------------
2+
UBUNTU FONT LICENCE Version 1.0
3+
-------------------------------
4+
5+
PREAMBLE
6+
This licence allows the licensed fonts to be used, studied, modified and
7+
redistributed freely. The fonts, including any derivative works, can be
8+
bundled, embedded, and redistributed provided the terms of this licence
9+
are met. The fonts and derivatives, however, cannot be released under
10+
any other licence. The requirement for fonts to remain under this
11+
licence does not require any document created using the fonts or their
12+
derivatives to be published under this licence, as long as the primary
13+
purpose of the document is not to be a vehicle for the distribution of
14+
the fonts.
15+
16+
DEFINITIONS
17+
"Font Software" refers to the set of files released by the Copyright
18+
Holder(s) under this licence and clearly marked as such. This may
19+
include source files, build scripts and documentation.
20+
21+
"Original Version" refers to the collection of Font Software components
22+
as received under this licence.
23+
24+
"Modified Version" refers to any derivative made by adding to, deleting,
25+
or substituting -- in part or in whole -- any of the components of the
26+
Original Version, by changing formats or by porting the Font Software to
27+
a new environment.
28+
29+
"Copyright Holder(s)" refers to all individuals and companies who have a
30+
copyright ownership of the Font Software.
31+
32+
"Substantially Changed" refers to Modified Versions which can be easily
33+
identified as dissimilar to the Font Software by users of the Font
34+
Software comparing the Original Version with the Modified Version.
35+
36+
To "Propagate" a work means to do anything with it that, without
37+
permission, would make you directly or secondarily liable for
38+
infringement under applicable copyright law, except executing it on a
39+
computer or modifying a private copy. Propagation includes copying,
40+
distribution (with or without modification and with or without charging
41+
a redistribution fee), making available to the public, and in some
42+
countries other activities as well.
43+
44+
PERMISSION & CONDITIONS
45+
This licence does not grant any rights under trademark law and all such
46+
rights are reserved.
47+
48+
Permission is hereby granted, free of charge, to any person obtaining a
49+
copy of the Font Software, to propagate the Font Software, subject to
50+
the below conditions:
51+
52+
1) Each copy of the Font Software must contain the above copyright
53+
notice and this licence. These can be included either as stand-alone
54+
text files, human-readable headers or in the appropriate machine-
55+
readable metadata fields within text or binary files as long as those
56+
fields can be easily viewed by the user.
57+
58+
2) The font name complies with the following:
59+
(a) The Original Version must retain its name, unmodified.
60+
(b) Modified Versions which are Substantially Changed must be renamed to
61+
avoid use of the name of the Original Version or similar names entirely.
62+
(c) Modified Versions which are not Substantially Changed must be
63+
renamed to both (i) retain the name of the Original Version and (ii) add
64+
additional naming elements to distinguish the Modified Version from the
65+
Original Version. The name of such Modified Versions must be the name of
66+
the Original Version, with "derivative X" where X represents the name of
67+
the new work, appended to that name.
68+
69+
3) The name(s) of the Copyright Holder(s) and any contributor to the
70+
Font Software shall not be used to promote, endorse or advertise any
71+
Modified Version, except (i) as required by this licence, (ii) to
72+
acknowledge the contribution(s) of the Copyright Holder(s) or (iii) with
73+
their explicit written permission.
74+
75+
4) The Font Software, modified or unmodified, in part or in whole, must
76+
be distributed entirely under this licence, and must not be distributed
77+
under any other licence. The requirement for fonts to remain under this
78+
licence does not affect any document created using the Font Software,
79+
except any version of the Font Software extracted from a document
80+
created using the Font Software may only be distributed under this
81+
licence.
82+
83+
TERMINATION
84+
This licence becomes null and void if any of the above conditions are
85+
not met.
86+
87+
DISCLAIMER
88+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
89+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
90+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
91+
COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
92+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
93+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
94+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
95+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
96+
DEALINGS IN THE FONT SOFTWARE.

‎fonts/Ubuntu-Bold.ttf

263 KB
Binary file not shown.

‎fonts/Ubuntu-BoldItalic.ttf

276 KB
Binary file not shown.

‎fonts/Ubuntu-Italic.ttf

318 KB
Binary file not shown.

‎fonts/Ubuntu-Light.ttf

353 KB
Binary file not shown.

‎fonts/Ubuntu-LightItalic.ttf

341 KB
Binary file not shown.

‎fonts/Ubuntu-Medium.ttf

277 KB
Binary file not shown.

‎fonts/Ubuntu-MediumItalic.ttf

301 KB
Binary file not shown.

‎fonts/Ubuntu-Regular.ttf

292 KB
Binary file not shown.

‎lib/main.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'src/menu.dart';
2+
import 'src/home.dart';
33

44
void main() => runApp(MaterialApp(
55
debugShowCheckedModeBanner: false,
@@ -21,7 +21,7 @@ class StartScreen extends StatelessWidget {
2121
onPressed: () {
2222
Navigator.push(
2323
context,
24-
MaterialPageRoute(builder: (context) => MainMenu()),
24+
MaterialPageRoute(builder: (context) => Home()),
2525
);
2626
},
2727
),

‎lib/src/category_card.dart

-65
This file was deleted.

‎lib/src/custom_items/home_page.dart

+162
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,162 @@
1+
import 'package:flutter/material.dart';
2+
import 'simulation_card.dart';
3+
4+
class HomePage extends StatelessWidget {
5+
@override
6+
Widget build(BuildContext context) {
7+
return Container(
8+
child: ListView(
9+
children: <Widget>[
10+
HomeHorizontalList(
11+
listName: 'Favorites',
12+
elements: <Widget>[
13+
Container(
14+
width: 180,
15+
),
16+
SimulationCard(
17+
simulationName: 'ToothPick Pattern',
18+
image: 'images/counting.gif',
19+
direct: null,
20+
),
21+
SimulationCard(
22+
simulationName: 'ToothPick Pattern',
23+
image: 'images/counting.gif',
24+
direct: null,
25+
),
26+
SimulationCard(
27+
simulationName: 'ToothPick Pattern',
28+
image: 'images/counting.gif',
29+
direct: null,
30+
),
31+
SimulationCard(
32+
simulationName: 'ToothPick Pattern',
33+
image: 'images/counting.gif',
34+
direct: null,
35+
)
36+
],
37+
),
38+
HomeHorizontalList(
39+
listName: 'Recents',
40+
elements: <Widget>[
41+
Container(
42+
width: 180,
43+
),
44+
SimulationCard(
45+
simulationName: 'ToothPick Pattern',
46+
image: 'images/counting.gif',
47+
direct: null,
48+
),
49+
SimulationCard(
50+
simulationName: 'ToothPick Pattern',
51+
image: 'images/counting.gif',
52+
direct: null,
53+
),
54+
SimulationCard(
55+
simulationName: 'ToothPick Pattern',
56+
image: 'images/counting.gif',
57+
direct: null,
58+
),
59+
SimulationCard(
60+
simulationName: 'ToothPick Pattern',
61+
image: 'images/counting.gif',
62+
direct: null,
63+
)
64+
],
65+
),
66+
HomeHorizontalList(
67+
listName: 'Explore',
68+
elements: <Widget>[
69+
Container(
70+
width: 180,
71+
),
72+
SimulationCard(
73+
simulationName: 'ToothPick Pattern',
74+
image: 'images/counting.gif',
75+
direct: null,
76+
),
77+
SimulationCard(
78+
simulationName: 'ToothPick Pattern',
79+
image: 'images/counting.gif',
80+
direct: null,
81+
),
82+
SimulationCard(
83+
simulationName: 'ToothPick Pattern',
84+
image: 'images/counting.gif',
85+
direct: null,
86+
),
87+
SimulationCard(
88+
simulationName: 'ToothPick Pattern',
89+
image: 'images/counting.gif',
90+
direct: null,
91+
)
92+
],
93+
),
94+
HomeHorizontalList(
95+
listName: 'Suggested',
96+
elements: <Widget>[
97+
Container(
98+
width: 180,
99+
),
100+
SimulationCard(
101+
simulationName: 'ToothPick Pattern',
102+
image: 'images/counting.gif',
103+
direct: null,
104+
),
105+
SimulationCard(
106+
simulationName: 'ToothPick Pattern',
107+
image: 'images/counting.gif',
108+
direct: null,
109+
),
110+
SimulationCard(
111+
simulationName: 'ToothPick Pattern',
112+
image: 'images/counting.gif',
113+
direct: null,
114+
),
115+
SimulationCard(
116+
simulationName: 'ToothPick Pattern',
117+
image: 'images/counting.gif',
118+
direct: null,
119+
)
120+
],
121+
),
122+
],
123+
),
124+
);
125+
}
126+
}
127+
128+
class HomeHorizontalList extends StatelessWidget {
129+
final String listName;
130+
final List<Widget> elements;
131+
HomeHorizontalList(
132+
{Key key, @required this.listName, @required this.elements})
133+
: super(key: key);
134+
@override
135+
Widget build(BuildContext context) {
136+
return Container(
137+
height: 235,
138+
margin: EdgeInsets.all(10),
139+
child: Column(
140+
children: <Widget>[
141+
Container(
142+
margin: EdgeInsets.all(5),
143+
width: MediaQuery.of(context).size.width,
144+
child: Text(
145+
listName,
146+
style: TextStyle(fontFamily: 'Ubuntu', fontSize: 17),
147+
textAlign: TextAlign.left,
148+
),
149+
),
150+
Container(
151+
color: Colors.white,
152+
height: 200,
153+
child: ListView(
154+
scrollDirection: Axis.horizontal,
155+
children: elements,
156+
),
157+
),
158+
],
159+
),
160+
);
161+
}
162+
}

‎lib/src/custom_items/physics_page.dart

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import 'package:flutter/material.dart';
2+
import 'simulation_card.dart';
3+
4+
class PhysicsPage extends StatelessWidget {
5+
@override
6+
Widget build(BuildContext context) {
7+
return Container(
8+
child: GridView.count(
9+
crossAxisCount: (MediaQuery.of(context).size.width / 200).floor(),
10+
children: <Widget>[
11+
SimulationCard(
12+
simulationName: 'ToothPick Pattern',
13+
image: 'images/counting.gif',
14+
direct: null,
15+
),
16+
SimulationCard(
17+
simulationName: 'ToothPick Pattern',
18+
image: 'images/counting.gif',
19+
direct: null,
20+
),
21+
SimulationCard(
22+
simulationName: 'ToothPick Pattern',
23+
image: 'images/counting.gif',
24+
direct: null,
25+
),
26+
SimulationCard(
27+
simulationName: 'ToothPick Pattern',
28+
image: 'images/counting.gif',
29+
direct: null,
30+
)
31+
],
32+
),
33+
);
34+
}
35+
}

0 commit comments

Comments
 (0)