From f8cfa04d042563ce43f54e2a7f9d1dc19d522d2f Mon Sep 17 00:00:00 2001
From: 55nknown <55922348+55nknown@users.noreply.github.com>
Date: Tue, 15 Nov 2022 09:00:38 +0100
Subject: [PATCH] nickname changing

---
 filcnaplo/lib/api/providers/user_provider.dart | 1 +
 filcnaplo/lib/database/init.dart               | 6 ++++--
 filcnaplo/lib/models/user.dart                 | 4 ++++
 filcnaplo/pubspec.yaml                         | 2 ++
 filcnaplo_kreta_api                            | 2 +-
 filcnaplo_mobile_ui                            | 2 +-
 filcnaplo_premium                              | 1 +
 7 files changed, 14 insertions(+), 4 deletions(-)
 create mode 160000 filcnaplo_premium

diff --git a/filcnaplo/lib/api/providers/user_provider.dart b/filcnaplo/lib/api/providers/user_provider.dart
index 5de7396..ad026d6 100644
--- a/filcnaplo/lib/api/providers/user_provider.dart
+++ b/filcnaplo/lib/api/providers/user_provider.dart
@@ -15,6 +15,7 @@ class UserProvider with ChangeNotifier {
   String? get password => user?.password;
   Role? get role => user?.role;
   Student? get student => user?.student;
+  String? get nickname => user?.nickname;
 
   void setUser(String userId) {
     _selectedUserId = userId;
diff --git a/filcnaplo/lib/database/init.dart b/filcnaplo/lib/database/init.dart
index ff50ad1..72c93a6 100644
--- a/filcnaplo/lib/database/init.dart
+++ b/filcnaplo/lib/database/init.dart
@@ -17,8 +17,10 @@ const settingsDB = DatabaseStruct("settings", {
   "x_filc_id": String, "graph_class_avg": int, "presentation_mode": int, "bell_delay": int, "bell_delay_enabled": int,
   "grade_opening_fun": int, "icon_pack": String,
 });
-const usersDB = DatabaseStruct(
-    "users", {"id": String, "name": String, "username": String, "password": String, "institute_code": String, "student": String, "role": int});
+const usersDB = DatabaseStruct("users", {
+  "id": String, "name": String, "username": String, "password": String, "institute_code": String, "student": String, "role": int,
+  "nickname": String // premium only
+});
 const userDataDB = DatabaseStruct("user_data", {
   "id": String, "grades": String, "timetable": String, "exams": String, "homework": String, "messages": String, "notes": String,
   "events": String, "absences": String, "group_averages": String,
diff --git a/filcnaplo/lib/models/user.dart b/filcnaplo/lib/models/user.dart
index f4169ea..7e70ab4 100644
--- a/filcnaplo/lib/models/user.dart
+++ b/filcnaplo/lib/models/user.dart
@@ -13,6 +13,7 @@ class User {
   String name;
   Student student;
   Role role;
+  String nickname;
 
   User({
     String? id,
@@ -22,6 +23,7 @@ class User {
     required this.instituteCode,
     required this.student,
     required this.role,
+    this.nickname = "",
   }) {
     if (id != null) {
       this.id = id;
@@ -39,6 +41,7 @@ class User {
       name: map["name"].trim(),
       student: Student.fromJson(jsonDecode(map["student"])),
       role: Role.values[map["role"] ?? 0],
+      nickname: map["nickname"] ?? "",
     );
   }
 
@@ -51,6 +54,7 @@ class User {
       "name": name,
       "student": jsonEncode(student.json),
       "role": role.index,
+      "nickname": nickname,
     };
   }
 
diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml
index 0d0eb68..b460252 100644
--- a/filcnaplo/pubspec.yaml
+++ b/filcnaplo/pubspec.yaml
@@ -20,6 +20,8 @@ dependencies:
     path: "../filcnaplo_desktop_ui/"
   filcnaplo_kreta_api:
     path: "../filcnaplo_kreta_api/"
+  filcnaplo_premium:
+    path: "../filcnaplo_premium/"
 
   flutter_localizations:
     sdk: flutter
diff --git a/filcnaplo_kreta_api b/filcnaplo_kreta_api
index bcd9755..66a65ad 160000
--- a/filcnaplo_kreta_api
+++ b/filcnaplo_kreta_api
@@ -1 +1 @@
-Subproject commit bcd97552227f418898d6a42f671024e479ecb1b4
+Subproject commit 66a65ad6494f8b8912735ab43a524967d11b525a
diff --git a/filcnaplo_mobile_ui b/filcnaplo_mobile_ui
index 9278bbb..8af7045 160000
--- a/filcnaplo_mobile_ui
+++ b/filcnaplo_mobile_ui
@@ -1 +1 @@
-Subproject commit 9278bbb8ec7e1cee072812946fc72a98777c7db4
+Subproject commit 8af704591c96592b7883a29977e69e798029a3aa
diff --git a/filcnaplo_premium b/filcnaplo_premium
new file mode 160000
index 0000000..54b1668
--- /dev/null
+++ b/filcnaplo_premium
@@ -0,0 +1 @@
+Subproject commit 54b166839a9a06680b51628567749421f3d9cca8