diff --git a/.travis.yml b/.travis.yml index c99aaf80c..8217793a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,8 @@ android: - tools - tools - platform-tools - - build-tools-26.0.2 - - android-26 + - build-tools-27.0.3 + - android-27 - extra-android-m2repository - extra-android-support - extra-google-m2repository @@ -16,3 +16,4 @@ script: - "./gradlew build connectedCheck" before_install: - chmod +x gradlew +- yes | sdkmanager "platforms;android-27" diff --git a/SWADroid/build.gradle b/SWADroid/build.gradle index e83821fe9..4e616a092 100644 --- a/SWADroid/build.gradle +++ b/SWADroid/build.gradle @@ -9,8 +9,8 @@ ext { } android { - compileSdkVersion 26 - buildToolsVersion "26.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" dexOptions { maxProcessCount=2 @@ -27,7 +27,7 @@ android { versionName gitVersionName minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 27 android.applicationVariants.all { variant -> def appName @@ -38,10 +38,8 @@ android { appName = parent.name } - variant.outputs.each { output -> - def newApkName - newApkName = "${appName}-${output.baseName}-${variant.versionName}.apk" - output.outputFile = new File(output.outputFile.parent, newApkName) + variant.outputs.all { output -> + outputFileName = "${appName}-${output.baseName}-${variant.versionName}.apk" } } @@ -77,13 +75,13 @@ def getBuildConfigField(String property){ } dependencies { - compile 'com.android.support:support-v4:26.0.0' - compile 'com.android.support:appcompat-v7:26.0.0' - compile 'com.google.android.gms:play-services-analytics:11.0.4' + compile 'com.android.support:support-v4:27.0.2' + compile 'com.android.support:appcompat-v7:27.0.2' + compile 'com.google.android.gms:play-services-analytics:11.8.0' compile 'com.google.code.ksoap2-android:ksoap2-android:3.6.2' - compile 'commons-io:commons-io:2.5' + compile 'commons-io:commons-io:2.6' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' compile 'com.journeyapps:zxing-android-embedded:3.5.0@aar' - compile 'com.google.zxing:core:3.3.0' - compile 'com.google.code.gson:gson:2.8.1' + compile 'com.google.zxing:core:3.3.1' + compile 'com.google.code.gson:gson:2.8.2' } \ No newline at end of file diff --git a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java index f628cd24e..51d476231 100644 --- a/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java +++ b/SWADroid/src/main/java/es/ugr/swad/swadroid/modules/groups/EnrollmentExpandableListAdapter.java @@ -198,16 +198,16 @@ public View getChildView(int groupPosition, int childPosition, if (multiple == 0 && role != Constants.TEACHER_TYPE_CODE) { //single inscriptions: holder.checkBox.setVisibility(View.GONE); holder.radioButton.setVisibility(View.VISIBLE); + holder.radioButton.setText(groupName); } else { //multiple inscriptions : holder.checkBox.setVisibility(View.VISIBLE); holder.radioButton.setVisibility(View.GONE); + holder.checkBox.setText(groupName); + holder.checkBox.setChecked(member != 0); } - holder.checkBox.setText(groupName); - holder.checkBox.setChecked(member != 0); - holder.nStudentText.setText(context.getString(R.string.numStudent) + ": " + String.valueOf(students)); if (maxStudents != -1) { diff --git a/SWADroid/src/main/res/raw-es/changes.html b/SWADroid/src/main/res/raw-es/changes.html index a304c8f26..1b693af55 100644 --- a/SWADroid/src/main/res/raw-es/changes.html +++ b/SWADroid/src/main/res/raw-es/changes.html @@ -14,6 +14,13 @@ + +

1.5.4 (2018-02-25)

+ +

1.5.3 (2017-10-25)