update

Author: hoc081098

README.md

@@ -1,23 +1,10 @@
 # sqlite_bloc_rxdart
 
-A new Flutter project.
+sqlite BLoC rxdart
 
 # Screenshots
 
 | Home page  | Detail page & Edit page | Add new page |
 | ------------- | ------------- | --------------
-| ![home](screenshots/home.gif)  | ![detail_and_edit](screenshots/detail_and_edit.gif)  | ![add_new](screenshots/add_new.gif)  |
+| ![home](https://github.com/hoc081098/hoc081098.github.io/blob/master/sqlite_bloc_rxdart/home.gif?raw=true)  | ![detail_and_edit](https://github.com/hoc081098/hoc081098.github.io/blob/master/sqlite_bloc_rxdart/detail_and_edit.gif?raw=true)  | ![add_new](https://github.com/hoc081098/hoc081098.github.io/blob/master/sqlite_bloc_rxdart/add_new.gif?raw=true)  |
 
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://flutter.io/docs/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://flutter.io/docs/cookbook)
-
-For help getting started with Flutter, view our 
-[online documentation](https://flutter.io/docs), which offers tutorials, 
-samples, guidance on mobile development, and a full API reference.

analysis_options.yaml

@@ -1,4 +1,5 @@
 include: package:pedantic/analysis_options.1.9.0.yaml
 linter:
   rules:
-    - prefer_final_locals
+    - prefer_final_locals
+    - prefer_relative_imports

lib/app.dart

@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc_pattern/flutter_bloc_pattern.dart';
 import 'package:flutter_provider/flutter_provider.dart';
-import 'package:sqlite_bloc_rxdart/domain/contact_repository.dart';
-import 'package:sqlite_bloc_rxdart/pages/home/home_bloc.dart';
-import 'package:sqlite_bloc_rxdart/pages/home/home_page.dart';
+
+import 'domain/contact_repository.dart';
+import 'pages/home/home_bloc.dart';
+import 'pages/home/home_page.dart';
 
 class MyApp extends StatelessWidget {
   const MyApp({Key key}) : super(key: key);

lib/data/contact_repository_impl.dart

@@ -1,7 +1,7 @@
-import 'package:sqlite_bloc_rxdart/data/contact_dao.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_entity.dart';
-import 'package:sqlite_bloc_rxdart/domain/contact.dart';
-import 'package:sqlite_bloc_rxdart/domain/contact_repository.dart';
+import '../domain/contact.dart';
+import '../domain/contact_repository.dart';
+import 'local/dao/contact_dao.dart';
+import 'local/dao/contact_entity.dart';
 
 class ContactRepositoryImpl implements ContactRepository {
   final ContactDao _contactDao;
@@ -10,8 +10,8 @@ class ContactRepositoryImpl implements ContactRepository {
 
   @override
   Stream<List<Contact>> search({String query = ''}) {
-    return _contactDao.search(query).map((entites) {
-      return entites.map(_toContact).toList(growable: false);
+    return _contactDao.search(query).map((entities) {
+      return entities.map(_toContact).toList(growable: false);
     });
   }
 

lib/data/app_database.dart renamed to lib/data/local/app_database.dart

@@ -2,26 +2,28 @@ import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:sqflite/sqflite.dart';
 import 'package:sqlbrite/sqlbrite.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_dao.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_dao_impl.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_entity.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_entry.dart';
+
+import 'dao/contact_dao.dart';
+import 'dao/contact_dao_impl.dart';
+import 'dao/contact_entity.dart';
+import 'dao/contact_entry.dart';
 
 const dbName = 'flutter_sqlite_bloc_rxdart.db';
 
 class AppDatabase {
-  static Database _db;
-
-  static Future<Database> get _dbFuture async => _db ??= await _open();
-
   final ContactDao contactDao;
 
-  AppDatabase()
-      : contactDao = ContactDaoImpl(_dbFuture.then((db) => BriteDatabase(db)));
+  AppDatabase._(this.contactDao);
+
+  factory AppDatabase() {
+    final _dbFuture = _open().then((db) => BriteDatabase(db));
+    return AppDatabase._(ContactDaoImpl(_dbFuture));
+  }
 
   static Future<Database> _open() async {
     final directory = await getApplicationDocumentsDirectory();
     final path = join(directory.path, dbName);
+
     return await openDatabase(
       path,
       version: 1,

lib/data/contact_dao.dart renamed to lib/data/local/dao/contact_dao.dart

@@ -1,4 +1,4 @@
-import 'package:sqlite_bloc_rxdart/data/contact_entity.dart';
+import 'contact_entity.dart';
 
 abstract class ContactDao {
   Stream<List<ContactEntity>> search(String query);

lib/data/contact_dao_impl.dart renamed to lib/data/local/dao/contact_dao_impl.dart

@@ -1,9 +1,10 @@
 import 'package:rxdart/rxdart.dart';
 import 'package:sqflite/sqflite.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_dao.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_entry.dart';
 import 'package:sqlbrite/sqlbrite.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_entity.dart';
+
+import 'contact_dao.dart';
+import 'contact_entity.dart';
+import 'contact_entry.dart';
 
 class ContactDaoImpl implements ContactDao {
   final Future<BriteDatabase> _briteDatabaseFuture;

lib/data/contact_entity.dart renamed to lib/data/local/dao/contact_entity.dart

@@ -1,5 +1,6 @@
-import 'package:flutter/widgets.dart';
-import 'package:sqlite_bloc_rxdart/data/contact_entry.dart';
+import 'package:meta/meta.dart';
+
+import 'contact_entry.dart';
 
 class ContactEntity {
   final int id;

lib/data/contact_entry.dart renamed to lib/data/local/dao/contact_entry.dart

@@ -1,4 +1,4 @@
-import 'package:sqlite_bloc_rxdart/domain/contact.dart';
+import 'contact.dart';
 
 abstract class ContactRepository {
   Stream<List<Contact>> search({String query = ''});