Skip to content

Commit 65b9b42

Browse files
rullyalvesrullyalves
committed
add features
1 parent 177e7e4 commit 65b9b42

42 files changed

Lines changed: 1451 additions & 668 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.flutter-plugins-dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"image_picker","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher-5.7.10\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.11\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.7+3\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher-5.7.10\\\\","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+9\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_macos-0.0.1+9\\\\","dependencies":[]}],"linux":[{"name":"url_launcher_linux","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_linux-0.0.1+4\\\\","dependencies":[]}],"windows":[{"name":"url_launcher_windows","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_windows-0.0.1+3\\\\","dependencies":[]}],"web":[{"name":"shared_preferences_web","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_web-0.1.5+1\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"shared_preferences","dependencies":["shared_preferences_macos","shared_preferences_web"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2021-02-22 22:11:54.686592","version":"1.22.5"}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"geolocator","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-6.2.1\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":[]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.12+4\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher-5.7.10\\\\","dependencies":[]}],"android":[{"name":"flutter_plugin_android_lifecycle","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\flutter_plugin_android_lifecycle-1.0.11\\\\","dependencies":[]},{"name":"geolocator","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator-6.2.1\\\\","dependencies":[]},{"name":"image_picker","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\image_picker-0.6.7+22\\\\","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"shared_preferences","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences-0.5.12+4\\\\","dependencies":[]},{"name":"url_launcher","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher-5.7.10\\\\","dependencies":[]}],"macos":[{"name":"shared_preferences_macos","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_macos-0.0.1+11\\\\","dependencies":[]},{"name":"url_launcher_macos","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_macos-0.0.1+9\\\\","dependencies":[]}],"linux":[{"name":"path_provider_linux","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_linux-0.0.1+2\\\\","dependencies":[]},{"name":"shared_preferences_linux","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_linux-0.0.2+4\\\\","dependencies":["path_provider_linux"]},{"name":"url_launcher_linux","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_linux-0.0.1+4\\\\","dependencies":[]}],"windows":[{"name":"path_provider_windows","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\path_provider_windows-0.0.4+3\\\\","dependencies":[]},{"name":"shared_preferences_windows","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_windows-0.0.2+3\\\\","dependencies":["path_provider_windows"]},{"name":"url_launcher_windows","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_windows-0.0.1+3\\\\","dependencies":[]}],"web":[{"name":"geolocator_web","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\geolocator_web-1.0.1\\\\","dependencies":[]},{"name":"shared_preferences_web","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\shared_preferences_web-0.1.2+7\\\\","dependencies":[]},{"name":"url_launcher_web","path":"C:\\\\flutter\\\\.pub-cache\\\\hosted\\\\pub.dartlang.org\\\\url_launcher_web-0.1.5+3\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"geolocator","dependencies":["geolocator_web"]},{"name":"geolocator_web","dependencies":[]},{"name":"image_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]},{"name":"url_launcher","dependencies":["url_launcher_web","url_launcher_linux","url_launcher_macos","url_launcher_windows"]},{"name":"url_launcher_linux","dependencies":[]},{"name":"url_launcher_macos","dependencies":[]},{"name":"url_launcher_web","dependencies":[]},{"name":"url_launcher_windows","dependencies":[]}],"date_created":"2021-02-28 06:35:45.438634","version":"1.26.0-17.8.pre"}

‎ios/Flutter/flutter_export_environment.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ export "FLUTTER_APPLICATION_PATH=C:\Users\rully.alves\3D Objects\bailaki-app-v2"
55
export "FLUTTER_TARGET=lib\main.dart"
66
export "FLUTTER_BUILD_DIR=build"
77
export "SYMROOT=${SOURCE_ROOT}/../build\ios"
8-
export "OTHER_LDFLAGS=$(inherited) -framework Flutter"
9-
export "FLUTTER_FRAMEWORK_DIR=C:\flutter\bin\cache\artifacts\engine\ios"
108
export "FLUTTER_BUILD_NAME=1.0.0"
119
export "FLUTTER_BUILD_NUMBER=1"
1210
export "DART_OBFUSCATION=false"

