Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion .fvmrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"flutter": "3.38.7"
"flutter": "3.41.1"
}
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}
},
"dart.flutterGenerateLocalizationsOnSave": "all",
"dart.flutterSdkPath": ".fvm/versions/3.38.7",
"dart.flutterSdkPath": ".fvm/versions/3.41.1",
"dart.debugExternalPackageLibraries": false,
"dart.debugSdkLibraries": false,
"dart.experimentalRefactors": true,
Expand Down
2 changes: 1 addition & 1 deletion packages/convenient_widgets/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"
version: 1.0.0

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/core/authenticator/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
resolution: workspace

environment:
sdk: ^3.10.7
sdk: ^3.11.0

dependencies:
collection: ^1.18.0
Expand Down
2 changes: 1 addition & 1 deletion packages/core/configurator/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ false_secrets:
- example/**

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/core/messenger/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ false_secrets:
- example/**

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/core/tracker/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ false_secrets:
- example/**

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
30 changes: 16 additions & 14 deletions packages/core/utils/lib/src/result/result.dart
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,13 @@ final class Failure<T> extends Result<T> {
extension ResultExtension<T> on Result<T> {
/// Get the data when successful (null when failed)
T? get dataOrNull => switch (this) {
Success(data: final data) => data,
Success(:final data) => data,
_ => null,
};

/// Get the error (null when successful)
AppError? get errorOrNull => switch (this) {
Failure(appError: final appError) => appError,
Failure(:final appError) => appError,
_ => null,
};

Expand All @@ -86,15 +86,17 @@ extension ResultExtension<T> on Result<T> {

/// Get the data when successful (throw exception when failed)
T get requireData => switch (this) {
Success(data: final data) => data,
Failure(appError: final appError, stackTrace: final stackTrace) =>
Error.throwWithStackTrace(appError, stackTrace ?? StackTrace.current),
Success(:final data) => data,
Failure(:final appError, :final stackTrace) => Error.throwWithStackTrace(
appError,
stackTrace ?? StackTrace.current,
),
};

/// Execute the success callback
Result<U> map<U>(U Function(T data) mapper) => switch (this) {
Success(data: final data) => Success(mapper(data)),
Failure(appError: final appError, stackTrace: final stackTrace) => Failure(
Success(:final data) => Success(mapper(data)),
Failure(:final appError, :final stackTrace) => Failure(
appError,
stackTrace,
),
Expand All @@ -104,8 +106,8 @@ extension ResultExtension<T> on Result<T> {
Future<Result<U>> mapAsync<U>(
Future<U> Function(T data) mapper,
) async => switch (this) {
Success(data: final data) => Success(await mapper(data)),
Failure(appError: final appError, stackTrace: final stackTrace) => Failure(
Success(:final data) => Success(await mapper(data)),
Failure(:final appError, :final stackTrace) => Failure(
appError,
stackTrace,
),
Expand All @@ -114,16 +116,16 @@ extension ResultExtension<T> on Result<T> {
/// Execute the failure callback
Result<T> catchError(T Function(AppError appError) handler) => switch (this) {
Success() => this,
Failure(appError: final appError) => Success(handler(appError)),
Failure(:final appError) => Success(handler(appError)),
};

/// Implementation of when for pattern matching
U when<U>({
required U Function(T data) success,
required U Function(AppError appError, StackTrace? stackTrace) failure,
}) => switch (this) {
Success(data: final data) => success(data),
Failure(appError: final appError, stackTrace: final stackTrace) => failure(
Success(:final data) => success(data),
Failure(:final appError, :final stackTrace) => failure(
appError,
stackTrace,
),
Expand All @@ -135,8 +137,8 @@ extension ResultExtension<T> on Result<T> {
U Function(AppError appError, StackTrace? stackTrace)? failure,
required U Function() orElse,
}) => switch (this) {
Success(data: final data) => success?.call(data) ?? orElse(),
Failure(appError: final appError, stackTrace: final stackTrace) =>
Success(:final data) => success?.call(data) ?? orElse(),
Failure(:final appError, :final stackTrace) =>
failure?.call(appError, stackTrace) ?? orElse(),
};
}
5 changes: 1 addition & 4 deletions packages/core/utils/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@ name: utils
description: "Utilities."
publish_to: "none"
version: 1.0.0
homepage:

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand All @@ -22,5 +21,3 @@ dev_dependencies:
altive_lints: ^2.1.0
flutter_test:
sdk: flutter

flutter:
2 changes: 0 additions & 2 deletions packages/flutter_app/ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,5 @@
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>13.0</string>
</dict>
</plist>

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

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

9 changes: 6 additions & 3 deletions packages/flutter_app/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import UIKit
import Flutter
import UIKit

@main
@objc class AppDelegate: FlutterAppDelegate {
@objc class AppDelegate: FlutterAppDelegate, FlutterImplicitEngineDelegate {
override func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}

func didInitializeImplicitFlutterEngine(_ engineBridge: FlutterImplicitEngineBridge) {
GeneratedPluginRegistrant.register(with: engineBridge.pluginRegistry)
}
}
21 changes: 21 additions & 0 deletions packages/flutter_app/ios/Runner/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,27 @@
<string>Use the camera to save photos.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>Use the photo library to store your photos.</string>
<key>UIApplicationSceneManifest</key>
<dict>
<key>UIApplicationSupportsMultipleScenes</key>
<false/>
<key>UISceneConfigurations</key>
<dict>
<key>UIWindowSceneSessionRoleApplication</key>
<array>
<dict>
<key>UISceneClassName</key>
<string>UIWindowScene</string>
<key>UISceneConfigurationName</key>
<string>flutter</string>
<key>UISceneDelegateClassName</key>
<string>FlutterSceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
</dict>
</array>
</dict>
</dict>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
<key>UIBackgroundModes</key>
Expand Down
2 changes: 1 addition & 1 deletion packages/flutter_app/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ publish_to: "none"
version: 1.0.0+32

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/pub_dev_api_client/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: Pub.dev API client package
version: 1.0.0

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/themes/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ version: 1.0.0
publish_to: "none"

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/util/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ version: 1.0.0
homepage: https://github.com/altive/flutter_app_template/tree/main/packages/util

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
2 changes: 1 addition & 1 deletion packages/widget_catalog/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ publish_to: "none"
version: 1.0.0

environment:
sdk: ^3.10.7
sdk: ^3.11.0

resolution: workspace

Expand Down
Loading
Loading