Skip to content

Commit

Permalink
Update MLKit dependency + Restructure code (#11)
Browse files Browse the repository at this point in the history
* Update MLKit dependency + Restructure library

* Remove ignored files
  • Loading branch information
husaynhakeem authored Jul 6, 2020
1 parent 400bbeb commit d47113d
Show file tree
Hide file tree
Showing 27 changed files with 268 additions and 602 deletions.
57 changes: 2 additions & 55 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,65 +1,12 @@
# Built application files
*.apk
*.ap_

# Files for the ART/Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/
out/

# Gradle files
.gradle/
build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# IntelliJ
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/caches

# Keystore files
# Uncomment the following line if you do not want to check your keystore files in.
#*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# Google Services (e.g. APIs or Firebase)
google-services.json

# Freeline
freeline.py
freeline/
freeline_project_description.json

# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
.idea/*
.DS_Store
7 changes: 0 additions & 7 deletions .idea/kotlinc.xml

This file was deleted.

72 changes: 0 additions & 72 deletions .idea/markdown-navigator.xml

This file was deleted.

3 changes: 0 additions & 3 deletions .idea/markdown-navigator/profiles_settings.xml

This file was deleted.

61 changes: 0 additions & 61 deletions .idea/misc.xml

This file was deleted.

11 changes: 0 additions & 11 deletions .idea/modules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/runConfigurations.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

28 changes: 8 additions & 20 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,37 +1,25 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: "com.android.application"
apply plugin: "kotlin-android"
apply plugin: "kotlin-android-extensions"

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "husaynhakeem.io.facedetectorapp"
minSdkVersion 21
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support:design:28.0.0'
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "com.google.android.material:material:1.1.0"

// Camera
implementation "com.otaliastudios:cameraview:1.5.1"

// Android face detector
implementation('com.github.husaynhakeem:android-face-detector:v1.1') {
exclude group: 'com.android.support'
}
implementation(project(":facedetector"))
}

apply plugin: 'com.google.gms.google-services'
21 changes: 0 additions & 21 deletions app/proguard-rules.pro

This file was deleted.

1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<activity android:name=".MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down
Loading

0 comments on commit d47113d

Please sign in to comment.