Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ app.*.map.json
.vscode/settings.json
devtools_options.yaml
lib/versioning/build_version.dart


# macOS Flutter ephemeral files
/macos/Flutter/ephemeral
8 changes: 4 additions & 4 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) {

android {
namespace "dev.flutterconke.fluttercon"
compileSdkVersion 35
compileSdkVersion 36
ndkVersion flutter.ndkVersion

compileOptions {
Expand All @@ -53,8 +53,8 @@ android {

defaultConfig {
applicationId "dev.flutterconke.app"
minSdkVersion 23
targetSdkVersion 35
minSdkVersion flutter.minSdkVersion
targetSdkVersion 36
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
Expand Down Expand Up @@ -115,6 +115,6 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20"
implementation 'com.google.guava:guava:31.1-android'
implementation 'com.google.guava:guava:33.5.0-android'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.5'
}
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
8 changes: 4 additions & 4 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '8.7.3' apply false
id 'com.android.application' version '8.13.0' apply false
// START: FlutterFire Configuration
id "com.google.gms.google-services" version "4.4.2" apply false
id "com.google.firebase.crashlytics" version "2.8.1" apply false
id "com.google.gms.google-services" version "4.4.3" apply false
id "com.google.firebase.crashlytics" version "3.0.6" apply false
// END: FlutterFire Configuration
id "org.jetbrains.kotlin.android" version "2.0.20" apply false
id "org.jetbrains.kotlin.android" version "2.2.20" apply false
}

include ":app"
103 changes: 45 additions & 58 deletions lib/bootstrap.dart
Original file line number Diff line number Diff line change
Expand Up @@ -69,77 +69,65 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
create: (_) => GoogleSignInCubit(authRepository: getIt()),
),
BlocProvider(
create:
(_) => FetchOrganisersCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (_) => FetchOrganisersCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
),
BlocProvider<SocialAuthSignInCubit>(
create:
(_) => SocialAuthSignInCubit(
authRepository: getIt(),
hiveRepository: getIt(),
),
create: (_) => SocialAuthSignInCubit(
authRepository: getIt(),
hiveRepository: getIt(),
),
),
BlocProvider<LogOutCubit>(
create:
(_) => LogOutCubit(
authRepository: getIt(),
hiveRepository: getIt(),
dbRepository: getIt(),
),
create: (_) => LogOutCubit(
authRepository: getIt(),
hiveRepository: getIt(),
dbRepository: getIt(),
),
),
BlocProvider<FetchFeedCubit>(
create:
(_) => FetchFeedCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (_) =>
FetchFeedCubit(apiRepository: getIt(), dBRepository: getIt()),
),
BlocProvider<FetchSponsorsCubit>(
create:
(context) => FetchSponsorsCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (context) => FetchSponsorsCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
),
BlocProvider<FetchSessionsCubit>(
create:
(context) => FetchSessionsCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (context) => FetchSessionsCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
),
BlocProvider<FetchGroupedSessionsCubit>(
create:
(context) => FetchGroupedSessionsCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (context) => FetchGroupedSessionsCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
),
BlocProvider<FetchSpeakersCubit>(
create:
(context) => FetchSpeakersCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (context) => FetchSpeakersCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
),
BlocProvider<FetchIndividualOrganisersCubit>(
create:
(context) => FetchIndividualOrganisersCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
create: (context) => FetchIndividualOrganisersCubit(
apiRepository: getIt(),
dBRepository: getIt(),
),
),
BlocProvider<BookmarkSessionCubit>(
create:
(context) => BookmarkSessionCubit(
apiRepository: getIt(),
dBRepository: getIt(),
notificationService: getIt(),
hiveRepository: getIt(),
),
create: (context) => BookmarkSessionCubit(
apiRepository: getIt(),
dBRepository: getIt(),
notificationService: getIt(),
hiveRepository: getIt(),
),
),
BlocProvider<ShareFeedPostCubit>(
create: (context) => ShareFeedPostCubit(shareRepository: getIt()),
Expand All @@ -148,11 +136,10 @@ Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
create: (context) => SendFeedbackCubit(apiRepository: getIt()),
),
BlocProvider<GhostSignInCubit>(
create:
(context) => GhostSignInCubit(
authRepository: getIt(),
hiveRepository: getIt(),
),
create: (context) => GhostSignInCubit(
authRepository: getIt(),
hiveRepository: getIt(),
),
),
BlocProvider<SearchCubit>(
create: (context) => SearchCubit(dbRepository: getIt()),
Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/auth.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'auth.freezed.dart';
part 'auth.g.dart';

@freezed
class FlutterConUser with _$FlutterConUser {
abstract class FlutterConUser with _$FlutterConUser {
const factory FlutterConUser(
String name,
String email,
Expand All @@ -17,7 +17,7 @@ class FlutterConUser with _$FlutterConUser {
}

@freezed
class AuthResult with _$AuthResult {
abstract class AuthResult with _$AuthResult {
const factory AuthResult({
required String token,
required FlutterConUser user,
Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/feed.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'feed.freezed.dart';
part 'feed.g.dart';

@freezed
class Feed with _$Feed {
abstract class Feed with _$Feed {
factory Feed({
required String title,
required String body,
Expand All @@ -18,7 +18,7 @@ class Feed with _$Feed {
}

@freezed
class FeedResponse with _$FeedResponse {
abstract class FeedResponse with _$FeedResponse {
const factory FeedResponse({required List<Feed> data}) = _FeedResponse;

factory FeedResponse.fromJson(Map<String, Object?> json) =>
Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/feedback_dto.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'feedback_dto.freezed.dart';
part 'feedback_dto.g.dart';

@freezed
class FeedbackDTO with _$FeedbackDTO {
abstract class FeedbackDTO with _$FeedbackDTO {
factory FeedbackDTO({
required String feedback,
required int rating,
Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/local/local_feed.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:isar/isar.dart';
import 'package:isar_community/isar.dart';

part 'local_feed.g.dart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:isar/isar.dart';
import 'package:isar_community/isar.dart';

part 'local_individual_organiser.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/local/local_organiser.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:isar/isar.dart';
import 'package:isar_community/isar.dart';

part 'local_organiser.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/local/local_session.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:isar/isar.dart';
import 'package:isar_community/isar.dart';

part 'local_session.g.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/local/local_speaker.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:isar/isar.dart';
import 'package:isar_community/isar.dart';

part 'local_speaker.g.dart';

Expand Down
3 changes: 1 addition & 2 deletions lib/common/data/models/local/local_sponsor.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import 'package:fluttercon/common/data/enums/sponsor_type.dart';
import 'package:isar/isar.dart';

import 'package:isar_community/isar.dart';
part 'local_sponsor.g.dart';

@collection
Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/meta.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'meta.freezed.dart';
part 'meta.g.dart';

@freezed
class Paginator with _$Paginator {
abstract class Paginator with _$Paginator {
factory Paginator({
required int count,
@JsonKey(name: 'per_page') required int perPage,
Expand All @@ -20,7 +20,7 @@ class Paginator with _$Paginator {
}

@freezed
class Meta with _$Meta {
abstract class Meta with _$Meta {
factory Meta({required Paginator paginator}) = _Meta;

factory Meta.fromJson(Map<String, dynamic> json) => _$MetaFromJson(json);
Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/organisers.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'organisers.g.dart';
part 'organisers.freezed.dart';

@freezed
class Organiser with _$Organiser {
abstract class Organiser with _$Organiser {
factory Organiser({
@JsonKey(name: 'photo') required String logo,
required String name,
Expand All @@ -19,7 +19,7 @@ class Organiser with _$Organiser {
}

@freezed
class OrganiserResponse with _$OrganiserResponse {
abstract class OrganiserResponse with _$OrganiserResponse {
const factory OrganiserResponse({required List<Organiser> data}) =
_OrganiserResponse;

Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/remote_config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'remote_config.freezed.dart';
part 'remote_config.g.dart';

@freezed
class RemoteConfig with _$RemoteConfig {
abstract class RemoteConfig with _$RemoteConfig {
factory RemoteConfig({
@JsonKey(name: 'app_version') required String appVersion,
@JsonKey(name: 'is_in_review') required bool isInReview,
Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/room.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ part 'room.freezed.dart';
part 'room.g.dart';

@freezed
class Room with _$Room {
abstract class Room with _$Room {
factory Room({required int id, required String title}) = _Room;

factory Room.fromJson(Map<String, Object?> json) => _$RoomFromJson(json);
}

@freezed
class RoomResponse with _$RoomResponse {
abstract class RoomResponse with _$RoomResponse {
const factory RoomResponse({required List<Room> data}) = _RoomResponse;

factory RoomResponse.fromJson(Map<String, Object?> json) =>
Expand Down
2 changes: 1 addition & 1 deletion lib/common/data/models/search_result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:freezed_annotation/freezed_annotation.dart';
part 'search_result.freezed.dart';

@freezed
class SearchResult with _$SearchResult {
abstract class SearchResult with _$SearchResult {
const factory SearchResult({
required String title,
required String subtitle,
Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/session.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ part 'session.freezed.dart';
part 'session.g.dart';

@freezed
class Session with _$Session {
abstract class Session with _$Session {
factory Session(
int id,
String title,
Expand Down Expand Up @@ -34,7 +34,7 @@ class Session with _$Session {
}

@freezed
class SessionResponse with _$SessionResponse {
abstract class SessionResponse with _$SessionResponse {
const factory SessionResponse({required List<Session> data}) =
_SessionResponse;

Expand Down
4 changes: 2 additions & 2 deletions lib/common/data/models/speaker.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ part 'speaker.freezed.dart';
part 'speaker.g.dart';

@freezed
class Speaker with _$Speaker {
abstract class Speaker with _$Speaker {
const factory Speaker({
required String name,
required String biography,
Expand All @@ -23,7 +23,7 @@ class Speaker with _$Speaker {
}

@freezed
class SpeakerResponse with _$SpeakerResponse {
abstract class SpeakerResponse with _$SpeakerResponse {
const factory SpeakerResponse({required List<Speaker> data}) =
_SpeakerResponse;

Expand Down
Loading