warlock/TaskTracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings page added

Browse Source
This commit is contained in:
warlock
2022-03-03 06:21:31 +05:30
parent 4576957b4c
commit 7f50983e11
12 changed files with 493 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

379
lib/Activities.dart
View File

@@ -17,64 +17,132 @@ class Activities extends StatefulWidget {
late ProgressDialog progressDialog;
class _ActivitiesState extends State<Activities> {
TextEditingController searchController = TextEditingController();
FocusNode _focus = FocusNode();
bool searching = false;
void _onFocusChange() {
print("FOCUS CHANGED! : ${_focus.hasFocus}");
if(!_focus.hasFocus){
searching=false;
setState(() {
});
}
}
@override
void initState() {
// TODO: implement initState
super.initState();
_focus.addListener(_onFocusChange);
UpdateList();
}
@override
void dispose() {
// TODO: implement dispose
super.dispose();
_focus.removeListener(_onFocusChange);
_focus.dispose();
}
@override
Widget build(BuildContext context) {
progressDialog = ProgressDialog(context: context);
return Scaffold(
floatingActionButton: FloatingActionButton.extended(
onPressed: () {
Navigator.of(context)
.push(MaterialPageRoute(builder: (context) => NewActivity()))
.then((value) => UpdateList());
Navigator.of(context).push(MaterialPageRoute(builder: (context) => NewActivity())).then((value) => UpdateList());
},
label: Text("New Activity"),
icon: Icon(Icons.add)),
appBar: AppBar(
title: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [
Icon(Icons.task, color: Theme.of(context).primaryColor),
SizedBox(width: 10),
Text('Activities')
]),
(selecting)
? Row(children: [
InkWell(
onTap: () {
DeleteSelectedTasks();
},
child: Icon(
Icons.delete,
size: 30,
)),
SizedBox(
width: 20,
),
InkWell(
onTap: () {
setState(() {
selecting = false;
});
},
child: Icon(Icons.close, size: 30),
)
])
: Container(),
],
)),
title: (searching)
? Row(
mainAxisSize: MainAxisSize.max,
children: [
Expanded(
child: TextField(onChanged: (text){setState(() {
});},controller: searchController, focusNode: _focus, decoration: InputDecoration(
filled: true,
),),
),
InkWell(
onTap: (){searching=false;
searchController.clear();
setState(() {
});},
child: Container(
padding: EdgeInsets.symmetric(horizontal: 10),
child: Icon(Icons.cancel),
),
)
],
)
: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [Icon(Icons.task, color: Theme.of(context).primaryColor), SizedBox(width: 10), Text('Activities')]),
(selecting)
? Row(children: [
InkWell(
onTap: () {
DeleteSelectedTasks();
},
child: Icon(
Icons.delete,
size: 30,
)),
SizedBox(
width: 20,
),
InkWell(
onTap: () {
setState(() {
selecting = false;
});
},
child: Icon(Icons.close, size: 30),
)
])
: Row(
children: [
InkWell(
onTap: () {
searching = true;
_focus.requestFocus();
setState(() {
});
},
child: Icon(
Icons.search,
size: 30,
)),
SizedBox(
width: 20,
),
InkWell(
onTap: () {
setState(() async {
await User.refreshUserData();
UpdateList();
});
},
child: Icon(Icons.refresh, size: 30),
)
],
),
],
)),
drawer: navDrawer(context, 2),
body: Container(
padding: EdgeInsets.all(10),
padding: EdgeInsets.all(0),
child: SingleChildScrollView(
child: Column(
children: PrintTasks(),
@@ -102,12 +170,12 @@ class _ActivitiesState extends State<Activities> {
Map<String, int> totalMinutes = <String, int>{};
for (var element in User.activities) {
String thisDate = dFormat.format(element.startTime);
int thisMinutes= element.endTime.difference(element.startTime).inMinutes;
if(totalMinutes.containsKey(thisDate)){
if((totalMinutes[thisDate]??0) < thisMinutes){
int thisMinutes = element.endTime.difference(element.startTime).inMinutes;
if (totalMinutes.containsKey(thisDate)) {
if ((totalMinutes[thisDate] ?? 0) < thisMinutes) {
totalMinutes[thisDate] = thisMinutes;
}
}else{
} else {
totalMinutes.putIfAbsent(thisDate, () => thisMinutes);
}
@@ -127,6 +195,14 @@ class _ActivitiesState extends State<Activities> {
}
print(productivtyActs);
for (var element in User.activities) {
if(searching){
if(element.metadata!.toLowerCase().contains(searchController.text.toLowerCase()) || element.taskType.name.toLowerCase().contains(searchController.text.toLowerCase())){
//Good to go
}else{
continue;
}
}
String thisDate = dFormat.format(element.startTime);
if (thisDate != lastDate) {
int prodActs = productivtyActs[thisDate] ?? 0;
@@ -138,11 +214,9 @@ class _ActivitiesState extends State<Activities> {
if (element.taskType.cat == null) {
print('Got some null cat : ${element.taskType.name}');
} else {
Color color =
HexColor.fromHex(element.taskType.cat?.color ?? '#000000');
Color color = HexColor.fromHex(element.taskType.cat?.color ?? '#000000');
bool productive = element.taskType.cat?.productive ?? true;
Widget task = ActivityCard(context, name, element.startTime,
element.endTime, productive, color, element, totalMinutes[thisDate] ?? 0);
Widget task = ActivityCard(context, name, element.startTime, element.endTime, productive, color, element, totalMinutes[thisDate] ?? 0);
_tasks.add(task);
}
}
@@ -153,27 +227,55 @@ class _ActivitiesState extends State<Activities> {
Widget DateSeperator(date, prodActs, unprodActs) {
double prodPercentage = (prodActs / (prodActs + unprodActs)) * 100;
return Padding(
padding: const EdgeInsets.fromLTRB(10, 20, 10, 0),
padding: const EdgeInsets.fromLTRB(0, 20, 10, 0),
child: Column(
children: [
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
date,
style: TextStyle(fontSize: 18),
Row(
children: [
Icon(Icons.remove_circle_outline),
SizedBox(
width: 10,
),
Text(
date,
style: TextStyle(fontSize: 18),
),
],
),
Row(children: [
Row(
children: [
Container(child:Align(child:Text(MinutesToTimeString(prodActs)), alignment: Alignment.center,),width: (prodPercentage) * 1.7, height: 25,decoration: BoxDecoration(color: Colors.green,borderRadius: BorderRadius.horizontal(left: Radius.circular(10))),),
Container(child:Align(child:Text(MinutesToTimeString(unprodActs)), alignment: Alignment.center,),width: (100-prodPercentage)* 1.7,height: 25,decoration: BoxDecoration(color: Colors.red,borderRadius: BorderRadius.horizontal(right: Radius.circular(10))),),
],
),
SizedBox(width: 10,),
Text(prodPercentage.toStringAsFixed(1) + "%",style: TextStyle(color: Colors.green, fontWeight: FontWeight.bold,fontSize: 20))
],)
Row(
children: [
Row(
children: [
Container(
child: Align(
child: FittedBox(fit: BoxFit.fitWidth,child: Text(MinutesToTimeString(prodActs),)),
alignment: Alignment.center,
),
width: (prodPercentage) * 1.7,
height: 25,
decoration: BoxDecoration(color: Colors.green, borderRadius: BorderRadius.horizontal(left: Radius.circular(10))),
),
Container(
child: Align(
child: Text(MinutesToTimeString(unprodActs)),
alignment: Alignment.center,
),
width: (100 - prodPercentage) * 1.7,
height: 25,
decoration: BoxDecoration(color: Colors.red, borderRadius: BorderRadius.horizontal(right: Radius.circular(10))),
),
],
),
SizedBox(
width: 10,
),
Text(prodPercentage.toStringAsFixed(1) + "%", style: TextStyle(color: Colors.green, fontWeight: FontWeight.bold, fontSize: 20))
],
)
// CustomPaint(
// painter: MyPlayerBar(100, prodPercentage.toInt(),
// background: Colors.green, fill: Colors.deepOrange),
@@ -195,20 +297,14 @@ class _ActivitiesState extends State<Activities> {
}
bool selecting = false;
Widget ActivityCard(BuildContext context, String name, DateTime sTime,
DateTime eTime, bool productive, Color color, Activity activity,int totalMinutes) {
Widget ActivityCard(BuildContext context, String name, DateTime sTime, DateTime eTime, bool productive, Color color, Activity activity, int totalMinutes) {
DateFormat dateFormat = DateFormat("HH:mm");
int thisMinutes = (activity.endTime.difference(activity.startTime).inMinutes);
int timePercentage = ((thisMinutes / totalMinutes) * 100).toInt();
// print("$thisMinutes / $totalMinutes");
bool containsMetadata = ((activity.metadata ?? 'null') != 'null') &&
((activity.metadata ?? '').isNotEmpty);
// print("$thisMinutes / $totalMinutes");
bool containsMetadata = ((activity.metadata ?? 'null') != 'null') && ((activity.metadata ?? '').isNotEmpty);
var _timeSpan = eTime.difference(sTime);
String timeSpan =
((_timeSpan.inHours > 0) ? _timeSpan.inHours.toString() + 'h ' : '') +
((_timeSpan.inMinutes % 60 > 0)
? (_timeSpan.inMinutes % 60).toString() + 'm'
: '');
String timeSpan = ((_timeSpan.inHours > 0) ? _timeSpan.inHours.toString() + 'h ' : '') + ((_timeSpan.inMinutes % 60 > 0) ? (_timeSpan.inMinutes % 60).toString() + 'm' : '');
return Row(children: [
// Container(),
(selecting)
@@ -219,84 +315,77 @@ class _ActivitiesState extends State<Activities> {
OnItemSelected(activity);
setState(() {});
})
: Container(),
: Container(padding: EdgeInsets.fromLTRB(10, 0, 5, 0), child: SizedBox(width: 1, height: 100, child: Container(color: Colors.white))),
Expanded(
child: Column(children: [
Card(
Padding(
padding: const EdgeInsets.fromLTRB(0, 0, 5, 0),
child: Card(
// color: color,
elevation: 20,
shadowColor: color,
child: InkWell(
onTap: () {
//Open Respective Category
if (selecting) {
OnItemSelected(activity);
}
setState(() {});
},
onLongPress: () {
print('gonna delete');
selecting = !selecting;
selectedActivities = [activity];
setState(() {});
},
child: Container(
padding: EdgeInsets.all(15),
child: Column(
children: [
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [
Text(name + " [$timeSpan]",
style: TextStyle( fontSize: 17)),
if (containsMetadata)
Icon(Icons.arrow_forward_outlined, size: 20,),
if (containsMetadata)
Text(activity.metadata ?? '',overflow: TextOverflow.clip,)
]),
// Icon(Icons.analytics, color: color, size: 20,),
// color: color,
elevation: 20,
shadowColor: color,
child: InkWell(
onTap: () {
//Open Respective Category
if (selecting) {
OnItemSelected(activity);
}
setState(() {});
},
onLongPress: () {
print('gonna delete');
selecting = !selecting;
selectedActivities = [activity];
setState(() {});
},
child: Container(
padding: EdgeInsets.all(15),
child: Column(
children: [
Row(mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Row(children: [
Text(name + " [$timeSpan]", style: TextStyle(fontSize: 17)),
if (containsMetadata)
Icon(
Icons.arrow_forward_outlined,
size: 20,
),
if (containsMetadata)
Text(
activity.metadata ?? '',
overflow: TextOverflow.ellipsis,
)
]),
SizedBox(
height: 5,
),
Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(dateFormat.format(sTime) +
" - " +
dateFormat.format(eTime)),
SizedBox(
width: 20,
),
Container(
padding: EdgeInsets.symmetric(
horizontal: 10, vertical: 2),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: (productive)
? Colors.green
: Colors.red),
child: Text(
activity.taskType.cat?.name ?? 'n/a'))
// Icon(Icons.circle,
// color: (productive)
// ? Colors.green
// : Colors.red)
])
],
)))),
// Icon(Icons.analytics, color: color, size: 20,),
]),
SizedBox(
height: 5,
),
Row(mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text(dateFormat.format(sTime) + " - " + dateFormat.format(eTime)),
SizedBox(
width: 20,
),
Container(
padding: EdgeInsets.symmetric(horizontal: 10, vertical: 2),
decoration: BoxDecoration(borderRadius: BorderRadius.circular(10), color: (productive) ? Colors.green : Colors.red),
child: Text(activity.taskType.cat?.name ?? 'n/a'))
// Icon(Icons.circle,
// color: (productive)
// ? Colors.green
// : Colors.red)
])
],
)))),
),
Container(
margin: EdgeInsets.fromLTRB(15, 0, 15, 10),
height: 2,
child:Row(children: [
Expanded(flex:timePercentage ,child: Container(color:color)),
Expanded(flex:100-timePercentage,child:Container())
],)),
child: Row(
children: [Expanded(flex: timePercentage, child: Container(color: color)), Expanded(flex: 100 - timePercentage, child: Container())],
)),
]),
),
]);
@@ -311,8 +400,7 @@ class _ActivitiesState extends State<Activities> {
}
void DeleteSelectedTasks() async {
progressDialog.show(
max: 100, msg: 'Deleteing ${selectedActivities.length} Activities');
progressDialog.show(max: 100, msg: 'Deleteing ${selectedActivities.length} Activities');
selectedActivities.forEach((element) async {
await User.UserOperations.deleteActivity(element, bulk: true);
});
@@ -328,7 +416,4 @@ class _ActivitiesState extends State<Activities> {
}
}
List<Activity> selectedActivities = [];

1
lib/Categories.dart
View File

@@ -122,7 +122,6 @@ class _CategoriesState extends State<Categories> {
Expanded(
child: Column(children: [
Card(
// color: color,
elevation:20,
shadowColor: color,

16
lib/Data.dart
View File

@@ -1,5 +1,9 @@
import 'dart:async';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:uuid/uuid.dart';
import 'theme_provider.dart';
import 'package:provider/provider.dart';
class Category{
Category(this.category_id, this.name, this.color, this.productive);
@@ -80,8 +84,9 @@ class Queries{
}
class Settings{
class Settings{
static Future<String> UUID() async{
final prefs = await SharedPreferences.getInstance();
if(prefs.containsKey('uuid')){
@@ -93,4 +98,11 @@ class Settings{
return Future.value(_uuid);
}
}
}
static Future<void> setTheme(int value) async{
final prefs = await SharedPreferences.getInstance();
await prefs.setInt("theme", value);
}
}
final settings = Settings();

49
lib/Settings/AppearanceSettings.dart Normal file
View File

@@ -0,0 +1,49 @@
import 'package:flutter/material.dart';
import 'package:tasktracker/Settings/Settings.dart';
import 'package:tasktracker/Data.dart';
import 'package:tasktracker/theme_provider.dart';
import 'package:provider/provider.dart';
class AppearanceSettings extends StatefulWidget {
const AppearanceSettings({Key? key}) : super(key: key);
@override
_AppearanceSettingsState createState() => _AppearanceSettingsState();
}
class _AppearanceSettingsState extends State<AppearanceSettings> {
@override
Widget build(BuildContext context) {
final themeProvider= Provider.of<ThemeProvider>(context);
return Scaffold(
appBar: AppBar(title: Text('Appearance Settings')),
body: SafeArea(
child: Container(
child: Column(
mainAxisSize: MainAxisSize.max,
children: [
SizedBox(height: 10,),
Padding(
padding: const EdgeInsets.all(5.0),
child: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text("Dark Mode",style: TextStyle(fontSize: 18)),
Switch.adaptive(value: themeProvider.isDarkMode, onChanged: (value){
final provider = Provider.of<ThemeProvider>(context, listen: false);
provider.toggleTheme(value);
Settings.setTheme(value ? 0:1);
})
],
),
),
Divider(),
],
),
),
)
);
}
}

37
lib/Settings/NotificationSettings.dart Normal file
View File

@@ -0,0 +1,37 @@
import 'package:flutter/material.dart';
class NotificationSettings extends StatefulWidget {
const NotificationSettings({Key? key}) : super(key: key);
@override
_NotificationSettingsState createState() => _NotificationSettingsState();
}
class _NotificationSettingsState extends State<NotificationSettings> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: Text("Notification Settings")),
body: SafeArea(
child: Column(
children: [
SizedBox(
height: 10,
),
ListTile(
title: Text("New Activity Notification"),
trailing: InkWell(onTap:(){},child: Text("1 hour")),
subtitle: Text("Notify you to track activities of past time"),
),
Divider(),
ListTile(
title: Text("Suggestion Notifications"), trailing:Switch.adaptive(value: true, onChanged: (val){}),
subtitle: Text("Notifies you about suggestions according to your data"),
)
],
),
),
);
}
}

48
lib/Settings/Settings.dart Normal file
View File

@@ -0,0 +1,48 @@
import 'package:flutter/material.dart';
import 'package:tasktracker/Settings/AppearanceSettings.dart';
import 'package:tasktracker/Settings/NotificationSettings.dart';
import 'package:tasktracker/main.dart';
class SettingsPage extends StatefulWidget {
const SettingsPage({Key? key}) : super(key: key);
@override
_SettingsPageState createState() => _SettingsPageState();
}
class _SettingsPageState extends State<SettingsPage> {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: Text('Settings')),
body: Column(
mainAxisSize: MainAxisSize.max,
children: [
SettingItem('Appearance', ()=>Navigator.of(context).push(MaterialPageRoute(builder: (context)=> const AppearanceSettings()))),
Divider(),
SettingItem('Notifications', ()=>Navigator.of(context).push(MaterialPageRoute(builder: (context)=> const NotificationSettings()))),
],
)
);
}
}
Widget SettingItem(String name, Function onTap){
return InkWell(
onTap: ()=>onTap(),
child: Padding(
padding: const EdgeInsets.all(15.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
mainAxisSize: MainAxisSize.max,
children: [
Text(name, style: TextStyle(fontSize: 18)),
Icon(Icons.arrow_forward,size: 20,)
],
),
)
);
}

3
lib/User.dart
View File

@@ -23,6 +23,7 @@ List<TaskType> taskTypes = [];
List<Activity> activities=[];
bool offline = true;
bool registered = false;
bool refreshing = true;
Future<http.Response> login(String _username, String password) async {
final prefs = await SharedPreferences.getInstance();
@@ -64,6 +65,7 @@ Future<void> initUserData() async {
bool userDataInitiated =false;
Future<void> refreshUserData() async{
ShowProgress("Loading data");
refreshing = true;
// categories= await GetCategories(true);
// taskTypes= await GetTaskTypes(true);
// activities= await GetActivities(true);
@@ -71,6 +73,7 @@ Future<void> refreshUserData() async{
await updateTasksList();
await updateActList();
userDataInitiated=true;
refreshing = false;
HideProgress();
}

87
lib/main.dart
View File

@@ -1,9 +1,12 @@
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
import 'package:provider/provider.dart';
import 'package:tasktracker/Categories.dart';
import 'package:tasktracker/Welcome.dart';
import 'package:tasktracker/splash.dart';
import 'package:tasktracker/theme_provider.dart';
import 'Settings/Settings.dart';
import 'package:wakelock/wakelock.dart';
import 'Data.dart';
import 'NewTask.dart';
@@ -69,21 +72,28 @@ class MyApp extends StatelessWidget {
const MyApp({Key? key}) : super(key: key);
// This widget is the root of your application.
@override
Widget build(BuildContext context) {
return MaterialApp(
title: 'Flutter Demo',
theme: ThemeData(accentColor: Colors.redAccent, brightness: Brightness.dark, primaryColor: Colors.amber, fontFamily: 'Noto-Sans'),
//home: const MyHomePage(),
initialRoute: '/splash',
routes: {
'/splash': (context) => const SplashScreen(),
'/welcome': (context) => const WelcomePage(),
'/': (context) => const MyHomePage(),
'/Tasks': (context) => const Tasks(),
'/Categories': (context) => const Categories(),
'/Activities': (context) => const Activities()
});
}
Widget build(BuildContext context) => ChangeNotifierProvider(
create: (context)=>ThemeProvider(),
builder: (context, _){
final themeProvider = Provider.of<ThemeProvider>(context);
return MaterialApp(
title: 'Task Tracker',
themeMode: themeProvider.themeMode,
theme: ThemeData(accentColor: Colors.redAccent,brightness: Brightness.light, primaryColor: Colors.amber, fontFamily: 'Noto-Sans'),
darkTheme: ThemeData(accentColor: Colors.redAccent,brightness: Brightness.dark, primaryColor: Colors.amber, fontFamily: 'Noto-Sans'),
//home: const MyHomePage(),
initialRoute: '/splash',
routes: {
'/splash': (context) => const SplashScreen(),
'/welcome': (context) => const WelcomePage(),
'/': (context) => const MyHomePage(),
'/Tasks': (context) => const Tasks(),
'/Categories': (context) => const Categories(),
'/Activities': (context) => const Activities(),
'/Settings':(context) => const SettingsPage()
});
});
}
List<String> days = [];
@@ -129,7 +139,7 @@ class _MyHomePageState extends State<MyHomePage> {
void initState() {
// TODO: implement initState
super.initState();
User.refreshUserData().then((val) => LoadStats());
// User.refreshUserData().then((val) => LoadStats());
// showOfflineSnack();
LoadStats();
// progressDialog = ProgressDialog(context: context);
@@ -153,17 +163,18 @@ class _MyHomePageState extends State<MyHomePage> {
firstDay = null;
lastDay = null;
String lastDate = "";
days=[];
for (var element in User.activities) {
if (lastDay == null) {
lastDay = element.endTime;
}
if (taskTypeRange == null) {
print("$lastDay - $firstDay");
taskTypeRange = DateTimeRange(start: lastDay!.subtract(const Duration(days: 1)), end: lastDay!);
taskTypeRange = DateTimeRange(start: lastDay!.subtract(const Duration(days: 0)), end: lastDay!);
}
if (catsRange == null) {
print("$lastDay - $firstDay");
catsRange = DateTimeRange(start: lastDay!.subtract(const Duration(days: 1)), end: lastDay!);
catsRange = DateTimeRange(start: lastDay!.subtract(const Duration(days: 0)), end: lastDay!);
}
firstDay = element.startTime;
String thisDate = dFormat.format(element.startTime);
@@ -237,7 +248,9 @@ class _MyHomePageState extends State<MyHomePage> {
Color barCol = HexColor.fromHex(key.color);
dailyData.add(CatMapData(key.name, value, barCol));
});
dailyData.sort((a,b){
return a.name.toLowerCase().compareTo(b.name.toLowerCase());
});
for (var element in days) {
// if(productivtyActs.containsKey(element) && unproductivtyActs.containsKey(element)){
int prodActs = (productivtyActs[element] ?? 0);
@@ -252,11 +265,16 @@ class _MyHomePageState extends State<MyHomePage> {
taskTypesData.add(TaskTypeMapData(key.name, value, HexColor.fromHex(key.cat!.color)));
});
taskTypesData.sort((a,b){
return a.time.compareTo(b.time);
});
catBriefMap.forEach((key, value) {
print(key.name + " : $value");
Color barCol = HexColor.fromHex(key.color);
catsData.add(CatMapData(key.name, value, barCol));
});
catsData.sort((a,b)=> a.time.compareTo(b.time));
});
}
}
@@ -281,7 +299,23 @@ class _MyHomePageState extends State<MyHomePage> {
},
label: Text("New Activity"),
icon: Icon(Icons.add)),
appBar: AppBar(title: Row(children: [Icon(Icons.article_outlined, color: Theme.of(context).primaryColor), SizedBox(width: 10), Text('Summary')])),
appBar: AppBar(title: Row(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(children: [Icon(Icons.article_outlined, color: Theme.of(context).primaryColor), SizedBox(width: 10), Text('Summary')]),
Row(children: [
InkWell(
onTap: () {
setState(() {
LoadStats();
});
},
child: Icon(Icons.refresh, size: 30),
)
],)
],
)),
drawer: navDrawer(context, 0),
body: SafeArea(
child: SingleChildScrollView(
@@ -362,6 +396,12 @@ class _MyHomePageState extends State<MyHomePage> {
dataSource: productivityData.reversed.toList(),
xValueMapper: (ProductivityMapData sales, _) => sales.day,
yValueMapper: (ProductivityMapData sales, _) => sales.productivity,
dataLabelMapper: (ProductivityMapData sales, _) => sales.productivity.toStringAsFixed(1) + "%",
dataLabelSettings: DataLabelSettings(
overflowMode: OverflowMode.hide,
showZeroValue: false,
isVisible: true
),
color: Colors.green)
]),
)
@@ -616,7 +656,12 @@ Drawer navDrawer(BuildContext context, int pageIndex) {
selected: (pageIndex == 5),
title: Text('Settings'),
leading: Icon(Icons.settings, color: Colors.blueGrey),
onTap: () {},
onTap: () {
if (pageIndex == 5) {
return;
}
Navigator.of(context).pushNamed('/Settings');
},
),
ListTile(
selected: (pageIndex == 6),

17
lib/splash.dart
View File

@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:tasktracker/Data.dart';
import 'User.dart' as Users;
import 'package:http/http.dart' as http;
import 'package:sn_progress_dialog/sn_progress_dialog.dart';
import 'theme_provider.dart';
import 'package:provider/provider.dart';
late ProgressDialog progressDialog;
class SplashScreen extends StatefulWidget {
const SplashScreen({Key? key}) : super(key: key);
@@ -13,6 +15,18 @@ class SplashScreen extends StatefulWidget {
}
class _SplashScreenState extends State<SplashScreen> {
Future<void> initSettings() async{
final prefs = await SharedPreferences.getInstance();
bool value = true;
if(prefs.containsKey("theme")){
value = ((await prefs.getInt("theme"))==0);
}else{
await prefs.setInt("theme", 0);
}
print('Dark theme is : $value');
final provider = Provider.of<ThemeProvider>(context, listen: false);
provider.toggleTheme(value);
}
@override
void initState() {
// TODO: implement initState
@@ -23,6 +37,7 @@ class _SplashScreenState extends State<SplashScreen> {
}
void init() async {
await initSettings();
final prefs = await SharedPreferences.getInstance();
// http.Response loginResponse = await Users.login('Test1', 'password');
// print(loginResponse.body);

12
lib/theme_provider.dart Normal file
View File

@@ -0,0 +1,12 @@
import 'package:flutter/material.dart';
class ThemeProvider extends ChangeNotifier{
ThemeMode themeMode = ThemeMode.dark;
bool get isDarkMode => themeMode == ThemeMode.dark;
void toggleTheme(bool isOn){
themeMode = isOn ? ThemeMode.dark : ThemeMode.light;
notifyListeners();
}
}