SA-28 PR #2

Merged
s452086 merged 1 commits from feature/SA-28-facebook-api-poc-impl into master 2019-12-09 17:12:41 +01:00
2 changed files with 13 additions and 2 deletions
Showing only changes of commit 057b8a35fd - Show all commits

View File

@ -5,12 +5,16 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-android-extensions'
android { android {
compileSdkVersion 29 compileSdkVersion 28
buildToolsVersion "29.0.2" buildToolsVersion "29.0.2"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig { defaultConfig {
applicationId "pl.edu.amu.wmi.socialaggregator" applicationId "pl.edu.amu.wmi.socialaggregator"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -26,6 +30,8 @@ android {
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:appcompat-v7:28.1.0'
implementation 'com.android.support:design:28.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.core:core-ktx:1.1.0' implementation 'androidx.core:core-ktx:1.1.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

View File

@ -33,6 +33,11 @@ class MainActivity : AppCompatActivity() {
} }
) )
}
override fun onResume() {
super.onResume()
connectedSocialsRecyclerView.apply { connectedSocialsRecyclerView.apply {
layoutManager = LinearLayoutManager(this@MainActivity) layoutManager = LinearLayoutManager(this@MainActivity)
adapter = SocialWithImageRecycler(SocialPlatformsManager.getLoggedIn(this@MainActivity), adapter = SocialWithImageRecycler(SocialPlatformsManager.getLoggedIn(this@MainActivity),