Skip to content

Commit 0af3fac

Browse files
Merge pull request #644 from DhanishMecha/feat/camera-app
feat(camera): settings screen & code refactor
2 parents 00a50fd + 9307253 commit 0af3fac

25 files changed

+731
-172
lines changed
581 Bytes
Loading

apps/camera/assets/images/back.png

512 Bytes
Loading
461 Bytes
Loading

apps/camera/assets/images/grid.png

507 Bytes
Loading

apps/camera/assets/images/hd.png

600 Bytes
Loading
709 Bytes
Loading

apps/camera/elinux/flutter/generated_plugin_registrant.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66

77
#include "generated_plugin_registrant.h"
88

9-
#include <camera_elinux/camera_elinux_plugin.h>
109
#include <video_player_elinux/video_player_elinux_plugin.h>
10+
#include <camera_elinux/camera_elinux_plugin.h>
1111

1212
void RegisterPlugins(flutter::PluginRegistry* registry) {
13-
CameraElinuxPluginRegisterWithRegistrar(
14-
registry->GetRegistrarForPlugin("CameraElinuxPlugin"));
1513
VideoPlayerElinuxPluginRegisterWithRegistrar(
1614
registry->GetRegistrarForPlugin("VideoPlayerElinuxPlugin"));
15+
CameraElinuxPluginRegisterWithRegistrar(
16+
registry->GetRegistrarForPlugin("CameraElinuxPlugin"));
1717
}

apps/camera/elinux/flutter/generated_plugin_registrant.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44

55
// ignore_for_file: lines_longer_than_80_chars
66

7-
import 'package:camera_elinux/camera_elinux.dart';
87
import 'package:video_player_elinux/video_player_elinux.dart';
8+
import 'package:camera_elinux/camera_elinux.dart';
99

1010
// ignore: public_member_api_docs
1111
void registerPlugins() {
12-
ELinuxCamera.registerWith();
1312
ELinuxVideoPlayer.registerWith();
13+
ELinuxCamera.registerWith();
1414
}

apps/camera/elinux/flutter/generated_plugins.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#
44

55
list(APPEND FLUTTER_PLUGIN_LIST
6-
camera_elinux
76
video_player_elinux
7+
camera_elinux
88
)
99

1010
list(APPEND FLUTTER_FFI_PLUGIN_LIST

apps/camera/lib/main.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import 'package:dbus/dbus.dart';
22
import 'package:flutter/material.dart';
33
import 'package:flutter/services.dart';
4+
import 'package:flutter_bloc/flutter_bloc.dart';
5+
import 'package:mechanix_camera/src/bloc/camera_bloc.dart';
46
import 'package:mechanix_camera/src/home/home.dart';
57
import 'package:mechanix_camera/load_settings.dart';
68
import 'package:watch_it/watch_it.dart';
@@ -12,7 +14,12 @@ void main() {
1214
WidgetsFlutterBinding.ensureInitialized();
1315
di.registerSingleton(ThemeToggle());
1416
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
15-
runApp(MechanixCameraApp());
17+
runApp(
18+
MultiBlocProvider(
19+
providers: [BlocProvider(create: (context) => CameraBloc())],
20+
child: MechanixCameraApp(),
21+
),
22+
);
1623
}
1724

1825
class MechanixCameraApp extends StatelessWidget with WatchItMixin {

0 commit comments

Comments
 (0)