From 6dce78543eb42ddf26926310a1aadf6f41e75856 Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Thu, 16 May 2024 23:48:36 +0200 Subject: [PATCH 1/7] feat: create AppConfig class --- lib/src/app/presentation/widgets/app.dart | 1 + lib/src/core/constants/app_config.dart | 20 ++++++++++++++++++++ lib/src/core/constants/app_url.dart | 10 ---------- lib/src/core/constants/constants.dart | 2 +- lib/src/core/l10n/arb/app_en.arb | 2 +- pubspec.yaml | 2 +- 6 files changed, 24 insertions(+), 13 deletions(-) create mode 100644 lib/src/core/constants/app_config.dart delete mode 100644 lib/src/core/constants/app_url.dart diff --git a/lib/src/app/presentation/widgets/app.dart b/lib/src/app/presentation/widgets/app.dart index a4538be..b502ffe 100644 --- a/lib/src/app/presentation/widgets/app.dart +++ b/lib/src/app/presentation/widgets/app.dart @@ -36,6 +36,7 @@ class _AppView extends StatelessWidget { return switch (state) { AppInitializing() => const SizedBox.shrink(), AppInitialized() => MaterialApp( + title: AppConfig.appName, debugShowCheckedModeBanner: false, localizationsDelegates: AppLocalizations.localizationsDelegates, supportedLocales: AppLocalizations.supportedLocales, diff --git a/lib/src/core/constants/app_config.dart b/lib/src/core/constants/app_config.dart new file mode 100644 index 0000000..86c76c9 --- /dev/null +++ b/lib/src/core/constants/app_config.dart @@ -0,0 +1,20 @@ +// Copyright 2024 BBK Development. All rights reserved. +// Use of this source code is governed by a GPL-style license that can be found +// in the LICENSE file. + +/// A class that provides constant app-wide configuration values. +abstract final class AppConfig { + /// Returns the name of the app. + static const appName = 'VMerge'; + + /// Returns the version of the app. + static const supportEmail = 'support@bbkdevelopment.com'; + + /// Returns the privacy policy URL. + static const privacyPolicy = + 'https://www.bbkdevelopment.com/apps/vmerge/privacy-policy'; + + /// Returns the terms and conditions URL. + static const termsAndConditions = + 'https://www.bbkdevelopment.com/apps/vmerge/terms-and-conditions'; +} diff --git a/lib/src/core/constants/app_url.dart b/lib/src/core/constants/app_url.dart deleted file mode 100644 index 2a7b458..0000000 --- a/lib/src/core/constants/app_url.dart +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2021 BBK Development. All rights reserved. -// Use of this source code is governed by a GPL-style license that can be found -// in the LICENSE file. - -abstract final class AppUrl { - static const privacyPolicy = - 'https://www.bbkdevelopment.com/apps/vmerge/privacy-policy'; - static const termsAndConditions = - 'https://www.bbkdevelopment.com/apps/vmerge/terms-and-conditions'; -} diff --git a/lib/src/core/constants/constants.dart b/lib/src/core/constants/constants.dart index 4c4b250..be2596e 100644 --- a/lib/src/core/constants/constants.dart +++ b/lib/src/core/constants/constants.dart @@ -5,7 +5,7 @@ export 'app_animation_duration.dart'; export 'app_border_radius.dart'; export 'app_button_size.dart'; +export 'app_config.dart'; export 'app_icon_size.dart'; export 'app_main_color.dart'; export 'app_padding.dart'; -export 'app_url.dart'; diff --git a/lib/src/core/l10n/arb/app_en.arb b/lib/src/core/l10n/arb/app_en.arb index b7f610e..39cafcb 100644 --- a/lib/src/core/l10n/arb/app_en.arb +++ b/lib/src/core/l10n/arb/app_en.arb @@ -31,7 +31,7 @@ "darkMode": "Dark Mode", "discardChanges": "Discard changes", "done": "Done", - "doneMessage": "The video has been successfully saved to your device!", + "doneMessage": "1", "exceptionDetail": "Exception Detail", "error": "Error", "errorMessage": "An error occurred while merging the videos. Please try again!", diff --git a/pubspec.yaml b/pubspec.yaml index 3f40a28..9e60dba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: vmerge description: A video merger app created by BBK Development. -version: 2.0.0+7 +version: 2.0.0+8 publish_to: none environment: From 198df5595216722a1ad06b30648220c5d852c37c Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Thu, 16 May 2024 23:49:06 +0200 Subject: [PATCH 2/7] fix: replace old contact email address --- .../more/presentation/widgets/more_page_option.dart | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/src/features/more/presentation/widgets/more_page_option.dart b/lib/src/features/more/presentation/widgets/more_page_option.dart index 872132f..8bcc8e4 100644 --- a/lib/src/features/more/presentation/widgets/more_page_option.dart +++ b/lib/src/features/more/presentation/widgets/more_page_option.dart @@ -53,8 +53,8 @@ class _MorePageOption extends StatelessWidget { .sendEmail( emailUri: Uri( scheme: 'mailto', - path: 'info@bbkdevelopment.com', - queryParameters: {'subject': 'VMerge'}, + path: AppConfig.supportEmail, + queryParameters: {'subject': AppConfig.appName}, ), ) .onError((error, stackTrace) { @@ -66,7 +66,7 @@ class _MorePageOption extends StatelessWidget { }); case MorePageOption.termsAndConditions: getIt() - .launch(url: Uri.parse(AppUrl.termsAndConditions)) + .launch(url: Uri.parse(AppConfig.termsAndConditions)) .onError((error, stackTrace) { context.read().caught( message: l10n.couldNotOpenTermsAndConditionsMessage, @@ -76,7 +76,7 @@ class _MorePageOption extends StatelessWidget { }); case MorePageOption.privacyPolicy: getIt() - .launch(url: Uri.parse(AppUrl.privacyPolicy)) + .launch(url: Uri.parse(AppConfig.privacyPolicy)) .onError((error, stackTrace) { context.read().caught( message: l10n.couldNotOpenPrivacyPolicyMessage, From 92f1b1e12b24a7dc28f505a98fd121f65c47b4ae Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Fri, 17 May 2024 00:12:37 +0200 Subject: [PATCH 3/7] build: update dart sdk constraints --- lib/src/core/l10n/arb/app_en.arb | 2 +- pubspec.lock | 2 +- pubspec.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/core/l10n/arb/app_en.arb b/lib/src/core/l10n/arb/app_en.arb index 39cafcb..b7f610e 100644 --- a/lib/src/core/l10n/arb/app_en.arb +++ b/lib/src/core/l10n/arb/app_en.arb @@ -31,7 +31,7 @@ "darkMode": "Dark Mode", "discardChanges": "Discard changes", "done": "Done", - "doneMessage": "1", + "doneMessage": "The video has been successfully saved to your device!", "exceptionDetail": "Exception Detail", "error": "Error", "errorMessage": "An error occurred while merging the videos. Please try again!", diff --git a/pubspec.lock b/pubspec.lock index e6ccf7b..f7a0996 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1206,5 +1206,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0 <4.0.0" + dart: ">=3.3.0 <3.4.0" flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index 9e60dba..7eccf56 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,7 @@ version: 2.0.0+8 publish_to: none environment: - sdk: '>=3.3.0 <4.0.0' + sdk: '>=3.3.0 <3.4.0' dependencies: android_intent_plus: ^5.0.2 From c7a3a17be264bcafa6823d6163bb512af832efde Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Fri, 17 May 2024 00:15:31 +0200 Subject: [PATCH 4/7] refactor: update contact email address --- lib/src/core/constants/app_config.dart | 4 ++-- .../features/more/presentation/widgets/more_page_option.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/src/core/constants/app_config.dart b/lib/src/core/constants/app_config.dart index 86c76c9..443edde 100644 --- a/lib/src/core/constants/app_config.dart +++ b/lib/src/core/constants/app_config.dart @@ -7,8 +7,8 @@ abstract final class AppConfig { /// Returns the name of the app. static const appName = 'VMerge'; - /// Returns the version of the app. - static const supportEmail = 'support@bbkdevelopment.com'; + /// Returns the contact email address. + static const contactEmail = 'hello@bbkdevelopment.com'; /// Returns the privacy policy URL. static const privacyPolicy = diff --git a/lib/src/features/more/presentation/widgets/more_page_option.dart b/lib/src/features/more/presentation/widgets/more_page_option.dart index 8bcc8e4..9c5219a 100644 --- a/lib/src/features/more/presentation/widgets/more_page_option.dart +++ b/lib/src/features/more/presentation/widgets/more_page_option.dart @@ -53,7 +53,7 @@ class _MorePageOption extends StatelessWidget { .sendEmail( emailUri: Uri( scheme: 'mailto', - path: AppConfig.supportEmail, + path: AppConfig.contactEmail, queryParameters: {'subject': AppConfig.appName}, ), ) From 125974db3dc55ab11132690763e81259e8bf2a16 Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Fri, 17 May 2024 00:21:24 +0200 Subject: [PATCH 5/7] build: update sdk constraints --- pubspec.lock | 2 +- pubspec.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index f7a0996..e6ccf7b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1206,5 +1206,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0 <3.4.0" + dart: ">=3.3.0 <4.0.0" flutter: ">=3.19.0" diff --git a/pubspec.yaml b/pubspec.yaml index 7eccf56..9f814c6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -4,7 +4,8 @@ version: 2.0.0+8 publish_to: none environment: - sdk: '>=3.3.0 <3.4.0' + sdk: '>=3.3.0 <4.0.0' + flutter: '>=3.19.0 <3.22.0' dependencies: android_intent_plus: ^5.0.2 From 31a2090b2b532275e3d4cace6436db1ffa897c88 Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Fri, 17 May 2024 00:23:27 +0200 Subject: [PATCH 6/7] build: remove flutter sdk constraints --- pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 9f814c6..9e60dba 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,6 @@ publish_to: none environment: sdk: '>=3.3.0 <4.0.0' - flutter: '>=3.19.0 <3.22.0' dependencies: android_intent_plus: ^5.0.2 From a51153e5b11e33d18aa6fb77ffce8ad56a11b3ff Mon Sep 17 00:00:00 2001 From: Bulent Baris Kilic Date: Fri, 17 May 2024 00:39:57 +0200 Subject: [PATCH 7/7] build(deps): modify intl version as any --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 9e60dba..16988b7 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: flutter_svg: ^2.0.10+1 get_it: ^7.7.0 image_gallery_saver: ^2.0.3 - intl: ^0.18.1 + intl: any launch_review_service: git: url: https://github.com/BBKDevelopment/Launch-Review-Service.git