Skip to content
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

Merge #336

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Merge #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d0844a4
Add ios face recognition
bachino90 Feb 1, 2024
cee8dd7
Add definitions
bachino90 Feb 1, 2024
75ddb67
Remove unused file
bachino90 Feb 28, 2024
99cae38
Fix
bachino90 Feb 28, 2024
7a3f52c
Fix
bachino90 Feb 28, 2024
dfd6132
v5.1.0 - Add new camera activity that uses camera x (#1)
bachino90 Mar 11, 2024
9bfe82b
Add enableFaceRecognition flag and return image as base64
bachino90 Mar 19, 2024
9db4125
Update capacitor (#2)
bachino90 Jun 5, 2024
da674a4
Wip
jlgaitan Jun 19, 2024
5f39b49
Remove unused code
jlgaitan Jun 19, 2024
92d16aa
Update version
jlgaitan Jun 25, 2024
48961a4
Merge pull request #4 from cocos-capital/feat/update-android-implemen…
jlgaitan Jun 26, 2024
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
24 changes: 22 additions & 2 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,19 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20"
}
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
namespace "com.ahm.capacitor.camera.preview.capacitorcamerapreview"
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 33
compileSdkVersion project.hasProperty('compileSdkVersion') ? rootProject.ext.compileSdkVersion : 34
defaultConfig {
minSdkVersion project.hasProperty('minSdkVersion') ? rootProject.ext.minSdkVersion : 22
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 33
targetSdkVersion project.hasProperty('targetSdkVersion') ? rootProject.ext.targetSdkVersion : 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -37,6 +39,13 @@ android {
lintOptions {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildFeatures {
viewBinding = true
}
}

repositories {
Expand All @@ -50,6 +59,17 @@ dependencies {
implementation project(':capacitor-android')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation "androidx.exifinterface:exifinterface:$androidxExifInterfaceVersion"
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.coordinatorlayout:coordinatorlayout:1.2.0'
def camerax_version = "1.3.1"
implementation "androidx.camera:camera-core:${camerax_version}"
implementation "androidx.camera:camera-camera2:${camerax_version}"
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
implementation "androidx.camera:camera-video:${camerax_version}"

implementation "androidx.camera:camera-view:${camerax_version}"
implementation "androidx.camera:camera-extensions:${camerax_version}"
implementation "com.google.mlkit:face-detection:16.1.6"
testImplementation "junit:junit:$junitVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
Expand Down
Loading