Skip to content

Commit

Permalink
Delete unused files and update code structure
Browse files Browse the repository at this point in the history
  • Loading branch information
Alidantech committed Mar 30, 2024
1 parent 9e9bd6d commit e0003a1
Show file tree
Hide file tree
Showing 16 changed files with 253 additions and 415 deletions.
25 changes: 25 additions & 0 deletions lib/config/colors.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import 'package:flutter/material.dart';

class AppColors {
// dark theme colors
static const Color primaryDark = Colors.green;
static Color primaryDark500 = Colors.green.shade500;
static Color primaryDark800 = Colors.green.shade800;
static const Color backgroundDark = Colors.black;
static Color scaffoldBackgroundDark = Colors.grey.shade900;
static const Color cardDark = Colors.black12;
static const Color shadowDark = Colors.black;
static const Color drawerBackgroundDark = Colors.black87;
static const Color dialogBackgroundDark = Colors.grey;

// light colors
static const Color primaryLight = Colors.green;
static Color primaryLight400 = Colors.green.shade400;
static Color primaryLight50 = Colors.green.shade50;
static const Color backgroundLight = Colors.white;
static const Color scaffoldBackgroundLight = Colors.white;
static Color cardLight = Colors.grey.shade200;
static Color shadowLight = Colors.grey.shade200;
static Color drawerBackgroundLight = Colors.green.shade50;
static Color dialogBackgroundLight = Colors.green.shade50;
}
Empty file removed lib/config/constants/colors.dart
Empty file.
10 changes: 0 additions & 10 deletions lib/config/constants/week.dart

This file was deleted.

19 changes: 10 additions & 9 deletions lib/config/themes/dark.dart
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
import 'package:Organiser/config/colors.dart';
import 'package:flutter/material.dart';

ThemeData darkMode = ThemeData(
primaryColor: Colors.green,
primaryColor: AppColors.primaryDark,
brightness: Brightness.dark,
colorScheme: ColorScheme.dark(
background: Colors.black,
primary: Colors.green.shade500,
secondary: Colors.green.shade800,
background: AppColors.backgroundDark,
primary: AppColors.primaryDark500,
secondary: AppColors.primaryDark800,
),
scaffoldBackgroundColor: Colors.grey.shade900,
cardTheme: CardTheme(color: Colors.black12),
shadowColor: Colors.black,
drawerTheme: DrawerThemeData(backgroundColor: Colors.black87),
scaffoldBackgroundColor: AppColors.scaffoldBackgroundDark,
cardTheme: CardTheme(color: AppColors.cardDark),
shadowColor: AppColors.shadowDark,
drawerTheme: DrawerThemeData(backgroundColor: AppColors.drawerBackgroundDark),
dialogTheme: DialogTheme(
backgroundColor: Colors.grey.shade500.withOpacity(0.9),
backgroundColor: AppColors.dialogBackgroundDark.withOpacity(0.9),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
),
);
19 changes: 10 additions & 9 deletions lib/config/themes/light.dart
Original file line number Diff line number Diff line change
@@ -1,21 +1,22 @@
import 'package:Organiser/config/colors.dart';
import 'package:flutter/material.dart';

ThemeData lightMode = ThemeData(
primaryColor: Colors.green,
cardTheme: CardTheme(color: Colors.grey.shade200, elevation: 1),
primaryColor: AppColors.primaryLight,
cardTheme: CardTheme(color: AppColors.cardLight, elevation: 1),
drawerTheme: DrawerThemeData(
backgroundColor: Colors.green.shade50,
backgroundColor: AppColors.drawerBackgroundLight,
),
scaffoldBackgroundColor: Colors.white,
scaffoldBackgroundColor: AppColors.scaffoldBackgroundLight,
brightness: Brightness.light,
colorScheme: ColorScheme.light(
background: Colors.grey.shade400,
primary: Colors.green,
secondary: Colors.green.shade50,
background: AppColors.backgroundLight,
primary: AppColors.primaryLight400,
secondary: AppColors.primaryLight50,
),
dialogTheme: DialogTheme(
backgroundColor: Colors.green.shade50.withOpacity(0.95),
backgroundColor: AppColors.dialogBackgroundLight.withOpacity(0.95),
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(50)),
),
shadowColor: Colors.grey.shade200,
shadowColor: AppColors.shadowLight,
);
4 changes: 1 addition & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';

