Skip to content
This repository has been archived by the owner on Jun 28, 2023. It is now read-only.

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
thielepaul committed Mar 4, 2022
1 parent 5dd5c32 commit 5447698
Show file tree
Hide file tree
Showing 20 changed files with 121 additions and 68 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.photoprism.photoprism_app

import io.flutter.embedding.android.FlutterActivity

class MainActivity: FlutterActivity() {
}
12 changes: 12 additions & 0 deletions android/app/src/main/res/drawable-v21/launch_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:colorBackground" />

<!-- You can insert your own image assets here -->
<!-- <item>
<bitmap
android:gravity="center"
android:src="@mipmap/launch_image" />
</item> -->
</layer-list>
18 changes: 18 additions & 0 deletions android/app/src/main/res/values-night/styles.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
<style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
Flutter draws its first frame -->
<item name="android:windowBackground">@drawable/launch_background</item>
</style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
This Theme is only used starting with V2 of Flutter's Android embedding. -->
<style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
<item name="android:windowBackground">?android:colorBackground</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion build.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
targets:
$default:
builders:
moor_generator:
drift_dev:
options:
generate_connect_constructor: true
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
8 changes: 8 additions & 0 deletions ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>PreviewsEnabled</key>
<false/>
</dict>
</plist>
2 changes: 1 addition & 1 deletion lib/api/db_api.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:convert';

import 'package:drift/native.dart';
import 'package:flutter/material.dart';
import 'package:http/http.dart' as http;
import 'package:moor/ffi.dart';
import 'package:photoprism/api/api.dart';
import 'package:photoprism/common/db.dart';
import 'package:photoprism/model/photoprism_model.dart';
Expand Down
4 changes: 2 additions & 2 deletions lib/common/db.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'dart:io' as io;
import 'package:moor/moor.dart';
import 'package:drift/drift.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart';
import 'package:photoprism/model/albums.dart';
Expand All @@ -10,7 +10,7 @@ import 'package:photoprism/model/photos_albums.dart';

part 'db.g.dart';

@UseMoor(tables: <Type>[Photos, Files, Albums, PhotosAlbums])
@DriftDatabase(tables: <Type>[Photos, Files, Albums, PhotosAlbums])
class MyDatabase extends _$MyDatabase {
MyDatabase(QueryExecutor e) : super(e);

Expand Down
16 changes: 8 additions & 8 deletions lib/common/db_init.dart
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
import 'dart:io' as io;
import 'dart:isolate';

import 'package:moor/ffi.dart';
import 'package:moor/isolate.dart';
import 'package:moor/moor.dart';
import 'package:drift/drift.dart';
import 'package:drift/isolate.dart';
import 'package:drift/native.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart';
import 'package:photoprism/common/db.dart';

Future<MyDatabase> connectDbAsync() async {
final MoorIsolate isolate = await _createMoorIsolate();
final DriftIsolate isolate = await _createMoorIsolate();
return MyDatabase.connect(await isolate.connect());
}

Future<MoorIsolate> _createMoorIsolate() async {
Future<DriftIsolate> _createMoorIsolate() async {
final io.Directory dir = await getApplicationDocumentsDirectory();
final String path = p.join(dir.path, 'db.sqlite');
final ReceivePort receivePort = ReceivePort();
Expand All @@ -23,12 +23,12 @@ Future<MoorIsolate> _createMoorIsolate() async {
_IsolateStartRequest(receivePort.sendPort, path),
);

return await receivePort.first as MoorIsolate;
return await receivePort.first as DriftIsolate;
}

void _startBackground(_IsolateStartRequest request) {
final VmDatabase executor = VmDatabase(io.File(request.targetPath));
final MoorIsolate moorIsolate = MoorIsolate.inCurrent(
final NativeDatabase executor = NativeDatabase(io.File(request.targetPath));
final DriftIsolate moorIsolate = DriftIsolate.inCurrent(
() => DatabaseConnection.fromExecutor(executor),
);
request.sendMoorIsolate.send(moorIsolate);
Expand Down
2 changes: 1 addition & 1 deletion lib/model/albums.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:moor/moor.dart';
import 'package:drift/drift.dart';

class Albums extends Table {
@JsonKey('ID')
Expand Down
2 changes: 1 addition & 1 deletion lib/model/files.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:moor/moor.dart';
import 'package:drift/drift.dart';

class Files extends Table {
@JsonKey('PhotoUID')
Expand Down
2 changes: 1 addition & 1 deletion lib/model/filter_photos.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'dart:convert';

import 'package:drift/drift.dart';
import 'package:enum_to_string/enum_to_string.dart';
import 'package:moor/moor.dart';
import 'package:shared_preferences/shared_preferences.dart';

enum PhotoSort { TakenAt, CreatedAt, UpdatedAt }
Expand Down
2 changes: 1 addition & 1 deletion lib/model/photos.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:moor/moor.dart';
import 'package:drift/drift.dart';

class Photos extends Table {
@JsonKey('ID')
Expand Down
2 changes: 1 addition & 1 deletion lib/model/photos_albums.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:moor/moor.dart';
import 'package:drift/drift.dart';

class PhotosAlbums extends Table {
@JsonKey('PhotoUID')
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/filter_photos_dialog.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:drift/drift.dart' as moor;
import 'package:easy_localization/easy_localization.dart';
import 'package:enum_to_string/enum_to_string.dart';
import 'package:flutter/material.dart';
import 'package:moor/moor.dart' as moor;
import 'package:photoprism/model/filter_photos.dart';
import 'package:photoprism/model/photoprism_model.dart';
import 'package:provider/provider.dart';
Expand Down
Loading

0 comments on commit 5447698

Please sign in to comment.