Skip to content

Commit

Permalink
Merge pull request #237 from Hash-Studios/v2.6.8-beta
Browse files Browse the repository at this point in the history
V2.6.8 beta
  • Loading branch information
codenameakshay authored Aug 8, 2021
2 parents 6277c24 + 60b2af9 commit 955477d
Show file tree
Hide file tree
Showing 111 changed files with 4,339 additions and 2,286 deletions.
Binary file added assets/images/ref.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion lib/auth/badgeModel.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:Prism/logger/logger.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:json_annotation/json_annotation.dart';
Expand Down Expand Up @@ -33,7 +34,7 @@ class Badge {
required this.color,
required this.url,
}) {
debugPrint("Default constructor !!!!");
logger.d("Default constructor !!!!");
}

factory Badge.fromJson(Map<String, dynamic> json) => _$BadgeFromJson(json);
Expand Down
19 changes: 11 additions & 8 deletions lib/auth/google_auth.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:Prism/analytics/analytics_service.dart';
import 'package:Prism/auth/userModel.dart';
import 'package:Prism/logger/logger.dart';
import 'package:Prism/payments/upgrade.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
Expand Down Expand Up @@ -50,8 +51,8 @@ class GoogleAuth {
if (user != null) {
final List<DocumentSnapshot?> usersData = await getUsersData(user);
// User exists in both. Therefore go ahead with the new collection, and forget the old one.
print("USERDATA0 ${usersData[0]}");
print("USERDATA1 ${usersData[1]}");
logger.d("USERDATA0 ${usersData[0]}");
logger.d("USERDATA1 ${usersData[1]}");
if (usersData[0] != null && usersData[1] != null) {
final doc = usersData[1]!;
globals.prismUser = PrismUsersV2.fromDocumentSnapshot(doc, user);
Expand All @@ -62,7 +63,7 @@ class GoogleAuth {
'lastLoginAt': DateTime.now().toUtc().toIso8601String(),
'loggedIn': true,
});
print("USERDATA CASE1 ${globals.prismUser.toJson()}");
logger.d("USERDATA CASE1 ${globals.prismUser.toJson()}");
}
// User exists in old database. Copy/create him in the new db.
else if (usersData[0] != null && usersData[1] == null) {
Expand All @@ -72,7 +73,7 @@ class GoogleAuth {
.collection(USER_NEW_COLLECTION)
.doc(globals.prismUser.id)
.set(globals.prismUser.toJson());
print("USERDATA CASE2 ${globals.prismUser.toJson()}");
logger.d("USERDATA CASE2 ${globals.prismUser.toJson()}");
}
// User exists in new database. Simply sign him in.
else if (usersData[0] == null && usersData[1] != null) {
Expand All @@ -85,7 +86,7 @@ class GoogleAuth {
'lastLoginAt': DateTime.now().toUtc().toIso8601String(),
'loggedIn': true,
});
print("USERDATA CASE3 ${globals.prismUser.toJson()}");
logger.d("USERDATA CASE3 ${globals.prismUser.toJson()}");
}
// User exists in none. Create new data in new db and sign him in.
else {
Expand All @@ -107,12 +108,13 @@ class GoogleAuth {
coins: 0,
subPrisms: [],
transactions: [],
coverPhoto: "",
);
FirebaseFirestore.instance
.collection(USER_NEW_COLLECTION)
.doc(globals.prismUser.id)
.set(globals.prismUser.toJson());
print("USERDATA CASE4 ${globals.prismUser.toJson()}");
logger.d("USERDATA CASE4 ${globals.prismUser.toJson()}");
}

await prefs.put('prismUserV2', globals.prismUser);
Expand Down Expand Up @@ -154,18 +156,19 @@ class GoogleAuth {
coins: 0,
subPrisms: [],
transactions: [],
coverPhoto: "",
);
Hive.openBox('prefs').then((value) {
value.put('prismUserV2', globals.prismUser);
});
await Purchases.reset();
debugPrint("User Sign Out");
logger.d("User Sign Out");
return true;
}

Future<bool> isSignedIn() async {
await googleSignIn.isSignedIn().then((value) {
debugPrint(value.toString());
logger.d(value.toString());
return value;
});
return false;
Expand Down
3 changes: 2 additions & 1 deletion lib/auth/transactionModel.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:Prism/logger/logger.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
import 'package:json_annotation/json_annotation.dart';
Expand Down Expand Up @@ -33,7 +34,7 @@ class PrismTransaction {
required this.by,
required this.processedAt,
}) {
debugPrint("Default constructor !!!!");
logger.d("Default constructor !!!!");
}

