From c20d79120ba3a7d3de8a3671fe2d6f76268f9b59 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Fri, 19 Aug 2016 13:51:46 +0200 Subject: [PATCH] update support libraries --- Habitica/build.gradle | 13 ++++++------- .../android/habitica/helpers/QrCodeManager.java | 8 +++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 77e1572df..49b327eab 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -71,11 +71,11 @@ dependencies { compile('com.mikepenz:materialdrawer:5.3.6@aar') { transitive = true } - compile 'com.android.support:appcompat-v7:24.1.1' - compile 'com.android.support:design:24.1.1' - compile 'com.android.support:gridlayout-v7:24.1.1' - compile 'com.android.support:recyclerview-v7:24.1.1' - compile 'com.android.support:preference-v14:24.1.1' + compile 'com.android.support:appcompat-v7:24.2.0' + compile 'com.android.support:design:24.2.0' + compile 'com.android.support:gridlayout-v7:24.2.0' + compile 'com.android.support:recyclerview-v7:24.2.0' + compile 'com.android.support:preference-v14:24.2.0' compile 'com.android.support:multidex:1.0.1' // Image Loading/Caching @@ -131,7 +131,6 @@ dependencies { exclude module: 'bolts-android' } //Tests - compile 'com.android.support:appcompat-v7:24.1.1' testCompile "junit:junit:4.10" testCompile "org.assertj:assertj-core:1.7.0" testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' @@ -151,7 +150,7 @@ dependencies { android { compileSdkVersion 24 - buildToolsVersion "23.0.3" + buildToolsVersion "24.0.1" defaultConfig { applicationId "com.habitrpg.android.habitica" diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java index 136e6809f..69991baee 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/QrCodeManager.java @@ -1,5 +1,7 @@ package com.habitrpg.android.habitica.helpers; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; + import android.app.Dialog; import android.content.Context; import android.content.SharedPreferences; @@ -108,7 +110,11 @@ public class QrCodeManager { return; } - Bitmap myBitmap = QRCode.from(this.content).withColor(0xFF432874, 0xFFFFFFFF).withSize(400, 400).bitmap(); + Bitmap myBitmap = QRCode.from(this.content) + .withErrorCorrection(ErrorCorrectionLevel.H) + .withColor(0xFF432874, 0x00FFFFFF) + .withSize(400, 400) + .bitmap(); qrCodeImageView.setImageBitmap(myBitmap); }