Skip to content

[camerax] Wrap classes to implement resolution configuration for image capture, image analysis, and preview #4523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 29 commits into from
Jul 27, 2023
Merged

[camerax] Wrap classes to implement resolution configuration for image capture, image analysis, and preview #4523

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dec3d69
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
0e0333b
Merge remote-tracking branch 'upstream/main'
camsim99 May 2, 2023
bd7ac99
Merge remote-tracking branch 'upstream/main'
camsim99 May 3, 2023
5c3363b
Merge remote-tracking branch 'upstream/main'
camsim99 May 10, 2023
fed9621
Undo changes
camsim99 May 10, 2023
5aabe34
Merge remote-tracking branch 'upstream/main'
camsim99 May 12, 2023
2b9a352
Merge remote-tracking branch 'upstream/main'
camsim99 May 25, 2023
a1173da
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cbc3d6b
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cae5a4c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 1, 2023
72283db
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
166a77c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
399780e
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 14, 2023
8d5d0e7
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 26, 2023
084d960
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 12, 2023
d2a59ac
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
a1422bf
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
bdd87a6
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 18, 2023
137a28b
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 19, 2023
c78e0b8
Add wrapped classes, tests, and remove deprecated apis
camsim99 Jul 19, 2023
3cd06e8
Modify null check to fix integration test
camsim99 Jul 19, 2023
a383e8f
Cleanup
camsim99 Jul 19, 2023
725a4ec
Add missing import
camsim99 Jul 19, 2023
bdfb634
Fix some spelling errors
camsim99 Jul 19, 2023
fc7c977
Merge remote-tracking branch 'upstream/main' into camx_wrapres
camsim99 Jul 19, 2023
41fdabc
Mark new classes as immutable
camsim99 Jul 20, 2023
996ce03
Address review
camsim99 Jul 24, 2023
d9ab6c3
Merge remote-tracking branch 'upstream/main' into camx_wrapres
camsim99 Jul 24, 2023
98e1035
Address review
camsim99 Jul 27, 2023
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
Prev Previous commit
Address review
  • Loading branch information
@camsim99
camsim99 committed Jul 27, 2023
commit 98e10359fe4ce4981635dca83174889cd242215f
4 changes: 2 additions & 2 deletions ...erax/android/src/main/java/io/flutter/plugins/camerax/AspectRatioStrategyHostApiImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public AspectRatioStrategyHostApiImpl(@NonNull InstanceManager instanceManager)
}

/**
* Constructs a {@link AspectRatioStrategyHostApiImpl}.
* Constructs an {@link AspectRatioStrategyHostApiImpl}.
*
* @param instanceManager maintains instances stored to communicate with attached Dart objects
* @param proxy proxy for constructors and static method of {@link AspectRatioStrategy}
Expand All @@ -53,7 +53,7 @@ public AspectRatioStrategyHostApiImpl(@NonNull InstanceManager instanceManager)
}

/**
* Creates a {@link AspectRatioStrategy} instance with the preferred aspect ratio and fallback
* Creates an {@link AspectRatioStrategy} instance with the preferred aspect ratio and fallback
* rule specified.
*/
@Override
Expand Down
2 changes: 1 addition & 1 deletion packages/camera/camera_android_camerax/lib/src/resolution_strategy.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import 'java_object.dart';
class ResolutionStrategy extends JavaObject {
/// Constructs a [ResolutionStrategy].
ResolutionStrategy({
Copy link
Member

@gmackall gmackall Jul 21, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about making the arguments to this constructor non-null (as they are for the android class) and instead using a private named constructor instead for the creation of the highest available strategy?

Copy link
Contributor Author

@camsim99 camsim99 Jul 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I love this idea. Changed it and added tests.

Copy link
Member

@gmackall gmackall Jul 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe as is, it is still nullable (it is required but someone can still pass null).

I think this can be changed to required Size this.boundSize, though, to keep it as an initializing formal but just with a stricter (non-nullable) type.

See the "NOTE: Also note that it is possible to enforce a type that is stricter"... in https://dart.dev/tools/linter-rules/prefer_initializing_formals (can't link sections unfortunately).

required this.boundSize,
required Size this.boundSize,
this.fallbackRule,
super.binaryMessenger,
super.instanceManager,
Expand Down