Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion packages/android_alarm_manager_plus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Next, within the `<application></application>` tags, add:
Then in Dart code add:

```dart
import 'package:android_alarm_manager/android_alarm_manager.dart';
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';

void printHello() {
final DateTime now = DateTime.now();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

package io.flutter.plugins.androidalarmmanager;

import static androidx.test.espresso.Espresso.pressBackUnconditionally;
import static androidx.test.espresso.flutter.EspressoFlutter.onFlutterWidget;
import static androidx.test.espresso.flutter.action.FlutterActions.click;
import static androidx.test.espresso.flutter.matcher.FlutterMatchers.withValueKey;
Expand All @@ -13,14 +12,11 @@
import android.content.Context;
import android.content.SharedPreferences;
import android.util.Log;

import androidx.test.InstrumentationRegistry;
import androidx.test.core.app.ActivityScenario;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;

import com.example.example.MainActivity;

import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -50,7 +46,7 @@ public void setUp() throws Exception {

@Test
public void startBackgroundIsolate() throws Exception {
Log.d("BackgroundExecutionTest","Started");
Log.d("BackgroundExecutionTest", "Started");

// Register a one shot alarm which will go off in ~5 seconds.
onFlutterWidget(withValueKey("RegisterOneShotAlarm")).perform(click());
Expand All @@ -71,9 +67,9 @@ public void startBackgroundIsolate() throws Exception {
while ((prefs.getLong(COUNT_KEY, -1) == 0) && (tries < 200)) {
Thread.sleep(100);
++tries;
Log.d("BackgroundExecutionTest","Waiting...");
Log.d("BackgroundExecutionTest", "Waiting...");
}
assertEquals(prefs.getLong(COUNT_KEY, -1), 1);
Log.d("BackgroundExecutionTest","Finished");
Log.d("BackgroundExecutionTest", "Finished");
}
}
2 changes: 1 addition & 1 deletion packages/android_alarm_manager_plus/example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'dart:isolate';
import 'dart:math';
import 'dart:ui';

import 'package:android_alarm_manager_plus/android_alarm_manager.dart';
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:flutter/material.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ import 'package:android_alarm_manager_example/main.dart' as app;
void main() {
enableFlutterDriverExtension();
app.main();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import 'dart:async';
import 'dart:io';
import 'package:android_alarm_manager_plus/android_alarm_manager.dart';
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
import 'package:e2e/e2e.dart';
import 'package:flutter/cupertino.dart';
import 'package:flutter_test/flutter_test.dart';
Expand Down Expand Up @@ -66,7 +66,8 @@ void main() {
final alarmId = 0;
final startingValue = await readCounter();
debugPrint('oneShot start');
await AndroidAlarmManager.oneShot(const Duration(seconds: 1), alarmId, incrementCounter);
await AndroidAlarmManager.oneShot(
const Duration(seconds: 1), alarmId, incrementCounter);
debugPrint('oneShot end');
debugPrint('Canceling alarm...');
expect(await AndroidAlarmManager.cancel(alarmId), isTrue);
Expand All @@ -80,7 +81,8 @@ void main() {
final alarmId = 1;
final startingValue = await readCounter();
debugPrint('oneShot start');
await AndroidAlarmManager.oneShot(const Duration(seconds: 1), alarmId, incrementCounter,
await AndroidAlarmManager.oneShot(
const Duration(seconds: 1), alarmId, incrementCounter,
exact: true, wakeup: true);
debugPrint('oneShot end');
await Future<void>.delayed(const Duration(seconds: 2));
Expand All @@ -100,7 +102,8 @@ void main() {
testWidgets('periodic', (WidgetTester tester) async {
final alarmId = 2;
final startingValue = await readCounter();
await AndroidAlarmManager.periodic(const Duration(seconds: 1), alarmId, incrementCounter,
await AndroidAlarmManager.periodic(
const Duration(seconds: 1), alarmId, incrementCounter,
wakeup: true, exact: true);
// poll until file is updated
while (await readCounter() < startingValue + 2) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Future<StreamSubscription<VMIsolateRef>> resumeIsolatesOnPause(
return driver.serviceClient.onIsolateRunnable
.asBroadcastStream()
.listen((VMIsolateRef isolateRef) async {
print('onIsolateRunnable');
print('onIsolateRunnable');
final isolate = await isolateRef.load();
if (isolate.isPaused) {
print('isolate.resume');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@

import 'dart:ui';

import 'package:android_alarm_manager_plus/android_alarm_manager.dart';
import 'package:android_alarm_manager_plus/android_alarm_manager_plus.dart';
import 'package:flutter/services.dart';
import 'package:flutter_test/flutter_test.dart';

void main() {
String invalidCallback(String foo) => foo;
void validCallback(int id) => null;

const testChannel = MethodChannel('plugins.flutter.io/android_alarm_manager', JSONMethodCodec());
const testChannel = MethodChannel(
'plugins.flutter.io/android_alarm_manager', JSONMethodCodec());
TestWidgetsFlutterBinding.ensureInitialized();

setUpAll(() {
Expand All @@ -36,17 +37,24 @@ void main() {
final validId = 1;

// Callback should take a single int param.
await expectLater(() => AndroidAlarmManager.oneShotAt(validTime, validId, invalidCallback), throwsAssertionError);
await expectLater(
() => AndroidAlarmManager.oneShotAt(
validTime, validId, invalidCallback),
throwsAssertionError);

// ID should be less than 32 bits.
await expectLater(
() => AndroidAlarmManager.oneShotAt(validTime, 2147483648, validCallback), throwsAssertionError);
() => AndroidAlarmManager.oneShotAt(
validTime, 2147483648, validCallback),
throwsAssertionError);
});

test('sends arguments to the platform', () async {
final alarm = DateTime(1993);
const rawHandle = 4;
AndroidAlarmManager.setTestOverides(getCallbackHandle: (Function _) => CallbackHandle.fromRawHandle(rawHandle));
AndroidAlarmManager.setTestOverides(
getCallbackHandle: (Function _) =>
CallbackHandle.fromRawHandle(rawHandle));

final id = 1;
final alarmClock = true;
Expand All @@ -68,7 +76,8 @@ void main() {
return true;
});

final result = await AndroidAlarmManager.oneShotAt(alarm, id, validCallback,
final result = await AndroidAlarmManager.oneShotAt(
alarm, id, validCallback,
alarmClock: alarmClock,
allowWhileIdle: allowWhileIdle,
exact: exact,
Expand All @@ -83,7 +92,9 @@ void main() {
final now = DateTime(1993);
const rawHandle = 4;
AndroidAlarmManager.setTestOverides(
now: () => now, getCallbackHandle: (Function _) => CallbackHandle.fromRawHandle(rawHandle));
now: () => now,
getCallbackHandle: (Function _) =>
CallbackHandle.fromRawHandle(rawHandle));

const alarm = Duration(seconds: 1);
final id = 1;
Expand All @@ -100,7 +111,8 @@ void main() {
expect(call.arguments[2], allowWhileIdle);
expect(call.arguments[3], exact);
expect(call.arguments[4], wakeup);
expect(call.arguments[5], now.millisecondsSinceEpoch + alarm.inMilliseconds);
expect(
call.arguments[5], now.millisecondsSinceEpoch + alarm.inMilliseconds);
expect(call.arguments[6], rescheduleOnReboot);
expect(call.arguments[7], rawHandle);
return true;
Expand All @@ -123,18 +135,24 @@ void main() {

// Callback should take a single int param.
await expectLater(
() => AndroidAlarmManager.periodic(validDuration, validId, invalidCallback), throwsAssertionError);
() => AndroidAlarmManager.periodic(
validDuration, validId, invalidCallback),
throwsAssertionError);

// ID should be less than 32 bits.
await expectLater(
() => AndroidAlarmManager.periodic(validDuration, 2147483648, validCallback), throwsAssertionError);
() => AndroidAlarmManager.periodic(
validDuration, 2147483648, validCallback),
throwsAssertionError);
});

test('sends arguments through to the platform', () async {
final now = DateTime(1993);
const rawHandle = 4;
AndroidAlarmManager.setTestOverides(
now: () => now, getCallbackHandle: (Function _) => CallbackHandle.fromRawHandle(rawHandle));
now: () => now,
getCallbackHandle: (Function _) =>
CallbackHandle.fromRawHandle(rawHandle));

final id = 1;
final exact = true;
Expand All @@ -147,7 +165,8 @@ void main() {
expect(call.arguments[0], id);
expect(call.arguments[1], exact);
expect(call.arguments[2], wakeup);
expect(call.arguments[3], (now.millisecondsSinceEpoch + period.inMilliseconds));
expect(call.arguments[3],
(now.millisecondsSinceEpoch + period.inMilliseconds));
expect(call.arguments[4], period.inMilliseconds);
expect(call.arguments[5], rescheduleOnReboot);
expect(call.arguments[6], rawHandle);
Expand Down
2 changes: 1 addition & 1 deletion packages/android_intent_plus/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
path: ../

dev_dependencies:
e2e: "^0.2.1"
e2e: ^0.3.0
flutter_driver:
sdk: flutter
pedantic: ^1.8.0
Expand Down
2 changes: 1 addition & 1 deletion packages/android_intent_plus/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ flutter:
dependencies:
flutter:
sdk: flutter
platform: ^2.0.0
platform: '>=2.0.0 <=3.0.0-nullsafety.2'
meta: ^1.0.5
dev_dependencies:
test: ^1.3.0
Expand Down
2 changes: 1 addition & 1 deletion packages/battery_plus/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ dependencies:
dev_dependencies:
flutter_driver:
sdk: flutter
integration_test: ^0.8.0
integration_test: ^0.9.1
pedantic: ^1.9.0

flutter:
Expand Down
8 changes: 3 additions & 5 deletions packages/battery_plus/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,16 @@ dependencies:
flutter:
sdk: flutter
meta: ^1.0.5
battery_plus_platform_interface:
path: ../battery_plus_platform_interface
battery_plus_web:
path: ../battery_plus_web
battery_plus_platform_interface: ^0.1.0
battery_plus_web: ^0.1.0

dev_dependencies:
async: ^2.0.8
test: ^1.3.0
mockito: 3.0.0
flutter_test:
sdk: flutter
integration_test: ^0.8.0
integration_test: ^0.9.1
plugin_platform_interface: ^1.0.0
pedantic: ^1.9.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'enums.dart';

/// Method for parsing battery state.
BatteryState parseBatteryState(String state) {
switch (state) {
case 'full':
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:flutter_web_plugins/flutter_web_plugins.dart';

/// The web implementation of the BatteryPlatform of the Battery plugin.
class BatteryPlugin extends BatteryPlatform {
/// Constructs a BatteryPlugin.
BatteryPlugin(html.Navigator navigator) : _getBattery = navigator.getBattery;

/// A check to determine if this version of the plugin can be used.
Expand Down
7 changes: 3 additions & 4 deletions packages/battery_plus_web/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ flutter:
platforms:
web:
pluginClass: BatteryPlugin
fileName: battery_web.dart
fileName: battery_plus_web.dart

dependencies:
battery_plus_platform_interface:
path: ../battery_plus_platform_interface
battery_plus_platform_interface: ^0.1.0
flutter_web_plugins:
sdk: flutter
flutter:
Expand All @@ -24,7 +23,7 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
integration_test: ^0.9.0
integration_test: ^0.9.1
mockito: ^4.1.2

environment:
Expand Down
2 changes: 1 addition & 1 deletion packages/connectivity_plus/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dev_dependencies:
flutter_driver:
sdk: flutter
test: any
integration_test: ^0.8.0
integration_test: ^0.9.1
pedantic: ^1.8.0

flutter:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ - (NSString*)convertCLAuthorizationStatusToString:(CLAuthorizationStatus)status
case kCLAuthorizationStatusAuthorizedWhenInUse: {
return @"authorizedWhenInUse";
}
default: { return @"unknown"; }
default: {
return @"unknown";
}
}
}

Expand Down
11 changes: 4 additions & 7 deletions packages/connectivity_plus/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,17 @@ dependencies:
flutter:
sdk: flutter
meta: ^1.0.5
connectivity_plus_platform_interface:
path: ../connectivity_plus_platform_interface
connectivity_plus_macos:
path: ../connectivity_plus_macos
connectivity_plus_web:
path: ../connectivity_plus_web
connectivity_plus_platform_interface: ^0.2.0
connectivity_plus_macos: ^0.2.0
connectivity_plus_web: ^0.4.0

dev_dependencies:
flutter_test:
sdk: flutter
flutter_driver:
sdk: flutter
test: any
integration_test: ^0.8.0
integration_test: ^0.9.1
mockito: ^4.1.1
plugin_platform_interface: ^1.0.0
pedantic: ^1.8.0
Expand Down
3 changes: 1 addition & 2 deletions packages/connectivity_plus_macos/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ environment:
flutter: ">=1.10.0 <2.0.0"

dependencies:
connectivity_plus_platform_interface:
path: ../connectivity_plus_platform_interface
connectivity_plus_platform_interface: ^0.2.0
flutter:
sdk: flutter

Expand Down
5 changes: 2 additions & 3 deletions packages/connectivity_plus_web/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ flutter:
fileName: connectivity_plus_web.dart

dependencies:
connectivity_plus_platform_interface:
path: ../connectivity_plus_platform_interface
connectivity_plus_platform_interface: ^0.2.0
flutter_web_plugins:
sdk: flutter
flutter:
Expand All @@ -24,7 +23,7 @@ dev_dependencies:
sdk: flutter
flutter_test:
sdk: flutter
integration_test: ^0.8.0
integration_test: ^0.9.1
mockito: ^4.1.1

environment:
Expand Down
Loading