From be412665318ab2d9afe1913b10dbfd33c9724a2f Mon Sep 17 00:00:00 2001 From: Vitaliy Zarubin Date: Tue, 10 Oct 2023 15:10:59 +0300 Subject: [PATCH] [plugin] Update wakelock to wakelock_plus --- README.md | 2 +- example/lib/l10n/app_en.arb | 2 +- example/lib/l10n/app_ru.arb | 2 +- example/lib/packages/packages.dart | 4 +- .../{wakelock => wakelock_plus}/model.dart | 16 ++++---- .../{wakelock => wakelock_plus}/package.dart | 12 +++--- .../{wakelock => wakelock_plus}/page.dart | 20 +++++----- example/pubspec.yaml | 18 +++------ packages/wakelock/wakelock_aurora/README.md | 37 ------------------- .../wakelock_plus_aurora}/.gitignore | 0 .../wakelock_plus_aurora/README.md | 32 ++++++++++++++++ .../analysis_options.yaml | 0 .../data/com.nokia.mce.request.xml | 0 .../lib/com_nokia_mce_request.dart | 0 .../lib/wakelock_plus_aurora.dart} | 6 +-- .../wakelock_plus_aurora}/pubspec.yaml | 8 ++-- 16 files changed, 74 insertions(+), 85 deletions(-) rename example/lib/packages/{wakelock => wakelock_plus}/model.dart (64%) rename example/lib/packages/{wakelock => wakelock_plus}/package.dart (72%) rename example/lib/packages/{wakelock => wakelock_plus}/page.dart (83%) delete mode 100644 packages/wakelock/wakelock_aurora/README.md rename packages/{wakelock/wakelock_aurora => wakelock_plus/wakelock_plus_aurora}/.gitignore (100%) create mode 100644 packages/wakelock_plus/wakelock_plus_aurora/README.md rename packages/{wakelock/wakelock_aurora => wakelock_plus/wakelock_plus_aurora}/analysis_options.yaml (100%) rename packages/{wakelock/wakelock_aurora => wakelock_plus/wakelock_plus_aurora}/data/com.nokia.mce.request.xml (100%) rename packages/{wakelock/wakelock_aurora => wakelock_plus/wakelock_plus_aurora}/lib/com_nokia_mce_request.dart (100%) rename packages/{wakelock/wakelock_aurora/lib/wakelock_aurora.dart => wakelock_plus/wakelock_plus_aurora/lib/wakelock_plus_aurora.dart} (80%) rename packages/{wakelock/wakelock_aurora => wakelock_plus/wakelock_plus_aurora}/pubspec.yaml (63%) diff --git a/README.md b/README.md index eed6f30..2c56916 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ | [path_provider_aurora](https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/path_provider/path_provider_aurora) | `0.0.1` | [path_provider](https://pub.dev/packages/path_provider) | `2.1.1` | `4.0.2.269` | | [shared_preferences_aurora](https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/shared_preferences/shared_preferences_aurora) | `0.0.1` | [shared_preferences](https://pub.dev/packages/shared_preferences) | `2.1.2` | `4.0.2.269` | | [sqflite_aurora](https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/sqflite/sqflite_aurora) | `0.0.1` | [sqflite](https://pub.dev/packages/sqflite) | `2.3.0` | `4.0.2.269` | -| [wakelock_aurora](https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/wakelock/wakelock_aurora) | `0.0.1` | [wakelock](https://pub.dev/packages/wakelock) | `fork` | `4.0.2.269` | +| [wakelock_plus_aurora](https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/wakelock_plus/wakelock_plus_aurora) | `0.0.1` | [wakelock_plus](https://pub.dev/packages/wakelock_plus) | `1.1.1` | `4.0.2.269` | | [xdga_directories](https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/xdga_directories) | `0.0.1` | - | - | `4.0.2.269` | | - | - | [flutter_cache_manager](https://pub.dev/packages/flutter_cache_manager) | `3.3.1` | `4.0.2.269` | | - | - | [cached_network_image](https://pub.dev/packages/cached_network_image) | `3.3.0` | `4.0.2.269` | diff --git a/example/lib/l10n/app_en.arb b/example/lib/l10n/app_en.arb index 2647a5f..857b8d2 100644 --- a/example/lib/l10n/app_en.arb +++ b/example/lib/l10n/app_en.arb @@ -169,7 +169,7 @@ }, "@_WAKELOCK": {}, - "wakelockTitle": "Wakelock", + "wakelockTitle": "Lock", "wakelockDesc": "The plugin allows you to enable and toggle the screen wakelock, which prevents the screen from turning off automatically.", "@_XDGA_DIRECTORIES": {}, diff --git a/example/lib/l10n/app_ru.arb b/example/lib/l10n/app_ru.arb index 89c7f69..beec8aa 100644 --- a/example/lib/l10n/app_ru.arb +++ b/example/lib/l10n/app_ru.arb @@ -161,7 +161,7 @@ "sharedPreferencesFieldError": "Пожалуйста, введите {value} значение", "@_WAKELOCK": {}, - "wakelockTitle": "Wakelock", + "wakelockTitle": "Блокировка", "wakelockDesc": "Плагин позволяет включать и переключать блокировку экрана, которая предотвращает автоматическое выключение экрана.", "@_XDGA_DIRECTORIES": {}, diff --git a/example/lib/packages/packages.dart b/example/lib/packages/packages.dart index 3467f6d..f1a3ad7 100644 --- a/example/lib/packages/packages.dart +++ b/example/lib/packages/packages.dart @@ -32,7 +32,7 @@ import 'package:flutter_example_packages/packages/scoped_model/package.dart'; import 'package:flutter_example_packages/packages/shared_preferences/package.dart'; import 'package:flutter_example_packages/packages/sqflite/package.dart'; import 'package:flutter_example_packages/packages/universal_io/package.dart'; -import 'package:flutter_example_packages/packages/wakelock/package.dart'; +import 'package:flutter_example_packages/packages/wakelock_plus/package.dart'; import 'package:flutter_example_packages/packages/xdga_directories/package.dart'; /// List app packages @@ -68,6 +68,6 @@ final packages = [ packageSharedPreferences, packageSqflite, packageUniversalIO, - packageWakelock, + packageWakelockPlus, packageXdgaDirectories, ]; diff --git a/example/lib/packages/wakelock/model.dart b/example/lib/packages/wakelock_plus/model.dart similarity index 64% rename from example/lib/packages/wakelock/model.dart rename to example/lib/packages/wakelock_plus/model.dart index 40aae9c..a03c63f 100644 --- a/example/lib/packages/wakelock/model.dart +++ b/example/lib/packages/wakelock_plus/model.dart @@ -2,13 +2,13 @@ // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter/widgets.dart'; import 'package:scoped_model/scoped_model.dart'; -import 'package:wakelock/wakelock.dart'; +import 'package:wakelock_plus/wakelock_plus.dart'; -/// Model for [WakelockPage] -class WakelockModel extends Model { +/// Model for [WakelockPlusPage] +class WakelockPlusModel extends Model { /// Get [ScopedModel] - static WakelockModel of(BuildContext context) => - ScopedModel.of(context); + static WakelockPlusModel of(BuildContext context) => + ScopedModel.of(context); /// Error String? _error; @@ -22,7 +22,7 @@ class WakelockModel extends Model { /// Check is enable Wakelock Future isEnable() async { try { - return await Wakelock.enabled; + return await WakelockPlus.enabled; } catch (e) { _error = e.toString(); } @@ -31,9 +31,9 @@ class WakelockModel extends Model { } /// Set state Wakelock - Future setStateWakelock(bool enable) async { + Future setStateWakelockPlus(bool enable) async { try { - await Wakelock.toggle(enable: enable); + await WakelockPlus.toggle(enable: enable); } catch (e) { _error = e.toString(); } diff --git a/example/lib/packages/wakelock/package.dart b/example/lib/packages/wakelock_plus/package.dart similarity index 72% rename from example/lib/packages/wakelock/package.dart rename to example/lib/packages/wakelock_plus/package.dart index 8fdae46..3e057e4 100644 --- a/example/lib/packages/wakelock/package.dart +++ b/example/lib/packages/wakelock_plus/package.dart @@ -1,14 +1,14 @@ // SPDX-FileCopyrightText: Copyright 2023 Open Mobile Platform LLC // SPDX-License-Identifier: BSD-3-Clause import 'package:flutter_example_packages/base/package/package_page.dart'; -import 'package:flutter_example_packages/packages/wakelock/page.dart'; +import 'package:flutter_example_packages/packages/wakelock_plus/page.dart'; import 'package:get_it/get_it.dart'; import 'model.dart'; /// Package values -final packageWakelock = PackagePage( - key: 'wakelock', +final packageWakelockPlus = PackagePage( + key: 'wakelock_plus', descEN: ''' Plugin that allows you to keep the device screen awake, i.e. prevent the screen from sleeping. @@ -17,10 +17,10 @@ final packageWakelock = PackagePage( Плагин, который позволяет держать экран устройства в активном состоянии, т. е. предотвращать переход экрана в спящий режим. ''', - version: '0.6.2', + version: '1.1.1', isPlatformDependent: true, - page: () => WakelockPage(), + page: () => WakelockPlusPage(), init: () { - GetIt.instance.registerFactory(() => WakelockModel()); + GetIt.instance.registerFactory(() => WakelockPlusModel()); }, ); diff --git a/example/lib/packages/wakelock/page.dart b/example/lib/packages/wakelock_plus/page.dart similarity index 83% rename from example/lib/packages/wakelock/page.dart rename to example/lib/packages/wakelock_plus/page.dart index 2493763..be9634a 100644 --- a/example/lib/packages/wakelock/page.dart +++ b/example/lib/packages/wakelock_plus/page.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_example_packages/base/di/app_di.dart'; import 'package:flutter_example_packages/base/package/package.dart'; -import 'package:flutter_example_packages/packages/wakelock/model.dart'; -import 'package:flutter_example_packages/packages/wakelock/package.dart'; +import 'package:flutter_example_packages/packages/wakelock_plus/model.dart'; +import 'package:flutter_example_packages/packages/wakelock_plus/package.dart'; import 'package:flutter_example_packages/theme/colors.dart'; import 'package:flutter_example_packages/widgets/base/export.dart'; import 'package:flutter_example_packages/widgets/blocks/block_alert.dart'; @@ -13,26 +13,26 @@ import 'package:flutter_example_packages/widgets/layouts/block_layout.dart'; import 'package:flutter_example_packages/widgets/texts/export.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart'; -class WakelockPage extends AppStatefulWidget { - WakelockPage({ +class WakelockPlusPage extends AppStatefulWidget { + WakelockPlusPage({ super.key, }); - final Package package = packageWakelock; + final Package package = packageWakelockPlus; @override - State createState() => _WakelockPageState(); + State createState() => _WakelockPlusPageState(); } -class _WakelockPageState extends AppState { +class _WakelockPlusPageState extends AppState { @override Widget buildWide( BuildContext context, MediaQueryData media, AppLocalizations l10n, ) { - return BlockLayout( - model: getIt(), + return BlockLayout( + model: getIt(), title: widget.package.key, builder: (context, child, model) { return SingleChildScrollView( @@ -71,7 +71,7 @@ class _WakelockPageState extends AppState { value: value, activeColor: AppColors.secondary, onChanged: (bool value) { - model.setStateWakelock(value); + model.setStateWakelockPlus(value); }, ), ); diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 68e6c8d..746b27b 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -153,21 +153,15 @@ dependencies: # ref: master # path: packages/sqflite/sqflite_aurora - ## https://github.com/creativecreatorormaybenot/wakelock - ## https://github.com/keygenqt/wakelock - up win32 - wakelock: - git: - url: https://github.com/keygenqt/wakelock.git - ref: wakelock_windows_git - path: wakelock - - ## https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/wakelock/wakelock_aurora - wakelock_aurora: - path: ../packages/wakelock/wakelock_aurora + ## https://pub.dev/packages/wakelock_plus + wakelock_plus: ^1.1.1 + ## https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/wakelock_plus/wakelock_plus_aurora + wakelock_plus_aurora: + path: ../packages/wakelock_plus/wakelock_plus_aurora # git: # url: https://gitlab.com/omprussia/flutter/flutter-plugins.git # ref: master -# path: packages/wakelock/wakelock_aurora +# path: packages/wakelock_plus/wakelock_plus_aurora dev_dependencies: flutter_test: diff --git a/packages/wakelock/wakelock_aurora/README.md b/packages/wakelock/wakelock_aurora/README.md deleted file mode 100644 index b281e33..0000000 --- a/packages/wakelock/wakelock_aurora/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# wakelock_aurora - -The Aurora implementation of [`wakelock`](https://pub.dev/packages/wakelock). - -## Usage -This package is not an _endorsed_ implementation of `wakelock`. -Therefore, you have to include `wakelock_aurora` alongside `wakelock` as dependencies in your `pubspec.yaml` file. - -**pubspec.yaml** - -```yaml -dependencies: - # wakelock: ^0.6.2 - Version is outdated - wakelock: - git: - url: https://github.com/keygenqt/wakelock.git - ref: wakelock_windows_git - path: wakelock - - wakelock_aurora: - git: - url: https://gitlab.com/omprussia/flutter/flutter-plugins.git - ref: master - path: packages/wakelock/wakelock_aurora -``` - -***.dart** - -```dart -import 'package:wakelock/wakelock.dart'; - -// The following line will enable wakelock. -Wakelock.enable(); - -// The next line disables the wakelock again. -Wakelock.disable(); -``` diff --git a/packages/wakelock/wakelock_aurora/.gitignore b/packages/wakelock_plus/wakelock_plus_aurora/.gitignore similarity index 100% rename from packages/wakelock/wakelock_aurora/.gitignore rename to packages/wakelock_plus/wakelock_plus_aurora/.gitignore diff --git a/packages/wakelock_plus/wakelock_plus_aurora/README.md b/packages/wakelock_plus/wakelock_plus_aurora/README.md new file mode 100644 index 0000000..50d922d --- /dev/null +++ b/packages/wakelock_plus/wakelock_plus_aurora/README.md @@ -0,0 +1,32 @@ +# wakelock_plus_aurora + +The Aurora implementation of [`wakelock_plus`](https://pub.dev/packages/wakelock_plus). + +## Usage +This package is not an _endorsed_ implementation of `wakelock_plus`. +Therefore, you have to include `wakelock_plus_aurora` alongside `wakelock_plus` as dependencies in your `pubspec.yaml` file. + +**pubspec.yaml** + +```yaml +dependencies: + wakelock_plus: ^1.1.1 + wakelock_plus_aurora: + git: + url: https://gitlab.com/omprussia/flutter/flutter-plugins.git + ref: master + path: packages/wakelock_plus/wakelock_plus_aurora +``` + +***.dart** + +```dart +import 'package:wakelock_plus/wakelock_plus.dart'; +// ... + +// The following line will enable the Android and iOS wakelock. +WakelockPlus.enable(); + +// The next line disables the wakelock again. +WakelockPlus.disable(); +``` diff --git a/packages/wakelock/wakelock_aurora/analysis_options.yaml b/packages/wakelock_plus/wakelock_plus_aurora/analysis_options.yaml similarity index 100% rename from packages/wakelock/wakelock_aurora/analysis_options.yaml rename to packages/wakelock_plus/wakelock_plus_aurora/analysis_options.yaml diff --git a/packages/wakelock/wakelock_aurora/data/com.nokia.mce.request.xml b/packages/wakelock_plus/wakelock_plus_aurora/data/com.nokia.mce.request.xml similarity index 100% rename from packages/wakelock/wakelock_aurora/data/com.nokia.mce.request.xml rename to packages/wakelock_plus/wakelock_plus_aurora/data/com.nokia.mce.request.xml diff --git a/packages/wakelock/wakelock_aurora/lib/com_nokia_mce_request.dart b/packages/wakelock_plus/wakelock_plus_aurora/lib/com_nokia_mce_request.dart similarity index 100% rename from packages/wakelock/wakelock_aurora/lib/com_nokia_mce_request.dart rename to packages/wakelock_plus/wakelock_plus_aurora/lib/com_nokia_mce_request.dart diff --git a/packages/wakelock/wakelock_aurora/lib/wakelock_aurora.dart b/packages/wakelock_plus/wakelock_plus_aurora/lib/wakelock_plus_aurora.dart similarity index 80% rename from packages/wakelock/wakelock_aurora/lib/wakelock_aurora.dart rename to packages/wakelock_plus/wakelock_plus_aurora/lib/wakelock_plus_aurora.dart index d254985..d8f33e7 100644 --- a/packages/wakelock/wakelock_aurora/lib/wakelock_aurora.dart +++ b/packages/wakelock_plus/wakelock_plus_aurora/lib/wakelock_plus_aurora.dart @@ -3,15 +3,15 @@ import 'dart:async'; import 'package:dbus/dbus.dart'; -import 'package:wakelock_platform_interface/wakelock_platform_interface.dart'; +import 'package:wakelock_plus_platform_interface/wakelock_plus_platform_interface.dart'; import 'com_nokia_mce_request.dart'; -class WakelockAurora extends WakelockPlatformInterface { +class WakelockPlusAurora extends WakelockPlusPlatformInterface { bool _enable = false; Timer? _timer; static void registerWith() { - WakelockPlatformInterface.instance = WakelockAurora(); + WakelockPlusPlatformInterface.instance = WakelockPlusAurora(); } @override diff --git a/packages/wakelock/wakelock_aurora/pubspec.yaml b/packages/wakelock_plus/wakelock_plus_aurora/pubspec.yaml similarity index 63% rename from packages/wakelock/wakelock_aurora/pubspec.yaml rename to packages/wakelock_plus/wakelock_plus_aurora/pubspec.yaml index ca9291e..64526d4 100644 --- a/packages/wakelock/wakelock_aurora/pubspec.yaml +++ b/packages/wakelock_plus/wakelock_plus_aurora/pubspec.yaml @@ -1,8 +1,8 @@ # SPDX-FileCopyrightText: Copyright 2023 Open Mobile Platform LLC # SPDX-License-Identifier: BSD-3-Clause -name: wakelock_aurora -description: A new Flutter plugin project. +name: wakelock_plus_aurora +description: Wakelock is Flutter plugin that allows you to keep the device screen awake, i.e. prevent the screen from sleeping. version: 0.0.1 environment: @@ -14,7 +14,7 @@ dependencies: sdk: flutter dbus: ^0.7.8 plugin_platform_interface: ^2.0.2 - wakelock_platform_interface: ^0.3.0 + wakelock_plus_platform_interface: ^1.1.0 dev_dependencies: flutter_test: @@ -25,4 +25,4 @@ flutter: plugin: platforms: aurora: - dartPluginClass: WakelockAurora + dartPluginClass: WakelockPlusAurora