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"/>