Skip to content

Commit

Permalink
Merge pull request #16 from thechawla225/master
Browse files Browse the repository at this point in the history 
Proxima Nova font will look good in this app.
  • Loading branch information
@krishnaclouds
krishnaclouds committed Oct 23, 2021
2 parents 39d036a + d85dca3 commit 1a5bbce
Show file tree
Hide file tree
Showing 7 changed files with 98 additions and 41 deletions.
Binary file added assets/fonts/Proxima-Nova-Bold.otf
View file
Binary file not shown.
Binary file added assets/fonts/Proxima-Nova-Regular.ttf
View file
Binary file not shown.
52 changes: 40 additions & 12 deletions lib/screens/add_task_screen.dart
View file
Expand Up @@ -108,9 +108,10 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
Text(
widget.task == null ? 'Add Task' : 'Update Task',
style: TextStyle(
fontFamily: 'ProximaNova',
color: Colors.black,
fontSize: 40.0,
fontWeight: FontWeight.bold),
fontWeight: FontWeight.w800,
fontSize: 40.0),
),
SizedBox(
height: 10.0,
Expand All @@ -125,7 +126,12 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
style: TextStyle(fontSize: 18),
decoration: InputDecoration(
labelText: 'Title',
labelStyle: TextStyle(fontSize: 18),
labelStyle: TextStyle(
fontSize: 18,
fontFamily: 'ProximaNova',
color: Colors.black,
fontWeight: FontWeight.w800,
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.0))),
validator: (input) => input!.trim().isEmpty
Expand All @@ -144,7 +150,12 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
onTap: _handleDatePicker,
decoration: InputDecoration(
labelText: 'Date',
labelStyle: TextStyle(fontSize: 18),
labelStyle: TextStyle(
fontSize: 18,
fontFamily: 'ProximaNova',
color: Colors.black,
fontWeight: FontWeight.w800,
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.0))),
),
Expand All @@ -159,20 +170,29 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
style: TextStyle(fontSize: 18),
decoration: InputDecoration(
labelText: 'Priority',
labelStyle: TextStyle(fontSize: 18),
labelStyle: TextStyle(
fontSize: 18,
fontFamily: 'ProximaNova',
color: Colors.black,
fontWeight: FontWeight.w800,
),
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10.0))),
validator: (dynamic input) => input.toString().trim().isEmpty
? 'Please Select a Priority Level'
: null,
validator: (dynamic input) =>
input.toString().trim().isEmpty
? 'Please Select a Priority Level'
: null,
// onSaved: (input) => _priority = input.toString(),
items: _priorities.map((String priority) {
return DropdownMenuItem(
value: priority,
child: new Text(
priority,
style: TextStyle(
color: Colors.black, fontSize: 18.0),
fontFamily: 'ProximaNova',
color: Colors.black,
fontWeight: FontWeight.w800,
fontSize: 18.0),
));
}).toList(),
onChanged: (dynamic newValue) {
Expand All @@ -195,8 +215,12 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
onPressed: _submit,
child: Text(
widget.task == null ? 'Add' : 'Update',
style:
TextStyle(color: Colors.white, fontSize: 20.0),
style: TextStyle(
color: Colors.white,
fontSize: 20.0,
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
),
),
),
),
Expand All @@ -213,7 +237,11 @@ class _AddTaskScreenState extends State<AddTaskScreen> {
child: Text(
'Delete',
style: TextStyle(
color: Colors.white, fontSize: 20.0),
color: Colors.white,
fontSize: 20.0,
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
),
),
),
)
Expand Down
30 changes: 24 additions & 6 deletions lib/screens/login_screen.dart
View file
Expand Up @@ -65,6 +65,7 @@ class _AuthState extends State<Auth> {
Text(
'TaskIt',
style: TextStyle(
fontFamily: 'ProximaNova',
fontSize: 60.0,
),
),
Expand All @@ -76,6 +77,8 @@ class _AuthState extends State<Auth> {
style: TextStyle(
fontSize: 20.0,
fontStyle: FontStyle.italic,
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
color: Colors.grey),
),
),
Expand All @@ -101,7 +104,11 @@ class _AuthState extends State<Auth> {
decoration: InputDecoration(
labelText: 'EMAIL',
labelStyle: TextStyle(
fontSize: 12.0, color: Colors.grey.withOpacity(0.5)),
fontSize: 12.0,
color: Colors.grey.withOpacity(0.5),
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(color: Colors.orange),
)),
Expand All @@ -114,7 +121,11 @@ class _AuthState extends State<Auth> {
decoration: InputDecoration(
labelText: 'PASSWORD',
labelStyle: TextStyle(
fontSize: 12.0, color: Colors.grey.withOpacity(0.5)),
fontSize: 12.0,
color: Colors.grey.withOpacity(0.5),
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
),
focusedBorder: UnderlineInputBorder(
borderSide: BorderSide(color: greenColor),
)),
Expand All @@ -136,9 +147,12 @@ class _AuthState extends State<Auth> {
child: InkWell(
child: Text('Forgot Password',
style: TextStyle(
color: greenColor,
fontSize: 11.0,
decoration: TextDecoration.underline))))),
color: greenColor,
fontSize: 11.0,
decoration: TextDecoration.underline,
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
))))),
SizedBox(height: 50.0),
GestureDetector(
onTap: () {
Expand All @@ -153,7 +167,11 @@ class _AuthState extends State<Auth> {
elevation: 4.0,
child: Center(
child: Text('LOGIN',
style: TextStyle(color: Colors.white))))),
style: TextStyle(
color: Colors.white,
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
))))),
),
],
),
Expand Down
31 changes: 18 additions & 13 deletions lib/screens/todo_list_screen.dart
View file
Expand Up @@ -35,6 +35,8 @@ class _TodoListScreenState extends State<TodoListScreen> {
title: Text(
task.title!,
style: TextStyle(
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
fontSize: 18,
decoration: task.status == 0
? TextDecoration.none
Expand All @@ -43,6 +45,8 @@ class _TodoListScreenState extends State<TodoListScreen> {
subtitle: Text(
'${_dateFormatter.format(task.date!)} * ${task.priority}',
style: TextStyle(
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
fontSize: 15,
decoration: task.status == 0
? TextDecoration.none
Expand Down Expand Up @@ -74,25 +78,23 @@ class _TodoListScreenState extends State<TodoListScreen> {
return Scaffold(
drawer: Drawer(
child: Column(
children: [
Text('Option 1'),
Text('Option 2'),
Text('Option 3')
],
children: [Text('Option 1'), Text('Option 2'), Text('Option 3')],
),
),
appBar: AppBar(
title: Text('TaskIt'),
title: Text('TaskIt',
style: TextStyle(
fontFamily: 'ProximaNova',
fontWeight: FontWeight.w800,
)),
),
floatingActionButton: FloatingActionButton(
backgroundColor: Theme.of(context).primaryColor,
onPressed: () => {
Navigator.push(
context,
MaterialPageRoute(
builder: (_) => AddTaskScreen(
updateTaskList : _updateTaskList
),
builder: (_) => AddTaskScreen(updateTaskList: _updateTaskList),
),
)
},
Expand All @@ -114,7 +116,7 @@ class _TodoListScreenState extends State<TodoListScreen> {

return ListView.builder(
padding: EdgeInsets.symmetric(vertical: 60.0),
itemCount: 1 + (snapshot.data as List<Task>).length ,
itemCount: 1 + (snapshot.data as List<Task>).length,
itemBuilder: (BuildContext context, int index) {
if (index == 0) {
return Padding(
Expand All @@ -126,16 +128,19 @@ class _TodoListScreenState extends State<TodoListScreen> {
Text(
'My Tasks',
style: TextStyle(
color: Colors.black,
fontSize: 30,
fontWeight: FontWeight.bold),
fontFamily: 'ProximaNova',
color: Colors.black,
fontWeight: FontWeight.w800,
fontSize: 30,
),
),
SizedBox(
height: 10.0,
),
Text(
'$completedTaskCount of ${(snapshot.data as List<Task>).length}',
style: TextStyle(
fontFamily: 'ProximaNova',
color: Colors.grey,
fontSize: 15.0,
fontWeight: FontWeight.w600),
Expand Down
10 changes: 5 additions & 5 deletions pubspec.lock
View file
Expand Up @@ -21,7 +21,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.1"
version: "2.8.2"
boolean_selector:
dependency: transitive
description:
Expand All @@ -42,7 +42,7 @@ packages:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -136,14 +136,14 @@ packages:
name: matcher
url: "https://pub.dartlang.org"
source: hosted
version: "0.12.10"
version: "0.12.11"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -281,7 +281,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
version: "0.4.3"
typed_data:
dependency: transitive
description:
Expand Down
16 changes: 11 additions & 5 deletions pubspec.yaml
View file
@@ -1,12 +1,12 @@
name: taskit
description: Not Just Another Todo App

publish_to: 'none' # Remove this line if you wish to publish to pub.dev
publish_to: "none" # Remove this line if you wish to publish to pub.dev

version: 1.0.0+1

environment:
sdk: '>=2.12.0 <3.0.0'
sdk: ">=2.12.0 <3.0.0"

dependencies:
flutter:
Expand All @@ -22,12 +22,11 @@ dev_dependencies:
flutter_launcher_icons: "^0.8.0"

flutter_icons:
image_path: 'assets/logo.png'
android : true
image_path: "assets/logo.png"
android: true

# The following section is specific to Flutter.
flutter:

uses-material-design: true

# To add assets to your application, add an assets section, like this:
Expand All @@ -46,6 +45,13 @@ flutter:
# "family" key with the font family name, and a "fonts" key with a
# list giving the asset and other descriptors for the font. For
# example:
fonts:
- family: ProximaNova
fonts:
- asset: assets/fonts/Proxima-Nova-Bold.otf
- asset: assets/fonts/Proxima-Nova-Regular.ttf
weight: 800

# fonts:
# - family: Schyler
# fonts:
Expand Down

0 comments on commit 1a5bbce

Please sign in to comment.