Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
committed Dec 31, 2024
1 parent 192febc commit 7d32ab0
Show file tree
Hide file tree
Showing 8 changed files with 53 additions and 78 deletions.
29 changes: 29 additions & 0 deletions package/general/.flutter-plugins
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# This is a generated file; do not edit or check into version control.
camera=/home/galaxeus/.pub-cache/hosted/pub.dev/camera-0.11.0+2/
camera_android_camerax=/home/galaxeus/.pub-cache/hosted/pub.dev/camera_android_camerax-0.6.9+2/
camera_avfoundation=/home/galaxeus/.pub-cache/hosted/pub.dev/camera_avfoundation-0.9.17+4/
camera_web=/home/galaxeus/.pub-cache/hosted/pub.dev/camera_web-0.3.5/
camera_windows=/home/galaxeus/.pub-cache/hosted/pub.dev/camera_windows-0.2.6+1/
file_picker=/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/
flutter_background=/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_background-1.3.0+1/
flutter_plugin_android_lifecycle=/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.23/
flutter_tts=/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_tts-4.2.0/
local_auth=/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth-2.3.0/
local_auth_android=/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_android-1.0.46/
local_auth_darwin=/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_darwin-1.4.1/
local_auth_windows=/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_windows-1.0.11/
media_kit_video=/home/galaxeus/.pub-cache/hosted/pub.dev/media_kit_video-1.2.5/
package_info_plus=/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/
permission_handler=/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler-11.3.1/
permission_handler_android=/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.12/
permission_handler_apple=/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.5/
permission_handler_html=/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+2/
permission_handler_windows=/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/
screen_brightness=/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness-0.2.2+1/
screen_brightness_android=/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_android-0.1.0+2/
screen_brightness_ios=/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_ios-0.1.0/
screen_brightness_macos=/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_macos-0.1.0+1/
screen_brightness_windows=/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_windows-0.1.3/
speech_to_text=/home/galaxeus/.pub-cache/hosted/pub.dev/speech_to_text-7.0.0/
volume_controller=/home/galaxeus/.pub-cache/hosted/pub.dev/volume_controller-2.0.8/
wakelock_plus=/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/
1 change: 1 addition & 0 deletions package/general/.flutter-plugins-dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"camera_avfoundation","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/camera_avfoundation-0.9.17+4/","native_build":true,"dependencies":[]},{"name":"file_picker","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/","native_build":true,"dependencies":[]},{"name":"flutter_tts","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_tts-4.2.0/","native_build":true,"dependencies":[]},{"name":"local_auth_darwin","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_darwin-1.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"media_kit_video","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/media_kit_video-1.2.5/","native_build":true,"dependencies":["wakelock_plus","volume_controller"]},{"name":"package_info_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/","native_build":true,"dependencies":[]},{"name":"permission_handler_apple","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_apple-9.4.5/","native_build":true,"dependencies":[]},{"name":"screen_brightness_ios","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_ios-0.1.0/","native_build":true,"dependencies":[]},{"name":"speech_to_text","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/speech_to_text-7.0.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"volume_controller","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/volume_controller-2.0.8/","native_build":true,"dependencies":[]},{"name":"wakelock_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/","native_build":true,"dependencies":["package_info_plus"]}],"android":[{"name":"camera_android_camerax","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/camera_android_camerax-0.6.9+2/","native_build":true,"dependencies":[]},{"name":"file_picker","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_background","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_background-1.3.0+1/","native_build":true,"dependencies":[]},{"name":"flutter_plugin_android_lifecycle","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_plugin_android_lifecycle-2.0.23/","native_build":true,"dependencies":[]},{"name":"flutter_tts","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_tts-4.2.0/","native_build":true,"dependencies":[]},{"name":"local_auth_android","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_android-1.0.46/","native_build":true,"dependencies":["flutter_plugin_android_lifecycle"]},{"name":"media_kit_video","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/media_kit_video-1.2.5/","native_build":true,"dependencies":["wakelock_plus","volume_controller"]},{"name":"package_info_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/","native_build":true,"dependencies":[]},{"name":"permission_handler_android","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_android-12.0.12/","native_build":true,"dependencies":[]},{"name":"screen_brightness_android","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_android-0.1.0+2/","native_build":true,"dependencies":[]},{"name":"speech_to_text","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/speech_to_text-7.0.0/","native_build":true,"dependencies":[]},{"name":"volume_controller","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/volume_controller-2.0.8/","native_build":true,"dependencies":[]},{"name":"wakelock_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/","native_build":true,"dependencies":["package_info_plus"]}],"macos":[{"name":"file_picker","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/","native_build":false,"dependencies":[]},{"name":"flutter_tts","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_tts-4.2.0/","native_build":true,"dependencies":[]},{"name":"local_auth_darwin","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_darwin-1.4.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"media_kit_video","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/media_kit_video-1.2.5/","native_build":true,"dependencies":["wakelock_plus"]},{"name":"package_info_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/","native_build":true,"dependencies":[]},{"name":"screen_brightness_macos","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_macos-0.1.0+1/","native_build":true,"dependencies":[]},{"name":"speech_to_text","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/speech_to_text-7.0.0/","shared_darwin_source":true,"native_build":true,"dependencies":[]},{"name":"wakelock_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/","native_build":true,"dependencies":["package_info_plus"]}],"linux":[{"name":"file_picker","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/","native_build":false,"dependencies":[]},{"name":"media_kit_video","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/media_kit_video-1.2.5/","native_build":true,"dependencies":["wakelock_plus"]},{"name":"package_info_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/","native_build":false,"dependencies":[]},{"name":"wakelock_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/","native_build":false,"dependencies":["package_info_plus"]}],"windows":[{"name":"camera_windows","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/camera_windows-0.2.6+1/","native_build":true,"dependencies":[]},{"name":"file_picker","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/","native_build":false,"dependencies":[]},{"name":"flutter_tts","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_tts-4.2.0/","native_build":true,"dependencies":[]},{"name":"local_auth_windows","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/local_auth_windows-1.0.11/","native_build":true,"dependencies":[]},{"name":"media_kit_video","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/media_kit_video-1.2.5/","native_build":true,"dependencies":["wakelock_plus"]},{"name":"package_info_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/","native_build":false,"dependencies":[]},{"name":"permission_handler_windows","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_windows-0.2.1/","native_build":true,"dependencies":[]},{"name":"screen_brightness_windows","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/screen_brightness_windows-0.1.3/","native_build":true,"dependencies":[]},{"name":"wakelock_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/","native_build":false,"dependencies":["package_info_plus"]}],"web":[{"name":"camera_web","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/camera_web-0.3.5/","dependencies":[]},{"name":"file_picker","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/file_picker-8.1.4/","dependencies":[]},{"name":"flutter_tts","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/flutter_tts-4.2.0/","dependencies":[]},{"name":"package_info_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/package_info_plus-8.0.3/","dependencies":[]},{"name":"permission_handler_html","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/permission_handler_html-0.1.3+2/","dependencies":[]},{"name":"speech_to_text","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/speech_to_text-7.0.0/","dependencies":[]},{"name":"wakelock_plus","path":"/home/galaxeus/.pub-cache/hosted/pub.dev/wakelock_plus-1.2.8/","dependencies":["package_info_plus"]}]},"dependencyGraph":[{"name":"camera","dependencies":["camera_android_camerax","camera_avfoundation","camera_web","flutter_plugin_android_lifecycle"]},{"name":"camera_android_camerax","dependencies":[]},{"name":"camera_avfoundation","dependencies":[]},{"name":"camera_web","dependencies":[]},{"name":"camera_windows","dependencies":[]},{"name":"file_picker","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"flutter_background","dependencies":[]},{"name":"flutter_plugin_android_lifecycle","dependencies":[]},{"name":"flutter_tts","dependencies":[]},{"name":"local_auth","dependencies":["local_auth_android","local_auth_darwin","local_auth_windows"]},{"name":"local_auth_android","dependencies":["flutter_plugin_android_lifecycle"]},{"name":"local_auth_darwin","dependencies":[]},{"name":"local_auth_windows","dependencies":[]},{"name":"media_kit_video","dependencies":["wakelock_plus","screen_brightness","volume_controller"]},{"name":"package_info_plus","dependencies":[]},{"name":"permission_handler","dependencies":["permission_handler_android","permission_handler_apple","permission_handler_html","permission_handler_windows"]},{"name":"permission_handler_android","dependencies":[]},{"name":"permission_handler_apple","dependencies":[]},{"name":"permission_handler_html","dependencies":[]},{"name":"permission_handler_windows","dependencies":[]},{"name":"screen_brightness","dependencies":["screen_brightness_android","screen_brightness_ios","screen_brightness_macos","screen_brightness_windows"]},{"name":"screen_brightness_android","dependencies":[]},{"name":"screen_brightness_ios","dependencies":[]},{"name":"screen_brightness_macos","dependencies":[]},{"name":"screen_brightness_windows","dependencies":[]},{"name":"speech_to_text","dependencies":[]},{"name":"volume_controller","dependencies":[]},{"name":"wakelock_plus","dependencies":["package_info_plus"]}],"date_created":"2024-12-31 08:26:12.173648","version":"3.27.0","swift_package_manager_enabled":false}
5 changes: 5 additions & 0 deletions package/general/bin/general.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import 'package:general/cli/cli.dart';

