From f2c21c0604f55e22d7216b35cf62cd7612f76389 Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Tue, 22 Sep 2020 16:10:15 +0200 Subject: [PATCH] Fix release breaking issues --- Habitica/build.gradle | 6 +- .../avatar_customization_category_bg.xml | 2 +- .../avatar_customization_subcategory_bg.xml | 2 +- Habitica/res/layout/activity_fixcharacter.xml | 7 +- Habitica/res/layout/activity_setup.xml | 5 +- Habitica/res/layout/avatar_setup_drawer.xml | 1 + Habitica/res/layout/dialog_edittext.xml | 2 +- Habitica/res/layout/dialog_habitica_base.xml | 3 +- Habitica/res/layout/fragment_setup_avatar.xml | 4 +- .../res/layout/fragment_support_bug_fix.xml | 21 + Habitica/res/layout/fragment_welcome.xml | 5 +- Habitica/res/layout/known_issue.xml | 10 + .../res/layout/profile_new_message_dialog.xml | 2 +- Habitica/res/layout/task_setup_item.xml | 2 +- Habitica/res/menu/inbox.xml | 1 - Habitica/res/navigation/navigation.xml | 11 +- Habitica/res/values-night/styles.xml | 15 + Habitica/res/values/colors.xml | 4 +- Habitica/res/values/strings.xml | 5 +- Habitica/res/values/styles.xml | 12 +- Habitica/res/xml/remote_config_defaults.xml | 4 + .../habitica/helpers/AppConfigManager.kt | 5 + .../GroupActivityNotification.kt | 2 +- ...ReceivedPrivateMessageLocalNotification.kt | 2 +- .../habitica/ui/activities/BaseActivity.kt | 10 + .../ui/activities/ChallengeFormActivity.kt | 3 +- .../activities/FixCharacterValuesActivity.kt | 4 +- .../ui/activities/FullProfileActivity.kt | 10 +- .../ui/activities/GroupInviteActivity.kt | 2 +- .../habitica/ui/activities/MainActivity.kt | 2 + .../habitica/ui/activities/SetupActivity.kt | 2 +- .../ui/activities/TaskFormActivity.kt | 4 + .../social/ChallengesListViewAdapter.kt | 2 +- .../habitica/ui/fragments/BaseMainFragment.kt | 11 +- .../AvatarCustomizationFragment.kt | 1 + .../equipment/EquipmentDetailFragment.kt | 7 +- .../AuthenticationPreferenceFragment.kt | 6 +- .../ui/fragments/setup/AvatarSetupFragment.kt | 4 +- .../challenges/ChallengeDetailFragment.kt | 2 +- .../social/party/PartyDetailFragment.kt | 4 +- .../ui/fragments/support/BugFixFragment.kt | 14 + .../ui/fragments/support/FAQDetailFragment.kt | 14 +- .../fragments/support/FAQOverviewFragment.kt | 4 +- .../ui/fragments/tasks/TasksFragment.kt | 6 + .../ui/helpers/AutocompleteAdapter.kt | 4 +- .../android/habitica/ui/helpers/EmojiMap.java | 1702 +++++++++++++++++ .../habitica/ui/helpers/EmojiParser.kt | 50 + .../habitica/ui/helpers/MarkdownParser.kt | 1 - .../habitica/ui/helpers/ToolbarColorHelper.kt | 9 +- .../tasks/form/HabitScoringButtonsView.kt | 4 - .../views/yesterdailies/YesterdailyDialog.kt | 2 +- .../widget/HabitButtonWidgetService.kt | 2 - .../habitica/widget/TaskListFactory.kt | 2 - Habitica/staff/release/output-metadata.json | 2 +- 54 files changed, 1942 insertions(+), 81 deletions(-) create mode 100644 Habitica/res/layout/known_issue.xml create mode 100644 Habitica/res/values-night/styles.xml create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiMap.java create mode 100644 Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiParser.kt diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 38986fd9e..c9d9d8187 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -60,11 +60,9 @@ dependencies { compileOnly 'com.github.pengrad:jdk9-deps:1.0' //App Compatibility and Material Design implementation 'androidx.appcompat:appcompat:1.2.0' - implementation 'com.google.android.material:material:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'androidx.legacy:legacy-preference-v14:1.0.0' - // Emojis - implementation 'com.github.viirus:emoji-lib:0.0.5' // Markdown implementation "io.noties.markwon:core:4.2.0" implementation "io.noties.markwon:ext-strikethrough:4.2.0" @@ -158,7 +156,7 @@ android { multiDexEnabled true 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 2557 + versionCode 2561 versionName "3.0" } diff --git a/Habitica/res/drawable/avatar_customization_category_bg.xml b/Habitica/res/drawable/avatar_customization_category_bg.xml index 2f30bb800..300ee34d1 100644 --- a/Habitica/res/drawable/avatar_customization_category_bg.xml +++ b/Habitica/res/drawable/avatar_customization_category_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml index 3be259e51..46989087c 100644 --- a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml +++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml @@ -2,7 +2,7 @@ - + diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml index 9820f8bea..55083564d 100644 --- a/Habitica/res/layout/activity_fixcharacter.xml +++ b/Habitica/res/layout/activity_fixcharacter.xml @@ -16,9 +16,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="?attr/actionBarSize" - android:theme="@style/Toolbar" - app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/> + android:theme="@style/Toolbar.Modern" + app:layout_scrollFlags="scroll|enterAlways"/>