Skip to content
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
Binary file added main_app/images/LogoBlue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/LogoCyan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/LogoFuchsia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/LogoGreen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/LogoPurple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/LogoRed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box1Blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box1Cyan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added main_app/images/box1Fuchsia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box1Green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box1Purple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box1Red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed main_app/images/box2.jpg
Binary file not shown.
Binary file added main_app/images/box2Blue.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box2Cyan.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box2Fuchsia.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box2Fuchsia.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box2Green.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box2Purple.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added main_app/images/box2Red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion main_app/images/boxLoader.json

This file was deleted.

1 change: 1 addition & 0 deletions main_app/images/boxloadBlue.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions main_app/images/boxloadCyan.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions main_app/images/boxloadFuchsia.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions main_app/images/boxloadGreen.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions main_app/images/boxloadPurple.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions main_app/images/boxloadRed.json

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions main_app/lib/color_options.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import 'package:flutter/material.dart';

class ColorProvider extends ChangeNotifier {
Color _appColor = const Color(0xFFC1007F); // Default color

Color get appColor => _appColor;

void updateColor(Color color) {
_appColor = color;
notifyListeners();
}
}
10 changes: 6 additions & 4 deletions main_app/lib/datebase/FileReader.dart
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
// ignore_for_file: unused_element

import 'dart:async';
import 'dart:io';

import 'IConnectivityChecker.dart';
import 'ICsvManager.dart';
import 'IFileUploader.dart';
import 'IUserManager.dart';
import 'iconnectivity_checker.dart';
import 'icsv_manager.dart';
import 'ifile_uploader.dart';
import 'iuser_manager.dart';

