Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 30
compileSdkVersion 33

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
Expand All @@ -44,8 +44,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "cheeseball.project_scanit"
minSdkVersion 21
targetSdkVersion 30
minSdkVersion 26
targetSdkVersion 33
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
android:icon="@mipmap/ic_launcher">
<activity
android:name=".MainActivity"
android:exported="true"
android:launchMode="singleTop"
android:theme="@style/LaunchTheme"
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.7.20'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
classpath 'com.android.tools.build:gradle:7.1.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
15 changes: 10 additions & 5 deletions lib/injection.config.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import 'package:flutter/material.dart';
import 'package:injectable/injectable.dart';
import 'package:project_scanit/injection.dart';
import 'package:project_scanit/views/core/app_widget.dart';

void main() {
WidgetsFlutterBinding.ensureInitialized();
configureInjection(Environment.prod);
runApp(AppWidget());
}
17 changes: 17 additions & 0 deletions lib/models/scan/image_processing_model.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
import 'dart:typed_data';

import 'package:flutter/foundation.dart';
import 'package:injectable/injectable.dart';
import 'package:project_scanit/models/scan/captured_image.dart';
import 'package:project_scanit/models/scan/image_filter.dart';
import 'package:project_scanit/services/opencv/opencv_service.dart';

@LazySingleton()
class ImageProcessingModel extends ChangeNotifier {
// TODO: write all images processing functions here :)
// See capture button onTap to get Uint8List image :)
final OpenCVService _openCVService;
List<CapturedImage> images = [];
int index = 0;

ImageProcessingModel(this._openCVService);

void setIndex(int newIndex) {
index = newIndex;
notifyListeners();
}

void getRawImage(Uint8List image) async {
images.add(CapturedImage(
Expand All @@ -23,6 +35,11 @@ class ImageProcessingModel extends ChangeNotifier {

cropToEdges() {}

rotate() {
// TODO: rotate image 90 deg clockwise from list at `index`
notifyListeners();
}

applyFilter() {}

reorder() {}
Expand Down
13 changes: 12 additions & 1 deletion lib/services/opencv/opencv_service.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
class OpencvService {
import 'dart:typed_data';

import 'package:injectable/injectable.dart';
import 'package:opencv/opencv.dart';

@LazySingleton()
class OpenCVService {
OpenCV openCV = OpenCV();

Future<Uint8List> rotate(double degree) async {
// TODO: add rotation function
return Uint8List(0);
}
}
15 changes: 5 additions & 10 deletions lib/views/scan/pages/pages.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,11 @@ class Pages extends StatelessWidget {
color: Color(0xff262626),
child: Column(
children: [
Expanded(child: PageListView()),
Material(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16.0),
topRight: Radius.circular(16.0),
),
color: Colors.white,
elevation: 8.0,
child: OptionsBar(),
),
Expanded(child: Padding(
padding: const EdgeInsets.all(8.0),
child: PageListView(),
)),
OptionsBar(),
],
),
);
Expand Down
60 changes: 48 additions & 12 deletions lib/views/scan/pages/widgets/options_bar/options_bar.dart
Original file line number Diff line number Diff line change
@@ -1,21 +1,57 @@
import 'package:flutter/material.dart';
import 'package:project_scanit/models/scan/image_processing_model.dart';
import 'package:project_scanit/views/scan/pages/widgets/options_bar/widgets/option_tile.dart';
import 'package:provider/provider.dart';

class OptionsBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.symmetric(vertical: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
OptionTile(icon: Icons.add_circle_rounded, text: 'Add Page', onTap: () {}),
OptionTile(icon: Icons.crop_rounded, text: 'Crop', onTap: () {}),
OptionTile(icon: Icons.rotate_right_rounded, text: 'Rotate', onTap: () {}),
OptionTile(icon: Icons.filter_rounded, text: 'Filter', onTap: () {}),
OptionTile(icon: Icons.view_array_rounded, text: 'Rearrange', onTap: () {}),
OptionTile(icon: Icons.remove_circle_rounded, text: 'Remove', onTap: () {}),
],
final imageProcessingModelProvider =
Provider.of<ImageProcessingModel>(context);
return Material(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(16.0),
topRight: Radius.circular(16.0),
),
color: Colors.white,
elevation: 8.0,
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 16.0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
OptionTile(
icon: Icons.add_circle_rounded,
text: 'Add Page',
onTap: () {},
),
OptionTile(
icon: Icons.crop_rounded,
text: 'Crop',
onTap: () {},
),
OptionTile(
icon: Icons.rotate_right_rounded,
text: 'Rotate',
onTap: () => imageProcessingModelProvider.rotate(),
),
OptionTile(
icon: Icons.filter_rounded,
text: 'Filter',
onTap: () {},
),
OptionTile(
icon: Icons.view_array_rounded,
text: 'Rearrange',
onTap: () {},
),
OptionTile(
icon: Icons.remove_circle_rounded,
text: 'Remove',
onTap: () {},
),
],
),
),
);
}
Expand Down
50 changes: 35 additions & 15 deletions lib/views/scan/pages/widgets/page_list_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,42 @@ class PageListView extends StatelessWidget {
Provider.of<ImageProcessingModel>(context);

print(imageProcessingModelProvider.images.length);
return Swiper(
scrollDirection: Axis.horizontal,
itemCount: imageProcessingModelProvider.images.length,
loop: false,
scale: 0.9,
viewportFraction: 0.8,
itemBuilder: (context, index) {
return Center(
child: Material(
color: Colors.transparent,
elevation: 8.0,
child:
Image.memory(imageProcessingModelProvider.images[index].image),
return Column(
children: [
Expanded(
child: Swiper(
scrollDirection: Axis.horizontal,
itemCount: imageProcessingModelProvider.images.length,
loop: false,
scale: 0.9,
viewportFraction: 0.8,
onIndexChanged: (index) =>
imageProcessingModelProvider.setIndex(index),
itemBuilder: (context, index) {
return Center(
child: Material(
color: Colors.transparent,
elevation: 8.0,
child: Image.memory(
imageProcessingModelProvider.images[index].image),
),
);
},
),
);
},
),
Material(
borderRadius: BorderRadius.circular(512.0),
color: Colors.white,
elevation: 8.0,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: Text(
'Page ${imageProcessingModelProvider.index+1}',
style: TextStyle(fontSize: 12.0),
),
),
),
],
);
}
}
3 changes: 2 additions & 1 deletion lib/views/scan/widgets/bottom_bar/bottom_bar.dart
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import 'package:flutter/material.dart';
import 'package:project_scanit/injection.dart';
import 'package:project_scanit/models/scan/capture_model.dart';
import 'package:project_scanit/models/scan/image_processing_model.dart';
import 'package:project_scanit/views/scan/widgets/bottom_bar/widgets/capture_button.dart';
import 'package:project_scanit/views/scan/pages/pages.dart';
import 'package:provider/provider.dart';

class BottomBar extends StatelessWidget {
final imageProcessingModel = ImageProcessingModel();
final imageProcessingModel = getIt<ImageProcessingModel>();
@override
Widget build(BuildContext context) {
final captureModelProvider = Provider.of<CaptureModel>(context);
Expand Down
Loading