Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to package:hive_flutter #698

Merged
merged 5 commits into from Jun 18, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions hive_flutter/lib/adapters.dart
@@ -0,0 +1,7 @@
import 'package:flutter/material.dart' show Color, TimeOfDay;
import 'package:hive/hive.dart' show TypeAdapter, BinaryReader, BinaryWriter;

export 'hive_flutter.dart';

part 'src/adapters/color_adapter.dart';
part 'src/adapters/time_adapter.dart';
6 changes: 4 additions & 2 deletions hive_flutter/lib/hive_flutter.dart
Expand Up @@ -5,8 +5,10 @@ import 'dart:async';
import 'package:flutter/foundation.dart';
import 'package:flutter/widgets.dart';
import 'package:hive/hive.dart';
import 'package:path_provider/path_provider.dart';
import 'package:path/path.dart' as path_helper;
import 'package:path_provider/path_provider.dart'
if (dart.library.html) 'src/stub/path_provider.dart';
import 'package:path/path.dart' if (dart.library.html) 'src/stub/path.dart'
as path_helper;

export 'package:hive/hive.dart';

Expand Down
12 changes: 3 additions & 9 deletions hive_flutter/lib/src/adapters/color_adapter.dart
@@ -1,17 +1,11 @@
import 'package:flutter/painting.dart';
import 'package:hive/hive.dart';
part of '../../adapters.dart';

class ColorAdapter extends TypeAdapter<Color> {
@override
Color read(BinaryReader reader) {
final colorValue = reader.readInt();
return Color(colorValue);
}
Color read(BinaryReader reader) => Color(reader.readInt());

@override
void write(BinaryWriter writer, Color obj) {
writer.writeInt(obj.value);
}
void write(BinaryWriter writer, Color obj) => writer.writeInt(obj.value);

@override
int get typeId => 200;
Expand Down
12 changes: 3 additions & 9 deletions hive_flutter/lib/src/adapters/time_adapter.dart
@@ -1,17 +1,11 @@
import 'package:flutter/material.dart';
import 'package:hive/hive.dart';
part of '../../adapters.dart';

class TimeAdapter extends TypeAdapter<TimeOfDay> {
@override
TimeOfDay read(BinaryReader reader) {
final time = reader.read() as TimeOfDay;
return time;
}
TimeOfDay read(BinaryReader reader) => reader.read() as TimeOfDay;
baumths marked this conversation as resolved.
Show resolved Hide resolved

@override
void write(BinaryWriter writer, TimeOfDay obj) {
writer.write(obj);
}
void write(BinaryWriter writer, TimeOfDay obj) => writer.write(obj);

@override
int get typeId => 201;
Expand Down
10 changes: 5 additions & 5 deletions hive_flutter/lib/src/hive_extensions.dart
Expand Up @@ -5,11 +5,11 @@ extension HiveX on HiveInterface {
/// Initializes Hive with the path from [getApplicationDocumentsDirectory].
///
/// You can provide a [subDir] where the boxes should be stored.
Future initFlutter([String? subDir]) async {
Future<void> initFlutter([String? subDir]) async {
WidgetsFlutterBinding.ensureInitialized();
if (!kIsWeb) {
var appDir = await getApplicationDocumentsDirectory();
init(path_helper.join(appDir.path, subDir));
}
if (kIsWeb) return;

var appDir = await getApplicationDocumentsDirectory();
init(path_helper.join(appDir.path, subDir));
}
}
14 changes: 14 additions & 0 deletions hive_flutter/lib/src/stub/path.dart
@@ -0,0 +1,14 @@
String join(
String part1, [
String? part2,
String? part3,
String? part4,
String? part5,
String? part6,
String? part7,
String? part8,
]) {
throw UnimplementedError(
'[Hive Error] Tried to use the `path` package from Flutter Web.',
);
}
9 changes: 9 additions & 0 deletions hive_flutter/lib/src/stub/path_provider.dart
@@ -0,0 +1,9 @@
abstract class Directory {
String get path;
}

Future<Directory> getApplicationDocumentsDirectory() {
throw UnimplementedError(
'[Hive Error] Tried to use the `path_provider` package from Flutter Web.',
);
}
10 changes: 5 additions & 5 deletions hive_flutter/pubspec.yaml
Expand Up @@ -11,13 +11,13 @@ dependencies:
flutter:
sdk: flutter

hive: ^2.0.0
path_provider: ^2.0.0
hive: ^2.0.4
path_provider: ^2.0.2
path: ^1.8.0

dev_dependencies:
flutter_test:
sdk: flutter
pedantic: ^1.8.0
mockito: ^5.0.7
build_runner: ^1.10.0
pedantic: ^1.11.1
mockito: ^5.0.10
build_runner: ^2.0.4
5 changes: 3 additions & 2 deletions hive_flutter/test/adapters/color_adapter_test.dart
@@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'dart:ui' show Color;

import 'package:flutter_test/flutter_test.dart';
import 'package:hive/hive.dart';
import 'package:hive_flutter/src/adapters/color_adapter.dart';
import 'package:hive_flutter/adapters.dart';
import 'package:mockito/mockito.dart';

import '../mocks.dart';
Expand Down
4 changes: 2 additions & 2 deletions hive_flutter/test/adapters/time_adapter_test.dart
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter/material.dart' show TimeOfDay;
import 'package:flutter_test/flutter_test.dart';
import 'package:hive/hive.dart';
import 'package:hive_flutter/src/adapters/time_adapter.dart';
import 'package:hive_flutter/adapters.dart';
import 'package:mockito/mockito.dart';

import '../mocks.dart';
Expand Down