From 0aa8e1a2a13fbf28cc7187c29359f863f2675073 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 23 Jun 2025 18:41:54 +0200 Subject: [PATCH 01/62] added dependencies for drift db --- pubspec.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pubspec.yaml b/pubspec.yaml index aa5fa8a..df16c45 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,6 +34,9 @@ dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^1.0.8 + drift: ^2.27.0 + drift_flutter: ^0.2.4 + path_provider: ^2.1.5 dev_dependencies: flutter_test: @@ -45,6 +48,8 @@ dev_dependencies: # package. See that file for information about deactivating specific lint # rules and activating additional ones. flutter_lints: ^5.0.0 + drift_dev: ^2.27.0 + build_runner: ^2.5.4 # For information on the generic Dart part of this file, see the # following page: https://dart.dev/tools/pub/pubspec From 5c334375190969d3d2509afc0edf6960d56f57e8 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 23 Jun 2025 22:29:55 +0200 Subject: [PATCH 02/62] added provider requirement for state management --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index df16c45..b539585 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -37,6 +37,7 @@ dependencies: drift: ^2.27.0 drift_flutter: ^0.2.4 path_provider: ^2.1.5 + provider: ^6.1.5 dev_dependencies: flutter_test: From 78ea7f644e34f07b92a938744509562388f4e970 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:12:46 +0200 Subject: [PATCH 03/62] added provider for state management & exposed db using provider --- lib/main.dart | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 1188332..c776485 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,8 +1,16 @@ import 'package:flutter/material.dart'; +import 'package:game_tracker/data/database.dart'; import 'package:game_tracker/presentation/views/home_view.dart'; +import 'package:provider/provider.dart'; void main() { - runApp(const MyApp()); + runApp( + Provider( + create: (context) => AppDatabase(), + child: MyApp(), + dispose: (context, db) => db.close(), + ), + ); } class MyApp extends StatelessWidget { From 7b7fbd47a58f8429ca282479a71926ef5156bfa2 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:15:06 +0200 Subject: [PATCH 04/62] created tables for Group, User and UserGrouo --- lib/data/database.dart | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 lib/data/database.dart diff --git a/lib/data/database.dart b/lib/data/database.dart new file mode 100644 index 0000000..2c04942 --- /dev/null +++ b/lib/data/database.dart @@ -0,0 +1,46 @@ +import 'package:drift/drift.dart'; +import 'package:drift_flutter/drift_flutter.dart'; +import 'package:path_provider/path_provider.dart'; + +part 'database.g.dart'; + +class User extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} + +class Group extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} + +class UserGroup extends Table { + TextColumn get userId => text().references(User, #id)(); + TextColumn get groupId => text().references(Group, #id)(); + + @override + Set> get primaryKey => {userId, groupId}; +} + +@DriftDatabase(tables: [User, Group, UserGroup]) +class AppDatabase extends _$AppDatabase { + AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection()); + + @override + int get schemaVersion => 1; + + static QueryExecutor _openConnection() { + return driftDatabase( + name: 'gametracker_db', + native: const DriftNativeOptions( + databaseDirectory: getApplicationSupportDirectory, + ), + ); + } +} \ No newline at end of file From e990c1138b6ba138e1503a7a0d53fc4713c6a9c9 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:16:50 +0200 Subject: [PATCH 05/62] added methods for interacting with User, Group and UserGroup in database --- lib/data/methods/group.dart | 28 ++++++++++++++++++++++++++++ lib/data/methods/user.dart | 28 ++++++++++++++++++++++++++++ lib/data/methods/user_group.dart | 26 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 lib/data/methods/group.dart create mode 100644 lib/data/methods/user.dart create mode 100644 lib/data/methods/user_group.dart diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart new file mode 100644 index 0000000..afc25c0 --- /dev/null +++ b/lib/data/methods/group.dart @@ -0,0 +1,28 @@ +import 'package:game_tracker/data/database.dart'; +import 'package:drift/drift.dart'; + +extension Group on AppDatabase { + Future> getAllGroups() async { + return await select(group).get(); + } + + Future> getGroupById(String id) async { + return await (select(group)..where((g) => g.id.equals(id))).get(); + } + + Future addGroup(String id, String name) async { + await into(group).insert( + GroupCompanion.insert(id: id, name: name), + ); + } + + Future deleteGroup(String id) async { + await (delete(group)..where((u) => u.id.equals(id))).go(); + } + + Future updateGroupname(String id, String newName) async { + await (update(group)..where((u) => u.id.equals(id))).write( + GroupCompanion(name: Value(newName)), + ); + } +} \ No newline at end of file diff --git a/lib/data/methods/user.dart b/lib/data/methods/user.dart new file mode 100644 index 0000000..46ed497 --- /dev/null +++ b/lib/data/methods/user.dart @@ -0,0 +1,28 @@ +import 'package:game_tracker/data/database.dart'; +import 'package:drift/drift.dart'; + +extension User on AppDatabase { + Future> getAllUsers() async { + return await select(user).get(); + } + + Future> getUserById(String id) async { + return await (select(user)..where((u) => u.id.equals(id))).get(); + } + + Future addUser(String id, String name) async { + await into(user).insert( + UserCompanion.insert(id: id, name: name), + ); + } + + Future deleteUser(String id) async { + await (delete(user)..where((u) => u.id.equals(id))).go(); + } + + Future updateUsername(String id, String newName) async { + await (update(user)..where((u) => u.id.equals(id))).write( + UserCompanion(name: Value(newName)), + ); + } +} \ No newline at end of file diff --git a/lib/data/methods/user_group.dart b/lib/data/methods/user_group.dart new file mode 100644 index 0000000..41e1e60 --- /dev/null +++ b/lib/data/methods/user_group.dart @@ -0,0 +1,26 @@ +import 'package:game_tracker/data/database.dart'; +import 'package:drift/drift.dart'; + +extension UserGroup on AppDatabase { + Future> getAllUsersAndGroups() async { + return await select(userGroup).get(); + } + + Future> getUsersGroups(String userId) async { + return await (select(userGroup)..where((uG) => uG.userId.equals(userId))).get(); + } + + Future> getGroupsUsers(String groupId) async { + return await (select(userGroup)..where((uG) => uG.groupId.equals(groupId))).get(); + } + + Future addUserToGroup(String userId, String groupId) async { + await into(userGroup).insert( + UserGroupCompanion.insert(userId: userId, groupId: groupId), + ); + } + + Future removeUserFromGroup(String userId, String groupId) async { + await (delete(userGroup)..where((uG) => uG.userId.equals(userId) & uG.groupId.equals(groupId))).go(); + } +} \ No newline at end of file From c7f07e0ce7b922e8d724bcfc422114b440b8ec80 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:17:06 +0200 Subject: [PATCH 06/62] generated database code --- lib/data/database.g.dart | 1455 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 1455 insertions(+) create mode 100644 lib/data/database.g.dart diff --git a/lib/data/database.g.dart b/lib/data/database.g.dart new file mode 100644 index 0000000..795f850 --- /dev/null +++ b/lib/data/database.g.dart @@ -0,0 +1,1455 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'database.dart'; + +// ignore_for_file: type=lint +class $UserTable extends User with TableInfo<$UserTable, UserData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $UserTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'user'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + UserData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return UserData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $UserTable createAlias(String alias) { + return $UserTable(attachedDatabase, alias); + } +} + +class UserData extends DataClass implements Insertable { + final String id; + final String name; + const UserData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + UserCompanion toCompanion(bool nullToAbsent) { + return UserCompanion(id: Value(id), name: Value(name)); + } + + factory UserData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return UserData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + UserData copyWith({String? id, String? name}) => + UserData(id: id ?? this.id, name: name ?? this.name); + UserData copyWithCompanion(UserCompanion data) { + return UserData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('UserData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is UserData && other.id == this.id && other.name == this.name); +} + +class UserCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const UserCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + UserCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + UserCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return UserCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('UserCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $GroupTable extends Group with TableInfo<$GroupTable, GroupData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $GroupTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'group'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + GroupData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return GroupData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $GroupTable createAlias(String alias) { + return $GroupTable(attachedDatabase, alias); + } +} + +class GroupData extends DataClass implements Insertable { + final String id; + final String name; + const GroupData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + GroupCompanion toCompanion(bool nullToAbsent) { + return GroupCompanion(id: Value(id), name: Value(name)); + } + + factory GroupData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return GroupData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + GroupData copyWith({String? id, String? name}) => + GroupData(id: id ?? this.id, name: name ?? this.name); + GroupData copyWithCompanion(GroupCompanion data) { + return GroupData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('GroupData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is GroupData && other.id == this.id && other.name == this.name); +} + +class GroupCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const GroupCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + GroupCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + GroupCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return GroupCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('GroupCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $UserGroupTable extends UserGroup + with TableInfo<$UserGroupTable, UserGroupData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $UserGroupTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); + @override + late final GeneratedColumn userId = GeneratedColumn( + 'user_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES user (id)', + ), + ); + static const VerificationMeta _groupIdMeta = const VerificationMeta( + 'groupId', + ); + @override + late final GeneratedColumn groupId = GeneratedColumn( + 'group_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES "group" (id)', + ), + ); + @override + List get $columns => [userId, groupId]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'user_group'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('user_id')) { + context.handle( + _userIdMeta, + userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta), + ); + } else if (isInserting) { + context.missing(_userIdMeta); + } + if (data.containsKey('group_id')) { + context.handle( + _groupIdMeta, + groupId.isAcceptableOrUnknown(data['group_id']!, _groupIdMeta), + ); + } else if (isInserting) { + context.missing(_groupIdMeta); + } + return context; + } + + @override + Set get $primaryKey => {userId, groupId}; + @override + UserGroupData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return UserGroupData( + userId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}user_id'], + )!, + groupId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}group_id'], + )!, + ); + } + + @override + $UserGroupTable createAlias(String alias) { + return $UserGroupTable(attachedDatabase, alias); + } +} + +class UserGroupData extends DataClass implements Insertable { + final String userId; + final String groupId; + const UserGroupData({required this.userId, required this.groupId}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['user_id'] = Variable(userId); + map['group_id'] = Variable(groupId); + return map; + } + + UserGroupCompanion toCompanion(bool nullToAbsent) { + return UserGroupCompanion(userId: Value(userId), groupId: Value(groupId)); + } + + factory UserGroupData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return UserGroupData( + userId: serializer.fromJson(json['userId']), + groupId: serializer.fromJson(json['groupId']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'userId': serializer.toJson(userId), + 'groupId': serializer.toJson(groupId), + }; + } + + UserGroupData copyWith({String? userId, String? groupId}) => UserGroupData( + userId: userId ?? this.userId, + groupId: groupId ?? this.groupId, + ); + UserGroupData copyWithCompanion(UserGroupCompanion data) { + return UserGroupData( + userId: data.userId.present ? data.userId.value : this.userId, + groupId: data.groupId.present ? data.groupId.value : this.groupId, + ); + } + + @override + String toString() { + return (StringBuffer('UserGroupData(') + ..write('userId: $userId, ') + ..write('groupId: $groupId') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(userId, groupId); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is UserGroupData && + other.userId == this.userId && + other.groupId == this.groupId); +} + +class UserGroupCompanion extends UpdateCompanion { + final Value userId; + final Value groupId; + final Value rowid; + const UserGroupCompanion({ + this.userId = const Value.absent(), + this.groupId = const Value.absent(), + this.rowid = const Value.absent(), + }); + UserGroupCompanion.insert({ + required String userId, + required String groupId, + this.rowid = const Value.absent(), + }) : userId = Value(userId), + groupId = Value(groupId); + static Insertable custom({ + Expression? userId, + Expression? groupId, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (userId != null) 'user_id': userId, + if (groupId != null) 'group_id': groupId, + if (rowid != null) 'rowid': rowid, + }); + } + + UserGroupCompanion copyWith({ + Value? userId, + Value? groupId, + Value? rowid, + }) { + return UserGroupCompanion( + userId: userId ?? this.userId, + groupId: groupId ?? this.groupId, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (userId.present) { + map['user_id'] = Variable(userId.value); + } + if (groupId.present) { + map['group_id'] = Variable(groupId.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('UserGroupCompanion(') + ..write('userId: $userId, ') + ..write('groupId: $groupId, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +abstract class _$AppDatabase extends GeneratedDatabase { + _$AppDatabase(QueryExecutor e) : super(e); + $AppDatabaseManager get managers => $AppDatabaseManager(this); + late final $UserTable user = $UserTable(this); + late final $GroupTable group = $GroupTable(this); + late final $UserGroupTable userGroup = $UserGroupTable(this); + @override + Iterable> get allTables => + allSchemaEntities.whereType>(); + @override + List get allSchemaEntities => [user, group, userGroup]; +} + +typedef $$UserTableCreateCompanionBuilder = + UserCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$UserTableUpdateCompanionBuilder = + UserCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +final class $$UserTableReferences + extends BaseReferences<_$AppDatabase, $UserTable, UserData> { + $$UserTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static MultiTypedResultKey<$UserGroupTable, List> + _userGroupRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.userGroup, + aliasName: $_aliasNameGenerator(db.user.id, db.userGroup.userId), + ); + + $$UserGroupTableProcessedTableManager get userGroupRefs { + final manager = $$UserGroupTableTableManager( + $_db, + $_db.userGroup, + ).filter((f) => f.userId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_userGroupRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + +class $$UserTableFilterComposer extends Composer<_$AppDatabase, $UserTable> { + $$UserTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); + + Expression userGroupRefs( + Expression Function($$UserGroupTableFilterComposer f) f, + ) { + final $$UserGroupTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.userId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableFilterComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$UserTableOrderingComposer extends Composer<_$AppDatabase, $UserTable> { + $$UserTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$UserTableAnnotationComposer + extends Composer<_$AppDatabase, $UserTable> { + $$UserTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); + + Expression userGroupRefs( + Expression Function($$UserGroupTableAnnotationComposer a) f, + ) { + final $$UserGroupTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.userId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableAnnotationComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$UserTableTableManager + extends + RootTableManager< + _$AppDatabase, + $UserTable, + UserData, + $$UserTableFilterComposer, + $$UserTableOrderingComposer, + $$UserTableAnnotationComposer, + $$UserTableCreateCompanionBuilder, + $$UserTableUpdateCompanionBuilder, + (UserData, $$UserTableReferences), + UserData, + PrefetchHooks Function({bool userGroupRefs}) + > { + $$UserTableTableManager(_$AppDatabase db, $UserTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$UserTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$UserTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$UserTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => UserCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => UserCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map( + (e) => + (e.readTable(table), $$UserTableReferences(db, table, e)), + ) + .toList(), + prefetchHooksCallback: ({userGroupRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [if (userGroupRefs) db.userGroup], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (userGroupRefs) + await $_getPrefetchedData< + UserData, + $UserTable, + UserGroupData + >( + currentTable: table, + referencedTable: $$UserTableReferences + ._userGroupRefsTable(db), + managerFromTypedResult: (p0) => + $$UserTableReferences(db, table, p0).userGroupRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.userId == item.id), + typedResults: items, + ), + ]; + }, + ); + }, + ), + ); +} + +typedef $$UserTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $UserTable, + UserData, + $$UserTableFilterComposer, + $$UserTableOrderingComposer, + $$UserTableAnnotationComposer, + $$UserTableCreateCompanionBuilder, + $$UserTableUpdateCompanionBuilder, + (UserData, $$UserTableReferences), + UserData, + PrefetchHooks Function({bool userGroupRefs}) + >; +typedef $$GroupTableCreateCompanionBuilder = + GroupCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$GroupTableUpdateCompanionBuilder = + GroupCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +final class $$GroupTableReferences + extends BaseReferences<_$AppDatabase, $GroupTable, GroupData> { + $$GroupTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static MultiTypedResultKey<$UserGroupTable, List> + _userGroupRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.userGroup, + aliasName: $_aliasNameGenerator(db.group.id, db.userGroup.groupId), + ); + + $$UserGroupTableProcessedTableManager get userGroupRefs { + final manager = $$UserGroupTableTableManager( + $_db, + $_db.userGroup, + ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_userGroupRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + +class $$GroupTableFilterComposer extends Composer<_$AppDatabase, $GroupTable> { + $$GroupTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); + + Expression userGroupRefs( + Expression Function($$UserGroupTableFilterComposer f) f, + ) { + final $$UserGroupTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableFilterComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$GroupTableOrderingComposer + extends Composer<_$AppDatabase, $GroupTable> { + $$GroupTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$GroupTableAnnotationComposer + extends Composer<_$AppDatabase, $GroupTable> { + $$GroupTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); + + Expression userGroupRefs( + Expression Function($$UserGroupTableAnnotationComposer a) f, + ) { + final $$UserGroupTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableAnnotationComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$GroupTableTableManager + extends + RootTableManager< + _$AppDatabase, + $GroupTable, + GroupData, + $$GroupTableFilterComposer, + $$GroupTableOrderingComposer, + $$GroupTableAnnotationComposer, + $$GroupTableCreateCompanionBuilder, + $$GroupTableUpdateCompanionBuilder, + (GroupData, $$GroupTableReferences), + GroupData, + PrefetchHooks Function({bool userGroupRefs}) + > { + $$GroupTableTableManager(_$AppDatabase db, $GroupTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$GroupTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GroupTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GroupTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => GroupCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => GroupCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map( + (e) => + (e.readTable(table), $$GroupTableReferences(db, table, e)), + ) + .toList(), + prefetchHooksCallback: ({userGroupRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [if (userGroupRefs) db.userGroup], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (userGroupRefs) + await $_getPrefetchedData< + GroupData, + $GroupTable, + UserGroupData + >( + currentTable: table, + referencedTable: $$GroupTableReferences + ._userGroupRefsTable(db), + managerFromTypedResult: (p0) => + $$GroupTableReferences(db, table, p0).userGroupRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.groupId == item.id), + typedResults: items, + ), + ]; + }, + ); + }, + ), + ); +} + +typedef $$GroupTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $GroupTable, + GroupData, + $$GroupTableFilterComposer, + $$GroupTableOrderingComposer, + $$GroupTableAnnotationComposer, + $$GroupTableCreateCompanionBuilder, + $$GroupTableUpdateCompanionBuilder, + (GroupData, $$GroupTableReferences), + GroupData, + PrefetchHooks Function({bool userGroupRefs}) + >; +typedef $$UserGroupTableCreateCompanionBuilder = + UserGroupCompanion Function({ + required String userId, + required String groupId, + Value rowid, + }); +typedef $$UserGroupTableUpdateCompanionBuilder = + UserGroupCompanion Function({ + Value userId, + Value groupId, + Value rowid, + }); + +final class $$UserGroupTableReferences + extends BaseReferences<_$AppDatabase, $UserGroupTable, UserGroupData> { + $$UserGroupTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static $UserTable _userIdTable(_$AppDatabase db) => db.user.createAlias( + $_aliasNameGenerator(db.userGroup.userId, db.user.id), + ); + + $$UserTableProcessedTableManager get userId { + final $_column = $_itemColumn('user_id')!; + + final manager = $$UserTableTableManager( + $_db, + $_db.user, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_userIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } + + static $GroupTable _groupIdTable(_$AppDatabase db) => db.group.createAlias( + $_aliasNameGenerator(db.userGroup.groupId, db.group.id), + ); + + $$GroupTableProcessedTableManager get groupId { + final $_column = $_itemColumn('group_id')!; + + final manager = $$GroupTableTableManager( + $_db, + $_db.group, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_groupIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } +} + +class $$UserGroupTableFilterComposer + extends Composer<_$AppDatabase, $UserGroupTable> { + $$UserGroupTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$UserTableFilterComposer get userId { + final $$UserTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.user, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserTableFilterComposer( + $db: $db, + $table: $db.user, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableFilterComposer get groupId { + final $$GroupTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.group, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableFilterComposer( + $db: $db, + $table: $db.group, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$UserGroupTableOrderingComposer + extends Composer<_$AppDatabase, $UserGroupTable> { + $$UserGroupTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$UserTableOrderingComposer get userId { + final $$UserTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.user, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserTableOrderingComposer( + $db: $db, + $table: $db.user, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableOrderingComposer get groupId { + final $$GroupTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.group, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableOrderingComposer( + $db: $db, + $table: $db.group, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$UserGroupTableAnnotationComposer + extends Composer<_$AppDatabase, $UserGroupTable> { + $$UserGroupTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$UserTableAnnotationComposer get userId { + final $$UserTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.user, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserTableAnnotationComposer( + $db: $db, + $table: $db.user, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableAnnotationComposer get groupId { + final $$GroupTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.group, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableAnnotationComposer( + $db: $db, + $table: $db.group, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$UserGroupTableTableManager + extends + RootTableManager< + _$AppDatabase, + $UserGroupTable, + UserGroupData, + $$UserGroupTableFilterComposer, + $$UserGroupTableOrderingComposer, + $$UserGroupTableAnnotationComposer, + $$UserGroupTableCreateCompanionBuilder, + $$UserGroupTableUpdateCompanionBuilder, + (UserGroupData, $$UserGroupTableReferences), + UserGroupData, + PrefetchHooks Function({bool userId, bool groupId}) + > { + $$UserGroupTableTableManager(_$AppDatabase db, $UserGroupTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$UserGroupTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$UserGroupTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$UserGroupTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value userId = const Value.absent(), + Value groupId = const Value.absent(), + Value rowid = const Value.absent(), + }) => UserGroupCompanion( + userId: userId, + groupId: groupId, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String userId, + required String groupId, + Value rowid = const Value.absent(), + }) => UserGroupCompanion.insert( + userId: userId, + groupId: groupId, + rowid: rowid, + ), + withReferenceMapper: (p0) => p0 + .map( + (e) => ( + e.readTable(table), + $$UserGroupTableReferences(db, table, e), + ), + ) + .toList(), + prefetchHooksCallback: ({userId = false, groupId = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [], + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (userId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.userId, + referencedTable: $$UserGroupTableReferences + ._userIdTable(db), + referencedColumn: $$UserGroupTableReferences + ._userIdTable(db) + .id, + ) + as T; + } + if (groupId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.groupId, + referencedTable: $$UserGroupTableReferences + ._groupIdTable(db), + referencedColumn: $$UserGroupTableReferences + ._groupIdTable(db) + .id, + ) + as T; + } + + return state; + }, + getPrefetchedDataCallback: (items) async { + return []; + }, + ); + }, + ), + ); +} + +typedef $$UserGroupTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $UserGroupTable, + UserGroupData, + $$UserGroupTableFilterComposer, + $$UserGroupTableOrderingComposer, + $$UserGroupTableAnnotationComposer, + $$UserGroupTableCreateCompanionBuilder, + $$UserGroupTableUpdateCompanionBuilder, + (UserGroupData, $$UserGroupTableReferences), + UserGroupData, + PrefetchHooks Function({bool userId, bool groupId}) + >; + +class $AppDatabaseManager { + final _$AppDatabase _db; + $AppDatabaseManager(this._db); + $$UserTableTableManager get user => $$UserTableTableManager(_db, _db.user); + $$GroupTableTableManager get group => + $$GroupTableTableManager(_db, _db.group); + $$UserGroupTableTableManager get userGroup => + $$UserGroupTableTableManager(_db, _db.userGroup); +} From e42064da2c5182c6df7011cee76f98c70a3495ef Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Tue, 24 Jun 2025 20:26:34 +0200 Subject: [PATCH 07/62] Update lib/data/methods/group.dart renamed var in deleteGroup to g instead of u Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/data/methods/group.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index afc25c0..bb5a131 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -17,7 +17,7 @@ extension Group on AppDatabase { } Future deleteGroup(String id) async { - await (delete(group)..where((u) => u.id.equals(id))).go(); + await (delete(group)..where((g) => g.id.equals(id))).go(); } Future updateGroupname(String id, String newName) async { From be08b286a41b3cfacd2cffd79e1c4b029e361ab0 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:28:26 +0200 Subject: [PATCH 08/62] renamed class names to avoid conflicts --- lib/data/methods/group.dart | 2 +- lib/data/methods/user.dart | 2 +- lib/data/methods/user_group.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index bb5a131..d996af6 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -1,7 +1,7 @@ import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; -extension Group on AppDatabase { +extension GroupMethods on AppDatabase { Future> getAllGroups() async { return await select(group).get(); } diff --git a/lib/data/methods/user.dart b/lib/data/methods/user.dart index 46ed497..ddf26b0 100644 --- a/lib/data/methods/user.dart +++ b/lib/data/methods/user.dart @@ -1,7 +1,7 @@ import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; -extension User on AppDatabase { +extension UserMethods on AppDatabase { Future> getAllUsers() async { return await select(user).get(); } diff --git a/lib/data/methods/user_group.dart b/lib/data/methods/user_group.dart index 41e1e60..206c1f0 100644 --- a/lib/data/methods/user_group.dart +++ b/lib/data/methods/user_group.dart @@ -1,7 +1,7 @@ import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; -extension UserGroup on AppDatabase { +extension UserGroupMethods on AppDatabase { Future> getAllUsersAndGroups() async { return await select(userGroup).get(); } From cd508190a3cfcfd34dcedd3c80e4e894e282022c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:35:30 +0200 Subject: [PATCH 09/62] changed return type of getGroupById and getUserById to match expected result --- lib/data/methods/group.dart | 4 ++-- lib/data/methods/user.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index d996af6..50a1745 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -6,8 +6,8 @@ extension GroupMethods on AppDatabase { return await select(group).get(); } - Future> getGroupById(String id) async { - return await (select(group)..where((g) => g.id.equals(id))).get(); + Future getGroupById(String id) async { + return await (select(group)..where((g) => g.id.equals(id))).getSingle(); } Future addGroup(String id, String name) async { diff --git a/lib/data/methods/user.dart b/lib/data/methods/user.dart index ddf26b0..6f4c508 100644 --- a/lib/data/methods/user.dart +++ b/lib/data/methods/user.dart @@ -6,8 +6,8 @@ extension UserMethods on AppDatabase { return await select(user).get(); } - Future> getUserById(String id) async { - return await (select(user)..where((u) => u.id.equals(id))).get(); + Future getUserById(String id) async { + return await (select(user)..where((u) => u.id.equals(id))).getSingle(); } Future addUser(String id, String name) async { From 0c57a83dfcec9598ba6c3334333d64a851a6c40d Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:38:29 +0200 Subject: [PATCH 10/62] renamed lambda var in updateGroupname from u to g --- lib/data/methods/group.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index 50a1745..a5346ba 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -21,7 +21,7 @@ extension GroupMethods on AppDatabase { } Future updateGroupname(String id, String newName) async { - await (update(group)..where((u) => u.id.equals(id))).write( + await (update(group)..where((g) => g.id.equals(id))).write( GroupCompanion(name: Value(newName)), ); } From b3c9990685798eb24c17b4377efd1e8d3607410c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:40:19 +0200 Subject: [PATCH 11/62] added const to MyApp in Providers child --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index c776485..e3f8a91 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -7,7 +7,7 @@ void main() { runApp( Provider( create: (context) => AppDatabase(), - child: MyApp(), + child: const MyApp(), dispose: (context, db) => db.close(), ), ); From 5d505858abc107dae6d17d3704494f6c2e06bc3a Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 23 Jun 2025 22:52:44 +0200 Subject: [PATCH 12/62] Added ios platform --- .metadata | 14 +- ios/.gitignore | 34 + ios/Flutter/AppFrameworkInfo.plist | 26 + ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Runner.xcodeproj/project.pbxproj | 619 ++++++++++++++++++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 101 +++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + ios/Runner/AppDelegate.swift | 13 + .../AppIcon.appiconset/Contents.json | 122 ++++ .../Icon-App-1024x1024@1x.png | Bin 0 -> 10932 bytes .../AppIcon.appiconset/Icon-App-20x20@1x.png | Bin 0 -> 295 bytes .../AppIcon.appiconset/Icon-App-20x20@2x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-20x20@3x.png | Bin 0 -> 450 bytes .../AppIcon.appiconset/Icon-App-29x29@1x.png | Bin 0 -> 282 bytes .../AppIcon.appiconset/Icon-App-29x29@2x.png | Bin 0 -> 462 bytes .../AppIcon.appiconset/Icon-App-29x29@3x.png | Bin 0 -> 704 bytes .../AppIcon.appiconset/Icon-App-40x40@1x.png | Bin 0 -> 406 bytes .../AppIcon.appiconset/Icon-App-40x40@2x.png | Bin 0 -> 586 bytes .../AppIcon.appiconset/Icon-App-40x40@3x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@2x.png | Bin 0 -> 862 bytes .../AppIcon.appiconset/Icon-App-60x60@3x.png | Bin 0 -> 1674 bytes .../AppIcon.appiconset/Icon-App-76x76@1x.png | Bin 0 -> 762 bytes .../AppIcon.appiconset/Icon-App-76x76@2x.png | Bin 0 -> 1226 bytes .../Icon-App-83.5x83.5@2x.png | Bin 0 -> 1418 bytes .../LaunchImage.imageset/Contents.json | 23 + .../LaunchImage.imageset/LaunchImage.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@2x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/LaunchImage@3x.png | Bin 0 -> 68 bytes .../LaunchImage.imageset/README.md | 5 + ios/Runner/Base.lproj/LaunchScreen.storyboard | 37 ++ ios/Runner/Base.lproj/Main.storyboard | 26 + ios/Runner/Info.plist | 49 ++ ios/Runner/Runner-Bridging-Header.h | 1 + ios/RunnerTests/RunnerTests.swift | 12 + 40 files changed, 1117 insertions(+), 13 deletions(-) create mode 100644 ios/.gitignore create mode 100644 ios/Flutter/AppFrameworkInfo.plist create mode 100644 ios/Flutter/Debug.xcconfig create mode 100644 ios/Flutter/Release.xcconfig create mode 100644 ios/Runner.xcodeproj/project.pbxproj create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 ios/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 ios/Runner/AppDelegate.swift create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png create mode 100644 ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png create mode 100644 ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md create mode 100644 ios/Runner/Base.lproj/LaunchScreen.storyboard create mode 100644 ios/Runner/Base.lproj/Main.storyboard create mode 100644 ios/Runner/Info.plist create mode 100644 ios/Runner/Runner-Bridging-Header.h create mode 100644 ios/RunnerTests/RunnerTests.swift diff --git a/.metadata b/.metadata index dc84ef0..85b54cb 100644 --- a/.metadata +++ b/.metadata @@ -15,19 +15,7 @@ migration: - platform: root create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - - platform: android - create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - - platform: linux - create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - - platform: macos - create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - - platform: web - create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 - - platform: windows + - platform: ios create_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 base_revision: b25305a8832cfc6ba632a7f87ad455e319dccce8 diff --git a/ios/.gitignore b/ios/.gitignore new file mode 100644 index 0000000..7a7f987 --- /dev/null +++ b/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000..7c56964 --- /dev/null +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 12.0 + + diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/ios/Flutter/Debug.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000..592ceee --- /dev/null +++ b/ios/Flutter/Release.xcconfig @@ -0,0 +1 @@ +#include "Generated.xcconfig" diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj new file mode 100644 index 0000000..e663485 --- /dev/null +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,619 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 54; + objects = { + +/* Begin PBXBuildFile section */ + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 331C8085294A63A400263BE5 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 97C146E61CF9000F007C117D /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97C146ED1CF9000F007C117D; + remoteInfo = Runner; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 9705A1C41CF9048500538489 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; + 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; + 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; + 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 97C146EB1CF9000F007C117D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 331C8082294A63A400263BE5 /* RunnerTests */ = { + isa = PBXGroup; + children = ( + 331C807B294A618700263BE5 /* RunnerTests.swift */, + ); + path = RunnerTests; + sourceTree = ""; + }; + 9740EEB11CF90186004384FC /* Flutter */ = { + isa = PBXGroup; + children = ( + 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 9740EEB31CF90195004384FC /* Generated.xcconfig */, + ); + name = Flutter; + sourceTree = ""; + }; + 97C146E51CF9000F007C117D = { + isa = PBXGroup; + children = ( + 9740EEB11CF90186004384FC /* Flutter */, + 97C146F01CF9000F007C117D /* Runner */, + 97C146EF1CF9000F007C117D /* Products */, + 331C8082294A63A400263BE5 /* RunnerTests */, + ); + sourceTree = ""; + }; + 97C146EF1CF9000F007C117D /* Products */ = { + isa = PBXGroup; + children = ( + 97C146EE1CF9000F007C117D /* Runner.app */, + 331C8081294A63A400263BE5 /* RunnerTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + 97C146F01CF9000F007C117D /* Runner */ = { + isa = PBXGroup; + children = ( + 97C146FA1CF9000F007C117D /* Main.storyboard */, + 97C146FD1CF9000F007C117D /* Assets.xcassets */, + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, + 97C147021CF9000F007C117D /* Info.plist */, + 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, + 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, + ); + path = Runner; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 331C8080294A63A400263BE5 /* RunnerTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; + buildPhases = ( + 331C807D294A63A400263BE5 /* Sources */, + 331C807F294A63A400263BE5 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 331C8086294A63A400263BE5 /* PBXTargetDependency */, + ); + name = RunnerTests; + productName = RunnerTests; + productReference = 331C8081294A63A400263BE5 /* RunnerTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; + 97C146ED1CF9000F007C117D /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 9740EEB61CF901F6004384FC /* Run Script */, + 97C146EA1CF9000F007C117D /* Sources */, + 97C146EB1CF9000F007C117D /* Frameworks */, + 97C146EC1CF9000F007C117D /* Resources */, + 9705A1C41CF9048500538489 /* Embed Frameworks */, + 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = Runner; + productName = Runner; + productReference = 97C146EE1CF9000F007C117D /* Runner.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 97C146E61CF9000F007C117D /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastUpgradeCheck = 1510; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 331C8080294A63A400263BE5 = { + CreatedOnToolsVersion = 14.0; + TestTargetID = 97C146ED1CF9000F007C117D; + }; + 97C146ED1CF9000F007C117D = { + CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; + }; + }; + }; + buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 97C146E51CF9000F007C117D; + productRefGroup = 97C146EF1CF9000F007C117D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 97C146ED1CF9000F007C117D /* Runner */, + 331C8080294A63A400263BE5 /* RunnerTests */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 331C807F294A63A400263BE5 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EC1CF9000F007C117D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, + 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, + 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, + 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${TARGET_BUILD_DIR}/${INFOPLIST_PATH}", + ); + name = "Thin Binary"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; + }; + 9740EEB61CF901F6004384FC /* Run Script */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + name = "Run Script"; + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 331C807D294A63A400263BE5 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 97C146EA1CF9000F007C117D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, + 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 331C8086294A63A400263BE5 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97C146ED1CF9000F007C117D /* Runner */; + targetProxy = 331C8085294A63A400263BE5 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 97C146FA1CF9000F007C117D /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C146FB1CF9000F007C117D /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 97C147001CF9000F007C117D /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 249021D3217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Profile; + }; + 249021D4217E4FDB00AE95B9 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = RJB4MM6RVS; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Profile; + }; + 331C8088294A63A400263BE5 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Debug; + }; + 331C8089294A63A400263BE5 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Release; + }; + 331C808A294A63A400263BE5 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + GENERATE_INFOPLIST_FILE = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker.RunnerTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner"; + }; + name = Profile; + }; + 97C147031CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 97C147041CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 97C147061CF9000F007C117D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = RJB4MM6RVS; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Debug; + }; + 97C147071CF9000F007C117D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; + DEVELOPMENT_TEAM = RJB4MM6RVS; + ENABLE_BITCODE = NO; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = com.example.gameTracker; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; + VERSIONING_SYSTEM = "apple-generic"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 331C8088294A63A400263BE5 /* Debug */, + 331C8089294A63A400263BE5 /* Release */, + 331C808A294A63A400263BE5 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147031CF9000F007C117D /* Debug */, + 97C147041CF9000F007C117D /* Release */, + 249021D3217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 97C147061CF9000F007C117D /* Debug */, + 97C147071CF9000F007C117D /* Release */, + 249021D4217E4FDB00AE95B9 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 97C146E61CF9000F007C117D /* Project object */; +} diff --git a/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 0000000..e3773d4 --- /dev/null +++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..1d526a1 --- /dev/null +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..f9b0d7c --- /dev/null +++ b/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/ios/Runner/AppDelegate.swift b/ios/Runner/AppDelegate.swift new file mode 100644 index 0000000..6266644 --- /dev/null +++ b/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import Flutter +import UIKit + +@main +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..d36b1fa --- /dev/null +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,122 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "Icon-App-1024x1024@1x.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9ada4725e9b0ddb1deab583e5b5102493aa332 GIT binary patch literal 10932 zcmeHN2~<R zh`|8`A_PQ1nSu(UMFx?8j8PC!!VDphaL#`F42fd#7Vlc`zIE4n%Y~eiz4y1j|NDpi z?<@|pSJ-HM`qifhf@m%MamgwK83`XpBA<+azdF#2QsT{X@z0A9Bq>~TVErigKH1~P zRX-!h-f0NJ4Mh++{D}J+K>~~rq}d%o%+4dogzXp7RxX4C>Km5XEI|PAFDmo;DFm6G zzjVoB`@qW98Yl0Kvc-9w09^PrsobmG*Eju^=3f?0o-t$U)TL1B3;sZ^!++3&bGZ!o-*6w?;oOhf z=A+Qb$scV5!RbG+&2S}BQ6YH!FKb0``VVX~T$dzzeSZ$&9=X$3)_7Z{SspSYJ!lGE z7yig_41zpQ)%5dr4ff0rh$@ky3-JLRk&DK)NEIHecf9c*?Z1bUB4%pZjQ7hD!A0r-@NF(^WKdr(LXj|=UE7?gBYGgGQV zidf2`ZT@pzXf7}!NH4q(0IMcxsUGDih(0{kRSez&z?CFA0RVXsVFw3^u=^KMtt95q z43q$b*6#uQDLoiCAF_{RFc{!H^moH_cmll#Fc^KXi{9GDl{>%+3qyfOE5;Zq|6#Hb zp^#1G+z^AXfRKaa9HK;%b3Ux~U@q?xg<2DXP%6k!3E)PA<#4$ui8eDy5|9hA5&{?v z(-;*1%(1~-NTQ`Is1_MGdQ{+i*ccd96ab$R$T3=% zw_KuNF@vI!A>>Y_2pl9L{9h1-C6H8<)J4gKI6{WzGBi<@u3P6hNsXG=bRq5c+z;Gc3VUCe;LIIFDmQAGy+=mRyF++u=drBWV8-^>0yE9N&*05XHZpPlE zxu@?8(ZNy7rm?|<+UNe0Vs6&o?l`Pt>P&WaL~M&#Eh%`rg@Mbb)J&@DA-wheQ>hRV z<(XhigZAT z>=M;URcdCaiO3d^?H<^EiEMDV+7HsTiOhoaMX%P65E<(5xMPJKxf!0u>U~uVqnPN7T!X!o@_gs3Ct1 zlZ_$5QXP4{Aj645wG_SNT&6m|O6~Tsl$q?nK*)(`{J4b=(yb^nOATtF1_aS978$x3 zx>Q@s4i3~IT*+l{@dx~Hst21fR*+5}S1@cf>&8*uLw-0^zK(+OpW?cS-YG1QBZ5q! zgTAgivzoF#`cSz&HL>Ti!!v#?36I1*l^mkrx7Y|K6L#n!-~5=d3;K<;Zqi|gpNUn_ z_^GaQDEQ*jfzh;`j&KXb66fWEk1K7vxQIMQ_#Wu_%3 z4Oeb7FJ`8I>Px;^S?)}2+4D_83gHEq>8qSQY0PVP?o)zAv3K~;R$fnwTmI-=ZLK`= zTm+0h*e+Yfr(IlH3i7gUclNH^!MU>id$Jw>O?2i0Cila#v|twub21@e{S2v}8Z13( zNDrTXZVgris|qYm<0NU(tAPouG!QF4ZNpZPkX~{tVf8xY690JqY1NVdiTtW+NqyRP zZ&;T0ikb8V{wxmFhlLTQ&?OP7 z;(z*<+?J2~z*6asSe7h`$8~Se(@t(#%?BGLVs$p``;CyvcT?7Y!{tIPva$LxCQ&4W z6v#F*);|RXvI%qnoOY&i4S*EL&h%hP3O zLsrFZhv&Hu5tF$Lx!8(hs&?!Kx5&L(fdu}UI5d*wn~A`nPUhG&Rv z2#ixiJdhSF-K2tpVL=)5UkXRuPAFrEW}7mW=uAmtVQ&pGE-&az6@#-(Te^n*lrH^m@X-ftVcwO_#7{WI)5v(?>uC9GG{lcGXYJ~Q8q zbMFl7;t+kV;|;KkBW2!P_o%Czhw&Q(nXlxK9ak&6r5t_KH8#1Mr-*0}2h8R9XNkr zto5-b7P_auqTJb(TJlmJ9xreA=6d=d)CVbYP-r4$hDn5|TIhB>SReMfh&OVLkMk-T zYf%$taLF0OqYF?V{+6Xkn>iX@TuqQ?&cN6UjC9YF&%q{Ut3zv{U2)~$>-3;Dp)*(? zg*$mu8^i=-e#acaj*T$pNowo{xiGEk$%DusaQiS!KjJH96XZ-hXv+jk%ard#fu=@Q z$AM)YWvE^{%tDfK%nD49=PI|wYu}lYVbB#a7wtN^Nml@CE@{Gv7+jo{_V?I*jkdLD zJE|jfdrmVbkfS>rN*+`#l%ZUi5_bMS<>=MBDNlpiSb_tAF|Zy`K7kcp@|d?yaTmB^ zo?(vg;B$vxS|SszusORgDg-*Uitzdi{dUV+glA~R8V(?`3GZIl^egW{a919!j#>f` znL1o_^-b`}xnU0+~KIFLQ)$Q6#ym%)(GYC`^XM*{g zv3AM5$+TtDRs%`2TyR^$(hqE7Y1b&`Jd6dS6B#hDVbJlUXcG3y*439D8MrK!2D~6gn>UD4Imctb z+IvAt0iaW73Iq$K?4}H`7wq6YkTMm`tcktXgK0lKPmh=>h+l}Y+pDtvHnG>uqBA)l zAH6BV4F}v$(o$8Gfo*PB>IuaY1*^*`OTx4|hM8jZ?B6HY;F6p4{`OcZZ(us-RVwDx zUzJrCQlp@mz1ZFiSZ*$yX3c_#h9J;yBE$2g%xjmGF4ca z&yL`nGVs!Zxsh^j6i%$a*I3ZD2SoNT`{D%mU=LKaEwbN(_J5%i-6Va?@*>=3(dQy` zOv%$_9lcy9+(t>qohkuU4r_P=R^6ME+wFu&LA9tw9RA?azGhjrVJKy&8=*qZT5Dr8g--d+S8zAyJ$1HlW3Olryt`yE zFIph~Z6oF&o64rw{>lgZISC6p^CBer9C5G6yq%?8tC+)7*d+ib^?fU!JRFxynRLEZ zj;?PwtS}Ao#9whV@KEmwQgM0TVP{hs>dg(1*DiMUOKHdQGIqa0`yZnHk9mtbPfoLx zo;^V6pKUJ!5#n`w2D&381#5#_t}AlTGEgDz$^;u;-vxDN?^#5!zN9ngytY@oTv!nc zp1Xn8uR$1Z;7vY`-<*?DfPHB;x|GUi_fI9@I9SVRv1)qETbNU_8{5U|(>Du84qP#7 z*l9Y$SgA&wGbj>R1YeT9vYjZuC@|{rajTL0f%N@>3$DFU=`lSPl=Iv;EjuGjBa$Gw zHD-;%YOE@<-!7-Mn`0WuO3oWuL6tB2cpPw~Nvuj|KM@))ixuDK`9;jGMe2d)7gHin zS<>k@!x;!TJEc#HdL#RF(`|4W+H88d4V%zlh(7#{q2d0OQX9*FW^`^_<3r$kabWAB z$9BONo5}*(%kx zOXi-yM_cmB3>inPpI~)duvZykJ@^^aWzQ=eQ&STUa}2uT@lV&WoRzkUoE`rR0)`=l zFT%f|LA9fCw>`enm$p7W^E@U7RNBtsh{_-7vVz3DtB*y#*~(L9+x9*wn8VjWw|Q~q zKFsj1Yl>;}%MG3=PY`$g$_mnyhuV&~O~u~)968$0b2!Jkd;2MtAP#ZDYw9hmK_+M$ zb3pxyYC&|CuAbtiG8HZjj?MZJBFbt`ryf+c1dXFuC z0*ZQhBzNBd*}s6K_G}(|Z_9NDV162#y%WSNe|FTDDhx)K!c(mMJh@h87@8(^YdK$&d*^WQe8Z53 z(|@MRJ$Lk-&ii74MPIs80WsOFZ(NX23oR-?As+*aq6b?~62@fSVmM-_*cb1RzZ)`5$agEiL`-E9s7{GM2?(KNPgK1(+c*|-FKoy}X(D_b#etO|YR z(BGZ)0Ntfv-7R4GHoXp?l5g#*={S1{u-QzxCGng*oWr~@X-5f~RA14b8~B+pLKvr4 zfgL|7I>jlak9>D4=(i(cqYf7#318!OSR=^`xxvI!bBlS??`xxWeg?+|>MxaIdH1U~#1tHu zB{QMR?EGRmQ_l4p6YXJ{o(hh-7Tdm>TAX380TZZZyVkqHNzjUn*_|cb?T? zt;d2s-?B#Mc>T-gvBmQZx(y_cfkXZO~{N zT6rP7SD6g~n9QJ)8F*8uHxTLCAZ{l1Y&?6v)BOJZ)=R-pY=Y=&1}jE7fQ>USS}xP#exo57uND0i*rEk@$;nLvRB@u~s^dwRf?G?_enN@$t* zbL%JO=rV(3Ju8#GqUpeE3l_Wu1lN9Y{D4uaUe`g>zlj$1ER$6S6@{m1!~V|bYkhZA z%CvrDRTkHuajMU8;&RZ&itnC~iYLW4DVkP<$}>#&(`UO>!n)Po;Mt(SY8Yb`AS9lt znbX^i?Oe9r_o=?})IHKHoQGKXsps_SE{hwrg?6dMI|^+$CeC&z@*LuF+P`7LfZ*yr+KN8B4{Nzv<`A(wyR@!|gw{zB6Ha ziwPAYh)oJ(nlqSknu(8g9N&1hu0$vFK$W#mp%>X~AU1ay+EKWcFdif{% z#4!4aoVVJ;ULmkQf!ke2}3hqxLK>eq|-d7Ly7-J9zMpT`?dxo6HdfJA|t)?qPEVBDv z{y_b?4^|YA4%WW0VZd8C(ZgQzRI5(I^)=Ub`Y#MHc@nv0w-DaJAqsbEHDWG8Ia6ju zo-iyr*sq((gEwCC&^TYBWt4_@|81?=B-?#P6NMff(*^re zYqvDuO`K@`mjm_Jd;mW_tP`3$cS?R$jR1ZN09$YO%_iBqh5ftzSpMQQtxKFU=FYmP zeY^jph+g<4>YO;U^O>-NFLn~-RqlHvnZl2yd2A{Yc1G@Ga$d+Q&(f^tnPf+Z7serIU};17+2DU_f4Z z@GaPFut27d?!YiD+QP@)T=77cR9~MK@bd~pY%X(h%L={{OIb8IQmf-!xmZkm8A0Ga zQSWONI17_ru5wpHg3jI@i9D+_Y|pCqVuHJNdHUauTD=R$JcD2K_liQisqG$(sm=k9;L* z!L?*4B~ql7uioSX$zWJ?;q-SWXRFhz2Jt4%fOHA=Bwf|RzhwqdXGr78y$J)LR7&3T zE1WWz*>GPWKZ0%|@%6=fyx)5rzUpI;bCj>3RKzNG_1w$fIFCZ&UR0(7S?g}`&Pg$M zf`SLsz8wK82Vyj7;RyKmY{a8G{2BHG%w!^T|Njr!h9TO2LaP^_f22Q1=l$QiU84ao zHe_#{S6;qrC6w~7{y(hs-?-j?lbOfgH^E=XcSgnwW*eEz{_Z<_xN#0001NP)t-s|Ns9~ z#rXRE|M&d=0au&!`~QyF`q}dRnBDt}*!qXo`c{v z{Djr|@Adh0(D_%#_&mM$D6{kE_x{oE{l@J5@%H*?%=t~i_`ufYOPkAEn!pfkr2$fs z652Tz0001XNklqeeKN4RM4i{jKqmiC$?+xN>3Apn^ z0QfuZLym_5b<*QdmkHjHlj811{If)dl(Z2K0A+ekGtrFJb?g|wt#k#pV-#A~bK=OT ts8>{%cPtyC${m|1#B1A6#u!Q;umknL1chzTM$P~L002ovPDHLkV1lTfnu!1a literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..797d452e458972bab9d994556c8305db4c827017 GIT binary patch literal 406 zcmV;H0crk;P))>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..6ed2d933e1120817fe9182483a228007b18ab6ae GIT binary patch literal 450 zcmV;z0X_bSP)iGWQ_5NJQ_~rNh*z)}eT%KUb z`7gNk0#AwF^#0T0?hIa^`~Ck;!}#m+_uT050aTR(J!bU#|IzRL%^UsMS#KsYnTF*!YeDOytlP4VhV?b} z%rz_<=#CPc)tU1MZTq~*2=8~iZ!lSa<{9b@2Jl;?IEV8)=fG217*|@)CCYgFze-x? zIFODUIA>nWKpE+bn~n7;-89sa>#DR>TSlqWk*!2hSN6D~Qb#VqbP~4Fk&m`@1$JGr zXPIdeRE&b2Thd#{MtDK$px*d3-Wx``>!oimf%|A-&-q*6KAH)e$3|6JV%HX{Hig)k suLT-RhftRq8b9;(V=235Wa|I=027H2wCDra;{X5v07*qoM6N<$f;9x^2LJ#7 literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000000000000000000000000000000000..4cd7b0099ca80c806f8fe495613e8d6c69460d76 GIT binary patch literal 282 zcmV+#0p(^bcu7P-R4C8Q z&e;xxFbF_Vrezo%_kH*OKhshZ6BFpG-Y1e10`QXJKbND7AMQ&cMj60B5TNObaZxYybcN07*qoM6N<$g3m;S%K!iX literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..fe730945a01f64a61e2235dbe3f45b08f7729182 GIT binary patch literal 462 zcmV;<0WtoGP)-}iV`2<;=$?g5M=KQbZ{F&YRNy7Nn@%_*5{gvDM0aKI4?ESmw z{NnZg)A0R`+4?NF_RZexyVB&^^ZvN!{I28tr{Vje;QNTz`dG&Jz0~Ek&f2;*Z7>B|cg}xYpxEFY+0YrKLF;^Q+-HreN0P{&i zK~zY`?b7ECf-n?@;d<&orQ*Q7KoR%4|C>{W^h6@&01>0SKS`dn{Q}GT%Qj_{PLZ_& zs`MFI#j-(>?bvdZ!8^xTwlY{qA)T4QLbY@j(!YJ7aXJervHy6HaG_2SB`6CC{He}f zHVw(fJWApwPq!6VY7r1w-Fs)@ox~N+q|w~e;JI~C4Vf^@d>Wvj=fl`^u9x9wd9 zR%3*Q+)t%S!MU_`id^@&Y{y7-r98lZX0?YrHlfmwb?#}^1b{8g&KzmkE(L>Z&)179 zp<)v6Y}pRl100G2FL_t(o!|l{-Q-VMg#&MKg7c{O0 z2wJImOS3Gy*Z2Qifdv~JYOp;v+U)a|nLoc7hNH;I$;lzDt$}rkaFw1mYK5_0Q(Sut zvbEloxON7$+HSOgC9Z8ltuC&0OSF!-mXv5caV>#bc3@hBPX@I$58-z}(ZZE!t-aOG zpjNkbau@>yEzH(5Yj4kZiMH32XI!4~gVXNnjAvRx;Sdg^`>2DpUEwoMhTs_st8pKG z(%SHyHdU&v%f36~uERh!bd`!T2dw;z6PrOTQ7Vt*#9F2uHlUVnb#ev_o^fh}Dzmq} zWtlk35}k=?xj28uO|5>>$yXadTUE@@IPpgH`gJ~Ro4>jd1IF|(+IX>8M4Ps{PNvmI zNj4D+XgN83gPt_Gm}`Ybv{;+&yu-C(Grdiahmo~BjG-l&mWM+{e5M1sm&=xduwgM9 z`8OEh`=F3r`^E{n_;%9weN{cf2%7=VzC@cYj+lg>+3|D|_1C@{hcU(DyQG_BvBWe? zvTv``=%b1zrol#=R`JB)>cdjpWt&rLJgVp-t?DREyuq1A%0Z4)6_WsQ7{nzjN zo!X zGXV)2i3kcZIL~_j>uIKPK_zib+3T+Nt3Mb&Br)s)UIaA}@p{wDda>7=Q|mGRp7pqY zkJ!7E{MNz$9nOwoVqpFb)}$IP24Wn2JJ=Cw(!`OXJBr45rP>>AQr$6c7slJWvbpNW z@KTwna6d?PP>hvXCcp=4F;=GR@R4E7{4VU^0p4F>v^#A|>07*qoM6N<$f*5nx ACIA2c literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..502f463a9bc882b461c96aadf492d1729e49e725 GIT binary patch literal 586 zcmV-Q0=4~#P)+}#`wDE{8-2Mebf5<{{PqV{TgVcv*r8?UZ3{-|G?_}T*&y;@cqf{ z{Q*~+qr%%p!1pS*_Uicl#q9lc(D`!D`LN62sNwq{oYw(Wmhk)k<@f$!$@ng~_5)Ru z0Z)trIA5^j{DIW^c+vT2%lW+2<(RtE2wR;4O@)Tm`Xr*?A(qYoM}7i5Yxw>D(&6ou zxz!_Xr~yNF+waPe00049Nkl*;a!v6h%{rlvIH#gW3s8p;bFr=l}mRqpW2h zw=OA%hdyL~z+UHOzl0eKhEr$YYOL-c-%Y<)=j?(bzDweB7{b+%_ypvm_cG{SvM=DK zhv{K@m>#Bw>2W$eUI#iU)Wdgs8Y3U+A$Gd&{+j)d)BmGKx+43U_!tik_YlN)>$7G! zhkE!s;%oku3;IwG3U^2kw?z+HM)jB{@zFhK8P#KMSytSthr+4!c(5c%+^UBn`0X*2 zy3(k600_CSZj?O$Qu%&$;|TGUJrptR(HzyIx>5E(2r{eA(<6t3e3I0B)7d6s7?Z5J zZ!rtKvA{MiEBm&KFtoifx>5P^Z=vl)95XJn()aS5%ad(s?4-=Tkis9IGu{`Fy8r+H07*qoM6N<$f20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec303439225b78712f49115768196d8d76f6790 GIT binary patch literal 862 zcmV-k1EKthP)20Z)wqMt%V?S?~D#06};F zA3KcL`Wb+>5ObvgQIG&ig8(;V04hz?@cqy3{mSh8o!|U|)cI!1_+!fWH@o*8vh^CU z^ws0;(c$gI+2~q^tO#GDHf@=;DncUw00J^eL_t(&-tE|HQ`%4vfZ;WsBqu-$0nu1R zq^Vj;p$clf^?twn|KHO+IGt^q#a3X?w9dXC@*yxhv&l}F322(8Y1&=P&I}~G@#h6; z1CV9ecD9ZEe87{{NtI*)_aJ<`kJa z?5=RBtFF50s;jQLFil-`)m2wrb=6h(&brpj%nG_U&ut~$?8Rokzxi8zJoWr#2dto5 zOX_URcc<1`Iky+jc;A%Vzx}1QU{2$|cKPom2Vf1{8m`vja4{F>HS?^Nc^rp}xo+Nh zxd}eOm`fm3@MQC1< zIk&aCjb~Yh%5+Yq0`)D;q{#-Uqlv*o+Oor zE!I71Z@ASH3grl8&P^L0WpavHoP|UX4e?!igT`4?AZk$hu*@%6WJ;zDOGlw7kj@ zY5!B-0ft0f?Lgb>C;$Ke07*qoM6N<$f~t1N9smFU literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..e9f5fea27c705180eb716271f41b582e76dcbd90 GIT binary patch literal 1674 zcmV;526g#~P){YQnis^a@{&-nmRmq)<&%Mztj67_#M}W?l>kYSliK<%xAp;0j{!}J0!o7b zE>q9${Lb$D&h7k=+4=!ek^n+`0zq>LL1O?lVyea53S5x`Nqqo2YyeuIrQrJj9XjOp z{;T5qbj3}&1vg1VK~#9!?b~^C5-}JC@Pyrv-6dSEqJqT}#j9#dJ@GzT@B8}x zU&J@bBI>f6w6en+CeI)3^kC*U?}X%OD8$Fd$H&LV$H&LV$H&LV#|K5~mLYf|VqzOc zkc7qL~0sOYuM{tG`rYEDV{DWY`Z8&)kW*hc2VkBuY+^Yx&92j&StN}Wp=LD zxoGxXw6f&8sB^u})h@b@z0RBeD`K7RMR9deyL(ZJu#39Z>rT)^>v}Khq8U-IbIvT> z?4pV9qGj=2)TNH3d)=De<+^w;>S7m_eFKTvzeaBeir45xY!^m!FmxnljbSS_3o=g( z->^wC9%qkR{kbGnW8MfFew_o9h3(r55Is`L$8KI@d+*%{=Nx+FXJ98L0PjFIu;rGnnfY zn1R5Qnp<{Jq0M1vX=X&F8gtLmcWv$1*M@4ZfF^9``()#hGTeKeP`1!iED ztNE(TN}M5}3Bbc*d=FIv`DNv&@|C6yYj{sSqUj5oo$#*0$7pu|Dd2TLI>t5%I zIa4Dvr(iayb+5x=j*Vum9&irk)xV1`t509lnPO0%skL8_1c#Xbamh(2@f?4yUI zhhuT5<#8RJhGz4%b$`PJwKPAudsm|at?u;*hGgnA zU1;9gnxVBC)wA(BsB`AW54N{|qmikJR*%x0c`{LGsSfa|NK61pYH(r-UQ4_JXd!Rsz)=k zL{GMc5{h138)fF5CzHEDM>+FqY)$pdN3}Ml+riTgJOLN0F*Vh?{9ESR{SVVg>*>=# zix;VJHPtvFFCRY$Ks*F;VX~%*r9F)W`PmPE9F!(&s#x07n2<}?S{(ygpXgX-&B&OM zONY&BRQ(#%0%jeQs?oJ4P!p*R98>qCy5p8w>_gpuh39NcOlp)(wOoz0sY-Qz55eB~ z7OC-fKBaD1sE3$l-6QgBJO!n?QOTza`!S_YK z_v-lm^7{VO^8Q@M_^8F)09Ki6%=s?2_5eupee(w1FB%aqSweusQ-T+CH0Xt{` zFjMvW{@C&TB)k25()nh~_yJ9coBRL(0oO@HK~z}7?bm5j;y@69;bvlHb2tf!$ReA~x{22wTq550 z?f?Hnw(;m3ip30;QzdV~7pi!wyMYhDtXW#cO7T>|f=bdFhu+F!zMZ2UFj;GUKX7tI z;hv3{q~!*pMj75WP_c}>6)IWvg5_yyg<9Op()eD1hWC19M@?_9_MHec{Z8n3FaF{8 z;u`Mw0ly(uE>*CgQYv{be6ab2LWhlaH1^iLIM{olnag$78^Fd}%dR7;JECQ+hmk|o z!u2&!3MqPfP5ChDSkFSH8F2WVOEf0(E_M(JL17G}Y+fg0_IuW%WQ zG(mG&u?|->YSdk0;8rc{yw2@2Z&GA}z{Wb91Ooz9VhA{b2DYE7RmG zjL}?eq#iX%3#k;JWMx_{^2nNax`xPhByFiDX+a7uTGU|otOvIAUy|dEKkXOm-`aWS z27pUzD{a)Ct<6p{{3)+lq@i`t@%>-wT4r?*S}k)58e09WZYP0{{R3FC5Sl00039P)t-s|Ns9~ z#rP?<_5oL$Q^olD{r_0T`27C={r>*`|Nj71npVa5OTzc(_WfbW_({R{p56NV{r*M2 z_xt?)2V0#0NsfV0u>{42ctGP(8vQj-Btk1n|O0ZD=YLwd&R{Ko41Gr9H= zY@z@@bOAMB5Ltl$E>bJJ{>JP30ZxkmI%?eW{k`b?Wy<&gOo;dS`~CR$Vwb@XWtR|N zi~t=w02?-0&j0TD{>bb6sNwsK*!p?V`RMQUl(*DVjk-9Cx+-z1KXab|Ka2oXhX5f% z`$|e!000AhNklrxs)5QTeTVRiEmz~MKK1WAjCw(c-JK6eox;2O)?`? zTG`AHia671e^vgmp!llKp|=5sVHk#C7=~epA~VAf-~%aPC=%Qw01h8mnSZ|p?hz91 z7p83F3%LVu9;S$tSI$C^%^yud1dfTM_6p2|+5Ejp$bd`GDvbR|xit>i!ZD&F>@CJrPmu*UjD&?DfZs=$@e3FQA(vNiU+$A*%a} z?`XcG2jDxJ_ZQ#Md`H{4Lpf6QBDp81_KWZ6Tk#yCy1)32zO#3<7>b`eT7UyYH1eGz z;O(rH$=QR*L%%ZcBpc=eGua?N55nD^K(8<#gl2+pN_j~b2MHs4#mcLmv%DkspS-3< zpI1F=^9siI0s-;IN_IrA;5xm~3?3!StX}pUv0vkxMaqm+zxrg7X7(I&*N~&dEd0kD z-FRV|g=|QuUsuh>-xCI}vD2imzYIOIdcCVV=$Bz@*u0+Bs<|L^)32nN*=wu3n%Ynw z@1|eLG>!8ruU1pFXUfb`j>(=Gy~?Rn4QJ-c3%3T|(Frd!bI`9u&zAnyFYTqlG#&J7 zAkD(jpw|oZLNiA>;>hgp1KX7-wxC~31II47gc zHcehD6Uxlf%+M^^uN5Wc*G%^;>D5qT{>=uxUhX%WJu^Z*(_Wq9y}npFO{Hhb>s6<9 zNi0pHXWFaVZnb)1+RS&F)xOv6&aeILcI)`k#0YE+?e)5&#r7J#c`3Z7x!LpTc01dx zrdC3{Z;joZ^KN&))zB_i)I9fWedoN>Zl-6_Iz+^G&*ak2jpF07*qoM6N<$f;w%0(f|Me literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..0467bf12aa4d28f374bb26596605a46dcbb3e7c8 GIT binary patch literal 1418 zcmV;51$Fv~P)q zKfU)WzW*n(@|xWGCA9ScMt*e9`2kdxPQ&&>|-UCa7_51w+ zLUsW@ZzZSW0y$)Hp~e9%PvP|a03ks1`~K?q{u;6NC8*{AOqIUq{CL&;p56Lf$oQGq z^={4hPQv)y=I|4n+?>7Fim=dxt1 z2H+Dm+1+fh+IF>G0SjJMkQQre1x4|G*Z==(Ot&kCnUrL4I(rf(ucITwmuHf^hXiJT zkdTm&kdTm&kdTm&kdP`esgWG0BcWCVkVZ&2dUwN`cgM8QJb`Z7Z~e<&Yj2(}>Tmf` zm1{eLgw!b{bXkjWbF%dTkTZEJWyWOb##Lfw4EK2}<0d6%>AGS{po>WCOy&f$Tay_> z?NBlkpo@s-O;0V%Y_Xa-G#_O08q5LR*~F%&)}{}r&L%Sbs8AS4t7Y0NEx*{soY=0MZExqA5XHQkqi#4gW3 zqODM^iyZl;dvf)-bOXtOru(s)Uc7~BFx{w-FK;2{`VA?(g&@3z&bfLFyctOH!cVsF z7IL=fo-qBndRUm;kAdXR4e6>k-z|21AaN%ubeVrHl*<|s&Ax@W-t?LR(P-24A5=>a z*R9#QvjzF8n%@1Nw@?CG@6(%>+-0ASK~jEmCV|&a*7-GKT72W<(TbSjf)&Eme6nGE z>Gkj4Sq&2e+-G%|+NM8OOm5zVl9{Z8Dd8A5z3y8mZ=4Bv4%>as_{9cN#bm~;h>62( zdqY93Zy}v&c4n($Vv!UybR8ocs7#zbfX1IY-*w~)p}XyZ-SFC~4w>BvMVr`dFbelV{lLL0bx7@*ZZdebr3`sP;? zVImji)kG)(6Juv0lz@q`F!k1FE;CQ(D0iG$wchPbKZQELlsZ#~rt8#90Y_Xh&3U-< z{s<&cCV_1`^TD^ia9!*mQDq& zn2{r`j};V|uV%_wsP!zB?m%;FeaRe+X47K0e+KE!8C{gAWF8)lCd1u1%~|M!XNRvw zvtqy3iz0WSpWdhn6$hP8PaRBmp)q`#PCA`Vd#Tc$@f1tAcM>f_I@bC)hkI9|o(Iqv zo}Piadq!j76}004RBio<`)70k^`K1NK)q>w?p^C6J2ZC!+UppiK6&y3Kmbv&O!oYF z34$0Z;QO!JOY#!`qyGH<3Pd}Pt@q*A0V=3SVtWKRR8d8Z&@)3qLPA19LPA19LPEUC YUoZo%k(ykuW&i*H07*qoM6N<$f+CH{y8r+H literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json new file mode 100644 index 0000000..0bedcf2 --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "LaunchImage.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "filename" : "LaunchImage@3x.png", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..9da19eacad3b03bb08bbddbbf4ac48dd78b3d838 GIT binary patch literal 68 zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx0wlM}@Gt=>Zci7-kcv6Uzs@r-FtIZ-&5|)J Q1PU{Fy85}Sb4q9e0B4a5jsO4v literal 0 HcmV?d00001 diff --git a/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md new file mode 100644 index 0000000..89c2725 --- /dev/null +++ b/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md @@ -0,0 +1,5 @@ +# Launch Screen Assets + +You can customize the launch screen with your own desired assets by replacing the image files in this directory. + +You can also do it by opening your Flutter project's Xcode project with `open ios/Runner.xcworkspace`, selecting `Runner/Assets.xcassets` in the Project Navigator and dropping in the desired images. \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000..f2e259c --- /dev/null +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Base.lproj/Main.storyboard b/ios/Runner/Base.lproj/Main.storyboard new file mode 100644 index 0000000..f3c2851 --- /dev/null +++ b/ios/Runner/Base.lproj/Main.storyboard @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist new file mode 100644 index 0000000..048157d --- /dev/null +++ b/ios/Runner/Info.plist @@ -0,0 +1,49 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + Game Tracker + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + game_tracker + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleSignature + ???? + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSupportsIndirectInputEvents + + + diff --git a/ios/Runner/Runner-Bridging-Header.h b/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 0000000..308a2a5 --- /dev/null +++ b/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/ios/RunnerTests/RunnerTests.swift b/ios/RunnerTests/RunnerTests.swift new file mode 100644 index 0000000..86a7c3b --- /dev/null +++ b/ios/RunnerTests/RunnerTests.swift @@ -0,0 +1,12 @@ +import Flutter +import UIKit +import XCTest + +class RunnerTests: XCTestCase { + + func testExample() { + // If you add code to the Runner application, consider adding tests here. + // See https://developer.apple.com/documentation/xctest for more information about using XCTest. + } + +} From 12bb2da31c46836b30088d86368d4b4100ec05c6 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 23 Jun 2025 23:01:05 +0200 Subject: [PATCH 13/62] Updated pubspec.yaml --- pubspec.yaml | 75 +++------------------------------------------------- 1 file changed, 3 insertions(+), 72 deletions(-) diff --git a/pubspec.yaml b/pubspec.yaml index aa5fa8a..7f2a6a8 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,89 +1,20 @@ name: game_tracker -description: "A new Flutter project." -# The following line prevents the package from being accidentally published to -# pub.dev using `flutter pub publish`. This is preferred for private packages. -publish_to: 'none' # Remove this line if you wish to publish to pub.dev - -# The following defines the version and build number for your application. -# A version number is three numbers separated by dots, like 1.2.43 -# followed by an optional build number separated by a +. -# Both the version and the builder number may be overridden in flutter -# build by specifying --build-name and --build-number, respectively. -# In Android, build-name is used as versionName while build-number used as versionCode. -# Read more about Android versioning at https://developer.android.com/studio/publish/versioning -# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion. -# Read more about iOS versioning at -# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html -# In Windows, build-name is used as the major, minor, and patch parts -# of the product and file versions while build-number is used as the build suffix. -version: 1.0.0+1 +description: "Game Tracking App for Card Games" +publish_to: 'none' +version: 0.0.1+1 environment: sdk: ^3.8.1 -# Dependencies specify other packages that your package needs in order to work. -# To automatically upgrade your package dependencies to the latest versions -# consider running `flutter pub upgrade --major-versions`. Alternatively, -# dependencies can be manually updated by changing the version numbers below to -# the latest version available on pub.dev. To see which dependencies have newer -# versions available, run `flutter pub outdated`. dependencies: flutter: sdk: flutter - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^1.0.8 dev_dependencies: flutter_test: sdk: flutter - - # The "flutter_lints" package below contains a set of recommended lints to - # encourage good coding practices. The lint set provided by the package is - # activated in the `analysis_options.yaml` file located at the root of your - # package. See that file for information about deactivating specific lint - # rules and activating additional ones. flutter_lints: ^5.0.0 -# For information on the generic Dart part of this file, see the -# following page: https://dart.dev/tools/pub/pubspec - -# The following section is specific to Flutter packages. flutter: - - # The following line ensures that the Material Icons font is - # included with your application, so that you can use the icons in - # the material Icons class. uses-material-design: true - - # To add assets to your application, add an assets section, like this: - # assets: - # - images/a_dot_burr.jpeg - # - images/a_dot_ham.jpeg - - # An image asset can refer to one or more resolution-specific "variants", see - # https://flutter.dev/to/resolution-aware-images - - # For details regarding adding assets from package dependencies, see - # https://flutter.dev/to/asset-from-package - - # To add custom fonts to your application, add a fonts section here, - # in this "flutter" section. Each entry in this list should have a - # "family" key with the font family name, and a "fonts" key with a - # list giving the asset and other descriptors for the font. For - # example: - # fonts: - # - family: Schyler - # fonts: - # - asset: fonts/Schyler-Regular.ttf - # - asset: fonts/Schyler-Italic.ttf - # style: italic - # - family: Trajan Pro - # fonts: - # - asset: fonts/TrajanPro.ttf - # - asset: fonts/TrajanPro_Bold.ttf - # weight: 700 - # - # For details regarding fonts from package dependencies, - # see https://flutter.dev/to/font-from-package From 36a42a7b8de935ca61480a23df789828d5a1cd5a Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 23 Jun 2025 23:47:40 +0200 Subject: [PATCH 14/62] Added mocked views --- .../views/main_menu/game_history_view.dart | 10 ++++++++++ lib/presentation/views/main_menu/groups_view.dart | 10 ++++++++++ lib/presentation/views/main_menu/home_view.dart | 10 ++++++++++ lib/presentation/views/main_menu/settings_view.dart | 10 ++++++++++ lib/presentation/views/main_menu/statistics_view.dart | 10 ++++++++++ 5 files changed, 50 insertions(+) create mode 100644 lib/presentation/views/main_menu/game_history_view.dart create mode 100644 lib/presentation/views/main_menu/groups_view.dart create mode 100644 lib/presentation/views/main_menu/home_view.dart create mode 100644 lib/presentation/views/main_menu/settings_view.dart create mode 100644 lib/presentation/views/main_menu/statistics_view.dart diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart new file mode 100644 index 0000000..4516dd6 --- /dev/null +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class GameHistoryView extends StatelessWidget { + const GameHistoryView({super.key}); + + @override + Widget build(BuildContext context) { + return const Center(child: Text('Game History View')); + } +} diff --git a/lib/presentation/views/main_menu/groups_view.dart b/lib/presentation/views/main_menu/groups_view.dart new file mode 100644 index 0000000..485d516 --- /dev/null +++ b/lib/presentation/views/main_menu/groups_view.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class GroupsView extends StatelessWidget { + const GroupsView({super.key}); + + @override + Widget build(BuildContext context) { + return const Center(child: Text('Groups View')); + } +} diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart new file mode 100644 index 0000000..fb23bc1 --- /dev/null +++ b/lib/presentation/views/main_menu/home_view.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class HomeView extends StatelessWidget { + const HomeView({super.key}); + + @override + Widget build(BuildContext context) { + return const Center(child: Text('Home View')); + } +} diff --git a/lib/presentation/views/main_menu/settings_view.dart b/lib/presentation/views/main_menu/settings_view.dart new file mode 100644 index 0000000..39bd978 --- /dev/null +++ b/lib/presentation/views/main_menu/settings_view.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class SettingsView extends StatelessWidget { + const SettingsView({super.key}); + + @override + Widget build(BuildContext context) { + return const Center(child: Text('Settings View')); + } +} diff --git a/lib/presentation/views/main_menu/statistics_view.dart b/lib/presentation/views/main_menu/statistics_view.dart new file mode 100644 index 0000000..84ccf77 --- /dev/null +++ b/lib/presentation/views/main_menu/statistics_view.dart @@ -0,0 +1,10 @@ +import 'package:flutter/cupertino.dart'; + +class StatisticsView extends StatelessWidget { + const StatisticsView({super.key}); + + @override + Widget build(BuildContext context) { + return const Center(child: Text('Statistics View')); + } +} From c78a3ed171b959e79a82e6619ca65d14279e5ee0 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 23 Jun 2025 23:47:59 +0200 Subject: [PATCH 15/62] Implemented custom navigation bar --- lib/core/custom_theme.dart | 19 ++++ lib/main.dart | 12 ++- lib/presentation/views/home_view.dart | 10 -- .../main_menu/custom_navigation_bar.dart | 101 ++++++++++++++++++ pubspec.yaml | 3 +- 5 files changed, 129 insertions(+), 16 deletions(-) create mode 100644 lib/core/custom_theme.dart delete mode 100644 lib/presentation/views/home_view.dart create mode 100644 lib/presentation/views/main_menu/custom_navigation_bar.dart diff --git a/lib/core/custom_theme.dart b/lib/core/custom_theme.dart new file mode 100644 index 0000000..afc8dee --- /dev/null +++ b/lib/core/custom_theme.dart @@ -0,0 +1,19 @@ +import 'package:flutter/material.dart'; + +class CustomTheme { + static Color primaryColor = const Color(0xFF71C0BB); + static Color secondaryColor = const Color(0xFF2A4759); + static Color backgroundColor = const Color(0xFF1A1A1A); + + static AppBarTheme appBarTheme = const AppBarTheme( + backgroundColor: Color(0xFF1A1A1A), + foregroundColor: Colors.white, + elevation: 0, + titleTextStyle: TextStyle( + color: Colors.white, + fontSize: 20, + fontWeight: FontWeight.bold, + ), + iconTheme: IconThemeData(color: Colors.white), + ); +} diff --git a/lib/main.dart b/lib/main.dart index 1188332..656788b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; -import 'package:game_tracker/presentation/views/home_view.dart'; +import 'package:game_tracker/core/custom_theme.dart'; +import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; void main() { runApp(const MyApp()); @@ -11,11 +12,12 @@ class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( + debugShowCheckedModeBanner: false, title: 'Game Tracker', - theme: ThemeData( - colorScheme: ColorScheme.fromSeed(seedColor: Colors.deepPurple), - ), - home: const HomeView(), + themeMode: ThemeMode.dark, + darkTheme: ThemeData.dark(), + theme: ThemeData(appBarTheme: CustomTheme.appBarTheme), + home: const CustomNavigationBar(), ); } } diff --git a/lib/presentation/views/home_view.dart b/lib/presentation/views/home_view.dart deleted file mode 100644 index 234dc1a..0000000 --- a/lib/presentation/views/home_view.dart +++ /dev/null @@ -1,10 +0,0 @@ -import 'package:flutter/material.dart'; - -class HomeView extends StatelessWidget { - const HomeView({super.key}); - - @override - Widget build(BuildContext context) { - return const Placeholder(); - } -} diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart new file mode 100644 index 0000000..0be94fe --- /dev/null +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -0,0 +1,101 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; +import 'package:game_tracker/presentation/views/main_menu/game_history_view.dart'; +import 'package:game_tracker/presentation/views/main_menu/groups_view.dart'; +import 'package:game_tracker/presentation/views/main_menu/home_view.dart'; +import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart'; + +class CustomNavigationBar extends StatefulWidget { + const CustomNavigationBar({super.key}); + + @override + State createState() => _CustomNavigationBarState(); +} + +class _CustomNavigationBarState extends State + with SingleTickerProviderStateMixin { + int currentIndex = 0; + final List tabs = [ + const HomeView(), + const GameHistoryView(), + const GroupsView(), + const StatisticsView(), + ]; + + void onTabTapped(int index) { + setState(() { + currentIndex = index; + }); + } + + @override + void initState() { + super.initState(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + backgroundColor: CustomTheme.backgroundColor, + actions: [ + IconButton(onPressed: () {}, icon: const Icon(Icons.settings)), + ], + elevation: 0, + ), + backgroundColor: CustomTheme.backgroundColor, + body: tabs[currentIndex], + extendBody: true, + floatingActionButton: FloatingActionButton( + shape: const CircleBorder(), + backgroundColor: CustomTheme.primaryColor, + onPressed: () {}, + child: const Icon(Icons.add), + ), + floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, + bottomNavigationBar: BottomAppBar( + padding: const EdgeInsets.symmetric(horizontal: 10), + elevation: 10, + height: 60, + color: CustomTheme.primaryColor, + shape: const CircularNotchedRectangle(), + notchMargin: 5, + child: Row( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + IconButton( + icon: Icon( + Icons.home, + color: currentIndex == 0 ? Colors.white : Colors.black, + ), + onPressed: () => onTabTapped(0), + ), + IconButton( + icon: Icon( + Icons.history, + color: currentIndex == 1 ? Colors.white : Colors.black, + ), + onPressed: () => onTabTapped(1), + ), + const SizedBox(width: 40), + IconButton( + icon: Icon( + Icons.group, + color: currentIndex == 2 ? Colors.white : Colors.black, + ), + onPressed: () => onTabTapped(2), + ), + IconButton( + icon: Icon( + Icons.bar_chart, + color: currentIndex == 3 ? Colors.white : Colors.black, + ), + onPressed: () => onTabTapped(3), + ), + ], + ), + ), + ); + } +} diff --git a/pubspec.yaml b/pubspec.yaml index 7f2a6a8..992bd8f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.1+1 +version: 0.0.1+18 environment: sdk: ^3.8.1 @@ -9,6 +9,7 @@ environment: dependencies: flutter: sdk: flutter + material_symbols_icons: ^4.2815.1 dev_dependencies: From 348b812f9ccb9603fe8eedb1d0db2d6dacd96552 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Mon, 23 Jun 2025 23:55:25 +0200 Subject: [PATCH 16/62] Theme changes & settings navigation --- lib/main.dart | 15 +++++++++++-- .../main_menu/custom_navigation_bar.dart | 21 ++++++++++++------- .../views/main_menu/settings_view.dart | 7 +++++-- pubspec.yaml | 2 +- 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 656788b..9577865 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -14,9 +14,20 @@ class MyApp extends StatelessWidget { return MaterialApp( debugShowCheckedModeBanner: false, title: 'Game Tracker', - themeMode: ThemeMode.dark, darkTheme: ThemeData.dark(), - theme: ThemeData(appBarTheme: CustomTheme.appBarTheme), + + themeMode: ThemeMode.dark, // forces light mode + theme: ThemeData( + primaryColor: CustomTheme.primaryColor, + scaffoldBackgroundColor: CustomTheme.backgroundColor, + appBarTheme: CustomTheme.appBarTheme, + + colorScheme: ColorScheme.fromSeed( + seedColor: CustomTheme.primaryColor, + brightness: Brightness.dark, + ).copyWith(surface: CustomTheme.backgroundColor), + ), + home: const CustomNavigationBar(), ); } diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 0be94fe..3b2629a 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -3,6 +3,7 @@ import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/presentation/views/main_menu/game_history_view.dart'; import 'package:game_tracker/presentation/views/main_menu/groups_view.dart'; import 'package:game_tracker/presentation/views/main_menu/home_view.dart'; +import 'package:game_tracker/presentation/views/main_menu/settings_view.dart'; import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart'; class CustomNavigationBar extends StatefulWidget { @@ -22,12 +23,6 @@ class _CustomNavigationBarState extends State const StatisticsView(), ]; - void onTabTapped(int index) { - setState(() { - currentIndex = index; - }); - } - @override void initState() { super.initState(); @@ -39,7 +34,13 @@ class _CustomNavigationBarState extends State appBar: AppBar( backgroundColor: CustomTheme.backgroundColor, actions: [ - IconButton(onPressed: () {}, icon: const Icon(Icons.settings)), + IconButton( + onPressed: () => Navigator.push( + context, + MaterialPageRoute(builder: (_) => const SettingsView()), + ), + icon: const Icon(Icons.settings), + ), ], elevation: 0, ), @@ -98,4 +99,10 @@ class _CustomNavigationBarState extends State ), ); } + + void onTabTapped(int index) { + setState(() { + currentIndex = index; + }); + } } diff --git a/lib/presentation/views/main_menu/settings_view.dart b/lib/presentation/views/main_menu/settings_view.dart index 39bd978..c3e75f3 100644 --- a/lib/presentation/views/main_menu/settings_view.dart +++ b/lib/presentation/views/main_menu/settings_view.dart @@ -1,10 +1,13 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; class SettingsView extends StatelessWidget { const SettingsView({super.key}); @override Widget build(BuildContext context) { - return const Center(child: Text('Settings View')); + return Scaffold( + appBar: AppBar(title: const Text('Einstellungen')), + body: const Center(child: Text('Settings View')), + ); } } diff --git a/pubspec.yaml b/pubspec.yaml index 992bd8f..abc2e18 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: game_tracker description: "Game Tracking App for Card Games" publish_to: 'none' -version: 0.0.1+18 +version: 0.0.1+21 environment: sdk: ^3.8.1 From 27f501646b5f06f405acef0e137f5da8eb19fd22 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 13:57:03 +0200 Subject: [PATCH 17/62] fix appbar color change on scroll --- lib/presentation/views/main_menu/custom_navigation_bar.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 3b2629a..6bf16d2 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -33,6 +33,7 @@ class _CustomNavigationBarState extends State return Scaffold( appBar: AppBar( backgroundColor: CustomTheme.backgroundColor, + scrolledUnderElevation: 0, actions: [ IconButton( onPressed: () => Navigator.push( From 502515002dd92039b47b2c185024609812d869d1 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 14:30:33 +0200 Subject: [PATCH 18/62] added changing appbar title for each tab --- .../main_menu/custom_navigation_bar.dart | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 6bf16d2..57b8519 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -32,6 +32,14 @@ class _CustomNavigationBarState extends State Widget build(BuildContext context) { return Scaffold( appBar: AppBar( + centerTitle: true, + title: Text( + _currentTabTitle(), + style: const TextStyle( + fontSize: 20, + fontWeight: FontWeight.bold, + ), + ), backgroundColor: CustomTheme.backgroundColor, scrolledUnderElevation: 0, actions: [ @@ -83,7 +91,7 @@ class _CustomNavigationBarState extends State const SizedBox(width: 40), IconButton( icon: Icon( - Icons.group, + Icons.groups, color: currentIndex == 2 ? Colors.white : Colors.black, ), onPressed: () => onTabTapped(2), @@ -106,4 +114,18 @@ class _CustomNavigationBarState extends State currentIndex = index; }); } -} + String _currentTabTitle() { + switch (currentIndex) { + case 0: + return 'Home'; + case 1: + return 'Game History'; + case 2: + return 'Groups'; + case 3: + return 'Statistics'; + default: + return ''; + } + } +} \ No newline at end of file From 0c2ec4167e541af945b99a23b4dc419c37a77c70 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 14:31:06 +0200 Subject: [PATCH 19/62] implemented game history view with searchbar --- .../views/main_menu/game_history_view.dart | 183 +++++++++++++++++- 1 file changed, 180 insertions(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 4516dd6..85d8454 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -1,10 +1,187 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; +import 'package:game_tracker/presentation/widgets/game_history_empty_builder.dart'; +import 'package:game_tracker/presentation/widgets/game_history_listtile.dart'; -class GameHistoryView extends StatelessWidget { +class GameHistoryView extends StatefulWidget { const GameHistoryView({super.key}); + @override + State createState() => _GameHistoryViewState(); +} + +class _GameHistoryViewState extends State { + final allGameData = [ + { + 'game': 'Schach', + 'title': 'Abendpartie', + 'players': 2, + 'group': 'Familie', + 'date': '01.06.2024', + }, + { + 'game': 'Monopoly', + 'title': 'Wochenendspaß', + 'players': 4, + 'group': 'Freunde', + 'date': '28.05.2024', + }, + { + 'game': 'Catan', + 'title': 'Strategieabend', + 'players': 3, + 'group': 'Brettspieler', + 'date': '25.05.2024', + }, + { + 'game': 'Uno', + 'title': 'Schnelle Runde', + 'players': 5, + 'group': 'Kollegen', + 'date': '22.05.2024', + }, + { + 'game': 'Poker', + 'title': 'Freitagspoker', + 'players': 6, + 'group': 'Pokerclub', + 'date': '20.05.2024', + }, + { + 'game': 'Scrabble', + 'title': 'Wortschlacht', + 'players': 4, + 'group': 'Familie', + 'date': '18.05.2024', + }, + { + 'game': 'Risiko', + 'title': 'Weltherrschaft', + 'players': 5, + 'group': 'Strategiegruppe', + 'date': '15.05.2024', + }, + { + 'game': 'Zug um Zug', + 'title': 'Zug-Abenteuer', + 'players': 4, + 'group': 'Reisende', + 'date': '12.05.2024', + }, + { + 'game': 'Carcassonne', + 'title': 'Plättchenlegen', + 'players': 3, + 'group': 'Brettspieler', + 'date': '10.05.2024', + }, + { + 'game': 'Pandemie', + 'title': 'Welt retten', + 'players': 4, + 'group': 'Koop-Team', + 'date': '08.05.2024', + }, + { + 'game': 'Cluedo', + 'title': 'Krimiabend', + 'players': 6, + 'group': 'Detektive', + 'date': '05.05.2024', + }, + { + 'game': 'Dixit', + 'title': 'Fantasiespiel', + 'players': 5, + 'group': 'Künstler', + 'date': '02.05.2024', + }, + { + 'game': 'Azul', + 'title': 'Plättchenmeister', + 'players': 4, + 'group': 'Familie', + 'date': '30.04.2024', + }, + { + 'game': 'Splendor', + 'title': 'Edelsteinhändler', + 'players': 3, + 'group': 'Freunde', + 'date': '28.04.2024', + }, + { + 'game': '7 Wonders', + 'title': 'Antike Reiche', + 'players': 7, + 'group': 'Geschichtsfreunde', + 'date': '25.04.2024', + }, + ]; + late List> suggestedGameData; + + @override + void initState() { + super.initState(); + suggestedGameData = List.from(allGameData); + } + @override Widget build(BuildContext context) { - return const Center(child: Text('Game History View')); + return Scaffold( + backgroundColor: CustomTheme.backgroundColor, + body: Stack( + children: [ + Column( + children: [ + Container( + margin: EdgeInsets.only(bottom: 75), + ), + Expanded( + child: gameHistoryListView(allGameData, suggestedGameData), + ), + ], + ), + Container( + margin: EdgeInsets.only(top: 10, bottom: 10, left: 10, right: 10), + child: SearchBar( + leading: Icon(Icons.search), + onChanged:(value) { + if (value.isEmpty) { + setState(() { + suggestedGameData.clear(); + suggestedGameData.addAll(allGameData); + }); + return; + } + final suggestions = allGameData.where((currentGame) { + return currentGame['game'].toString().toLowerCase().contains(value.toLowerCase()) || + currentGame['title'].toString().toLowerCase().contains(value.toLowerCase()) || + currentGame['group'].toString().toLowerCase().contains(value.toLowerCase()); + }); + setState(() { + suggestedGameData.clear(); + suggestedGameData.addAll(suggestions); + }); + }, + ), + ), + ], + ), + ); } } + +Widget gameHistoryListView(allGameData, suggestedGameData) { + if (suggestedGameData.isEmpty && allGameData.isEmpty) { + return GameHistoryEmptyBuilder("Keine Spiele erstellt"); + } else if (suggestedGameData.isEmpty) { + return GameHistoryEmptyBuilder("Kein Spiel mit den Suchparametern gefunden."); + } + return ListView.builder( + itemCount: suggestedGameData.length, + itemBuilder: (context, index) { + final currentGame = suggestedGameData[index]; + return GameHistoryListTile(currentGame); + }); +} \ No newline at end of file From c644a06173dfbbbd5a67ced317d0ab0aac269c09 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 14:31:33 +0200 Subject: [PATCH 20/62] implemented empty builder widget for game history view --- .../widgets/game_history_empty_builder.dart | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 lib/presentation/widgets/game_history_empty_builder.dart diff --git a/lib/presentation/widgets/game_history_empty_builder.dart b/lib/presentation/widgets/game_history_empty_builder.dart new file mode 100644 index 0000000..db3c974 --- /dev/null +++ b/lib/presentation/widgets/game_history_empty_builder.dart @@ -0,0 +1,15 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/presentation/widgets/game_history_listtile.dart'; + +Widget GameHistoryEmptyBuilder(message) { + return Container( + padding: EdgeInsets.only(top:100), + margin: EdgeInsets.only(left: 10, right: 10), + alignment: Alignment.topCenter, + child: Text( + "$message", + style: TextStyle(fontSize: 20), + textAlign: TextAlign.center, + ) + ); +} \ No newline at end of file From 8e2863d70a15977b037247cece7c6ae0130cdf39 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 14:31:47 +0200 Subject: [PATCH 21/62] implemented list tile widget for game history view --- .../widgets/game_history_listtile.dart | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 lib/presentation/widgets/game_history_listtile.dart diff --git a/lib/presentation/widgets/game_history_listtile.dart b/lib/presentation/widgets/game_history_listtile.dart new file mode 100644 index 0000000..473476c --- /dev/null +++ b/lib/presentation/widgets/game_history_listtile.dart @@ -0,0 +1,32 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +Widget GameHistoryListTile(currentGame){ + return Container( + margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + color: CustomTheme.secondaryColor, + ), + child: Column( + children: [ + Row( + children: [ + Text("${currentGame['game']}: ", style: TextStyle(fontSize: 20)), + Text("${currentGame['title']}", style: TextStyle(fontSize: 20)), + Spacer(), + Text("${currentGame['players']} Spieler", style: TextStyle(fontSize: 20)) + ], + ), + Row( + children: [ + Text("${currentGame['group']}", style: TextStyle(fontSize: 20)), + Spacer(), + Text("${currentGame['date']}", style: TextStyle(fontSize: 20)) + ], + ), + ], + ), + ); +} \ No newline at end of file From 80e47589caacc64938282af4e4226ffa00a314e2 Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:49:50 +0200 Subject: [PATCH 22/62] added type annotation for currentgame in GameHistoryListTile Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/presentation/widgets/game_history_listtile.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/widgets/game_history_listtile.dart b/lib/presentation/widgets/game_history_listtile.dart index 473476c..ccc818d 100644 --- a/lib/presentation/widgets/game_history_listtile.dart +++ b/lib/presentation/widgets/game_history_listtile.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; -Widget GameHistoryListTile(currentGame){ +Widget GameHistoryListTile(Map currentGame){ return Container( margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), padding: EdgeInsets.all(10), From 46404e3ebf93ba9931b2ec4fe79936cfaadf0707 Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:50:24 +0200 Subject: [PATCH 23/62] removed unnecessary import Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/presentation/widgets/game_history_empty_builder.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/presentation/widgets/game_history_empty_builder.dart b/lib/presentation/widgets/game_history_empty_builder.dart index db3c974..f3442d7 100644 --- a/lib/presentation/widgets/game_history_empty_builder.dart +++ b/lib/presentation/widgets/game_history_empty_builder.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:game_tracker/presentation/widgets/game_history_listtile.dart'; Widget GameHistoryEmptyBuilder(message) { return Container( From fc832d35dba2e612193c738172217b88bbcaec7a Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:50:41 +0200 Subject: [PATCH 24/62] added type annotation for message in GameHistoryEmptyBuilder Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/presentation/widgets/game_history_empty_builder.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/widgets/game_history_empty_builder.dart b/lib/presentation/widgets/game_history_empty_builder.dart index f3442d7..f34b6f8 100644 --- a/lib/presentation/widgets/game_history_empty_builder.dart +++ b/lib/presentation/widgets/game_history_empty_builder.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -Widget GameHistoryEmptyBuilder(message) { +Widget GameHistoryEmptyBuilder(String message) { return Container( padding: EdgeInsets.only(top:100), margin: EdgeInsets.only(left: 10, right: 10), From 879a81567a85625595d4ab56caf475d456ae08e2 Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Wed, 25 Jun 2025 14:50:57 +0200 Subject: [PATCH 25/62] fixed typo Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 9577865..42c1d0c 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -16,7 +16,7 @@ class MyApp extends StatelessWidget { title: 'Game Tracker', darkTheme: ThemeData.dark(), - themeMode: ThemeMode.dark, // forces light mode + themeMode: ThemeMode.dark, // forces dark mode theme: ThemeData( primaryColor: CustomTheme.primaryColor, scaffoldBackgroundColor: CustomTheme.backgroundColor, From 56116a74fcd872f8284c72ece05d9ae8f20b49ea Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 14:52:27 +0200 Subject: [PATCH 26/62] fixed type of suggestedGameData map --- lib/presentation/views/main_menu/game_history_view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 85d8454..bd68e5a 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -118,7 +118,7 @@ class _GameHistoryViewState extends State { 'date': '25.04.2024', }, ]; - late List> suggestedGameData; + late List> suggestedGameData; @override void initState() { From 0c39f4836efcfd144617a5d19c1dc73debc14446 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 16:36:39 +0200 Subject: [PATCH 27/62] renamed game_history_empty_builder to top_centered_message --- lib/presentation/views/main_menu/game_history_view.dart | 9 +++++---- ...tory_empty_builder.dart => top_centered_message.dart} | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) rename lib/presentation/widgets/{game_history_empty_builder.dart => top_centered_message.dart} (86%) diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index bd68e5a..32c41db 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; -import 'package:game_tracker/presentation/widgets/game_history_empty_builder.dart'; +import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; import 'package:game_tracker/presentation/widgets/game_history_listtile.dart'; class GameHistoryView extends StatefulWidget { @@ -174,14 +174,15 @@ class _GameHistoryViewState extends State { Widget gameHistoryListView(allGameData, suggestedGameData) { if (suggestedGameData.isEmpty && allGameData.isEmpty) { - return GameHistoryEmptyBuilder("Keine Spiele erstellt"); + return TopCenteredMessage("Keine Spiele erstellt"); } else if (suggestedGameData.isEmpty) { - return GameHistoryEmptyBuilder("Kein Spiel mit den Suchparametern gefunden."); + return TopCenteredMessage("Kein Spiel mit den Suchparametern gefunden."); } return ListView.builder( itemCount: suggestedGameData.length, itemBuilder: (context, index) { final currentGame = suggestedGameData[index]; return GameHistoryListTile(currentGame); - }); + } + ); } \ No newline at end of file diff --git a/lib/presentation/widgets/game_history_empty_builder.dart b/lib/presentation/widgets/top_centered_message.dart similarity index 86% rename from lib/presentation/widgets/game_history_empty_builder.dart rename to lib/presentation/widgets/top_centered_message.dart index f34b6f8..be29d88 100644 --- a/lib/presentation/widgets/game_history_empty_builder.dart +++ b/lib/presentation/widgets/top_centered_message.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -Widget GameHistoryEmptyBuilder(String message) { +Widget TopCenteredMessage(String message) { return Container( padding: EdgeInsets.only(top:100), margin: EdgeInsets.only(left: 10, right: 10), From b41821df472c33c2c2f5f4fbade2a60b6a67675c Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 16:39:51 +0200 Subject: [PATCH 28/62] format with dart format --- .../main_menu/custom_navigation_bar.dart | 8 +-- .../views/main_menu/game_history_view.dart | 34 ++++++----- .../widgets/game_history_listtile.dart | 59 ++++++++++--------- .../widgets/top_centered_message.dart | 20 +++---- 4 files changed, 63 insertions(+), 58 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 57b8519..c18d876 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -35,10 +35,7 @@ class _CustomNavigationBarState extends State centerTitle: true, title: Text( _currentTabTitle(), - style: const TextStyle( - fontSize: 20, - fontWeight: FontWeight.bold, - ), + style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold), ), backgroundColor: CustomTheme.backgroundColor, scrolledUnderElevation: 0, @@ -114,6 +111,7 @@ class _CustomNavigationBarState extends State currentIndex = index; }); } + String _currentTabTitle() { switch (currentIndex) { case 0: @@ -128,4 +126,4 @@ class _CustomNavigationBarState extends State return ''; } } -} \ No newline at end of file +} diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 32c41db..6d0179a 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -119,7 +119,7 @@ class _GameHistoryViewState extends State { }, ]; late List> suggestedGameData; - + @override void initState() { super.initState(); @@ -134,9 +134,7 @@ class _GameHistoryViewState extends State { children: [ Column( children: [ - Container( - margin: EdgeInsets.only(bottom: 75), - ), + Container(margin: EdgeInsets.only(bottom: 75)), Expanded( child: gameHistoryListView(allGameData, suggestedGameData), ), @@ -146,7 +144,7 @@ class _GameHistoryViewState extends State { margin: EdgeInsets.only(top: 10, bottom: 10, left: 10, right: 10), child: SearchBar( leading: Icon(Icons.search), - onChanged:(value) { + onChanged: (value) { if (value.isEmpty) { setState(() { suggestedGameData.clear(); @@ -155,9 +153,15 @@ class _GameHistoryViewState extends State { return; } final suggestions = allGameData.where((currentGame) { - return currentGame['game'].toString().toLowerCase().contains(value.toLowerCase()) || - currentGame['title'].toString().toLowerCase().contains(value.toLowerCase()) || - currentGame['group'].toString().toLowerCase().contains(value.toLowerCase()); + return currentGame['game'].toString().toLowerCase().contains( + value.toLowerCase(), + ) || + currentGame['title'].toString().toLowerCase().contains( + value.toLowerCase(), + ) || + currentGame['group'].toString().toLowerCase().contains( + value.toLowerCase(), + ); }); setState(() { suggestedGameData.clear(); @@ -179,10 +183,10 @@ Widget gameHistoryListView(allGameData, suggestedGameData) { return TopCenteredMessage("Kein Spiel mit den Suchparametern gefunden."); } return ListView.builder( - itemCount: suggestedGameData.length, - itemBuilder: (context, index) { - final currentGame = suggestedGameData[index]; - return GameHistoryListTile(currentGame); - } - ); -} \ No newline at end of file + itemCount: suggestedGameData.length, + itemBuilder: (context, index) { + final currentGame = suggestedGameData[index]; + return GameHistoryListTile(currentGame); + }, + ); +} diff --git a/lib/presentation/widgets/game_history_listtile.dart b/lib/presentation/widgets/game_history_listtile.dart index ccc818d..66b18b2 100644 --- a/lib/presentation/widgets/game_history_listtile.dart +++ b/lib/presentation/widgets/game_history_listtile.dart @@ -1,32 +1,35 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; -Widget GameHistoryListTile(Map currentGame){ - return Container( - margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20), - color: CustomTheme.secondaryColor, +Widget GameHistoryListTile(Map currentGame) { + return Container( + margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + color: CustomTheme.secondaryColor, + ), + child: Column( + children: [ + Row( + children: [ + Text("${currentGame['game']}: ", style: TextStyle(fontSize: 20)), + Text("${currentGame['title']}", style: TextStyle(fontSize: 20)), + Spacer(), + Text( + "${currentGame['players']} Spieler", + style: TextStyle(fontSize: 20), ), - child: Column( - children: [ - Row( - children: [ - Text("${currentGame['game']}: ", style: TextStyle(fontSize: 20)), - Text("${currentGame['title']}", style: TextStyle(fontSize: 20)), - Spacer(), - Text("${currentGame['players']} Spieler", style: TextStyle(fontSize: 20)) - ], - ), - Row( - children: [ - Text("${currentGame['group']}", style: TextStyle(fontSize: 20)), - Spacer(), - Text("${currentGame['date']}", style: TextStyle(fontSize: 20)) - ], - ), - ], - ), - ); -} \ No newline at end of file + ], + ), + Row( + children: [ + Text("${currentGame['group']}", style: TextStyle(fontSize: 20)), + Spacer(), + Text("${currentGame['date']}", style: TextStyle(fontSize: 20)), + ], + ), + ], + ), + ); +} diff --git a/lib/presentation/widgets/top_centered_message.dart b/lib/presentation/widgets/top_centered_message.dart index be29d88..6fe34ff 100644 --- a/lib/presentation/widgets/top_centered_message.dart +++ b/lib/presentation/widgets/top_centered_message.dart @@ -2,13 +2,13 @@ import 'package:flutter/material.dart'; Widget TopCenteredMessage(String message) { return Container( - padding: EdgeInsets.only(top:100), - margin: EdgeInsets.only(left: 10, right: 10), - alignment: Alignment.topCenter, - child: Text( - "$message", - style: TextStyle(fontSize: 20), - textAlign: TextAlign.center, - ) - ); -} \ No newline at end of file + padding: EdgeInsets.only(top: 100), + margin: EdgeInsets.only(left: 10, right: 10), + alignment: Alignment.topCenter, + child: Text( + "$message", + style: TextStyle(fontSize: 20), + textAlign: TextAlign.center, + ), + ); +} From 55857bd92cd394b32ae1a454b42580ae570e20cf Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 17:06:20 +0200 Subject: [PATCH 29/62] rebuilt tile to be reusable and added TextOverflow behaviour --- .../widgets/double_row_info_tile.dart | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 lib/presentation/widgets/double_row_info_tile.dart diff --git a/lib/presentation/widgets/double_row_info_tile.dart b/lib/presentation/widgets/double_row_info_tile.dart new file mode 100644 index 0000000..621cc74 --- /dev/null +++ b/lib/presentation/widgets/double_row_info_tile.dart @@ -0,0 +1,71 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +Widget doubleRowInfoTile( + String titleOneUpperLeft, + String titleTwoUpperLeft, + String titleUpperRight, + String titleLowerLeft, + String titleLowerRight, +) { + return Container( + margin: EdgeInsets.symmetric(vertical: 5, horizontal: 10), + padding: EdgeInsets.all(10), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(20), + color: CustomTheme.secondaryColor, + ), + child: Column( + children: [ + Row( + children: [ + Expanded( + flex: 10, + child: Text( + "$titleOneUpperLeft $titleTwoUpperLeft", + style: TextStyle(fontSize: 20), + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), + ), + Spacer(), + Expanded( + flex: 3, + child: Text( + "$titleUpperRight", + style: TextStyle(fontSize: 20), + overflow: TextOverflow.ellipsis, + maxLines: 1, + textAlign: TextAlign.end, + ), + ), + ], + ), + Row( + children: [ + Expanded( + flex: 10, + child: Text( + "$titleLowerLeft", + style: TextStyle(fontSize: 20), + overflow: TextOverflow.ellipsis, + maxLines: 1, + ), + ), + Spacer(), + Expanded( + flex: 4, + child: Text( + "$titleLowerRight", + style: TextStyle(fontSize: 20), + overflow: TextOverflow.ellipsis, + maxLines: 1, + textAlign: TextAlign.end, + ), + ), + ], + ), + ], + ), + ); +} From a4c7dcda5ceed4bdbb019cf61252c62bad9b6801 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 17:08:13 +0200 Subject: [PATCH 30/62] fixed imports and method calls due to renaming --- .../views/main_menu/game_history_view.dart | 12 +++++-- .../widgets/game_history_listtile.dart | 35 ------------------- 2 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 lib/presentation/widgets/game_history_listtile.dart diff --git a/lib/presentation/views/main_menu/game_history_view.dart b/lib/presentation/views/main_menu/game_history_view.dart index 6d0179a..de75ae6 100644 --- a/lib/presentation/views/main_menu/game_history_view.dart +++ b/lib/presentation/views/main_menu/game_history_view.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/presentation/widgets/top_centered_message.dart'; -import 'package:game_tracker/presentation/widgets/game_history_listtile.dart'; +import 'package:game_tracker/presentation/widgets/double_row_info_tile.dart'; class GameHistoryView extends StatefulWidget { const GameHistoryView({super.key}); @@ -21,7 +21,7 @@ class _GameHistoryViewState extends State { }, { 'game': 'Monopoly', - 'title': 'Wochenendspaß', + 'title': 'Wochenendspaß mit Gras du Saas', 'players': 4, 'group': 'Freunde', 'date': '28.05.2024', @@ -186,7 +186,13 @@ Widget gameHistoryListView(allGameData, suggestedGameData) { itemCount: suggestedGameData.length, itemBuilder: (context, index) { final currentGame = suggestedGameData[index]; - return GameHistoryListTile(currentGame); + return doubleRowInfoTile( + currentGame['game'] + ": ", + currentGame['title'], + currentGame['players'].toString() + " Spieler", + currentGame['group'], + currentGame['date'], + ); }, ); } diff --git a/lib/presentation/widgets/game_history_listtile.dart b/lib/presentation/widgets/game_history_listtile.dart deleted file mode 100644 index 66b18b2..0000000 --- a/lib/presentation/widgets/game_history_listtile.dart +++ /dev/null @@ -1,35 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:game_tracker/core/custom_theme.dart'; - -Widget GameHistoryListTile(Map currentGame) { - return Container( - margin: EdgeInsets.only(top: 5, bottom: 5, left: 10, right: 10), - padding: EdgeInsets.all(10), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(20), - color: CustomTheme.secondaryColor, - ), - child: Column( - children: [ - Row( - children: [ - Text("${currentGame['game']}: ", style: TextStyle(fontSize: 20)), - Text("${currentGame['title']}", style: TextStyle(fontSize: 20)), - Spacer(), - Text( - "${currentGame['players']} Spieler", - style: TextStyle(fontSize: 20), - ), - ], - ), - Row( - children: [ - Text("${currentGame['group']}", style: TextStyle(fontSize: 20)), - Spacer(), - Text("${currentGame['date']}", style: TextStyle(fontSize: 20)), - ], - ), - ], - ), - ); -} From d3633c4b0062178fe97ec39bfc7a0f2ac8b65196 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 23 Jun 2025 18:41:54 +0200 Subject: [PATCH 31/62] added dependencies for drift db --- ios/Flutter/Debug.xcconfig | 1 + ios/Flutter/Release.xcconfig | 1 + ios/Podfile | 43 ++++++++++++++++++++++++++++++++++++ pubspec.yaml | 8 +++++++ 4 files changed, 53 insertions(+) create mode 100644 ios/Podfile diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..e549ee2 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,43 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '12.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) + target 'RunnerTests' do + inherit! :search_paths + end +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/pubspec.yaml b/pubspec.yaml index abc2e18..7c3520d 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -11,11 +11,19 @@ dependencies: sdk: flutter material_symbols_icons: ^4.2815.1 + # The following adds the Cupertino Icons font to your application. + # Use with the CupertinoIcons class for iOS style icons. + cupertino_icons: ^1.0.8 + drift: ^2.27.0 + drift_flutter: ^0.2.4 + path_provider: ^2.1.5 dev_dependencies: flutter_test: sdk: flutter flutter_lints: ^5.0.0 + drift_dev: ^2.27.0 + build_runner: ^2.5.4 flutter: uses-material-design: true From 00ad4ad16d21aa38721461db799ea66977d24606 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Mon, 23 Jun 2025 22:29:55 +0200 Subject: [PATCH 32/62] added provider requirement for state management --- pubspec.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/pubspec.yaml b/pubspec.yaml index 7c3520d..5fa8019 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -17,6 +17,7 @@ dependencies: drift: ^2.27.0 drift_flutter: ^0.2.4 path_provider: ^2.1.5 + provider: ^6.1.5 dev_dependencies: flutter_test: From b2d686b2306f318190848b3516715c1a8165fa60 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:12:46 +0200 Subject: [PATCH 33/62] added provider for state management & exposed db using provider --- lib/main.dart | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 42c1d0c..3f9b3ec 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,9 +1,17 @@ import 'package:flutter/material.dart'; +import 'package:game_tracker/presentation/views/main_menu/home_view.dart'; import 'package:game_tracker/core/custom_theme.dart'; -import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; +import 'package:game_tracker/data/database.dart'; +import 'package:provider/provider.dart'; void main() { - runApp(const MyApp()); + runApp( + Provider( + create: (context) => AppDatabase(), + child: MyApp(), + dispose: (context, db) => db.close(), + ), + ); } class MyApp extends StatelessWidget { From 998c34e555331cd8b73d1ee4524df5f29bce6ee0 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:15:06 +0200 Subject: [PATCH 34/62] created tables for Group, User and UserGrouo --- lib/data/database.dart | 46 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 lib/data/database.dart diff --git a/lib/data/database.dart b/lib/data/database.dart new file mode 100644 index 0000000..2c04942 --- /dev/null +++ b/lib/data/database.dart @@ -0,0 +1,46 @@ +import 'package:drift/drift.dart'; +import 'package:drift_flutter/drift_flutter.dart'; +import 'package:path_provider/path_provider.dart'; + +part 'database.g.dart'; + +class User extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} + +class Group extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} + +class UserGroup extends Table { + TextColumn get userId => text().references(User, #id)(); + TextColumn get groupId => text().references(Group, #id)(); + + @override + Set> get primaryKey => {userId, groupId}; +} + +@DriftDatabase(tables: [User, Group, UserGroup]) +class AppDatabase extends _$AppDatabase { + AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection()); + + @override + int get schemaVersion => 1; + + static QueryExecutor _openConnection() { + return driftDatabase( + name: 'gametracker_db', + native: const DriftNativeOptions( + databaseDirectory: getApplicationSupportDirectory, + ), + ); + } +} \ No newline at end of file From 2b60909c43c429d3d5d0c186d0403a1f722b5615 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:16:50 +0200 Subject: [PATCH 35/62] added methods for interacting with User, Group and UserGroup in database --- lib/data/methods/group.dart | 28 ++++++++++++++++++++++++++++ lib/data/methods/user.dart | 28 ++++++++++++++++++++++++++++ lib/data/methods/user_group.dart | 26 ++++++++++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 lib/data/methods/group.dart create mode 100644 lib/data/methods/user.dart create mode 100644 lib/data/methods/user_group.dart diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart new file mode 100644 index 0000000..afc25c0 --- /dev/null +++ b/lib/data/methods/group.dart @@ -0,0 +1,28 @@ +import 'package:game_tracker/data/database.dart'; +import 'package:drift/drift.dart'; + +extension Group on AppDatabase { + Future> getAllGroups() async { + return await select(group).get(); + } + + Future> getGroupById(String id) async { + return await (select(group)..where((g) => g.id.equals(id))).get(); + } + + Future addGroup(String id, String name) async { + await into(group).insert( + GroupCompanion.insert(id: id, name: name), + ); + } + + Future deleteGroup(String id) async { + await (delete(group)..where((u) => u.id.equals(id))).go(); + } + + Future updateGroupname(String id, String newName) async { + await (update(group)..where((u) => u.id.equals(id))).write( + GroupCompanion(name: Value(newName)), + ); + } +} \ No newline at end of file diff --git a/lib/data/methods/user.dart b/lib/data/methods/user.dart new file mode 100644 index 0000000..46ed497 --- /dev/null +++ b/lib/data/methods/user.dart @@ -0,0 +1,28 @@ +import 'package:game_tracker/data/database.dart'; +import 'package:drift/drift.dart'; + +extension User on AppDatabase { + Future> getAllUsers() async { + return await select(user).get(); + } + + Future> getUserById(String id) async { + return await (select(user)..where((u) => u.id.equals(id))).get(); + } + + Future addUser(String id, String name) async { + await into(user).insert( + UserCompanion.insert(id: id, name: name), + ); + } + + Future deleteUser(String id) async { + await (delete(user)..where((u) => u.id.equals(id))).go(); + } + + Future updateUsername(String id, String newName) async { + await (update(user)..where((u) => u.id.equals(id))).write( + UserCompanion(name: Value(newName)), + ); + } +} \ No newline at end of file diff --git a/lib/data/methods/user_group.dart b/lib/data/methods/user_group.dart new file mode 100644 index 0000000..41e1e60 --- /dev/null +++ b/lib/data/methods/user_group.dart @@ -0,0 +1,26 @@ +import 'package:game_tracker/data/database.dart'; +import 'package:drift/drift.dart'; + +extension UserGroup on AppDatabase { + Future> getAllUsersAndGroups() async { + return await select(userGroup).get(); + } + + Future> getUsersGroups(String userId) async { + return await (select(userGroup)..where((uG) => uG.userId.equals(userId))).get(); + } + + Future> getGroupsUsers(String groupId) async { + return await (select(userGroup)..where((uG) => uG.groupId.equals(groupId))).get(); + } + + Future addUserToGroup(String userId, String groupId) async { + await into(userGroup).insert( + UserGroupCompanion.insert(userId: userId, groupId: groupId), + ); + } + + Future removeUserFromGroup(String userId, String groupId) async { + await (delete(userGroup)..where((uG) => uG.userId.equals(userId) & uG.groupId.equals(groupId))).go(); + } +} \ No newline at end of file From a32df2420a71564fca2b3f04d04cfcf8e2069a4f Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:17:06 +0200 Subject: [PATCH 36/62] generated database code --- lib/data/database.g.dart | 1455 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 1455 insertions(+) create mode 100644 lib/data/database.g.dart diff --git a/lib/data/database.g.dart b/lib/data/database.g.dart new file mode 100644 index 0000000..795f850 --- /dev/null +++ b/lib/data/database.g.dart @@ -0,0 +1,1455 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'database.dart'; + +// ignore_for_file: type=lint +class $UserTable extends User with TableInfo<$UserTable, UserData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $UserTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'user'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + UserData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return UserData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $UserTable createAlias(String alias) { + return $UserTable(attachedDatabase, alias); + } +} + +class UserData extends DataClass implements Insertable { + final String id; + final String name; + const UserData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + UserCompanion toCompanion(bool nullToAbsent) { + return UserCompanion(id: Value(id), name: Value(name)); + } + + factory UserData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return UserData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + UserData copyWith({String? id, String? name}) => + UserData(id: id ?? this.id, name: name ?? this.name); + UserData copyWithCompanion(UserCompanion data) { + return UserData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('UserData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is UserData && other.id == this.id && other.name == this.name); +} + +class UserCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const UserCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + UserCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + UserCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return UserCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('UserCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $GroupTable extends Group with TableInfo<$GroupTable, GroupData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $GroupTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'group'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + GroupData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return GroupData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $GroupTable createAlias(String alias) { + return $GroupTable(attachedDatabase, alias); + } +} + +class GroupData extends DataClass implements Insertable { + final String id; + final String name; + const GroupData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + GroupCompanion toCompanion(bool nullToAbsent) { + return GroupCompanion(id: Value(id), name: Value(name)); + } + + factory GroupData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return GroupData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + GroupData copyWith({String? id, String? name}) => + GroupData(id: id ?? this.id, name: name ?? this.name); + GroupData copyWithCompanion(GroupCompanion data) { + return GroupData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('GroupData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is GroupData && other.id == this.id && other.name == this.name); +} + +class GroupCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const GroupCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + GroupCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + GroupCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return GroupCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('GroupCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $UserGroupTable extends UserGroup + with TableInfo<$UserGroupTable, UserGroupData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $UserGroupTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); + @override + late final GeneratedColumn userId = GeneratedColumn( + 'user_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES user (id)', + ), + ); + static const VerificationMeta _groupIdMeta = const VerificationMeta( + 'groupId', + ); + @override + late final GeneratedColumn groupId = GeneratedColumn( + 'group_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES "group" (id)', + ), + ); + @override + List get $columns => [userId, groupId]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'user_group'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('user_id')) { + context.handle( + _userIdMeta, + userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta), + ); + } else if (isInserting) { + context.missing(_userIdMeta); + } + if (data.containsKey('group_id')) { + context.handle( + _groupIdMeta, + groupId.isAcceptableOrUnknown(data['group_id']!, _groupIdMeta), + ); + } else if (isInserting) { + context.missing(_groupIdMeta); + } + return context; + } + + @override + Set get $primaryKey => {userId, groupId}; + @override + UserGroupData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return UserGroupData( + userId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}user_id'], + )!, + groupId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}group_id'], + )!, + ); + } + + @override + $UserGroupTable createAlias(String alias) { + return $UserGroupTable(attachedDatabase, alias); + } +} + +class UserGroupData extends DataClass implements Insertable { + final String userId; + final String groupId; + const UserGroupData({required this.userId, required this.groupId}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['user_id'] = Variable(userId); + map['group_id'] = Variable(groupId); + return map; + } + + UserGroupCompanion toCompanion(bool nullToAbsent) { + return UserGroupCompanion(userId: Value(userId), groupId: Value(groupId)); + } + + factory UserGroupData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return UserGroupData( + userId: serializer.fromJson(json['userId']), + groupId: serializer.fromJson(json['groupId']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'userId': serializer.toJson(userId), + 'groupId': serializer.toJson(groupId), + }; + } + + UserGroupData copyWith({String? userId, String? groupId}) => UserGroupData( + userId: userId ?? this.userId, + groupId: groupId ?? this.groupId, + ); + UserGroupData copyWithCompanion(UserGroupCompanion data) { + return UserGroupData( + userId: data.userId.present ? data.userId.value : this.userId, + groupId: data.groupId.present ? data.groupId.value : this.groupId, + ); + } + + @override + String toString() { + return (StringBuffer('UserGroupData(') + ..write('userId: $userId, ') + ..write('groupId: $groupId') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(userId, groupId); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is UserGroupData && + other.userId == this.userId && + other.groupId == this.groupId); +} + +class UserGroupCompanion extends UpdateCompanion { + final Value userId; + final Value groupId; + final Value rowid; + const UserGroupCompanion({ + this.userId = const Value.absent(), + this.groupId = const Value.absent(), + this.rowid = const Value.absent(), + }); + UserGroupCompanion.insert({ + required String userId, + required String groupId, + this.rowid = const Value.absent(), + }) : userId = Value(userId), + groupId = Value(groupId); + static Insertable custom({ + Expression? userId, + Expression? groupId, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (userId != null) 'user_id': userId, + if (groupId != null) 'group_id': groupId, + if (rowid != null) 'rowid': rowid, + }); + } + + UserGroupCompanion copyWith({ + Value? userId, + Value? groupId, + Value? rowid, + }) { + return UserGroupCompanion( + userId: userId ?? this.userId, + groupId: groupId ?? this.groupId, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (userId.present) { + map['user_id'] = Variable(userId.value); + } + if (groupId.present) { + map['group_id'] = Variable(groupId.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('UserGroupCompanion(') + ..write('userId: $userId, ') + ..write('groupId: $groupId, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +abstract class _$AppDatabase extends GeneratedDatabase { + _$AppDatabase(QueryExecutor e) : super(e); + $AppDatabaseManager get managers => $AppDatabaseManager(this); + late final $UserTable user = $UserTable(this); + late final $GroupTable group = $GroupTable(this); + late final $UserGroupTable userGroup = $UserGroupTable(this); + @override + Iterable> get allTables => + allSchemaEntities.whereType>(); + @override + List get allSchemaEntities => [user, group, userGroup]; +} + +typedef $$UserTableCreateCompanionBuilder = + UserCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$UserTableUpdateCompanionBuilder = + UserCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +final class $$UserTableReferences + extends BaseReferences<_$AppDatabase, $UserTable, UserData> { + $$UserTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static MultiTypedResultKey<$UserGroupTable, List> + _userGroupRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.userGroup, + aliasName: $_aliasNameGenerator(db.user.id, db.userGroup.userId), + ); + + $$UserGroupTableProcessedTableManager get userGroupRefs { + final manager = $$UserGroupTableTableManager( + $_db, + $_db.userGroup, + ).filter((f) => f.userId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_userGroupRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + +class $$UserTableFilterComposer extends Composer<_$AppDatabase, $UserTable> { + $$UserTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); + + Expression userGroupRefs( + Expression Function($$UserGroupTableFilterComposer f) f, + ) { + final $$UserGroupTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.userId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableFilterComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$UserTableOrderingComposer extends Composer<_$AppDatabase, $UserTable> { + $$UserTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$UserTableAnnotationComposer + extends Composer<_$AppDatabase, $UserTable> { + $$UserTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); + + Expression userGroupRefs( + Expression Function($$UserGroupTableAnnotationComposer a) f, + ) { + final $$UserGroupTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.userId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableAnnotationComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$UserTableTableManager + extends + RootTableManager< + _$AppDatabase, + $UserTable, + UserData, + $$UserTableFilterComposer, + $$UserTableOrderingComposer, + $$UserTableAnnotationComposer, + $$UserTableCreateCompanionBuilder, + $$UserTableUpdateCompanionBuilder, + (UserData, $$UserTableReferences), + UserData, + PrefetchHooks Function({bool userGroupRefs}) + > { + $$UserTableTableManager(_$AppDatabase db, $UserTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$UserTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$UserTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$UserTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => UserCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => UserCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map( + (e) => + (e.readTable(table), $$UserTableReferences(db, table, e)), + ) + .toList(), + prefetchHooksCallback: ({userGroupRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [if (userGroupRefs) db.userGroup], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (userGroupRefs) + await $_getPrefetchedData< + UserData, + $UserTable, + UserGroupData + >( + currentTable: table, + referencedTable: $$UserTableReferences + ._userGroupRefsTable(db), + managerFromTypedResult: (p0) => + $$UserTableReferences(db, table, p0).userGroupRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.userId == item.id), + typedResults: items, + ), + ]; + }, + ); + }, + ), + ); +} + +typedef $$UserTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $UserTable, + UserData, + $$UserTableFilterComposer, + $$UserTableOrderingComposer, + $$UserTableAnnotationComposer, + $$UserTableCreateCompanionBuilder, + $$UserTableUpdateCompanionBuilder, + (UserData, $$UserTableReferences), + UserData, + PrefetchHooks Function({bool userGroupRefs}) + >; +typedef $$GroupTableCreateCompanionBuilder = + GroupCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$GroupTableUpdateCompanionBuilder = + GroupCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +final class $$GroupTableReferences + extends BaseReferences<_$AppDatabase, $GroupTable, GroupData> { + $$GroupTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static MultiTypedResultKey<$UserGroupTable, List> + _userGroupRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.userGroup, + aliasName: $_aliasNameGenerator(db.group.id, db.userGroup.groupId), + ); + + $$UserGroupTableProcessedTableManager get userGroupRefs { + final manager = $$UserGroupTableTableManager( + $_db, + $_db.userGroup, + ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull(_userGroupRefsTable($_db)); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + +class $$GroupTableFilterComposer extends Composer<_$AppDatabase, $GroupTable> { + $$GroupTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); + + Expression userGroupRefs( + Expression Function($$UserGroupTableFilterComposer f) f, + ) { + final $$UserGroupTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableFilterComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$GroupTableOrderingComposer + extends Composer<_$AppDatabase, $GroupTable> { + $$GroupTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$GroupTableAnnotationComposer + extends Composer<_$AppDatabase, $GroupTable> { + $$GroupTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); + + Expression userGroupRefs( + Expression Function($$UserGroupTableAnnotationComposer a) f, + ) { + final $$UserGroupTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.userGroup, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserGroupTableAnnotationComposer( + $db: $db, + $table: $db.userGroup, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } +} + +class $$GroupTableTableManager + extends + RootTableManager< + _$AppDatabase, + $GroupTable, + GroupData, + $$GroupTableFilterComposer, + $$GroupTableOrderingComposer, + $$GroupTableAnnotationComposer, + $$GroupTableCreateCompanionBuilder, + $$GroupTableUpdateCompanionBuilder, + (GroupData, $$GroupTableReferences), + GroupData, + PrefetchHooks Function({bool userGroupRefs}) + > { + $$GroupTableTableManager(_$AppDatabase db, $GroupTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$GroupTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GroupTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GroupTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => GroupCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => GroupCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map( + (e) => + (e.readTable(table), $$GroupTableReferences(db, table, e)), + ) + .toList(), + prefetchHooksCallback: ({userGroupRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [if (userGroupRefs) db.userGroup], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (userGroupRefs) + await $_getPrefetchedData< + GroupData, + $GroupTable, + UserGroupData + >( + currentTable: table, + referencedTable: $$GroupTableReferences + ._userGroupRefsTable(db), + managerFromTypedResult: (p0) => + $$GroupTableReferences(db, table, p0).userGroupRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.groupId == item.id), + typedResults: items, + ), + ]; + }, + ); + }, + ), + ); +} + +typedef $$GroupTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $GroupTable, + GroupData, + $$GroupTableFilterComposer, + $$GroupTableOrderingComposer, + $$GroupTableAnnotationComposer, + $$GroupTableCreateCompanionBuilder, + $$GroupTableUpdateCompanionBuilder, + (GroupData, $$GroupTableReferences), + GroupData, + PrefetchHooks Function({bool userGroupRefs}) + >; +typedef $$UserGroupTableCreateCompanionBuilder = + UserGroupCompanion Function({ + required String userId, + required String groupId, + Value rowid, + }); +typedef $$UserGroupTableUpdateCompanionBuilder = + UserGroupCompanion Function({ + Value userId, + Value groupId, + Value rowid, + }); + +final class $$UserGroupTableReferences + extends BaseReferences<_$AppDatabase, $UserGroupTable, UserGroupData> { + $$UserGroupTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static $UserTable _userIdTable(_$AppDatabase db) => db.user.createAlias( + $_aliasNameGenerator(db.userGroup.userId, db.user.id), + ); + + $$UserTableProcessedTableManager get userId { + final $_column = $_itemColumn('user_id')!; + + final manager = $$UserTableTableManager( + $_db, + $_db.user, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_userIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } + + static $GroupTable _groupIdTable(_$AppDatabase db) => db.group.createAlias( + $_aliasNameGenerator(db.userGroup.groupId, db.group.id), + ); + + $$GroupTableProcessedTableManager get groupId { + final $_column = $_itemColumn('group_id')!; + + final manager = $$GroupTableTableManager( + $_db, + $_db.group, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_groupIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } +} + +class $$UserGroupTableFilterComposer + extends Composer<_$AppDatabase, $UserGroupTable> { + $$UserGroupTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$UserTableFilterComposer get userId { + final $$UserTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.user, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserTableFilterComposer( + $db: $db, + $table: $db.user, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableFilterComposer get groupId { + final $$GroupTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.group, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableFilterComposer( + $db: $db, + $table: $db.group, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$UserGroupTableOrderingComposer + extends Composer<_$AppDatabase, $UserGroupTable> { + $$UserGroupTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$UserTableOrderingComposer get userId { + final $$UserTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.user, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserTableOrderingComposer( + $db: $db, + $table: $db.user, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableOrderingComposer get groupId { + final $$GroupTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.group, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableOrderingComposer( + $db: $db, + $table: $db.group, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$UserGroupTableAnnotationComposer + extends Composer<_$AppDatabase, $UserGroupTable> { + $$UserGroupTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + $$UserTableAnnotationComposer get userId { + final $$UserTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.user, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$UserTableAnnotationComposer( + $db: $db, + $table: $db.user, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } + + $$GroupTableAnnotationComposer get groupId { + final $$GroupTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.group, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableAnnotationComposer( + $db: $db, + $table: $db.group, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } +} + +class $$UserGroupTableTableManager + extends + RootTableManager< + _$AppDatabase, + $UserGroupTable, + UserGroupData, + $$UserGroupTableFilterComposer, + $$UserGroupTableOrderingComposer, + $$UserGroupTableAnnotationComposer, + $$UserGroupTableCreateCompanionBuilder, + $$UserGroupTableUpdateCompanionBuilder, + (UserGroupData, $$UserGroupTableReferences), + UserGroupData, + PrefetchHooks Function({bool userId, bool groupId}) + > { + $$UserGroupTableTableManager(_$AppDatabase db, $UserGroupTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$UserGroupTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$UserGroupTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$UserGroupTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value userId = const Value.absent(), + Value groupId = const Value.absent(), + Value rowid = const Value.absent(), + }) => UserGroupCompanion( + userId: userId, + groupId: groupId, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String userId, + required String groupId, + Value rowid = const Value.absent(), + }) => UserGroupCompanion.insert( + userId: userId, + groupId: groupId, + rowid: rowid, + ), + withReferenceMapper: (p0) => p0 + .map( + (e) => ( + e.readTable(table), + $$UserGroupTableReferences(db, table, e), + ), + ) + .toList(), + prefetchHooksCallback: ({userId = false, groupId = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [], + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (userId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.userId, + referencedTable: $$UserGroupTableReferences + ._userIdTable(db), + referencedColumn: $$UserGroupTableReferences + ._userIdTable(db) + .id, + ) + as T; + } + if (groupId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.groupId, + referencedTable: $$UserGroupTableReferences + ._groupIdTable(db), + referencedColumn: $$UserGroupTableReferences + ._groupIdTable(db) + .id, + ) + as T; + } + + return state; + }, + getPrefetchedDataCallback: (items) async { + return []; + }, + ); + }, + ), + ); +} + +typedef $$UserGroupTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $UserGroupTable, + UserGroupData, + $$UserGroupTableFilterComposer, + $$UserGroupTableOrderingComposer, + $$UserGroupTableAnnotationComposer, + $$UserGroupTableCreateCompanionBuilder, + $$UserGroupTableUpdateCompanionBuilder, + (UserGroupData, $$UserGroupTableReferences), + UserGroupData, + PrefetchHooks Function({bool userId, bool groupId}) + >; + +class $AppDatabaseManager { + final _$AppDatabase _db; + $AppDatabaseManager(this._db); + $$UserTableTableManager get user => $$UserTableTableManager(_db, _db.user); + $$GroupTableTableManager get group => + $$GroupTableTableManager(_db, _db.group); + $$UserGroupTableTableManager get userGroup => + $$UserGroupTableTableManager(_db, _db.userGroup); +} From 6371d7de68f8d209bd9aae1329e0b729a390d44e Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Tue, 24 Jun 2025 20:26:34 +0200 Subject: [PATCH 37/62] Update lib/data/methods/group.dart renamed var in deleteGroup to g instead of u Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- lib/data/methods/group.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index afc25c0..bb5a131 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -17,7 +17,7 @@ extension Group on AppDatabase { } Future deleteGroup(String id) async { - await (delete(group)..where((u) => u.id.equals(id))).go(); + await (delete(group)..where((g) => g.id.equals(id))).go(); } Future updateGroupname(String id, String newName) async { From d771f78810e3191b4a89483653618002be7e3e2f Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:28:26 +0200 Subject: [PATCH 38/62] renamed class names to avoid conflicts --- lib/data/methods/group.dart | 2 +- lib/data/methods/user.dart | 2 +- lib/data/methods/user_group.dart | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index bb5a131..d996af6 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -1,7 +1,7 @@ import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; -extension Group on AppDatabase { +extension GroupMethods on AppDatabase { Future> getAllGroups() async { return await select(group).get(); } diff --git a/lib/data/methods/user.dart b/lib/data/methods/user.dart index 46ed497..ddf26b0 100644 --- a/lib/data/methods/user.dart +++ b/lib/data/methods/user.dart @@ -1,7 +1,7 @@ import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; -extension User on AppDatabase { +extension UserMethods on AppDatabase { Future> getAllUsers() async { return await select(user).get(); } diff --git a/lib/data/methods/user_group.dart b/lib/data/methods/user_group.dart index 41e1e60..206c1f0 100644 --- a/lib/data/methods/user_group.dart +++ b/lib/data/methods/user_group.dart @@ -1,7 +1,7 @@ import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; -extension UserGroup on AppDatabase { +extension UserGroupMethods on AppDatabase { Future> getAllUsersAndGroups() async { return await select(userGroup).get(); } From b4e91b1211d34c0bf2324ba1821824fc54392190 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:35:30 +0200 Subject: [PATCH 39/62] changed return type of getGroupById and getUserById to match expected result --- lib/data/methods/group.dart | 4 ++-- lib/data/methods/user.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index d996af6..50a1745 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -6,8 +6,8 @@ extension GroupMethods on AppDatabase { return await select(group).get(); } - Future> getGroupById(String id) async { - return await (select(group)..where((g) => g.id.equals(id))).get(); + Future getGroupById(String id) async { + return await (select(group)..where((g) => g.id.equals(id))).getSingle(); } Future addGroup(String id, String name) async { diff --git a/lib/data/methods/user.dart b/lib/data/methods/user.dart index ddf26b0..6f4c508 100644 --- a/lib/data/methods/user.dart +++ b/lib/data/methods/user.dart @@ -6,8 +6,8 @@ extension UserMethods on AppDatabase { return await select(user).get(); } - Future> getUserById(String id) async { - return await (select(user)..where((u) => u.id.equals(id))).get(); + Future getUserById(String id) async { + return await (select(user)..where((u) => u.id.equals(id))).getSingle(); } Future addUser(String id, String name) async { From 00cedf8647a3dd7ed49dccb04c03f9d67d1eb6f0 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:38:29 +0200 Subject: [PATCH 40/62] renamed lambda var in updateGroupname from u to g --- lib/data/methods/group.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart index 50a1745..a5346ba 100644 --- a/lib/data/methods/group.dart +++ b/lib/data/methods/group.dart @@ -21,7 +21,7 @@ extension GroupMethods on AppDatabase { } Future updateGroupname(String id, String newName) async { - await (update(group)..where((u) => u.id.equals(id))).write( + await (update(group)..where((g) => g.id.equals(id))).write( GroupCompanion(name: Value(newName)), ); } From 41e9eb2c91bb21c159cf5b255dfc66b058de7512 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Tue, 24 Jun 2025 20:40:19 +0200 Subject: [PATCH 41/62] added const to MyApp in Providers child --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 3f9b3ec..dc582a4 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -8,7 +8,7 @@ void main() { runApp( Provider( create: (context) => AppDatabase(), - child: MyApp(), + child: const MyApp(), dispose: (context, db) => db.close(), ), ); From ed275b0f7c108c4ae4ac4371fbe21042bc028dd9 Mon Sep 17 00:00:00 2001 From: mathiskirchner Date: Wed, 25 Jun 2025 23:24:33 +0200 Subject: [PATCH 42/62] fixed import of custom nav bar --- lib/main.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/main.dart b/lib/main.dart index dc582a4..478c094 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/presentation/views/main_menu/home_view.dart'; +import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/database.dart'; import 'package:provider/provider.dart'; From 6898ed51a38c7add6774e28c4e743fb0eb9022a2 Mon Sep 17 00:00:00 2001 From: Sneeex <65130981+mathiskir@users.noreply.github.com> Date: Wed, 25 Jun 2025 23:46:54 +0200 Subject: [PATCH 43/62] remove unused home view import --- lib/main.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index 478c094..261ff1b 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart'; -import 'package:game_tracker/presentation/views/main_menu/home_view.dart'; import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/database.dart'; From a795732da606d9321e8158f00cb1cf53a53f63b6 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 8 Nov 2025 13:49:08 +0100 Subject: [PATCH 44/62] Updated theme --- lib/core/custom_theme.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/core/custom_theme.dart b/lib/core/custom_theme.dart index afc8dee..1a5741a 100644 --- a/lib/core/custom_theme.dart +++ b/lib/core/custom_theme.dart @@ -1,19 +1,19 @@ import 'package:flutter/material.dart'; class CustomTheme { - static Color primaryColor = const Color(0xFF71C0BB); - static Color secondaryColor = const Color(0xFF2A4759); + static Color primaryColor = const Color(0xFF7505E4); + static Color secondaryColor = const Color(0xFFAFA2FF); static Color backgroundColor = const Color(0xFF1A1A1A); - static AppBarTheme appBarTheme = const AppBarTheme( - backgroundColor: Color(0xFF1A1A1A), + static AppBarTheme appBarTheme = AppBarTheme( + backgroundColor: backgroundColor, foregroundColor: Colors.white, elevation: 0, - titleTextStyle: TextStyle( + titleTextStyle: const TextStyle( color: Colors.white, fontSize: 20, fontWeight: FontWeight.bold, ), - iconTheme: IconThemeData(color: Colors.white), + iconTheme: const IconThemeData(color: Colors.white), ); } From 9db8c80d63a04fa4a06e8b4c3a027927b53b4f9e Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 15:29:39 +0100 Subject: [PATCH 45/62] removed floating button --- .../views/main_menu/custom_navigation_bar.dart | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index c18d876..a78a9f9 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -53,20 +53,12 @@ class _CustomNavigationBarState extends State backgroundColor: CustomTheme.backgroundColor, body: tabs[currentIndex], extendBody: true, - floatingActionButton: FloatingActionButton( - shape: const CircleBorder(), - backgroundColor: CustomTheme.primaryColor, - onPressed: () {}, - child: const Icon(Icons.add), - ), - floatingActionButtonLocation: FloatingActionButtonLocation.centerDocked, bottomNavigationBar: BottomAppBar( padding: const EdgeInsets.symmetric(horizontal: 10), elevation: 10, height: 60, color: CustomTheme.primaryColor, - shape: const CircularNotchedRectangle(), - notchMargin: 5, + shape: null, child: Row( mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, @@ -85,7 +77,6 @@ class _CustomNavigationBarState extends State ), onPressed: () => onTabTapped(1), ), - const SizedBox(width: 40), IconButton( icon: Icon( Icons.groups, From 4503574443da27e43d83863956644b70b7dc4930 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 8 Nov 2025 15:21:05 +0100 Subject: [PATCH 46/62] Implemented basic structure --- lib/data/dao/group_dao.dart | 42 + lib/data/dao/group_dao.g.dart | 8 + .../user.dart => dao/player_dao.dart} | 21 +- lib/data/dao/player_dao.g.dart | 8 + lib/data/dao/player_group_dao.dart | 40 + lib/data/dao/player_group_dao.g.dart | 9 + lib/data/database.dart | 46 - lib/data/database.g.dart | 1455 ----------------- lib/data/db/database.dart | 31 + lib/data/db/database.g.dart | 1092 +++++++++++++ lib/data/db/tables/group_table.dart | 9 + lib/data/db/tables/player_group_table.dart | 11 + lib/data/db/tables/player_table.dart | 9 + lib/data/dto/game.dart | 6 + lib/data/dto/group.dart | 9 + lib/data/dto/player.dart | 6 + lib/data/methods/group.dart | 28 - lib/data/methods/user_group.dart | 26 - lib/main.dart | 4 +- 19 files changed, 1295 insertions(+), 1565 deletions(-) create mode 100644 lib/data/dao/group_dao.dart create mode 100644 lib/data/dao/group_dao.g.dart rename lib/data/{methods/user.dart => dao/player_dao.dart} (51%) create mode 100644 lib/data/dao/player_dao.g.dart create mode 100644 lib/data/dao/player_group_dao.dart create mode 100644 lib/data/dao/player_group_dao.g.dart delete mode 100644 lib/data/database.dart delete mode 100644 lib/data/database.g.dart create mode 100644 lib/data/db/database.dart create mode 100644 lib/data/db/database.g.dart create mode 100644 lib/data/db/tables/group_table.dart create mode 100644 lib/data/db/tables/player_group_table.dart create mode 100644 lib/data/db/tables/player_table.dart create mode 100644 lib/data/dto/game.dart create mode 100644 lib/data/dto/group.dart create mode 100644 lib/data/dto/player.dart delete mode 100644 lib/data/methods/group.dart delete mode 100644 lib/data/methods/user_group.dart diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart new file mode 100644 index 0000000..d2f529c --- /dev/null +++ b/lib/data/dao/group_dao.dart @@ -0,0 +1,42 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/dto/group.dart'; + +part 'group_dao.g.dart'; + +@DriftAccessor(tables: [GroupTable]) +class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { + GroupDao(super.db); + + Future> getAllGroups() async { + final query = select(groupTable); + final result = await query.get(); + return result + .map((row) => Group(id: row.id, name: row.name, members: [])) + .toList(); + } + + Future getGroupById(String id) async { + final query = select(groupTable)..where((g) => g.id.equals(id)); + final result = await query.getSingle(); + + // todo: Get group members + + return Group(id: result.id, name: result.name, members: []); + } + + Future addGroup(String id, String name) async { + await into(group).insert(GroupCompanion.insert(id: id, name: name)); + } + + Future deleteGroup(String id) async { + await (delete(group)..where((g) => g.id.equals(id))).go(); + } + + Future updateGroupname(String id, String newName) async { + await (update(group)..where((g) => g.id.equals(id))).write( + GroupCompanion(name: Value(newName)), + ); + } +} diff --git a/lib/data/dao/group_dao.g.dart b/lib/data/dao/group_dao.g.dart new file mode 100644 index 0000000..4a09208 --- /dev/null +++ b/lib/data/dao/group_dao.g.dart @@ -0,0 +1,8 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'group_dao.dart'; + +// ignore_for_file: type=lint +mixin _$GroupDaoMixin on DatabaseAccessor { + $GroupTableTable get groupTable => attachedDatabase.groupTable; +} diff --git a/lib/data/methods/user.dart b/lib/data/dao/player_dao.dart similarity index 51% rename from lib/data/methods/user.dart rename to lib/data/dao/player_dao.dart index 6f4c508..d7a7596 100644 --- a/lib/data/methods/user.dart +++ b/lib/data/dao/player_dao.dart @@ -1,9 +1,16 @@ -import 'package:game_tracker/data/database.dart'; import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/db/tables/player_table.dart'; +import 'package:game_tracker/data/dto/player.dart'; -extension UserMethods on AppDatabase { - Future> getAllUsers() async { - return await select(user).get(); +part 'player_dao.g.dart'; + +@DriftAccessor(tables: [PlayerTable]) +class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { + PlayerDao(super.db); + + Future> getAllUsers() async { + return await select(UserTable).get(); } Future getUserById(String id) async { @@ -11,9 +18,7 @@ extension UserMethods on AppDatabase { } Future addUser(String id, String name) async { - await into(user).insert( - UserCompanion.insert(id: id, name: name), - ); + await into(user).insert(UserCompanion.insert(id: id, name: name)); } Future deleteUser(String id) async { @@ -25,4 +30,4 @@ extension UserMethods on AppDatabase { UserCompanion(name: Value(newName)), ); } -} \ No newline at end of file +} diff --git a/lib/data/dao/player_dao.g.dart b/lib/data/dao/player_dao.g.dart new file mode 100644 index 0000000..c517581 --- /dev/null +++ b/lib/data/dao/player_dao.g.dart @@ -0,0 +1,8 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'player_dao.dart'; + +// ignore_for_file: type=lint +mixin _$PlayerDaoMixin on DatabaseAccessor { + $PlayerTableTable get playerTable => attachedDatabase.playerTable; +} diff --git a/lib/data/dao/player_group_dao.dart b/lib/data/dao/player_group_dao.dart new file mode 100644 index 0000000..c4daf21 --- /dev/null +++ b/lib/data/dao/player_group_dao.dart @@ -0,0 +1,40 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/db/tables/player_group_table.dart'; + +part 'player_group_dao.g.dart'; + +@DriftAccessor(tables: [PlayerGroupTable]) +class PlayerGroupDao extends DatabaseAccessor + with _$PlayerGroupDaoMixin { + PlayerGroupDao(super.db); + + Future> getAllUsersAndGroups() async { + return await select(userGroup).get(); + } + + Future> getUsersGroups(String userId) async { + return await (select( + userGroup, + )..where((uG) => uG.userId.equals(userId))).get(); + } + + Future> getGroupsUsers(String groupId) async { + return await (select( + userGroup, + )..where((uG) => uG.groupId.equals(groupId))).get(); + } + + Future addUserToGroup(String userId, String groupId) async { + await into( + userGroup, + ).insert(UserGroupCompanion.insert(userId: userId, groupId: groupId)); + } + + Future removeUserFromGroup(String userId, String groupId) async { + await (delete( + userGroup, + )..where((uG) => uG.userId.equals(userId) & uG.groupId.equals(groupId))) + .go(); + } +} diff --git a/lib/data/dao/player_group_dao.g.dart b/lib/data/dao/player_group_dao.g.dart new file mode 100644 index 0000000..d512bb4 --- /dev/null +++ b/lib/data/dao/player_group_dao.g.dart @@ -0,0 +1,9 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'player_group_dao.dart'; + +// ignore_for_file: type=lint +mixin _$PlayerGroupDaoMixin on DatabaseAccessor { + $PlayerGroupTableTable get playerGroupTable => + attachedDatabase.playerGroupTable; +} diff --git a/lib/data/database.dart b/lib/data/database.dart deleted file mode 100644 index 2c04942..0000000 --- a/lib/data/database.dart +++ /dev/null @@ -1,46 +0,0 @@ -import 'package:drift/drift.dart'; -import 'package:drift_flutter/drift_flutter.dart'; -import 'package:path_provider/path_provider.dart'; - -part 'database.g.dart'; - -class User extends Table { - TextColumn get id => text()(); - TextColumn get name => text()(); - - @override - Set> get primaryKey => {id}; -} - -class Group extends Table { - TextColumn get id => text()(); - TextColumn get name => text()(); - - @override - Set> get primaryKey => {id}; -} - -class UserGroup extends Table { - TextColumn get userId => text().references(User, #id)(); - TextColumn get groupId => text().references(Group, #id)(); - - @override - Set> get primaryKey => {userId, groupId}; -} - -@DriftDatabase(tables: [User, Group, UserGroup]) -class AppDatabase extends _$AppDatabase { - AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection()); - - @override - int get schemaVersion => 1; - - static QueryExecutor _openConnection() { - return driftDatabase( - name: 'gametracker_db', - native: const DriftNativeOptions( - databaseDirectory: getApplicationSupportDirectory, - ), - ); - } -} \ No newline at end of file diff --git a/lib/data/database.g.dart b/lib/data/database.g.dart deleted file mode 100644 index 795f850..0000000 --- a/lib/data/database.g.dart +++ /dev/null @@ -1,1455 +0,0 @@ -// GENERATED CODE - DO NOT MODIFY BY HAND - -part of 'database.dart'; - -// ignore_for_file: type=lint -class $UserTable extends User with TableInfo<$UserTable, UserData> { - @override - final GeneratedDatabase attachedDatabase; - final String? _alias; - $UserTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); - @override - late final GeneratedColumn id = GeneratedColumn( - 'id', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _nameMeta = const VerificationMeta('name'); - @override - late final GeneratedColumn name = GeneratedColumn( - 'name', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - @override - List get $columns => [id, name]; - @override - String get aliasedName => _alias ?? actualTableName; - @override - String get actualTableName => $name; - static const String $name = 'user'; - @override - VerificationContext validateIntegrity( - Insertable instance, { - bool isInserting = false, - }) { - final context = VerificationContext(); - final data = instance.toColumns(true); - if (data.containsKey('id')) { - context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); - } else if (isInserting) { - context.missing(_idMeta); - } - if (data.containsKey('name')) { - context.handle( - _nameMeta, - name.isAcceptableOrUnknown(data['name']!, _nameMeta), - ); - } else if (isInserting) { - context.missing(_nameMeta); - } - return context; - } - - @override - Set get $primaryKey => {id}; - @override - UserData map(Map data, {String? tablePrefix}) { - final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; - return UserData( - id: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, - name: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}name'], - )!, - ); - } - - @override - $UserTable createAlias(String alias) { - return $UserTable(attachedDatabase, alias); - } -} - -class UserData extends DataClass implements Insertable { - final String id; - final String name; - const UserData({required this.id, required this.name}); - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - map['id'] = Variable(id); - map['name'] = Variable(name); - return map; - } - - UserCompanion toCompanion(bool nullToAbsent) { - return UserCompanion(id: Value(id), name: Value(name)); - } - - factory UserData.fromJson( - Map json, { - ValueSerializer? serializer, - }) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return UserData( - id: serializer.fromJson(json['id']), - name: serializer.fromJson(json['name']), - ); - } - @override - Map toJson({ValueSerializer? serializer}) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return { - 'id': serializer.toJson(id), - 'name': serializer.toJson(name), - }; - } - - UserData copyWith({String? id, String? name}) => - UserData(id: id ?? this.id, name: name ?? this.name); - UserData copyWithCompanion(UserCompanion data) { - return UserData( - id: data.id.present ? data.id.value : this.id, - name: data.name.present ? data.name.value : this.name, - ); - } - - @override - String toString() { - return (StringBuffer('UserData(') - ..write('id: $id, ') - ..write('name: $name') - ..write(')')) - .toString(); - } - - @override - int get hashCode => Object.hash(id, name); - @override - bool operator ==(Object other) => - identical(this, other) || - (other is UserData && other.id == this.id && other.name == this.name); -} - -class UserCompanion extends UpdateCompanion { - final Value id; - final Value name; - final Value rowid; - const UserCompanion({ - this.id = const Value.absent(), - this.name = const Value.absent(), - this.rowid = const Value.absent(), - }); - UserCompanion.insert({ - required String id, - required String name, - this.rowid = const Value.absent(), - }) : id = Value(id), - name = Value(name); - static Insertable custom({ - Expression? id, - Expression? name, - Expression? rowid, - }) { - return RawValuesInsertable({ - if (id != null) 'id': id, - if (name != null) 'name': name, - if (rowid != null) 'rowid': rowid, - }); - } - - UserCompanion copyWith({ - Value? id, - Value? name, - Value? rowid, - }) { - return UserCompanion( - id: id ?? this.id, - name: name ?? this.name, - rowid: rowid ?? this.rowid, - ); - } - - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - if (id.present) { - map['id'] = Variable(id.value); - } - if (name.present) { - map['name'] = Variable(name.value); - } - if (rowid.present) { - map['rowid'] = Variable(rowid.value); - } - return map; - } - - @override - String toString() { - return (StringBuffer('UserCompanion(') - ..write('id: $id, ') - ..write('name: $name, ') - ..write('rowid: $rowid') - ..write(')')) - .toString(); - } -} - -class $GroupTable extends Group with TableInfo<$GroupTable, GroupData> { - @override - final GeneratedDatabase attachedDatabase; - final String? _alias; - $GroupTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _idMeta = const VerificationMeta('id'); - @override - late final GeneratedColumn id = GeneratedColumn( - 'id', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - static const VerificationMeta _nameMeta = const VerificationMeta('name'); - @override - late final GeneratedColumn name = GeneratedColumn( - 'name', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - ); - @override - List get $columns => [id, name]; - @override - String get aliasedName => _alias ?? actualTableName; - @override - String get actualTableName => $name; - static const String $name = 'group'; - @override - VerificationContext validateIntegrity( - Insertable instance, { - bool isInserting = false, - }) { - final context = VerificationContext(); - final data = instance.toColumns(true); - if (data.containsKey('id')) { - context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); - } else if (isInserting) { - context.missing(_idMeta); - } - if (data.containsKey('name')) { - context.handle( - _nameMeta, - name.isAcceptableOrUnknown(data['name']!, _nameMeta), - ); - } else if (isInserting) { - context.missing(_nameMeta); - } - return context; - } - - @override - Set get $primaryKey => {id}; - @override - GroupData map(Map data, {String? tablePrefix}) { - final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; - return GroupData( - id: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}id'], - )!, - name: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}name'], - )!, - ); - } - - @override - $GroupTable createAlias(String alias) { - return $GroupTable(attachedDatabase, alias); - } -} - -class GroupData extends DataClass implements Insertable { - final String id; - final String name; - const GroupData({required this.id, required this.name}); - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - map['id'] = Variable(id); - map['name'] = Variable(name); - return map; - } - - GroupCompanion toCompanion(bool nullToAbsent) { - return GroupCompanion(id: Value(id), name: Value(name)); - } - - factory GroupData.fromJson( - Map json, { - ValueSerializer? serializer, - }) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return GroupData( - id: serializer.fromJson(json['id']), - name: serializer.fromJson(json['name']), - ); - } - @override - Map toJson({ValueSerializer? serializer}) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return { - 'id': serializer.toJson(id), - 'name': serializer.toJson(name), - }; - } - - GroupData copyWith({String? id, String? name}) => - GroupData(id: id ?? this.id, name: name ?? this.name); - GroupData copyWithCompanion(GroupCompanion data) { - return GroupData( - id: data.id.present ? data.id.value : this.id, - name: data.name.present ? data.name.value : this.name, - ); - } - - @override - String toString() { - return (StringBuffer('GroupData(') - ..write('id: $id, ') - ..write('name: $name') - ..write(')')) - .toString(); - } - - @override - int get hashCode => Object.hash(id, name); - @override - bool operator ==(Object other) => - identical(this, other) || - (other is GroupData && other.id == this.id && other.name == this.name); -} - -class GroupCompanion extends UpdateCompanion { - final Value id; - final Value name; - final Value rowid; - const GroupCompanion({ - this.id = const Value.absent(), - this.name = const Value.absent(), - this.rowid = const Value.absent(), - }); - GroupCompanion.insert({ - required String id, - required String name, - this.rowid = const Value.absent(), - }) : id = Value(id), - name = Value(name); - static Insertable custom({ - Expression? id, - Expression? name, - Expression? rowid, - }) { - return RawValuesInsertable({ - if (id != null) 'id': id, - if (name != null) 'name': name, - if (rowid != null) 'rowid': rowid, - }); - } - - GroupCompanion copyWith({ - Value? id, - Value? name, - Value? rowid, - }) { - return GroupCompanion( - id: id ?? this.id, - name: name ?? this.name, - rowid: rowid ?? this.rowid, - ); - } - - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - if (id.present) { - map['id'] = Variable(id.value); - } - if (name.present) { - map['name'] = Variable(name.value); - } - if (rowid.present) { - map['rowid'] = Variable(rowid.value); - } - return map; - } - - @override - String toString() { - return (StringBuffer('GroupCompanion(') - ..write('id: $id, ') - ..write('name: $name, ') - ..write('rowid: $rowid') - ..write(')')) - .toString(); - } -} - -class $UserGroupTable extends UserGroup - with TableInfo<$UserGroupTable, UserGroupData> { - @override - final GeneratedDatabase attachedDatabase; - final String? _alias; - $UserGroupTable(this.attachedDatabase, [this._alias]); - static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); - @override - late final GeneratedColumn userId = GeneratedColumn( - 'user_id', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES user (id)', - ), - ); - static const VerificationMeta _groupIdMeta = const VerificationMeta( - 'groupId', - ); - @override - late final GeneratedColumn groupId = GeneratedColumn( - 'group_id', - aliasedName, - false, - type: DriftSqlType.string, - requiredDuringInsert: true, - defaultConstraints: GeneratedColumn.constraintIsAlways( - 'REFERENCES "group" (id)', - ), - ); - @override - List get $columns => [userId, groupId]; - @override - String get aliasedName => _alias ?? actualTableName; - @override - String get actualTableName => $name; - static const String $name = 'user_group'; - @override - VerificationContext validateIntegrity( - Insertable instance, { - bool isInserting = false, - }) { - final context = VerificationContext(); - final data = instance.toColumns(true); - if (data.containsKey('user_id')) { - context.handle( - _userIdMeta, - userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta), - ); - } else if (isInserting) { - context.missing(_userIdMeta); - } - if (data.containsKey('group_id')) { - context.handle( - _groupIdMeta, - groupId.isAcceptableOrUnknown(data['group_id']!, _groupIdMeta), - ); - } else if (isInserting) { - context.missing(_groupIdMeta); - } - return context; - } - - @override - Set get $primaryKey => {userId, groupId}; - @override - UserGroupData map(Map data, {String? tablePrefix}) { - final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; - return UserGroupData( - userId: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}user_id'], - )!, - groupId: attachedDatabase.typeMapping.read( - DriftSqlType.string, - data['${effectivePrefix}group_id'], - )!, - ); - } - - @override - $UserGroupTable createAlias(String alias) { - return $UserGroupTable(attachedDatabase, alias); - } -} - -class UserGroupData extends DataClass implements Insertable { - final String userId; - final String groupId; - const UserGroupData({required this.userId, required this.groupId}); - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - map['user_id'] = Variable(userId); - map['group_id'] = Variable(groupId); - return map; - } - - UserGroupCompanion toCompanion(bool nullToAbsent) { - return UserGroupCompanion(userId: Value(userId), groupId: Value(groupId)); - } - - factory UserGroupData.fromJson( - Map json, { - ValueSerializer? serializer, - }) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return UserGroupData( - userId: serializer.fromJson(json['userId']), - groupId: serializer.fromJson(json['groupId']), - ); - } - @override - Map toJson({ValueSerializer? serializer}) { - serializer ??= driftRuntimeOptions.defaultSerializer; - return { - 'userId': serializer.toJson(userId), - 'groupId': serializer.toJson(groupId), - }; - } - - UserGroupData copyWith({String? userId, String? groupId}) => UserGroupData( - userId: userId ?? this.userId, - groupId: groupId ?? this.groupId, - ); - UserGroupData copyWithCompanion(UserGroupCompanion data) { - return UserGroupData( - userId: data.userId.present ? data.userId.value : this.userId, - groupId: data.groupId.present ? data.groupId.value : this.groupId, - ); - } - - @override - String toString() { - return (StringBuffer('UserGroupData(') - ..write('userId: $userId, ') - ..write('groupId: $groupId') - ..write(')')) - .toString(); - } - - @override - int get hashCode => Object.hash(userId, groupId); - @override - bool operator ==(Object other) => - identical(this, other) || - (other is UserGroupData && - other.userId == this.userId && - other.groupId == this.groupId); -} - -class UserGroupCompanion extends UpdateCompanion { - final Value userId; - final Value groupId; - final Value rowid; - const UserGroupCompanion({ - this.userId = const Value.absent(), - this.groupId = const Value.absent(), - this.rowid = const Value.absent(), - }); - UserGroupCompanion.insert({ - required String userId, - required String groupId, - this.rowid = const Value.absent(), - }) : userId = Value(userId), - groupId = Value(groupId); - static Insertable custom({ - Expression? userId, - Expression? groupId, - Expression? rowid, - }) { - return RawValuesInsertable({ - if (userId != null) 'user_id': userId, - if (groupId != null) 'group_id': groupId, - if (rowid != null) 'rowid': rowid, - }); - } - - UserGroupCompanion copyWith({ - Value? userId, - Value? groupId, - Value? rowid, - }) { - return UserGroupCompanion( - userId: userId ?? this.userId, - groupId: groupId ?? this.groupId, - rowid: rowid ?? this.rowid, - ); - } - - @override - Map toColumns(bool nullToAbsent) { - final map = {}; - if (userId.present) { - map['user_id'] = Variable(userId.value); - } - if (groupId.present) { - map['group_id'] = Variable(groupId.value); - } - if (rowid.present) { - map['rowid'] = Variable(rowid.value); - } - return map; - } - - @override - String toString() { - return (StringBuffer('UserGroupCompanion(') - ..write('userId: $userId, ') - ..write('groupId: $groupId, ') - ..write('rowid: $rowid') - ..write(')')) - .toString(); - } -} - -abstract class _$AppDatabase extends GeneratedDatabase { - _$AppDatabase(QueryExecutor e) : super(e); - $AppDatabaseManager get managers => $AppDatabaseManager(this); - late final $UserTable user = $UserTable(this); - late final $GroupTable group = $GroupTable(this); - late final $UserGroupTable userGroup = $UserGroupTable(this); - @override - Iterable> get allTables => - allSchemaEntities.whereType>(); - @override - List get allSchemaEntities => [user, group, userGroup]; -} - -typedef $$UserTableCreateCompanionBuilder = - UserCompanion Function({ - required String id, - required String name, - Value rowid, - }); -typedef $$UserTableUpdateCompanionBuilder = - UserCompanion Function({ - Value id, - Value name, - Value rowid, - }); - -final class $$UserTableReferences - extends BaseReferences<_$AppDatabase, $UserTable, UserData> { - $$UserTableReferences(super.$_db, super.$_table, super.$_typedResult); - - static MultiTypedResultKey<$UserGroupTable, List> - _userGroupRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( - db.userGroup, - aliasName: $_aliasNameGenerator(db.user.id, db.userGroup.userId), - ); - - $$UserGroupTableProcessedTableManager get userGroupRefs { - final manager = $$UserGroupTableTableManager( - $_db, - $_db.userGroup, - ).filter((f) => f.userId.id.sqlEquals($_itemColumn('id')!)); - - final cache = $_typedResult.readTableOrNull(_userGroupRefsTable($_db)); - return ProcessedTableManager( - manager.$state.copyWith(prefetchedData: cache), - ); - } -} - -class $$UserTableFilterComposer extends Composer<_$AppDatabase, $UserTable> { - $$UserTableFilterComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - ColumnFilters get id => $composableBuilder( - column: $table.id, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get name => $composableBuilder( - column: $table.name, - builder: (column) => ColumnFilters(column), - ); - - Expression userGroupRefs( - Expression Function($$UserGroupTableFilterComposer f) f, - ) { - final $$UserGroupTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.userGroup, - getReferencedColumn: (t) => t.userId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserGroupTableFilterComposer( - $db: $db, - $table: $db.userGroup, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } -} - -class $$UserTableOrderingComposer extends Composer<_$AppDatabase, $UserTable> { - $$UserTableOrderingComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - ColumnOrderings get id => $composableBuilder( - column: $table.id, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get name => $composableBuilder( - column: $table.name, - builder: (column) => ColumnOrderings(column), - ); -} - -class $$UserTableAnnotationComposer - extends Composer<_$AppDatabase, $UserTable> { - $$UserTableAnnotationComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); - - GeneratedColumn get name => - $composableBuilder(column: $table.name, builder: (column) => column); - - Expression userGroupRefs( - Expression Function($$UserGroupTableAnnotationComposer a) f, - ) { - final $$UserGroupTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.userGroup, - getReferencedColumn: (t) => t.userId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserGroupTableAnnotationComposer( - $db: $db, - $table: $db.userGroup, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } -} - -class $$UserTableTableManager - extends - RootTableManager< - _$AppDatabase, - $UserTable, - UserData, - $$UserTableFilterComposer, - $$UserTableOrderingComposer, - $$UserTableAnnotationComposer, - $$UserTableCreateCompanionBuilder, - $$UserTableUpdateCompanionBuilder, - (UserData, $$UserTableReferences), - UserData, - PrefetchHooks Function({bool userGroupRefs}) - > { - $$UserTableTableManager(_$AppDatabase db, $UserTable table) - : super( - TableManagerState( - db: db, - table: table, - createFilteringComposer: () => - $$UserTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$UserTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: () => - $$UserTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: - ({ - Value id = const Value.absent(), - Value name = const Value.absent(), - Value rowid = const Value.absent(), - }) => UserCompanion(id: id, name: name, rowid: rowid), - createCompanionCallback: - ({ - required String id, - required String name, - Value rowid = const Value.absent(), - }) => UserCompanion.insert(id: id, name: name, rowid: rowid), - withReferenceMapper: (p0) => p0 - .map( - (e) => - (e.readTable(table), $$UserTableReferences(db, table, e)), - ) - .toList(), - prefetchHooksCallback: ({userGroupRefs = false}) { - return PrefetchHooks( - db: db, - explicitlyWatchedTables: [if (userGroupRefs) db.userGroup], - addJoins: null, - getPrefetchedDataCallback: (items) async { - return [ - if (userGroupRefs) - await $_getPrefetchedData< - UserData, - $UserTable, - UserGroupData - >( - currentTable: table, - referencedTable: $$UserTableReferences - ._userGroupRefsTable(db), - managerFromTypedResult: (p0) => - $$UserTableReferences(db, table, p0).userGroupRefs, - referencedItemsForCurrentItem: (item, referencedItems) => - referencedItems.where((e) => e.userId == item.id), - typedResults: items, - ), - ]; - }, - ); - }, - ), - ); -} - -typedef $$UserTableProcessedTableManager = - ProcessedTableManager< - _$AppDatabase, - $UserTable, - UserData, - $$UserTableFilterComposer, - $$UserTableOrderingComposer, - $$UserTableAnnotationComposer, - $$UserTableCreateCompanionBuilder, - $$UserTableUpdateCompanionBuilder, - (UserData, $$UserTableReferences), - UserData, - PrefetchHooks Function({bool userGroupRefs}) - >; -typedef $$GroupTableCreateCompanionBuilder = - GroupCompanion Function({ - required String id, - required String name, - Value rowid, - }); -typedef $$GroupTableUpdateCompanionBuilder = - GroupCompanion Function({ - Value id, - Value name, - Value rowid, - }); - -final class $$GroupTableReferences - extends BaseReferences<_$AppDatabase, $GroupTable, GroupData> { - $$GroupTableReferences(super.$_db, super.$_table, super.$_typedResult); - - static MultiTypedResultKey<$UserGroupTable, List> - _userGroupRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( - db.userGroup, - aliasName: $_aliasNameGenerator(db.group.id, db.userGroup.groupId), - ); - - $$UserGroupTableProcessedTableManager get userGroupRefs { - final manager = $$UserGroupTableTableManager( - $_db, - $_db.userGroup, - ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); - - final cache = $_typedResult.readTableOrNull(_userGroupRefsTable($_db)); - return ProcessedTableManager( - manager.$state.copyWith(prefetchedData: cache), - ); - } -} - -class $$GroupTableFilterComposer extends Composer<_$AppDatabase, $GroupTable> { - $$GroupTableFilterComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - ColumnFilters get id => $composableBuilder( - column: $table.id, - builder: (column) => ColumnFilters(column), - ); - - ColumnFilters get name => $composableBuilder( - column: $table.name, - builder: (column) => ColumnFilters(column), - ); - - Expression userGroupRefs( - Expression Function($$UserGroupTableFilterComposer f) f, - ) { - final $$UserGroupTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.userGroup, - getReferencedColumn: (t) => t.groupId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserGroupTableFilterComposer( - $db: $db, - $table: $db.userGroup, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } -} - -class $$GroupTableOrderingComposer - extends Composer<_$AppDatabase, $GroupTable> { - $$GroupTableOrderingComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - ColumnOrderings get id => $composableBuilder( - column: $table.id, - builder: (column) => ColumnOrderings(column), - ); - - ColumnOrderings get name => $composableBuilder( - column: $table.name, - builder: (column) => ColumnOrderings(column), - ); -} - -class $$GroupTableAnnotationComposer - extends Composer<_$AppDatabase, $GroupTable> { - $$GroupTableAnnotationComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - GeneratedColumn get id => - $composableBuilder(column: $table.id, builder: (column) => column); - - GeneratedColumn get name => - $composableBuilder(column: $table.name, builder: (column) => column); - - Expression userGroupRefs( - Expression Function($$UserGroupTableAnnotationComposer a) f, - ) { - final $$UserGroupTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.id, - referencedTable: $db.userGroup, - getReferencedColumn: (t) => t.groupId, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserGroupTableAnnotationComposer( - $db: $db, - $table: $db.userGroup, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return f(composer); - } -} - -class $$GroupTableTableManager - extends - RootTableManager< - _$AppDatabase, - $GroupTable, - GroupData, - $$GroupTableFilterComposer, - $$GroupTableOrderingComposer, - $$GroupTableAnnotationComposer, - $$GroupTableCreateCompanionBuilder, - $$GroupTableUpdateCompanionBuilder, - (GroupData, $$GroupTableReferences), - GroupData, - PrefetchHooks Function({bool userGroupRefs}) - > { - $$GroupTableTableManager(_$AppDatabase db, $GroupTable table) - : super( - TableManagerState( - db: db, - table: table, - createFilteringComposer: () => - $$GroupTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$GroupTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: () => - $$GroupTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: - ({ - Value id = const Value.absent(), - Value name = const Value.absent(), - Value rowid = const Value.absent(), - }) => GroupCompanion(id: id, name: name, rowid: rowid), - createCompanionCallback: - ({ - required String id, - required String name, - Value rowid = const Value.absent(), - }) => GroupCompanion.insert(id: id, name: name, rowid: rowid), - withReferenceMapper: (p0) => p0 - .map( - (e) => - (e.readTable(table), $$GroupTableReferences(db, table, e)), - ) - .toList(), - prefetchHooksCallback: ({userGroupRefs = false}) { - return PrefetchHooks( - db: db, - explicitlyWatchedTables: [if (userGroupRefs) db.userGroup], - addJoins: null, - getPrefetchedDataCallback: (items) async { - return [ - if (userGroupRefs) - await $_getPrefetchedData< - GroupData, - $GroupTable, - UserGroupData - >( - currentTable: table, - referencedTable: $$GroupTableReferences - ._userGroupRefsTable(db), - managerFromTypedResult: (p0) => - $$GroupTableReferences(db, table, p0).userGroupRefs, - referencedItemsForCurrentItem: (item, referencedItems) => - referencedItems.where((e) => e.groupId == item.id), - typedResults: items, - ), - ]; - }, - ); - }, - ), - ); -} - -typedef $$GroupTableProcessedTableManager = - ProcessedTableManager< - _$AppDatabase, - $GroupTable, - GroupData, - $$GroupTableFilterComposer, - $$GroupTableOrderingComposer, - $$GroupTableAnnotationComposer, - $$GroupTableCreateCompanionBuilder, - $$GroupTableUpdateCompanionBuilder, - (GroupData, $$GroupTableReferences), - GroupData, - PrefetchHooks Function({bool userGroupRefs}) - >; -typedef $$UserGroupTableCreateCompanionBuilder = - UserGroupCompanion Function({ - required String userId, - required String groupId, - Value rowid, - }); -typedef $$UserGroupTableUpdateCompanionBuilder = - UserGroupCompanion Function({ - Value userId, - Value groupId, - Value rowid, - }); - -final class $$UserGroupTableReferences - extends BaseReferences<_$AppDatabase, $UserGroupTable, UserGroupData> { - $$UserGroupTableReferences(super.$_db, super.$_table, super.$_typedResult); - - static $UserTable _userIdTable(_$AppDatabase db) => db.user.createAlias( - $_aliasNameGenerator(db.userGroup.userId, db.user.id), - ); - - $$UserTableProcessedTableManager get userId { - final $_column = $_itemColumn('user_id')!; - - final manager = $$UserTableTableManager( - $_db, - $_db.user, - ).filter((f) => f.id.sqlEquals($_column)); - final item = $_typedResult.readTableOrNull(_userIdTable($_db)); - if (item == null) return manager; - return ProcessedTableManager( - manager.$state.copyWith(prefetchedData: [item]), - ); - } - - static $GroupTable _groupIdTable(_$AppDatabase db) => db.group.createAlias( - $_aliasNameGenerator(db.userGroup.groupId, db.group.id), - ); - - $$GroupTableProcessedTableManager get groupId { - final $_column = $_itemColumn('group_id')!; - - final manager = $$GroupTableTableManager( - $_db, - $_db.group, - ).filter((f) => f.id.sqlEquals($_column)); - final item = $_typedResult.readTableOrNull(_groupIdTable($_db)); - if (item == null) return manager; - return ProcessedTableManager( - manager.$state.copyWith(prefetchedData: [item]), - ); - } -} - -class $$UserGroupTableFilterComposer - extends Composer<_$AppDatabase, $UserGroupTable> { - $$UserGroupTableFilterComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - $$UserTableFilterComposer get userId { - final $$UserTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.userId, - referencedTable: $db.user, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserTableFilterComposer( - $db: $db, - $table: $db.user, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } - - $$GroupTableFilterComposer get groupId { - final $$GroupTableFilterComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.groupId, - referencedTable: $db.group, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$GroupTableFilterComposer( - $db: $db, - $table: $db.group, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } -} - -class $$UserGroupTableOrderingComposer - extends Composer<_$AppDatabase, $UserGroupTable> { - $$UserGroupTableOrderingComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - $$UserTableOrderingComposer get userId { - final $$UserTableOrderingComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.userId, - referencedTable: $db.user, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserTableOrderingComposer( - $db: $db, - $table: $db.user, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } - - $$GroupTableOrderingComposer get groupId { - final $$GroupTableOrderingComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.groupId, - referencedTable: $db.group, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$GroupTableOrderingComposer( - $db: $db, - $table: $db.group, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } -} - -class $$UserGroupTableAnnotationComposer - extends Composer<_$AppDatabase, $UserGroupTable> { - $$UserGroupTableAnnotationComposer({ - required super.$db, - required super.$table, - super.joinBuilder, - super.$addJoinBuilderToRootComposer, - super.$removeJoinBuilderFromRootComposer, - }); - $$UserTableAnnotationComposer get userId { - final $$UserTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.userId, - referencedTable: $db.user, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$UserTableAnnotationComposer( - $db: $db, - $table: $db.user, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } - - $$GroupTableAnnotationComposer get groupId { - final $$GroupTableAnnotationComposer composer = $composerBuilder( - composer: this, - getCurrentColumn: (t) => t.groupId, - referencedTable: $db.group, - getReferencedColumn: (t) => t.id, - builder: - ( - joinBuilder, { - $addJoinBuilderToRootComposer, - $removeJoinBuilderFromRootComposer, - }) => $$GroupTableAnnotationComposer( - $db: $db, - $table: $db.group, - $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, - joinBuilder: joinBuilder, - $removeJoinBuilderFromRootComposer: - $removeJoinBuilderFromRootComposer, - ), - ); - return composer; - } -} - -class $$UserGroupTableTableManager - extends - RootTableManager< - _$AppDatabase, - $UserGroupTable, - UserGroupData, - $$UserGroupTableFilterComposer, - $$UserGroupTableOrderingComposer, - $$UserGroupTableAnnotationComposer, - $$UserGroupTableCreateCompanionBuilder, - $$UserGroupTableUpdateCompanionBuilder, - (UserGroupData, $$UserGroupTableReferences), - UserGroupData, - PrefetchHooks Function({bool userId, bool groupId}) - > { - $$UserGroupTableTableManager(_$AppDatabase db, $UserGroupTable table) - : super( - TableManagerState( - db: db, - table: table, - createFilteringComposer: () => - $$UserGroupTableFilterComposer($db: db, $table: table), - createOrderingComposer: () => - $$UserGroupTableOrderingComposer($db: db, $table: table), - createComputedFieldComposer: () => - $$UserGroupTableAnnotationComposer($db: db, $table: table), - updateCompanionCallback: - ({ - Value userId = const Value.absent(), - Value groupId = const Value.absent(), - Value rowid = const Value.absent(), - }) => UserGroupCompanion( - userId: userId, - groupId: groupId, - rowid: rowid, - ), - createCompanionCallback: - ({ - required String userId, - required String groupId, - Value rowid = const Value.absent(), - }) => UserGroupCompanion.insert( - userId: userId, - groupId: groupId, - rowid: rowid, - ), - withReferenceMapper: (p0) => p0 - .map( - (e) => ( - e.readTable(table), - $$UserGroupTableReferences(db, table, e), - ), - ) - .toList(), - prefetchHooksCallback: ({userId = false, groupId = false}) { - return PrefetchHooks( - db: db, - explicitlyWatchedTables: [], - addJoins: - < - T extends TableManagerState< - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic, - dynamic - > - >(state) { - if (userId) { - state = - state.withJoin( - currentTable: table, - currentColumn: table.userId, - referencedTable: $$UserGroupTableReferences - ._userIdTable(db), - referencedColumn: $$UserGroupTableReferences - ._userIdTable(db) - .id, - ) - as T; - } - if (groupId) { - state = - state.withJoin( - currentTable: table, - currentColumn: table.groupId, - referencedTable: $$UserGroupTableReferences - ._groupIdTable(db), - referencedColumn: $$UserGroupTableReferences - ._groupIdTable(db) - .id, - ) - as T; - } - - return state; - }, - getPrefetchedDataCallback: (items) async { - return []; - }, - ); - }, - ), - ); -} - -typedef $$UserGroupTableProcessedTableManager = - ProcessedTableManager< - _$AppDatabase, - $UserGroupTable, - UserGroupData, - $$UserGroupTableFilterComposer, - $$UserGroupTableOrderingComposer, - $$UserGroupTableAnnotationComposer, - $$UserGroupTableCreateCompanionBuilder, - $$UserGroupTableUpdateCompanionBuilder, - (UserGroupData, $$UserGroupTableReferences), - UserGroupData, - PrefetchHooks Function({bool userId, bool groupId}) - >; - -class $AppDatabaseManager { - final _$AppDatabase _db; - $AppDatabaseManager(this._db); - $$UserTableTableManager get user => $$UserTableTableManager(_db, _db.user); - $$GroupTableTableManager get group => - $$GroupTableTableManager(_db, _db.group); - $$UserGroupTableTableManager get userGroup => - $$UserGroupTableTableManager(_db, _db.userGroup); -} diff --git a/lib/data/db/database.dart b/lib/data/db/database.dart new file mode 100644 index 0000000..6d4dedc --- /dev/null +++ b/lib/data/db/database.dart @@ -0,0 +1,31 @@ +import 'package:drift/drift.dart'; +import 'package:drift_flutter/drift_flutter.dart'; +import 'package:game_tracker/data/dao/group_dao.dart'; +import 'package:game_tracker/data/dao/player_dao.dart'; +import 'package:game_tracker/data/dao/player_group_dao.dart'; +import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/db/tables/player_group_table.dart'; +import 'package:game_tracker/data/db/tables/player_table.dart'; +import 'package:path_provider/path_provider.dart'; + +part 'database.g.dart'; + +@DriftDatabase( + tables: [PlayerTable, GroupTable, PlayerGroupTable], + daos: [GroupDao, PlayerDao, PlayerGroupDao], +) +class AppDatabase extends _$AppDatabase { + AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection()); + + @override + int get schemaVersion => 1; + + static QueryExecutor _openConnection() { + return driftDatabase( + name: 'gametracker_db', + native: const DriftNativeOptions( + databaseDirectory: getApplicationSupportDirectory, + ), + ); + } +} diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart new file mode 100644 index 0000000..150b8a3 --- /dev/null +++ b/lib/data/db/database.g.dart @@ -0,0 +1,1092 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'database.dart'; + +// ignore_for_file: type=lint +class $PlayerTableTable extends PlayerTable + with TableInfo<$PlayerTableTable, PlayerTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $PlayerTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'player_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + PlayerTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return PlayerTableData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $PlayerTableTable createAlias(String alias) { + return $PlayerTableTable(attachedDatabase, alias); + } +} + +class PlayerTableData extends DataClass implements Insertable { + final String id; + final String name; + const PlayerTableData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + PlayerTableCompanion toCompanion(bool nullToAbsent) { + return PlayerTableCompanion(id: Value(id), name: Value(name)); + } + + factory PlayerTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return PlayerTableData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + PlayerTableData copyWith({String? id, String? name}) => + PlayerTableData(id: id ?? this.id, name: name ?? this.name); + PlayerTableData copyWithCompanion(PlayerTableCompanion data) { + return PlayerTableData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('PlayerTableData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is PlayerTableData && + other.id == this.id && + other.name == this.name); +} + +class PlayerTableCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const PlayerTableCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + PlayerTableCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + PlayerTableCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return PlayerTableCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('PlayerTableCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $GroupTableTable extends GroupTable + with TableInfo<$GroupTableTable, GroupTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $GroupTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'group_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + GroupTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return GroupTableData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $GroupTableTable createAlias(String alias) { + return $GroupTableTable(attachedDatabase, alias); + } +} + +class GroupTableData extends DataClass implements Insertable { + final String id; + final String name; + const GroupTableData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + GroupTableCompanion toCompanion(bool nullToAbsent) { + return GroupTableCompanion(id: Value(id), name: Value(name)); + } + + factory GroupTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return GroupTableData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + GroupTableData copyWith({String? id, String? name}) => + GroupTableData(id: id ?? this.id, name: name ?? this.name); + GroupTableData copyWithCompanion(GroupTableCompanion data) { + return GroupTableData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('GroupTableData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is GroupTableData && + other.id == this.id && + other.name == this.name); +} + +class GroupTableCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const GroupTableCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + GroupTableCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + GroupTableCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return GroupTableCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('GroupTableCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +class $PlayerGroupTableTable extends PlayerGroupTable + with TableInfo<$PlayerGroupTableTable, PlayerGroupTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $PlayerGroupTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _userIdMeta = const VerificationMeta('userId'); + @override + late final GeneratedColumn userId = GeneratedColumn( + 'user_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _groupIdMeta = const VerificationMeta( + 'groupId', + ); + @override + late final GeneratedColumn groupId = GeneratedColumn( + 'group_id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [userId, groupId]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'player_group_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('user_id')) { + context.handle( + _userIdMeta, + userId.isAcceptableOrUnknown(data['user_id']!, _userIdMeta), + ); + } else if (isInserting) { + context.missing(_userIdMeta); + } + if (data.containsKey('group_id')) { + context.handle( + _groupIdMeta, + groupId.isAcceptableOrUnknown(data['group_id']!, _groupIdMeta), + ); + } else if (isInserting) { + context.missing(_groupIdMeta); + } + return context; + } + + @override + Set get $primaryKey => {userId, groupId}; + @override + PlayerGroupTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return PlayerGroupTableData( + userId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}user_id'], + )!, + groupId: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}group_id'], + )!, + ); + } + + @override + $PlayerGroupTableTable createAlias(String alias) { + return $PlayerGroupTableTable(attachedDatabase, alias); + } +} + +class PlayerGroupTableData extends DataClass + implements Insertable { + final String userId; + final String groupId; + const PlayerGroupTableData({required this.userId, required this.groupId}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['user_id'] = Variable(userId); + map['group_id'] = Variable(groupId); + return map; + } + + PlayerGroupTableCompanion toCompanion(bool nullToAbsent) { + return PlayerGroupTableCompanion( + userId: Value(userId), + groupId: Value(groupId), + ); + } + + factory PlayerGroupTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return PlayerGroupTableData( + userId: serializer.fromJson(json['userId']), + groupId: serializer.fromJson(json['groupId']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'userId': serializer.toJson(userId), + 'groupId': serializer.toJson(groupId), + }; + } + + PlayerGroupTableData copyWith({String? userId, String? groupId}) => + PlayerGroupTableData( + userId: userId ?? this.userId, + groupId: groupId ?? this.groupId, + ); + PlayerGroupTableData copyWithCompanion(PlayerGroupTableCompanion data) { + return PlayerGroupTableData( + userId: data.userId.present ? data.userId.value : this.userId, + groupId: data.groupId.present ? data.groupId.value : this.groupId, + ); + } + + @override + String toString() { + return (StringBuffer('PlayerGroupTableData(') + ..write('userId: $userId, ') + ..write('groupId: $groupId') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(userId, groupId); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is PlayerGroupTableData && + other.userId == this.userId && + other.groupId == this.groupId); +} + +class PlayerGroupTableCompanion extends UpdateCompanion { + final Value userId; + final Value groupId; + final Value rowid; + const PlayerGroupTableCompanion({ + this.userId = const Value.absent(), + this.groupId = const Value.absent(), + this.rowid = const Value.absent(), + }); + PlayerGroupTableCompanion.insert({ + required String userId, + required String groupId, + this.rowid = const Value.absent(), + }) : userId = Value(userId), + groupId = Value(groupId); + static Insertable custom({ + Expression? userId, + Expression? groupId, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (userId != null) 'user_id': userId, + if (groupId != null) 'group_id': groupId, + if (rowid != null) 'rowid': rowid, + }); + } + + PlayerGroupTableCompanion copyWith({ + Value? userId, + Value? groupId, + Value? rowid, + }) { + return PlayerGroupTableCompanion( + userId: userId ?? this.userId, + groupId: groupId ?? this.groupId, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (userId.present) { + map['user_id'] = Variable(userId.value); + } + if (groupId.present) { + map['group_id'] = Variable(groupId.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('PlayerGroupTableCompanion(') + ..write('userId: $userId, ') + ..write('groupId: $groupId, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + +abstract class _$AppDatabase extends GeneratedDatabase { + _$AppDatabase(QueryExecutor e) : super(e); + $AppDatabaseManager get managers => $AppDatabaseManager(this); + late final $PlayerTableTable playerTable = $PlayerTableTable(this); + late final $GroupTableTable groupTable = $GroupTableTable(this); + late final $PlayerGroupTableTable playerGroupTable = $PlayerGroupTableTable( + this, + ); + late final GroupDao groupDao = GroupDao(this as AppDatabase); + late final PlayerDao playerDao = PlayerDao(this as AppDatabase); + late final PlayerGroupDao playerGroupDao = PlayerGroupDao( + this as AppDatabase, + ); + @override + Iterable> get allTables => + allSchemaEntities.whereType>(); + @override + List get allSchemaEntities => [ + playerTable, + groupTable, + playerGroupTable, + ]; +} + +typedef $$PlayerTableTableCreateCompanionBuilder = + PlayerTableCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$PlayerTableTableUpdateCompanionBuilder = + PlayerTableCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +class $$PlayerTableTableFilterComposer + extends Composer<_$AppDatabase, $PlayerTableTable> { + $$PlayerTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); +} + +class $$PlayerTableTableOrderingComposer + extends Composer<_$AppDatabase, $PlayerTableTable> { + $$PlayerTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$PlayerTableTableAnnotationComposer + extends Composer<_$AppDatabase, $PlayerTableTable> { + $$PlayerTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); +} + +class $$PlayerTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $PlayerTableTable, + PlayerTableData, + $$PlayerTableTableFilterComposer, + $$PlayerTableTableOrderingComposer, + $$PlayerTableTableAnnotationComposer, + $$PlayerTableTableCreateCompanionBuilder, + $$PlayerTableTableUpdateCompanionBuilder, + ( + PlayerTableData, + BaseReferences<_$AppDatabase, $PlayerTableTable, PlayerTableData>, + ), + PlayerTableData, + PrefetchHooks Function() + > { + $$PlayerTableTableTableManager(_$AppDatabase db, $PlayerTableTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$PlayerTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$PlayerTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$PlayerTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => PlayerTableCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => + PlayerTableCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + ), + ); +} + +typedef $$PlayerTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $PlayerTableTable, + PlayerTableData, + $$PlayerTableTableFilterComposer, + $$PlayerTableTableOrderingComposer, + $$PlayerTableTableAnnotationComposer, + $$PlayerTableTableCreateCompanionBuilder, + $$PlayerTableTableUpdateCompanionBuilder, + ( + PlayerTableData, + BaseReferences<_$AppDatabase, $PlayerTableTable, PlayerTableData>, + ), + PlayerTableData, + PrefetchHooks Function() + >; +typedef $$GroupTableTableCreateCompanionBuilder = + GroupTableCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$GroupTableTableUpdateCompanionBuilder = + GroupTableCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +class $$GroupTableTableFilterComposer + extends Composer<_$AppDatabase, $GroupTableTable> { + $$GroupTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); +} + +class $$GroupTableTableOrderingComposer + extends Composer<_$AppDatabase, $GroupTableTable> { + $$GroupTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$GroupTableTableAnnotationComposer + extends Composer<_$AppDatabase, $GroupTableTable> { + $$GroupTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); +} + +class $$GroupTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $GroupTableTable, + GroupTableData, + $$GroupTableTableFilterComposer, + $$GroupTableTableOrderingComposer, + $$GroupTableTableAnnotationComposer, + $$GroupTableTableCreateCompanionBuilder, + $$GroupTableTableUpdateCompanionBuilder, + ( + GroupTableData, + BaseReferences<_$AppDatabase, $GroupTableTable, GroupTableData>, + ), + GroupTableData, + PrefetchHooks Function() + > { + $$GroupTableTableTableManager(_$AppDatabase db, $GroupTableTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$GroupTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GroupTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GroupTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => GroupTableCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => + GroupTableCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + ), + ); +} + +typedef $$GroupTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $GroupTableTable, + GroupTableData, + $$GroupTableTableFilterComposer, + $$GroupTableTableOrderingComposer, + $$GroupTableTableAnnotationComposer, + $$GroupTableTableCreateCompanionBuilder, + $$GroupTableTableUpdateCompanionBuilder, + ( + GroupTableData, + BaseReferences<_$AppDatabase, $GroupTableTable, GroupTableData>, + ), + GroupTableData, + PrefetchHooks Function() + >; +typedef $$PlayerGroupTableTableCreateCompanionBuilder = + PlayerGroupTableCompanion Function({ + required String userId, + required String groupId, + Value rowid, + }); +typedef $$PlayerGroupTableTableUpdateCompanionBuilder = + PlayerGroupTableCompanion Function({ + Value userId, + Value groupId, + Value rowid, + }); + +class $$PlayerGroupTableTableFilterComposer + extends Composer<_$AppDatabase, $PlayerGroupTableTable> { + $$PlayerGroupTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get userId => $composableBuilder( + column: $table.userId, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get groupId => $composableBuilder( + column: $table.groupId, + builder: (column) => ColumnFilters(column), + ); +} + +class $$PlayerGroupTableTableOrderingComposer + extends Composer<_$AppDatabase, $PlayerGroupTableTable> { + $$PlayerGroupTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get userId => $composableBuilder( + column: $table.userId, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get groupId => $composableBuilder( + column: $table.groupId, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$PlayerGroupTableTableAnnotationComposer + extends Composer<_$AppDatabase, $PlayerGroupTableTable> { + $$PlayerGroupTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get userId => + $composableBuilder(column: $table.userId, builder: (column) => column); + + GeneratedColumn get groupId => + $composableBuilder(column: $table.groupId, builder: (column) => column); +} + +class $$PlayerGroupTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $PlayerGroupTableTable, + PlayerGroupTableData, + $$PlayerGroupTableTableFilterComposer, + $$PlayerGroupTableTableOrderingComposer, + $$PlayerGroupTableTableAnnotationComposer, + $$PlayerGroupTableTableCreateCompanionBuilder, + $$PlayerGroupTableTableUpdateCompanionBuilder, + ( + PlayerGroupTableData, + BaseReferences< + _$AppDatabase, + $PlayerGroupTableTable, + PlayerGroupTableData + >, + ), + PlayerGroupTableData, + PrefetchHooks Function() + > { + $$PlayerGroupTableTableTableManager( + _$AppDatabase db, + $PlayerGroupTableTable table, + ) : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$PlayerGroupTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$PlayerGroupTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$PlayerGroupTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value userId = const Value.absent(), + Value groupId = const Value.absent(), + Value rowid = const Value.absent(), + }) => PlayerGroupTableCompanion( + userId: userId, + groupId: groupId, + rowid: rowid, + ), + createCompanionCallback: + ({ + required String userId, + required String groupId, + Value rowid = const Value.absent(), + }) => PlayerGroupTableCompanion.insert( + userId: userId, + groupId: groupId, + rowid: rowid, + ), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + ), + ); +} + +typedef $$PlayerGroupTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $PlayerGroupTableTable, + PlayerGroupTableData, + $$PlayerGroupTableTableFilterComposer, + $$PlayerGroupTableTableOrderingComposer, + $$PlayerGroupTableTableAnnotationComposer, + $$PlayerGroupTableTableCreateCompanionBuilder, + $$PlayerGroupTableTableUpdateCompanionBuilder, + ( + PlayerGroupTableData, + BaseReferences< + _$AppDatabase, + $PlayerGroupTableTable, + PlayerGroupTableData + >, + ), + PlayerGroupTableData, + PrefetchHooks Function() + >; + +class $AppDatabaseManager { + final _$AppDatabase _db; + $AppDatabaseManager(this._db); + $$PlayerTableTableTableManager get playerTable => + $$PlayerTableTableTableManager(_db, _db.playerTable); + $$GroupTableTableTableManager get groupTable => + $$GroupTableTableTableManager(_db, _db.groupTable); + $$PlayerGroupTableTableTableManager get playerGroupTable => + $$PlayerGroupTableTableTableManager(_db, _db.playerGroupTable); +} diff --git a/lib/data/db/tables/group_table.dart b/lib/data/db/tables/group_table.dart new file mode 100644 index 0000000..dc9335d --- /dev/null +++ b/lib/data/db/tables/group_table.dart @@ -0,0 +1,9 @@ +import 'package:drift/drift.dart'; + +class GroupTable extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} diff --git a/lib/data/db/tables/player_group_table.dart b/lib/data/db/tables/player_group_table.dart new file mode 100644 index 0000000..a045789 --- /dev/null +++ b/lib/data/db/tables/player_group_table.dart @@ -0,0 +1,11 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/methods/db/tables/group_table.dart'; +import 'package:game_tracker/data/methods/db/tables/user_table.dart'; + +class PlayerGroupTable extends Table { + TextColumn get userId => text().references(UserTable, #id)(); + TextColumn get groupId => text().references(GroupTable, #id)(); + + @override + Set> get primaryKey => {userId, groupId}; +} diff --git a/lib/data/db/tables/player_table.dart b/lib/data/db/tables/player_table.dart new file mode 100644 index 0000000..3d97459 --- /dev/null +++ b/lib/data/db/tables/player_table.dart @@ -0,0 +1,9 @@ +import 'package:drift/drift.dart'; + +class PlayerTable extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} diff --git a/lib/data/dto/game.dart b/lib/data/dto/game.dart new file mode 100644 index 0000000..7457b54 --- /dev/null +++ b/lib/data/dto/game.dart @@ -0,0 +1,6 @@ +class Game { + final String id; + final String name; + + Game({required this.id, required this.name}); +} diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart new file mode 100644 index 0000000..316b712 --- /dev/null +++ b/lib/data/dto/group.dart @@ -0,0 +1,9 @@ +import 'package:game_tracker/data/methods/dto/player.dart'; + +class Group { + final String id; + final String name; + final List members; + + Group({required this.id, required this.name, required this.members}); +} diff --git a/lib/data/dto/player.dart b/lib/data/dto/player.dart new file mode 100644 index 0000000..331645a --- /dev/null +++ b/lib/data/dto/player.dart @@ -0,0 +1,6 @@ +class Player { + final String id; + final String username; + + Player({required this.id, required this.username}); +} diff --git a/lib/data/methods/group.dart b/lib/data/methods/group.dart deleted file mode 100644 index a5346ba..0000000 --- a/lib/data/methods/group.dart +++ /dev/null @@ -1,28 +0,0 @@ -import 'package:game_tracker/data/database.dart'; -import 'package:drift/drift.dart'; - -extension GroupMethods on AppDatabase { - Future> getAllGroups() async { - return await select(group).get(); - } - - Future getGroupById(String id) async { - return await (select(group)..where((g) => g.id.equals(id))).getSingle(); - } - - Future addGroup(String id, String name) async { - await into(group).insert( - GroupCompanion.insert(id: id, name: name), - ); - } - - Future deleteGroup(String id) async { - await (delete(group)..where((g) => g.id.equals(id))).go(); - } - - Future updateGroupname(String id, String newName) async { - await (update(group)..where((g) => g.id.equals(id))).write( - GroupCompanion(name: Value(newName)), - ); - } -} \ No newline at end of file diff --git a/lib/data/methods/user_group.dart b/lib/data/methods/user_group.dart deleted file mode 100644 index 206c1f0..0000000 --- a/lib/data/methods/user_group.dart +++ /dev/null @@ -1,26 +0,0 @@ -import 'package:game_tracker/data/database.dart'; -import 'package:drift/drift.dart'; - -extension UserGroupMethods on AppDatabase { - Future> getAllUsersAndGroups() async { - return await select(userGroup).get(); - } - - Future> getUsersGroups(String userId) async { - return await (select(userGroup)..where((uG) => uG.userId.equals(userId))).get(); - } - - Future> getGroupsUsers(String groupId) async { - return await (select(userGroup)..where((uG) => uG.groupId.equals(groupId))).get(); - } - - Future addUserToGroup(String userId, String groupId) async { - await into(userGroup).insert( - UserGroupCompanion.insert(userId: userId, groupId: groupId), - ); - } - - Future removeUserFromGroup(String userId, String groupId) async { - await (delete(userGroup)..where((uG) => uG.userId.equals(userId) & uG.groupId.equals(groupId))).go(); - } -} \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 261ff1b..dd19f34 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; import 'package:game_tracker/core/custom_theme.dart'; import 'package:game_tracker/data/database.dart'; +import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bardb/database.dart'; import 'package:provider/provider.dart'; void main() { @@ -10,7 +10,7 @@ void main() { create: (context) => AppDatabase(), child: const MyApp(), dispose: (context, db) => db.close(), - ), + ), ); } From 0895f6df0a7be52e844a9169f53776ddd2fa8a4c Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 15:41:20 +0100 Subject: [PATCH 47/62] add text and change icons --- .../main_menu/custom_navigation_bar.dart | 61 ++++++++++--------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index a78a9f9..95dd408 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -63,40 +63,45 @@ class _CustomNavigationBarState extends State mainAxisSize: MainAxisSize.max, mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - IconButton( - icon: Icon( - Icons.home, - color: currentIndex == 0 ? Colors.white : Colors.black, - ), - onPressed: () => onTabTapped(0), - ), - IconButton( - icon: Icon( - Icons.history, - color: currentIndex == 1 ? Colors.white : Colors.black, - ), - onPressed: () => onTabTapped(1), - ), - IconButton( - icon: Icon( - Icons.groups, - color: currentIndex == 2 ? Colors.white : Colors.black, - ), - onPressed: () => onTabTapped(2), - ), - IconButton( - icon: Icon( - Icons.bar_chart, - color: currentIndex == 3 ? Colors.white : Colors.black, - ), - onPressed: () => onTabTapped(3), - ), + const SizedBox(width: 0), + _buildNavItem(Icons.home, 'Home', 0), + _buildNavItem(Icons.history, 'History', 1), + _buildNavItem(Icons.groups, 'Groups', 2), + _buildNavItem(Icons.bar_chart, 'Stats', 3), + const SizedBox(width: 0), ], ), ), ); } + Widget _buildNavItem(IconData icon, String label, int index) { + final isSelected = currentIndex == index; + + return GestureDetector( + onTap: () => onTabTapped(index), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + icon, + color: isSelected ? Colors.white : Colors.black, + ), + const SizedBox(height: 4), + Text( + label, + style: TextStyle( + color: isSelected ? Colors.white : Colors.black, + fontSize: 12, + fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, + ), + ), + ], + ), + ); + } + void onTabTapped(int index) { setState(() { currentIndex = index; From 5baeda8b32fa4b0763a972e3123554f41c84d23e Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 15:41:56 +0100 Subject: [PATCH 48/62] change history text to games --- lib/presentation/views/main_menu/custom_navigation_bar.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 95dd408..bd85c63 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -65,7 +65,7 @@ class _CustomNavigationBarState extends State children: [ const SizedBox(width: 0), _buildNavItem(Icons.home, 'Home', 0), - _buildNavItem(Icons.history, 'History', 1), + _buildNavItem(Icons.history, 'Games', 1), _buildNavItem(Icons.groups, 'Groups', 2), _buildNavItem(Icons.bar_chart, 'Stats', 3), const SizedBox(width: 0), From d5315a8f00fbf39737161733aa57200dc62d7bd7 Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 15:53:28 +0100 Subject: [PATCH 49/62] change spacing of icons --- lib/presentation/views/main_menu/custom_navigation_bar.dart | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index bd85c63..184b9bd 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -61,14 +61,12 @@ class _CustomNavigationBarState extends State shape: null, child: Row( mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceBetween, + mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - const SizedBox(width: 0), _buildNavItem(Icons.home, 'Home', 0), _buildNavItem(Icons.history, 'Games', 1), _buildNavItem(Icons.groups, 'Groups', 2), _buildNavItem(Icons.bar_chart, 'Stats', 3), - const SizedBox(width: 0), ], ), ), From 5bbb5c18882bcacfba0661ee4ce5577152c6507d Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 16:14:52 +0100 Subject: [PATCH 50/62] add floating and rounded navbar --- .../main_menu/custom_navigation_bar.dart | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 184b9bd..d1732a8 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -52,22 +52,28 @@ class _CustomNavigationBarState extends State ), backgroundColor: CustomTheme.backgroundColor, body: tabs[currentIndex], - extendBody: true, - bottomNavigationBar: BottomAppBar( - padding: const EdgeInsets.symmetric(horizontal: 10), - elevation: 10, - height: 60, - color: CustomTheme.primaryColor, - shape: null, - child: Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - _buildNavItem(Icons.home, 'Home', 0), - _buildNavItem(Icons.history, 'Games', 1), - _buildNavItem(Icons.groups, 'Groups', 2), - _buildNavItem(Icons.bar_chart, 'Stats', 3), - ], + extendBody: true, // Enables floating effect + bottomNavigationBar: Padding( + padding: const EdgeInsets.only(left: 12.0, right: 12.0, bottom: 8.0), + child: Material( + elevation: 10, + borderRadius: BorderRadius.circular(24), + color: CustomTheme.primaryColor, + child: ClipRRect( + borderRadius: BorderRadius.circular(24), + child: SizedBox( + height: 60, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + _buildNavItem(Icons.home, 'Home', 0), + _buildNavItem(Icons.history, 'Games', 1), + _buildNavItem(Icons.groups, 'Groups', 2), + _buildNavItem(Icons.bar_chart, 'Stats', 3), + ], + ), + ), + ), ), ), ); From b03979b0c6229b7f87301b90c5a62568ce0ff7e3 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sat, 8 Nov 2025 17:09:02 +0100 Subject: [PATCH 51/62] Completed daos, added basic GameTable & GameDao --- lib/data/dao/game_dao.dart | 25 + lib/data/dao/game_dao.g.dart | 8 + lib/data/dao/group_dao.dart | 35 +- lib/data/dao/player_dao.dart | 44 +- lib/data/dao/player_group_dao.dart | 50 +- lib/data/dao/player_group_dao.g.dart | 2 + lib/data/db/database.dart | 6 +- lib/data/db/database.g.dart | 905 +++++++++++++++++++-- lib/data/db/tables/game_table.dart | 9 + lib/data/db/tables/player_group_table.dart | 6 +- lib/data/dto/group.dart | 2 +- lib/data/dto/player.dart | 4 +- lib/main.dart | 4 +- 13 files changed, 984 insertions(+), 116 deletions(-) create mode 100644 lib/data/dao/game_dao.dart create mode 100644 lib/data/dao/game_dao.g.dart create mode 100644 lib/data/db/tables/game_table.dart diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart new file mode 100644 index 0000000..e59fae4 --- /dev/null +++ b/lib/data/dao/game_dao.dart @@ -0,0 +1,25 @@ +import 'package:drift/drift.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/data/db/tables/game_table.dart'; +import 'package:game_tracker/data/dto/game.dart'; + +part 'game_dao.g.dart'; + +@DriftAccessor(tables: [GameTable]) +class GameDao extends DatabaseAccessor with _$GameDaoMixin { + GameDao(super.db); + + /// Retrieves all games from the database. + Future> getAllGames() async { + final query = select(gameTable); + final result = await query.get(); + return result.map((row) => Game(id: row.id, name: row.name)).toList(); + } + + /// Retrieves a [Game] by its [id]. + Future getGameById(String id) async { + final query = select(gameTable)..where((g) => g.id.equals(id)); + final result = await query.getSingle(); + return Game(id: result.id, name: result.name); + } +} diff --git a/lib/data/dao/game_dao.g.dart b/lib/data/dao/game_dao.g.dart new file mode 100644 index 0000000..b5a29fe --- /dev/null +++ b/lib/data/dao/game_dao.g.dart @@ -0,0 +1,8 @@ +// GENERATED CODE - DO NOT MODIFY BY HAND + +part of 'game_dao.dart'; + +// ignore_for_file: type=lint +mixin _$GameDaoMixin on DatabaseAccessor { + $GameTableTable get gameTable => attachedDatabase.gameTable; +} diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index d2f529c..c1932d3 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -2,6 +2,7 @@ import 'package:drift/drift.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/tables/group_table.dart'; import 'package:game_tracker/data/dto/group.dart'; +import 'package:game_tracker/data/dto/player.dart'; part 'group_dao.g.dart'; @@ -9,6 +10,7 @@ part 'group_dao.g.dart'; class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { GroupDao(super.db); + /// Retrieves all groups from the database. Future> getAllGroups() async { final query = select(groupTable); final result = await query.get(); @@ -17,26 +19,41 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { .toList(); } + /// Retrieves a [Group] by its [id], including its members. Future getGroupById(String id) async { final query = select(groupTable)..where((g) => g.id.equals(id)); final result = await query.getSingle(); - // todo: Get group members + List members = []; - return Group(id: result.id, name: result.name, members: []); + members = await db.playerGroupDao.getPlayersOfGroupById(id); + + return Group(id: result.id, name: result.name, members: members); } + /// Adds a new group with the given [id] and [name] to the database. + /// Returns `true` if more than 0 rows were affected, otherwise `false`. Future addGroup(String id, String name) async { - await into(group).insert(GroupCompanion.insert(id: id, name: name)); + await into( + groupTable, + ).insert(GroupTableCompanion.insert(id: id, name: name)); } - Future deleteGroup(String id) async { - await (delete(group)..where((g) => g.id.equals(id))).go(); + /// Deletes the group with the given [id] from the database. + /// Returns `true` if more than 0 rows were affected, otherwise `false`. + Future deleteGroup(String id) async { + final query = (delete(groupTable)..where((g) => g.id.equals(id))); + final rowsAffected = await query.go(); + return rowsAffected > 0; } - Future updateGroupname(String id, String newName) async { - await (update(group)..where((g) => g.id.equals(id))).write( - GroupCompanion(name: Value(newName)), - ); + /// Updates the name of the group with the given [id] to [newName]. + /// Returns `true` if more than 0 rows were affected, otherwise `false`. + Future updateGroupname(String id, String newName) async { + final rowsAffected = + await (update(groupTable)..where((g) => g.id.equals(id))).write( + GroupTableCompanion(name: Value(newName)), + ); + return rowsAffected > 0; } } diff --git a/lib/data/dao/player_dao.dart b/lib/data/dao/player_dao.dart index d7a7596..2d3c0ab 100644 --- a/lib/data/dao/player_dao.dart +++ b/lib/data/dao/player_dao.dart @@ -9,25 +9,47 @@ part 'player_dao.g.dart'; class PlayerDao extends DatabaseAccessor with _$PlayerDaoMixin { PlayerDao(super.db); - Future> getAllUsers() async { - return await select(UserTable).get(); + /// Retrieves all players from the database. + Future> getAllPlayers() async { + final query = select(playerTable); + final result = await query.get(); + return result.map((row) => Player(id: row.id, name: row.name)).toList(); } - Future getUserById(String id) async { - return await (select(user)..where((u) => u.id.equals(id))).getSingle(); + /// Retrieves a [Player] by their [id]. + Future getPlayerById(String id) async { + final query = select(playerTable)..where((p) => p.id.equals(id)); + final result = await query.getSingle(); + return Player(id: result.id, name: result.name); } - Future addUser(String id, String name) async { - await into(user).insert(UserCompanion.insert(id: id, name: name)); + /// Adds a new [player] to the database. + Future addPlayer(Player player) async { + await into( + playerTable, + ).insert(PlayerTableCompanion.insert(id: player.id, name: player.name)); } - Future deleteUser(String id) async { - await (delete(user)..where((u) => u.id.equals(id))).go(); + /// Deletes the player with the given [id] from the database. + /// Returns `true` if the player was deleted, `false` if the player did not exist. + Future deletePlayer(String id) async { + final query = delete(playerTable)..where((p) => p.id.equals(id)); + final rowsAffected = await query.go(); + return rowsAffected > 0; } - Future updateUsername(String id, String newName) async { - await (update(user)..where((u) => u.id.equals(id))).write( - UserCompanion(name: Value(newName)), + /// Checks if a player with the given [id] exists in the database. + /// Returns `true` if the player exists, `false` otherwise. + Future playerExists(String id) async { + final query = select(playerTable)..where((p) => p.id.equals(id)); + final result = await query.getSingleOrNull(); + return result != null; + } + + /// Updates the name of the player with the given [id] to [newName]. + Future updatePlayername(String id, String newName) async { + await (update(playerTable)..where((p) => p.id.equals(id))).write( + PlayerTableCompanion(name: Value(newName)), ); } } diff --git a/lib/data/dao/player_group_dao.dart b/lib/data/dao/player_group_dao.dart index c4daf21..b68ed09 100644 --- a/lib/data/dao/player_group_dao.dart +++ b/lib/data/dao/player_group_dao.dart @@ -1,6 +1,7 @@ import 'package:drift/drift.dart'; import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/data/db/tables/player_group_table.dart'; +import 'package:game_tracker/data/dto/player.dart'; part 'player_group_dao.g.dart'; @@ -9,32 +10,35 @@ class PlayerGroupDao extends DatabaseAccessor with _$PlayerGroupDaoMixin { PlayerGroupDao(super.db); - Future> getAllUsersAndGroups() async { - return await select(userGroup).get(); + /// Retrieves all players belonging to a specific group by [groupId]. + Future> getPlayersOfGroupById(String groupId) async { + final query = select(playerGroupTable) + ..where((pG) => pG.groupId.equals(groupId)); + final result = await query.get(); + + List groupMembers = []; + + for (var entry in result) { + final player = await db.playerDao.getPlayerById(entry.userId); + groupMembers.add(player); + } + + return groupMembers; } - Future> getUsersGroups(String userId) async { - return await (select( - userGroup, - )..where((uG) => uG.userId.equals(userId))).get(); + /// Removes a player from a group based on [userId] and [groupId]. + /// Returns `true` if more than 0 rows were affected, otherwise `false`. + Future removePlayerFromGroup(String userId, String groupId) async { + final query = delete(playerGroupTable) + ..where((p) => p.userId.equals(userId) & p.groupId.equals(groupId)); + final rowsAffected = await query.go(); + return rowsAffected > 0; } - Future> getGroupsUsers(String groupId) async { - return await (select( - userGroup, - )..where((uG) => uG.groupId.equals(groupId))).get(); - } - - Future addUserToGroup(String userId, String groupId) async { - await into( - userGroup, - ).insert(UserGroupCompanion.insert(userId: userId, groupId: groupId)); - } - - Future removeUserFromGroup(String userId, String groupId) async { - await (delete( - userGroup, - )..where((uG) => uG.userId.equals(userId) & uG.groupId.equals(groupId))) - .go(); + /// Adds a player to a group with the given [userId] and [groupId]. + Future addPlayerToGroup(String userId, String groupId) async { + await into(playerGroupTable).insert( + PlayerGroupTableCompanion.insert(userId: userId, groupId: groupId), + ); } } diff --git a/lib/data/dao/player_group_dao.g.dart b/lib/data/dao/player_group_dao.g.dart index d512bb4..d54f979 100644 --- a/lib/data/dao/player_group_dao.g.dart +++ b/lib/data/dao/player_group_dao.g.dart @@ -4,6 +4,8 @@ part of 'player_group_dao.dart'; // ignore_for_file: type=lint mixin _$PlayerGroupDaoMixin on DatabaseAccessor { + $PlayerTableTable get playerTable => attachedDatabase.playerTable; + $GroupTableTable get groupTable => attachedDatabase.groupTable; $PlayerGroupTableTable get playerGroupTable => attachedDatabase.playerGroupTable; } diff --git a/lib/data/db/database.dart b/lib/data/db/database.dart index 6d4dedc..e35513e 100644 --- a/lib/data/db/database.dart +++ b/lib/data/db/database.dart @@ -1,8 +1,10 @@ import 'package:drift/drift.dart'; import 'package:drift_flutter/drift_flutter.dart'; +import 'package:game_tracker/data/dao/game_dao.dart'; import 'package:game_tracker/data/dao/group_dao.dart'; import 'package:game_tracker/data/dao/player_dao.dart'; import 'package:game_tracker/data/dao/player_group_dao.dart'; +import 'package:game_tracker/data/db/tables/game_table.dart'; import 'package:game_tracker/data/db/tables/group_table.dart'; import 'package:game_tracker/data/db/tables/player_group_table.dart'; import 'package:game_tracker/data/db/tables/player_table.dart'; @@ -11,8 +13,8 @@ import 'package:path_provider/path_provider.dart'; part 'database.g.dart'; @DriftDatabase( - tables: [PlayerTable, GroupTable, PlayerGroupTable], - daos: [GroupDao, PlayerDao, PlayerGroupDao], + tables: [PlayerTable, GroupTable, PlayerGroupTable, GameTable], + daos: [GroupDao, PlayerDao, PlayerGroupDao, GameDao], ) class AppDatabase extends _$AppDatabase { AppDatabase([QueryExecutor? executor]) : super(executor ?? _openConnection()); diff --git a/lib/data/db/database.g.dart b/lib/data/db/database.g.dart index 150b8a3..4075912 100644 --- a/lib/data/db/database.g.dart +++ b/lib/data/db/database.g.dart @@ -427,6 +427,9 @@ class $PlayerGroupTableTable extends PlayerGroupTable false, type: DriftSqlType.string, requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES player_table (id)', + ), ); static const VerificationMeta _groupIdMeta = const VerificationMeta( 'groupId', @@ -438,6 +441,9 @@ class $PlayerGroupTableTable extends PlayerGroupTable false, type: DriftSqlType.string, requiredDuringInsert: true, + defaultConstraints: GeneratedColumn.constraintIsAlways( + 'REFERENCES group_table (id)', + ), ); @override List get $columns => [userId, groupId]; @@ -630,6 +636,211 @@ class PlayerGroupTableCompanion extends UpdateCompanion { } } +class $GameTableTable extends GameTable + with TableInfo<$GameTableTable, GameTableData> { + @override + final GeneratedDatabase attachedDatabase; + final String? _alias; + $GameTableTable(this.attachedDatabase, [this._alias]); + static const VerificationMeta _idMeta = const VerificationMeta('id'); + @override + late final GeneratedColumn id = GeneratedColumn( + 'id', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + static const VerificationMeta _nameMeta = const VerificationMeta('name'); + @override + late final GeneratedColumn name = GeneratedColumn( + 'name', + aliasedName, + false, + type: DriftSqlType.string, + requiredDuringInsert: true, + ); + @override + List get $columns => [id, name]; + @override + String get aliasedName => _alias ?? actualTableName; + @override + String get actualTableName => $name; + static const String $name = 'game_table'; + @override + VerificationContext validateIntegrity( + Insertable instance, { + bool isInserting = false, + }) { + final context = VerificationContext(); + final data = instance.toColumns(true); + if (data.containsKey('id')) { + context.handle(_idMeta, id.isAcceptableOrUnknown(data['id']!, _idMeta)); + } else if (isInserting) { + context.missing(_idMeta); + } + if (data.containsKey('name')) { + context.handle( + _nameMeta, + name.isAcceptableOrUnknown(data['name']!, _nameMeta), + ); + } else if (isInserting) { + context.missing(_nameMeta); + } + return context; + } + + @override + Set get $primaryKey => {id}; + @override + GameTableData map(Map data, {String? tablePrefix}) { + final effectivePrefix = tablePrefix != null ? '$tablePrefix.' : ''; + return GameTableData( + id: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}id'], + )!, + name: attachedDatabase.typeMapping.read( + DriftSqlType.string, + data['${effectivePrefix}name'], + )!, + ); + } + + @override + $GameTableTable createAlias(String alias) { + return $GameTableTable(attachedDatabase, alias); + } +} + +class GameTableData extends DataClass implements Insertable { + final String id; + final String name; + const GameTableData({required this.id, required this.name}); + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + map['id'] = Variable(id); + map['name'] = Variable(name); + return map; + } + + GameTableCompanion toCompanion(bool nullToAbsent) { + return GameTableCompanion(id: Value(id), name: Value(name)); + } + + factory GameTableData.fromJson( + Map json, { + ValueSerializer? serializer, + }) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return GameTableData( + id: serializer.fromJson(json['id']), + name: serializer.fromJson(json['name']), + ); + } + @override + Map toJson({ValueSerializer? serializer}) { + serializer ??= driftRuntimeOptions.defaultSerializer; + return { + 'id': serializer.toJson(id), + 'name': serializer.toJson(name), + }; + } + + GameTableData copyWith({String? id, String? name}) => + GameTableData(id: id ?? this.id, name: name ?? this.name); + GameTableData copyWithCompanion(GameTableCompanion data) { + return GameTableData( + id: data.id.present ? data.id.value : this.id, + name: data.name.present ? data.name.value : this.name, + ); + } + + @override + String toString() { + return (StringBuffer('GameTableData(') + ..write('id: $id, ') + ..write('name: $name') + ..write(')')) + .toString(); + } + + @override + int get hashCode => Object.hash(id, name); + @override + bool operator ==(Object other) => + identical(this, other) || + (other is GameTableData && + other.id == this.id && + other.name == this.name); +} + +class GameTableCompanion extends UpdateCompanion { + final Value id; + final Value name; + final Value rowid; + const GameTableCompanion({ + this.id = const Value.absent(), + this.name = const Value.absent(), + this.rowid = const Value.absent(), + }); + GameTableCompanion.insert({ + required String id, + required String name, + this.rowid = const Value.absent(), + }) : id = Value(id), + name = Value(name); + static Insertable custom({ + Expression? id, + Expression? name, + Expression? rowid, + }) { + return RawValuesInsertable({ + if (id != null) 'id': id, + if (name != null) 'name': name, + if (rowid != null) 'rowid': rowid, + }); + } + + GameTableCompanion copyWith({ + Value? id, + Value? name, + Value? rowid, + }) { + return GameTableCompanion( + id: id ?? this.id, + name: name ?? this.name, + rowid: rowid ?? this.rowid, + ); + } + + @override + Map toColumns(bool nullToAbsent) { + final map = {}; + if (id.present) { + map['id'] = Variable(id.value); + } + if (name.present) { + map['name'] = Variable(name.value); + } + if (rowid.present) { + map['rowid'] = Variable(rowid.value); + } + return map; + } + + @override + String toString() { + return (StringBuffer('GameTableCompanion(') + ..write('id: $id, ') + ..write('name: $name, ') + ..write('rowid: $rowid') + ..write(')')) + .toString(); + } +} + abstract class _$AppDatabase extends GeneratedDatabase { _$AppDatabase(QueryExecutor e) : super(e); $AppDatabaseManager get managers => $AppDatabaseManager(this); @@ -638,11 +849,13 @@ abstract class _$AppDatabase extends GeneratedDatabase { late final $PlayerGroupTableTable playerGroupTable = $PlayerGroupTableTable( this, ); + late final $GameTableTable gameTable = $GameTableTable(this); late final GroupDao groupDao = GroupDao(this as AppDatabase); late final PlayerDao playerDao = PlayerDao(this as AppDatabase); late final PlayerGroupDao playerGroupDao = PlayerGroupDao( this as AppDatabase, ); + late final GameDao gameDao = GameDao(this as AppDatabase); @override Iterable> get allTables => allSchemaEntities.whereType>(); @@ -651,6 +864,7 @@ abstract class _$AppDatabase extends GeneratedDatabase { playerTable, groupTable, playerGroupTable, + gameTable, ]; } @@ -667,6 +881,34 @@ typedef $$PlayerTableTableUpdateCompanionBuilder = Value rowid, }); +final class $$PlayerTableTableReferences + extends BaseReferences<_$AppDatabase, $PlayerTableTable, PlayerTableData> { + $$PlayerTableTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static MultiTypedResultKey<$PlayerGroupTableTable, List> + _playerGroupTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.playerGroupTable, + aliasName: $_aliasNameGenerator( + db.playerTable.id, + db.playerGroupTable.userId, + ), + ); + + $$PlayerGroupTableTableProcessedTableManager get playerGroupTableRefs { + final manager = $$PlayerGroupTableTableTableManager( + $_db, + $_db.playerGroupTable, + ).filter((f) => f.userId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull( + _playerGroupTableRefsTable($_db), + ); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + class $$PlayerTableTableFilterComposer extends Composer<_$AppDatabase, $PlayerTableTable> { $$PlayerTableTableFilterComposer({ @@ -685,6 +927,31 @@ class $$PlayerTableTableFilterComposer column: $table.name, builder: (column) => ColumnFilters(column), ); + + Expression playerGroupTableRefs( + Expression Function($$PlayerGroupTableTableFilterComposer f) f, + ) { + final $$PlayerGroupTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGroupTable, + getReferencedColumn: (t) => t.userId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGroupTableTableFilterComposer( + $db: $db, + $table: $db.playerGroupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$PlayerTableTableOrderingComposer @@ -721,6 +988,31 @@ class $$PlayerTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + + Expression playerGroupTableRefs( + Expression Function($$PlayerGroupTableTableAnnotationComposer a) f, + ) { + final $$PlayerGroupTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGroupTable, + getReferencedColumn: (t) => t.userId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGroupTableTableAnnotationComposer( + $db: $db, + $table: $db.playerGroupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$PlayerTableTableTableManager @@ -734,12 +1026,9 @@ class $$PlayerTableTableTableManager $$PlayerTableTableAnnotationComposer, $$PlayerTableTableCreateCompanionBuilder, $$PlayerTableTableUpdateCompanionBuilder, - ( - PlayerTableData, - BaseReferences<_$AppDatabase, $PlayerTableTable, PlayerTableData>, - ), + (PlayerTableData, $$PlayerTableTableReferences), PlayerTableData, - PrefetchHooks Function() + PrefetchHooks Function({bool playerGroupTableRefs}) > { $$PlayerTableTableTableManager(_$AppDatabase db, $PlayerTableTable table) : super( @@ -766,9 +1055,45 @@ class $$PlayerTableTableTableManager }) => PlayerTableCompanion.insert(id: id, name: name, rowid: rowid), withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .map( + (e) => ( + e.readTable(table), + $$PlayerTableTableReferences(db, table, e), + ), + ) .toList(), - prefetchHooksCallback: null, + prefetchHooksCallback: ({playerGroupTableRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [ + if (playerGroupTableRefs) db.playerGroupTable, + ], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (playerGroupTableRefs) + await $_getPrefetchedData< + PlayerTableData, + $PlayerTableTable, + PlayerGroupTableData + >( + currentTable: table, + referencedTable: $$PlayerTableTableReferences + ._playerGroupTableRefsTable(db), + managerFromTypedResult: (p0) => + $$PlayerTableTableReferences( + db, + table, + p0, + ).playerGroupTableRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.userId == item.id), + typedResults: items, + ), + ]; + }, + ); + }, ), ); } @@ -783,12 +1108,9 @@ typedef $$PlayerTableTableProcessedTableManager = $$PlayerTableTableAnnotationComposer, $$PlayerTableTableCreateCompanionBuilder, $$PlayerTableTableUpdateCompanionBuilder, - ( - PlayerTableData, - BaseReferences<_$AppDatabase, $PlayerTableTable, PlayerTableData>, - ), + (PlayerTableData, $$PlayerTableTableReferences), PlayerTableData, - PrefetchHooks Function() + PrefetchHooks Function({bool playerGroupTableRefs}) >; typedef $$GroupTableTableCreateCompanionBuilder = GroupTableCompanion Function({ @@ -803,6 +1125,34 @@ typedef $$GroupTableTableUpdateCompanionBuilder = Value rowid, }); +final class $$GroupTableTableReferences + extends BaseReferences<_$AppDatabase, $GroupTableTable, GroupTableData> { + $$GroupTableTableReferences(super.$_db, super.$_table, super.$_typedResult); + + static MultiTypedResultKey<$PlayerGroupTableTable, List> + _playerGroupTableRefsTable(_$AppDatabase db) => MultiTypedResultKey.fromTable( + db.playerGroupTable, + aliasName: $_aliasNameGenerator( + db.groupTable.id, + db.playerGroupTable.groupId, + ), + ); + + $$PlayerGroupTableTableProcessedTableManager get playerGroupTableRefs { + final manager = $$PlayerGroupTableTableTableManager( + $_db, + $_db.playerGroupTable, + ).filter((f) => f.groupId.id.sqlEquals($_itemColumn('id')!)); + + final cache = $_typedResult.readTableOrNull( + _playerGroupTableRefsTable($_db), + ); + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: cache), + ); + } +} + class $$GroupTableTableFilterComposer extends Composer<_$AppDatabase, $GroupTableTable> { $$GroupTableTableFilterComposer({ @@ -821,6 +1171,31 @@ class $$GroupTableTableFilterComposer column: $table.name, builder: (column) => ColumnFilters(column), ); + + Expression playerGroupTableRefs( + Expression Function($$PlayerGroupTableTableFilterComposer f) f, + ) { + final $$PlayerGroupTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGroupTable, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGroupTableTableFilterComposer( + $db: $db, + $table: $db.playerGroupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$GroupTableTableOrderingComposer @@ -857,6 +1232,31 @@ class $$GroupTableTableAnnotationComposer GeneratedColumn get name => $composableBuilder(column: $table.name, builder: (column) => column); + + Expression playerGroupTableRefs( + Expression Function($$PlayerGroupTableTableAnnotationComposer a) f, + ) { + final $$PlayerGroupTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.id, + referencedTable: $db.playerGroupTable, + getReferencedColumn: (t) => t.groupId, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerGroupTableTableAnnotationComposer( + $db: $db, + $table: $db.playerGroupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return f(composer); + } } class $$GroupTableTableTableManager @@ -870,12 +1270,9 @@ class $$GroupTableTableTableManager $$GroupTableTableAnnotationComposer, $$GroupTableTableCreateCompanionBuilder, $$GroupTableTableUpdateCompanionBuilder, - ( - GroupTableData, - BaseReferences<_$AppDatabase, $GroupTableTable, GroupTableData>, - ), + (GroupTableData, $$GroupTableTableReferences), GroupTableData, - PrefetchHooks Function() + PrefetchHooks Function({bool playerGroupTableRefs}) > { $$GroupTableTableTableManager(_$AppDatabase db, $GroupTableTable table) : super( @@ -902,9 +1299,45 @@ class $$GroupTableTableTableManager }) => GroupTableCompanion.insert(id: id, name: name, rowid: rowid), withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .map( + (e) => ( + e.readTable(table), + $$GroupTableTableReferences(db, table, e), + ), + ) .toList(), - prefetchHooksCallback: null, + prefetchHooksCallback: ({playerGroupTableRefs = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [ + if (playerGroupTableRefs) db.playerGroupTable, + ], + addJoins: null, + getPrefetchedDataCallback: (items) async { + return [ + if (playerGroupTableRefs) + await $_getPrefetchedData< + GroupTableData, + $GroupTableTable, + PlayerGroupTableData + >( + currentTable: table, + referencedTable: $$GroupTableTableReferences + ._playerGroupTableRefsTable(db), + managerFromTypedResult: (p0) => + $$GroupTableTableReferences( + db, + table, + p0, + ).playerGroupTableRefs, + referencedItemsForCurrentItem: (item, referencedItems) => + referencedItems.where((e) => e.groupId == item.id), + typedResults: items, + ), + ]; + }, + ); + }, ), ); } @@ -919,12 +1352,9 @@ typedef $$GroupTableTableProcessedTableManager = $$GroupTableTableAnnotationComposer, $$GroupTableTableCreateCompanionBuilder, $$GroupTableTableUpdateCompanionBuilder, - ( - GroupTableData, - BaseReferences<_$AppDatabase, $GroupTableTable, GroupTableData>, - ), + (GroupTableData, $$GroupTableTableReferences), GroupTableData, - PrefetchHooks Function() + PrefetchHooks Function({bool playerGroupTableRefs}) >; typedef $$PlayerGroupTableTableCreateCompanionBuilder = PlayerGroupTableCompanion Function({ @@ -939,6 +1369,58 @@ typedef $$PlayerGroupTableTableUpdateCompanionBuilder = Value rowid, }); +final class $$PlayerGroupTableTableReferences + extends + BaseReferences< + _$AppDatabase, + $PlayerGroupTableTable, + PlayerGroupTableData + > { + $$PlayerGroupTableTableReferences( + super.$_db, + super.$_table, + super.$_typedResult, + ); + + static $PlayerTableTable _userIdTable(_$AppDatabase db) => + db.playerTable.createAlias( + $_aliasNameGenerator(db.playerGroupTable.userId, db.playerTable.id), + ); + + $$PlayerTableTableProcessedTableManager get userId { + final $_column = $_itemColumn('user_id')!; + + final manager = $$PlayerTableTableTableManager( + $_db, + $_db.playerTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_userIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } + + static $GroupTableTable _groupIdTable(_$AppDatabase db) => + db.groupTable.createAlias( + $_aliasNameGenerator(db.playerGroupTable.groupId, db.groupTable.id), + ); + + $$GroupTableTableProcessedTableManager get groupId { + final $_column = $_itemColumn('group_id')!; + + final manager = $$GroupTableTableTableManager( + $_db, + $_db.groupTable, + ).filter((f) => f.id.sqlEquals($_column)); + final item = $_typedResult.readTableOrNull(_groupIdTable($_db)); + if (item == null) return manager; + return ProcessedTableManager( + manager.$state.copyWith(prefetchedData: [item]), + ); + } +} + class $$PlayerGroupTableTableFilterComposer extends Composer<_$AppDatabase, $PlayerGroupTableTable> { $$PlayerGroupTableTableFilterComposer({ @@ -948,15 +1430,51 @@ class $$PlayerGroupTableTableFilterComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnFilters get userId => $composableBuilder( - column: $table.userId, - builder: (column) => ColumnFilters(column), - ); + $$PlayerTableTableFilterComposer get userId { + final $$PlayerTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableFilterComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } - ColumnFilters get groupId => $composableBuilder( - column: $table.groupId, - builder: (column) => ColumnFilters(column), - ); + $$GroupTableTableFilterComposer get groupId { + final $$GroupTableTableFilterComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableFilterComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } } class $$PlayerGroupTableTableOrderingComposer @@ -968,15 +1486,51 @@ class $$PlayerGroupTableTableOrderingComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - ColumnOrderings get userId => $composableBuilder( - column: $table.userId, - builder: (column) => ColumnOrderings(column), - ); + $$PlayerTableTableOrderingComposer get userId { + final $$PlayerTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableOrderingComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } - ColumnOrderings get groupId => $composableBuilder( - column: $table.groupId, - builder: (column) => ColumnOrderings(column), - ); + $$GroupTableTableOrderingComposer get groupId { + final $$GroupTableTableOrderingComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableOrderingComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } } class $$PlayerGroupTableTableAnnotationComposer @@ -988,11 +1542,51 @@ class $$PlayerGroupTableTableAnnotationComposer super.$addJoinBuilderToRootComposer, super.$removeJoinBuilderFromRootComposer, }); - GeneratedColumn get userId => - $composableBuilder(column: $table.userId, builder: (column) => column); + $$PlayerTableTableAnnotationComposer get userId { + final $$PlayerTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.userId, + referencedTable: $db.playerTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$PlayerTableTableAnnotationComposer( + $db: $db, + $table: $db.playerTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } - GeneratedColumn get groupId => - $composableBuilder(column: $table.groupId, builder: (column) => column); + $$GroupTableTableAnnotationComposer get groupId { + final $$GroupTableTableAnnotationComposer composer = $composerBuilder( + composer: this, + getCurrentColumn: (t) => t.groupId, + referencedTable: $db.groupTable, + getReferencedColumn: (t) => t.id, + builder: + ( + joinBuilder, { + $addJoinBuilderToRootComposer, + $removeJoinBuilderFromRootComposer, + }) => $$GroupTableTableAnnotationComposer( + $db: $db, + $table: $db.groupTable, + $addJoinBuilderToRootComposer: $addJoinBuilderToRootComposer, + joinBuilder: joinBuilder, + $removeJoinBuilderFromRootComposer: + $removeJoinBuilderFromRootComposer, + ), + ); + return composer; + } } class $$PlayerGroupTableTableTableManager @@ -1006,16 +1600,9 @@ class $$PlayerGroupTableTableTableManager $$PlayerGroupTableTableAnnotationComposer, $$PlayerGroupTableTableCreateCompanionBuilder, $$PlayerGroupTableTableUpdateCompanionBuilder, - ( - PlayerGroupTableData, - BaseReferences< - _$AppDatabase, - $PlayerGroupTableTable, - PlayerGroupTableData - >, - ), + (PlayerGroupTableData, $$PlayerGroupTableTableReferences), PlayerGroupTableData, - PrefetchHooks Function() + PrefetchHooks Function({bool userId, bool groupId}) > { $$PlayerGroupTableTableTableManager( _$AppDatabase db, @@ -1051,9 +1638,71 @@ class $$PlayerGroupTableTableTableManager rowid: rowid, ), withReferenceMapper: (p0) => p0 - .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .map( + (e) => ( + e.readTable(table), + $$PlayerGroupTableTableReferences(db, table, e), + ), + ) .toList(), - prefetchHooksCallback: null, + prefetchHooksCallback: ({userId = false, groupId = false}) { + return PrefetchHooks( + db: db, + explicitlyWatchedTables: [], + addJoins: + < + T extends TableManagerState< + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic, + dynamic + > + >(state) { + if (userId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.userId, + referencedTable: + $$PlayerGroupTableTableReferences + ._userIdTable(db), + referencedColumn: + $$PlayerGroupTableTableReferences + ._userIdTable(db) + .id, + ) + as T; + } + if (groupId) { + state = + state.withJoin( + currentTable: table, + currentColumn: table.groupId, + referencedTable: + $$PlayerGroupTableTableReferences + ._groupIdTable(db), + referencedColumn: + $$PlayerGroupTableTableReferences + ._groupIdTable(db) + .id, + ) + as T; + } + + return state; + }, + getPrefetchedDataCallback: (items) async { + return []; + }, + ); + }, ), ); } @@ -1068,15 +1717,143 @@ typedef $$PlayerGroupTableTableProcessedTableManager = $$PlayerGroupTableTableAnnotationComposer, $$PlayerGroupTableTableCreateCompanionBuilder, $$PlayerGroupTableTableUpdateCompanionBuilder, - ( - PlayerGroupTableData, - BaseReferences< - _$AppDatabase, - $PlayerGroupTableTable, - PlayerGroupTableData - >, - ), + (PlayerGroupTableData, $$PlayerGroupTableTableReferences), PlayerGroupTableData, + PrefetchHooks Function({bool userId, bool groupId}) + >; +typedef $$GameTableTableCreateCompanionBuilder = + GameTableCompanion Function({ + required String id, + required String name, + Value rowid, + }); +typedef $$GameTableTableUpdateCompanionBuilder = + GameTableCompanion Function({ + Value id, + Value name, + Value rowid, + }); + +class $$GameTableTableFilterComposer + extends Composer<_$AppDatabase, $GameTableTable> { + $$GameTableTableFilterComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnFilters get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnFilters(column), + ); + + ColumnFilters get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnFilters(column), + ); +} + +class $$GameTableTableOrderingComposer + extends Composer<_$AppDatabase, $GameTableTable> { + $$GameTableTableOrderingComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + ColumnOrderings get id => $composableBuilder( + column: $table.id, + builder: (column) => ColumnOrderings(column), + ); + + ColumnOrderings get name => $composableBuilder( + column: $table.name, + builder: (column) => ColumnOrderings(column), + ); +} + +class $$GameTableTableAnnotationComposer + extends Composer<_$AppDatabase, $GameTableTable> { + $$GameTableTableAnnotationComposer({ + required super.$db, + required super.$table, + super.joinBuilder, + super.$addJoinBuilderToRootComposer, + super.$removeJoinBuilderFromRootComposer, + }); + GeneratedColumn get id => + $composableBuilder(column: $table.id, builder: (column) => column); + + GeneratedColumn get name => + $composableBuilder(column: $table.name, builder: (column) => column); +} + +class $$GameTableTableTableManager + extends + RootTableManager< + _$AppDatabase, + $GameTableTable, + GameTableData, + $$GameTableTableFilterComposer, + $$GameTableTableOrderingComposer, + $$GameTableTableAnnotationComposer, + $$GameTableTableCreateCompanionBuilder, + $$GameTableTableUpdateCompanionBuilder, + ( + GameTableData, + BaseReferences<_$AppDatabase, $GameTableTable, GameTableData>, + ), + GameTableData, + PrefetchHooks Function() + > { + $$GameTableTableTableManager(_$AppDatabase db, $GameTableTable table) + : super( + TableManagerState( + db: db, + table: table, + createFilteringComposer: () => + $$GameTableTableFilterComposer($db: db, $table: table), + createOrderingComposer: () => + $$GameTableTableOrderingComposer($db: db, $table: table), + createComputedFieldComposer: () => + $$GameTableTableAnnotationComposer($db: db, $table: table), + updateCompanionCallback: + ({ + Value id = const Value.absent(), + Value name = const Value.absent(), + Value rowid = const Value.absent(), + }) => GameTableCompanion(id: id, name: name, rowid: rowid), + createCompanionCallback: + ({ + required String id, + required String name, + Value rowid = const Value.absent(), + }) => GameTableCompanion.insert(id: id, name: name, rowid: rowid), + withReferenceMapper: (p0) => p0 + .map((e) => (e.readTable(table), BaseReferences(db, table, e))) + .toList(), + prefetchHooksCallback: null, + ), + ); +} + +typedef $$GameTableTableProcessedTableManager = + ProcessedTableManager< + _$AppDatabase, + $GameTableTable, + GameTableData, + $$GameTableTableFilterComposer, + $$GameTableTableOrderingComposer, + $$GameTableTableAnnotationComposer, + $$GameTableTableCreateCompanionBuilder, + $$GameTableTableUpdateCompanionBuilder, + ( + GameTableData, + BaseReferences<_$AppDatabase, $GameTableTable, GameTableData>, + ), + GameTableData, PrefetchHooks Function() >; @@ -1089,4 +1866,6 @@ class $AppDatabaseManager { $$GroupTableTableTableManager(_db, _db.groupTable); $$PlayerGroupTableTableTableManager get playerGroupTable => $$PlayerGroupTableTableTableManager(_db, _db.playerGroupTable); + $$GameTableTableTableManager get gameTable => + $$GameTableTableTableManager(_db, _db.gameTable); } diff --git a/lib/data/db/tables/game_table.dart b/lib/data/db/tables/game_table.dart new file mode 100644 index 0000000..45bfb20 --- /dev/null +++ b/lib/data/db/tables/game_table.dart @@ -0,0 +1,9 @@ +import 'package:drift/drift.dart'; + +class GameTable extends Table { + TextColumn get id => text()(); + TextColumn get name => text()(); + + @override + Set> get primaryKey => {id}; +} diff --git a/lib/data/db/tables/player_group_table.dart b/lib/data/db/tables/player_group_table.dart index a045789..096a981 100644 --- a/lib/data/db/tables/player_group_table.dart +++ b/lib/data/db/tables/player_group_table.dart @@ -1,9 +1,9 @@ import 'package:drift/drift.dart'; -import 'package:game_tracker/data/methods/db/tables/group_table.dart'; -import 'package:game_tracker/data/methods/db/tables/user_table.dart'; +import 'package:game_tracker/data/db/tables/group_table.dart'; +import 'package:game_tracker/data/db/tables/player_table.dart'; class PlayerGroupTable extends Table { - TextColumn get userId => text().references(UserTable, #id)(); + TextColumn get userId => text().references(PlayerTable, #id)(); TextColumn get groupId => text().references(GroupTable, #id)(); @override diff --git a/lib/data/dto/group.dart b/lib/data/dto/group.dart index 316b712..6f12fe9 100644 --- a/lib/data/dto/group.dart +++ b/lib/data/dto/group.dart @@ -1,4 +1,4 @@ -import 'package:game_tracker/data/methods/dto/player.dart'; +import 'package:game_tracker/data/dto/player.dart'; class Group { final String id; diff --git a/lib/data/dto/player.dart b/lib/data/dto/player.dart index 331645a..d5e84e8 100644 --- a/lib/data/dto/player.dart +++ b/lib/data/dto/player.dart @@ -1,6 +1,6 @@ class Player { final String id; - final String username; + final String name; - Player({required this.id, required this.username}); + Player({required this.id, required this.name}); } diff --git a/lib/main.dart b/lib/main.dart index dd19f34..22f94c7 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; -import 'package:game_tracker/data/database.dart'; -import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bardb/database.dart'; +import 'package:game_tracker/data/db/database.dart'; +import 'package:game_tracker/presentation/views/main_menu/custom_navigation_bar.dart'; import 'package:provider/provider.dart'; void main() { From 17d304eb5dc8a959215f4f66cfda7ce1423ef53d Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 17:19:00 +0100 Subject: [PATCH 52/62] add bigger hitboxes --- .../main_menu/custom_navigation_bar.dart | 46 +++++++++++-------- 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index d1732a8..680a4dd 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -80,31 +80,37 @@ class _CustomNavigationBarState extends State } Widget _buildNavItem(IconData icon, String label, int index) { - final isSelected = currentIndex == index; + final isSelected = currentIndex == index; - return GestureDetector( + return Expanded( // makes each nav item occupy equal width = large horizontal hitbox + child: GestureDetector( onTap: () => onTabTapped(index), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - icon, - color: isSelected ? Colors.white : Colors.black, - ), - const SizedBox(height: 4), - Text( - label, - style: TextStyle( + behavior: HitTestBehavior.opaque, // ensures the entire area is tappable + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 5.0), // adds comfortable tap height + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + icon, color: isSelected ? Colors.white : Colors.black, - fontSize: 12, - fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, ), - ), - ], + const SizedBox(height: 4), + Text( + label, + style: TextStyle( + color: isSelected ? Colors.white : Colors.black, + fontSize: 12, + fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, + ), + ), + ], + ), ), - ); - } + ), + ); +} void onTabTapped(int index) { setState(() { From 1698f61c2b0c583cc7a6d670f67afa3c007f103a Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 17:45:04 +0100 Subject: [PATCH 53/62] remove useless comments --- .../views/main_menu/custom_navigation_bar.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 680a4dd..bf7d90b 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -52,7 +52,7 @@ class _CustomNavigationBarState extends State ), backgroundColor: CustomTheme.backgroundColor, body: tabs[currentIndex], - extendBody: true, // Enables floating effect + extendBody: true, bottomNavigationBar: Padding( padding: const EdgeInsets.only(left: 12.0, right: 12.0, bottom: 8.0), child: Material( @@ -82,12 +82,12 @@ class _CustomNavigationBarState extends State Widget _buildNavItem(IconData icon, String label, int index) { final isSelected = currentIndex == index; - return Expanded( // makes each nav item occupy equal width = large horizontal hitbox + return Expanded( child: GestureDetector( onTap: () => onTabTapped(index), - behavior: HitTestBehavior.opaque, // ensures the entire area is tappable + behavior: HitTestBehavior.opaque, child: Padding( - padding: const EdgeInsets.symmetric(vertical: 5.0), // adds comfortable tap height + padding: const EdgeInsets.symmetric(vertical: 5.0), child: Column( mainAxisSize: MainAxisSize.min, mainAxisAlignment: MainAxisAlignment.center, From 34df9f007b0b710662887037723cbec06479162e Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 17:49:02 +0100 Subject: [PATCH 54/62] add navbar_item.dart --- lib/presentation/widgets/navbar_item.dart | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 lib/presentation/widgets/navbar_item.dart diff --git a/lib/presentation/widgets/navbar_item.dart b/lib/presentation/widgets/navbar_item.dart new file mode 100644 index 0000000..dd938b2 --- /dev/null +++ b/lib/presentation/widgets/navbar_item.dart @@ -0,0 +1,15 @@ +import 'package:flutter/cupertino.dart'; + +class NavbarItem extends StatefulWidget { + const NavbarItem({super.key}); + + @override + State createState() => _NavbarItemState(); +} + +class _NavbarItemState extends State { + @override + Widget build(BuildContext context) { + return const Placeholder(); + } +} From 92817bc4dbdc0b54a0b8a03d5a7b341241f2409b Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sat, 8 Nov 2025 18:05:19 +0100 Subject: [PATCH 55/62] move navbar widget to its own file --- .../main_menu/custom_navigation_bar.dart | 42 ++--------------- lib/presentation/widgets/navbar_item.dart | 47 +++++++++++++++++-- 2 files changed, 49 insertions(+), 40 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index bf7d90b..10ee10f 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -5,6 +5,7 @@ import 'package:game_tracker/presentation/views/main_menu/groups_view.dart'; import 'package:game_tracker/presentation/views/main_menu/home_view.dart'; import 'package:game_tracker/presentation/views/main_menu/settings_view.dart'; import 'package:game_tracker/presentation/views/main_menu/statistics_view.dart'; +import 'package:game_tracker/presentation/widgets/navbar_item.dart'; class CustomNavigationBar extends StatefulWidget { const CustomNavigationBar({super.key}); @@ -66,10 +67,10 @@ class _CustomNavigationBarState extends State child: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - _buildNavItem(Icons.home, 'Home', 0), - _buildNavItem(Icons.history, 'Games', 1), - _buildNavItem(Icons.groups, 'Groups', 2), - _buildNavItem(Icons.bar_chart, 'Stats', 3), + NavbarItem(currentIndex: currentIndex, index: 0, icon: Icons.home_rounded, label: 'Home', onTabTapped: onTabTapped), + NavbarItem(currentIndex: currentIndex, index: 1, icon: Icons.gamepad_rounded, label: 'Games', onTabTapped: onTabTapped), + NavbarItem(currentIndex: currentIndex, index: 2, icon: Icons.group_rounded, label: 'Groups', onTabTapped: onTabTapped), + NavbarItem(currentIndex: currentIndex, index: 3, icon: Icons.bar_chart_rounded, label: 'Stats', onTabTapped: onTabTapped), ], ), ), @@ -79,39 +80,6 @@ class _CustomNavigationBarState extends State ); } - Widget _buildNavItem(IconData icon, String label, int index) { - final isSelected = currentIndex == index; - - return Expanded( - child: GestureDetector( - onTap: () => onTabTapped(index), - behavior: HitTestBehavior.opaque, - child: Padding( - padding: const EdgeInsets.symmetric(vertical: 5.0), - child: Column( - mainAxisSize: MainAxisSize.min, - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Icon( - icon, - color: isSelected ? Colors.white : Colors.black, - ), - const SizedBox(height: 4), - Text( - label, - style: TextStyle( - color: isSelected ? Colors.white : Colors.black, - fontSize: 12, - fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, - ), - ), - ], - ), - ), - ), - ); -} - void onTabTapped(int index) { setState(() { currentIndex = index; diff --git a/lib/presentation/widgets/navbar_item.dart b/lib/presentation/widgets/navbar_item.dart index dd938b2..f178ccf 100644 --- a/lib/presentation/widgets/navbar_item.dart +++ b/lib/presentation/widgets/navbar_item.dart @@ -1,7 +1,18 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; class NavbarItem extends StatefulWidget { - const NavbarItem({super.key}); + + final int currentIndex; + final int index; + final IconData icon; + final String label; + final Function(int) onTabTapped; + + const NavbarItem( + {super.key, required this.currentIndex, required this.index, + required this.icon, required this.label, required this.onTabTapped + } + ); @override State createState() => _NavbarItemState(); @@ -10,6 +21,36 @@ class NavbarItem extends StatefulWidget { class _NavbarItemState extends State { @override Widget build(BuildContext context) { - return const Placeholder(); + + bool isSelected = widget.currentIndex == widget.index; + + return Expanded( + child: GestureDetector( + onTap: () => widget.onTabTapped(widget.index), + behavior: HitTestBehavior.opaque, + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 5.0), + child: Column( + mainAxisSize: MainAxisSize.min, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + Icon( + widget.icon, + color: isSelected ? Colors.white : Colors.black, + ), + const SizedBox(height: 4), + Text( + widget.label, + style: TextStyle( + color: isSelected ? Colors.white : Colors.black, + fontSize: 12, + fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, + ), + ), + ], + ), + ), + ), + ); } } From 3916cca2ca01b6f88fd28d6487ae4da1b3f1202f Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sun, 9 Nov 2025 19:10:11 +0100 Subject: [PATCH 56/62] Implemented QuickInfoTile --- ios/Flutter/AppFrameworkInfo.plist | 2 +- ios/Podfile | 2 +- ios/Runner.xcodeproj/project.pbxproj | 118 +++++++++++++++++- .../contents.xcworkspacedata | 3 + lib/core/custom_theme.dart | 4 +- .../views/main_menu/home_view.dart | 19 ++- lib/presentation/widgets/quick_info_tile.dart | 56 +++++++++ 7 files changed, 196 insertions(+), 8 deletions(-) create mode 100644 lib/presentation/widgets/quick_info_tile.dart diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist index 7c56964..1dc6cf7 100644 --- a/ios/Flutter/AppFrameworkInfo.plist +++ b/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 12.0 + 13.0 diff --git a/ios/Podfile b/ios/Podfile index e549ee2..620e46e 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -1,5 +1,5 @@ # Uncomment this line to define a global platform for your project -# platform :ios, '12.0' +# platform :ios, '13.0' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index e663485..8358b1c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -11,9 +11,11 @@ 331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; + 8AD879B4BA24BC1EB84E1092 /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8543AAE6520EA0C0B3AF8FEE /* Pods_RunnerTests.framework */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + DDD6907F99188C9B97C6B11F /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D622CF241440C10C19C0D397 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -40,14 +42,18 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 13301BC306FBFE16F253F2B9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 32DDFE3349B038E1CA758D7B /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; 331C807B294A618700263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = ""; }; 331C8081294A63A400263BE5 /* RunnerTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RunnerTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; + 8543AAE6520EA0C0B3AF8FEE /* Pods_RunnerTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_RunnerTests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 96CDE41BAA7259C918DB326B /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -55,13 +61,26 @@ 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + B194217AD06D15D90AAF9056 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; + B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = ""; }; + D622CF241440C10C19C0D397 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 6F6FEDCE9772FEF7A6255134 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 8AD879B4BA24BC1EB84E1092 /* Pods_RunnerTests.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 97C146EB1CF9000F007C117D /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + DDD6907F99188C9B97C6B11F /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -94,6 +113,8 @@ 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, 331C8082294A63A400263BE5 /* RunnerTests */, + ABF0E17C36D6999806C09130 /* Pods */, + F14326E3F17437DD2E32AB7B /* Frameworks */, ); sourceTree = ""; }; @@ -121,6 +142,29 @@ path = Runner; sourceTree = ""; }; + ABF0E17C36D6999806C09130 /* Pods */ = { + isa = PBXGroup; + children = ( + B194217AD06D15D90AAF9056 /* Pods-Runner.debug.xcconfig */, + 32DDFE3349B038E1CA758D7B /* Pods-Runner.release.xcconfig */, + 13301BC306FBFE16F253F2B9 /* Pods-Runner.profile.xcconfig */, + 96CDE41BAA7259C918DB326B /* Pods-RunnerTests.debug.xcconfig */, + B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */, + E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + F14326E3F17437DD2E32AB7B /* Frameworks */ = { + isa = PBXGroup; + children = ( + D622CF241440C10C19C0D397 /* Pods_Runner.framework */, + 8543AAE6520EA0C0B3AF8FEE /* Pods_RunnerTests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -128,8 +172,10 @@ isa = PBXNativeTarget; buildConfigurationList = 331C8087294A63A400263BE5 /* Build configuration list for PBXNativeTarget "RunnerTests" */; buildPhases = ( + F7D5E29C2C77E2E8925BBB8A /* [CP] Check Pods Manifest.lock */, 331C807D294A63A400263BE5 /* Sources */, 331C807F294A63A400263BE5 /* Resources */, + 6F6FEDCE9772FEF7A6255134 /* Frameworks */, ); buildRules = ( ); @@ -145,12 +191,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + 8947D8DE27F8CB7D5A5F265C /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + 0CC58B149CD3F41CF94E1C52 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -222,6 +270,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0CC58B149CD3F41CF94E1C52 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; 3B06AD1E1E4923F5004D2608 /* Thin Binary */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -238,6 +303,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; + 8947D8DE27F8CB7D5A5F265C /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; alwaysOutOfDate = 1; @@ -253,6 +340,28 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + F7D5E29C2C77E2E8925BBB8A /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-RunnerTests-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -346,7 +455,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -379,6 +488,7 @@ }; 331C8088294A63A400263BE5 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 96CDE41BAA7259C918DB326B /* Pods-RunnerTests.debug.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -396,6 +506,7 @@ }; 331C8089294A63A400263BE5 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = B68CF4A64F0B5E45B43D6900 /* Pods-RunnerTests.release.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -411,6 +522,7 @@ }; 331C808A294A63A400263BE5 /* Profile */ = { isa = XCBuildConfiguration; + baseConfigurationReference = E754D1191B3E54E52B6DCC49 /* Pods-RunnerTests.profile.xcconfig */; buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; CODE_SIGN_STYLE = Automatic; @@ -473,7 +585,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -524,7 +636,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 12.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/lib/core/custom_theme.dart b/lib/core/custom_theme.dart index 1a5741a..438aab5 100644 --- a/lib/core/custom_theme.dart +++ b/lib/core/custom_theme.dart @@ -3,7 +3,9 @@ import 'package:flutter/material.dart'; class CustomTheme { static Color primaryColor = const Color(0xFF7505E4); static Color secondaryColor = const Color(0xFFAFA2FF); - static Color backgroundColor = const Color(0xFF1A1A1A); + static Color backgroundColor = const Color(0xFF0B0B0B); + static Color boxColor = const Color(0xFF101010); + static Color boxBorder = const Color(0xFF272727); static AppBarTheme appBarTheme = AppBarTheme( backgroundColor: backgroundColor, diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index fb23bc1..1a95b27 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -1,10 +1,25 @@ -import 'package:flutter/cupertino.dart'; +import 'package:flutter/material.dart'; +import 'package:game_tracker/presentation/widgets/quick_info_tile.dart'; class HomeView extends StatelessWidget { const HomeView({super.key}); @override Widget build(BuildContext context) { - return const Center(child: Text('Home View')); + return const Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickInfoTile(title: 'Games', icon: Icons.casino, value: 42), + QuickInfoTile( + title: 'Groups', + icon: Icons.groups_rounded, + value: 5, + ), + ], + ), + ], + ); } } diff --git a/lib/presentation/widgets/quick_info_tile.dart b/lib/presentation/widgets/quick_info_tile.dart new file mode 100644 index 0000000..69ab5c6 --- /dev/null +++ b/lib/presentation/widgets/quick_info_tile.dart @@ -0,0 +1,56 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class QuickInfoTile extends StatefulWidget { + final String title; + final IconData icon; + final int value; + const QuickInfoTile({ + super.key, + required this.title, + required this.icon, + required this.value, + }); + + @override + State createState() => _QuickInfoTileState(); +} + +class _QuickInfoTileState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: const EdgeInsets.all(12), + height: 110, + width: 180, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: CustomTheme.boxColor, + border: Border.all(color: CustomTheme.boxBorder), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Row( + children: [ + const Icon(Icons.casino), + const SizedBox(width: 5), + Text( + widget.title, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + const Spacer(), + Text( + widget.value.toString(), + style: const TextStyle(fontSize: 32, fontWeight: FontWeight.bold), + ), + ], + ), + ); + } +} From 1b090a43a0648db180f01ebc55debd606bc808f2 Mon Sep 17 00:00:00 2001 From: Yannick <69087944+GelbEinhalb@users.noreply.github.com> Date: Sun, 9 Nov 2025 20:49:14 +0100 Subject: [PATCH 57/62] a bit cleaner solution --- .../main_menu/custom_navigation_bar.dart | 32 ++++++++++++++++--- lib/presentation/widgets/navbar_item.dart | 27 ++++++++-------- 2 files changed, 42 insertions(+), 17 deletions(-) diff --git a/lib/presentation/views/main_menu/custom_navigation_bar.dart b/lib/presentation/views/main_menu/custom_navigation_bar.dart index 10ee10f..20ced7a 100644 --- a/lib/presentation/views/main_menu/custom_navigation_bar.dart +++ b/lib/presentation/views/main_menu/custom_navigation_bar.dart @@ -67,10 +67,34 @@ class _CustomNavigationBarState extends State child: Row( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ - NavbarItem(currentIndex: currentIndex, index: 0, icon: Icons.home_rounded, label: 'Home', onTabTapped: onTabTapped), - NavbarItem(currentIndex: currentIndex, index: 1, icon: Icons.gamepad_rounded, label: 'Games', onTabTapped: onTabTapped), - NavbarItem(currentIndex: currentIndex, index: 2, icon: Icons.group_rounded, label: 'Groups', onTabTapped: onTabTapped), - NavbarItem(currentIndex: currentIndex, index: 3, icon: Icons.bar_chart_rounded, label: 'Stats', onTabTapped: onTabTapped), + NavbarItem( + index: 0, + isSelected: currentIndex == 0, + icon: Icons.home_rounded, + label: 'Home', + onTabTapped: onTabTapped, + ), + NavbarItem( + index: 1, + isSelected: currentIndex == 1, + icon: Icons.gamepad_rounded, + label: 'Games', + onTabTapped: onTabTapped, + ), + NavbarItem( + index: 2, + isSelected: currentIndex == 2, + icon: Icons.group_rounded, + label: 'Groups', + onTabTapped: onTabTapped, + ), + NavbarItem( + index: 3, + isSelected: currentIndex == 3, + icon: Icons.bar_chart_rounded, + label: 'Stats', + onTabTapped: onTabTapped, + ), ], ), ), diff --git a/lib/presentation/widgets/navbar_item.dart b/lib/presentation/widgets/navbar_item.dart index f178ccf..b249571 100644 --- a/lib/presentation/widgets/navbar_item.dart +++ b/lib/presentation/widgets/navbar_item.dart @@ -1,18 +1,20 @@ import 'package:flutter/material.dart'; class NavbarItem extends StatefulWidget { - - final int currentIndex; final int index; + final bool isSelected; final IconData icon; final String label; final Function(int) onTabTapped; - const NavbarItem( - {super.key, required this.currentIndex, required this.index, - required this.icon, required this.label, required this.onTabTapped - } - ); + const NavbarItem({ + super.key, + required this.index, + required this.isSelected, + required this.icon, + required this.label, + required this.onTabTapped, + }); @override State createState() => _NavbarItemState(); @@ -21,9 +23,6 @@ class NavbarItem extends StatefulWidget { class _NavbarItemState extends State { @override Widget build(BuildContext context) { - - bool isSelected = widget.currentIndex == widget.index; - return Expanded( child: GestureDetector( onTap: () => widget.onTabTapped(widget.index), @@ -36,15 +35,17 @@ class _NavbarItemState extends State { children: [ Icon( widget.icon, - color: isSelected ? Colors.white : Colors.black, + color: widget.isSelected ? Colors.white : Colors.black, ), const SizedBox(height: 4), Text( widget.label, style: TextStyle( - color: isSelected ? Colors.white : Colors.black, + color: widget.isSelected ? Colors.white : Colors.black, fontSize: 12, - fontWeight: isSelected ? FontWeight.bold : FontWeight.normal, + fontWeight: widget.isSelected + ? FontWeight.bold + : FontWeight.normal, ), ), ], From e88211245c8f3d0387b3c62d869372accab9155e Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Sun, 9 Nov 2025 23:33:29 +0100 Subject: [PATCH 58/62] Implemented first version of home view --- .../views/main_menu/home_view.dart | 45 +++++++++- lib/presentation/widgets/game_tile.dart | 82 +++++++++++++++++++ lib/presentation/widgets/info_tile.dart | 61 ++++++++++++++ .../widgets/quick_create_button.dart | 34 ++++++++ lib/presentation/widgets/quick_info_tile.dart | 2 +- 5 files changed, 221 insertions(+), 3 deletions(-) create mode 100644 lib/presentation/widgets/game_tile.dart create mode 100644 lib/presentation/widgets/info_tile.dart create mode 100644 lib/presentation/widgets/quick_create_button.dart diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 1a95b27..fb03c5f 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -1,4 +1,7 @@ import 'package:flutter/material.dart'; +import 'package:game_tracker/presentation/widgets/game_tile.dart'; +import 'package:game_tracker/presentation/widgets/info_tile.dart'; +import 'package:game_tracker/presentation/widgets/quick_create_button.dart'; import 'package:game_tracker/presentation/widgets/quick_info_tile.dart'; class HomeView extends StatelessWidget { @@ -6,9 +9,10 @@ class HomeView extends StatelessWidget { @override Widget build(BuildContext context) { - return const Column( + return Column( + crossAxisAlignment: CrossAxisAlignment.center, children: [ - Row( + const Row( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ QuickInfoTile(title: 'Games', icon: Icons.casino, value: 42), @@ -19,6 +23,43 @@ class HomeView extends StatelessWidget { ), ], ), + const InfoTile( + title: 'Recent Games', + padding: EdgeInsets.symmetric(horizontal: 8.0, vertical: 16.0), + icon: Icons.timer, + content: GameTile(), + ), + InfoTile( + title: 'Quick Create', + height: 210, + padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 16.0), + icon: Icons.add_box_rounded, + content: Column( + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton(text: 'Cabo', onPressed: () {}), + QuickCreateButton(text: 'Uno', onPressed: () {}), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton(text: 'Phase 10', onPressed: () {}), + QuickCreateButton(text: 'Category 5', onPressed: () {}), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton(text: 'Category 6', onPressed: () {}), + QuickCreateButton(text: 'Category 7', onPressed: () {}), + ], + ), + ], + ), + ), ], ); } diff --git a/lib/presentation/widgets/game_tile.dart b/lib/presentation/widgets/game_tile.dart new file mode 100644 index 0000000..546531c --- /dev/null +++ b/lib/presentation/widgets/game_tile.dart @@ -0,0 +1,82 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class GameTile extends StatefulWidget { + const GameTile({super.key}); + + @override + State createState() => _GameTileState(); +} + +class _GameTileState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: const EdgeInsets.all(12), + height: 120, + width: 250, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: CustomTheme.boxColor, + border: Border.all(color: CustomTheme.boxBorder), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + const Row( + children: [ + Text( + 'Gametitle', + style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + SizedBox(width: 5), + Text( + 'Gametype', + style: TextStyle(fontSize: 14, color: Colors.grey), + ), + ], + ), + const SizedBox(height: 5), + Container( + padding: const EdgeInsets.symmetric(horizontal: 4), + height: 20, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: CustomTheme.primaryColor, + ), + child: const Text( + 'Ruleset', + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), + const Center( + child: Text( + '5 Player', + style: TextStyle(fontWeight: FontWeight.bold), + ), + ), + const Spacer(), + Center( + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 4), + width: 220, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: Colors.yellow.shade300, + ), + child: const Text( + 'In Progress', + textAlign: TextAlign.center, + style: TextStyle( + fontWeight: FontWeight.bold, + color: Colors.black87, + ), + ), + ), + ), + ], + ), + ); + } +} diff --git a/lib/presentation/widgets/info_tile.dart b/lib/presentation/widgets/info_tile.dart new file mode 100644 index 0000000..a323556 --- /dev/null +++ b/lib/presentation/widgets/info_tile.dart @@ -0,0 +1,61 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class InfoTile extends StatefulWidget { + final String title; + final IconData icon; + final Widget content; + final EdgeInsets? padding; + final double? height; + const InfoTile({ + super.key, + required this.title, + required this.icon, + required this.content, + this.padding, + this.height, + }); + + @override + State createState() => _InfoTileState(); +} + +class _InfoTileState extends State { + @override + Widget build(BuildContext context) { + return Padding( + padding: widget.padding ?? const EdgeInsets.all(0), + child: Container( + padding: const EdgeInsets.all(12), + height: widget.height ?? 200, + width: 380, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: CustomTheme.boxColor, + border: Border.all(color: CustomTheme.boxBorder), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + children: [ + Icon(widget.icon), + const SizedBox(width: 5), + Text( + widget.title, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + const SizedBox(height: 10), + widget.content, + ], + ), + ), + ); + } +} diff --git a/lib/presentation/widgets/quick_create_button.dart b/lib/presentation/widgets/quick_create_button.dart new file mode 100644 index 0000000..bdf2945 --- /dev/null +++ b/lib/presentation/widgets/quick_create_button.dart @@ -0,0 +1,34 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class QuickCreateButton extends StatefulWidget { + final String text; + final VoidCallback? onPressed; + const QuickCreateButton({ + super.key, + required this.text, + required this.onPressed, + }); + + @override + State createState() => _QuickCreateButtonState(); +} + +class _QuickCreateButtonState extends State { + @override + Widget build(BuildContext context) { + return ElevatedButton( + onPressed: widget.onPressed, + + style: ElevatedButton.styleFrom( + minimumSize: const Size(140, 40), + backgroundColor: CustomTheme.primaryColor, + shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), + ), + child: Text( + widget.text, + style: const TextStyle(fontWeight: FontWeight.bold), + ), + ); + } +} diff --git a/lib/presentation/widgets/quick_info_tile.dart b/lib/presentation/widgets/quick_info_tile.dart index 69ab5c6..6831c65 100644 --- a/lib/presentation/widgets/quick_info_tile.dart +++ b/lib/presentation/widgets/quick_info_tile.dart @@ -33,7 +33,7 @@ class _QuickInfoTileState extends State { children: [ Row( children: [ - const Icon(Icons.casino), + Icon(widget.icon), const SizedBox(width: 5), Text( widget.title, From 6cbc64c0421f4291e3b9252f3aebd8348f79b8c9 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Tue, 11 Nov 2025 15:34:16 +0100 Subject: [PATCH 59/62] Simplified game tile --- lib/presentation/widgets/game_tile.dart | 126 +++++++++++++----------- 1 file changed, 67 insertions(+), 59 deletions(-) diff --git a/lib/presentation/widgets/game_tile.dart b/lib/presentation/widgets/game_tile.dart index 546531c..c79a6b7 100644 --- a/lib/presentation/widgets/game_tile.dart +++ b/lib/presentation/widgets/game_tile.dart @@ -2,7 +2,20 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/core/custom_theme.dart'; class GameTile extends StatefulWidget { - const GameTile({super.key}); + final String gameTitle; + final String gameType; + final String ruleset; + final String players; + final String winner; + + const GameTile({ + super.key, + required this.gameTitle, + required this.gameType, + required this.ruleset, + required this.players, + required this.winner, + }); @override State createState() => _GameTileState(); @@ -11,72 +24,67 @@ class GameTile extends StatefulWidget { class _GameTileState extends State { @override Widget build(BuildContext context) { - return Container( - padding: const EdgeInsets.all(12), - height: 120, - width: 250, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: CustomTheme.boxColor, - border: Border.all(color: CustomTheme.boxBorder), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - const Row( - children: [ - Text( - 'Gametitle', - style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold), - ), - SizedBox(width: 5), - Text( - 'Gametype', - style: TextStyle(fontSize: 14, color: Colors.grey), - ), - ], + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + widget.gameTitle, + style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold), + ), + const SizedBox(width: 5), + Text( + widget.gameType, + style: const TextStyle(fontSize: 14, color: Colors.grey), + ), + ], + ), + const SizedBox(height: 5), + Container( + padding: const EdgeInsets.symmetric(horizontal: 4), + height: 20, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: CustomTheme.primaryColor, ), - const SizedBox(height: 5), - Container( + child: Text( + widget.ruleset, + style: const TextStyle(fontWeight: FontWeight.bold), + ), + ), + Center( + heightFactor: 1.5, + child: Text( + widget.players, + style: const TextStyle(fontWeight: FontWeight.bold), + ), + ), + Center( + child: Container( padding: const EdgeInsets.symmetric(horizontal: 4), - height: 20, + width: 220, decoration: BoxDecoration( borderRadius: BorderRadius.circular(4), - color: CustomTheme.primaryColor, + color: Colors.yellow.shade300, ), - child: const Text( - 'Ruleset', - style: TextStyle(fontWeight: FontWeight.bold), - ), - ), - const Center( - child: Text( - '5 Player', - style: TextStyle(fontWeight: FontWeight.bold), - ), - ), - const Spacer(), - Center( - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 4), - width: 220, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - color: Colors.yellow.shade300, - ), - child: const Text( - 'In Progress', - textAlign: TextAlign.center, - style: TextStyle( - fontWeight: FontWeight.bold, - color: Colors.black87, + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const Icon(Icons.emoji_events, color: Colors.black, size: 20), + Text( + widget.winner, + textAlign: TextAlign.center, + style: const TextStyle( + fontWeight: FontWeight.bold, + color: Colors.black87, + ), ), - ), + ], ), ), - ], - ), + ), + ], ); } } From 4f8ba002d3f1f2cb966aabe59eeaaeaa9a351153 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Tue, 11 Nov 2025 15:34:31 +0100 Subject: [PATCH 60/62] Overhauled layout building --- .../views/main_menu/home_view.dart | 135 ++++++++++++------ lib/presentation/widgets/info_tile.dart | 61 -------- .../widgets/quick_create_button.dart | 5 +- lib/presentation/widgets/tiles/info_tile.dart | 60 ++++++++ .../widgets/{ => tiles}/quick_info_tile.dart | 12 +- 5 files changed, 161 insertions(+), 112 deletions(-) delete mode 100644 lib/presentation/widgets/info_tile.dart create mode 100644 lib/presentation/widgets/tiles/info_tile.dart rename lib/presentation/widgets/{ => tiles}/quick_info_tile.dart (84%) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index fb03c5f..bbed244 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -1,66 +1,111 @@ import 'package:flutter/material.dart'; import 'package:game_tracker/presentation/widgets/game_tile.dart'; -import 'package:game_tracker/presentation/widgets/info_tile.dart'; import 'package:game_tracker/presentation/widgets/quick_create_button.dart'; -import 'package:game_tracker/presentation/widgets/quick_info_tile.dart'; +import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart'; +import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart'; class HomeView extends StatelessWidget { const HomeView({super.key}); @override Widget build(BuildContext context) { - return Column( - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - const Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - QuickInfoTile(title: 'Games', icon: Icons.casino, value: 42), - QuickInfoTile( - title: 'Groups', - icon: Icons.groups_rounded, - value: 5, - ), - ], - ), - const InfoTile( - title: 'Recent Games', - padding: EdgeInsets.symmetric(horizontal: 8.0, vertical: 16.0), - icon: Icons.timer, - content: GameTile(), - ), - InfoTile( - title: 'Quick Create', - height: 210, - padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 16.0), - icon: Icons.add_box_rounded, - content: Column( + return LayoutBuilder( + builder: (BuildContext context, BoxConstraints constraints) { + return SingleChildScrollView( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, children: [ Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, + mainAxisAlignment: MainAxisAlignment.center, children: [ - QuickCreateButton(text: 'Cabo', onPressed: () {}), - QuickCreateButton(text: 'Uno', onPressed: () {}), + QuickInfoTile( + width: constraints.maxWidth * 0.45, + height: constraints.maxHeight * 0.15, + title: 'Games', + icon: Icons.casino, + value: 42, + ), + SizedBox(width: constraints.maxWidth * 0.05), + QuickInfoTile( + width: constraints.maxWidth * 0.45, + height: constraints.maxHeight * 0.15, + title: 'Groups', + icon: Icons.groups_rounded, + value: 5, + ), ], ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - QuickCreateButton(text: 'Phase 10', onPressed: () {}), - QuickCreateButton(text: 'Category 5', onPressed: () {}), - ], + Padding( + padding: const EdgeInsets.symmetric(vertical: 24.0), + child: InfoTile( + width: constraints.maxWidth * 0.95, + title: 'Recent Games', + icon: Icons.timer, + content: const Padding( + padding: EdgeInsets.symmetric(horizontal: 40.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GameTile( + gameTitle: 'Gamenight', + gameType: 'Cabo', + ruleset: 'Lowest Points', + players: '5 Players', + winner: 'Leonard', + ), + Padding( + padding: EdgeInsets.symmetric(vertical: 8.0), + child: Divider(), + ), + GameTile( + gameTitle: 'Schoolbreak', + gameType: 'Uno', + ruleset: 'Highest Points', + players: 'The Gang', + winner: 'Lina', + ), + SizedBox(height: 8), + ], + ), + ), + ), ), - Row( - mainAxisAlignment: MainAxisAlignment.spaceEvenly, - children: [ - QuickCreateButton(text: 'Category 6', onPressed: () {}), - QuickCreateButton(text: 'Category 7', onPressed: () {}), - ], + InfoTile( + width: constraints.maxWidth * 0.95, + title: 'Quick Create', + icon: Icons.add_box_rounded, + content: Column( + spacing: 8, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton(text: 'Category 1', onPressed: () {}), + QuickCreateButton(text: 'Category 2', onPressed: () {}), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton(text: 'Category 3', onPressed: () {}), + QuickCreateButton(text: 'Category 4', onPressed: () {}), + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceEvenly, + children: [ + QuickCreateButton(text: 'Category 5', onPressed: () {}), + QuickCreateButton(text: 'Category 6', onPressed: () {}), + ], + ), + ], + ), ), ], ), - ), - ], + ); + }, ); } } diff --git a/lib/presentation/widgets/info_tile.dart b/lib/presentation/widgets/info_tile.dart deleted file mode 100644 index a323556..0000000 --- a/lib/presentation/widgets/info_tile.dart +++ /dev/null @@ -1,61 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:game_tracker/core/custom_theme.dart'; - -class InfoTile extends StatefulWidget { - final String title; - final IconData icon; - final Widget content; - final EdgeInsets? padding; - final double? height; - const InfoTile({ - super.key, - required this.title, - required this.icon, - required this.content, - this.padding, - this.height, - }); - - @override - State createState() => _InfoTileState(); -} - -class _InfoTileState extends State { - @override - Widget build(BuildContext context) { - return Padding( - padding: widget.padding ?? const EdgeInsets.all(0), - child: Container( - padding: const EdgeInsets.all(12), - height: widget.height ?? 200, - width: 380, - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(12), - color: CustomTheme.boxColor, - border: Border.all(color: CustomTheme.boxBorder), - ), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Row( - children: [ - Icon(widget.icon), - const SizedBox(width: 5), - Text( - widget.title, - style: const TextStyle( - fontSize: 16, - fontWeight: FontWeight.bold, - ), - ), - ], - ), - const SizedBox(height: 10), - widget.content, - ], - ), - ), - ); - } -} diff --git a/lib/presentation/widgets/quick_create_button.dart b/lib/presentation/widgets/quick_create_button.dart index bdf2945..3860f1c 100644 --- a/lib/presentation/widgets/quick_create_button.dart +++ b/lib/presentation/widgets/quick_create_button.dart @@ -19,15 +19,14 @@ class _QuickCreateButtonState extends State { Widget build(BuildContext context) { return ElevatedButton( onPressed: widget.onPressed, - style: ElevatedButton.styleFrom( - minimumSize: const Size(140, 40), + minimumSize: const Size(140, 45), backgroundColor: CustomTheme.primaryColor, shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)), ), child: Text( widget.text, - style: const TextStyle(fontWeight: FontWeight.bold), + style: const TextStyle(fontWeight: FontWeight.bold, fontSize: 16), ), ); } diff --git a/lib/presentation/widgets/tiles/info_tile.dart b/lib/presentation/widgets/tiles/info_tile.dart new file mode 100644 index 0000000..168262e --- /dev/null +++ b/lib/presentation/widgets/tiles/info_tile.dart @@ -0,0 +1,60 @@ +import 'package:flutter/material.dart'; +import 'package:game_tracker/core/custom_theme.dart'; + +class InfoTile extends StatefulWidget { + final String title; + final IconData icon; + final Widget content; + final EdgeInsets? padding; + final double? height; + final double? width; + const InfoTile({ + super.key, + required this.title, + required this.icon, + required this.content, + this.padding, + this.height, + this.width, + }); + + @override + State createState() => _InfoTileState(); +} + +class _InfoTileState extends State { + @override + Widget build(BuildContext context) { + return Container( + padding: widget.padding ?? const EdgeInsets.all(12), + height: widget.height, + width: widget.width ?? 380, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(12), + color: CustomTheme.boxColor, + border: Border.all(color: CustomTheme.boxBorder), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + children: [ + Icon(widget.icon), + const SizedBox(width: 5), + Text( + widget.title, + style: const TextStyle( + fontSize: 16, + fontWeight: FontWeight.bold, + ), + ), + ], + ), + const SizedBox(height: 10), + widget.content, + ], + ), + ); + } +} diff --git a/lib/presentation/widgets/quick_info_tile.dart b/lib/presentation/widgets/tiles/quick_info_tile.dart similarity index 84% rename from lib/presentation/widgets/quick_info_tile.dart rename to lib/presentation/widgets/tiles/quick_info_tile.dart index 6831c65..423b8d3 100644 --- a/lib/presentation/widgets/quick_info_tile.dart +++ b/lib/presentation/widgets/tiles/quick_info_tile.dart @@ -5,11 +5,17 @@ class QuickInfoTile extends StatefulWidget { final String title; final IconData icon; final int value; + final double? height; + final double? width; + final EdgeInsets? padding; const QuickInfoTile({ super.key, required this.title, required this.icon, required this.value, + this.height, + this.width, + this.padding, }); @override @@ -20,9 +26,9 @@ class _QuickInfoTileState extends State { @override Widget build(BuildContext context) { return Container( - padding: const EdgeInsets.all(12), - height: 110, - width: 180, + padding: widget.padding ?? const EdgeInsets.all(12), + height: widget.height ?? 110, + width: widget.width ?? 180, decoration: BoxDecoration( borderRadius: BorderRadius.circular(12), color: CustomTheme.boxColor, From dd754eb5696bfb02998b6463d97211bee82c058a Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Tue, 11 Nov 2025 21:03:10 +0100 Subject: [PATCH 61/62] Implemented retrieving game and group count from the db --- lib/data/dao/game_dao.dart | 9 +++ lib/data/dao/group_dao.dart | 9 +++ .../views/main_menu/home_view.dart | 60 +++++++++++++++---- 3 files changed, 65 insertions(+), 13 deletions(-) diff --git a/lib/data/dao/game_dao.dart b/lib/data/dao/game_dao.dart index e59fae4..3b6529a 100644 --- a/lib/data/dao/game_dao.dart +++ b/lib/data/dao/game_dao.dart @@ -22,4 +22,13 @@ class GameDao extends DatabaseAccessor with _$GameDaoMixin { final result = await query.getSingle(); return Game(id: result.id, name: result.name); } + + /// Retrieves the number of games in the database. + Future getGameCount() async { + final count = + await (selectOnly(gameTable)..addColumns([gameTable.id.count()])) + .map((row) => row.read(gameTable.id.count())) + .getSingle(); + return count ?? 0; + } } diff --git a/lib/data/dao/group_dao.dart b/lib/data/dao/group_dao.dart index c1932d3..7dc144d 100644 --- a/lib/data/dao/group_dao.dart +++ b/lib/data/dao/group_dao.dart @@ -56,4 +56,13 @@ class GroupDao extends DatabaseAccessor with _$GroupDaoMixin { ); return rowsAffected > 0; } + + /// Retrieves the number of groups in the database. + Future getGroupCount() async { + final count = + await (selectOnly(groupTable)..addColumns([groupTable.id.count()])) + .map((row) => row.read(groupTable.id.count())) + .getSingle(); + return count ?? 0; + } } diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index bbed244..42cb822 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -1,12 +1,30 @@ import 'package:flutter/material.dart'; +import 'package:game_tracker/data/db/database.dart'; import 'package:game_tracker/presentation/widgets/game_tile.dart'; import 'package:game_tracker/presentation/widgets/quick_create_button.dart'; import 'package:game_tracker/presentation/widgets/tiles/info_tile.dart'; import 'package:game_tracker/presentation/widgets/tiles/quick_info_tile.dart'; +import 'package:provider/provider.dart'; -class HomeView extends StatelessWidget { +class HomeView extends StatefulWidget { const HomeView({super.key}); + @override + State createState() => _HomeViewState(); +} + +class _HomeViewState extends State { + late Future _gameCountFuture; + late Future _groupCountFuture; + + @override + initState() { + super.initState(); + final db = Provider.of(context, listen: false); + _gameCountFuture = db.gameDao.getGameCount(); + _groupCountFuture = db.groupDao.getGroupCount(); + } + @override Widget build(BuildContext context) { return LayoutBuilder( @@ -18,20 +36,36 @@ class HomeView extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.center, children: [ - QuickInfoTile( - width: constraints.maxWidth * 0.45, - height: constraints.maxHeight * 0.15, - title: 'Games', - icon: Icons.casino, - value: 42, + FutureBuilder( + future: _gameCountFuture, + builder: (context, snapshot) { + final int count = (snapshot.hasData) ? snapshot.data! : 0; + return QuickInfoTile( + width: constraints.maxWidth * 0.45, + height: constraints.maxHeight * 0.15, + title: 'Games', + icon: Icons.groups_rounded, + value: count, + ); + }, ), SizedBox(width: constraints.maxWidth * 0.05), - QuickInfoTile( - width: constraints.maxWidth * 0.45, - height: constraints.maxHeight * 0.15, - title: 'Groups', - icon: Icons.groups_rounded, - value: 5, + FutureBuilder( + future: _groupCountFuture, + builder: (context, snapshot) { + final int count = + (snapshot.connectionState == ConnectionState.done && + snapshot.hasData) + ? snapshot.data! + : 0; + return QuickInfoTile( + width: constraints.maxWidth * 0.45, + height: constraints.maxHeight * 0.15, + title: 'Groups', + icon: Icons.groups_rounded, + value: count, + ); + }, ), ], ), From 40f9ff6413bdd15f9cbd56cf7e910488f67ebe39 Mon Sep 17 00:00:00 2001 From: Felix Kirchner Date: Tue, 11 Nov 2025 21:16:35 +0100 Subject: [PATCH 62/62] Updated padding --- lib/presentation/views/main_menu/home_view.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/presentation/views/main_menu/home_view.dart b/lib/presentation/views/main_menu/home_view.dart index 42cb822..141af77 100644 --- a/lib/presentation/views/main_menu/home_view.dart +++ b/lib/presentation/views/main_menu/home_view.dart @@ -70,7 +70,7 @@ class _HomeViewState extends State { ], ), Padding( - padding: const EdgeInsets.symmetric(vertical: 24.0), + padding: const EdgeInsets.symmetric(vertical: 16.0), child: InfoTile( width: constraints.maxWidth * 0.95, title: 'Recent Games',