diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 32342b111..cb4593dd8 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -9,7 +9,7 @@ + android:targetSdkVersion="27" /> diff --git a/Habitica/build.gradle b/Habitica/build.gradle index cf6006298..a1e6f36af 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -43,8 +43,8 @@ repositories { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') //Networking - implementation 'com.squareup.okhttp3:okhttp:3.9.0' - implementation 'com.squareup.okhttp3:logging-interceptor:3.9.0' + implementation 'com.squareup.okhttp3:okhttp:3.9.1' + implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1' //REST API handling implementation('com.squareup.retrofit2:retrofit:2.3.0') { exclude module: 'okhttp' @@ -52,24 +52,24 @@ dependencies { implementation 'com.squareup.retrofit2:converter-gson:2.3.0' implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0' //Crash Logging - releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.6.8@aar') { + releaseImplementation('com.crashlytics.sdk.android:crashlytics:2.8.0@aar') { transitive = true } // View Elements Binding :) implementation 'com.jakewharton:butterknife:8.8.1' kapt 'com.jakewharton:butterknife-compiler:8.8.1' //Dependency Injection - implementation 'com.google.dagger:dagger:2.12' - kapt 'com.google.dagger:dagger-compiler:2.12' + implementation 'com.google.dagger:dagger:2.14.1' + kapt 'com.google.dagger:dagger-compiler:2.14.1' compileOnly 'org.glassfish:javax.annotation:10.0-b28' //App Compatibility and Material Design implementation('com.mikepenz:materialdrawer:5.8.3@aar') { transitive = true } - implementation 'com.android.support:appcompat-v7:27.0.1' - implementation 'com.android.support:design:27.0.1' - implementation 'com.android.support:recyclerview-v7:27.0.1' - implementation 'com.android.support:preference-v14:27.0.1' + implementation 'com.android.support:appcompat-v7:27.0.2' + implementation 'com.android.support:design:27.0.2' + implementation 'com.android.support:recyclerview-v7:27.0.2' + implementation 'com.android.support:preference-v14:27.0.2' //QR Code implementation 'com.github.kenglxn.QRGen:android:2.2.0' // Emojis @@ -83,9 +83,9 @@ dependencies { // a better fab alternative implementation 'com.github.clans:fab:1.6.4' //Eventbus - implementation 'org.greenrobot:eventbus:3.0.0' + implementation 'org.greenrobot:eventbus:3.1.1' // IAP Handling / Verification - implementation 'org.solovyev.android:checkout:1.0.1' + implementation 'org.solovyev.android:checkout:1.2.1' //Facebook implementation('com.facebook.android:facebook-android-sdk:4.19.0') { transitive = true @@ -95,14 +95,14 @@ dependencies { implementation 'com.github.javadev:underscore:1.23' //RxJava implementation 'io.reactivex:rxandroid:1.2.1' - implementation 'io.reactivex:rxjava:1.3.2' + implementation 'io.reactivex:rxjava:1.3.5' //Analytics - implementation 'com.amplitude:android-sdk:2.14.1' + implementation 'com.amplitude:android-sdk:2.16.0' // Fresco Image Management Library - implementation('com.facebook.fresco:fresco:1.5.0') { + implementation('com.facebook.fresco:fresco:1.8.0') { exclude module: 'bolts-android' } - implementation('com.facebook.fresco:animated-gif:1.5.0') { + implementation('com.facebook.fresco:animated-gif:1.8.0') { exclude module: 'bolts-android' } //Tests diff --git a/Habitica/res/drawable/rounded_yellow_10_square.xml b/Habitica/res/drawable/rounded_yellow_10_square.xml new file mode 100644 index 000000000..0451f7911 --- /dev/null +++ b/Habitica/res/drawable/rounded_yellow_10_square.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml index c09301471..bb911c36d 100644 --- a/Habitica/res/layout/fragment_tavern_detail.xml +++ b/Habitica/res/layout/fragment_tavern_detail.xml @@ -1,34 +1,88 @@ - - - - - + + +