Skip to content
Merged
Show file tree
Hide file tree
Changes from 13 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
1 change: 1 addition & 0 deletions .idea/runConfigurations/melos_bootstrap.xml

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

1 change: 1 addition & 0 deletions .idea/runConfigurations/melos_clean.xml

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

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_analyze.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_asset_gen.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_build_apk.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_build_bundle.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_build_ipa.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_build_runner.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_format.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_go_ios_go.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_locale_gen.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/runConfigurations/melos_run_widgetbook_gen.xml

This file was deleted.

6 changes: 3 additions & 3 deletions apps/app_core/android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {

android {
namespace = "com.flutter.boilerplate.app"
compileSdk = 35
compileSdk = 36
ndkVersion = "29.0.13113456 rc1"

compileOptions {
Expand All @@ -23,7 +23,7 @@ android {

defaultConfig {
applicationId = "com.flutter.boilerplate.app"
minSdk = 23
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
Expand Down Expand Up @@ -64,4 +64,4 @@ flutter {
dependencies {
implementation(platform("com.google.firebase:firebase-bom:33.8.0"))
implementation("com.google.firebase:firebase-analytics")
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,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.11.1-all.zip
2 changes: 1 addition & 1 deletion apps/app_core/android/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pluginManagement {

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.7.0" apply false
id("com.android.application") version "8.9.1" apply false
id("org.jetbrains.kotlin.android") version "2.0.0" apply false
id("com.google.gms.google-services") version "4.4.2" apply false
}
Expand Down
6 changes: 4 additions & 2 deletions apps/app_core/lib/app/app.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'dart:async';

import 'package:app_core/app/config/app_config.dart';
import 'package:app_core/app/helpers/injection.dart';
import 'package:app_core/app/routes/app_router.dart';
Expand Down Expand Up @@ -121,10 +123,10 @@ class _AppState extends State<App> {
}

@override
void dispose() {
void dispose() {
NetWorkInfoService.instance.dispose();
_connectivityService.dispose();
getIt<NotificationServiceInterface>().dispose();
unawaited(getIt<NotificationServiceInterface>().dispose());
super.dispose();
}
}
4 changes: 2 additions & 2 deletions apps/app_core/lib/app/helpers/injection.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ import 'package:get_it/get_it.dart';

final GetIt getIt = GetIt.instance;

final userApiClient = getIt.get<RestApiClient>(instanceName: 'user');
final RestApiClient userApiClient = getIt.get<RestApiClient>(instanceName: 'user');

final baseApiClient = getIt.get<RestApiClient>(instanceName: 'base');
final RestApiClient baseApiClient = getIt.get<RestApiClient>(instanceName: 'base');
1 change: 0 additions & 1 deletion apps/app_core/lib/app/observers/app_bloc_observer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ final class AppBlocObserver extends BlocObserver {
super.onChange(bloc, change);
if (kDebugMode) {
logger
// ignore: avoid_dynamic_calls
.f(
'onChange(${bloc.runtimeType}, ${change.nextState.runtimeType})',
);
Expand Down
2 changes: 1 addition & 1 deletion apps/app_core/lib/app/routes/app_router.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import 'package:flutter/cupertino.dart';
part 'app_router.gr.dart';

/// [Doc Link](https://codelabs-preview.appspot.com/?file_id=1BDawGTK-riXb-PjwFCCqjwZ74yhdzFapw9kT2yJnp88#6)
@AutoRouterConfig(replaceInRouteName: 'Page|Screen,Route')
@AutoRouterConfig()
class AppRouter extends RootStackRouter {
@override
List<AutoRoute> get routes => [
Expand Down
1 change: 0 additions & 1 deletion apps/app_core/lib/bootstrap.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: require_trailing_commas
import 'dart:async';

import 'package:api_client/api_client.dart';
Expand Down
1 change: 0 additions & 1 deletion apps/app_core/lib/core/data/models/pagination_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import 'package:equatable/equatable.dart';

// ignore: must_be_immutable
class PaginationModel extends Equatable {
const PaginationModel({this.currentPage, this.hasMorePages, this.total});

Expand Down
1 change: 0 additions & 1 deletion apps/app_core/lib/core/data/services/media.service.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: constant_identifier_names

import 'dart:io';
import 'package:image_picker/image_picker.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class _ForceUpdateWidgetState extends State<ForceUpdateWidget>
await widget.showStoreListing(storeUrl);
} else if (success == false) {
// * user clicked on the cancel button
} else if (success == null && allowCancel == false) {
} else if (success == null && !allowCancel) {
// * user clicked on the Android back button: show alert again
return _triggerForceUpdate(storeUrl, allowCancel);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: require_trailing_commas
import 'package:api_client/api_client.dart';
import 'package:app_core/app/config/api_endpoints.dart';
import 'package:app_core/app/helpers/injection.dart';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class SignInBloc extends Bloc<SignInEvent, SignInState> {
on<SignInWithGoogleTaped>(_onSignInWithGoogleTaped);
}

// ignore: unused_field
final IAuthRepository _authenticationRepository;

void _onEmailChanged(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: public_member_api_docs, sort_constructors_first
part of 'sign_up_bloc.dart';

final class SignUpState extends Equatable {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: one_member_abstracts

import 'package:api_client/api_client.dart';
import 'package:app_core/app/config/api_endpoints.dart';
Expand Down
1 change: 0 additions & 1 deletion apps/app_core/lib/modules/profile/bloc/profile_state.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: public_member_api_docs, sort_constructors_first
part of 'profile_cubit.dart';

enum ProfileActionStatus {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: require_trailing_commas
import 'dart:io';
import 'dart:math';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore_for_file: unused_element

import 'package:api_client/api_client.dart';
import 'package:app_core/core/presentation/widgets/app_snackbar.dart';
Expand Down Expand Up @@ -41,7 +40,7 @@ class EditProfileScreen extends StatelessWidget implements AutoRouteWrapper {
showAppSnackbar(context, state.errorMessage, type: SnackbarType.failed);
} else if (state.profileActionStatus == ProfileActionStatus.profileEdited) {
showAppSnackbar(context, context.t.profile_edit_success);
} else if ((state.isPermissionDenied ?? false) == true) {
} else if (state.isPermissionDenied ?? false) {
showAppSnackbar(
context,
context.t.please_unable_media_permission,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SubscriptionCubit extends Cubit<SubscriptionState> {

final SubscriptionRepository repository;
final BuildContext context;
final _inAppPurchase = getIt<CustomInAppPurchase>();
final CustomInAppPurchase _inAppPurchase = getIt<CustomInAppPurchase>();

void togglePlanType(PlanType planType) {
emit(state.copyWith(planType: planType));
Expand Down
Loading