factory PrismTransaction.fromJson(Map<String, dynamic> json) =>
Expand Down
39 changes: 38 additions & 1 deletion lib/auth/userModel.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:Prism/auth/badgeModel.dart';
import 'package:Prism/auth/transactionModel.dart';
import 'package:Prism/logger/logger.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:firebase_auth/firebase_auth.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -47,6 +48,8 @@ class PrismUsersV2 {
List<PrismTransaction> transactions;
@HiveField(16)
String name;
@HiveField(17)
String? coverPhoto;

PrismUsersV2({
required this.username,
Expand All @@ -66,8 +69,9 @@ class PrismUsersV2 {
required this.coins,
required this.transactions,
required this.name,
this.coverPhoto,
}) {
debugPrint("Default constructor !!!!");
logger.d("Default constructor !!!!");
}

factory PrismUsersV2.fromJson(Map<String, dynamic> json) =>
Expand Down Expand Up @@ -98,6 +102,39 @@ class PrismUsersV2 {
transactions: (doc.data()!['transactions'] as List<dynamic> ?? [])
.map((e) => PrismTransaction.fromJson(e as Map<String, dynamic>))
.toList(),
coverPhoto: doc.data()!["coverPhoto"]?.toString(),
);

// factory PrismUsersV2.fromDocumentSnapshotWithoutUser(DocumentSnapshot doc) =>
// PrismUsersV2(
// name: (doc.data()!["name"] ?? "").toString(),
// username: (doc.data()!["username"] ?? "")
// .toString()
// .replaceAll(RegExp(r"(?: |[^\w\s])+"), ""),
// email: (doc.data()!["email"] ?? "").toString(),
// id: doc.data()!["id"].toString(),
// createdAt: DateTime.fromMillisecondsSinceEpoch(
// (doc.data()!["createdAt"] as Timestamp).millisecondsSinceEpoch)
// .toUtc()
// .toIso8601String(),
// premium: doc.data()!["premium"] as bool,
// lastLoginAt: doc.data()!["lastLoginAt"]?.toString() ??
// DateTime.now().toUtc().toIso8601String(),
// links: doc.data()!["links"] as Map<String, dynamic> ?? {},
// followers: doc.data()!["followers"] as List ?? [],
// following: doc.data()!["following"] as List ?? [],
// profilePhoto: (doc.data()!["profilePhoto"] ?? "").toString(),
// bio: (doc.data()!["bio"] ?? "").toString(),
// loggedIn: true,
// badges: (doc.data()!['badges'] as List<dynamic> ?? [])
// .map((e) => Badge.fromJson(e as Map<String, dynamic>))
// .toList(),
// subPrisms: doc.data()!['subPrisms'] as List<dynamic> ?? [],
// coins: doc.data()!['coins'] as int ?? 0,
// transactions: (doc.data()!['transactions'] as List<dynamic> ?? [])
// .map((e) => PrismTransaction.fromJson(e as Map<String, dynamic>))
// .toList(),
// coverPhoto: doc.data()!["coverPhoto"]?.toString(),
// );
Map<String, dynamic> toJson() => _$PrismUsersV2ToJson(this);
}
9 changes: 7 additions & 2 deletions lib/auth/userModel.g.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 5 additions & 4 deletions lib/auth/userOldModel.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:Prism/auth/google_auth.dart';
import 'package:Prism/logger/logger.dart';
import 'package:cloud_firestore/cloud_firestore.dart';
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
Expand Down Expand Up @@ -47,7 +48,7 @@ class PrismUsers {
required this.bio,
required this.loggedIn,
}) {
debugPrint("Default constructor !!!!");
logger.d("Default constructor !!!!");
}