‎lib/app/data/models/deslike_dto.dart‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
class DeslikeDto {
2+
final int currentUserPartnerId;
3+
final int friendPartnerId;
4+
5+
DeslikeDto(this.currentUserPartnerId, this.friendPartnerId);
6+
}

‎lib/app/data/models/login_result.dart‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import 'package:odoo_client/app/data/pojo/music_genre.dart';
2+
import 'package:odoo_client/app/data/pojo/music_skill.dart';
3+
import 'package:odoo_client/app/data/services/login_facade_impl.dart';
4+
5+
class LoginResult {
6+
final UserProfile userProfile;
7+
final List<MusicSkill> musicSkills;
8+
final List<MusicGenre> musicGenres;
9+
10+
LoginResult(
11+
this.userProfile,
12+
this.musicSkills,
13+
this.musicGenres,
14+
);
15+
}

‎lib/app/data/models/memory_image.dart‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
class MemoryImage {
2+
final int id;
3+
final List<int> image;
4+
5+
MemoryImage({this.id, this.image});
6+
7+
factory MemoryImage.fromJson(Map<String, dynamic> json) {
8+
return MemoryImage(
9+
id: json["id"], image: json["image"] is! bool ? json["image"] : null);
10+
}
11+
}

‎lib/app/data/models/profile_dto.dart‎

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,68 @@
1+
import 'package:latlng/latlng.dart';
2+
import 'package:odoo_client/app/data/models/memory_image.dart';
3+
14
class ProfileDto {
25
final String profile_description;
36
final List<int> music_genre_ids;
47
final int music_skill_id;
58
final String function;
69
final DateTime birthdate_date;
710
final String gender;
11+
final int refferedFriendMaxDistance;
12+
final String city;
13+
final String activityState;
14+
final LatLng latLng;
15+
final bool interestMales;
16+
final bool interestFemales;
17+
final bool interestOtherGenres;
18+
final List<MemoryImage> images;
819

9-
ProfileDto({
10-
this.profile_description,
11-
this.music_genre_ids,
12-
this.music_skill_id,
13-
this.function,
14-
this.birthdate_date,
15-
this.gender,
16-
});
20+
ProfileDto(
21+
{this.interestMales,
22+
this.interestFemales,
23+
this.interestOtherGenres,
24+
this.city,
25+
this.activityState,
26+
this.latLng,
27+
this.refferedFriendMaxDistance,
28+
this.profile_description,
29+
this.music_genre_ids,
30+
this.music_skill_id,
31+
this.function,
32+
this.birthdate_date,
33+
this.gender,
34+
this.images});
1735

1836
factory ProfileDto.fromJson(Map<String, dynamic> json) {
1937
return ProfileDto(
2038
birthdate_date:
2139
json['birthdate_date'] is! bool ? json['birthdate_date'] : null,
2240
function: json['function'] is! bool ? json['function'] : null,
2341
gender: json['gender'] is! bool ? json['gender'] : null,
24-
music_genre_ids:
25-
json['music_genre_ids'] is! bool ? List<int>.from(json['music_genre_ids']): null,
42+
music_genre_ids: json['music_genre_ids'] is! bool
43+
? List<int>.from(json['music_genre_ids'])
44+
: null,
2645
music_skill_id:
27-
json['music_skill_id'] is! bool ? json['music_skill_id'] : null,
46+
json['music_skill_id'] is! bool ? json['music_skill_id'][0] : null,
2847
profile_description: json['profile_description'] is! bool
2948
? json['profile_description']
30-
: null);
49+
: null,
50+
refferedFriendMaxDistance: json['referred_friend_max_distance'] is! bool
51+
? json['referred_friend_max_distance']
52+
: 0,
53+
city: json["city"] is! bool ? json["city"] : "N/A",
54+
activityState:
55+
json["activity_state"] is! bool ? json["activity_state"] : "N/A",
56+
latLng: json["partner_current_latitude"] is! bool &&
57+
json["partner_current_longitude"] is! bool
58+
? LatLng(
59+
json["partner_current_latitude"],
60+
json["partner_current_longitude"],
61+
)
62+
: null,
63+
interestFemales: json["interest_female_gender"],
64+
interestMales: json["interest_male_gender"],
65+
interestOtherGenres: json["interest_other_genres"],
66+
images: json["images"].map<MemoryImage>((e) => MemoryImage.fromJson(e)).toList());
3167
}
3268
}