import 'views/services/user_provider.dart';

void main() async {
Expand All @@ -20,7 +19,6 @@ void main() async {
FirebaseFirestore.instance.settings = Settings(
persistenceEnabled: true,
);


runApp(
MultiProvider(
Expand Down Expand Up @@ -62,7 +60,7 @@ class _OrganiserAppState extends State<OrganiserApp> {
statusBarBrightness: themeProvider.themeData.brightness == Brightness.dark
? Brightness.light
: Brightness.dark,
systemStatusBarContrastEnforced: false,
systemStatusBarContrastEnforced: false,
));
return MaterialApp(
theme: themeProvider.themeData,
Expand Down
2 changes: 1 addition & 1 deletion lib/models/common/event.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:Organiser/models/common/meal.dart';
import 'package:flutter/material.dart';

class Event with ChangeNotifier {
class Event {
String id = "";
String priority;
String title;
Expand Down
37 changes: 16 additions & 21 deletions lib/views/pages/forms/add_event.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ import 'package:Organiser/views/widgets/styled/input_adder/ticket.dart';
import 'package:Organiser/views/widgets/styled/input_adder/optionsAppBar.dart';

class CreateEventPage extends StatefulWidget {
final EventModel eventModel;

CreateEventPage(this.eventModel);

@override
_CreateEventPageState createState() => _CreateEventPageState();
}
Expand Down Expand Up @@ -92,7 +88,9 @@ class _CreateEventPageState extends State<CreateEventPage> {
costPerTicketController: _ticketCostController,
),
SizedBox(height: 16.0),
TimezoneAdder(timezoneConroller: _timezoneConroller,)
TimezoneAdder(
timezoneConroller: _timezoneConroller,
)
],
),
),
Expand All @@ -115,23 +113,20 @@ class _CreateEventPageState extends State<CreateEventPage> {

void createEvent() {
Event newEvent = Event(
title: _titleController.text,
priority: _priorityController.text,
notes: _notesController.text,
category: _cartegoryController.text,
tags: _tagsController,
photoURL: _photoUrlController,
dateAndTime: [_dateAndTimeController],
isRepeating: _isRepetingController,
repetition: [_repetitionController],
location: [_locationController],
ticketCost: _ticketCostController.text as double,
numberOfTickets: _ticketsController.text as int,
timezone: _timezoneConroller.text
);
title: _titleController.text,
priority: _priorityController.text,
notes: _notesController.text,
category: _cartegoryController.text,
tags: _tagsController,
photoURL: _photoUrlController,
dateAndTime: [_dateAndTimeController],
isRepeating: _isRepetingController,
repetition: [_repetitionController],
location: [_locationController],
ticketCost: _ticketCostController.text as double,
numberOfTickets: _ticketsController.text as int,
timezone: _timezoneConroller.text);
Navigator.pop(context);
print(" Clicked a function");
widget.eventModel.addEvent(newEvent);
}

void createDraft() {
Expand Down
52 changes: 52 additions & 0 deletions lib/views/pages/forms/add_task.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import 'package:flutter/material.dart';
class CreateTaskPage extends StatefulWidget {
@override
_CreateTaskPageState createState() => _CreateTaskPageState();
}

class _CreateTaskPageState extends State<CreateTaskPage> {
final TextEditingController _titleController = TextEditingController();
final TextEditingController _descriptionController = TextEditingController();

@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextField(
controller: _titleController,
decoration: InputDecoration(
labelText: 'Title',
),
),
SizedBox(height: 16.0),
TextField(
controller: _descriptionController,
decoration: InputDecoration(
labelText: 'Description',
),
maxLines: 3,
),
SizedBox(height: 16.0),
ElevatedButton(
onPressed: () {
_saveTask();
Navigator.pop(context);
},
child: Text('Save'),
),
],
),
);
}

void _saveTask() {
final String title = _titleController.text.trim();
final String description = _descriptionController.text.trim();

// Implement your logic to save the task here
print('Title: $title, Description: $description');
}
}
Loading

0 comments on commit e0003a1

Please sign in to comment.