From 14e3807c7c238a2ea1879f79da820be303cfb3ed Mon Sep 17 00:00:00 2001 From: xAlpharax <42233094+xAlpharax@users.noreply.github.com> Date: Fri, 13 Oct 2023 17:35:29 +0300 Subject: Fixed Icon Breakage Changes to be committed: deleted: android/app/src/main/res/AndroidManifest.xml new file: android/app/src/main/res/drawable-hdpi/ic_launcher_background.png new file: android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file: android/app/src/main/res/drawable-mdpi/ic_launcher_background.png new file: android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file: android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png new file: android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file: android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png new file: android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file: android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png new file: android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file: android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml modified: android/app/src/main/res/mipmap-hdpi/ic_launcher.png modified: android/app/src/main/res/mipmap-mdpi/ic_launcher.png modified: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png modified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png modified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file: android/app/src/main/res/values/colors.xml modified: lib/main.dart --- android/app/src/main/res/AndroidManifest.xml | 38 --- .../res/drawable-hdpi/ic_launcher_background.png | Bin 0 -> 1122 bytes .../res/drawable-hdpi/ic_launcher_foreground.png | Bin 0 -> 1122 bytes .../res/drawable-mdpi/ic_launcher_background.png | Bin 0 -> 673 bytes .../res/drawable-mdpi/ic_launcher_foreground.png | Bin 0 -> 673 bytes .../res/drawable-xhdpi/ic_launcher_background.png | Bin 0 -> 1636 bytes .../res/drawable-xhdpi/ic_launcher_foreground.png | Bin 0 -> 1636 bytes .../res/drawable-xxhdpi/ic_launcher_background.png | Bin 0 -> 2915 bytes .../res/drawable-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 2915 bytes .../drawable-xxxhdpi/ic_launcher_background.png | Bin 0 -> 4362 bytes .../drawable-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 4362 bytes .../src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 + .../app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 544 -> 445 bytes .../app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 442 -> 322 bytes .../app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 721 -> 604 bytes .../app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 1031 -> 973 bytes .../src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 1443 -> 1416 bytes android/app/src/main/res/values/colors.xml | 4 + lib/main.dart | 346 +-------------------- 19 files changed, 10 insertions(+), 383 deletions(-) delete mode 100644 android/app/src/main/res/AndroidManifest.xml create mode 100644 android/app/src/main/res/drawable-hdpi/ic_launcher_background.png create mode 100644 android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png create mode 100644 android/app/src/main/res/drawable-mdpi/ic_launcher_background.png create mode 100644 android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png create mode 100644 android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png create mode 100644 android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png create mode 100644 android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png create mode 100644 android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png create mode 100644 android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 android/app/src/main/res/values/colors.xml diff --git a/android/app/src/main/res/AndroidManifest.xml b/android/app/src/main/res/AndroidManifest.xml deleted file mode 100644 index dd90eee..0000000 --- a/android/app/src/main/res/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..e127458 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..e127458 Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..4f53b51 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..4f53b51 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..335a110 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..335a110 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..a255ceb Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..a255ceb Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..eaf610c Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..eaf610c Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..5f349f7 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index db77bb4..60dc7d8 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 17987b7..519150a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 09d4391..5077421 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index d5f1c8d..8f62be2 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4d6372e..d11eb7f 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..beab31f --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,4 @@ + + + #000000 + \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index 173a152..dfa3a69 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -6,7 +6,7 @@ import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart // import 'package:flutter_speed_dial/flutter_speed_dial.dart'; import 'package:flutter_tts/flutter_tts.dart'; import 'package:flutter_vision/flutter_vision.dart'; -import 'package:image_picker/image_picker.dart'; +// import 'package:image_picker/image_picker.dart'; // import 'package:yolo/result_screen.dart'; import 'package:flutter/material.dart'; @@ -436,348 +436,4 @@ class _YoloVideoState extends State { ); }).toList(); } -} - -// YOLO V5 OBJECT DETECTION - -class YoloImageV5 extends StatefulWidget { - final FlutterVision vision; - const YoloImageV5({Key? key, required this.vision}) : super(key: key); - - @override - State createState() => _YoloImageV5State(); -} - -class _YoloImageV5State extends State { - late List> yoloResults; - File? imageFile; - int imageHeight = 1; - int imageWidth = 1; - bool isLoaded = false; - - @override - void initState() { - super.initState(); - loadYoloModel().then((value) { - setState(() { - yoloResults = []; - isLoaded = true; - }); - }); - } - - @override - void dispose() async { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - final Size size = MediaQuery.of(context).size; - if (!isLoaded) { - return const Scaffold( - body: Center( - child: Text("Model not loaded, waiting for it"), - ), - ); - } - return Stack( - fit: StackFit.expand, - children: [ - imageFile != null ? Image.file(imageFile!) : const SizedBox(), - Align( - alignment: Alignment.bottomCenter, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - TextButton( - onPressed: pickImage, - child: const Text("Pick image"), - ), - ElevatedButton( - onPressed: yoloOnImage, - child: const Text("Detect"), - ) - ], - ), - ), - ...displayBoxesAroundRecognizedObjects(size), - ], - ); - } - - Future loadYoloModel() async { - await widget.vision.loadYoloModel( - labels: 'assets/labels.txt', - modelPath: 'assets/yolov5n.tflite', - modelVersion: "yolov5", - quantization: false, - numThreads: 2, - useGpu: true); - setState(() { - isLoaded = true; - }); - } - - Future pickImage() async { - final ImagePicker picker = ImagePicker(); - // Capture a photo - final XFile? photo = await picker.pickImage(source: ImageSource.gallery); - if (photo != null) { - setState(() { - imageFile = File(photo.path); - }); - } - } - - yoloOnImage() async { - yoloResults.clear(); - Uint8List byte = await imageFile!.readAsBytes(); - final image = await decodeImageFromList(byte); - imageHeight = image.height; - imageWidth = image.width; - final result = await widget.vision.yoloOnImage( - bytesList: byte, - imageHeight: image.height, - imageWidth: image.width, - iouThreshold: 0.8, - confThreshold: 0.4, - classThreshold: 0.5); - if (result.isNotEmpty) { - setState(() { - yoloResults = result; - }); - } - } - - List displayBoxesAroundRecognizedObjects(Size screen) { - if (yoloResults.isEmpty) return []; - - double factorX = screen.width / (imageWidth); - double imgRatio = imageWidth / imageHeight; - double newWidth = imageWidth * factorX; - double newHeight = newWidth / imgRatio; - double factorY = newHeight / (imageHeight); - - double pady = (screen.height - newHeight) / 2; - - Color colorPick = const Color.fromARGB(255, 50, 233, 30); - return yoloResults.map((result) { - return Positioned( - left: result["box"][0] * factorX, - top: result["box"][1] * factorY + pady, - width: (result["box"][2] - result["box"][0]) * factorX, - height: (result["box"][3] - result["box"][1]) * factorY, - child: Container( - decoration: BoxDecoration( - borderRadius: const BorderRadius.all(Radius.circular(10.0)), - border: Border.all(color: Colors.pink, width: 2.0), - ), - child: Text( - "${result['tag']} ${(result['box'][4] * 100).toStringAsFixed(0)}%", - style: TextStyle( - background: Paint()..color = colorPick, - color: Colors.white, - fontSize: 18.0, - ), - ), - ), - ); - }).toList(); - } -} - -// YOLO V8 SEMANTIC SEGMENTATION - -class YoloImageV8Seg extends StatefulWidget { - final FlutterVision vision; - const YoloImageV8Seg({Key? key, required this.vision}) : super(key: key); - - @override - State createState() => _YoloImageV8SegState(); -} - -class _YoloImageV8SegState extends State { - late List> yoloResults; - File? imageFile; - int imageHeight = 1; - int imageWidth = 1; - bool isLoaded = false; - - @override - void initState() { - super.initState(); - loadYoloModel().then((value) { - setState(() { - yoloResults = []; - isLoaded = true; - }); - }); - } - - @override - void dispose() async { - super.dispose(); - } - - @override - Widget build(BuildContext context) { - final Size size = MediaQuery.of(context).size; - if (!isLoaded) { - return const Scaffold( - body: Center( - child: Text("Model not loaded, waiting for it"), - ), - ); - } - return Stack( - fit: StackFit.expand, - children: [ - imageFile != null ? Image.file(imageFile!) : const SizedBox(), - Align( - alignment: Alignment.bottomCenter, - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - TextButton( - onPressed: pickImage, - child: const Text("Pick image"), - ), - ElevatedButton( - onPressed: yoloOnImage, - child: const Text("Detect"), - ) - ], - ), - ), - ...displayBoxesAroundRecognizedObjects(size), - ], - ); - } - - Future loadYoloModel() async { - await widget.vision.loadYoloModel( - labels: 'assets/labels.txt', - modelPath: 'assets/yolov8n-seg.tflite', - modelVersion: "yolov8seg", - quantization: false, - numThreads: 2, - useGpu: true); - setState(() { - isLoaded = true; - }); - } - - Future pickImage() async { - final ImagePicker picker = ImagePicker(); - // Capture a photo - final XFile? photo = await picker.pickImage(source: ImageSource.gallery); - if (photo != null) { - setState(() { - imageFile = File(photo.path); - }); - } - } - - yoloOnImage() async { - yoloResults.clear(); - Uint8List byte = await imageFile!.readAsBytes(); - final image = await decodeImageFromList(byte); - imageHeight = image.height; - imageWidth = image.width; - final result = await widget.vision.yoloOnImage( - bytesList: byte, - imageHeight: image.height, - imageWidth: image.width, - iouThreshold: 0.8, - confThreshold: 0.4, - classThreshold: 0.5); - if (result.isNotEmpty) { - setState(() { - yoloResults = result; - }); - } - } - - List displayBoxesAroundRecognizedObjects(Size screen) { - if (yoloResults.isEmpty) return []; - - double factorX = screen.width / (imageWidth); - double imgRatio = imageWidth / imageHeight; - double newWidth = imageWidth * factorX; - double newHeight = newWidth / imgRatio; - double factorY = newHeight / (imageHeight); - - double pady = (screen.height - newHeight) / 2; - - Color colorPick = const Color.fromARGB(255, 50, 233, 30); - return yoloResults.map((result) { - return Stack(children: [ - Positioned( - left: result["box"][0] * factorX, - top: result["box"][1] * factorY + pady, - width: (result["box"][2] - result["box"][0]) * factorX, - height: (result["box"][3] - result["box"][1]) * factorY, - child: Container( - decoration: BoxDecoration( - borderRadius: const BorderRadius.all(Radius.circular(10.0)), - border: Border.all(color: Colors.pink, width: 2.0), - ), - child: Text( - "${result['tag']} ${(result['box'][4] * 100).toStringAsFixed(0)}%", - style: TextStyle( - background: Paint()..color = colorPick, - color: Colors.white, - fontSize: 18.0, - ), - ), - ), - ), - Positioned( - left: result["box"][0] * factorX, - top: result["box"][1] * factorY + pady, - width: (result["box"][2] - result["box"][0]) * factorX, - height: (result["box"][3] - result["box"][1]) * factorY, - child: CustomPaint( - painter: PolygonPainter( - points: (result["polygons"] as List).map((e) { - Map xy = Map.from(e); - xy['x'] = (xy['x'] as double) * factorX; - xy['y'] = (xy['y'] as double) * factorY; - return xy; - }).toList()), - )), - ]); - }).toList(); - } -} - -class PolygonPainter extends CustomPainter { - final List> points; - - PolygonPainter({required this.points}); - - @override - void paint(Canvas canvas, Size size) { - final paint = Paint() - ..color = const Color.fromARGB(129, 255, 2, 124) - ..strokeWidth = 2 - ..style = PaintingStyle.fill; - - final path = Path(); - if (points.isNotEmpty) { - path.moveTo(points[0]['x']!, points[0]['y']!); - for (var i = 1; i < points.length; i++) { - path.lineTo(points[i]['x']!, points[i]['y']!); - } - path.close(); - } - - canvas.drawPath(path, paint); - } - - @override - bool shouldRepaint(CustomPainter oldDelegate) { - return false; - } } \ No newline at end of file -- cgit v1.2.3