Skip to content
Snippets Groups Projects
Commit 383ab573 authored by Akara's avatar Akara
Browse files

merge

parents a2b53f8d ddcf33f3
No related branches found
No related tags found
No related merge requests found
Showing
with 170 additions and 74 deletions
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:label="atlub"
android:label="AtClub"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
android:icon="@mipmap/logo_atclub2">
<activity
android:name=".MainActivity"
android:exported="true"
......
atlub/android/app/src/main/res/mipmap-hdpi/logo_atclub.png

133 KiB

atlub/android/app/src/main/res/mipmap-hdpi/logo_atclub2.png

134 KiB

atlub/android/app/src/main/res/mipmap-mdpi/logo_atclub.png

133 KiB

atlub/android/app/src/main/res/mipmap-mdpi/logo_atclub2.png

134 KiB

atlub/android/app/src/main/res/mipmap-xhdpi/logo_atclub.png

133 KiB

atlub/android/app/src/main/res/mipmap-xhdpi/logo_atclub2.png

134 KiB

atlub/android/app/src/main/res/mipmap-xxhdpi/logo_atclub.png

133 KiB

atlub/android/app/src/main/res/mipmap-xxhdpi/logo_atclub2.png

134 KiB

atlub/android/app/src/main/res/mipmap-xxxhdpi/logo_atclub.png

133 KiB

atlub/android/app/src/main/res/mipmap-xxxhdpi/logo_atclub2.png

134 KiB

atlub/assets/images/atclub_writing.png

78.6 KiB

<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="1431.000000pt" height="1262.000000pt" viewBox="0 0 1431.000000 1262.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,1262.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M5235 10484 c-484 -36 -809 -98 -1195 -229 -894 -302 -1732 -952
-2254 -1747 -347 -530 -555 -1127 -631 -1809 -22 -195 -30 -663 -16 -864 55
-767 268 -1404 646 -1932 124 -172 230 -295 392 -453 270 -265 520 -443 855
-611 644 -323 1498 -473 2378 -419 781 49 1335 217 1970 600 283 170 596 388
610 425 14 37 -6 89 -50 129 -44 40 -77 51 -120 42 -16 -3 -101 -52 -187 -109
-185 -122 -268 -169 -458 -265 -424 -212 -927 -357 -1440 -417 -809 -93 -1512
7 -2110 300 -829 406 -1409 1134 -1630 2048 -86 353 -109 577 -110 1027 0 371
8 480 56 765 135 803 507 1552 1049 2109 563 579 1253 936 2030 1050 462 69
1053 29 1502 -100 501 -143 920 -402 1272 -783 424 -460 665 -1024 747 -1751
20 -175 17 -672 -4 -835 -78 -585 -270 -1042 -613 -1460 -352 -430 -767 -655
-1214 -658 -152 -2 -214 16 -279 81 -129 130 -99 323 193 1237 120 376 317
964 499 1490 111 320 425 1212 442 1258 7 16 -21 17 -506 17 l-514 0 -38 -112
c-63 -182 -54 -172 -82 -103 -65 160 -183 263 -355 312 -86 24 -370 24 -510 0
-385 -66 -732 -227 -1100 -513 -143 -111 -438 -403 -554 -549 -99 -124 -288
-405 -363 -540 -236 -424 -392 -859 -454 -1265 -26 -177 -36 -480 -19 -631 45
-412 211 -685 505 -828 195 -95 391 -133 690 -134 198 -1 216 1 310 26 310 84
591 312 828 672 32 50 60 91 61 92 1 1 0 -57 -2 -129 -3 -83 0 -152 8 -187 56
-251 277 -407 662 -468 153 -24 573 -24 731 0 595 91 1074 338 1497 774 221
226 371 440 529 753 268 530 364 968 332 1514 -26 424 -93 746 -228 1091 -283
722 -838 1317 -1568 1682 -413 207 -880 336 -1405 388 -145 15 -674 27 -785
19z m780 -2005 c61 -17 119 -83 145 -166 79 -253 14 -754 -179 -1395 -375
-1242 -791 -2016 -1222 -2271 -122 -72 -278 -100 -359 -65 -155 66 -233 352
-217 793 21 565 169 1147 454 1785 277 619 584 1031 905 1213 158 90 364 136
473 106z"/>
<path d="M9805 5460 c-51 -17 -259 -70 -333 -86 -19 -4 -23 -10 -20 -32 3 -26
5 -27 60 -24 70 4 93 -7 110 -55 19 -56 19 -1473 0 -1520 -15 -33 -52 -53
-102 -53 -32 0 -59 -25 -43 -41 17 -17 571 -18 578 -1 10 26 -7 42 -44 42 -57
0 -104 29 -113 70 -5 19 -7 413 -6 875 1 724 0 840 -13 842 -8 1 -41 -7 -74
-17z"/>
<path d="M11730 5439 c-52 -15 -131 -36 -175 -44 -111 -23 -127 -30 -123 -58
3 -20 9 -22 69 -25 114 -5 104 69 104 -761 0 -394 -2 -763 -5 -821 l-5 -105
26 -3 c21 -2 44 11 99 57 40 34 78 61 84 61 6 0 43 -24 83 -54 90 -68 150 -88
262 -89 161 -1 282 46 386 148 109 108 165 256 165 440 0 180 -54 326 -159
433 -100 102 -223 148 -376 140 -102 -5 -182 -45 -257 -127 l-51 -56 5 448 6
447 -22 -1 c-11 0 -64 -14 -116 -30z m488 -816 c123 -58 192 -219 192 -448 0
-172 -36 -306 -108 -400 -103 -135 -276 -134 -377 3 -59 80 -65 116 -65 389 0
148 4 262 11 289 13 50 82 135 133 161 69 36 146 38 214 6z"/>
<path d="M8854 4746 c-104 -24 -172 -63 -259 -151 -134 -133 -182 -264 -172
-465 9 -166 57 -281 162 -385 104 -104 217 -148 380 -148 183 0 326 74 416
215 31 49 32 51 14 64 -10 8 -23 14 -27 14 -5 0 -36 -29 -68 -64 -80 -85 -136
-110 -250 -110 -76 -1 -91 2 -139 29 -140 77 -206 227 -204 460 3 294 107 475
274 475 36 0 47 -6 81 -42 22 -24 59 -72 82 -108 67 -105 138 -126 189 -58 28
38 36 138 13 173 -53 81 -331 138 -492 101z"/>
<path d="M10450 4740 c-29 -8 -115 -23 -318 -56 -29 -4 -33 -8 -30 -32 3 -25
7 -27 49 -28 25 0 57 -4 70 -7 51 -13 53 -33 54 -422 0 -354 0 -361 23 -411
61 -134 222 -208 398 -183 110 15 195 68 265 163 l29 39 0 -101 c0 -90 2 -102
18 -102 19 0 270 27 347 38 41 6 50 11 50 27 0 16 -9 21 -55 28 -71 10 -97 28
-107 74 -4 21 -8 251 -7 511 1 310 -3 472 -9 472 -6 0 -83 -14 -171 -30 -89
-17 -179 -34 -201 -38 -34 -6 -40 -11 -40 -32 0 -24 3 -25 70 -30 103 -7 100
4 100 -375 l0 -310 -30 -58 c-60 -120 -170 -183 -271 -158 -67 17 -90 36 -121
99 l-28 57 -1 435 -2 435 -23 2 c-13 1 -40 -3 -59 -7z"/>
</g>
</svg>
atlub/assets/images/logo_atclub.png

