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 @@
-
-
-
-
-
+
+
+
-
+ style="@style/Button.Yellow.Small"/>
-
+
+
+
-
-
\ No newline at end of file
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:text="@string/view_community_guidelines"
+ style="@style/HabiticaButton.Gray"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
new file mode 100644
index 000000000..0de3768a5
--- /dev/null
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/values/attrs.xml b/Habitica/res/values/attrs.xml
index 916d1caa3..ecc06e801 100644
--- a/Habitica/res/values/attrs.xml
+++ b/Habitica/res/values/attrs.xml
@@ -1,6 +1,7 @@
+
@@ -48,7 +49,7 @@
-
+
@@ -65,4 +66,7 @@
+
+
+
diff --git a/Habitica/res/values/colors.contributor.xml b/Habitica/res/values/colors.contributor.xml
index e65b5cfb0..e2a659dfc 100644
--- a/Habitica/res/values/colors.contributor.xml
+++ b/Habitica/res/values/colors.contributor.xml
@@ -1,15 +1,15 @@
#aaa
- #f57a9d
- #b93030
- #ff3300
- #ff9500
- #fff700
- #5eff00
- #00aaff
- #130ead
- #88108f
+ #c42871
+ #b01515
+ #d70e14
+ #c24d00
+ #9e650f
+ #2b8363
+ #167e87
+ #277eab
+ #6133b4
#000
#00FF00
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 7b0bf5c99..ca371cb2d 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -724,4 +724,14 @@
%d points
Toogle Emojis
Welcome to the Inn! Pull up a chair to chat, or take a break from your tasks.
+ Check into Inn
+ Community Guidelines
+ View Community Guidelines
+ Habitica tries to create a welcoming environment for users of all ages and backgrounds, especially in public spaces like the Tavern. If you have any questions, please consult our guidelines.
+ Helpful Links
+ View FAQ
+ Report a Bug
+ Player Tiers
+ Staff and Moderators
+ The colored usernames you see in chat represent a person’s contributor tier. The higher the tier, the more the person has contributed to habitica through art, code, the community, or more!
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 02b2e8ba7..c2b2e79a8 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -304,6 +304,18 @@
- @dimen/button_padding_vertical_small
+
+
+
+