void main(List<String> args) {
generalLibraryCli(argsRaw: args);
}
43 changes: 0 additions & 43 deletions package/general/bin/install.dart

This file was deleted.

23 changes: 7 additions & 16 deletions package/general/lib/cli/cli.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:general/api/api.dart';
import 'package:general_lib/general_lib.dart';
import 'package:mason_logger/mason_logger.dart';
import 'package:universal_io/io.dart';
import 'package:io_universe/io_universe.dart';

final Logger logger = Logger();

Expand Down Expand Up @@ -39,26 +39,20 @@ Future<void> generalLibraryCli({
}

if (command == "init") {
await generalLibraryApi
.create(newName: ".", directoryBase: Directory.current)
.listen((event) {
await generalLibraryApi.create(newName: ".", directoryBase: Directory.current).listen((event) {
printed(event);
}).asFuture();
exit(0);
}

if (command == "setup") {
await generalLibraryApi
.setup(directoryBase: Directory.current)
.listen((event) {
await generalLibraryApi.setup(directoryBase: Directory.current).listen((event) {
printed(event);
}).asFuture();
exit(0);
}
if (command == "patch") {
await generalLibraryApi
.patch(directoryBase: Directory.current)
.listen((event) {
await generalLibraryApi.patch(directoryBase: Directory.current).listen((event) {
printed(event);
}).asFuture();
exit(0);
Expand All @@ -69,19 +63,16 @@ Future<void> generalLibraryCli({

Progress progress = logger.progress("message");
void printed(GeneralLibraryApiStatus event) {
if (event.serverUniverseApiStatusType ==
GeneralLibraryApiStatusType.progress_start) {
if (event.serverUniverseApiStatusType == GeneralLibraryApiStatusType.progress_start) {
progress.cancel();
progress = logger.progress(event.value);
return;
}
if (event.serverUniverseApiStatusType ==
GeneralLibraryApiStatusType.progress) {
if (event.serverUniverseApiStatusType == GeneralLibraryApiStatusType.progress) {
progress.update(event.value);
return;
}
if (event.serverUniverseApiStatusType ==
GeneralLibraryApiStatusType.progress_complete) {
if (event.serverUniverseApiStatusType == GeneralLibraryApiStatusType.progress_complete) {
progress.complete(event.value);

// progress.cancel();
Expand Down
17 changes: 6 additions & 11 deletions package/general/lib/flutter/camera/camera_core.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import 'package:flutter/material.dart';
import 'package:general/core/camera/camera.dart';
import 'package:flutter/foundation.dart';
import 'package:general/flutter/camera/widget/camera_widget.dart';
import 'package:universal_io/io.dart';
import 'package:io_universe/io_universe.dart';

import 'package:camera/camera.dart' as camera_package;
import 'package:camera_windows/camera_windows.dart' as camera_package_windows;
Expand All @@ -53,8 +53,7 @@ class GeneralLibraryCameraBaseFlutter implements GeneralLibraryCameraBase {
bool is_select_camera = false;
bool is_camera_active = false;

bool get isDesktop =>
Platform.isWindows || Platform.isLinux || Platform.isMacOS;
bool get isDesktop => Platform.isWindows || Platform.isLinux || Platform.isMacOS;
bool get isMobile => Platform.isAndroid || Platform.isIOS || kIsWeb;

Future<void> initializeCameras() async {
Expand Down Expand Up @@ -100,8 +99,7 @@ class GeneralLibraryCameraBaseFlutter implements GeneralLibraryCameraBase {

if (isDesktop) {
if (Platform.isWindows) {
camera_id = await camera_windows.createCamera(
camera_mobile_datas.first, camera_package.ResolutionPreset.max);
camera_id = await camera_windows.createCamera(camera_mobile_datas.first, camera_package.ResolutionPreset.max);
is_select_camera = true;
setState(() {});
}
Expand All @@ -119,8 +117,7 @@ class GeneralLibraryCameraBaseFlutter implements GeneralLibraryCameraBase {
}
if (isMobile) {
for (var i = 0; i < camera_mobile_datas.length; i++) {
camera_package.CameraDescription camera_mobile_data =
camera_mobile_datas[i];
camera_package.CameraDescription camera_mobile_data = camera_mobile_datas[i];
if (i == (camera_id - 1)) {
camera_mobile_controller = camera_package.CameraController(
camera_mobile_data,
Expand All @@ -135,8 +132,7 @@ class GeneralLibraryCameraBaseFlutter implements GeneralLibraryCameraBase {
if (isDesktop) {
if (Platform.isWindows) {
for (var i = 0; i < camera_mobile_datas.length; i++) {
camera_package.CameraDescription camera_mobile_data =
camera_mobile_datas[i];
camera_package.CameraDescription camera_mobile_data = camera_mobile_datas[i];
if (i == (camera_id - 1)) {
camera_id = await camera_windows.createCamera(
camera_mobile_data,
Expand Down Expand Up @@ -553,6 +549,5 @@ class CameraTakePictureData {
String path;
String name;

CameraTakePictureData(
{required this.mimeType, required this.path, required this.name});
CameraTakePictureData({required this.mimeType, required this.path, required this.name});
}
9 changes: 3 additions & 6 deletions package/general/lib/flutter/camera/widget/camera_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:general/flutter/camera/camera_core.dart';

import 'package:universal_io/io.dart';
import 'package:io_universe/io_universe.dart';
import 'package:camera/camera.dart' as camera_package;

class CameraWidget extends StatefulWidget {
Expand All @@ -64,9 +64,7 @@ class CameraWidget extends StatefulWidget {
class _CameraState extends State<CameraWidget> {
@override
Widget build(BuildContext context) {
if (!widget.generalLibraryCameraBase.is_camera_init ||
!widget.generalLibraryCameraBase.is_select_camera ||
!widget.generalLibraryCameraBase.is_camera_active) {
if (!widget.generalLibraryCameraBase.is_camera_init || !widget.generalLibraryCameraBase.is_select_camera || !widget.generalLibraryCameraBase.is_camera_active) {
if (!widget.generalLibraryCameraBase.is_camera_init) {
return widget.onCameraNotInit(context);
}
Expand All @@ -92,8 +90,7 @@ class _CameraState extends State<CameraWidget> {
),
);
return Visibility(
visible: widget.generalLibraryCameraBase.camera_mobile_controller.value
.isInitialized,
visible: widget.generalLibraryCameraBase.camera_mobile_controller.value.isInitialized,
replacement: const CircularProgressIndicator(),
child: camera_package.CameraPreview(
widget.generalLibraryCameraBase.camera_mobile_controller,
Expand Down
Loading

0 comments on commit 7d32ab0

Please sign in to comment.