‎lib/app/data/models/update_profile_dto.dart‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,16 @@ class UpdateProfileDto {
66
final String function;
77
final DateTime birthdate_date;
88
final String gender;
9+
final int refferedFriendMaxDistance;
10+
final bool interestMaleGender;
11+
final bool interestFemaleGender;
12+
final bool interestOtherGenres;
913

1014
UpdateProfileDto({
15+
this.interestMaleGender,
16+
this.interestFemaleGender,
17+
this.interestOtherGenres,
18+
this.refferedFriendMaxDistance,
1119
this.profile_description,
1220
this.music_genre_ids,
1321
this.music_skill_id,
@@ -18,11 +26,20 @@ class UpdateProfileDto {
1826
});
1927

2028
Map<String, dynamic> toJson() => {
21-
'profile_description': profile_description,
22-
'music_genre_ids': music_genre_ids,
23-
'music_skill_id': music_skill_id,
24-
'function': function,
25-
'birthdate_date': birthdate_date,
26-
'gender': gender
29+
if (refferedFriendMaxDistance != null)
30+
'reffered_friend_max_distance': refferedFriendMaxDistance,
31+
if (interestMaleGender != null)
32+
'interest_male_gender': interestMaleGender,
33+
if (interestFemaleGender != null)
34+
'interest_female_gender': interestFemaleGender,
35+
if (interestOtherGenres != null)
36+
'interest_other_genres': interestOtherGenres,
37+
if (profile_description != null)
38+
'profile_description': profile_description,
39+
if (music_genre_ids != null) 'music_genre_ids': music_genre_ids,
40+
if (music_skill_id != null) 'music_skill_id': music_skill_id,
41+
if (function != null) 'function': function,
42+
if (birthdate_date != null) 'birthdate_date': birthdate_date,
43+
if (gender != null) 'gender': gender
2744
};
2845
}

‎lib/app/data/pojo/partner_detail.dart‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,65 @@
1+
import 'package:latlng/latlng.dart';
2+
import 'package:odoo_client/app/data/models/memory_image.dart';
3+
14
class PartnerDetail {
25
final int age;
36
final String bio;
47
final String name;
58
final String email;
69
final String phone;
7-
final String mobile;
8-
final String street;
9-
final String street2;
1010
final String city;
11-
final String stateId;
12-
final String zip;
1311
final String title;
1412
final String website;
1513
final String jobPosition;
1614
final String country;
17-
final String imageUrl;
18-
final String birth;
15+
final DateTime birthdate;
1916
final String gender;
17+
final String activityState;
18+
final LatLng position;
19+
final List<MemoryImage> images;
2020

21-
PartnerDetail({
22-
this.age,
23-
this.bio,
24-
this.name,
25-
this.email,
26-
this.phone,
27-
this.mobile,
28-
this.street,
29-
this.street2,
30-
this.city,
31-
this.stateId,
32-
this.zip,
33-
this.title,
34-
this.website,
35-
this.jobPosition,
36-
this.country,
37-
this.imageUrl,
38-
this.birth,
39-
this.gender,
40-
});
21+
PartnerDetail(
22+
{this.position,
23+
this.activityState,
24+
this.age,
25+
this.bio,
26+
this.name,
27+
this.email,
28+
this.phone,
29+
this.city,
30+
this.title,
31+
this.website,
32+
this.jobPosition,
33+
this.country,
34+
this.birthdate,
35+
this.gender,
36+
this.images});
4137

4238
factory PartnerDetail.fromJson(Map<String, dynamic> json) {
4339
return PartnerDetail(
4440
age: json["age"] is! bool ? json['age'] : "N/A",
4541
bio: json["comment"] is! bool ? json["comment"] : "N/A",
4642
name: json["name"],
47-
email: json["email"] is! bool ? json["email"] : "N/A",
43+
email: json["email"] is! bool ? json["email"] : "N/A",
4844
phone: json['phone'] is! bool ? json['phone'] : "N/A",
49-
mobile: json['mobile'] is! bool ? json['mobile'] : "N/A",
50-
street: json['street'] is! bool ? json['street'] : "",
51-
street2: json['street2'] is! bool ? json['street2'] : "",
5245
city: json['city'] is! bool ? json['city'] : "",
53-
stateId: json['state_id'] is! bool ? json['state_id'][1] : "",
54-
zip: json['zip'] is! bool ? json['zip'] : "",
5546
title: json['title'] is! bool ? json['title'][1] : "N/A",
5647
website: json['website'] is! bool ? json['website'] : "N/A",
5748
jobPosition: json['function'] is! bool ? json['function'] : "N/A",
58-
country: json["country_id"] is! bool ? json["country_id"][1] : "N/A",
59-
imageUrl: '',
60-
birth: json['birthdate_date'] is! bool ? json['birthdate_date'] : "N/A",
61-
gender: json['gender'] is! bool ? json['gender'] : "N/A");
49+
birthdate:
50+
json['birthdate_date'] is! bool && json['birthdate_date'] != null
51+
? json['birthdate_date']
52+
: null,
53+
gender: json['gender'] is! bool ? json['gender'] : "N/A",
54+
activityState:
55+
json['activity_state'] is! bool ? json['activity_state'] : "N/A",
56+
position: json["partner_current_latitude"] is! bool &&
57+
json["partner_current_longitude"] is! bool
58+
? LatLng(
59+
json["partner_current_latitude"],
60+
json["partner_current_longitude"],
61+
)
62+
: null,
63+
images: json["images"].map<MemoryImage>((e) => MemoryImage.fromJson(e)).toList());
6264
}
6365
}