PrismUsers.withSave({
Expand All @@ -64,7 +65,7 @@ class PrismUsers {
required this.bio,
required this.loggedIn,
}) {
debugPrint("With Save constructor !!!!");
logger.d("With Save constructor !!!!");
FirebaseFirestore.instance.collection(USER_NEW_COLLECTION).doc(id).update({
'bio': bio,
'username': username,
Expand Down Expand Up @@ -93,7 +94,7 @@ class PrismUsers {
this.profilePhoto = "",
this.loggedIn = false,
}) {
debugPrint("initial constructor !!!!");
logger.d("initial constructor !!!!");
}

PrismUsers.withoutSave({
Expand All @@ -110,7 +111,7 @@ class PrismUsers {
required this.bio,
required this.loggedIn,
}) {
debugPrint("Without save constructor !!!!");
logger.d("Without save constructor !!!!");
FirebaseFirestore.instance.collection(USER_NEW_COLLECTION).doc(id).update({
'bio': bio,
'username': username,
Expand Down
111 changes: 111 additions & 0 deletions lib/auth/wallpaperModel.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
// import 'package:Prism/auth/badgeModel.dart';
// import 'package:Prism/auth/transactionModel.dart';
// import 'package:cloud_firestore/cloud_firestore.dart';
// import 'package:firebase_auth/firebase_auth.dart';
// import 'package:flutter/material.dart';
// import 'package:hive/hive.dart';
// import 'package:json_annotation/json_annotation.dart';

// part 'wallpaperModel.g.dart';

// enum WallpaperProvider { Prism, Wallhaven, Pexels }

// extension WallExtension on WallpaperProvider {
// String get name {
// return this.toString().split('.').last;
// }
// }

// @HiveType(typeId: 16)
// @JsonSerializable(
// explicitToJson: true,
// )
// class WallpaperV2 {
// @HiveField(0)
// String username;
// @HiveField(1)
// List<String> collections;
// @HiveField(2)
// String id;
// @HiveField(3)
// DateTime createdAt;
// @HiveField(4)
// String description;
// @HiveField(5)
// String resolution;
// @HiveField(6)
// bool review;
// @HiveField(7)
// String size;
// @HiveField(8)
// String profilePhoto;
// @HiveField(9)
// String wallpaper_provider;
// @HiveField(10)
// String wallpaper_url;
// @HiveField(11)
// String wallpaper_thumb;
// @HiveField(12)
// List subPrisms;
// @HiveField(13)
// bool free;
// @HiveField(14)
// int coins;
// @HiveField(15)
// String link;

// WallpaperV2({
// required this.username,
// required this.email,
// required this.id,
// required this.createdAt,
// required this.premium,
// required this.lastLoginAt,
// required this.links,
// required this.followers,
// required this.following,
// required this.profilePhoto,
// required this.bio,
// required this.loggedIn,
// required this.badges,
// required this.subPrisms,
// required this.coins,
// required this.transactions,
// required this.name,
// this.coverPhoto,
// }) {
// logger.d("Default constructor !!!!");
// }

// factory PrismUsersV2.fromJson(Map<String, dynamic> json) =>
// _$PrismUsersV2FromJson(json);
// factory PrismUsersV2.fromDocumentSnapshot(DocumentSnapshot doc, User user) =>
// PrismUsersV2(
// name: (doc.data()!["name"] ?? user.displayName).toString(),
// username: (doc.data()!["username"] ?? user.displayName)
// .toString()
// .replaceAll(RegExp(r"(?: |[^\w\s])+"), ""),
// email: (doc.data()!["email"] ?? user.email).toString(),
// id: doc.data()!["id"].toString(),
// createdAt: doc.data()!["createdAt"].toString(),
// premium: doc.data()!["premium"] as bool,
// lastLoginAt: doc.data()!["lastLoginAt"]?.toString() ??
// DateTime.now().toUtc().toIso8601String(),
// links: doc.data()!["links"] as Map<String, dynamic> ?? {},
// followers: doc.data()!["followers"] as List ?? [],
// following: doc.data()!["following"] as List ?? [],
// profilePhoto: (doc.data()!["profilePhoto"] ?? user.photoURL).toString(),
// bio: (doc.data()!["bio"] ?? "").toString(),
// loggedIn: true,
// badges: (doc.data()!['badges'] as List<dynamic> ?? [])
// .map((e) => Badge.fromJson(e as Map<String, dynamic>))
// .toList(),
// subPrisms: doc.data()!['subPrisms'] as List<dynamic> ?? [],
// coins: doc.data()!['coins'] as int ?? 0,
// transactions: (doc.data()!['transactions'] as List<dynamic> ?? [])
// .map((e) => PrismTransaction.fromJson(e as Map<String, dynamic>))
// .toList(),
// coverPhoto: doc.data()!["coverPhoto"]?.toString(),
// );
// Map<String, dynamic> toJson() => _$PrismUsersV2ToJson(this);
// }
Loading

0 comments on commit 955477d

Please sign in to comment.