2020-02-28 00:36:26 +01:00
|
|
|
apply plugin: 'com.android.application'
|
2020-02-28 17:08:54 +01:00
|
|
|
apply plugin: 'kotlin-android'
|
|
|
|
apply plugin: 'kotlin-android-extensions'
|
|
|
|
apply plugin: 'jacoco'
|
2020-02-28 00:36:26 +01:00
|
|
|
|
|
|
|
android {
|
2020-03-07 18:13:26 +01:00
|
|
|
|
2020-02-28 00:36:26 +01:00
|
|
|
compileSdkVersion 29
|
2020-02-28 17:59:54 +01:00
|
|
|
buildToolsVersion "29.0.3"
|
2020-03-07 18:13:26 +01:00
|
|
|
compileOptions {
|
2020-03-04 18:04:55 +01:00
|
|
|
sourceCompatibility JavaVersion.VERSION_1_8
|
|
|
|
targetCompatibility JavaVersion.VERSION_1_8
|
|
|
|
}
|
2020-03-08 12:55:48 +01:00
|
|
|
kotlinOptions {
|
|
|
|
jvmTarget = "1.8"
|
|
|
|
}
|
2020-02-28 00:36:26 +01:00
|
|
|
defaultConfig {
|
2020-02-28 17:08:54 +01:00
|
|
|
applicationId "com.h.pixeldroid"
|
|
|
|
minSdkVersion 23
|
2020-02-28 00:36:26 +01:00
|
|
|
targetSdkVersion 29
|
|
|
|
versionCode 1
|
|
|
|
versionName "1.0"
|
|
|
|
|
|
|
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
2020-03-07 18:13:26 +01:00
|
|
|
testInstrumentationRunnerArguments clearPackageData: 'true'
|
2020-02-28 00:36:26 +01:00
|
|
|
}
|
2020-03-07 11:00:24 +01:00
|
|
|
sourceSets {
|
|
|
|
main.java.srcDirs += 'src/main/java'
|
|
|
|
test.java.srcDirs += 'src/test/java'
|
|
|
|
androidTest.java.srcDirs += 'src/androidTest/java'
|
2020-02-28 00:36:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
buildTypes {
|
2020-02-28 17:08:54 +01:00
|
|
|
debug {
|
|
|
|
testCoverageEnabled true
|
|
|
|
}
|
2020-02-28 00:36:26 +01:00
|
|
|
release {
|
|
|
|
minifyEnabled false
|
|
|
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
|
|
|
}
|
|
|
|
}
|
2020-03-07 11:00:24 +01:00
|
|
|
testOptions {
|
|
|
|
animationsDisabled true
|
2020-03-07 18:13:26 +01:00
|
|
|
|
2020-03-07 11:00:24 +01:00
|
|
|
}
|
2020-02-28 00:36:26 +01:00
|
|
|
|
2020-03-12 23:27:40 +01:00
|
|
|
apply plugin: 'kotlin-kapt'
|
2020-02-28 00:36:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
dependencies {
|
|
|
|
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
2020-02-28 17:08:54 +01:00
|
|
|
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
|
2020-02-28 00:36:26 +01:00
|
|
|
implementation 'androidx.appcompat:appcompat:1.1.0'
|
2020-02-28 17:08:54 +01:00
|
|
|
implementation 'androidx.core:core-ktx:1.2.0'
|
2020-04-17 15:07:04 +02:00
|
|
|
implementation 'androidx.preference:preference:1.1.1'
|
2020-02-28 00:36:26 +01:00
|
|
|
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
|
2020-04-17 15:07:04 +02:00
|
|
|
implementation 'androidx.navigation:navigation-fragment:2.2.2'
|
|
|
|
implementation 'androidx.navigation:navigation-ui:2.2.2'
|
|
|
|
implementation "com.squareup.okhttp3:okhttp:4.4.1"
|
|
|
|
implementation 'com.squareup.retrofit2:retrofit:2.8.1'
|
|
|
|
implementation 'com.squareup.retrofit2:converter-gson:2.8.1'
|
|
|
|
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.8.1'
|
2020-03-04 18:04:55 +01:00
|
|
|
implementation 'io.reactivex.rxjava2:rxjava:2.2.16'
|
|
|
|
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
|
2020-03-06 08:37:59 +01:00
|
|
|
implementation "androidx.browser:browser:1.2.0"
|
2020-03-07 18:13:26 +01:00
|
|
|
implementation 'com.google.android.material:material:1.1.0'
|
2020-04-23 17:48:45 +02:00
|
|
|
implementation 'com.github.connyduck:sparkbutton:3.0.0'
|
2020-03-07 18:13:26 +01:00
|
|
|
|
2020-03-31 11:11:02 +02:00
|
|
|
def room_version = "2.2.5"
|
2020-03-12 23:27:40 +01:00
|
|
|
implementation "androidx.room:room-runtime:$room_version"
|
2020-03-18 20:56:42 +01:00
|
|
|
implementation 'androidx.recyclerview:recyclerview:1.1.0'
|
|
|
|
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
|
2020-03-12 23:27:40 +01:00
|
|
|
kapt "androidx.room:room-compiler:$room_version"
|
|
|
|
implementation "androidx.room:room-ktx:$room_version"
|
2020-03-04 18:04:55 +01:00
|
|
|
|
2020-03-08 12:54:18 +01:00
|
|
|
implementation("com.github.bumptech.glide:glide:4.11.0") {
|
2020-03-05 21:59:40 +01:00
|
|
|
exclude group: "com.android.support"
|
|
|
|
}
|
2020-04-09 22:36:59 +02:00
|
|
|
|
2020-03-07 19:45:27 +01:00
|
|
|
implementation "com.github.bumptech.glide:okhttp-integration:4.11.0"
|
Commenting & seeing comments on a post ( issues: #37 #77 ) (#87)
Comment and like buttons added + a few UI tweaks
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* layout changes
* refactoring
* refactoring
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* fixed merging errors
* trying my best to merge
* removed drawable definition in activity_post.xml
* Started converting Post to a fragment
* got a working feed
* WI
* removed non-valid test
* rebase on other branch
* moved the feed to the home page
* Add tests
* delete test for now
* Adapt test to changes (no more profile from drawer)
* Add unit test for api
* Add test for profile, refactor to allow testing, add exception to security policy to allow tests
* Adapt test to new situation
* Fix typo due to change
* refactor somewhat
* added a feed test
* WIP posts
* trying to add images
* WIP posts
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* WIP posts
* trying to add images
* WIP posts
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* fixed merging errors
* trying my best to merge
* removed drawable definition in activity_post.xml
* Started converting Post to a fragment
* got a working feed
* WI
* removed non-valid test
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* refactoring
* refactoring
* removed wrong annotation in unit test
* WIP posts
* WIP posts
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* layout changes
* moved a test file
* refactoring
* refactoring
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* fixed merging errors
* trying my best to merge
* removed drawable definition in activity_post.xml
* Started converting Post to a fragment
* got a working feed
* WI
* removed non-valid test
* rebase on other branch
* moved the feed to the home page
* added a feed test
* added a working feed test
* fixed broken test
* merged with master
* added a max height for images and made profile pictures round
* Added a default image for the post
* created a PostActivity to look a single posts
* fixed buggy postActivity
* Complete overhall of the feed UI
* removed test that didn't please Travis
* removed legacy test
* changed feedAdapter init location (outside of network callback)
* changed the feed from public timeline to home timeline
* Refactored myProfile page
* Converted profile picture to round image
* restored feed test
* I can like a post, but unlike is still a WIP
* Liking kind of works now and added tests
* fixed an error, now we can unlike as well
* fixed travis constraint error
* Display user's posts on profile page
* moved test to Mock server tests
* fixed test
* last resort debugging
* Changed fixed size of profile posts
* last resort debugging
* last resort debugging
* last resort debugging
* made post_activity profilepic round
* Total refactor of profile posts
* still have a weird bug with the comments: input is always null (WIP)
* still trying to fix coments
* removed annoying side margins in the home feed
* trying to fix comments
* fixed null comment
* converted all posts back to statuses and got rid of post
* Refactored recycler view
* Merged with my-profile
* Posts displayed on profile page
* Added links to profile activity where needed
* fixed comment posting
* finished implementing comments, but api is buggy so none are visible
* removed useless space in profile page
* fixed ci config bug
* trying to trigger ci hook (github was down last time)
* updated tests with master tests
* added tests for the comments
* added tests for the comments
* added first() matcher to fix comment test
* still trying to fix comment tests' null progress bar
* getting rid of that null progress bar
* added comment test
* fixed merge error
* added like button test
* added more post tests
* took pr coments into account
* added back an old test
* added mockServer response for comment test and fixed comment null pointer bug
* changed notification UI to better separate notifications
* added mockserver response for likes and corrected like toggling error
* added a test for posting comments
* fixed typo in test
* a gift for code climate
* refactored stuff
* fixed broken imports
* comment refactored as xml
Co-authored-by: Matthieu <61561059+Wv5twkFEKh54vo4tta9yu7dHa3@users.noreply.github.com>
Co-authored-by: mjaillot <marie.jaillot@epfl.ch>
2020-04-11 12:55:06 +02:00
|
|
|
implementation("com.github.bumptech.glide:recyclerview-integration:4.11.0") {
|
2020-03-21 19:46:45 +01:00
|
|
|
// Excludes the support library because it's already included by Glide.
|
|
|
|
transitive = false
|
|
|
|
}
|
|
|
|
annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
|
2020-03-07 19:45:27 +01:00
|
|
|
|
2020-03-12 22:23:25 +01:00
|
|
|
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
|
2020-03-07 18:13:26 +01:00
|
|
|
testImplementation "com.github.tomakehurst:wiremock-jre8:2.26.3"
|
2020-03-04 18:04:55 +01:00
|
|
|
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
|
2020-02-28 17:08:54 +01:00
|
|
|
testImplementation 'junit:junit:4.13'
|
2020-03-07 18:13:26 +01:00
|
|
|
|
2020-04-17 15:07:04 +02:00
|
|
|
androidTestImplementation("com.squareup.okhttp3:mockwebserver:4.4.1")
|
2020-02-28 00:36:26 +01:00
|
|
|
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
|
2020-03-31 11:11:02 +02:00
|
|
|
androidTestImplementation 'androidx.test:runner:1.2.0'
|
|
|
|
androidTestImplementation 'androidx.test:rules:1.2.0'
|
2020-02-28 00:36:26 +01:00
|
|
|
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
|
2020-03-07 18:13:26 +01:00
|
|
|
androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0'
|
2020-03-08 20:41:01 +01:00
|
|
|
androidTestImplementation 'com.android.support.test.espresso:espresso-contrib:3.0.2'
|
Commenting & seeing comments on a post ( issues: #37 #77 ) (#87)
Comment and like buttons added + a few UI tweaks
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* layout changes
* refactoring
* refactoring
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* fixed merging errors
* trying my best to merge
* removed drawable definition in activity_post.xml
* Started converting Post to a fragment
* got a working feed
* WI
* removed non-valid test
* rebase on other branch
* moved the feed to the home page
* Add tests
* delete test for now
* Adapt test to changes (no more profile from drawer)
* Add unit test for api
* Add test for profile, refactor to allow testing, add exception to security policy to allow tests
* Adapt test to new situation
* Fix typo due to change
* refactor somewhat
* added a feed test
* WIP posts
* trying to add images
* WIP posts
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* WIP posts
* trying to add images
* WIP posts
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* fixed merging errors
* trying my best to merge
* removed drawable definition in activity_post.xml
* Started converting Post to a fragment
* got a working feed
* WI
* removed non-valid test
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* moved a test file
* refactoring
* refactoring
* refactoring
* refactoring
* removed wrong annotation in unit test
* WIP posts
* WIP posts
* WIP posts
* WIP posts
* trying to add images
* trying to add images
* trying to add images
* trying to add images
* Got posts working and linked them to the profile
* Got posts working and linked them to the profile
* added tests for Post
* layout changes
* layout changes
* moved a test file
* refactoring
* refactoring
* refactoring
* refactoring
* removed wrong annotation in unit test
* removed an import that was breaking the build
* removed an import that was breaking the build
* removed tests that broke from merge, will override with master
* removed tests that broke from merge, will override with master
* added UI test for the post activity
* fixed merging errors
* trying my best to merge
* removed drawable definition in activity_post.xml
* Started converting Post to a fragment
* got a working feed
* WI
* removed non-valid test
* rebase on other branch
* moved the feed to the home page
* added a feed test
* added a working feed test
* fixed broken test
* merged with master
* added a max height for images and made profile pictures round
* Added a default image for the post
* created a PostActivity to look a single posts
* fixed buggy postActivity
* Complete overhall of the feed UI
* removed test that didn't please Travis
* removed legacy test
* changed feedAdapter init location (outside of network callback)
* changed the feed from public timeline to home timeline
* Refactored myProfile page
* Converted profile picture to round image
* restored feed test
* I can like a post, but unlike is still a WIP
* Liking kind of works now and added tests
* fixed an error, now we can unlike as well
* fixed travis constraint error
* Display user's posts on profile page
* moved test to Mock server tests
* fixed test
* last resort debugging
* Changed fixed size of profile posts
* last resort debugging
* last resort debugging
* last resort debugging
* made post_activity profilepic round
* Total refactor of profile posts
* still have a weird bug with the comments: input is always null (WIP)
* still trying to fix coments
* removed annoying side margins in the home feed
* trying to fix comments
* fixed null comment
* converted all posts back to statuses and got rid of post
* Refactored recycler view
* Merged with my-profile
* Posts displayed on profile page
* Added links to profile activity where needed
* fixed comment posting
* finished implementing comments, but api is buggy so none are visible
* removed useless space in profile page
* fixed ci config bug
* trying to trigger ci hook (github was down last time)
* updated tests with master tests
* added tests for the comments
* added tests for the comments
* added first() matcher to fix comment test
* still trying to fix comment tests' null progress bar
* getting rid of that null progress bar
* added comment test
* fixed merge error
* added like button test
* added more post tests
* took pr coments into account
* added back an old test
* added mockServer response for comment test and fixed comment null pointer bug
* changed notification UI to better separate notifications
* added mockserver response for likes and corrected like toggling error
* added a test for posting comments
* fixed typo in test
* a gift for code climate
* refactored stuff
* fixed broken imports
* comment refactored as xml
Co-authored-by: Matthieu <61561059+Wv5twkFEKh54vo4tta9yu7dHa3@users.noreply.github.com>
Co-authored-by: mjaillot <marie.jaillot@epfl.ch>
2020-04-11 12:55:06 +02:00
|
|
|
implementation 'androidx.paging:paging-runtime-ktx:2.1.2'
|
2020-04-02 19:57:07 +02:00
|
|
|
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
|
2020-02-28 17:08:54 +01:00
|
|
|
|
2020-03-07 18:13:26 +01:00
|
|
|
}
|
2020-02-28 17:08:54 +01:00
|
|
|
|
|
|
|
tasks.withType(Test) {
|
|
|
|
jacoco.includeNoLocationClasses = true
|
|
|
|
jacoco.excludes = ['jdk.internal.*']
|
|
|
|
}
|
|
|
|
|
2020-04-09 22:36:59 +02:00
|
|
|
|
2020-02-28 17:08:54 +01:00
|
|
|
task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest', 'createDebugCoverageReport']) {
|
|
|
|
|
|
|
|
reports {
|
|
|
|
xml.enabled = true
|
|
|
|
html.enabled = true
|
|
|
|
}
|
|
|
|
|
|
|
|
def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']
|
2020-02-29 14:09:20 +01:00
|
|
|
def kotlinDebugTree = fileTree(dir: "$project.buildDir/tmp/kotlin-classes/debug", excludes: fileFilter)
|
2020-03-04 18:04:55 +01:00
|
|
|
def mainSrc = "$project.projectDir/src/main/java"
|
2020-03-06 18:24:20 +01:00
|
|
|
getSourceDirectories().from(files([mainSrc]))
|
|
|
|
getClassDirectories().from(files([kotlinDebugTree]))
|
|
|
|
getExecutionData().from(fileTree(dir: project.buildDir, includes: [
|
|
|
|
|
|
|
|
'outputs/code_coverage/debugAndroidTest/connected/*coverage.ec',
|
|
|
|
|
|
|
|
'jacoco/testDebugUnitTest.exec'
|
|
|
|
|
|
|
|
]))
|
2020-03-05 21:07:10 +01:00
|
|
|
}
|