154 KiB

<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
width="1431.000000pt" height="1262.000000pt" viewBox="0 0 1431.000000 1262.000000"
preserveAspectRatio="xMidYMid meet">
<g transform="translate(0.000000,1262.000000) scale(0.100000,-0.100000)"
fill="#000000" stroke="none">
<path d="M1294 11410 c-11 -4 -26 -21 -33 -37 -12 -30 -23 30 264 -1488 31
-165 63 -310 71 -322 8 -13 24 -29 37 -37 18 -12 535 -108 1329 -247 176 -31
206 -30 227 10 6 11 11 32 11 47 0 26 -226 1488 -236 1531 -3 12 -14 29 -24
38 -19 17 -1578 516 -1608 514 -10 0 -26 -4 -38 -9z"/>
<path d="M4920 11165 c-388 -68 -763 -133 -834 -144 -70 -11 -138 -27 -151
-35 -13 -8 -28 -30 -34 -48 -14 -44 -301 -1514 -301 -1543 0 -12 9 -34 21 -49
16 -21 29 -26 63 -26 37 0 672 84 1276 170 240 33 233 30 275 163 14 45 132
411 261 812 129 402 237 735 238 740 2 6 -3 23 -11 38 -14 28 -49 48 -81 46
-9 -1 -334 -57 -722 -124z"/>
<path d="M3353 9024 c-36 -18 -58 -62 -50 -102 3 -16 94 -197 203 -403 353
-671 3425 -6453 3457 -6507 37 -62 75 -87 124 -79 19 4 353 195 793 456 417
248 763 452 769 453 6 2 282 -402 614 -897 559 -834 605 -900 633 -903 19 -2
36 4 46 15 9 10 342 776 739 1703 397 927 732 1699 743 1717 12 18 32 34 48
37 34 7 2166 1154 2190 1178 23 23 23 79 1 107 -18 21 -585 201 -8073 2556
-2173 683 -2179 685 -2193 685 -7 0 -26 -7 -44 -16z m4659 -2651 c2469 -1360
3317 -1832 3314 -1843 -19 -59 -1362 -3170 -1364 -3159 -3 15 240 1888 260
2002 13 80 -7 517 -26 554 -6 12 -1262 965 -2791 2118 -1529 1153 -2782 2103
-2783 2111 -7 29 7 44 39 44 24 0 883 -469 3351 -1827z"/>
<path d="M1522 8832 c-12 -2 -33 -18 -45 -35 -21 -28 -258 -509 -639 -1296
-65 -135 -118 -255 -118 -268 0 -13 12 -36 26 -50 l26 -26 482 8 c264 4 658
10 873 14 l393 6 25 26 c20 20 84 192 281 759 140 403 254 743 254 755 0 37
-10 55 -40 70 -22 11 -149 16 -646 24 -340 6 -671 12 -734 14 -63 1 -125 1
-138 -1z"/>
</g>
</svg>
import 'package:atlub/Mods/Profil_assets/profile_card2.0.dart';
import 'package:atlub/Pages/Formulaires/modify_profile.dart';
import 'package:flutter/material.dart';
import '../../Pages/Formulaires/modify_profile.dart';
import '../../Pages/Formulaires/modify_statut.dart';
import '../Theme_colors/colors.dart';
import 'package:atlub/userprovider.dart';
import 'package:provider/provider.dart';
......@@ -48,7 +47,7 @@ class CardHolder extends StatelessWidget {
onTap: () {
Navigator.push(
context,
MaterialPageRoute(builder: (context) => ModStatut(idProfil: userid, profilData: profilData)),
MaterialPageRoute(builder: (context) => ModifyProfile(idProfil: userid)),//ModStatut(idProfil: userid, profilData: profilData)),
);
},
child: Padding(
......
import 'package:atlub/Mods/Theme_colors/colors.dart';
import 'package:flutter/material.dart';
class ChatBubble extends StatelessWidget {
final widget;
final String auteur;
final alignmentColumn;
final Color color;
const ChatBubble({super.key, this.widget, required this.auteur, this.alignmentColumn, required this.color});
@override
Widget build(BuildContext context) {
return Column(
crossAxisAlignment: alignmentColumn,
children: [
Padding(
padding: const EdgeInsets.symmetric(horizontal: 9.0),
child: Text(auteur, style: TextStyle(color: AppColor.darkBlue),),
),
Container(
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(20),
color: color
),
child: widget,
)
],
);
}
}
......@@ -7,6 +7,8 @@ import '../Pages/profil2.0.dart';
import 'package:atlub/Services/authservice.dart';
import 'Theme_colors/colors.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter_svg/svg.dart';
Widget buildDrawer() {
User? user= FirebaseAuth.instance.currentUser;
......@@ -22,14 +24,9 @@ import 'package:firebase_auth/firebase_auth.dart';
color: AppColor.turquoiseBlue,
child: ListView(
children: [
const DrawerHeader(
DrawerHeader(
child: Center(
child: Text("LOGO",
style: TextStyle(
fontSize: 40,
color: Colors.white
),
),
child: Image.asset('assets/images/atclub_writing.png')
),
),
ListTile(
......
import 'dart:async';
import 'package:atlub/Mods/forms_assets/send_button.dart';
import 'package:atlub/Services/database.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class SelectClub extends StatefulWidget {
final Map<String, Map<String, dynamic>> clubs;
const SelectClub({super.key, required this.clubs});
@override
State<SelectClub> createState() => _SelectClubState();
}
class _SelectClubState extends State<SelectClub> {
final List<String> selectedClubs = [];
Map<String, Map<String, dynamic>> get clubs => widget.clubs;
void _clubsSelection(String club, bool isSelected){
setState(() {
if(isSelected){
selectedClubs.add(club);
}
else{
selectedClubs.remove(club);
}
});
}
Future<void> selectionner() async{
//UserProvider userProvider = UserProvider();
DatabaseService db = DatabaseService();
String? uid= FirebaseAuth.instance.currentUser?.uid;
await db.updatefiltre( uid!, selectedClubs);
print("updatenormalement");
Navigator.pop(context, selectedClubs);
selectedClubs.clear();
}
@override
Widget build(BuildContext context) {
return Column(
children: [
ListBody(
children: widget.clubs.keys.toList().map((club)=>CheckboxListTile(
value: selectedClubs.contains(club),
title: Text(clubs[club]?['nom']),
onChanged: (isChecked) => _clubsSelection(club, isChecked!),
)).toList(),
),
SendButton(onTap: selectionner),
],
);
}
}
import 'package:flutter/material.dart';
import 'Theme_colors/colors.dart';
class HeadBureauxFiltres extends StatelessWidget {
final String bdx;
final Color color1;
final Color color2;
const HeadBureauxFiltres({super.key, required this.bdx, required this.color1, required this.color2});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: Container(
alignment: Alignment.centerLeft,
padding: EdgeInsets.all(12),
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft, // Début du dégradé
end: Alignment.bottomRight, // Fin du dégradé
colors: [
color1, // Couleur du dégradé au début
color2, // Couleur du dégradé à la fin
],
),
borderRadius: BorderRadius.circular(15.0), // Arrondi les coins du conteneur
),
child: Text(bdx, style: TextStyle(color: AppColor.white, fontSize: 15, fontWeight: FontWeight.bold),),
),
);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment