Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
0424db5
Add minimal Flutter demo app
nalenz-objectbox Sep 4, 2019
6233dab
Remove mobile Flutter example and add desktop one instead
nalenz-objectbox Sep 4, 2019
147d9fc
Fix minor things in objectbox_demo_desktop
nalenz-objectbox Sep 5, 2019
a234548
Increase pubspec.yaml version to 0.2.0
nalenz-objectbox Sep 5, 2019
f75e23e
Fully recreate model generation using source_gen
nalenz-objectbox Sep 5, 2019
e29a49e
Update FFI Pointer usage to Dart 2.5.0
nalenz-objectbox Sep 5, 2019
f2a16d1
Add ObjectBox Flutter demo for desktop
nalenz-objectbox Sep 5, 2019
5f54b18
Increase minimal version requirement to 2.5.0-dev.4.0
nalenz-objectbox Sep 5, 2019
864749d
Always use type Long for @Id properties
nalenz-objectbox Sep 6, 2019
b558ff3
Revert back to Dart 2.4.1 for this branch
nalenz-objectbox Sep 6, 2019
6097bd6
Add UTF-8 support to CString (#14)
nalenz-objectbox Sep 6, 2019
b4b6d71
Use Dart 2.5.0-dev.2.0 in this branch
nalenz-objectbox Sep 6, 2019
0699069
Fix Flatbuffers offset storage in Box._marshal
nalenz-objectbox Sep 6, 2019
491b7f1
Use const instead of final in generated OBXModel and OBXDefs
nalenz-objectbox Sep 6, 2019
4846d9f
Allow zero-length strings in CString.val
nalenz-objectbox Sep 6, 2019
f094be3
Use better error handling for invalid returned pointers (#13)
nalenz-objectbox Sep 6, 2019
06f5da2
Fix store set to null for testing
nalenz-objectbox Sep 6, 2019
38dee1b
Use consistent singular for ObjectBox constants
nalenz-objectbox Sep 9, 2019
819b8e7
Rename Box.getById to Box.get
nalenz-objectbox Sep 9, 2019
f1e85ca
Add loadMemory helper function
nalenz-objectbox Sep 9, 2019
e9500c0
Add bindings for bulk put and get functions (#4)
nalenz-objectbox Sep 9, 2019
c6253df
Implement Box.getAll (#4)
nalenz-objectbox Sep 9, 2019
6e4a891
Implement Box.getMany (#4)
nalenz-objectbox Sep 9, 2019
e472eba
Introduce class _IDArray for more convenient Box.getMany (#4)
nalenz-objectbox Sep 9, 2019
174e620
Implement Box.putMany (#4)
nalenz-objectbox Sep 9, 2019
67622a0
Add minimal unit tests for Box.get and Box.put (#15)
nalenz-objectbox Sep 9, 2019
d53350e
Rename obx_model_create to obx_model due to objectbox-c 0.7
nalenz-objectbox Sep 9, 2019
7a759c1
README.md: Edit objectbox-c command to use version 0.7
nalenz-objectbox Sep 10, 2019
10a3b70
Add possibility to use store options
nalenz-objectbox Sep 10, 2019
9f8f456
Fix function return types in Box class
nalenz-objectbox Sep 10, 2019
7efb031
Fix ID generation for Box.putMany
nalenz-objectbox Sep 10, 2019
ab13e8a
Add unit tests for bulk put and get (#4, #15)
nalenz-objectbox Sep 10, 2019
3c99394
CHANGELOG.md: Add information about 0.2.0
nalenz-objectbox Sep 10, 2019
7a77c86
README.md: Add instructions on how to run unit tests
nalenz-objectbox Sep 10, 2019
6e585f8
Update minimal Dart version requirement to 2.5.0
nalenz-objectbox Sep 10, 2019
d45932b
CHANGELOG.md: Fix order and mention contributor
nalenz-objectbox Sep 11, 2019
bd6cebe
Fix test tearDown in case store fails to initialize
nalenz-objectbox Sep 11, 2019
13f1938
README.md: Simplify objectbox-c installation command
nalenz-objectbox Sep 11, 2019
13281f5
Move computations outside of setState in Flutter
nalenz-objectbox Sep 11, 2019
fcaf2a2
Fix _testGet in Flutter demo
nalenz-objectbox Sep 11, 2019
327905b
Handle exceptions in Box._inReadTransaction
nalenz-objectbox Sep 11, 2019
11361e1
Reorganize files to conform to Dart's package layout conventions
nalenz-objectbox Sep 11, 2019
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
12 changes: 6 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.dart_tool/
.packages
build/
pubspec.lock
objectbox/
**/.dart_tool/
**/.packages
**/build/
**/pubspec.lock
misc/
.idea/
.idea/
**/*.g.dart
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ Getting started
To try out the demo code in this repository, follow these steps:

1. Install [objectbox-c](https://github.com/objectbox/objectbox-c) system-wide: `bash <(curl -s https://raw.githubusercontent.com/objectbox/objectbox-c/master/download.sh)` (answer Y when it asks about installing to /usr/lib).
2. Back in this repository, run `pub get` to download all Dart dependencies.
3. Finally run `dart test/test.dart` to start the demo script.
2. Back in this repository, run `pub get` in each of the following directories: `objectbox`, `objectbox_model_generator`, `objectbox_test`. If you just want to try out the tests, running it in `objectbox_test` is enough.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new branch doesn't follow conventions https://dart.dev/tools/pub/package-layout or rather it creates three packages.

What is the reason it must be split in such a way instead having a single package?

  • lib instead of objectbox
  • bin/binding-generator instead of objectbox_model_generator
  • test instead of objectbox_test

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this, I generally stuck to how Dart's json_serializable organizes its files. It uses source_gen as well (just like objectbox_model_generator), so it seemed like quite a good reference for some first orientation. Also, it subdivides the repository into three subprojects as well, each with its own pubspec.yaml: example (our objectbox_test), json_annotation (our objectbox) and json_serializable (our objectbox_model_generator).

Unfortunately, source_gen and build_runner are rather poorly documented for the use case of generating source code for annotations, so it's hard to find good resources on how to better organize the directory structure. Apart from that, I also think that the model generator needs to have its own Dart package in order for build.yaml to work properly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Core packages are not always a best source of organization since they use to have long history, before most conventions even emerged.

The page I've linked (https://dart.dev/tools/pub/package-layout) is an official recommendation how a package should be structured and as such it would be strongly preferable to follow there are serious reasons we need to diverge. If you say building the generator is (I don't know enough of dart to help you there at the moment), then let's keep the generator as a separate project for now but at least leave the rest as a single one. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, I definitely agree; I'll also keep the generator as a separate package for now. Please check out my last commit, I reorganized the file structure similar to how you suggested.

3. Move into the `objectbox_test` directory and execute `pub run build_runner build`. This regenerates the ObjectBox model to make it usable in Dart (i.e. the file `test/test.g.dart`) and is necessary each time you add or change a class annotated with `@Entity(...)`.
4. Finally run `dart test/test.dart` to start the demo script.
Note that, as fairly recent language features are used, the minimal required Dart version is 2.2.2.

Dart integration
Expand All @@ -63,31 +64,31 @@ Technically, we need to setup [build time tools for Dart](https://github.com/obj

```dart
import "../lib/objectbox.dart";
part "test.g.dart";

@Entity(id: 1, uid: 1)
class Note {
@Id(id: 1, uid: 1001, type: Type.Long)
@Id(id: 1, uid: 1001, type: OBXPropertyType.Long)
int id;

@Property(id: 2, uid: 1002)
String text;

Note(); // empty default constructor needed
Note.construct(this.text);

toString() => "Note{id: $id, text: $text}";
}
```

In your main function, you can then create a _store_ which needs an array of your entity classes to be constructed.
In your main function, you can then create a _store_ which needs an array of your entity classes and definitions to be constructed. If you have several entities, construct your store like `Store([[Entity1, Entity1_OBXDefs], [Entity2, Entity2_OBXDefs]])` etc.
Finally, you need a _box_, representing the interface for objects of one specific entity type.

```dart
var store = Store([Note]);
var store = Store([[Note, Note_OBXDefs]]);
var box = Box<Note>(store);

var note = Note("Hello");
box.put(note);
var note = Note.construct("Hello");
note.id = box.put(note);
print("new note got id ${note.id}");
print("refetched note: ${box.getById(note.id)}");

Expand Down
16 changes: 16 additions & 0 deletions examples/flutter/objectbox_demo_desktop/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.atom/
.dart_tool/
.idea
.vscode/
.packages
.pub/
android/
build/
ios/
packages
.flutter-plugins
# Since the current expectation is that clients are using Flutter head,
# and Dart SDK changes unlock dependencies, pubspec.lock isn't useful.
# Ignore it since it just creates noise. When there's a system in place
# for versioning this project relative to Flutter, remove this.
pubspec.lock
8 changes: 8 additions & 0 deletions examples/flutter/objectbox_demo_desktop/.metadata
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file tracks properties of this Flutter project.
# Used by Flutter tool to assess capabilities and perform upgrades etc.
#
# This file should be version controlled and should not be manually edited.

version:
revision: eaa9b47a4ac278a9439468911d2c361a472b114b
channel: master
13 changes: 13 additions & 0 deletions examples/flutter/objectbox_demo_desktop/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# objectbox_demo_desktop

## Getting Started

In this early demo version, only desktop environments are supported. Mobile platform support, i.e. Android and iOS, will be added later. The current code is based on Google's [flutter-desktop-embedding](https://github.com/google/flutter-desktop-embedding) repository.

If you have never run Flutter on desktop before, execute the following commands (these are for Linux, adjust accordingly for your OS, see [here](https://github.com/flutter/flutter/wiki/Desktop-shells#tooling)):

flutter channel master
flutter upgrade
flutter config --enable-linux-desktop
flutter packages get
flutter run
202 changes: 202 additions & 0 deletions examples/flutter/objectbox_demo_desktop/fonts/Roboto/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
77 changes: 77 additions & 0 deletions examples/flutter/objectbox_demo_desktop/lib/main.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import 'package:flutter/foundation.dart' show debugDefaultTargetPlatformOverride;
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
// import "package:objectbox/objectbox.dart";

void main() {
// See https://github.com/flutter/flutter/wiki/Desktop-shells#target-platform-override
debugDefaultTargetPlatformOverride = TargetPlatform.fuchsia;

runApp(MyApp());
}

class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
return MaterialApp(
title: "ObjectBox Demo",
theme: ThemeData(primarySwatch: Colors.blue, fontFamily: "Roboto"),
home: MyHomePage(title: "ObjectBox Demo"),
);
}
}

class MyHomePage extends StatefulWidget {
MyHomePage({Key key, this.title}) : super(key: key);

final String title;

@override
_MyHomePageState createState() => _MyHomePageState();
}

class _MyHomePageState extends State<MyHomePage> {
String _status = "";

void _testGetById() {
setState(() {
_status += "getById\n";
});
}

void _testPut() {
setState(() {
_status += "put\n";
});
}

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(title: Text(widget.title)),
body: Column(
mainAxisAlignment: MainAxisAlignment.start,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Row(
children: <Widget>[
FlatButton(
onPressed: _testGetById,
child: Text("getById"),
color: Colors.blue,
textColor: Colors.white,
),
FlatButton(
onPressed: _testPut,
child: Text("put"),
color: Colors.blue,
textColor: Colors.white,
),
],
),
Text("$_status"),
],
),
);
}
}
1 change: 1 addition & 0 deletions examples/flutter/objectbox_demo_desktop/linux/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
flutter/
Loading