Skip to content

Commit

Permalink
Merge pull request #10 from gennakk/branch1
Browse files Browse the repository at this point in the history
Branch1 merge release 2
  • Loading branch information
ralonsobeas authored May 19, 2020
2 parents 37ad603 + 322f79f commit 89d2fdd
Show file tree
Hide file tree
Showing 94 changed files with 4,401 additions and 512 deletions.
4 changes: 3 additions & 1 deletion .idea/gradle.xml

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

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

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

15 changes: 15 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-android'
apply plugin: 'com.google.gms.google-services'
//apply plugin: 'kotlin-kapt'

//apply plugin: 'com.chaquo.python'
Expand Down Expand Up @@ -49,6 +50,7 @@ android {
}

repositories {
google()
mavenCentral()
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
maven { url "https://jitpack.io" }
Expand All @@ -67,6 +69,7 @@ dependencies {
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'io.reactivex.rxjava2:rxjava:2.1.6'
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
implementation 'com.google.firebase:firebase-auth:16.0.5'
testImplementation 'junit:junit:4.12'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.0'
annotationProcessor 'com.google.dagger:dagger-compiler:2.25.2'
Expand Down Expand Up @@ -156,6 +159,18 @@ dependencies {

//Lottie
implementation 'com.airbnb.android:lottie:3.3.0'
implementation 'com.google.android.gms:play-services-auth:18.0.0'

//apache
implementation 'commons-net:commons-net:3.6'
implementation 'androidx.work:work-runtime:2.3.4'
//noinspection GradleCompatible
implementation 'com.android.support:recyclerview-v7:28.0.0'

//json ignore
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.8.3'

compile files('libs/simpleftp')
}

/*implementation 'com.jakewharton:butterknife:10.2.0'
Expand Down
48 changes: 48 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"project_info": {
"project_number": "592877169541",
"firebase_url": "https://didaktikapp-c2949.firebaseio.com",
"project_id": "didaktikapp-c2949",
"storage_bucket": "didaktikapp-c2949.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:592877169541:android:348c33b1f7658b079e32ec",
"android_client_info": {
"package_name": "com.app.didaktikapp"
}
},
"oauth_client": [
{
"client_id": "592877169541-lf9bkmeb8gnpgrii0hikknqfm39ito0h.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.app.didaktikapp",
"certificate_hash": "a87065d26db8cc7a462b5ab19e113c3a0b8a8552"
}
},
{
"client_id": "592877169541-tt43ncdr8e31rmulknq6evjeeush4n8b.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCgnZWhKFvF42o_l8yz9LWh6HRlALoQ2aQ"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "592877169541-tt43ncdr8e31rmulknq6evjeeush4n8b.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
Binary file added app/libs/simpleftp.jar
Binary file not shown.
Loading

0 comments on commit 89d2fdd

Please sign in to comment.