‎lib/app/data/pojo/partners.dart‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,31 @@
1+
import 'package:latlng/latlng.dart';
12

23
class Partner {
34
int id;
45
String name;
56
String imageUrl;
6-
String email;
7-
String phone;
8-
String address;
9-
String birth;
10-
String gender;
7+
DateTime birthdate;
118

12-
Partner(
13-
{this.id,
14-
this.name,
15-
this.imageUrl,
16-
this.email,
17-
this.phone,
18-
this.address,
19-
this.birth,
20-
this.gender});
9+
Partner({
10+
this.id,
11+
this.name,
12+
this.imageUrl,
13+
this.birthdate,
14+
});
2115

16+
/*
17+
'name',
18+
'birthdate_date'
19+
'partner_current_latitude',
20+
'partner_current_longitude',
21+
*/
2222
Partner.fromJson(Map<String, dynamic> json) {
2323
id = json["id"];
24-
email = json["email"] is! bool ? json["email"] : "N/A";
2524
name = json["name"];
26-
phone = json["phone"] is! bool ? json["phone"] : "N/A";
25+
birthdate =
26+
json["birthdate_date"] is! bool && json["birthdate_date"] != null
27+
? DateTime.parse(json["birthdate"])
28+
: null;
2729
imageUrl =
2830
'https://assets.b9.com.br/wp-content/uploads/2020/09/Batman-issue86-heder-1280x677.jpg';
2931

‎lib/app/data/services/login_facade.dart‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:odoo_client/app/data/models/login_dto.dart';
2+
import 'package:odoo_client/app/data/models/login_result.dart';
23
import 'package:odoo_client/app/data/services/login_facade_impl.dart';
34

45
abstract class LoginFacade{
5-
Future<UserProfile> login(LoginDto loginDto);
6+
Future<LoginResult> login(LoginDto loginDto);
67
}

0 commit comments

Comments
 (0)