diff --git a/app/build.gradle b/app/build.gradle index cee9be1..3b81205 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,6 @@ plugins { } apply plugin: 'com.android.application' -apply plugin: 'com.jakewharton.hugo' apply plugin: 'fr.coppernic.extensions' copper { @@ -18,6 +17,7 @@ apply plugin: 'fr.coppernic.android' android { compileSdkVersion 27 + defaultConfig { applicationId "fr.coppernic.samples.pcsc" minSdkVersion 17 @@ -31,12 +31,18 @@ android { abiFilters "armeabi", "armeabi-v7a" } } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } + + packagingOptions { + exclude 'META-INF/main.kotlin_module' + exclude 'META-INF/lib_release.kotlin_module' + } } dependencies { @@ -49,7 +55,7 @@ dependencies { androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' // Timber - implementation 'com.jakewharton.timber:timber:4.7.0' + implementation 'com.jakewharton.timber:timber:4.7.1' //Canary implementation 'com.squareup.leakcanary:leakcanary-android:1.5.4' @@ -62,7 +68,7 @@ dependencies { implementation 'com.github.d-max:spots-dialog:0.7@aar' // Coppernic - implementation 'fr.coppernic.sdk.cpcutils:CpcUtilsLib:6.18.1' + implementation 'fr.coppernic.sdk.cpcutils:CpcUtilsLib:6.18.4' implementation 'fr.coppernic.sdk.core:CpcCore:1.8.12' implementation 'fr.bipi.splash:splash:0.0.1' diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index c8ab686..2aaa6cd 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -32,11 +32,13 @@ android:layout_gravity="center_horizontal" android:layout_marginEnd="8dp" android:layout_marginStart="8dp" + android:layout_marginTop="8dp" android:hint="@string/sprinnerReaderHint" android:textColorHint="#05ab9a" app:layout_constraintEnd_toStartOf="@+id/swConnect" app:layout_constraintStart_toStartOf="parent" - app:met_floatingLabel="normal" /> + app:layout_constraintTop_toTopOf="parent" + app:met_floatingLabel="normal"/>