class FileReader {
final List<String> _uploadQueue = [];
Expand Down
9 changes: 0 additions & 9 deletions main_app/lib/datebase/IFileUploader.dart

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:connectivity_plus/connectivity_plus.dart';

import 'IConnectivityChecker.dart';
import 'iconnectivity_checker.dart';

class Connectivitychecker implements IConnectivityChecker {
@override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import 'dart:io';
import 'package:csv/csv.dart';
import 'package:firebase_storage/firebase_storage.dart';
import 'package:path_provider/path_provider.dart';
import 'FileUploader.dart';
import 'ICsvManager.dart';
import 'UserManager.dart';
import 'file_uploader.dart';
import 'icsv_manager.dart';
import 'user_manager.dart';

class CsvManager implements ICsvManager {
@override
Future<void> writeToFile(List<dynamic> row, String client) async {
final directory = await getApplicationDocumentsDirectory();
final file = File('${directory.path}/$client.csv');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import 'dart:io';
import 'package:firebase_storage/firebase_storage.dart';
import 'package:path/path.dart';
import 'package:path_provider/path_provider.dart';
import 'ConnectivityChecker.dart';
import 'IFileUploader.dart';
import 'connectivity_checker.dart';
import 'ifile_uploader.dart';

class FileUploader implements IFileUploader {
@override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'dart:developer';

import 'package:firebase_auth/firebase_auth.dart';

import 'IUserManager.dart';
import 'iuser_manager.dart';

class UserManager implements IUserManager {
@override
Expand Down
9 changes: 7 additions & 2 deletions main_app/lib/design/drawer/AboutDialogContent.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:provider/provider.dart';

import '../../color_options.dart';
import '../../generated/l10n.dart';
import '../textfont.dart';
import 'ContactInfoRow.dart';

class AboutDialogContent extends StatelessWidget {
const AboutDialogContent({super.key});

@override
Widget build(BuildContext context) {
final appColor = Provider.of<ColorProvider>(context).appColor;
return AlertDialog(
title: Row(
mainAxisAlignment: MainAxisAlignment.center,
Expand All @@ -17,7 +22,7 @@ class AboutDialogContent extends StatelessWidget {
child: Image.asset('images/info.png', width: 30, height: 30),
),
Textdesign(S.of(context).about, 25,
fontWeight: FontWeight.w500, color: const Color(0xFFC1007F)),
fontWeight: FontWeight.w500, color: appColor),
],
),
content: Column(
Expand All @@ -36,7 +41,7 @@ class AboutDialogContent extends StatelessWidget {
const SizedBox(height: 30.0),
ContactInfoRow(
iconPath: 'images/github.png',
text: 'https://github.com/M3-Codes/M3-Codes',
text: ('https://github.com/\nM3-Codes/M3-Codes'),
snackBarMessage: S.of(context).aboutus5,
),
GestureDetector(
Expand Down
28 changes: 21 additions & 7 deletions main_app/lib/design/drawer/DefaultUserInfo.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import '../../color_options.dart';

class DefaultUserInfo extends StatelessWidget {
final String userEmail;
Expand All @@ -7,11 +10,25 @@ class DefaultUserInfo extends StatelessWidget {

@override
Widget build(BuildContext context) {
final appColor = Provider.of<ColorProvider>(context).appColor;
String colorName = 'Fuchsia'; // Default color name
if (appColor == const Color(0xFFd32f2f)) {
colorName = 'Red';
} else if (appColor == const Color(0xFF4CAF50)) {
colorName = 'Green';
} else if (appColor == const Color(0xFF2196F3)) {
colorName = 'Blue';
} else if (appColor == const Color(0xFF00BCD4)) {
colorName = 'Cyan';
} else if (appColor == const Color(0xFF9C27B0)) {
colorName = 'Purple';
} else if (appColor == const Color(0xFFC1007F)) {
colorName = 'Fuchsia';
}
return Column(
children: [
const SizedBox(height: 20),
const Icon(Icons.person,
color: Color.fromARGB(255, 147, 1, 98), size: 80),
Icon(Icons.person, color: appColor, size: 80),
const Text('User',
style: TextStyle(fontSize: 25, fontWeight: FontWeight.bold)),
SizedBox(
Expand All @@ -27,11 +44,8 @@ class DefaultUserInfo extends StatelessWidget {
),
),
const SizedBox(height: 10),
const SizedBox(
width: 250,
child:
Divider(thickness: 1, color: Color.fromARGB(255, 147, 1, 98))),
Image.asset('images/Logo.png'),
SizedBox(width: 250, child: Divider(thickness: 1, color: appColor)),
Image.asset('images/Logo$colorName.png'),
],
);
}
Expand Down
8 changes: 5 additions & 3 deletions main_app/lib/design/drawer/LanguageSelectionDialog.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';

import '../../color_options.dart';
import '../../generated/l10n.dart';
import '../../language_provider.dart';
import '../textfont.dart';

class LanguageSelectionDialog extends StatelessWidget {
@override
Widget build(BuildContext context) {
final appColor = Provider.of<ColorProvider>(context).appColor;
return AlertDialog(
title: Text(S.of(context).selectlan),
content: Column(
Expand All @@ -19,23 +21,23 @@ class LanguageSelectionDialog extends StatelessWidget {
.setLocale(const Locale('en'));
Navigator.of(context).pop();
},
child: const Textdesign('English', color: Color(0xFFc10080), 16),
child: Textdesign('English', color: appColor, 16),
),
ElevatedButton(
onPressed: () {
Provider.of<LanguageProvider>(context, listen: false)
.setLocale(const Locale('tr'));
Navigator.of(context).pop();
},
child: const Textdesign('Türkçe', color: Color(0xFFc10080), 16),
child: Textdesign('Türkçe', color: appColor, 16),
),
ElevatedButton(
onPressed: () {
Provider.of<LanguageProvider>(context, listen: false)
.setLocale(const Locale('ar'));
Navigator.of(context).pop();
},
child: const Textdesign('العربية', color: Color(0xFFc10080), 16),
child: Textdesign('العربية', color: appColor, 16),
),
],
),
Expand Down
28 changes: 21 additions & 7 deletions main_app/lib/design/drawer/UserInfoCard.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import '../../color_options.dart';
import 'DefaultUserInfo.dart';

class UserInfoCard extends StatelessWidget {
Expand Down Expand Up @@ -50,11 +52,26 @@ class UserInfo extends StatelessWidget {

@override
Widget build(BuildContext context) {
final appColor = Provider.of<ColorProvider>(context).appColor;
String colorName = 'Fuchsia'; // Default color name
if (appColor == const Color(0xFFd32f2f)) {
colorName = 'Red';
} else if (appColor == const Color(0xFF4CAF50)) {
colorName = 'Green';
} else if (appColor == const Color(0xFF2196F3)) {
colorName = 'Blue';
} else if (appColor == const Color(0xFF00BCD4)) {
colorName = 'Cyan';
} else if (appColor == const Color(0xFF9C27B0)) {
colorName = 'Purple';
} else if (appColor == const Color(0xFFC1007F)) {
colorName = 'Fuchsia';
}

return Column(
children: [
const SizedBox(height: 20),
const Icon(Icons.person,
color: Color.fromARGB(255, 147, 1, 98), size: 80),
Icon(Icons.person, color: appColor, size: 80),
Text(useDataMap['username'],
style: const TextStyle(fontSize: 25, fontWeight: FontWeight.bold)),
SizedBox(
Expand All @@ -70,11 +87,8 @@ class UserInfo extends StatelessWidget {
),
),
const SizedBox(height: 10),
const SizedBox(
width: 250,
child:
Divider(thickness: 1, color: Color.fromARGB(255, 147, 1, 98))),
Image.asset('images/Logo.png'),
SizedBox(width: 250, child: Divider(thickness: 1, color: appColor)),
Image.asset('images/Logo$colorName.png'),
],
);
}
Expand Down
Loading