From 87706a49bad4821a8c4342aed3ee587fe3fa46a3 Mon Sep 17 00:00:00 2001 From: commitimpush Date: Wed, 31 Aug 2022 10:19:57 +0200 Subject: [PATCH] Code improvements and removed calculator --- CHANGELOG.md | 7 +- example/lib/main_calculator.dart | 149 --------------------- example/test/widget_test.dart | 30 ----- lib/calculator.dart | 17 --- lib/src/screens/image_picker_ui.dart | 15 +-- lib/src/services/image_picker_service.dart | 12 ++ test/flutter_image_picker_test.dart | 32 ----- 7 files changed, 24 insertions(+), 238 deletions(-) delete mode 100644 example/lib/main_calculator.dart delete mode 100644 example/test/widget_test.dart delete mode 100644 lib/calculator.dart create mode 100644 lib/src/services/image_picker_service.dart delete mode 100644 test/flutter_image_picker_test.dart diff --git a/CHANGELOG.md b/CHANGELOG.md index 772557d..7a2ce96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,12 @@ * Added more folders -# 0.0.5 +## 0.0.5 * Added image picker package which shows a dialog to choose an image from gallery or to make a picture with the camera * Added example app to test/show off the image picker package functionality + +## 0.0.6 + +* Code improvements +* Removed the calculator test application \ No newline at end of file diff --git a/example/lib/main_calculator.dart b/example/lib/main_calculator.dart deleted file mode 100644 index 41a9848..0000000 --- a/example/lib/main_calculator.dart +++ /dev/null @@ -1,149 +0,0 @@ -import 'package:flutter/material.dart'; -import 'package:flutter_image_picker/calculator.dart'; - -void main() { - runApp(const MyApp()); -} - -class MyApp extends StatelessWidget { - const MyApp({Key? key}) : super(key: key); - - // This widget is the root of your application. - @override - Widget build(BuildContext context) { - return MaterialApp( - title: 'Flutter Demo', - theme: ThemeData( - // This is the theme of your application. - // - // Try running your application with "flutter run". You'll see the - // application has a blue toolbar. Then, without quitting the app, try - // changing the primarySwatch below to Colors.green and then invoke - // "hot reload" (press "r" in the console where you ran "flutter run", - // or simply save your changes to "hot reload" in a Flutter IDE). - // Notice that the counter didn't reset back to zero; the application - // is not restarted. - primarySwatch: Colors.blue, - ), - home: const MyHomePage(title: 'Flutter Demo Home Page'), - ); - } -} - -class MyHomePage extends StatefulWidget { - const MyHomePage({Key? key, required this.title}) : super(key: key); - - // This widget is the home page of your application. It is stateful, meaning - // that it has a State object (defined below) that contains fields that affect - // how it looks. - - // This class is the configuration for the state. It holds the values (in this - // case the title) provided by the parent (in this case the App widget) and - // used by the build method of the State. Fields in a Widget subclass are - // always marked "final". - - final String title; - - @override - State createState() => _MyHomePageState(); -} - -class _MyHomePageState extends State { - var c = Calculator(); - int _counter = 0; - - void _incrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter = c.addOne(_counter); - if (_counter % 10 == 0) { - _counter = c.valueTimesTen(_counter); - } - }); - } - - void _decrementCounter() { - setState(() { - // This call to setState tells the Flutter framework that something has - // changed in this State, which causes it to rerun the build method below - // so that the display can reflect the updated values. If we changed - // _counter without calling setState(), then the build method would not be - // called again, and so nothing would appear to happen. - _counter = c.substractOne(_counter); - if (_counter % 10.0 == 0.0) { - _counter = c.valueDividedByTen(_counter); - } - }); - } - - @override - Widget build(BuildContext context) { - // This method is rerun every time setState is called, for instance as done - // by the _incrementCounter method above. - // - // The Flutter framework has been optimized to make rerunning build methods - // fast, so that you can just rebuild anything that needs updating rather - // than having to individually change instances of widgets. - return Scaffold( - appBar: AppBar( - // Here we take the value from the MyHomePage object that was created by - // the App.build method, and use it to set our appbar title. - title: Text(widget.title), - ), - body: Center( - // Center is a layout widget. It takes a single child and positions it - // in the middle of the parent. - child: Column( - // Column is also a layout widget. It takes a list of children and - // arranges them vertically. By default, it sizes itself to fit its - // children horizontally, and tries to be as tall as its parent. - // - // Invoke "debug painting" (press "p" in the console, choose the - // "Toggle Debug Paint" action from the Flutter Inspector in Android - // Studio, or the "Toggle Debug Paint" command in Visual Studio Code) - // to see the wireframe for each widget. - // - // Column has various properties to control how it sizes itself and - // how it positions its children. Here we use mainAxisAlignment to - // center the children vertically; the main axis here is the vertical - // axis because Columns are vertical (the cross axis would be - // horizontal). - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const Text( - 'You have pushed the button this many times:', - ), - Text( - '$_counter', - style: Theme.of(context).textTheme.headline4, - ), - ], - ), - ), - floatingActionButton: Stack(children: [ - Align( - alignment: Alignment.bottomCenter, - child: FloatingActionButton( - heroTag: null, - onPressed: _decrementCounter, - tooltip: 'Decrement', - child: const Icon(Icons.exposure_minus_1), - ), - ), - Align( - alignment: Alignment.bottomRight, - child: FloatingActionButton( - heroTag: null, - onPressed: _incrementCounter, - tooltip: 'Increment', - child: const Icon(Icons.add), - ), - ), - ]), - ); - } -} diff --git a/example/test/widget_test.dart b/example/test/widget_test.dart deleted file mode 100644 index 4f0b14a..0000000 --- a/example/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility in the flutter_test package. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:flutter_image_picker_example/main_calculator.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(const MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} diff --git a/lib/calculator.dart b/lib/calculator.dart deleted file mode 100644 index 0514711..0000000 --- a/lib/calculator.dart +++ /dev/null @@ -1,17 +0,0 @@ -library flutter_image_picker; - -/// A Calculator. -class Calculator { - /// Returns [value] plus 1. - int addOne(int value) => value + 1; - - int substractOne(int value) => value - 1; - - int valueTimesTen(int value) { - return value * 10; - } - - int valueDividedByTen(int value) { - return (value / 10).round(); - } -} diff --git a/lib/src/screens/image_picker_ui.dart b/lib/src/screens/image_picker_ui.dart index 1c10684..2634350 100644 --- a/lib/src/screens/image_picker_ui.dart +++ b/lib/src/screens/image_picker_ui.dart @@ -1,10 +1,11 @@ import 'dart:typed_data'; import 'package:flutter/material.dart'; +import 'package:flutter_image_picker/src/services/image_picker_service.dart'; import 'package:image_picker/image_picker.dart'; class ImagePickerUI { - final ImagePicker _imagePicker = ImagePicker(); + final ImagePickerService _imagePickerService = ImagePickerService(); Future pickImageDialog(BuildContext context) async { return await showDialog( @@ -23,11 +24,13 @@ class ImagePickerUI { ), actions: [ ElevatedButton( - onPressed: () => _pickImage(ImageSource.gallery, context), + onPressed: () => + _imagePickerService.pickImage(ImageSource.gallery, context), child: const Text('Pick image from Gallery'), ), ElevatedButton( - onPressed: () => _pickImage(ImageSource.camera, context), + onPressed: () => + _imagePickerService.pickImage(ImageSource.camera, context), child: const Text('Make picture with Camera'), ), TextButton( @@ -41,10 +44,4 @@ class ImagePickerUI { }, ); } - - void _pickImage(ImageSource source, BuildContext context) async { - var image = - await (await _imagePicker.pickImage(source: source))?.readAsBytes(); - Navigator.of(context).pop(image); - } } diff --git a/lib/src/services/image_picker_service.dart b/lib/src/services/image_picker_service.dart new file mode 100644 index 0000000..29ef94a --- /dev/null +++ b/lib/src/services/image_picker_service.dart @@ -0,0 +1,12 @@ +import 'package:flutter/material.dart'; +import 'package:image_picker/image_picker.dart'; + +class ImagePickerService { + final ImagePicker _imagePicker = ImagePicker(); + + void pickImage(ImageSource source, BuildContext context) async { + var image = + await (await _imagePicker.pickImage(source: source))?.readAsBytes(); + Navigator.of(context).pop(image); + } +} diff --git a/test/flutter_image_picker_test.dart b/test/flutter_image_picker_test.dart deleted file mode 100644 index e83c3d1..0000000 --- a/test/flutter_image_picker_test.dart +++ /dev/null @@ -1,32 +0,0 @@ -import 'package:flutter_test/flutter_test.dart'; - -import 'package:flutter_image_picker/calculator.dart'; - -void main() { - test('adds one to input values', () { - final calculator = Calculator(); - expect(calculator.addOne(2), 3); - expect(calculator.addOne(-7), -6); - expect(calculator.addOne(0), 1); - }); - - test('substracts one from input values', () { - final calculator = Calculator(); - expect(calculator.substractOne(40), 39); - expect(calculator.substractOne(-10), -11); - expect(calculator.substractOne(0), -1); - }); - - test('input value times ten', () { - final calculator = Calculator(); - expect(calculator.valueTimesTen(9), 90); - expect(calculator.valueTimesTen(0), 0); - }); - - test('input value divided by ten', () { - final calculator = Calculator(); - expect(calculator.valueDividedByTen(100), 10); - expect(calculator.valueDividedByTen(10), 1); - expect(calculator.valueDividedByTen(0), 0); - }); -}