From 4ea15382f5df4511b7c3d19d331dd1e9861c4939 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 17 Feb 2021 11:03:34 +0100 Subject: [PATCH] improve guild list display --- Habitica/build.gradle | 6 +-- Habitica/res/layout/fragment_quest_detail.xml | 29 +----------- Habitica/res/values/strings.xml | 6 ++- Habitica/src/main/assets/HelveticaNeue.ttc | Bin 6171680 -> 0 bytes .../ui/adapter/social/GuildListAdapter.kt | 3 +- .../fragments/social/QuestDetailFragment.kt | 44 +++++------------- .../social/party/PartyDetailFragment.kt | 4 +- .../habitica/ui/views/HabiticaIcons.java | 12 +---- Habitica/staff/release/output-metadata.json | 2 +- build.gradle | 4 +- 10 files changed, 27 insertions(+), 83 deletions(-) delete mode 100644 Habitica/src/main/assets/HelveticaNeue.ttc diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 61652636e..b82d69c6c 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -113,14 +113,14 @@ dependencies { implementation 'com.google.firebase:firebase-core:18.0.2' implementation 'com.google.firebase:firebase-messaging:21.0.1' implementation 'com.google.firebase:firebase-config:20.0.3' - implementation 'com.google.firebase:firebase-perf:19.1.0' + implementation 'com.google.firebase:firebase-perf:19.1.1' implementation 'com.google.android.gms:play-services-auth:19.0.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'com.nex3z:flow-layout:1.2.2' implementation 'androidx.core:core-ktx:1.3.2' implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0" + implementation "androidx.lifecycle:lifecycle-common-java8:2.3.0" implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3' implementation 'androidx.navigation:navigation-ui-ktx:2.3.3' implementation "androidx.paging:paging-runtime-ktx:2.1.2" @@ -150,7 +150,7 @@ android { buildConfigField "String", "TESTING_LEVEL", "\"production\"" resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW" - versionCode 2820 + versionCode 2824 versionName "3.2" } diff --git a/Habitica/res/layout/fragment_quest_detail.xml b/Habitica/res/layout/fragment_quest_detail.xml index c1cfa082d..6a4e84e53 100644 --- a/Habitica/res/layout/fragment_quest_detail.xml +++ b/Habitica/res/layout/fragment_quest_detail.xml @@ -101,37 +101,10 @@ android:layout_height="1dp" android:background="@color/black_10_alpha"/> - -