[plugin] Update wakelock to wakelock_plus

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`        |

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": {},

example/lib/l10n/app_ru.arb

@@ -161,7 +161,7 @@
   "sharedPreferencesFieldError": "Пожалуйста, введите {value} значение",
 
   "@_WAKELOCK": {},
-  "wakelockTitle": "Wakelock",
+  "wakelockTitle": "Блокировка",
   "wakelockDesc": "Плагин позволяет включать и переключать блокировку экрана, которая предотвращает автоматическое выключение экрана.",
 
   "@_XDGA_DIRECTORIES": {},

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 = <Package>[
   packageSharedPreferences,
   packageSqflite,
   packageUniversalIO,
-  packageWakelock,
+  packageWakelockPlus,
   packageXdgaDirectories,
 ];

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]
+/// Model for [WakelockPlusPage]
-class WakelockModel extends Model {
+class WakelockPlusModel extends Model {
   /// Get [ScopedModel]
-  static WakelockModel of(BuildContext context) =>
+  static WakelockPlusModel of(BuildContext context) =>
-      ScopedModel.of<WakelockModel>(context);
+      ScopedModel.of<WakelockPlusModel>(context);
 
   /// Error
   String? _error;
@@ -22,7 +22,7 @@ class WakelockModel extends Model {
   /// Check is enable Wakelock
   Future<bool?> 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<void> setStateWakelock(bool enable) async {
+  Future<void> setStateWakelockPlus(bool enable) async {
     try {
-      await Wakelock.toggle(enable: enable);
+      await WakelockPlus.toggle(enable: enable);
     } catch (e) {
       _error = e.toString();
     }

example/lib/packages/wakelock_plus/package.dart

@@ -1,14 +1,14 @@
 // SPDX-FileCopyrightText: Copyright 2023 Open Mobile Platform LLC <community@omp.ru>
 // 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(
+final packageWakelockPlus = PackagePage(
-  key: 'wakelock',
+  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>(() => WakelockModel());
+    GetIt.instance.registerFactory<WakelockPlusModel>(() => WakelockPlusModel());
   },
 );

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_plus/model.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/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 {
+class WakelockPlusPage extends AppStatefulWidget {
-  WakelockPage({
+  WakelockPlusPage({
     super.key,
   });
 
-  final Package package = packageWakelock;
+  final Package package = packageWakelockPlus;
 
   @override
-  State<WakelockPage> createState() => _WakelockPageState();
+  State<WakelockPlusPage> createState() => _WakelockPlusPageState();
 }
 
-class _WakelockPageState extends AppState<WakelockPage> {
+class _WakelockPlusPageState extends AppState<WakelockPlusPage> {
   @override
   Widget buildWide(
     BuildContext context,
     MediaQueryData media,
     AppLocalizations l10n,
   ) {
-    return BlockLayout<WakelockModel>(
+    return BlockLayout<WakelockPlusModel>(
-      model: getIt<WakelockModel>(),
+      model: getIt<WakelockPlusModel>(),
       title: widget.package.key,
       builder: (context, child, model) {
         return SingleChildScrollView(
@@ -71,7 +71,7 @@ class _WakelockPageState extends AppState<WakelockPage> {
                               value: value,
                               activeColor: AppColors.secondary,
                               onChanged: (bool value) {
-                                model.setStateWakelock(value);
+                                model.setStateWakelockPlus(value);
                               },
                             ),
                           );

example/pubspec.yaml

@@ -153,21 +153,15 @@ dependencies:
 #      ref: master
 #      path: packages/sqflite/sqflite_aurora
 
-  ## https://github.com/creativecreatorormaybenot/wakelock
+  ## https://pub.dev/packages/wakelock_plus
-  ## https://github.com/keygenqt/wakelock - up win32
+  wakelock_plus: ^1.1.1
-  wakelock:
+  ## https://gitlab.com/omprussia/flutter/flutter-plugins/-/tree/master/packages/wakelock_plus/wakelock_plus_aurora
-    git:
+  wakelock_plus_aurora:
-      url: https://github.com/keygenqt/wakelock.git
+    path: ../packages/wakelock_plus/wakelock_plus_aurora
-      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
 #    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:

packages/wakelock/wakelock_aurora/README.md

@@ -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();
-```

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();
+```

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

packages/wakelock_plus/wakelock_plus_aurora/pubspec.yaml

@@ -1,8 +1,8 @@
 # SPDX-FileCopyrightText: Copyright 2023 Open Mobile Platform LLC <community@omp.ru>
 # SPDX-License-Identifier: BSD-3-Clause
 
-name: wakelock_aurora
+name: wakelock_plus_aurora
-description: A new Flutter plugin project.
+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