Merge branch 'master' into feature/about-page
This commit is contained in:
commit
9b86c93e76
99 changed files with 4321 additions and 893 deletions
|
@ -12,6 +12,14 @@ android {
|
|||
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables.useSupportLibrary true
|
||||
}
|
||||
productFlavors {
|
||||
google {
|
||||
buildConfigField "boolean", "USES_PUSH_NOTIFICATIONS", "true"
|
||||
}
|
||||
fdroid {
|
||||
buildConfigField "boolean", "USES_PUSH_NOTIFICATIONS", "false"
|
||||
}
|
||||
}
|
||||
buildTypes {
|
||||
release {
|
||||
minifyEnabled true
|
||||
|
@ -38,23 +46,24 @@ dependencies {
|
|||
compile 'com.android.support:support-v13:25.3.1'
|
||||
compile 'com.android.support:design:25.3.1'
|
||||
compile 'com.android.support:exifinterface:25.3.1'
|
||||
compile 'com.squareup.retrofit2:retrofit:2.2.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
|
||||
compile 'com.squareup.picasso:picasso:2.5.2'
|
||||
compile 'com.squareup.okhttp3:okhttp:3.7.0'
|
||||
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.1.0'
|
||||
compile 'com.pkmmte.view:circularimageview:1.1'
|
||||
compile 'com.github.peter9870:sparkbutton:master'
|
||||
compile 'com.mikhaellopez:circularfillableloaders:1.2.0'
|
||||
compile 'com.squareup.retrofit2:retrofit:2.2.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
|
||||
compile 'com.github.chrisbanes:PhotoView:1.3.1'
|
||||
compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar'
|
||||
compile 'com.github.arimorty:floatingsearchview:2.0.3'
|
||||
compile 'com.github.arimorty:floatingsearchview:2.0.4'
|
||||
compile 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
|
||||
compile 'com.jakewharton:butterknife:8.4.0'
|
||||
compile 'com.google.firebase:firebase-messaging:10.0.1'
|
||||
compile 'com.google.firebase:firebase-crash:10.0.1'
|
||||
googleCompile 'com.google.firebase:firebase-messaging:10.0.1'
|
||||
googleCompile 'com.google.firebase:firebase-crash:10.0.1'
|
||||
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha7'
|
||||
testCompile 'junit:junit:4.12'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0'
|
||||
}
|
||||
|
||||
|
||||
|
||||
apply plugin: 'com.google.gms.google-services'
|
Loading…
Add table
Add a link
Reference in a new issue