diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..8234eac1ef --- /dev/null +++ b/.editorconfig @@ -0,0 +1,14 @@ +[*.{kt,kts}] +max_line_length=off +ktlint_function_naming_ignore_when_annotated_with=Composable + +[*.gradle.kts] +property_naming=off + + +[shared/src/commonMain/kotlin/com/habitrpg/shared/habitica/models/responses/TaskDirectionData.kt] +ktlint_standard_backing-property-naming=disabled + +[**/generated/**/*.kt] +ktlint_standard_property-naming=disabled +ktlint_standard_backing-property-naming=disabled diff --git a/.github/prepare-workflow b/.github/prepare-workflow new file mode 100755 index 0000000000..ba73ad72e6 --- /dev/null +++ b/.github/prepare-workflow @@ -0,0 +1,5 @@ +chmod +x gradlew +cp habitica.properties.example habitica.properties +cp habitica.resources.example habitica.resources +cp Habitica/google-services.json.example Habitica/google-services.json +cp Habitica/google-services.json.example wearos/google-services.json diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 65f4d06b62..a7f330a4bf 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -2,104 +2,108 @@ name: Android CI on: push: - branches: [ develop ] + branches: [ main, 'version/*', 'feature/*' ] pull_request: - branches: [ develop ] jobs: build: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: set up JDK 11 - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - name: set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: copy properties file - uses: canastro/copy-file-action@master - with: - source: "habitica.properties.example" - target: "habitica.properties" - - name: copy resources file - uses: canastro/copy-file-action@master + - name: Prepare + run: ./.github/prepare-workflow + - name: Run with Gradle + uses: gradle/gradle-build-action@v2 with: - source: "habitica.resources.example" - target: "habitica.resources" - - name: copy google services file - uses: canastro/copy-file-action@master - with: - source: "Habitica/google-services.json.example" - target: "Habitica/google-services.json" - - name: Build with Gradle - run: ./gradlew assembleDebug -PdisablePreDex - lint: - runs-on: ubuntu-latest + arguments: assembleProdDebug -PdisablePreDex "-Dorg.gradle.jvmargs=-Xmx2g" + unit-test: + runs-on: ubuntu-latest + strategy: + matrix: + module: + - "common" + - "Habitica" steps: - - uses: actions/checkout@v2 - - name: set up JDK 11 - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - name: set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - - name: copy properties file - uses: canastro/copy-file-action@master - with: - source: "habitica.properties.example" - target: "habitica.properties" - - name: copy resources file - uses: canastro/copy-file-action@master - with: - source: "habitica.resources.example" - target: "habitica.resources" - - name: copy google services file - uses: canastro/copy-file-action@master + - name: Prepare + run: ./.github/prepare-workflow + - name: Run with Gradle + uses: gradle/gradle-build-action@v2 with: - source: "Habitica/google-services.json.example" - target: "Habitica/google-services.json" - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Run Ktlint - run: ./gradlew ktlint - detekt: - runs-on: ubuntu-latest + arguments: ${{ matrix.module }}:testProdDebugUnitTest + +# ui-test: +# runs-on: ubuntu-latest +# strategy: +# matrix: +# api-level: [28, 29, 30, 31, 32] +# steps: +# - uses: actions/checkout@v2 +# - name: set up JDK 11 +# uses: actions/setup-java@v2 +# with: +# java-version: '11' +# distribution: 'adopt' +# cache: gradle +# - name: Prepare +# run: ./.github/prepare-workflow +# - name: run tests +# uses: reactivecircus/android-emulator-runner@v2 +# with: +# api-level: ${{ matrix.api-level }} +# arch: x86_64 +# emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none +# disable-animations: true +# script: ./gradlew connectedProdDebugAndroidTest + lint: + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: set up JDK 11 - uses: actions/setup-java@v2 + - uses: actions/checkout@v3 + - name: set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'adopt' cache: gradle - - name: copy properties file - uses: canastro/copy-file-action@master + - name: Prepare + run: ./.github/prepare-workflow + - name: Run with Gradle + uses: gradle/gradle-build-action@v2 with: - source: "habitica.properties.example" - target: "habitica.properties" - - name: copy resources file - uses: canastro/copy-file-action@master - with: - source: "habitica.resources.example" - target: "habitica.resources" - - name: copy google services file - uses: canastro/copy-file-action@master - with: - source: "Habitica/google-services.json.example" - target: "Habitica/google-services.json" - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Run detekt - run: ./gradlew detekt - - name: Upload SARIF to Github using the upload-sarif action - uses: github/codeql-action/upload-sarif@v1 - if: ${{ always() }} - with: - sarif_file: build/report/detekt.sarif + arguments: ktlintCheck + +# detekt: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v3 +# - name: set up JDK 17 +# uses: actions/setup-java@v3 +# with: +# java-version: '17' +# distribution: 'adopt' +# cache: gradle +# - name: Prepare +# run: ./.github/prepare-workflow +# - name: Run with Gradle +# uses: gradle/gradle-build-action@v2 +# with: +# arguments: detekt +# - name: Upload SARIF to Github using the upload-sarif action +# uses: github/codeql-action/upload-sarif@v2 +# if: ${{ always() }} +# with: +# sarif_file: build/reports/detekt.sarif diff --git a/.gitignore b/.gitignore index 63cbd92ce7..c3d9e5b97b 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,8 @@ fastlane/metadata/android/*/changelogs/ *.aab /Habitica/alpha output-metadata.json +/Habitica/jacoco.exec +*.dm +/fastlane/upload_slack.py +.kotlin +/fastlane/README.md diff --git a/.tx/config b/.tx/config deleted file mode 100644 index a5d9967400..0000000000 --- a/.tx/config +++ /dev/null @@ -1,33 +0,0 @@ -[main] -host = https://www.transifex.com -lang_map = pt_BR: pt-rBR, zh_TW: zh-rTW, hr_HR: hr-rHR, pt_PT: pt-rPT, en_GB: en-rGB, he: iw, id: in - -[habitica-android.store_stringsxml] -file_filter = translations/store_strings-.xml -source_lang = en -type = ANDROID - -[habitica-android.stringssidebarxml] -file_filter = Habitica/res/values-/strings.sidebar.xml -source_file = Habitica/res/values/strings.sidebar.xml -source_lang = en -type = ANDROID - -[habitica-android.stringstutorialxml] -file_filter = Habitica/res/values-/strings.tutorial.xml -source_file = Habitica/res/values/strings.tutorial.xml -source_lang = en -type = ANDROID - -[habitica-android.stringsprofilexml] -file_filter = Habitica/res/values-/strings.profile.xml -source_file = Habitica/res/values/strings.profile.xml -source_lang = en -type = ANDROID - -[habitica-android.stringsxml] -file_filter = Habitica/res/values-/strings.xml -source_file = Habitica/res/values/strings.xml -source_lang = en -type = ANDROID - diff --git a/AndroidStyle.xml b/AndroidStyle.xml deleted file mode 100644 index ee7d365b2c..0000000000 --- a/AndroidStyle.xml +++ /dev/null @@ -1,174 +0,0 @@ - - - - - diff --git a/Gemfile.lock b/Gemfile.lock index e6897e404d..cbf714ee31 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -81,6 +81,9 @@ GEM xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) + fastlane-plugin-properties (1.1.2) + java-properties + fastlane-plugin-semantic_release (1.18.0) fastlane-plugin-versioning_android (0.1.0) gh_inspector (1.1.3) google-api-client (0.38.0) @@ -115,6 +118,7 @@ GEM http-cookie (1.0.3) domain_name (~> 0.5) httpclient (2.8.3) + java-properties (0.3.0) jmespath (1.4.0) json (2.3.0) jwt (2.1.0) @@ -175,6 +179,8 @@ PLATFORMS DEPENDENCIES fastlane + fastlane-plugin-properties + fastlane-plugin-semantic_release fastlane-plugin-versioning_android BUNDLED WITH diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 20aa8c698f..95d57bd551 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -1,46 +1,50 @@ + + + - - - - - + + + android:configChanges="orientation|smallestScreenSize|screenLayout" + android:networkSecurityConfig="@xml/network_security_config" + android:localeConfig="@xml/locales_config"> + + + + + android:configChanges="screenSize | smallestScreenSize | screenLayout" + android:exported="true"> - + @@ -54,8 +58,10 @@ android:name=".ui.activities.PrefsActivity" android:parentActivityName=".ui.activities.MainActivity" android:label="@string/PS_settings_title" - tools:ignore="UnusedAttribute"> - + tools:ignore="UnusedAttribute" + android:configChanges="screenSize | smallestScreenSize | screenLayout | orientation" + android:exported="true"> + @@ -64,56 +70,58 @@ android:pathPattern="/settings/.*"/> + + + + - - - - + android:name=".ui.activities.SkillTasksActivity"> + android:name=".ui.activities.SkillMemberActivity"> - - + + + + + + + + tools:ignore="UnusedAttribute" + android:exported="true"> - + @@ -176,22 +200,15 @@ - - - + @@ -209,25 +226,31 @@ - + + - + - + + + + + android:label="@string/stats_widget_label" + android:exported="false"> @@ -256,7 +289,8 @@ android:resource="@xml/avatar_widget_info" /> + android:label="@string/widget_dailies" + android:exported="false"> @@ -264,7 +298,8 @@ android:resource="@xml/daily_list_widget_info" /> + android:label="@string/widget_todo_list" + android:exported="false"> @@ -272,7 +307,8 @@ android:resource="@xml/todo_list_widget_info" /> + android:label="@string/widget_habit_button" + android:exported="false"> @@ -287,6 +323,25 @@ android:name=".widget.TodosWidgetService" android:permission="android.permission.BIND_REMOTEVIEWS" /> + + + + + + - + + + + + + + + + + + + diff --git a/Habitica/AndroidManifestTesting.xml b/Habitica/AndroidManifestTesting.xml index b2a3cbd1a8..53b3c978f6 100644 --- a/Habitica/AndroidManifestTesting.xml +++ b/Habitica/AndroidManifestTesting.xml @@ -2,8 +2,6 @@ @@ -20,7 +18,7 @@ @@ -43,22 +41,12 @@ tools:ignore="UnusedAttribute"> - - - - - diff --git a/Habitica/build.gradle b/Habitica/build.gradle deleted file mode 100644 index 6a284c4e47..0000000000 --- a/Habitica/build.gradle +++ /dev/null @@ -1,356 +0,0 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' -apply plugin: 'com.google.gms.google-services' -apply plugin: 'com.google.firebase.crashlytics' -apply plugin: 'realm-android' -apply plugin: 'androidx.navigation.safeargs' -apply plugin: 'com.google.firebase.firebase-perf' - -buildscript { - repositories { - mavenLocal() - google() - mavenCentral() - jcenter() - } - dependencies { - classpath 'com.android.tools.build:gradle:4.2.2' - classpath 'net.sourceforge.pmd:pmd-java:5.5.3' - } -} - -repositories { - mavenLocal() - mavenCentral() - google() - maven { url "https://oss.sonatype.org/content/repositories/snapshots" } - - maven { url "https://jitpack.io" } -} - -configurations { - ktlint -} - -dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - //Networking - implementation 'com.squareup.okhttp3:okhttp:4.9.1' - implementation 'com.squareup.okhttp3:logging-interceptor:4.9.1' - //REST API handling - implementation('com.squareup.retrofit2:retrofit:2.9.0') { - exclude module: 'okhttp' - } - implementation 'com.squareup.retrofit2:converter-gson:2.9.0' - implementation 'com.squareup.retrofit2:adapter-rxjava3:2.9.0' - - //Dependency Injection - implementation 'com.google.dagger:dagger:2.38' - kapt 'com.google.dagger:dagger-compiler:2.38' - compileOnly 'javax.annotation:javax.annotation-api:1.3.2' - compileOnly 'com.github.pengrad:jdk9-deps:1.0' - //App Compatibility and Material Design - implementation 'androidx.appcompat:appcompat:1.3.1' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.recyclerview:recyclerview:1.2.1' - implementation "androidx.preference:preference-ktx:1.1.1" - - - // Markdown - implementation "io.noties.markwon:core:4.6.2" - implementation "io.noties.markwon:ext-strikethrough:4.6.2" - implementation "io.noties.markwon:image:4.6.2" - implementation "io.noties.markwon:recycler:4.6.2" - //Eventbus - implementation 'org.greenrobot:eventbus:3.2.0' - // IAP Handling / Verification - implementation 'org.solovyev.android:checkout:1.2.3' - //Facebook - implementation('com.facebook.android:facebook-android-sdk:11.3.0') { - transitive = true - } - implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar' - //RxJava - implementation 'io.reactivex.rxjava3:rxandroid:3.0.0' - implementation 'io.reactivex.rxjava3:rxjava:3.1.1' - implementation 'io.reactivex.rxjava3:rxkotlin:3.0.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.21' - implementation "com.github.akarnokd:rxjava3-bridge:3.0.0" - - //Analytics - implementation 'com.amplitude:android-sdk:2.30.0' - // Image Management Library - implementation("io.coil-kt:coil:1.2.2") - implementation("io.coil-kt:coil-gif:1.2.2") - //Tests - testImplementation 'junit:junit:4.12' - testImplementation 'androidx.test:core:1.4.0' - testImplementation "com.google.truth:truth:1.0.1" - testImplementation 'org.assertj:assertj-core:2.6.0' - testImplementation 'org.robolectric:robolectric:4.6.1' - testImplementation 'org.robolectric:shadows-multidex:4.6.1' - testImplementation 'org.mockito:mockito-core:2.25.0' - testImplementation 'org.powermock:powermock-api-mockito2:1.7.0' - testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.7.0' - testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.0' - testImplementation 'org.powermock:powermock-module-junit4:1.7.0' - //Leak Detection - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7' - //Push Notifications - implementation platform('com.google.firebase:firebase-bom:28.3.0') - implementation 'com.google.firebase:firebase-crashlytics' - implementation 'com.google.firebase:firebase-core' - implementation 'com.google.firebase:firebase-messaging' - implementation 'com.google.firebase:firebase-config' - implementation 'com.google.firebase:firebase-perf' - implementation 'com.google.android.gms:play-services-auth:19.2.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.30" - implementation 'com.nex3z:flow-layout:1.2.2' - - implementation 'androidx.core:core-ktx:1.6.0' - implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" - implementation "androidx.lifecycle:lifecycle-common-java8:2.3.1" - implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5' - implementation 'androidx.navigation:navigation-ui-ktx:2.3.5' - implementation "androidx.paging:paging-runtime-ktx:3.0.1" - implementation 'com.plattysoft.leonids:LeonidsLib:1.3.2' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0' - - implementation 'com.willowtreeapps:signinwithapplebutton:0.3' - - implementation project(':shared') - - ktlint("com.pinterest:ktlint:0.42.1") { - attributes { - attribute(Bundling.BUNDLING_ATTRIBUTE, getObjects().named(Bundling, Bundling.EXTERNAL)) - } - } -} - -android { - compileSdkVersion 30 - buildToolsVersion '30.0.2' - testOptions { - unitTests { - includeAndroidResources = true - } - } - - defaultConfig { - minSdkVersion 21 - applicationId "com.habitrpg.android.habitica" - vectorDrawables.useSupportLibrary = true - buildConfigField "String", "STORE", "\"google\"" - 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 3044 - versionName "3.4" - } - - buildFeatures { - viewBinding true - } - - lintOptions { - abortOnError false - } - - signingConfigs { - release - } - flavorDimensions "buildType" - - buildTypes { - debug { - applicationIdSuffix ".debug" - debuggable true - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - // Disable fabric build ID generation for debug builds - ext.enableCrashlytics = false - ext.alwaysUpdateBuildId = false - resValue "string", "content_provider", "com.habitrpg.android.habitica.debug.fileprovider" - resValue "string", "app_name", "Habitica Debug" - } - release { - signingConfig signingConfigs.release - debuggable false - minifyEnabled true - shrinkResources true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - resValue "string", "content_provider", "com.habitrpg.android.habitica.fileprovider" - resValue "string", "app_name", "Habitica" - } - } - - productFlavors { - dev { - dimension "buildType" - } - - staff { - dimension "buildType" - buildConfigField "String", "TESTING_LEVEL", "\"staff\"" - resValue "string", "app_name", "Habitica Staff" - } - - alpha { - dimension "buildType" - buildConfigField "String", "TESTING_LEVEL", "\"alpha\"" - resValue "string", "app_name", "Habitica Alpha" - } - - beta { - buildConfigField "String", "TESTING_LEVEL", "\"beta\"" - dimension "buildType" - } - - prod { - buildConfigField "String", "TESTING_LEVEL", "\"production\"" - dimension "buildType" - } - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src/main/java'] - resources.srcDirs = ['src/main/java'] - aidl.srcDirs = ['src/main/java'] - renderscript.srcDirs = ['src/main/java'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - /*robolectric { - manifest.srcFile 'AndroidManifestTesting.xml' - java.srcDir file('src/test/java/') - res.srcDirs = ['res'] - }*/ - //instrumentTest.setRoot('tests') - release { java.srcDirs = ['src/release/java'] } - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - - kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() - } - - dexOptions { - preDexLibraries false - javaMaxHeapSize "6g" // Use gig increments depending on needs - } - - lintOptions { - disable 'MissingTranslation','InvalidPackage' - enable 'LogConditional','IconExpectedSize','MissingRegistered','TypographyQuotes' - } - - bundle { - language { - // Specifies that the app bundle should not support - // configuration APKs for language resources. These - // resources are instead packaged with each base and - // dynamic feature APK. - enableSplit = false - } - } -} - -Properties props = new Properties() -def propFile = new File('signingrelease.properties') -if (propFile.canRead()) { - props.load(new FileInputStream(propFile)) - - if (props != null && props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') && - props.containsKey('KEY_ALIAS') && props.containsKey('KEY_PASSWORD')) { - android.signingConfigs.release.storeFile = file(props['STORE_FILE']) - android.signingConfigs.release.storePassword = props['STORE_PASSWORD'] - android.signingConfigs.release.keyAlias = props['KEY_ALIAS'] - android.signingConfigs.release.keyPassword = props['KEY_PASSWORD'] - } else { - println 'signing.properties found but some entries are missing' - android.buildTypes.release.signingConfig = null - } -} else { - println 'signing.properties not found' - android.buildTypes.release.signingConfig = null -} - -// Add Habitica Properties to buildConfigField -final File HRPG_PROPS_FILE = new File('habitica.properties') -if (HRPG_PROPS_FILE.canRead()) { - Properties HRPG_PROPS = new Properties() - HRPG_PROPS.load(new FileInputStream(HRPG_PROPS_FILE)) - - if (HRPG_PROPS != null) { - android.buildTypes.all { buildType -> - HRPG_PROPS.any { property -> - buildType.buildConfigField "String", property.key, "\"${property.value}\"" - } - } - } else { - throw new InvalidUserDataException('habitica.properties found but some entries are missing') - } -} else { - throw new MissingResourceException('habitica.properties not found') -} - -// Add Habitica Resources to resources -final File HRPG_RES_FILE = new File('habitica.resources') -if (HRPG_RES_FILE.canRead()) { - Properties HRPG_RES = new Properties() - HRPG_RES.load(new FileInputStream(HRPG_RES_FILE)) - - if (HRPG_RES != null) { - android.buildTypes.all { buildType -> - HRPG_RES.any { property -> - buildType.resValue "string", property.key, "\"${property.value}\"" - } - } - } else { - throw new InvalidUserDataException('habitica.resources found but some entries are missing') - } -} else { - throw new MissingResourceException('habitica.resources not found') -} - -tasks.whenTaskAdded { task -> - if (task.name == "lint") { - task.enabled = false - } -} - -gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - options.compilerArgs << "-Xmaxerrs" << "500" - } -} - -apply plugin: 'com.google.gms.google-services' - -task ktlint(type: JavaExec, group: "verification") { - description = "Check Kotlin code style." - classpath = configurations.ktlint - main = "com.pinterest.ktlint.Main" - args "--disabled_rules=no-wildcard-imports", "--reporter=plain?group_by_file", "src/**/*.kt" - // to generate report in checkstyle format prepend following args: - // "--reporter=plain", "--reporter=checkstyle,output=${buildDir}/ktlint.xml" - // to add a baseline to check against prepend following args: - // "--baseline=ktlint-baseline.xml" - // see https://github.com/pinterest/ktlint#usage for more -} -check.dependsOn ktlint - -task ktlintFormat(type: JavaExec, group: "formatting") { - description = "Fix Kotlin code style deviations." - classpath = configurations.ktlint - main = "com.pinterest.ktlint.Main" - args "--disabled_rules=no-wildcard-imports", "-F", "src/**/*.kt" -} \ No newline at end of file diff --git a/Habitica/build.gradle.kts b/Habitica/build.gradle.kts new file mode 100644 index 0000000000..3c562b6910 --- /dev/null +++ b/Habitica/build.gradle.kts @@ -0,0 +1,224 @@ +import com.android.build.gradle.internal.lint.AndroidLintTask +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinJvmCompile + +plugins { + `jacoco-report-aggregation` + id(libs.plugins.kotlin.android.get().pluginId) + id(libs.plugins.android.application.get().pluginId) + id(libs.plugins.hilt.get().pluginId) + id(libs.plugins.navigation.get().pluginId) + id(libs.plugins.ksp.get().pluginId) + id("kotlin-parcelize") + id("kotlin-kapt") + id(libs.plugins.kotlin.compose.get().pluginId) + id(libs.plugins.realm.get().pluginId) + id(libs.plugins.habitrpg.application.get().pluginId) + id(libs.plugins.habitrpg.convention.get().pluginId) + id(libs.plugins.crashlytics.get().pluginId) + id(libs.plugins.firebase.perf.get().pluginId) + id(libs.plugins.google.service.get().pluginId) +} + +android { + compileSdk = libs.versions.targetSdk.get().toInt() + namespace = "com.habitrpg.android.habitica" + + defaultConfig { + applicationId = "com.habitrpg.android.habitica" + minSdk = libs.versions.minSdk.get().toInt() + compileSdk = libs.versions.targetSdk.get().toInt() + vectorDrawables.useSupportLibrary = true + + targetSdk = libs.versions.targetSdk.get().toInt() + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunnerArguments["clearPackageData"] = "true" + + @Suppress("UnstableApiUsage") + androidResources.localeFilters.addAll( + listOf("en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "hu", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "uk", "zh", "zh-rTW") + ) + + buildConfigField("String", "STORE", "\"google\"") + buildConfigField("String", "TESTING_LEVEL", "\"production\"") + } + + buildFeatures { + viewBinding = true + compose = true + renderScript = true + buildConfig = true + } + + buildTypes { + debug { + // Keep it commented! + //applicationIdSuffix ".debug" + isDebuggable = true + isMinifyEnabled = false + proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") + // Disable fabric build ID generation for debug builds + ext["enableCrashlytics"] = false + ext["alwaysUpdateBuildId"] = false + enableUnitTestCoverage = false + resValue("string", "content_provider", "com.habitrpg.android.habitica.debug.fileprovider") + resValue("string", "app_name", "Habitica Debug") + } + create("debugIAP") { + signingConfigs.asMap["release"]?.let { releaseSigning -> signingConfig = releaseSigning } + isDebuggable = true + isMinifyEnabled = false + enableUnitTestCoverage = false + enableAndroidTestCoverage = false + proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") + // Disable fabric build ID generation for debug builds + ext["enableCrashlytics"] = false + ext["alwaysUpdateBuildId"] = false + resValue("string", "content_provider", "com.habitrpg.android.habitica.fileprovider") + resValue("string", "app_name", "Habitica Debug") + } + release { + signingConfigs.asMap["release"]?.let { releaseSigning -> signingConfig = releaseSigning } + isDebuggable = false + isMinifyEnabled = true + isShrinkResources = true + proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro") + resValue("string", "content_provider", "com.habitrpg.android.habitica.fileprovider") + resValue("string", "app_name", "Habitica") + } + } + + sourceSets { + getByName("main") { + manifest.srcFile("AndroidManifest.xml") + java.srcDirs("src/main/java") + resources.srcDirs("src/main/java") + renderscript.srcDirs("src/main/java") + res.srcDirs("res") + assets.srcDirs("assets") + } + getByName("test") { java.srcDir("src/test/java") } + getByName("debugIAP") { java.srcDirs("src/debug/java") } + getByName("release") { java.srcDirs("src/release/java") } + } + + compileOptions { + isCoreLibraryDesugaringEnabled = true + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } + + hilt { + enableAggregatingTask = true + } + + testOptions { + unitTests { + isIncludeAndroidResources = true + isReturnDefaultValues = true + all { it.useJUnitPlatform() } + } + animationsDisabled = true + } + + lint { + checkReleaseBuilds = false + abortOnError = true + disable.addAll(listOf("MissingTranslation")) + enable.addAll(listOf("LogConditional", "IconExpectedSize", "MissingRegistered", "TypographyQuotes")) + } + + bundle.language.enableSplit = false + packaging.resources.excludes.add("META-INF/*") +} + +tasks.withType { enabled = false } +tasks.withType { options.compilerArgs.addAll(listOf("-Xmaxerrs", "500")) } +tasks.withType().configureEach { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_11) + } +} + +dependencies { + implementation(projects.common) + implementation(projects.shared) + + implementation(fileTree("../common/libs") { include("*.jar") }) + + //Networking + implementation(libs.bundles.okhttp) + + //REST API handling + implementation(libs.retrofit) { exclude(module = libs.okhttp.asProvider().get().group) } + implementation(libs.retrofit.converter.gson) + + //Dependency Injection + implementation(libs.hilt.android) + ksp(libs.hilt.compiler) + compileOnly(libs.javax.annotation) + + //App Compatibility and Material Design + implementation(libs.bundles.design) + + //Desugaring + coreLibraryDesugaring(libs.desugar) + + // IAP Handling / Verification + implementation(libs.billing) + + implementation(libs.coil.compose) + + //Analytics + implementation(libs.amplitude.analytic) + + implementation(libs.shimmer) + + //Leak Detection + debugImplementation(libs.leakcanary) + + // Google Services + implementation(platform(libs.firebase.bom)) + implementation(libs.bundles.google.services) + implementation(libs.credentials) + implementation(libs.credentials.playServicesAuth) + implementation(libs.googleid) + + implementation(libs.flexbox) + + implementation(libs.core) + implementation(libs.core.ktx) + + implementation(libs.lifecycle.common) + implementation(libs.lifecycle.viewmodel) + implementation(libs.lifecycle.livedata) + implementation(libs.lifecycle.process) + + implementation(libs.navigation.fragment) + implementation(libs.fragment.ktx) + implementation(libs.paging) + implementation(libs.paging.compose) + implementation(libs.kotlinx.coroutine) + implementation(libs.coroutine.android) + implementation(libs.material3) + + implementation(libs.google.play.review) + implementation(libs.google.play.review.ktx) + + implementation(libs.activity.compose) + implementation(libs.runtime.livedata) + implementation(libs.compose.animation) + implementation(libs.text.google.fonts) + implementation(libs.ui.tooling) + implementation(libs.viewmodel.compose) + + implementation(libs.kotlin.stdlib) + + //Tests + testImplementation(libs.bundles.test.implementation) + androidTestImplementation(libs.bundles.android.test.implementation) + androidTestImplementation(libs.kaspresso) { exclude(module = "protobuf-lite") } + debugImplementation(libs.test.fragment) + debugImplementation(libs.test.monitor) + androidTestUtil(libs.test.orchestrator) +} diff --git a/Habitica/config/checkstyle.xml b/Habitica/config/checkstyle.xml deleted file mode 100644 index 1e89755792..0000000000 --- a/Habitica/config/checkstyle.xml +++ /dev/null @@ -1,267 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Habitica/config/pmd.xml b/Habitica/config/pmd.xml deleted file mode 100644 index 4ec9b7a370..0000000000 --- a/Habitica/config/pmd.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - - - POM rule set file - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Habitica/google-services.json.example b/Habitica/google-services.json.example index a75180c304..4df402da15 100644 --- a/Habitica/google-services.json.example +++ b/Habitica/google-services.json.example @@ -31,9 +31,6 @@ "appinvite_service": { "status": 1, "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 } } }, @@ -62,9 +59,6 @@ "appinvite_service": { "status": 1, "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 } } } diff --git a/Habitica/habitica-flavor.json b/Habitica/habitica-flavor.json new file mode 100644 index 0000000000..32dedf0c61 --- /dev/null +++ b/Habitica/habitica-flavor.json @@ -0,0 +1,45 @@ +{ + "dimension": "buildType", + "flavors": [ + { + "name": "dev" + }, + { + "name": "staff", + "testingLevel": "\"staff\"", + "appName": "Habitica Staff", + "versionCodeIncrement": 8 + }, + { + "name": "setup", + "testingLevel": "\"staff\"", + "appName": "Habitica Setup", + "versionCodeIncrement": 9, + "applicationId": "com.habitrpg.android.habitica.debug" + }, + { + "name": "partners", + "testingLevel": "\"partners\"", + "appName": "Habitica", + "versionCodeIncrement": 6 + }, + { + "name": "alpha", + "testingLevel": "\"alpha\"", + "appName": "Habitica Alpha", + "versionCodeIncrement": 4 + }, + { + "name": "beta", + "testingLevel": "\"beta\"", + "appName": "Habitica", + "versionCodeIncrement": 2 + }, + { + "name": "prod", + "testingLevel": "\"production\"", + "appName": "Habitica", + "versionCodeIncrement": 0 + } + ] +} diff --git a/Habitica/ic_launcher-web.webp b/Habitica/ic_launcher-web.webp deleted file mode 100644 index c1d05bb399..0000000000 Binary files a/Habitica/ic_launcher-web.webp and /dev/null differ diff --git a/Habitica/libs/LeonidsLib-1.3.2.jar b/Habitica/libs/LeonidsLib-1.3.2.jar new file mode 100644 index 0000000000..2713755b70 Binary files /dev/null and b/Habitica/libs/LeonidsLib-1.3.2.jar differ diff --git a/Habitica/lint.xml b/Habitica/lint.xml deleted file mode 100644 index ee0eead5bb..0000000000 --- a/Habitica/lint.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro index 80cc5c85e4..dd5de2009c 100644 --- a/Habitica/proguard-rules.pro +++ b/Habitica/proguard-rules.pro @@ -21,7 +21,6 @@ -keepattributes Signature -keepattributes *Annotation* -keepattributes Exceptions --keep class sun.misc.Unsafe { *; } #retrolambda -dontwarn java.lang.invoke.* @@ -33,18 +32,10 @@ long consumerIndex; } --keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueProducerNodeRef { - rx.internal.util.atomic.LinkedQueueNode producerNode; -} - --keepclassmembers class rx.internal.util.unsafe.BaseLinkedQueueConsumerNodeRef { - rx.internal.util.atomic.LinkedQueueNode consumerNode; -} #OkHttp -keep class okhttp3.** { *; } -keep,includedescriptorclasses class okio.Source --keep,includedescriptorclasses class okio.okio.Buffer -keep interface okhttp3.** { *; } -dontwarn okhttp3.** @@ -52,6 +43,9 @@ #retrofit -dontwarn retrofit2.** -keep class retrofit2.** { *; } +-if interface * { @retrofit2.http.* *** *(...); } +-keep,allowobfuscation interface <3> +-keep,allowobfuscation,allowshrinking interface retrofit2.Call -keepclasseswithmembers class * { @retrofit2.http.* ; @@ -63,9 +57,19 @@ -keep class * implements com.google.gson.JsonSerializer -keep class * implements com.google.gson.JsonDeserializer +-keepattributes Signature +-keep class com.google.gson.reflect.TypeToken +-keep class * extends com.google.gson.reflect.TypeToken +-keep public class * implements java.lang.reflect.Type +-keepclassmembers,allowobfuscation class * { + @com.google.gson.annotations.SerializedName ; +} + #keep Habitica code -keep class com.habitrpg.android.habitica.** { *; } - +-keep class com.habitrpg.common.habitica.** { *; } +-keep class com.habitrpg.shared.habitica.** { *; } +-keep class com.habitrpg.android.habitica.extensions.ViewGroupExt #realm -keep class io.realm.annotations.RealmModule -keep @io.realm.annotations.RealmModule class * @@ -74,62 +78,21 @@ -dontwarn javax.** -dontwarn io.realm.** -#eventbus --keepclassmembers class ** { - @org.greenrobot.eventbus.Subscribe ; -} --keep enum org.greenrobot.eventbus.ThreadMode { *; } - -# Only required if you use AsyncExecutor --keepclassmembers class * extends org.greenrobot.eventbus.util.ThrowableFailureEvent { - (java.lang.Throwable); -} - #crashlytic -keepattributes SourceFile,LineNumberTable -keep public class * extends java.lang.Exception -keep class com.crashlytics.** { *; } -dontwarn com.crashlytics.** -#fresko -# Keep our interfaces so they can be used by other ProGuard rules. -# See http://sourceforge.net/p/proguard/bugs/466/ --keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip - -# Do not strip any method/class that is annotated with @DoNotStrip --keep @com.facebook.common.internal.DoNotStrip class * --keepclassmembers class * { - @com.facebook.common.internal.DoNotStrip *; -} - # Keep native methods -keepclassmembers class * { native ; } -# Keep our interfaces so they can be used by other ProGuard rules. -# See http://sourceforge.net/p/proguard/bugs/466/ --keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip - -# Do not strip any method/class that is annotated with @DoNotStrip --keep @com.facebook.common.internal.DoNotStrip class * --keepclassmembers class * { - @com.facebook.common.internal.DoNotStrip *; -} - -# Keep native methods --keepclassmembers class * { - native ; -} -#end fresko #amplitude -keep class com.google.android.gms.ads.** { *; } #end amplitude -#playservices --keep class * extends java.util.ListResourceBundle { - protected Object[][] getContents(); -} -keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable { public static final *** NULL; @@ -147,20 +110,6 @@ -dontwarn com.google.android.gms.** #end playservices -#checkout --keep class com.android.vending.billing.** - --assumenosideeffects class org.solovyev.android.checkout.Billing { - public static void debug(...); - public static void warning(...); - public static void error(...); -} - --assumenosideeffects class org.solovyev.android.checkout.Check { - static *; -} -#end chekout - #add warnings here, warnings in proguard is normal -dontwarn javax.annotation.** -dontwarn com.squareup.picasso.** @@ -169,18 +118,17 @@ -dontwarn com.android.volley.toolbox.** -dontwarn com.facebook.infer.** -dontwarn com.habitrpg.android.habitica.ui.views.bottombar.** --dontwarn com.viewpagerindicator.** #-ignorewarnings -keep class com.google.firebase.provider.FirebaseInitProvider #keep all enums -keepclassmembers enum * { *; } --keep class Type { - public *; -} -keepclassmembers class * extends java.lang.Enum { ; public static **[] values(); public static ** valueOf(java.lang.String); -} \ No newline at end of file +} + +-keepattributes Signature +-keep class kotlin.coroutines.Continuation diff --git a/Habitica/res/anim/bottom_sheet_slide_in.xml b/Habitica/res/anim/bottom_sheet_slide_in.xml new file mode 100644 index 0000000000..df4e1bb9a2 --- /dev/null +++ b/Habitica/res/anim/bottom_sheet_slide_in.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/Habitica/res/anim/bottom_sheet_slide_out.xml b/Habitica/res/anim/bottom_sheet_slide_out.xml new file mode 100644 index 0000000000..c436df8c7d --- /dev/null +++ b/Habitica/res/anim/bottom_sheet_slide_out.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/color/color_box_stroke.xml b/Habitica/res/color/color_box_stroke.xml new file mode 100644 index 0000000000..0580c24814 --- /dev/null +++ b/Habitica/res/color/color_box_stroke.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/color/promo_gradient.xml b/Habitica/res/color/promo_gradient.xml new file mode 100644 index 0000000000..efe22607d4 --- /dev/null +++ b/Habitica/res/color/promo_gradient.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/color/text_input_account_stroke.xml b/Habitica/res/color/text_input_account_stroke.xml new file mode 100644 index 0000000000..809fab7777 --- /dev/null +++ b/Habitica/res/color/text_input_account_stroke.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png index 69420d1895..5ee9633e62 100644 Binary files a/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-hdpi/ab_solid_shadow_holo.9.png differ diff --git a/Habitica/res/drawable-hdpi/adventure_guide_art.png b/Habitica/res/drawable-hdpi/adventure_guide_art.png index 5d070259e7..88266a1be3 100644 Binary files a/Habitica/res/drawable-hdpi/adventure_guide_art.png and b/Habitica/res/drawable-hdpi/adventure_guide_art.png differ diff --git a/Habitica/res/drawable-hdpi/adventure_guide_left.png b/Habitica/res/drawable-hdpi/adventure_guide_left.png new file mode 100644 index 0000000000..3731cb7697 Binary files /dev/null and b/Habitica/res/drawable-hdpi/adventure_guide_left.png differ diff --git a/Habitica/res/drawable-hdpi/adventure_guide_right.png b/Habitica/res/drawable-hdpi/adventure_guide_right.png new file mode 100644 index 0000000000..811d5c70b3 Binary files /dev/null and b/Habitica/res/drawable-hdpi/adventure_guide_right.png differ diff --git a/Habitica/res/drawable-hdpi/armoire_background.png b/Habitica/res/drawable-hdpi/armoire_background.png new file mode 100644 index 0000000000..df363c7788 Binary files /dev/null and b/Habitica/res/drawable-hdpi/armoire_background.png differ diff --git a/Habitica/res/drawable-hdpi/armoire_circle.png b/Habitica/res/drawable-hdpi/armoire_circle.png new file mode 100644 index 0000000000..e372349474 Binary files /dev/null and b/Habitica/res/drawable-hdpi/armoire_circle.png differ diff --git a/Habitica/res/drawable-hdpi/armoire_experience.png b/Habitica/res/drawable-hdpi/armoire_experience.png new file mode 100644 index 0000000000..45731db182 Binary files /dev/null and b/Habitica/res/drawable-hdpi/armoire_experience.png differ diff --git a/Habitica/res/drawable-hdpi/assign.png b/Habitica/res/drawable-hdpi/assign.png new file mode 100644 index 0000000000..7cb775b3c7 Binary files /dev/null and b/Habitica/res/drawable-hdpi/assign.png differ diff --git a/Habitica/res/drawable-hdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-hdpi/baseline_error_outline_black_36dp.png deleted file mode 100644 index ec4860d026..0000000000 Binary files a/Habitica/res/drawable-hdpi/baseline_error_outline_black_36dp.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/birthday_gifts.png b/Habitica/res/drawable-hdpi/birthday_gifts.png new file mode 100644 index 0000000000..45408a694c Binary files /dev/null and b/Habitica/res/drawable-hdpi/birthday_gifts.png differ diff --git a/Habitica/res/drawable-hdpi/birthday_menu_gems.png b/Habitica/res/drawable-hdpi/birthday_menu_gems.png new file mode 100644 index 0000000000..cd5b0a2d8e Binary files /dev/null and b/Habitica/res/drawable-hdpi/birthday_menu_gems.png differ diff --git a/Habitica/res/drawable-hdpi/birthday_textdeco_left.png b/Habitica/res/drawable-hdpi/birthday_textdeco_left.png new file mode 100644 index 0000000000..dd170cdbd8 Binary files /dev/null and b/Habitica/res/drawable-hdpi/birthday_textdeco_left.png differ diff --git a/Habitica/res/drawable-hdpi/birthday_textdeco_right.png b/Habitica/res/drawable-hdpi/birthday_textdeco_right.png new file mode 100644 index 0000000000..32c0a850c6 Binary files /dev/null and b/Habitica/res/drawable-hdpi/birthday_textdeco_right.png differ diff --git a/Habitica/res/drawable-hdpi/border_pixelated.png b/Habitica/res/drawable-hdpi/border_pixelated.png new file mode 100644 index 0000000000..1e1cf0ea55 Binary files /dev/null and b/Habitica/res/drawable-hdpi/border_pixelated.png differ diff --git a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png index 3c5f373cee..a1d60a7301 100644 Binary files a/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-hdpi/challenge_won_gem_confetti.png differ diff --git a/Habitica/res/drawable-hdpi/checkmark_small.png b/Habitica/res/drawable-hdpi/checkmark_small.png new file mode 100644 index 0000000000..b9b621b017 Binary files /dev/null and b/Habitica/res/drawable-hdpi/checkmark_small.png differ diff --git a/Habitica/res/drawable-hdpi/contributor_icon.png b/Habitica/res/drawable-hdpi/contributor_icon.png new file mode 100644 index 0000000000..62973544f7 Binary files /dev/null and b/Habitica/res/drawable-hdpi/contributor_icon.png differ diff --git a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png index 0a7ac2a6b0..5df493c36f 100644 Binary files a/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png and b/Habitica/res/drawable-hdpi/creator_hair_bangs_2_white.png differ diff --git a/Habitica/res/drawable-hdpi/customization_background.png b/Habitica/res/drawable-hdpi/customization_background.png new file mode 100644 index 0000000000..4421320fbc Binary files /dev/null and b/Habitica/res/drawable-hdpi/customization_background.png differ diff --git a/Habitica/res/drawable-hdpi/customization_mix.png b/Habitica/res/drawable-hdpi/customization_mix.png new file mode 100644 index 0000000000..e22f03ba08 Binary files /dev/null and b/Habitica/res/drawable-hdpi/customization_mix.png differ diff --git a/Habitica/res/drawable-hdpi/diamond_button_white.9.png b/Habitica/res/drawable-hdpi/diamond_button_white.9.png index f9f657f99f..ce13f3b4d3 100644 Binary files a/Habitica/res/drawable-hdpi/diamond_button_white.9.png and b/Habitica/res/drawable-hdpi/diamond_button_white.9.png differ diff --git a/Habitica/res/drawable-hdpi/drawer_shadow.9.png b/Habitica/res/drawable-hdpi/drawer_shadow.9.png deleted file mode 100644 index 227cf4b057..0000000000 Binary files a/Habitica/res/drawable-hdpi/drawer_shadow.9.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/empty_slot.png b/Habitica/res/drawable-hdpi/empty_slot.png new file mode 100644 index 0000000000..50dc713633 Binary files /dev/null and b/Habitica/res/drawable-hdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-hdpi/extra_gem_cap_left.png b/Habitica/res/drawable-hdpi/extra_gem_cap_left.png new file mode 100644 index 0000000000..6d195f1d0d Binary files /dev/null and b/Habitica/res/drawable-hdpi/extra_gem_cap_left.png differ diff --git a/Habitica/res/drawable-hdpi/extra_gem_cap_right.png b/Habitica/res/drawable-hdpi/extra_gem_cap_right.png new file mode 100644 index 0000000000..e0fd2a3966 Binary files /dev/null and b/Habitica/res/drawable-hdpi/extra_gem_cap_right.png differ diff --git a/Habitica/res/drawable-hdpi/fall_gems_21.png b/Habitica/res/drawable-hdpi/fall_gems_21.png new file mode 100644 index 0000000000..bef48ecf1e Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_21.png differ diff --git a/Habitica/res/drawable-hdpi/fall_gems_4.png b/Habitica/res/drawable-hdpi/fall_gems_4.png new file mode 100644 index 0000000000..1891c5c7d0 Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_4.png differ diff --git a/Habitica/res/drawable-hdpi/fall_gems_42.png b/Habitica/res/drawable-hdpi/fall_gems_42.png new file mode 100644 index 0000000000..fcc6b0f407 Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_42.png differ diff --git a/Habitica/res/drawable-hdpi/fall_gems_84.png b/Habitica/res/drawable-hdpi/fall_gems_84.png new file mode 100644 index 0000000000..30e9af878e Binary files /dev/null and b/Habitica/res/drawable-hdpi/fall_gems_84.png differ diff --git a/Habitica/res/drawable-hdpi/fall_promo_title.png b/Habitica/res/drawable-hdpi/fall_promo_title.png index 14bb37c525..5e85626caf 100644 Binary files a/Habitica/res/drawable-hdpi/fall_promo_title.png and b/Habitica/res/drawable-hdpi/fall_promo_title.png differ diff --git a/Habitica/res/drawable-hdpi/flag_flap.png b/Habitica/res/drawable-hdpi/flag_flap.png index b4e5e9cec5..2ceefd3e73 100644 Binary files a/Habitica/res/drawable-hdpi/flag_flap.png and b/Habitica/res/drawable-hdpi/flag_flap.png differ diff --git a/Habitica/res/drawable-hdpi/footer_hills.png b/Habitica/res/drawable-hdpi/footer_hills.png new file mode 100644 index 0000000000..7203cf5e57 Binary files /dev/null and b/Habitica/res/drawable-hdpi/footer_hills.png differ diff --git a/Habitica/res/drawable-hdpi/footer_hills_g1g1.png b/Habitica/res/drawable-hdpi/footer_hills_g1g1.png new file mode 100644 index 0000000000..528e6448d1 Binary files /dev/null and b/Habitica/res/drawable-hdpi/footer_hills_g1g1.png differ diff --git a/Habitica/res/drawable-hdpi/footer_stars_left.png b/Habitica/res/drawable-hdpi/footer_stars_left.png new file mode 100644 index 0000000000..2fd9029310 Binary files /dev/null and b/Habitica/res/drawable-hdpi/footer_stars_left.png differ diff --git a/Habitica/res/drawable-hdpi/footer_stars_right.png b/Habitica/res/drawable-hdpi/footer_stars_right.png new file mode 100644 index 0000000000..b045f7717a Binary files /dev/null and b/Habitica/res/drawable-hdpi/footer_stars_right.png differ diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png index 96f5d9fa39..12959c0d13 100644 Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_menu_right.png differ diff --git a/Habitica/res/drawable-hdpi/g1g1_promo_right.png b/Habitica/res/drawable-hdpi/g1g1_promo_right.png index fc31a92855..aac2b88e5b 100644 Binary files a/Habitica/res/drawable-hdpi/g1g1_promo_right.png and b/Habitica/res/drawable-hdpi/g1g1_promo_right.png differ diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png index 8c3b33645f..4495d22028 100644 Binary files a/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-hdpi/g1g1_sparkle_left.png differ diff --git a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png index 917c06821c..3a941253a8 100644 Binary files a/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-hdpi/g1g1_sparkle_right.png differ diff --git a/Habitica/res/drawable-hdpi/gem_gold_left.png b/Habitica/res/drawable-hdpi/gem_gold_left.png new file mode 100644 index 0000000000..78a2461b9e Binary files /dev/null and b/Habitica/res/drawable-hdpi/gem_gold_left.png differ diff --git a/Habitica/res/drawable-hdpi/gem_gold_right.png b/Habitica/res/drawable-hdpi/gem_gold_right.png new file mode 100644 index 0000000000..3f10c01d69 Binary files /dev/null and b/Habitica/res/drawable-hdpi/gem_gold_right.png differ diff --git a/Habitica/res/drawable-hdpi/gems_21.png b/Habitica/res/drawable-hdpi/gems_21.png index 8a2b09b8a3..b32d0a122e 100644 Binary files a/Habitica/res/drawable-hdpi/gems_21.png and b/Habitica/res/drawable-hdpi/gems_21.png differ diff --git a/Habitica/res/drawable-hdpi/gems_4.png b/Habitica/res/drawable-hdpi/gems_4.png index 1c582645b5..deb5b8e50f 100644 Binary files a/Habitica/res/drawable-hdpi/gems_4.png and b/Habitica/res/drawable-hdpi/gems_4.png differ diff --git a/Habitica/res/drawable-hdpi/gems_42.png b/Habitica/res/drawable-hdpi/gems_42.png index cae16bb453..dbfb8fe613 100644 Binary files a/Habitica/res/drawable-hdpi/gems_42.png and b/Habitica/res/drawable-hdpi/gems_42.png differ diff --git a/Habitica/res/drawable-hdpi/gems_84.png b/Habitica/res/drawable-hdpi/gems_84.png index 56e9dcffb7..4c3dfdb5e2 100644 Binary files a/Habitica/res/drawable-hdpi/gems_84.png and b/Habitica/res/drawable-hdpi/gems_84.png differ diff --git a/Habitica/res/drawable-hdpi/gift_sub_gift.png b/Habitica/res/drawable-hdpi/gift_sub_gift.png index 30842a74b8..16226de8ff 100644 Binary files a/Habitica/res/drawable-hdpi/gift_sub_gift.png and b/Habitica/res/drawable-hdpi/gift_sub_gift.png differ diff --git a/Habitica/res/drawable-hdpi/gold_coins_left.png b/Habitica/res/drawable-hdpi/gold_coins_left.png index f1e0e5b91b..99d7d073cc 100644 Binary files a/Habitica/res/drawable-hdpi/gold_coins_left.png and b/Habitica/res/drawable-hdpi/gold_coins_left.png differ diff --git a/Habitica/res/drawable-hdpi/gold_coins_right.png b/Habitica/res/drawable-hdpi/gold_coins_right.png index 733f648778..c8cb53a77b 100644 Binary files a/Habitica/res/drawable-hdpi/gold_coins_right.png and b/Habitica/res/drawable-hdpi/gold_coins_right.png differ diff --git a/Habitica/res/drawable-hdpi/header_verify_username.png b/Habitica/res/drawable-hdpi/header_verify_username.png new file mode 100644 index 0000000000..87cc9aa64e Binary files /dev/null and b/Habitica/res/drawable-hdpi/header_verify_username.png differ diff --git a/Habitica/res/drawable-hdpi/hourglass_fancy_left.png b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png new file mode 100644 index 0000000000..6606c71d50 Binary files /dev/null and b/Habitica/res/drawable-hdpi/hourglass_fancy_left.png differ diff --git a/Habitica/res/drawable-hdpi/ic_add_white_18dp.png b/Habitica/res/drawable-hdpi/ic_add_white_18dp.png index bfccb5195f..598139d623 100644 Binary files a/Habitica/res/drawable-hdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-hdpi/ic_add_white_18dp.png differ diff --git a/Habitica/res/drawable-hdpi/ic_close_white_18dp.xml b/Habitica/res/drawable-hdpi/ic_close_white_18dp.xml new file mode 100644 index 0000000000..cc8352bdca --- /dev/null +++ b/Habitica/res/drawable-hdpi/ic_close_white_18dp.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/drawable-hdpi/ic_email_color.png b/Habitica/res/drawable-hdpi/ic_email_color.png new file mode 100644 index 0000000000..6beaa5556a Binary files /dev/null and b/Habitica/res/drawable-hdpi/ic_email_color.png differ diff --git a/Habitica/res/drawable-hdpi/ic_gryphon_white.webp b/Habitica/res/drawable-hdpi/ic_gryphon_white.webp deleted file mode 100644 index d98990a207..0000000000 Binary files a/Habitica/res/drawable-hdpi/ic_gryphon_white.webp and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/icon_birthday.png b/Habitica/res/drawable-hdpi/icon_birthday.png new file mode 100644 index 0000000000..4cba17f864 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-hdpi/icon_boss_health.png b/Habitica/res/drawable-hdpi/icon_boss_health.png new file mode 100644 index 0000000000..de71e8e765 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_boss_health.png differ diff --git a/Habitica/res/drawable-hdpi/icon_boss_rage.png b/Habitica/res/drawable-hdpi/icon_boss_rage.png new file mode 100644 index 0000000000..c7e0d227c5 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_boss_rage.png differ diff --git a/Habitica/res/drawable-hdpi/icon_eggs.png b/Habitica/res/drawable-hdpi/icon_eggs.png new file mode 100644 index 0000000000..28d622e558 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_eggs.png differ diff --git a/Habitica/res/drawable-hdpi/icon_food.png b/Habitica/res/drawable-hdpi/icon_food.png new file mode 100644 index 0000000000..71f8cc10cb Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_food.png differ diff --git a/Habitica/res/drawable-hdpi/icon_hatchingpotions.png b/Habitica/res/drawable-hdpi/icon_hatchingpotions.png new file mode 100644 index 0000000000..38e366bcf8 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_hatchingpotions.png differ diff --git a/Habitica/res/drawable-hdpi/icon_lock.png b/Habitica/res/drawable-hdpi/icon_lock.png new file mode 100644 index 0000000000..3960a21e08 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_lock.png differ diff --git a/Habitica/res/drawable-hdpi/icon_messages.png b/Habitica/res/drawable-hdpi/icon_messages.png index b688753672..517d615db8 100644 Binary files a/Habitica/res/drawable-hdpi/icon_messages.png and b/Habitica/res/drawable-hdpi/icon_messages.png differ diff --git a/Habitica/res/drawable-hdpi/icon_quests.png b/Habitica/res/drawable-hdpi/icon_quests.png new file mode 100644 index 0000000000..451891f519 Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_quests.png differ diff --git a/Habitica/res/drawable-hdpi/icon_shops.png b/Habitica/res/drawable-hdpi/icon_shops.png new file mode 100644 index 0000000000..0ec7855f8c Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_shops.png differ diff --git a/Habitica/res/drawable-hdpi/icon_special.png b/Habitica/res/drawable-hdpi/icon_special.png new file mode 100644 index 0000000000..877dcf6dbd Binary files /dev/null and b/Habitica/res/drawable-hdpi/icon_special.png differ diff --git a/Habitica/res/drawable-hdpi/indicator_subscribe.png b/Habitica/res/drawable-hdpi/indicator_subscribe.png new file mode 100644 index 0000000000..c6dbe30efa Binary files /dev/null and b/Habitica/res/drawable-hdpi/indicator_subscribe.png differ diff --git a/Habitica/res/drawable-hdpi/limited.png b/Habitica/res/drawable-hdpi/limited.png new file mode 100644 index 0000000000..a5a53e20c6 Binary files /dev/null and b/Habitica/res/drawable-hdpi/limited.png differ diff --git a/Habitica/res/drawable-hdpi/login_email.png b/Habitica/res/drawable-hdpi/login_email.png new file mode 100644 index 0000000000..9828d1f8c8 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_email.png differ diff --git a/Habitica/res/drawable-hdpi/login_logo.png b/Habitica/res/drawable-hdpi/login_logo.png new file mode 100644 index 0000000000..d168e8577a Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_logo.png differ diff --git a/Habitica/res/drawable-hdpi/login_logo.webp b/Habitica/res/drawable-hdpi/login_logo.webp deleted file mode 100644 index 04b6a53268..0000000000 Binary files a/Habitica/res/drawable-hdpi/login_logo.webp and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/login_password.png b/Habitica/res/drawable-hdpi/login_password.png new file mode 100644 index 0000000000..967ac22641 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_password.png differ diff --git a/Habitica/res/drawable-hdpi/login_username.png b/Habitica/res/drawable-hdpi/login_username.png new file mode 100644 index 0000000000..a69b5ce131 Binary files /dev/null and b/Habitica/res/drawable-hdpi/login_username.png differ diff --git a/Habitica/res/drawable-hdpi/looking_for_party_empty.png b/Habitica/res/drawable-hdpi/looking_for_party_empty.png new file mode 100644 index 0000000000..d27eb88ea6 Binary files /dev/null and b/Habitica/res/drawable-hdpi/looking_for_party_empty.png differ diff --git a/Habitica/res/drawable-hdpi/name_plate.9.png b/Habitica/res/drawable-hdpi/name_plate.9.png index 9701a9ed6a..ef35d6d74a 100644 Binary files a/Habitica/res/drawable-hdpi/name_plate.9.png and b/Habitica/res/drawable-hdpi/name_plate.9.png differ diff --git a/Habitica/res/drawable-hdpi/npc_gradient.png b/Habitica/res/drawable-hdpi/npc_gradient.png new file mode 100644 index 0000000000..5065b7b896 Binary files /dev/null and b/Habitica/res/drawable-hdpi/npc_gradient.png differ diff --git a/Habitica/res/drawable-hdpi/payment_gift.png b/Habitica/res/drawable-hdpi/payment_gift.png index 250123b8c2..f7d3f4409d 100644 Binary files a/Habitica/res/drawable-hdpi/payment_gift.png and b/Habitica/res/drawable-hdpi/payment_gift.png differ diff --git a/Habitica/res/drawable-hdpi/separator_fancy.png b/Habitica/res/drawable-hdpi/separator_fancy.png index ec6d69ba81..8bfeda35cb 100644 Binary files a/Habitica/res/drawable-hdpi/separator_fancy.png and b/Habitica/res/drawable-hdpi/separator_fancy.png differ diff --git a/Habitica/res/drawable-hdpi/shop_header_sparkle.png b/Habitica/res/drawable-hdpi/shop_header_sparkle.png new file mode 100644 index 0000000000..abb593112f Binary files /dev/null and b/Habitica/res/drawable-hdpi/shop_header_sparkle.png differ diff --git a/Habitica/res/drawable-hdpi/spooky_gems_21.png b/Habitica/res/drawable-hdpi/spooky_gems_21.png new file mode 100644 index 0000000000..1e9d50876a Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_21.png differ diff --git a/Habitica/res/drawable-hdpi/spooky_gems_4.png b/Habitica/res/drawable-hdpi/spooky_gems_4.png new file mode 100644 index 0000000000..f89624e31c Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_4.png differ diff --git a/Habitica/res/drawable-hdpi/spooky_gems_42.png b/Habitica/res/drawable-hdpi/spooky_gems_42.png new file mode 100644 index 0000000000..4508d8c9a6 Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_42.png differ diff --git a/Habitica/res/drawable-hdpi/spooky_gems_84.png b/Habitica/res/drawable-hdpi/spooky_gems_84.png new file mode 100644 index 0000000000..6758e065f3 Binary files /dev/null and b/Habitica/res/drawable-hdpi/spooky_gems_84.png differ diff --git a/Habitica/res/drawable-hdpi/stable_background_spring.png b/Habitica/res/drawable-hdpi/stable_background_spring.png new file mode 100644 index 0000000000..f8fe197429 Binary files /dev/null and b/Habitica/res/drawable-hdpi/stable_background_spring.png differ diff --git a/Habitica/res/drawable-hdpi/sub_benefits_armoire.png b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png new file mode 100644 index 0000000000..fa80037623 Binary files /dev/null and b/Habitica/res/drawable-hdpi/sub_benefits_armoire.png differ diff --git a/Habitica/res/drawable-hdpi/sub_benefits_drops.png b/Habitica/res/drawable-hdpi/sub_benefits_drops.png deleted file mode 100644 index 8957c803cf..0000000000 Binary files a/Habitica/res/drawable-hdpi/sub_benefits_drops.png and /dev/null differ diff --git a/Habitica/res/drawable-hdpi/sub_benefits_faint.png b/Habitica/res/drawable-hdpi/sub_benefits_faint.png new file mode 100644 index 0000000000..a8e75bedbf Binary files /dev/null and b/Habitica/res/drawable-hdpi/sub_benefits_faint.png differ diff --git a/Habitica/res/drawable-hdpi/sub_benefits_gems.png b/Habitica/res/drawable-hdpi/sub_benefits_gems.png index 73e544731e..3d3922cb27 100644 Binary files a/Habitica/res/drawable-hdpi/sub_benefits_gems.png and b/Habitica/res/drawable-hdpi/sub_benefits_gems.png differ diff --git a/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png index 6d2d8dd471..2f09dc7950 100644 Binary files a/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-hdpi/sub_benefits_hourglasses.png differ diff --git a/Habitica/res/drawable-hdpi/sub_benefits_pet.png b/Habitica/res/drawable-hdpi/sub_benefits_pet.png index 528375ca8a..67c765b3f2 100644 Binary files a/Habitica/res/drawable-hdpi/sub_benefits_pet.png and b/Habitica/res/drawable-hdpi/sub_benefits_pet.png differ diff --git a/Habitica/res/drawable-hdpi/sub_plus.png b/Habitica/res/drawable-hdpi/sub_plus.png new file mode 100644 index 0000000000..540d024757 Binary files /dev/null and b/Habitica/res/drawable-hdpi/sub_plus.png differ diff --git a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png index 516e0f92fd..b50bf131df 100644 Binary files a/Habitica/res/drawable-hdpi/subscriber_banner_dark.png and b/Habitica/res/drawable-hdpi/subscriber_banner_dark.png differ diff --git a/Habitica/res/drawable-hdpi/subscription_promo_gold.png b/Habitica/res/drawable-hdpi/subscription_promo_gold.png index 81f74fe13d..e1c3a7bea3 100644 Binary files a/Habitica/res/drawable-hdpi/subscription_promo_gold.png and b/Habitica/res/drawable-hdpi/subscription_promo_gold.png differ diff --git a/Habitica/res/drawable-hdpi/subscription_selected_indicator.png b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000..d621d06524 Binary files /dev/null and b/Habitica/res/drawable-hdpi/subscription_selected_indicator.png differ diff --git a/Habitica/res/drawable-hdpi/survey_art_left.png b/Habitica/res/drawable-hdpi/survey_art_left.png index 0edf01c36c..ab78736879 100644 Binary files a/Habitica/res/drawable-hdpi/survey_art_left.png and b/Habitica/res/drawable-hdpi/survey_art_left.png differ diff --git a/Habitica/res/drawable-hdpi/team_info_icon.png b/Habitica/res/drawable-hdpi/team_info_icon.png deleted file mode 100644 index d950f4cfae..0000000000 Binary files a/Habitica/res/drawable-hdpi/team_info_icon.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png index 6f24923b66..725c8026a7 100644 Binary files a/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-mdpi/ab_solid_shadow_holo.9.png differ diff --git a/Habitica/res/drawable-mdpi/adventure_guide_art.png b/Habitica/res/drawable-mdpi/adventure_guide_art.png index a615111815..9801480e8d 100644 Binary files a/Habitica/res/drawable-mdpi/adventure_guide_art.png and b/Habitica/res/drawable-mdpi/adventure_guide_art.png differ diff --git a/Habitica/res/drawable-mdpi/arrow_back.png b/Habitica/res/drawable-mdpi/arrow_back.png new file mode 100644 index 0000000000..ace7c756c8 Binary files /dev/null and b/Habitica/res/drawable-mdpi/arrow_back.png differ diff --git a/Habitica/res/drawable-mdpi/assign.png b/Habitica/res/drawable-mdpi/assign.png new file mode 100644 index 0000000000..7e35c52706 Binary files /dev/null and b/Habitica/res/drawable-mdpi/assign.png differ diff --git a/Habitica/res/drawable-mdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-mdpi/baseline_error_outline_black_36dp.png deleted file mode 100644 index 8994911faa..0000000000 Binary files a/Habitica/res/drawable-mdpi/baseline_error_outline_black_36dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png b/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png deleted file mode 100644 index 6ab2cf3391..0000000000 Binary files a/Habitica/res/drawable-mdpi/baseline_keyboard_arrow_right_black_18dp.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/birthday_gifts.png b/Habitica/res/drawable-mdpi/birthday_gifts.png new file mode 100644 index 0000000000..45408a694c Binary files /dev/null and b/Habitica/res/drawable-mdpi/birthday_gifts.png differ diff --git a/Habitica/res/drawable-mdpi/birthday_menu_gems.png b/Habitica/res/drawable-mdpi/birthday_menu_gems.png new file mode 100644 index 0000000000..21b3ec6117 Binary files /dev/null and b/Habitica/res/drawable-mdpi/birthday_menu_gems.png differ diff --git a/Habitica/res/drawable-mdpi/birthday_textdeco_left.png b/Habitica/res/drawable-mdpi/birthday_textdeco_left.png new file mode 100644 index 0000000000..fbf01c101f Binary files /dev/null and b/Habitica/res/drawable-mdpi/birthday_textdeco_left.png differ diff --git a/Habitica/res/drawable-mdpi/birthday_textdeco_right.png b/Habitica/res/drawable-mdpi/birthday_textdeco_right.png new file mode 100644 index 0000000000..9acdfd86e4 Binary files /dev/null and b/Habitica/res/drawable-mdpi/birthday_textdeco_right.png differ diff --git a/Habitica/res/drawable-mdpi/border_pixelated.png b/Habitica/res/drawable-mdpi/border_pixelated.png new file mode 100644 index 0000000000..3287d37ec4 Binary files /dev/null and b/Habitica/res/drawable-mdpi/border_pixelated.png differ diff --git a/Habitica/res/drawable-mdpi/checkmark_small.png b/Habitica/res/drawable-mdpi/checkmark_small.png new file mode 100644 index 0000000000..d41f09f153 Binary files /dev/null and b/Habitica/res/drawable-mdpi/checkmark_small.png differ diff --git a/Habitica/res/drawable-mdpi/cloud_1.png b/Habitica/res/drawable-mdpi/cloud_1.png index b67075dc48..361910ab9d 100644 Binary files a/Habitica/res/drawable-mdpi/cloud_1.png and b/Habitica/res/drawable-mdpi/cloud_1.png differ diff --git a/Habitica/res/drawable-mdpi/completed.png b/Habitica/res/drawable-mdpi/completed.png new file mode 100644 index 0000000000..724283bdf4 Binary files /dev/null and b/Habitica/res/drawable-mdpi/completed.png differ diff --git a/Habitica/res/drawable-mdpi/contributor_icon.png b/Habitica/res/drawable-mdpi/contributor_icon.png new file mode 100644 index 0000000000..0efaf3b603 Binary files /dev/null and b/Habitica/res/drawable-mdpi/contributor_icon.png differ diff --git a/Habitica/res/drawable-mdpi/customization_background.png b/Habitica/res/drawable-mdpi/customization_background.png new file mode 100644 index 0000000000..6d448aef79 Binary files /dev/null and b/Habitica/res/drawable-mdpi/customization_background.png differ diff --git a/Habitica/res/drawable-mdpi/customization_mix.png b/Habitica/res/drawable-mdpi/customization_mix.png new file mode 100644 index 0000000000..43886ca14b Binary files /dev/null and b/Habitica/res/drawable-mdpi/customization_mix.png differ diff --git a/Habitica/res/drawable-mdpi/diamond_button.9.png b/Habitica/res/drawable-mdpi/diamond_button.9.png index b1fec171bf..738a50f8b1 100644 Binary files a/Habitica/res/drawable-mdpi/diamond_button.9.png and b/Habitica/res/drawable-mdpi/diamond_button.9.png differ diff --git a/Habitica/res/drawable-mdpi/diamond_button_white.9.png b/Habitica/res/drawable-mdpi/diamond_button_white.9.png index 40a72bd90d..b35c9c5463 100644 Binary files a/Habitica/res/drawable-mdpi/diamond_button_white.9.png and b/Habitica/res/drawable-mdpi/diamond_button_white.9.png differ diff --git a/Habitica/res/drawable-mdpi/drawer_shadow.9.png b/Habitica/res/drawable-mdpi/drawer_shadow.9.png deleted file mode 100644 index 7e2e4c7801..0000000000 Binary files a/Habitica/res/drawable-mdpi/drawer_shadow.9.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/empty_slot.png b/Habitica/res/drawable-mdpi/empty_slot.png new file mode 100644 index 0000000000..a28f660ee1 Binary files /dev/null and b/Habitica/res/drawable-mdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-mdpi/extra_gem_cap_left.png b/Habitica/res/drawable-mdpi/extra_gem_cap_left.png new file mode 100644 index 0000000000..258fdd5372 Binary files /dev/null and b/Habitica/res/drawable-mdpi/extra_gem_cap_left.png differ diff --git a/Habitica/res/drawable-mdpi/extra_gem_cap_right.png b/Habitica/res/drawable-mdpi/extra_gem_cap_right.png new file mode 100644 index 0000000000..843b5e65d9 Binary files /dev/null and b/Habitica/res/drawable-mdpi/extra_gem_cap_right.png differ diff --git a/Habitica/res/drawable-mdpi/fall_promo_title.png b/Habitica/res/drawable-mdpi/fall_promo_title.png index d00a79cbb2..7fa1484a50 100644 Binary files a/Habitica/res/drawable-mdpi/fall_promo_title.png and b/Habitica/res/drawable-mdpi/fall_promo_title.png differ diff --git a/Habitica/res/drawable-mdpi/feed_base.png b/Habitica/res/drawable-mdpi/feed_base.png new file mode 100644 index 0000000000..ef8f1f327f Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_base.png differ diff --git a/Habitica/res/drawable-mdpi/feed_blue.png b/Habitica/res/drawable-mdpi/feed_blue.png new file mode 100644 index 0000000000..2a29d39e54 Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_blue.png differ diff --git a/Habitica/res/drawable-mdpi/feed_desert.png b/Habitica/res/drawable-mdpi/feed_desert.png new file mode 100644 index 0000000000..512578087f Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_desert.png differ diff --git a/Habitica/res/drawable-mdpi/feed_golden.png b/Habitica/res/drawable-mdpi/feed_golden.png new file mode 100644 index 0000000000..c0664c25d6 Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_golden.png differ diff --git a/Habitica/res/drawable-mdpi/feed_pink.png b/Habitica/res/drawable-mdpi/feed_pink.png new file mode 100644 index 0000000000..33ee4c1ef6 Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_pink.png differ diff --git a/Habitica/res/drawable-mdpi/feed_red.png b/Habitica/res/drawable-mdpi/feed_red.png new file mode 100644 index 0000000000..2c2be50bfc Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_red.png differ diff --git a/Habitica/res/drawable-mdpi/feed_saddle.png b/Habitica/res/drawable-mdpi/feed_saddle.png new file mode 100644 index 0000000000..fb88f034cf Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_saddle.png differ diff --git a/Habitica/res/drawable-mdpi/feed_shade.png b/Habitica/res/drawable-mdpi/feed_shade.png new file mode 100644 index 0000000000..83ebaf29e5 Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_shade.png differ diff --git a/Habitica/res/drawable-mdpi/feed_skeleton.png b/Habitica/res/drawable-mdpi/feed_skeleton.png new file mode 100644 index 0000000000..2e86b5e330 Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_skeleton.png differ diff --git a/Habitica/res/drawable-mdpi/feed_white.png b/Habitica/res/drawable-mdpi/feed_white.png new file mode 100644 index 0000000000..98715dff46 Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_white.png differ diff --git a/Habitica/res/drawable-mdpi/feed_zombie.png b/Habitica/res/drawable-mdpi/feed_zombie.png new file mode 100644 index 0000000000..c51b94e27f Binary files /dev/null and b/Habitica/res/drawable-mdpi/feed_zombie.png differ diff --git a/Habitica/res/drawable-mdpi/flag_flap.png b/Habitica/res/drawable-mdpi/flag_flap.png index b14a890333..44f7e10de5 100644 Binary files a/Habitica/res/drawable-mdpi/flag_flap.png and b/Habitica/res/drawable-mdpi/flag_flap.png differ diff --git a/Habitica/res/drawable-mdpi/footer_hills.png b/Habitica/res/drawable-mdpi/footer_hills.png new file mode 100644 index 0000000000..188f22031b Binary files /dev/null and b/Habitica/res/drawable-mdpi/footer_hills.png differ diff --git a/Habitica/res/drawable-mdpi/footer_hills_g1g1.png b/Habitica/res/drawable-mdpi/footer_hills_g1g1.png new file mode 100644 index 0000000000..d8c7f67b6b Binary files /dev/null and b/Habitica/res/drawable-mdpi/footer_hills_g1g1.png differ diff --git a/Habitica/res/drawable-mdpi/footer_stars_left.png b/Habitica/res/drawable-mdpi/footer_stars_left.png new file mode 100644 index 0000000000..7b6adc56e7 Binary files /dev/null and b/Habitica/res/drawable-mdpi/footer_stars_left.png differ diff --git a/Habitica/res/drawable-mdpi/footer_stars_right.png b/Habitica/res/drawable-mdpi/footer_stars_right.png new file mode 100644 index 0000000000..ce82ea69dc Binary files /dev/null and b/Habitica/res/drawable-mdpi/footer_stars_right.png differ diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png index 31dd195cde..f07035c5f8 100644 Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-mdpi/g1g1_promo_left_small.png differ diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png index a277e90cf5..6eb23a0829 100644 Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_menu_right.png differ diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right.png b/Habitica/res/drawable-mdpi/g1g1_promo_right.png index 30cf6ebff6..2acc53d5d0 100644 Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right.png differ diff --git a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png index f78e0afa4c..8652c7be1d 100644 Binary files a/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png and b/Habitica/res/drawable-mdpi/g1g1_promo_right_small.png differ diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png index e761fd38f3..7d52e7aa22 100644 Binary files a/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-mdpi/g1g1_sparkle_left.png differ diff --git a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png index 1ed05c97d6..c6686e1544 100644 Binary files a/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-mdpi/g1g1_sparkle_right.png differ diff --git a/Habitica/res/drawable-mdpi/gem_gold_left.png b/Habitica/res/drawable-mdpi/gem_gold_left.png new file mode 100644 index 0000000000..c383fd2c9d Binary files /dev/null and b/Habitica/res/drawable-mdpi/gem_gold_left.png differ diff --git a/Habitica/res/drawable-mdpi/gem_gold_right.png b/Habitica/res/drawable-mdpi/gem_gold_right.png new file mode 100644 index 0000000000..7a9703dc43 Binary files /dev/null and b/Habitica/res/drawable-mdpi/gem_gold_right.png differ diff --git a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png index 8671dae775..f235e1c692 100644 Binary files a/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-mdpi/gem_purchase_header_dark.png differ diff --git a/Habitica/res/drawable-mdpi/gems_21.png b/Habitica/res/drawable-mdpi/gems_21.png deleted file mode 100644 index dcc89ea8d8..0000000000 Binary files a/Habitica/res/drawable-mdpi/gems_21.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/gems_4.png b/Habitica/res/drawable-mdpi/gems_4.png deleted file mode 100644 index a0dd90aef9..0000000000 Binary files a/Habitica/res/drawable-mdpi/gems_4.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/gems_42.png b/Habitica/res/drawable-mdpi/gems_42.png deleted file mode 100644 index c51f238152..0000000000 Binary files a/Habitica/res/drawable-mdpi/gems_42.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/gems_84.png b/Habitica/res/drawable-mdpi/gems_84.png deleted file mode 100644 index aaa599af2a..0000000000 Binary files a/Habitica/res/drawable-mdpi/gems_84.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/gift_sub_gift.png b/Habitica/res/drawable-mdpi/gift_sub_gift.png index fd10d6689e..633b3bfb86 100644 Binary files a/Habitica/res/drawable-mdpi/gift_sub_gift.png and b/Habitica/res/drawable-mdpi/gift_sub_gift.png differ diff --git a/Habitica/res/drawable-mdpi/gold_coins_right.png b/Habitica/res/drawable-mdpi/gold_coins_right.png index 0ced28cff3..5c564ff652 100644 Binary files a/Habitica/res/drawable-mdpi/gold_coins_right.png and b/Habitica/res/drawable-mdpi/gold_coins_right.png differ diff --git a/Habitica/res/drawable-mdpi/header_verify_username.png b/Habitica/res/drawable-mdpi/header_verify_username.png new file mode 100644 index 0000000000..a19e95fdcb Binary files /dev/null and b/Habitica/res/drawable-mdpi/header_verify_username.png differ diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_left.png b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png new file mode 100644 index 0000000000..ac2a94e28a Binary files /dev/null and b/Habitica/res/drawable-mdpi/hourglass_fancy_left.png differ diff --git a/Habitica/res/drawable-mdpi/hourglass_fancy_right.png b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png new file mode 100644 index 0000000000..58a632589c Binary files /dev/null and b/Habitica/res/drawable-mdpi/hourglass_fancy_right.png differ diff --git a/Habitica/res/drawable-mdpi/ic_email_color.png b/Habitica/res/drawable-mdpi/ic_email_color.png new file mode 100644 index 0000000000..816a262646 Binary files /dev/null and b/Habitica/res/drawable-mdpi/ic_email_color.png differ diff --git a/Habitica/res/drawable-mdpi/ic_gryphon_white.webp b/Habitica/res/drawable-mdpi/ic_gryphon_white.webp deleted file mode 100644 index 24145a0aab..0000000000 Binary files a/Habitica/res/drawable-mdpi/ic_gryphon_white.webp and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png index 6b77b82242..3d9ba7f24c 100644 Binary files a/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-mdpi/ic_keyboard_arrow_right.png differ diff --git a/Habitica/res/drawable-mdpi/icon_birthday.png b/Habitica/res/drawable-mdpi/icon_birthday.png new file mode 100644 index 0000000000..03913d8022 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-mdpi/icon_boss_health.png b/Habitica/res/drawable-mdpi/icon_boss_health.png new file mode 100644 index 0000000000..b8209da5fb Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_boss_health.png differ diff --git a/Habitica/res/drawable-mdpi/icon_boss_rage.png b/Habitica/res/drawable-mdpi/icon_boss_rage.png new file mode 100644 index 0000000000..9f4b1d9974 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_boss_rage.png differ diff --git a/Habitica/res/drawable-mdpi/icon_eggs.png b/Habitica/res/drawable-mdpi/icon_eggs.png new file mode 100644 index 0000000000..65c40edff8 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_eggs.png differ diff --git a/Habitica/res/drawable-mdpi/icon_food.png b/Habitica/res/drawable-mdpi/icon_food.png new file mode 100644 index 0000000000..a05781a84c Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_food.png differ diff --git a/Habitica/res/drawable-mdpi/icon_gift_subscription.png b/Habitica/res/drawable-mdpi/icon_gift_subscription.png index a441562628..b4ddaa45d5 100644 Binary files a/Habitica/res/drawable-mdpi/icon_gift_subscription.png and b/Habitica/res/drawable-mdpi/icon_gift_subscription.png differ diff --git a/Habitica/res/drawable-mdpi/icon_hatchingpotions.png b/Habitica/res/drawable-mdpi/icon_hatchingpotions.png new file mode 100644 index 0000000000..2489e4ff74 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_hatchingpotions.png differ diff --git a/Habitica/res/drawable-mdpi/icon_lock.png b/Habitica/res/drawable-mdpi/icon_lock.png new file mode 100644 index 0000000000..d4d1f926aa Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_lock.png differ diff --git a/Habitica/res/drawable-mdpi/icon_quests.png b/Habitica/res/drawable-mdpi/icon_quests.png new file mode 100644 index 0000000000..3f2c697724 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_quests.png differ diff --git a/Habitica/res/drawable-mdpi/icon_shops.png b/Habitica/res/drawable-mdpi/icon_shops.png new file mode 100644 index 0000000000..6462cf19cc Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_shops.png differ diff --git a/Habitica/res/drawable-mdpi/icon_special.png b/Habitica/res/drawable-mdpi/icon_special.png new file mode 100644 index 0000000000..73e6d037c6 Binary files /dev/null and b/Habitica/res/drawable-mdpi/icon_special.png differ diff --git a/Habitica/res/drawable-mdpi/justin_textbox.png b/Habitica/res/drawable-mdpi/justin_textbox.png index 1142419d43..06785edf9a 100644 Binary files a/Habitica/res/drawable-mdpi/justin_textbox.png and b/Habitica/res/drawable-mdpi/justin_textbox.png differ diff --git a/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml b/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml deleted file mode 100644 index deb24efa2e..0000000000 --- a/Habitica/res/drawable-mdpi/layout_rounded_bg_gray.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable-mdpi/limited.png b/Habitica/res/drawable-mdpi/limited.png new file mode 100644 index 0000000000..ce72231017 Binary files /dev/null and b/Habitica/res/drawable-mdpi/limited.png differ diff --git a/Habitica/res/drawable-mdpi/login_background.png b/Habitica/res/drawable-mdpi/login_background.png new file mode 100644 index 0000000000..04a4091862 Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_background.png differ diff --git a/Habitica/res/drawable-mdpi/login_background.webp b/Habitica/res/drawable-mdpi/login_background.webp deleted file mode 100644 index 5d863ac2be..0000000000 Binary files a/Habitica/res/drawable-mdpi/login_background.webp and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/login_email.png b/Habitica/res/drawable-mdpi/login_email.png new file mode 100644 index 0000000000..ba3ffb7a96 Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_email.png differ diff --git a/Habitica/res/drawable-mdpi/login_logo.png b/Habitica/res/drawable-mdpi/login_logo.png new file mode 100644 index 0000000000..1baefa80da Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_logo.png differ diff --git a/Habitica/res/drawable-mdpi/login_logo.webp b/Habitica/res/drawable-mdpi/login_logo.webp deleted file mode 100644 index b513ef30cb..0000000000 Binary files a/Habitica/res/drawable-mdpi/login_logo.webp and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/login_password.png b/Habitica/res/drawable-mdpi/login_password.png new file mode 100644 index 0000000000..8391bf2319 Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_password.png differ diff --git a/Habitica/res/drawable-mdpi/login_username.png b/Habitica/res/drawable-mdpi/login_username.png new file mode 100644 index 0000000000..737ef4ae5a Binary files /dev/null and b/Habitica/res/drawable-mdpi/login_username.png differ diff --git a/Habitica/res/drawable-mdpi/looking_for_party_empty.png b/Habitica/res/drawable-mdpi/looking_for_party_empty.png new file mode 100644 index 0000000000..9ffddc15d9 Binary files /dev/null and b/Habitica/res/drawable-mdpi/looking_for_party_empty.png differ diff --git a/Habitica/res/drawable-mdpi/npc_gradient.png b/Habitica/res/drawable-mdpi/npc_gradient.png new file mode 100644 index 0000000000..a3caa26ee6 Binary files /dev/null and b/Habitica/res/drawable-mdpi/npc_gradient.png differ diff --git a/Habitica/res/drawable-mdpi/onboarding_done_art.png b/Habitica/res/drawable-mdpi/onboarding_done_art.png index 960b76e867..64efa33b06 100644 Binary files a/Habitica/res/drawable-mdpi/onboarding_done_art.png and b/Habitica/res/drawable-mdpi/onboarding_done_art.png differ diff --git a/Habitica/res/drawable-mdpi/payment_gift.png b/Habitica/res/drawable-mdpi/payment_gift.png index bfdf2bd4ae..61576352fe 100644 Binary files a/Habitica/res/drawable-mdpi/payment_gift.png and b/Habitica/res/drawable-mdpi/payment_gift.png differ diff --git a/Habitica/res/drawable-mdpi/separator_fancy.png b/Habitica/res/drawable-mdpi/separator_fancy.png index 5595d9b813..5d7c9694ac 100644 Binary files a/Habitica/res/drawable-mdpi/separator_fancy.png and b/Habitica/res/drawable-mdpi/separator_fancy.png differ diff --git a/Habitica/res/drawable-mdpi/shop_header_sparkle.png b/Habitica/res/drawable-mdpi/shop_header_sparkle.png new file mode 100644 index 0000000000..74a559ee55 Binary files /dev/null and b/Habitica/res/drawable-mdpi/shop_header_sparkle.png differ diff --git a/Habitica/res/drawable-mdpi/spooky_promo_info_right.png b/Habitica/res/drawable-mdpi/spooky_promo_info_right.png index 54f2dbef6c..e5f542f54d 100644 Binary files a/Habitica/res/drawable-mdpi/spooky_promo_info_right.png and b/Habitica/res/drawable-mdpi/spooky_promo_info_right.png differ diff --git a/Habitica/res/drawable-mdpi/stable_background_spring.png b/Habitica/res/drawable-mdpi/stable_background_spring.png new file mode 100644 index 0000000000..951ea8973a Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_background_spring.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_april.png b/Habitica/res/drawable-mdpi/stable_tile_april.png new file mode 100644 index 0000000000..945b7fa9a2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_april.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_august.png b/Habitica/res/drawable-mdpi/stable_tile_august.png new file mode 100644 index 0000000000..719c82dde2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_august.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_december.png b/Habitica/res/drawable-mdpi/stable_tile_december.png new file mode 100644 index 0000000000..a31d02e71f Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_december.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_february.png b/Habitica/res/drawable-mdpi/stable_tile_february.png new file mode 100644 index 0000000000..43dd03a1df Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_february.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_janurary.png b/Habitica/res/drawable-mdpi/stable_tile_janurary.png new file mode 100644 index 0000000000..0c9d9d8c45 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_janurary.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_july.png b/Habitica/res/drawable-mdpi/stable_tile_july.png new file mode 100644 index 0000000000..8031d532e6 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_july.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_june.png b/Habitica/res/drawable-mdpi/stable_tile_june.png new file mode 100644 index 0000000000..fe5bd7df09 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_june.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_march.png b/Habitica/res/drawable-mdpi/stable_tile_march.png new file mode 100644 index 0000000000..8a9cefd3f5 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_march.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_may.png b/Habitica/res/drawable-mdpi/stable_tile_may.png new file mode 100644 index 0000000000..1567de2822 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_may.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_november.png b/Habitica/res/drawable-mdpi/stable_tile_november.png new file mode 100644 index 0000000000..4c3907d5c3 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_november.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_october.png b/Habitica/res/drawable-mdpi/stable_tile_october.png new file mode 100644 index 0000000000..16f9e512d2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_october.png differ diff --git a/Habitica/res/drawable-mdpi/stable_tile_september.png b/Habitica/res/drawable-mdpi/stable_tile_september.png new file mode 100644 index 0000000000..bf7223a364 Binary files /dev/null and b/Habitica/res/drawable-mdpi/stable_tile_september.png differ diff --git a/Habitica/res/drawable-mdpi/sub_benefits_armoire.png b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png new file mode 100644 index 0000000000..48aec1eb2c Binary files /dev/null and b/Habitica/res/drawable-mdpi/sub_benefits_armoire.png differ diff --git a/Habitica/res/drawable-mdpi/sub_benefits_drops.png b/Habitica/res/drawable-mdpi/sub_benefits_drops.png deleted file mode 100644 index 7de03d0004..0000000000 Binary files a/Habitica/res/drawable-mdpi/sub_benefits_drops.png and /dev/null differ diff --git a/Habitica/res/drawable-mdpi/sub_benefits_faint.png b/Habitica/res/drawable-mdpi/sub_benefits_faint.png new file mode 100644 index 0000000000..9276ee4ec6 Binary files /dev/null and b/Habitica/res/drawable-mdpi/sub_benefits_faint.png differ diff --git a/Habitica/res/drawable-mdpi/sub_benefits_gems.png b/Habitica/res/drawable-mdpi/sub_benefits_gems.png index da8507b4a2..e66bce05d8 100644 Binary files a/Habitica/res/drawable-mdpi/sub_benefits_gems.png and b/Habitica/res/drawable-mdpi/sub_benefits_gems.png differ diff --git a/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png index f9a6419b43..b1366d1240 100644 Binary files a/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-mdpi/sub_benefits_hourglasses.png differ diff --git a/Habitica/res/drawable-mdpi/sub_benefits_pet.png b/Habitica/res/drawable-mdpi/sub_benefits_pet.png index 115d5259d0..e0338d1b3d 100644 Binary files a/Habitica/res/drawable-mdpi/sub_benefits_pet.png and b/Habitica/res/drawable-mdpi/sub_benefits_pet.png differ diff --git a/Habitica/res/drawable-mdpi/sub_plus.png b/Habitica/res/drawable-mdpi/sub_plus.png new file mode 100644 index 0000000000..c114da48f2 Binary files /dev/null and b/Habitica/res/drawable-mdpi/sub_plus.png differ diff --git a/Habitica/res/drawable-mdpi/subscription_selected_indicator.png b/Habitica/res/drawable-mdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000..1f3f8211a7 Binary files /dev/null and b/Habitica/res/drawable-mdpi/subscription_selected_indicator.png differ diff --git a/Habitica/res/drawable-mdpi/survey_art_left.png b/Habitica/res/drawable-mdpi/survey_art_left.png index 51eb648327..f43b08b69c 100644 Binary files a/Habitica/res/drawable-mdpi/survey_art_left.png and b/Habitica/res/drawable-mdpi/survey_art_left.png differ diff --git a/Habitica/res/drawable-mdpi/survey_art_right.png b/Habitica/res/drawable-mdpi/survey_art_right.png index 27325c1994..6b6dba8966 100644 Binary files a/Habitica/res/drawable-mdpi/survey_art_right.png and b/Habitica/res/drawable-mdpi/survey_art_right.png differ diff --git a/Habitica/res/drawable-mdpi/team_info_icon.png b/Habitica/res/drawable-mdpi/team_info_icon.png deleted file mode 100644 index 40b76cd1ae..0000000000 Binary files a/Habitica/res/drawable-mdpi/team_info_icon.png and /dev/null differ diff --git a/Habitica/res/drawable-night-hdpi/assign.png b/Habitica/res/drawable-night-hdpi/assign.png new file mode 100644 index 0000000000..df03c6189a Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/assign.png differ diff --git a/Habitica/res/drawable-night-hdpi/empty_slot.png b/Habitica/res/drawable-night-hdpi/empty_slot.png new file mode 100644 index 0000000000..a7977ee2c6 Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png b/Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png new file mode 100644 index 0000000000..3488d78848 Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/hourglass_fancy_right.png differ diff --git a/Habitica/res/drawable-night-hdpi/icon_birthday.png b/Habitica/res/drawable-night-hdpi/icon_birthday.png new file mode 100644 index 0000000000..d8ce0accfd Binary files /dev/null and b/Habitica/res/drawable-night-hdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-night-mdpi/assign.png b/Habitica/res/drawable-night-mdpi/assign.png new file mode 100644 index 0000000000..dd618cb069 Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/assign.png differ diff --git a/Habitica/res/drawable-night-mdpi/empty_slot.png b/Habitica/res/drawable-night-mdpi/empty_slot.png new file mode 100644 index 0000000000..177ef09940 Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-night-mdpi/icon_birthday.png b/Habitica/res/drawable-night-mdpi/icon_birthday.png new file mode 100644 index 0000000000..a17811f09f Binary files /dev/null and b/Habitica/res/drawable-night-mdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-night-xhdpi/assign.png b/Habitica/res/drawable-night-xhdpi/assign.png new file mode 100644 index 0000000000..5210407785 Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/assign.png differ diff --git a/Habitica/res/drawable-night-xhdpi/empty_slot.png b/Habitica/res/drawable-night-xhdpi/empty_slot.png new file mode 100644 index 0000000000..7d3bd9a1e6 Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-night-xhdpi/icon_birthday.png b/Habitica/res/drawable-night-xhdpi/icon_birthday.png new file mode 100644 index 0000000000..3f43b63fc9 Binary files /dev/null and b/Habitica/res/drawable-night-xhdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-night-xxhdpi/assign.png b/Habitica/res/drawable-night-xxhdpi/assign.png new file mode 100644 index 0000000000..b336e5fbed Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/assign.png differ diff --git a/Habitica/res/drawable-night-xxhdpi/empty_slot.png b/Habitica/res/drawable-night-xxhdpi/empty_slot.png new file mode 100644 index 0000000000..7fc32a5732 Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-night-xxhdpi/icon_birthday.png b/Habitica/res/drawable-night-xxhdpi/icon_birthday.png new file mode 100644 index 0000000000..3188cbeef0 Binary files /dev/null and b/Habitica/res/drawable-night-xxhdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-night/armoire_gold_background.xml b/Habitica/res/drawable-night/armoire_gold_background.xml new file mode 100644 index 0000000000..1f8085a956 --- /dev/null +++ b/Habitica/res/drawable-night/armoire_gold_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable-night/indicator_subscribe.png b/Habitica/res/drawable-night/indicator_subscribe.png new file mode 100644 index 0000000000..c6dbe30efa Binary files /dev/null and b/Habitica/res/drawable-night/indicator_subscribe.png differ diff --git a/Habitica/res/drawable-night/shop_category_header_background.xml b/Habitica/res/drawable-night/shop_category_header_background.xml new file mode 100644 index 0000000000..3236bc5a73 --- /dev/null +++ b/Habitica/res/drawable-night/shop_category_header_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png index 6d5b7a686d..eb95efb179 100644 Binary files a/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-xhdpi/ab_solid_shadow_holo.9.png differ diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_art.png b/Habitica/res/drawable-xhdpi/adventure_guide_art.png index 9ddd2fbc0f..361f59c895 100644 Binary files a/Habitica/res/drawable-xhdpi/adventure_guide_art.png and b/Habitica/res/drawable-xhdpi/adventure_guide_art.png differ diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_left.png b/Habitica/res/drawable-xhdpi/adventure_guide_left.png new file mode 100644 index 0000000000..9ce4e9b806 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/adventure_guide_left.png differ diff --git a/Habitica/res/drawable-xhdpi/adventure_guide_right.png b/Habitica/res/drawable-xhdpi/adventure_guide_right.png new file mode 100644 index 0000000000..d4ff2dd3d3 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/adventure_guide_right.png differ diff --git a/Habitica/res/drawable-xhdpi/armoire_background.png b/Habitica/res/drawable-xhdpi/armoire_background.png new file mode 100644 index 0000000000..091689efa6 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/armoire_background.png differ diff --git a/Habitica/res/drawable-xhdpi/armoire_circle.png b/Habitica/res/drawable-xhdpi/armoire_circle.png new file mode 100644 index 0000000000..269764a2fc Binary files /dev/null and b/Habitica/res/drawable-xhdpi/armoire_circle.png differ diff --git a/Habitica/res/drawable-xhdpi/armoire_experience.png b/Habitica/res/drawable-xhdpi/armoire_experience.png new file mode 100644 index 0000000000..bffe1a4418 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/armoire_experience.png differ diff --git a/Habitica/res/drawable-xhdpi/arrow_back.png b/Habitica/res/drawable-xhdpi/arrow_back.png new file mode 100644 index 0000000000..4ce40a745d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/arrow_back.png differ diff --git a/Habitica/res/drawable-xhdpi/assign.png b/Habitica/res/drawable-xhdpi/assign.png new file mode 100644 index 0000000000..9a3d59f942 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/assign.png differ diff --git a/Habitica/res/drawable-xhdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-xhdpi/baseline_error_outline_black_36dp.png deleted file mode 100644 index 356880514a..0000000000 Binary files a/Habitica/res/drawable-xhdpi/baseline_error_outline_black_36dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/birthday_gems.png b/Habitica/res/drawable-xhdpi/birthday_gems.png new file mode 100644 index 0000000000..bab5e9d5ff Binary files /dev/null and b/Habitica/res/drawable-xhdpi/birthday_gems.png differ diff --git a/Habitica/res/drawable-xhdpi/birthday_gifts.png b/Habitica/res/drawable-xhdpi/birthday_gifts.png new file mode 100644 index 0000000000..3d7a59a7b1 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/birthday_gifts.png differ diff --git a/Habitica/res/drawable-xhdpi/birthday_menu_gems.png b/Habitica/res/drawable-xhdpi/birthday_menu_gems.png new file mode 100644 index 0000000000..ee38c98af0 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/birthday_menu_gems.png differ diff --git a/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png b/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png new file mode 100644 index 0000000000..f748482aad Binary files /dev/null and b/Habitica/res/drawable-xhdpi/birthday_textdeco_left.png differ diff --git a/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png b/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png new file mode 100644 index 0000000000..ce128b69ca Binary files /dev/null and b/Habitica/res/drawable-xhdpi/birthday_textdeco_right.png differ diff --git a/Habitica/res/drawable-xhdpi/border_pixelated.png b/Habitica/res/drawable-xhdpi/border_pixelated.png new file mode 100644 index 0000000000..7d25561f57 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/border_pixelated.png differ diff --git a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png index 2e5acc59bf..cb4f559f0c 100644 Binary files a/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-xhdpi/challenge_won_gem_confetti.png differ diff --git a/Habitica/res/drawable-xhdpi/checkmark_small.png b/Habitica/res/drawable-xhdpi/checkmark_small.png new file mode 100644 index 0000000000..9efd57c267 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/checkmark_small.png differ diff --git a/Habitica/res/drawable-xhdpi/completed.png b/Habitica/res/drawable-xhdpi/completed.png new file mode 100644 index 0000000000..cba883db03 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/completed.png differ diff --git a/Habitica/res/drawable-xhdpi/customization_background.png b/Habitica/res/drawable-xhdpi/customization_background.png new file mode 100644 index 0000000000..41c1edb1e9 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/customization_background.png differ diff --git a/Habitica/res/drawable-xhdpi/customization_mix.png b/Habitica/res/drawable-xhdpi/customization_mix.png new file mode 100644 index 0000000000..c33790524e Binary files /dev/null and b/Habitica/res/drawable-xhdpi/customization_mix.png differ diff --git a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png index c3564d0e59..266f7afd2c 100644 Binary files a/Habitica/res/drawable-xhdpi/diamond_button_white.9.png and b/Habitica/res/drawable-xhdpi/diamond_button_white.9.png differ diff --git a/Habitica/res/drawable-xhdpi/drawer_shadow.9.png b/Habitica/res/drawable-xhdpi/drawer_shadow.9.png deleted file mode 100644 index 83af61c29d..0000000000 Binary files a/Habitica/res/drawable-xhdpi/drawer_shadow.9.png and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/empty_slot.png b/Habitica/res/drawable-xhdpi/empty_slot.png new file mode 100644 index 0000000000..7a16503355 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png b/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png index c362404a28..6e66857dc9 100644 Binary files a/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png and b/Habitica/res/drawable-xhdpi/equipment_nothing_equipped.png differ diff --git a/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png b/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png new file mode 100644 index 0000000000..3ea7780266 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/extra_gem_cap_left.png differ diff --git a/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png b/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png new file mode 100644 index 0000000000..2114ef610a Binary files /dev/null and b/Habitica/res/drawable-xhdpi/extra_gem_cap_right.png differ diff --git a/Habitica/res/drawable-xhdpi/fall_gems_21.png b/Habitica/res/drawable-xhdpi/fall_gems_21.png new file mode 100644 index 0000000000..00cdfc5c58 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_21.png differ diff --git a/Habitica/res/drawable-xhdpi/fall_gems_4.png b/Habitica/res/drawable-xhdpi/fall_gems_4.png new file mode 100644 index 0000000000..b3cd763041 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_4.png differ diff --git a/Habitica/res/drawable-xhdpi/fall_gems_42.png b/Habitica/res/drawable-xhdpi/fall_gems_42.png new file mode 100644 index 0000000000..859a1caf8b Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_42.png differ diff --git a/Habitica/res/drawable-xhdpi/fall_gems_84.png b/Habitica/res/drawable-xhdpi/fall_gems_84.png new file mode 100644 index 0000000000..375ead94d6 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/fall_gems_84.png differ diff --git a/Habitica/res/drawable-xhdpi/fall_promo_title.png b/Habitica/res/drawable-xhdpi/fall_promo_title.png index 20f5b46134..8b9fca1f7f 100644 Binary files a/Habitica/res/drawable-xhdpi/fall_promo_title.png and b/Habitica/res/drawable-xhdpi/fall_promo_title.png differ diff --git a/Habitica/res/drawable-xhdpi/flag_flap.png b/Habitica/res/drawable-xhdpi/flag_flap.png index dca3af7c54..7a85c9a77f 100644 Binary files a/Habitica/res/drawable-xhdpi/flag_flap.png and b/Habitica/res/drawable-xhdpi/flag_flap.png differ diff --git a/Habitica/res/drawable-xhdpi/footer_hills.png b/Habitica/res/drawable-xhdpi/footer_hills.png new file mode 100644 index 0000000000..03e1b2c4c6 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/footer_hills.png differ diff --git a/Habitica/res/drawable-xhdpi/footer_hills_g1g1.png b/Habitica/res/drawable-xhdpi/footer_hills_g1g1.png new file mode 100644 index 0000000000..f51d93e19e Binary files /dev/null and b/Habitica/res/drawable-xhdpi/footer_hills_g1g1.png differ diff --git a/Habitica/res/drawable-xhdpi/footer_stars_left.png b/Habitica/res/drawable-xhdpi/footer_stars_left.png new file mode 100644 index 0000000000..a68d54c9c7 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/footer_stars_left.png differ diff --git a/Habitica/res/drawable-xhdpi/footer_stars_right.png b/Habitica/res/drawable-xhdpi/footer_stars_right.png new file mode 100644 index 0000000000..995a6dd2c3 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/footer_stars_right.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png index 252291e5ee..a438f21587 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png index ecd4aa36a5..ea86b0b9aa 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_left_small.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png index 1e96e7513c..3e50669a81 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_left.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png index 04fa918025..ffcc275215 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_menu_right.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png index 37df461cd4..6b89f67b1e 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png index ad9ba537a0..6b5c59508c 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png and b/Habitica/res/drawable-xhdpi/g1g1_promo_right_small.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png index 46de9ec099..183300bff6 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_left.png differ diff --git a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png index 2eceaffae3..1f1e6fd0d3 100644 Binary files a/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-xhdpi/g1g1_sparkle_right.png differ diff --git a/Habitica/res/drawable-xhdpi/gem_gold_left.png b/Habitica/res/drawable-xhdpi/gem_gold_left.png new file mode 100644 index 0000000000..3f7cea2e06 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gem_gold_left.png differ diff --git a/Habitica/res/drawable-xhdpi/gem_gold_right.png b/Habitica/res/drawable-xhdpi/gem_gold_right.png new file mode 100644 index 0000000000..3102b9fc86 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/gem_gold_right.png differ diff --git a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png index 6b74258d11..309332d965 100644 Binary files a/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-xhdpi/gem_purchase_header_dark.png differ diff --git a/Habitica/res/drawable-xhdpi/gems_21.png b/Habitica/res/drawable-xhdpi/gems_21.png index 276403aec5..5162c8d2b7 100644 Binary files a/Habitica/res/drawable-xhdpi/gems_21.png and b/Habitica/res/drawable-xhdpi/gems_21.png differ diff --git a/Habitica/res/drawable-xhdpi/gems_4.png b/Habitica/res/drawable-xhdpi/gems_4.png index 5a0541dbaa..441e95989f 100644 Binary files a/Habitica/res/drawable-xhdpi/gems_4.png and b/Habitica/res/drawable-xhdpi/gems_4.png differ diff --git a/Habitica/res/drawable-xhdpi/gems_42.png b/Habitica/res/drawable-xhdpi/gems_42.png index bc99941834..0bf63dc8fa 100644 Binary files a/Habitica/res/drawable-xhdpi/gems_42.png and b/Habitica/res/drawable-xhdpi/gems_42.png differ diff --git a/Habitica/res/drawable-xhdpi/gems_84.png b/Habitica/res/drawable-xhdpi/gems_84.png index bb167ee785..85e52f6e89 100644 Binary files a/Habitica/res/drawable-xhdpi/gems_84.png and b/Habitica/res/drawable-xhdpi/gems_84.png differ diff --git a/Habitica/res/drawable-xhdpi/gift_sub_gift.png b/Habitica/res/drawable-xhdpi/gift_sub_gift.png index cb0b08379a..aef886d3eb 100644 Binary files a/Habitica/res/drawable-xhdpi/gift_sub_gift.png and b/Habitica/res/drawable-xhdpi/gift_sub_gift.png differ diff --git a/Habitica/res/drawable-xhdpi/gold_coins_left.png b/Habitica/res/drawable-xhdpi/gold_coins_left.png index 898a9cb8a8..f760f90c92 100644 Binary files a/Habitica/res/drawable-xhdpi/gold_coins_left.png and b/Habitica/res/drawable-xhdpi/gold_coins_left.png differ diff --git a/Habitica/res/drawable-xhdpi/gold_coins_right.png b/Habitica/res/drawable-xhdpi/gold_coins_right.png index 830a2b4e7f..809e66ca4c 100644 Binary files a/Habitica/res/drawable-xhdpi/gold_coins_right.png and b/Habitica/res/drawable-xhdpi/gold_coins_right.png differ diff --git a/Habitica/res/drawable-xhdpi/habit_minus.png b/Habitica/res/drawable-xhdpi/habit_minus.png index 98d386e937..8b7d51dd15 100644 Binary files a/Habitica/res/drawable-xhdpi/habit_minus.png and b/Habitica/res/drawable-xhdpi/habit_minus.png differ diff --git a/Habitica/res/drawable-xhdpi/habit_plus.png b/Habitica/res/drawable-xhdpi/habit_plus.png index a8a708fe4f..3c80abab89 100644 Binary files a/Habitica/res/drawable-xhdpi/habit_plus.png and b/Habitica/res/drawable-xhdpi/habit_plus.png differ diff --git a/Habitica/res/drawable-xhdpi/header_verify_username.png b/Habitica/res/drawable-xhdpi/header_verify_username.png new file mode 100644 index 0000000000..5277c4adad Binary files /dev/null and b/Habitica/res/drawable-xhdpi/header_verify_username.png differ diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png new file mode 100644 index 0000000000..eb64ef1f0d Binary files /dev/null and b/Habitica/res/drawable-xhdpi/hourglass_fancy_left.png differ diff --git a/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png new file mode 100644 index 0000000000..4f81c476de Binary files /dev/null and b/Habitica/res/drawable-xhdpi/hourglass_fancy_right.png differ diff --git a/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png index 3e6f536090..694179bd46 100644 Binary files a/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-xhdpi/ic_add_white_18dp.png differ diff --git a/Habitica/res/drawable-xhdpi/ic_email_color.png b/Habitica/res/drawable-xhdpi/ic_email_color.png new file mode 100644 index 0000000000..b3d1572997 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/ic_email_color.png differ diff --git a/Habitica/res/drawable-xhdpi/ic_gryphon_white.webp b/Habitica/res/drawable-xhdpi/ic_gryphon_white.webp deleted file mode 100644 index ffb6eddd64..0000000000 Binary files a/Habitica/res/drawable-xhdpi/ic_gryphon_white.webp and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png index 9a8d9d8386..20085d8615 100644 Binary files a/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-xhdpi/ic_keyboard_arrow_right.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_birthday.png b/Habitica/res/drawable-xhdpi/icon_birthday.png new file mode 100644 index 0000000000..0726a0f622 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_boss_health.png b/Habitica/res/drawable-xhdpi/icon_boss_health.png new file mode 100644 index 0000000000..60464e286a Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_boss_health.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_boss_rage.png b/Habitica/res/drawable-xhdpi/icon_boss_rage.png new file mode 100644 index 0000000000..b895946e65 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_boss_rage.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_eggs.png b/Habitica/res/drawable-xhdpi/icon_eggs.png new file mode 100644 index 0000000000..52e4c1f7c7 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_eggs.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_food.png b/Habitica/res/drawable-xhdpi/icon_food.png new file mode 100644 index 0000000000..ed896ea5ff Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_food.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_gift_gems.png b/Habitica/res/drawable-xhdpi/icon_gift_gems.png index 072958a4a2..fcef42045e 100644 Binary files a/Habitica/res/drawable-xhdpi/icon_gift_gems.png and b/Habitica/res/drawable-xhdpi/icon_gift_gems.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png b/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png new file mode 100644 index 0000000000..71f6359e5b Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_hatchingpotions.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_lock.png b/Habitica/res/drawable-xhdpi/icon_lock.png new file mode 100644 index 0000000000..fc59dc2ea9 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_lock.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_quests.png b/Habitica/res/drawable-xhdpi/icon_quests.png new file mode 100644 index 0000000000..2d90151648 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_quests.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_shops.png b/Habitica/res/drawable-xhdpi/icon_shops.png new file mode 100644 index 0000000000..cde0d28051 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_shops.png differ diff --git a/Habitica/res/drawable-xhdpi/icon_special.png b/Habitica/res/drawable-xhdpi/icon_special.png new file mode 100644 index 0000000000..f5b4465b94 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/icon_special.png differ diff --git a/Habitica/res/drawable-xhdpi/indicator_subscribe.png b/Habitica/res/drawable-xhdpi/indicator_subscribe.png new file mode 100644 index 0000000000..4ff6d2a5b8 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/indicator_subscribe.png differ diff --git a/Habitica/res/drawable-xhdpi/limited.png b/Habitica/res/drawable-xhdpi/limited.png new file mode 100644 index 0000000000..b09af198b6 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/limited.png differ diff --git a/Habitica/res/drawable-xhdpi/login_email.png b/Habitica/res/drawable-xhdpi/login_email.png new file mode 100644 index 0000000000..f4d6e0c02f Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_email.png differ diff --git a/Habitica/res/drawable-xhdpi/login_logo.png b/Habitica/res/drawable-xhdpi/login_logo.png new file mode 100644 index 0000000000..37802b6ca5 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_logo.png differ diff --git a/Habitica/res/drawable-xhdpi/login_logo.webp b/Habitica/res/drawable-xhdpi/login_logo.webp deleted file mode 100644 index 877d039086..0000000000 Binary files a/Habitica/res/drawable-xhdpi/login_logo.webp and /dev/null differ diff --git a/Habitica/res/drawable-xhdpi/login_password.png b/Habitica/res/drawable-xhdpi/login_password.png new file mode 100644 index 0000000000..e1e4d4586a Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_password.png differ diff --git a/Habitica/res/drawable-xhdpi/login_username.png b/Habitica/res/drawable-xhdpi/login_username.png new file mode 100644 index 0000000000..19a7f14f74 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/login_username.png differ diff --git a/Habitica/res/drawable-xhdpi/looking_for_party_empty.png b/Habitica/res/drawable-xhdpi/looking_for_party_empty.png new file mode 100644 index 0000000000..ad66b6f363 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/looking_for_party_empty.png differ diff --git a/Habitica/res/drawable-xhdpi/npc_gradient.png b/Habitica/res/drawable-xhdpi/npc_gradient.png new file mode 100644 index 0000000000..ef7ee7c7a1 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/npc_gradient.png differ diff --git a/Habitica/res/drawable-xhdpi/onboarding_done_art.png b/Habitica/res/drawable-xhdpi/onboarding_done_art.png index 407a1bdb1d..64ebcdc6b6 100644 Binary files a/Habitica/res/drawable-xhdpi/onboarding_done_art.png and b/Habitica/res/drawable-xhdpi/onboarding_done_art.png differ diff --git a/Habitica/res/drawable-xhdpi/payment_gift.png b/Habitica/res/drawable-xhdpi/payment_gift.png index fb1d96a23f..b7553901c0 100644 Binary files a/Habitica/res/drawable-xhdpi/payment_gift.png and b/Habitica/res/drawable-xhdpi/payment_gift.png differ diff --git a/Habitica/res/drawable-xhdpi/payment_stripe.png b/Habitica/res/drawable-xhdpi/payment_stripe.png index 4dd9aba311..b2466fb686 100644 Binary files a/Habitica/res/drawable-xhdpi/payment_stripe.png and b/Habitica/res/drawable-xhdpi/payment_stripe.png differ diff --git a/Habitica/res/drawable-xhdpi/separator_fancy.png b/Habitica/res/drawable-xhdpi/separator_fancy.png index 28f321bf2a..62123c6f26 100644 Binary files a/Habitica/res/drawable-xhdpi/separator_fancy.png and b/Habitica/res/drawable-xhdpi/separator_fancy.png differ diff --git a/Habitica/res/drawable-xhdpi/shop_header_sparkle.png b/Habitica/res/drawable-xhdpi/shop_header_sparkle.png new file mode 100644 index 0000000000..5895aaaf2c Binary files /dev/null and b/Habitica/res/drawable-xhdpi/shop_header_sparkle.png differ diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_21.png b/Habitica/res/drawable-xhdpi/spooky_gems_21.png new file mode 100644 index 0000000000..afd2014866 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_21.png differ diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_4.png b/Habitica/res/drawable-xhdpi/spooky_gems_4.png new file mode 100644 index 0000000000..897feba0b7 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_4.png differ diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_42.png b/Habitica/res/drawable-xhdpi/spooky_gems_42.png new file mode 100644 index 0000000000..d6b2d76d39 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_42.png differ diff --git a/Habitica/res/drawable-xhdpi/spooky_gems_84.png b/Habitica/res/drawable-xhdpi/spooky_gems_84.png new file mode 100644 index 0000000000..ea3eaf3f23 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/spooky_gems_84.png differ diff --git a/Habitica/res/drawable-xhdpi/stable_background_spring.png b/Habitica/res/drawable-xhdpi/stable_background_spring.png new file mode 100644 index 0000000000..7652a75b69 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/stable_background_spring.png differ diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png new file mode 100644 index 0000000000..faeafad19b Binary files /dev/null and b/Habitica/res/drawable-xhdpi/sub_benefits_armoire.png differ diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_faint.png b/Habitica/res/drawable-xhdpi/sub_benefits_faint.png new file mode 100644 index 0000000000..2551fe85b8 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/sub_benefits_faint.png differ diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_gems.png b/Habitica/res/drawable-xhdpi/sub_benefits_gems.png index b7f706651a..7040a73815 100644 Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_gems.png and b/Habitica/res/drawable-xhdpi/sub_benefits_gems.png differ diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png index 5ee6684061..28a03db9ce 100644 Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-xhdpi/sub_benefits_hourglasses.png differ diff --git a/Habitica/res/drawable-xhdpi/sub_benefits_pet.png b/Habitica/res/drawable-xhdpi/sub_benefits_pet.png index 95ba1a3caf..b9d861e349 100644 Binary files a/Habitica/res/drawable-xhdpi/sub_benefits_pet.png and b/Habitica/res/drawable-xhdpi/sub_benefits_pet.png differ diff --git a/Habitica/res/drawable-xhdpi/sub_plus.png b/Habitica/res/drawable-xhdpi/sub_plus.png new file mode 100644 index 0000000000..c4102f37b4 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/sub_plus.png differ diff --git a/Habitica/res/drawable-xhdpi/subscription_promo_gold.png b/Habitica/res/drawable-xhdpi/subscription_promo_gold.png index 84ed867827..17ae60958a 100644 Binary files a/Habitica/res/drawable-xhdpi/subscription_promo_gold.png and b/Habitica/res/drawable-xhdpi/subscription_promo_gold.png differ diff --git a/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000..e8581e3ea2 Binary files /dev/null and b/Habitica/res/drawable-xhdpi/subscription_selected_indicator.png differ diff --git a/Habitica/res/drawable-xhdpi/survey_art_left.png b/Habitica/res/drawable-xhdpi/survey_art_left.png index 6555bae8a7..eb8a61b4c9 100644 Binary files a/Habitica/res/drawable-xhdpi/survey_art_left.png and b/Habitica/res/drawable-xhdpi/survey_art_left.png differ diff --git a/Habitica/res/drawable-xhdpi/task_broken_megaphone.png b/Habitica/res/drawable-xhdpi/task_broken_megaphone.png index 9a5e6294f1..3d2063c2c9 100644 Binary files a/Habitica/res/drawable-xhdpi/task_broken_megaphone.png and b/Habitica/res/drawable-xhdpi/task_broken_megaphone.png differ diff --git a/Habitica/res/drawable-xhdpi/team_info_icon.png b/Habitica/res/drawable-xhdpi/team_info_icon.png deleted file mode 100644 index b88a51736d..0000000000 Binary files a/Habitica/res/drawable-xhdpi/team_info_icon.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png b/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png index a107821a91..37bdededf9 100644 Binary files a/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png and b/Habitica/res/drawable-xxhdpi/ab_solid_shadow_holo.9.png differ diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_art.png b/Habitica/res/drawable-xxhdpi/adventure_guide_art.png index fdeacdcdfe..36feb214b0 100644 Binary files a/Habitica/res/drawable-xxhdpi/adventure_guide_art.png and b/Habitica/res/drawable-xxhdpi/adventure_guide_art.png differ diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_left.png b/Habitica/res/drawable-xxhdpi/adventure_guide_left.png new file mode 100644 index 0000000000..b3cb5d6bfc Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/adventure_guide_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/adventure_guide_right.png b/Habitica/res/drawable-xxhdpi/adventure_guide_right.png new file mode 100644 index 0000000000..a44fadb00d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/adventure_guide_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/armoire_background.png b/Habitica/res/drawable-xxhdpi/armoire_background.png new file mode 100644 index 0000000000..0632e59f2d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/armoire_background.png differ diff --git a/Habitica/res/drawable-xxhdpi/armoire_circle.png b/Habitica/res/drawable-xxhdpi/armoire_circle.png new file mode 100644 index 0000000000..5481fa4648 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/armoire_circle.png differ diff --git a/Habitica/res/drawable-xxhdpi/armoire_experience.png b/Habitica/res/drawable-xxhdpi/armoire_experience.png new file mode 100644 index 0000000000..251d2510ea Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/armoire_experience.png differ diff --git a/Habitica/res/drawable-xxhdpi/arrow_back.png b/Habitica/res/drawable-xxhdpi/arrow_back.png new file mode 100644 index 0000000000..65f6329dfb Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/arrow_back.png differ diff --git a/Habitica/res/drawable-xxhdpi/assign.png b/Habitica/res/drawable-xxhdpi/assign.png new file mode 100644 index 0000000000..493747f392 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/assign.png differ diff --git a/Habitica/res/drawable-xxhdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-xxhdpi/baseline_error_outline_black_36dp.png deleted file mode 100644 index a65cafc821..0000000000 Binary files a/Habitica/res/drawable-xxhdpi/baseline_error_outline_black_36dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/birthday_gems.png b/Habitica/res/drawable-xxhdpi/birthday_gems.png new file mode 100644 index 0000000000..ea6ce0a6e0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/birthday_gems.png differ diff --git a/Habitica/res/drawable-xxhdpi/birthday_gifts.png b/Habitica/res/drawable-xxhdpi/birthday_gifts.png new file mode 100644 index 0000000000..ee621360e7 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/birthday_gifts.png differ diff --git a/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png b/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png new file mode 100644 index 0000000000..5025ec99a0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/birthday_menu_gems.png differ diff --git a/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png b/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png new file mode 100644 index 0000000000..5822c67280 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/birthday_textdeco_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png b/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png new file mode 100644 index 0000000000..f4bda60ff1 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/birthday_textdeco_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/border_pixelated.png b/Habitica/res/drawable-xxhdpi/border_pixelated.png new file mode 100644 index 0000000000..5c2ca9de9e Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/border_pixelated.png differ diff --git a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png index 9daee8f9ef..24f453fcc7 100644 Binary files a/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png and b/Habitica/res/drawable-xxhdpi/challenge_won_gem_confetti.png differ diff --git a/Habitica/res/drawable-xxhdpi/checkmark_small.png b/Habitica/res/drawable-xxhdpi/checkmark_small.png new file mode 100644 index 0000000000..061f1a5dec Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/checkmark_small.png differ diff --git a/Habitica/res/drawable-xxhdpi/completed.png b/Habitica/res/drawable-xxhdpi/completed.png new file mode 100644 index 0000000000..2f5d8b78f8 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/completed.png differ diff --git a/Habitica/res/drawable-xxhdpi/contributor_icon.png b/Habitica/res/drawable-xxhdpi/contributor_icon.png new file mode 100644 index 0000000000..4579bdafcc Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/contributor_icon.png differ diff --git a/Habitica/res/drawable-xxhdpi/customization_background.png b/Habitica/res/drawable-xxhdpi/customization_background.png new file mode 100644 index 0000000000..4f6b3f3f6f Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/customization_background.png differ diff --git a/Habitica/res/drawable-xxhdpi/customization_mix.png b/Habitica/res/drawable-xxhdpi/customization_mix.png new file mode 100644 index 0000000000..198e5594be Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/customization_mix.png differ diff --git a/Habitica/res/drawable-xxhdpi/diamond_button.9.png b/Habitica/res/drawable-xxhdpi/diamond_button.9.png index 317538c093..9db00d7475 100644 Binary files a/Habitica/res/drawable-xxhdpi/diamond_button.9.png and b/Habitica/res/drawable-xxhdpi/diamond_button.9.png differ diff --git a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png index 2317f85225..f307977c1d 100644 Binary files a/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png and b/Habitica/res/drawable-xxhdpi/diamond_button_white.9.png differ diff --git a/Habitica/res/drawable-xxhdpi/empty_slot.png b/Habitica/res/drawable-xxhdpi/empty_slot.png new file mode 100644 index 0000000000..67d1d9a11e Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/empty_slot.png differ diff --git a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png index 578cb397ea..f1717f4512 100644 Binary files a/Habitica/res/drawable-xxhdpi/equipment_two_handed.png and b/Habitica/res/drawable-xxhdpi/equipment_two_handed.png differ diff --git a/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png b/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png new file mode 100644 index 0000000000..d14dfc5910 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/extra_gem_cap_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png b/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png new file mode 100644 index 0000000000..5c6d6e25a5 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/extra_gem_cap_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxhdpi/fall_gems_21.png new file mode 100644 index 0000000000..51b5ab55a0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_21.png differ diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxhdpi/fall_gems_4.png new file mode 100644 index 0000000000..996311238e Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_4.png differ diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxhdpi/fall_gems_42.png new file mode 100644 index 0000000000..9ebc2a0aaa Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_42.png differ diff --git a/Habitica/res/drawable-xxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxhdpi/fall_gems_84.png new file mode 100644 index 0000000000..f18383a838 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/fall_gems_84.png differ diff --git a/Habitica/res/drawable-xxhdpi/fall_promo_title.png b/Habitica/res/drawable-xxhdpi/fall_promo_title.png index 846418d8f8..2a49c02fbc 100644 Binary files a/Habitica/res/drawable-xxhdpi/fall_promo_title.png and b/Habitica/res/drawable-xxhdpi/fall_promo_title.png differ diff --git a/Habitica/res/drawable-xxhdpi/flag_flap.png b/Habitica/res/drawable-xxhdpi/flag_flap.png index fa7d6a76ca..ca02603af7 100644 Binary files a/Habitica/res/drawable-xxhdpi/flag_flap.png and b/Habitica/res/drawable-xxhdpi/flag_flap.png differ diff --git a/Habitica/res/drawable-xxhdpi/footer_hills.png b/Habitica/res/drawable-xxhdpi/footer_hills.png new file mode 100644 index 0000000000..54b78eb163 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/footer_hills.png differ diff --git a/Habitica/res/drawable-xxhdpi/footer_hills_g1g1.png b/Habitica/res/drawable-xxhdpi/footer_hills_g1g1.png new file mode 100644 index 0000000000..74cc3d00de Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/footer_hills_g1g1.png differ diff --git a/Habitica/res/drawable-xxhdpi/footer_stars_left.png b/Habitica/res/drawable-xxhdpi/footer_stars_left.png new file mode 100644 index 0000000000..3cf8137963 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/footer_stars_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/footer_stars_right.png b/Habitica/res/drawable-xxhdpi/footer_stars_right.png new file mode 100644 index 0000000000..3400e9aaad Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/footer_stars_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png index 0db5950706..9dbb03c006 100644 Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png index 2a7e4472ce..484b54d769 100644 Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_left_small.png differ diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png index 3a6730ad10..de15d7eb0c 100644 Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_menu_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png index 7c77ff9b2b..4409f987d5 100644 Binary files a/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_promo_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png index c704cc43e6..86ad001590 100644 Binary files a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png index 9a608b8e9f..f0e644d4f9 100644 Binary files a/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png and b/Habitica/res/drawable-xxhdpi/g1g1_sparkle_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/gem_gold_left.png b/Habitica/res/drawable-xxhdpi/gem_gold_left.png new file mode 100644 index 0000000000..7d71c80fbf Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gem_gold_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/gem_gold_right.png b/Habitica/res/drawable-xxhdpi/gem_gold_right.png new file mode 100644 index 0000000000..84ce131566 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/gem_gold_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header.png index bbeafadfc4..9ce6c5f347 100644 Binary files a/Habitica/res/drawable-xxhdpi/gem_purchase_header.png and b/Habitica/res/drawable-xxhdpi/gem_purchase_header.png differ diff --git a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png index e318090273..2d28aa92ff 100644 Binary files a/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png and b/Habitica/res/drawable-xxhdpi/gem_purchase_header_dark.png differ diff --git a/Habitica/res/drawable-xxhdpi/gems_21.png b/Habitica/res/drawable-xxhdpi/gems_21.png index e158a98de8..a9d796129a 100644 Binary files a/Habitica/res/drawable-xxhdpi/gems_21.png and b/Habitica/res/drawable-xxhdpi/gems_21.png differ diff --git a/Habitica/res/drawable-xxhdpi/gems_4.png b/Habitica/res/drawable-xxhdpi/gems_4.png index de9c8a5d41..62cc2a8f1a 100644 Binary files a/Habitica/res/drawable-xxhdpi/gems_4.png and b/Habitica/res/drawable-xxhdpi/gems_4.png differ diff --git a/Habitica/res/drawable-xxhdpi/gems_42.png b/Habitica/res/drawable-xxhdpi/gems_42.png index d4f06cb622..c2966c3127 100644 Binary files a/Habitica/res/drawable-xxhdpi/gems_42.png and b/Habitica/res/drawable-xxhdpi/gems_42.png differ diff --git a/Habitica/res/drawable-xxhdpi/gems_84.png b/Habitica/res/drawable-xxhdpi/gems_84.png index 2c8725c353..82b29c445b 100644 Binary files a/Habitica/res/drawable-xxhdpi/gems_84.png and b/Habitica/res/drawable-xxhdpi/gems_84.png differ diff --git a/Habitica/res/drawable-xxhdpi/gift_sub_gift.png b/Habitica/res/drawable-xxhdpi/gift_sub_gift.png index f5fc9dbe58..38ca925b9d 100644 Binary files a/Habitica/res/drawable-xxhdpi/gift_sub_gift.png and b/Habitica/res/drawable-xxhdpi/gift_sub_gift.png differ diff --git a/Habitica/res/drawable-xxhdpi/gold_coins_left.png b/Habitica/res/drawable-xxhdpi/gold_coins_left.png index e1caf33d6a..a516a5e00e 100644 Binary files a/Habitica/res/drawable-xxhdpi/gold_coins_left.png and b/Habitica/res/drawable-xxhdpi/gold_coins_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/gold_coins_right.png b/Habitica/res/drawable-xxhdpi/gold_coins_right.png index ebd64b89eb..99d70c64d0 100644 Binary files a/Habitica/res/drawable-xxhdpi/gold_coins_right.png and b/Habitica/res/drawable-xxhdpi/gold_coins_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/habit_minus.png b/Habitica/res/drawable-xxhdpi/habit_minus.png index 03c4578114..a4e60765bb 100644 Binary files a/Habitica/res/drawable-xxhdpi/habit_minus.png and b/Habitica/res/drawable-xxhdpi/habit_minus.png differ diff --git a/Habitica/res/drawable-xxhdpi/habit_plus.png b/Habitica/res/drawable-xxhdpi/habit_plus.png index 6609fef8c7..7f1db95aa7 100644 Binary files a/Habitica/res/drawable-xxhdpi/habit_plus.png and b/Habitica/res/drawable-xxhdpi/habit_plus.png differ diff --git a/Habitica/res/drawable-xxhdpi/header_verify_username.png b/Habitica/res/drawable-xxhdpi/header_verify_username.png new file mode 100644 index 0000000000..9a32db5753 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/header_verify_username.png differ diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png new file mode 100644 index 0000000000..a99d877ed5 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png new file mode 100644 index 0000000000..c3b3c5866b Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/hourglass_fancy_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png b/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png index 5d03558c52..3bfd91d8ee 100644 Binary files a/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png and b/Habitica/res/drawable-xxhdpi/ic_add_white_18dp.png differ diff --git a/Habitica/res/drawable-xxhdpi/ic_email_color.png b/Habitica/res/drawable-xxhdpi/ic_email_color.png new file mode 100644 index 0000000000..d02917321d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/ic_email_color.png differ diff --git a/Habitica/res/drawable-xxhdpi/ic_gryphon_white.webp b/Habitica/res/drawable-xxhdpi/ic_gryphon_white.webp deleted file mode 100644 index 4159a87205..0000000000 Binary files a/Habitica/res/drawable-xxhdpi/ic_gryphon_white.webp and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png b/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png index c4d55365dc..a881c32ac0 100644 Binary files a/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png and b/Habitica/res/drawable-xxhdpi/ic_keyboard_arrow_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_birthday.png b/Habitica/res/drawable-xxhdpi/icon_birthday.png new file mode 100644 index 0000000000..f26d5e0cb8 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_birthday.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_health.png b/Habitica/res/drawable-xxhdpi/icon_boss_health.png new file mode 100644 index 0000000000..b6e0bf9db0 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_boss_health.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_boss_rage.png b/Habitica/res/drawable-xxhdpi/icon_boss_rage.png new file mode 100644 index 0000000000..259cc40243 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_boss_rage.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_eggs.png b/Habitica/res/drawable-xxhdpi/icon_eggs.png new file mode 100644 index 0000000000..f590b6cd29 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_eggs.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_food.png b/Habitica/res/drawable-xxhdpi/icon_food.png new file mode 100644 index 0000000000..3fc7a2977e Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_food.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png b/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png new file mode 100644 index 0000000000..315bd82e00 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_hatchingpotions.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_lock.png b/Habitica/res/drawable-xxhdpi/icon_lock.png new file mode 100644 index 0000000000..6b0ea94206 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_lock.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_quests.png b/Habitica/res/drawable-xxhdpi/icon_quests.png new file mode 100644 index 0000000000..a713864dcb Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_quests.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_shops.png b/Habitica/res/drawable-xxhdpi/icon_shops.png new file mode 100644 index 0000000000..e85600161a Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_shops.png differ diff --git a/Habitica/res/drawable-xxhdpi/icon_special.png b/Habitica/res/drawable-xxhdpi/icon_special.png new file mode 100644 index 0000000000..19cacf1084 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/icon_special.png differ diff --git a/Habitica/res/drawable-xxhdpi/indicator_subscribe.png b/Habitica/res/drawable-xxhdpi/indicator_subscribe.png new file mode 100644 index 0000000000..d817304b69 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/indicator_subscribe.png differ diff --git a/Habitica/res/drawable-xxhdpi/limited.png b/Habitica/res/drawable-xxhdpi/limited.png new file mode 100644 index 0000000000..5f6e16a182 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/limited.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_email.png b/Habitica/res/drawable-xxhdpi/login_email.png new file mode 100644 index 0000000000..013171a219 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_email.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_logo.png b/Habitica/res/drawable-xxhdpi/login_logo.png new file mode 100644 index 0000000000..de82bff53d Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_logo.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_logo.webp b/Habitica/res/drawable-xxhdpi/login_logo.webp deleted file mode 100644 index 239a2b37a6..0000000000 Binary files a/Habitica/res/drawable-xxhdpi/login_logo.webp and /dev/null differ diff --git a/Habitica/res/drawable-xxhdpi/login_password.png b/Habitica/res/drawable-xxhdpi/login_password.png new file mode 100644 index 0000000000..57e59de4f4 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_password.png differ diff --git a/Habitica/res/drawable-xxhdpi/login_username.png b/Habitica/res/drawable-xxhdpi/login_username.png new file mode 100644 index 0000000000..7ed0c460d8 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/login_username.png differ diff --git a/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png b/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png new file mode 100644 index 0000000000..a310e9f0f6 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/looking_for_party_empty.png differ diff --git a/Habitica/res/drawable-xxhdpi/no_background.png b/Habitica/res/drawable-xxhdpi/no_background.png index 6ca2077d43..b4f4aa192c 100644 Binary files a/Habitica/res/drawable-xxhdpi/no_background.png and b/Habitica/res/drawable-xxhdpi/no_background.png differ diff --git a/Habitica/res/drawable-xxhdpi/npc_gradient.png b/Habitica/res/drawable-xxhdpi/npc_gradient.png new file mode 100644 index 0000000000..91e493d682 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/npc_gradient.png differ diff --git a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png index d9cc8ec0b8..298ce31b3b 100644 Binary files a/Habitica/res/drawable-xxhdpi/onboarding_done_art.png and b/Habitica/res/drawable-xxhdpi/onboarding_done_art.png differ diff --git a/Habitica/res/drawable-xxhdpi/party_invite_reject.png b/Habitica/res/drawable-xxhdpi/party_invite_reject.png index c351769ae9..e0606bca24 100644 Binary files a/Habitica/res/drawable-xxhdpi/party_invite_reject.png and b/Habitica/res/drawable-xxhdpi/party_invite_reject.png differ diff --git a/Habitica/res/drawable-xxhdpi/payment_gift.png b/Habitica/res/drawable-xxhdpi/payment_gift.png index e466c91e38..a81af8ee20 100644 Binary files a/Habitica/res/drawable-xxhdpi/payment_gift.png and b/Habitica/res/drawable-xxhdpi/payment_gift.png differ diff --git a/Habitica/res/drawable-xxhdpi/payment_google.png b/Habitica/res/drawable-xxhdpi/payment_google.png index 5589b141e1..3780cb7940 100644 Binary files a/Habitica/res/drawable-xxhdpi/payment_google.png and b/Habitica/res/drawable-xxhdpi/payment_google.png differ diff --git a/Habitica/res/drawable-xxhdpi/payment_stripe.png b/Habitica/res/drawable-xxhdpi/payment_stripe.png index 030c1dacf7..3319a2b495 100644 Binary files a/Habitica/res/drawable-xxhdpi/payment_stripe.png and b/Habitica/res/drawable-xxhdpi/payment_stripe.png differ diff --git a/Habitica/res/drawable-xxhdpi/pet_checkmark.png b/Habitica/res/drawable-xxhdpi/pet_checkmark.png index ead8094251..f208811992 100644 Binary files a/Habitica/res/drawable-xxhdpi/pet_checkmark.png and b/Habitica/res/drawable-xxhdpi/pet_checkmark.png differ diff --git a/Habitica/res/drawable-xxhdpi/separator_fancy.png b/Habitica/res/drawable-xxhdpi/separator_fancy.png index bb1aad139a..5115bcd6e3 100644 Binary files a/Habitica/res/drawable-xxhdpi/separator_fancy.png and b/Habitica/res/drawable-xxhdpi/separator_fancy.png differ diff --git a/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png b/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png new file mode 100644 index 0000000000..eaeeeb8dab Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/shop_header_sparkle.png differ diff --git a/Habitica/res/drawable-xxhdpi/sparkles_left.png b/Habitica/res/drawable-xxhdpi/sparkles_left.png index 9885b9ec44..db84f84a2b 100644 Binary files a/Habitica/res/drawable-xxhdpi/sparkles_left.png and b/Habitica/res/drawable-xxhdpi/sparkles_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png new file mode 100644 index 0000000000..9737275e45 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_21.png differ diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png new file mode 100644 index 0000000000..8f875e8008 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_4.png differ diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png new file mode 100644 index 0000000000..ecc795f5d3 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_42.png differ diff --git a/Habitica/res/drawable-xxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png new file mode 100644 index 0000000000..97eac988c3 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/spooky_gems_84.png differ diff --git a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png index 426b1aa9fb..e84fd8bba3 100644 Binary files a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png and b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png index 6b3b23f1df..b01369bc1f 100644 Binary files a/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png and b/Habitica/res/drawable-xxhdpi/spooky_promo_banner_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/stable_background_spring.png b/Habitica/res/drawable-xxhdpi/stable_background_spring.png new file mode 100644 index 0000000000..9158fb0cda Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/stable_background_spring.png differ diff --git a/Habitica/res/drawable-xxhdpi/star.png b/Habitica/res/drawable-xxhdpi/star.png index 44da3b86f1..1ba7d46aa2 100644 Binary files a/Habitica/res/drawable-xxhdpi/star.png and b/Habitica/res/drawable-xxhdpi/star.png differ diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png new file mode 100644 index 0000000000..8a56eb4147 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/sub_benefits_armoire.png differ diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png b/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png new file mode 100644 index 0000000000..13e1e2fe4f Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/sub_benefits_faint.png differ diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png b/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png index 0ffdf0f294..8f12be290b 100644 Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_gems.png differ diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png b/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png index cca709d611..3ea287e204 100644 Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_hourglasses.png differ diff --git a/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png b/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png index 2376fce043..cdaff2b5c8 100644 Binary files a/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png and b/Habitica/res/drawable-xxhdpi/sub_benefits_pet.png differ diff --git a/Habitica/res/drawable-xxhdpi/sub_plus.png b/Habitica/res/drawable-xxhdpi/sub_plus.png new file mode 100644 index 0000000000..29d1aaba73 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/sub_plus.png differ diff --git a/Habitica/res/drawable-xxhdpi/subscribe_header.png b/Habitica/res/drawable-xxhdpi/subscribe_header.png index 3fa324fdc0..97b3465952 100644 Binary files a/Habitica/res/drawable-xxhdpi/subscribe_header.png and b/Habitica/res/drawable-xxhdpi/subscribe_header.png differ diff --git a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png index 3f5f0e1b2c..04dec7fe0d 100644 Binary files a/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png and b/Habitica/res/drawable-xxhdpi/subscriber_banner_dark.png differ diff --git a/Habitica/res/drawable-xxhdpi/subscriber_header.png b/Habitica/res/drawable-xxhdpi/subscriber_header.png index baa6a74657..3097333785 100644 Binary files a/Habitica/res/drawable-xxhdpi/subscriber_header.png and b/Habitica/res/drawable-xxhdpi/subscriber_header.png differ diff --git a/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png new file mode 100644 index 0000000000..d47fcef417 Binary files /dev/null and b/Habitica/res/drawable-xxhdpi/subscription_selected_indicator.png differ diff --git a/Habitica/res/drawable-xxhdpi/survey_art_left.png b/Habitica/res/drawable-xxhdpi/survey_art_left.png index e68f99f343..f7cc9c604d 100644 Binary files a/Habitica/res/drawable-xxhdpi/survey_art_left.png and b/Habitica/res/drawable-xxhdpi/survey_art_left.png differ diff --git a/Habitica/res/drawable-xxhdpi/survey_art_right.png b/Habitica/res/drawable-xxhdpi/survey_art_right.png index f5733eea4f..ecb647e277 100644 Binary files a/Habitica/res/drawable-xxhdpi/survey_art_right.png and b/Habitica/res/drawable-xxhdpi/survey_art_right.png differ diff --git a/Habitica/res/drawable-xxhdpi/team_info_icon.png b/Habitica/res/drawable-xxhdpi/team_info_icon.png deleted file mode 100644 index 9acdade443..0000000000 Binary files a/Habitica/res/drawable-xxhdpi/team_info_icon.png and /dev/null differ diff --git a/Habitica/res/drawable-xxxhdpi/adventure_guide_left.png b/Habitica/res/drawable-xxxhdpi/adventure_guide_left.png new file mode 100644 index 0000000000..8f39878e33 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/adventure_guide_left.png differ diff --git a/Habitica/res/drawable-xxxhdpi/adventure_guide_right.png b/Habitica/res/drawable-xxxhdpi/adventure_guide_right.png new file mode 100644 index 0000000000..2383e21d9d Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/adventure_guide_right.png differ diff --git a/Habitica/res/drawable-xxxhdpi/armoire_background.png b/Habitica/res/drawable-xxxhdpi/armoire_background.png new file mode 100644 index 0000000000..d7db873960 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/armoire_background.png differ diff --git a/Habitica/res/drawable-xxxhdpi/armoire_circle.png b/Habitica/res/drawable-xxxhdpi/armoire_circle.png new file mode 100644 index 0000000000..79ee00ecd9 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/armoire_circle.png differ diff --git a/Habitica/res/drawable-xxxhdpi/armoire_experience.png b/Habitica/res/drawable-xxxhdpi/armoire_experience.png new file mode 100644 index 0000000000..9346537b4c Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/armoire_experience.png differ diff --git a/Habitica/res/drawable-xxxhdpi/baseline_error_outline_black_36dp.png b/Habitica/res/drawable-xxxhdpi/baseline_error_outline_black_36dp.png deleted file mode 100644 index 0a0d146a4e..0000000000 Binary files a/Habitica/res/drawable-xxxhdpi/baseline_error_outline_black_36dp.png and /dev/null differ diff --git a/Habitica/res/drawable-xxxhdpi/contributor_icon.png b/Habitica/res/drawable-xxxhdpi/contributor_icon.png new file mode 100644 index 0000000000..e124ef7c27 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/contributor_icon.png differ diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_21.png b/Habitica/res/drawable-xxxhdpi/fall_gems_21.png new file mode 100644 index 0000000000..d086b585aa Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_21.png differ diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_4.png b/Habitica/res/drawable-xxxhdpi/fall_gems_4.png new file mode 100644 index 0000000000..b7b33acd4c Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_4.png differ diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_42.png b/Habitica/res/drawable-xxxhdpi/fall_gems_42.png new file mode 100644 index 0000000000..fc13cf769b Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_42.png differ diff --git a/Habitica/res/drawable-xxxhdpi/fall_gems_84.png b/Habitica/res/drawable-xxxhdpi/fall_gems_84.png new file mode 100644 index 0000000000..0ec58519d2 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/fall_gems_84.png differ diff --git a/Habitica/res/drawable-xxxhdpi/gems_21.png b/Habitica/res/drawable-xxxhdpi/gems_21.png index 36ba10ee5c..b6ba507c72 100644 Binary files a/Habitica/res/drawable-xxxhdpi/gems_21.png and b/Habitica/res/drawable-xxxhdpi/gems_21.png differ diff --git a/Habitica/res/drawable-xxxhdpi/gems_4.png b/Habitica/res/drawable-xxxhdpi/gems_4.png index b1025f85d1..ffaa2ec0fd 100644 Binary files a/Habitica/res/drawable-xxxhdpi/gems_4.png and b/Habitica/res/drawable-xxxhdpi/gems_4.png differ diff --git a/Habitica/res/drawable-xxxhdpi/gems_42.png b/Habitica/res/drawable-xxxhdpi/gems_42.png index 2cb9b1affe..6454b8b9d5 100644 Binary files a/Habitica/res/drawable-xxxhdpi/gems_42.png and b/Habitica/res/drawable-xxxhdpi/gems_42.png differ diff --git a/Habitica/res/drawable-xxxhdpi/gems_84.png b/Habitica/res/drawable-xxxhdpi/gems_84.png index b106891d90..f821991702 100644 Binary files a/Habitica/res/drawable-xxxhdpi/gems_84.png and b/Habitica/res/drawable-xxxhdpi/gems_84.png differ diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png new file mode 100644 index 0000000000..939b6149a5 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_21.png differ diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png new file mode 100644 index 0000000000..428e4a0d89 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_4.png differ diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png new file mode 100644 index 0000000000..527bce18f8 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_42.png differ diff --git a/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png b/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png new file mode 100644 index 0000000000..e5ddaf7379 Binary files /dev/null and b/Habitica/res/drawable-xxxhdpi/spooky_gems_84.png differ diff --git a/Habitica/res/drawable-xxxhdpi/team_info_icon.png b/Habitica/res/drawable-xxxhdpi/team_info_icon.png deleted file mode 100644 index 9f0a549bff..0000000000 Binary files a/Habitica/res/drawable-xxxhdpi/team_info_icon.png and /dev/null differ diff --git a/Habitica/res/drawable/achievement_section_badge_bg.xml b/Habitica/res/drawable/achievement_section_badge_bg.xml index d71c5e6da7..f0068a78a2 100644 --- a/Habitica/res/drawable/achievement_section_badge_bg.xml +++ b/Habitica/res/drawable/achievement_section_badge_bg.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/activity_launch_background.xml b/Habitica/res/drawable/activity_launch_background.xml index 4b12dee0b1..190f9d1c46 100644 --- a/Habitica/res/drawable/activity_launch_background.xml +++ b/Habitica/res/drawable/activity_launch_background.xml @@ -1,13 +1,10 @@ - - - - \ No newline at end of file + diff --git a/Habitica/res/drawable/ad_button_background.xml b/Habitica/res/drawable/ad_button_background.xml new file mode 100644 index 0000000000..5186b00329 --- /dev/null +++ b/Habitica/res/drawable/ad_button_background.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/ad_button_background_content.xml b/Habitica/res/drawable/ad_button_background_content.xml new file mode 100644 index 0000000000..ab553aad05 --- /dev/null +++ b/Habitica/res/drawable/ad_button_background_content.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/ad_button_background_disabled.xml b/Habitica/res/drawable/ad_button_background_disabled.xml new file mode 100644 index 0000000000..144721661f --- /dev/null +++ b/Habitica/res/drawable/ad_button_background_disabled.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/adventure_guide_menu_bg.xml b/Habitica/res/drawable/adventure_guide_menu_bg.xml deleted file mode 100644 index 7a696951db..0000000000 --- a/Habitica/res/drawable/adventure_guide_menu_bg.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/adventure_guide_menu_card_bg.xml b/Habitica/res/drawable/adventure_guide_menu_card_bg.xml index e0ff6fc6eb..2d37391107 100644 --- a/Habitica/res/drawable/adventure_guide_menu_card_bg.xml +++ b/Habitica/res/drawable/adventure_guide_menu_card_bg.xml @@ -1,6 +1,23 @@ - - + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml b/Habitica/res/drawable/adventure_guide_menu_card_gray.xml deleted file mode 100644 index 264f19e60a..0000000000 --- a/Habitica/res/drawable/adventure_guide_menu_card_gray.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/armoire_background_full.xml b/Habitica/res/drawable/armoire_background_full.xml new file mode 100644 index 0000000000..bb9de1b2f0 --- /dev/null +++ b/Habitica/res/drawable/armoire_background_full.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Habitica/res/drawable/armoire_gold_background.xml b/Habitica/res/drawable/armoire_gold_background.xml new file mode 100644 index 0000000000..5db42576d2 --- /dev/null +++ b/Habitica/res/drawable/armoire_gold_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml index 46989087c0..1eaeca2670 100644 --- a/Habitica/res/drawable/avatar_customization_subcategory_bg.xml +++ b/Habitica/res/drawable/avatar_customization_subcategory_bg.xml @@ -2,10 +2,10 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/drawable/bg_rebirth_gem_cost.xml b/Habitica/res/drawable/bg_rebirth_gem_cost.xml new file mode 100644 index 0000000000..0ffc5dc29b --- /dev/null +++ b/Habitica/res/drawable/bg_rebirth_gem_cost.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/Habitica/res/drawable/border_1f000000.xml b/Habitica/res/drawable/border_1f000000.xml index b2336280bf..7329bc223d 100644 --- a/Habitica/res/drawable/border_1f000000.xml +++ b/Habitica/res/drawable/border_1f000000.xml @@ -1,10 +1,8 @@ - - diff --git a/Habitica/res/drawable/border_1f000000_white.xml b/Habitica/res/drawable/border_1f000000_white.xml index feea4b8155..476b164c64 100644 --- a/Habitica/res/drawable/border_1f000000_white.xml +++ b/Habitica/res/drawable/border_1f000000_white.xml @@ -1,7 +1,7 @@ - + - - \ No newline at end of file + + diff --git a/Habitica/res/drawable/bottom_sheet_background.xml b/Habitica/res/drawable/bottom_sheet_background.xml new file mode 100644 index 0000000000..1532e6d261 --- /dev/null +++ b/Habitica/res/drawable/bottom_sheet_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/bottom_sheet_title.xml b/Habitica/res/drawable/bottom_sheet_title.xml new file mode 100644 index 0000000000..5d2292b955 --- /dev/null +++ b/Habitica/res/drawable/bottom_sheet_title.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/Habitica/res/drawable/button_background.xml b/Habitica/res/drawable/button_background.xml new file mode 100644 index 0000000000..274aa4f769 --- /dev/null +++ b/Habitica/res/drawable/button_background.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/button_background_gray_700.xml b/Habitica/res/drawable/button_background_gray_700.xml index 701f12e7a0..9de2c19e03 100644 --- a/Habitica/res/drawable/button_background_gray_700.xml +++ b/Habitica/res/drawable/button_background_gray_700.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/Habitica/res/drawable/button_background_primary.xml b/Habitica/res/drawable/button_background_primary.xml index ea1e791059..e7476fe5b8 100644 --- a/Habitica/res/drawable/button_background_primary.xml +++ b/Habitica/res/drawable/button_background_primary.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/button_gray_100.xml b/Habitica/res/drawable/button_gray_100.xml index eb34b9075c..3b0e1bd755 100644 --- a/Habitica/res/drawable/button_gray_100.xml +++ b/Habitica/res/drawable/button_gray_100.xml @@ -7,7 +7,7 @@ + android:radius="6dp" /> + android:radius="6dp" /> + android:radius="6dp" /> + + + + + diff --git a/Habitica/res/drawable/circle_gray_700.xml b/Habitica/res/drawable/circle_gray_700.xml new file mode 100644 index 0000000000..a6defe225b --- /dev/null +++ b/Habitica/res/drawable/circle_gray_700.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/class_selection_inset_arrow.xml b/Habitica/res/drawable/class_selection_inset_arrow.xml index f0ba3ac24e..03e64cbf0f 100644 --- a/Habitica/res/drawable/class_selection_inset_arrow.xml +++ b/Habitica/res/drawable/class_selection_inset_arrow.xml @@ -6,6 +6,6 @@ android:viewportHeight="24.0"> + android:strokeColor="?attr/colorContentBackground" + android:fillColor="?attr/colorContentBackground"/> \ No newline at end of file diff --git a/Habitica/res/drawable/confetti_blue.xml b/Habitica/res/drawable/confetti_blue.xml index e78d8b5405..3e49327410 100644 --- a/Habitica/res/drawable/confetti_blue.xml +++ b/Habitica/res/drawable/confetti_blue.xml @@ -1,6 +1,6 @@ - + - - \ No newline at end of file + + diff --git a/Habitica/res/drawable/confetti_purple.xml b/Habitica/res/drawable/confetti_purple.xml index 22c59b135b..d7066cd0c0 100644 --- a/Habitica/res/drawable/confetti_purple.xml +++ b/Habitica/res/drawable/confetti_purple.xml @@ -1,6 +1,6 @@ - - - - \ No newline at end of file + + + + diff --git a/Habitica/res/drawable/confetti_red.xml b/Habitica/res/drawable/confetti_red.xml index ffd9d742d2..0de56e6980 100644 --- a/Habitica/res/drawable/confetti_red.xml +++ b/Habitica/res/drawable/confetti_red.xml @@ -1,6 +1,6 @@ - + - - \ No newline at end of file + + diff --git a/Habitica/res/drawable/confetti_subs.xml b/Habitica/res/drawable/confetti_subs.xml new file mode 100644 index 0000000000..e148b40163 --- /dev/null +++ b/Habitica/res/drawable/confetti_subs.xml @@ -0,0 +1,7 @@ + + + + diff --git a/Habitica/res/drawable/confetti_yellow.xml b/Habitica/res/drawable/confetti_yellow.xml index ae6bbc01e3..dac8309bb6 100644 --- a/Habitica/res/drawable/confetti_yellow.xml +++ b/Habitica/res/drawable/confetti_yellow.xml @@ -1,6 +1,6 @@ - + - - \ No newline at end of file + + diff --git a/Habitica/res/drawable/death_ghost.png b/Habitica/res/drawable/death_ghost.png new file mode 100644 index 0000000000..8adbcb34d3 Binary files /dev/null and b/Habitica/res/drawable/death_ghost.png differ diff --git a/Habitica/res/drawable/edit.xml b/Habitica/res/drawable/edit.xml new file mode 100644 index 0000000000..d72a04c2af --- /dev/null +++ b/Habitica/res/drawable/edit.xml @@ -0,0 +1,10 @@ + + + diff --git a/Habitica/res/drawable/flag_flap_background.xml b/Habitica/res/drawable/flag_flap_background.xml new file mode 100644 index 0000000000..4bd0c225f3 --- /dev/null +++ b/Habitica/res/drawable/flag_flap_background.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/drawable/g1g1_box.xml b/Habitica/res/drawable/g1g1_box.xml index 3c098bd650..c122da223d 100644 --- a/Habitica/res/drawable/g1g1_box.xml +++ b/Habitica/res/drawable/g1g1_box.xml @@ -1,5 +1,5 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/drawable/g1g1_vertical_background.xml b/Habitica/res/drawable/g1g1_vertical_background.xml new file mode 100644 index 0000000000..daae2fdfe5 --- /dev/null +++ b/Habitica/res/drawable/g1g1_vertical_background.xml @@ -0,0 +1,6 @@ + + + + diff --git a/Habitica/res/drawable/gem_extra_progress.xml b/Habitica/res/drawable/gem_extra_progress.xml new file mode 100644 index 0000000000..d56a7122a7 --- /dev/null +++ b/Habitica/res/drawable/gem_extra_progress.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/gem_ic.xml b/Habitica/res/drawable/gem_ic.xml new file mode 100644 index 0000000000..6da6bbb84f --- /dev/null +++ b/Habitica/res/drawable/gem_ic.xml @@ -0,0 +1,40 @@ + + + + + + + + diff --git a/Habitica/res/drawable/gryphon_old.xml b/Habitica/res/drawable/gryphon_old.xml new file mode 100644 index 0000000000..c86d246b09 --- /dev/null +++ b/Habitica/res/drawable/gryphon_old.xml @@ -0,0 +1,18 @@ + + + + diff --git a/Habitica/res/drawable/habit_circle_disabled.xml b/Habitica/res/drawable/habit_circle_disabled.xml index 16a7cd5c7f..156cc2bd70 100644 --- a/Habitica/res/drawable/habit_circle_disabled.xml +++ b/Habitica/res/drawable/habit_circle_disabled.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/habit_scoring_circle.xml b/Habitica/res/drawable/habit_scoring_circle.xml index 170bb9a377..38760bf83a 100644 --- a/Habitica/res/drawable/habit_scoring_circle.xml +++ b/Habitica/res/drawable/habit_scoring_circle.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/habit_scoring_circle_selected.xml b/Habitica/res/drawable/habit_scoring_circle_selected.xml index c428160521..d5f1baa621 100644 --- a/Habitica/res/drawable/habit_scoring_circle_selected.xml +++ b/Habitica/res/drawable/habit_scoring_circle_selected.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/ic_arrow_drop_down_10dp.xml b/Habitica/res/drawable/ic_arrow_drop_down_10dp.xml new file mode 100644 index 0000000000..71aca5d72f --- /dev/null +++ b/Habitica/res/drawable/ic_arrow_drop_down_10dp.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/drawable/ic_broken_heart.xml b/Habitica/res/drawable/ic_broken_heart.xml new file mode 100644 index 0000000000..65960dbcb1 --- /dev/null +++ b/Habitica/res/drawable/ic_broken_heart.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/ic_check_purple.xml b/Habitica/res/drawable/ic_check_purple.xml index 60e7b4dd3b..64e073bc14 100644 --- a/Habitica/res/drawable/ic_check_purple.xml +++ b/Habitica/res/drawable/ic_check_purple.xml @@ -1,4 +1,4 @@ - + diff --git a/Habitica/res/drawable/ic_clock_24dp.xml b/Habitica/res/drawable/ic_clock_24dp.xml new file mode 100644 index 0000000000..72952bcaad --- /dev/null +++ b/Habitica/res/drawable/ic_clock_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/Habitica/res/drawable/ic_launcher_foreground.xml b/Habitica/res/drawable/ic_launcher_foreground.xml index 4fc0d90b9b..bf7ae72c57 100644 --- a/Habitica/res/drawable/ic_launcher_foreground.xml +++ b/Habitica/res/drawable/ic_launcher_foreground.xml @@ -1,18 +1,12 @@ + android:viewportWidth="108" + android:viewportHeight="108"> - diff --git a/Habitica/res/drawable/ic_launcher_monochrome.xml b/Habitica/res/drawable/ic_launcher_monochrome.xml new file mode 100644 index 0000000000..ef38c6ae28 --- /dev/null +++ b/Habitica/res/drawable/ic_launcher_monochrome.xml @@ -0,0 +1,9 @@ + + + diff --git a/Habitica/res/drawable/icon_chat.xml b/Habitica/res/drawable/icon_chat.xml new file mode 100644 index 0000000000..42714253f8 --- /dev/null +++ b/Habitica/res/drawable/icon_chat.xml @@ -0,0 +1,5 @@ + + + diff --git a/Habitica/res/drawable/indicator_diamond.xml b/Habitica/res/drawable/indicator_diamond.xml index 249abe868d..1d24e209cb 100644 --- a/Habitica/res/drawable/indicator_diamond.xml +++ b/Habitica/res/drawable/indicator_diamond.xml @@ -1,5 +1,13 @@ - - - \ No newline at end of file + + + + + + + + + + + diff --git a/Habitica/res/drawable/item_indicator_subscribe.xml b/Habitica/res/drawable/item_indicator_subscribe.xml new file mode 100644 index 0000000000..638af238a0 --- /dev/null +++ b/Habitica/res/drawable/item_indicator_subscribe.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Habitica/res/drawable/layout_extra_rounded_teal_1.xml b/Habitica/res/drawable/layout_extra_rounded_teal_1.xml new file mode 100644 index 0000000000..2db80cfe85 --- /dev/null +++ b/Habitica/res/drawable/layout_extra_rounded_teal_1.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/layout_rounded_bg_blue.xml b/Habitica/res/drawable/layout_rounded_bg_blue.xml deleted file mode 100644 index 852c90177c..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_blue.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_content.xml b/Habitica/res/drawable/layout_rounded_bg_content.xml index 9f6e1d1b00..9b650e7d25 100644 --- a/Habitica/res/drawable/layout_rounded_bg_content.xml +++ b/Habitica/res/drawable/layout_rounded_bg_content.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_gray_1.xml b/Habitica/res/drawable/layout_rounded_bg_gray_1.xml deleted file mode 100644 index d20820b881..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_gray_1.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_header_bar.xml b/Habitica/res/drawable/layout_rounded_bg_header_bar.xml deleted file mode 100644 index 3ab4bfac48..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_header_bar.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml b/Habitica/res/drawable/layout_rounded_bg_light_gray.xml deleted file mode 100644 index 051bbab112..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_light_gray.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_official_challenge.xml b/Habitica/res/drawable/layout_rounded_bg_official_challenge.xml deleted file mode 100644 index 95764e89e4..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_official_challenge.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_offset.xml b/Habitica/res/drawable/layout_rounded_bg_offset.xml deleted file mode 100644 index e2b9456560..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_offset.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_primary.xml b/Habitica/res/drawable/layout_rounded_bg_primary.xml deleted file mode 100644 index 81fa2727a3..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_primary.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_shopitem.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml index 0268627560..b7da773d0a 100644 --- a/Habitica/res/drawable/layout_rounded_bg_shopitem.xml +++ b/Habitica/res/drawable/layout_rounded_bg_shopitem.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml index fb31372340..22775b2a2f 100644 --- a/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml +++ b/Habitica/res/drawable/layout_rounded_bg_shopitem_price.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_task_form.xml b/Habitica/res/drawable/layout_rounded_bg_task_form.xml index a9bd8afc2a..68e8a515bd 100644 --- a/Habitica/res/drawable/layout_rounded_bg_task_form.xml +++ b/Habitica/res/drawable/layout_rounded_bg_task_form.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_teal.xml b/Habitica/res/drawable/layout_rounded_bg_teal.xml deleted file mode 100644 index d7f9772b33..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_teal.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_tinted.xml b/Habitica/res/drawable/layout_rounded_bg_tinted.xml new file mode 100644 index 0000000000..d65e9884cc --- /dev/null +++ b/Habitica/res/drawable/layout_rounded_bg_tinted.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_white.xml b/Habitica/res/drawable/layout_rounded_bg_white.xml deleted file mode 100644 index 9f6e1d1b00..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_white.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_window.xml b/Habitica/res/drawable/layout_rounded_bg_window.xml index f3645d99d3..9de2c19e03 100644 --- a/Habitica/res/drawable/layout_rounded_bg_window.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml index 8046a6e8e7..e8d53e2989 100644 --- a/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_blue_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml index d2983eda56..d4f4cb619c 100644 --- a/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_brand_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml index 2a67aca44c..ee1f0310d6 100644 --- a/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_red_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml index d896b0dc65..c114879b2a 100644 --- a/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_tint_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml index 984a3d92f1..e512ca5393 100644 --- a/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml +++ b/Habitica/res/drawable/layout_rounded_bg_window_yellow_border.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/layout_rounded_bg_yellow.xml b/Habitica/res/drawable/layout_rounded_bg_yellow.xml deleted file mode 100644 index 02060a7eb1..0000000000 --- a/Habitica/res/drawable/layout_rounded_bg_yellow.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/login_gradient.xml b/Habitica/res/drawable/login_gradient.xml index e5339aff3a..335bd85c4b 100644 --- a/Habitica/res/drawable/login_gradient.xml +++ b/Habitica/res/drawable/login_gradient.xml @@ -3,8 +3,8 @@ - \ No newline at end of file + diff --git a/Habitica/res/drawable/no_party_background_gradient.xml b/Habitica/res/drawable/no_party_background_gradient.xml index a72529e441..a3ca9db253 100644 --- a/Habitica/res/drawable/no_party_background_gradient.xml +++ b/Habitica/res/drawable/no_party_background_gradient.xml @@ -1,15 +1,10 @@ - - - - - \ No newline at end of file + diff --git a/Habitica/res/drawable/not_enough_gems_wave.xml b/Habitica/res/drawable/not_enough_gems_wave.xml new file mode 100644 index 0000000000..a16cfa1766 --- /dev/null +++ b/Habitica/res/drawable/not_enough_gems_wave.xml @@ -0,0 +1,10 @@ + + + diff --git a/Habitica/res/drawable/npc_gradient_banner.xml b/Habitica/res/drawable/npc_gradient_banner.xml new file mode 100644 index 0000000000..2e943c2d56 --- /dev/null +++ b/Habitica/res/drawable/npc_gradient_banner.xml @@ -0,0 +1,9 @@ + + + + diff --git a/Habitica/res/drawable/party_seeking.png b/Habitica/res/drawable/party_seeking.png new file mode 100644 index 0000000000..d640f78579 Binary files /dev/null and b/Habitica/res/drawable/party_seeking.png differ diff --git a/Habitica/res/drawable/pill_bg.xml b/Habitica/res/drawable/pill_bg.xml index 70382d6db3..1d2a6714e1 100644 --- a/Habitica/res/drawable/pill_bg.xml +++ b/Habitica/res/drawable/pill_bg.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_content.xml b/Habitica/res/drawable/pill_bg_content.xml index 34654a9f65..84a1dd62a4 100644 --- a/Habitica/res/drawable/pill_bg_content.xml +++ b/Habitica/res/drawable/pill_bg_content.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_green.xml b/Habitica/res/drawable/pill_bg_green.xml index ed85dcfaa1..6d0e913807 100644 --- a/Habitica/res/drawable/pill_bg_green.xml +++ b/Habitica/res/drawable/pill_bg_green.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/drawable/pill_bg_green_10.xml b/Habitica/res/drawable/pill_bg_green_10.xml new file mode 100644 index 0000000000..e7bf88b20f --- /dev/null +++ b/Habitica/res/drawable/pill_bg_green_10.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Habitica/res/drawable/pill_bg_purple_300.xml b/Habitica/res/drawable/pill_bg_purple_300.xml index 5e2df8a8e4..048095726b 100644 --- a/Habitica/res/drawable/pill_bg_purple_300.xml +++ b/Habitica/res/drawable/pill_bg_purple_300.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/drawable/pill_bg_radio_selected.xml b/Habitica/res/drawable/pill_bg_radio_selected.xml index 7160d31ed1..88587cc4e3 100644 --- a/Habitica/res/drawable/pill_bg_radio_selected.xml +++ b/Habitica/res/drawable/pill_bg_radio_selected.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_radio_unselected.xml b/Habitica/res/drawable/pill_bg_radio_unselected.xml index 3c7f7ed728..e09990c808 100644 --- a/Habitica/res/drawable/pill_bg_radio_unselected.xml +++ b/Habitica/res/drawable/pill_bg_radio_unselected.xml @@ -1,7 +1,5 @@ - - - - + + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_teal_100.xml b/Habitica/res/drawable/pill_bg_teal_100.xml new file mode 100644 index 0000000000..766abdf5d2 --- /dev/null +++ b/Habitica/res/drawable/pill_bg_teal_100.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_window.xml b/Habitica/res/drawable/pill_bg_window.xml index 70382d6db3..1d2a6714e1 100644 --- a/Habitica/res/drawable/pill_bg_window.xml +++ b/Habitica/res/drawable/pill_bg_window.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/pill_bg_yellow_100.xml b/Habitica/res/drawable/pill_bg_yellow_100.xml new file mode 100644 index 0000000000..36ff673768 --- /dev/null +++ b/Habitica/res/drawable/pill_bg_yellow_100.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Habitica/res/drawable/pill_bg_yellow_500.xml b/Habitica/res/drawable/pill_bg_yellow_500.xml new file mode 100644 index 0000000000..e528d884dd --- /dev/null +++ b/Habitica/res/drawable/pill_bg_yellow_500.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/promo_gradient.xml b/Habitica/res/drawable/promo_gradient.xml new file mode 100644 index 0000000000..1a4fb7a7ca --- /dev/null +++ b/Habitica/res/drawable/promo_gradient.xml @@ -0,0 +1,7 @@ + + + + diff --git a/Habitica/res/drawable/purchase_button_background.xml b/Habitica/res/drawable/purchase_button_background.xml index 0937d02597..b90a8c971a 100644 --- a/Habitica/res/drawable/purchase_button_background.xml +++ b/Habitica/res/drawable/purchase_button_background.xml @@ -8,7 +8,7 @@ android:color="@color/brand_700" > + android:radius="@dimen/rounded_button_radius"> @@ -19,27 +19,27 @@ android:color="@color/brand_500"> + android:radius="@dimen/rounded_button_radius"> + android:color="@color/gray_600"> + android:radius="@dimen/rounded_button_radius"> + android:color="@color/white"> + android:radius="@dimen/rounded_button_radius"> diff --git a/Habitica/res/drawable/purchase_dialog_spacing.xml b/Habitica/res/drawable/purchase_dialog_spacing.xml new file mode 100644 index 0000000000..1135937b0e --- /dev/null +++ b/Habitica/res/drawable/purchase_dialog_spacing.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/quest_collection_bg.xml b/Habitica/res/drawable/quest_collection_bg.xml index 8fc079ea9a..97817b1283 100644 --- a/Habitica/res/drawable/quest_collection_bg.xml +++ b/Habitica/res/drawable/quest_collection_bg.xml @@ -1,5 +1,5 @@ - - \ No newline at end of file + + diff --git a/Habitica/res/drawable/quest_difficulty_bg.xml b/Habitica/res/drawable/quest_difficulty_bg.xml index 7bcd3ecde0..7f170b3c23 100644 --- a/Habitica/res/drawable/quest_difficulty_bg.xml +++ b/Habitica/res/drawable/quest_difficulty_bg.xml @@ -1,7 +1,7 @@ - - + + - \ No newline at end of file + diff --git a/Habitica/res/drawable/radio_button_text_color.xml b/Habitica/res/drawable/radio_button_text_color.xml index 8c1cf7168e..0b7b3bd6b4 100644 --- a/Habitica/res/drawable/radio_button_text_color.xml +++ b/Habitica/res/drawable/radio_button_text_color.xml @@ -1,5 +1,6 @@ - + + \ No newline at end of file diff --git a/Habitica/res/drawable/rounded_border.xml b/Habitica/res/drawable/rounded_border.xml index d239815b81..1f3d1ff5e4 100644 --- a/Habitica/res/drawable/rounded_border.xml +++ b/Habitica/res/drawable/rounded_border.xml @@ -4,5 +4,5 @@ - + diff --git a/Habitica/res/drawable/rounded_border_content.xml b/Habitica/res/drawable/rounded_border_content.xml index c768d51cf1..9c06ba6d77 100644 --- a/Habitica/res/drawable/rounded_border_content.xml +++ b/Habitica/res/drawable/rounded_border_content.xml @@ -1,6 +1,6 @@ - + diff --git a/Habitica/res/drawable/search_background.xml b/Habitica/res/drawable/search_background.xml new file mode 100644 index 0000000000..e04dd2862b --- /dev/null +++ b/Habitica/res/drawable/search_background.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/seekbar_thumb.xml b/Habitica/res/drawable/seekbar_thumb.xml index 74a3d4b0a7..5218288c30 100644 --- a/Habitica/res/drawable/seekbar_thumb.xml +++ b/Habitica/res/drawable/seekbar_thumb.xml @@ -10,10 +10,10 @@ - + + android:color="?attr/colorContentBackgroundOffset" /> diff --git a/Habitica/res/drawable/separator_fancy_full.xml b/Habitica/res/drawable/separator_fancy_full.xml new file mode 100644 index 0000000000..4a3c54fa76 --- /dev/null +++ b/Habitica/res/drawable/separator_fancy_full.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/Habitica/res/drawable/shop_category_header_background.xml b/Habitica/res/drawable/shop_category_header_background.xml new file mode 100644 index 0000000000..67c142ebe9 --- /dev/null +++ b/Habitica/res/drawable/shop_category_header_background.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Habitica/res/drawable/shop_header_background.xml b/Habitica/res/drawable/shop_header_background.xml new file mode 100644 index 0000000000..c5aee6ded9 --- /dev/null +++ b/Habitica/res/drawable/shop_header_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_header_else_background.xml b/Habitica/res/drawable/shop_header_else_background.xml new file mode 100644 index 0000000000..cb61299d72 --- /dev/null +++ b/Habitica/res/drawable/shop_header_else_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_header_healer_background.xml b/Habitica/res/drawable/shop_header_healer_background.xml new file mode 100644 index 0000000000..1333ee4d21 --- /dev/null +++ b/Habitica/res/drawable/shop_header_healer_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_header_rogue_background.xml b/Habitica/res/drawable/shop_header_rogue_background.xml new file mode 100644 index 0000000000..85fa9fc15d --- /dev/null +++ b/Habitica/res/drawable/shop_header_rogue_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_header_time_background.xml b/Habitica/res/drawable/shop_header_time_background.xml new file mode 100644 index 0000000000..e1519e0276 --- /dev/null +++ b/Habitica/res/drawable/shop_header_time_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_header_warrior_background.xml b/Habitica/res/drawable/shop_header_warrior_background.xml new file mode 100644 index 0000000000..9ec917a508 --- /dev/null +++ b/Habitica/res/drawable/shop_header_warrior_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_header_wizard_background.xml b/Habitica/res/drawable/shop_header_wizard_background.xml new file mode 100644 index 0000000000..a6f29b1002 --- /dev/null +++ b/Habitica/res/drawable/shop_header_wizard_background.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/shop_limited.xml b/Habitica/res/drawable/shop_limited.xml new file mode 100644 index 0000000000..5ecffe1d06 --- /dev/null +++ b/Habitica/res/drawable/shop_limited.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/shop_locked.xml b/Habitica/res/drawable/shop_locked.xml new file mode 100644 index 0000000000..22c200ab08 --- /dev/null +++ b/Habitica/res/drawable/shop_locked.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/shop_locked_limited.xml b/Habitica/res/drawable/shop_locked_limited.xml new file mode 100644 index 0000000000..0cb35be309 --- /dev/null +++ b/Habitica/res/drawable/shop_locked_limited.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/snackbar_background_black.xml b/Habitica/res/drawable/snackbar_background_black.xml new file mode 100644 index 0000000000..6fa29e2994 --- /dev/null +++ b/Habitica/res/drawable/snackbar_background_black.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/snackbar_background_red.xml b/Habitica/res/drawable/snackbar_background_red.xml index c03d995f35..097eab78bf 100644 --- a/Habitica/res/drawable/snackbar_background_red.xml +++ b/Habitica/res/drawable/snackbar_background_red.xml @@ -1,6 +1,6 @@ - + - \ No newline at end of file + diff --git a/Habitica/res/drawable/sub_perk_bg.xml b/Habitica/res/drawable/sub_perk_bg.xml new file mode 100644 index 0000000000..a62e9ef6f5 --- /dev/null +++ b/Habitica/res/drawable/sub_perk_bg.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/subscribe_incentive_bg.xml b/Habitica/res/drawable/subscribe_incentive_bg.xml new file mode 100644 index 0000000000..7fc46c5f00 --- /dev/null +++ b/Habitica/res/drawable/subscribe_incentive_bg.xml @@ -0,0 +1,4 @@ + + + + diff --git a/Habitica/res/drawable/subscribe_incentive_bg_topround.xml b/Habitica/res/drawable/subscribe_incentive_bg_topround.xml new file mode 100644 index 0000000000..281d577109 --- /dev/null +++ b/Habitica/res/drawable/subscribe_incentive_bg_topround.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/subscriber_benefit_button_bg.xml b/Habitica/res/drawable/subscriber_benefit_button_bg.xml new file mode 100644 index 0000000000..76e4c55b5a --- /dev/null +++ b/Habitica/res/drawable/subscriber_benefit_button_bg.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/subscriber_benefit_snackbar_bg.xml b/Habitica/res/drawable/subscriber_benefit_snackbar_bg.xml new file mode 100644 index 0000000000..2c2745de8e --- /dev/null +++ b/Habitica/res/drawable/subscriber_benefit_snackbar_bg.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/subscription_banner_image_left.xml b/Habitica/res/drawable/subscription_banner_image_left.xml new file mode 100644 index 0000000000..0261df640d --- /dev/null +++ b/Habitica/res/drawable/subscription_banner_image_left.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/subscription_banner_image_right.xml b/Habitica/res/drawable/subscription_banner_image_right.xml new file mode 100644 index 0000000000..d13de7c95a --- /dev/null +++ b/Habitica/res/drawable/subscription_banner_image_right.xml @@ -0,0 +1,264 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Habitica/res/drawable/subscription_box_bg.xml b/Habitica/res/drawable/subscription_box_bg.xml index bc7b823024..02260c724d 100644 --- a/Habitica/res/drawable/subscription_box_bg.xml +++ b/Habitica/res/drawable/subscription_box_bg.xml @@ -1,6 +1,6 @@ - - + + - \ No newline at end of file + diff --git a/Habitica/res/drawable/subscription_box_bg_selected.xml b/Habitica/res/drawable/subscription_box_bg_selected.xml index 3051368c31..2afd67ff62 100644 --- a/Habitica/res/drawable/subscription_box_bg_selected.xml +++ b/Habitica/res/drawable/subscription_box_bg_selected.xml @@ -1,7 +1,6 @@ - + - - \ No newline at end of file + diff --git a/Habitica/res/drawable/subscription_type_box_bg.xml b/Habitica/res/drawable/subscription_type_box_bg.xml new file mode 100644 index 0000000000..514a48d10f --- /dev/null +++ b/Habitica/res/drawable/subscription_type_box_bg.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/Habitica/res/drawable/success_border.xml b/Habitica/res/drawable/success_border.xml new file mode 100644 index 0000000000..0d26a21e10 --- /dev/null +++ b/Habitica/res/drawable/success_border.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/Habitica/res/drawable/system_chat_background.xml b/Habitica/res/drawable/system_chat_background.xml index ca5a8cd526..5cd3969cb3 100644 --- a/Habitica/res/drawable/system_chat_background.xml +++ b/Habitica/res/drawable/system_chat_background.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/Habitica/res/drawable/task_form_control_bg.xml b/Habitica/res/drawable/task_form_control_bg.xml index 4e8a5ba4fd..0ea4196cbc 100644 --- a/Habitica/res/drawable/task_form_control_bg.xml +++ b/Habitica/res/drawable/task_form_control_bg.xml @@ -2,14 +2,20 @@ - + - + - + + + + + + + diff --git a/Habitica/res/drawable/teams_title_bg.xml b/Habitica/res/drawable/teams_title_bg.xml new file mode 100644 index 0000000000..40d3a2a579 --- /dev/null +++ b/Habitica/res/drawable/teams_title_bg.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Habitica/res/drawable/vertical_divider.xml b/Habitica/res/drawable/vertical_divider.xml deleted file mode 100644 index 8f0c41fc4f..0000000000 --- a/Habitica/res/drawable/vertical_divider.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Habitica/res/drawable/widget_background.xml b/Habitica/res/drawable/widget_background.xml index df3a989a9e..95b667dc4c 100644 --- a/Habitica/res/drawable/widget_background.xml +++ b/Habitica/res/drawable/widget_background.xml @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/Habitica/res/drawable/widget_dailies.webp b/Habitica/res/drawable/widget_dailies.webp index d16dd4e150..771e67e5c1 100644 Binary files a/Habitica/res/drawable/widget_dailies.webp and b/Habitica/res/drawable/widget_dailies.webp differ diff --git a/Habitica/res/drawable/widget_habits.webp b/Habitica/res/drawable/widget_habits.webp index 37f769049e..c328a1ee68 100644 Binary files a/Habitica/res/drawable/widget_habits.webp and b/Habitica/res/drawable/widget_habits.webp differ diff --git a/Habitica/res/drawable/widget_stats.webp b/Habitica/res/drawable/widget_stats.webp index 2349033dae..5871743fb9 100644 Binary files a/Habitica/res/drawable/widget_stats.webp and b/Habitica/res/drawable/widget_stats.webp differ diff --git a/Habitica/res/drawable/widget_todos.webp b/Habitica/res/drawable/widget_todos.webp index 822620fef2..6070eb542e 100644 Binary files a/Habitica/res/drawable/widget_todos.webp and b/Habitica/res/drawable/widget_todos.webp differ diff --git a/Habitica/res/layout-land/row_shopitem.xml b/Habitica/res/layout-land/row_shopitem.xml new file mode 100644 index 0000000000..9ecbaa8a42 --- /dev/null +++ b/Habitica/res/layout-land/row_shopitem.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + diff --git a/Habitica/res/layout/achievement_grid_item.xml b/Habitica/res/layout/achievement_grid_item.xml index ca8f8b0764..f888c452cf 100644 --- a/Habitica/res/layout/achievement_grid_item.xml +++ b/Habitica/res/layout/achievement_grid_item.xml @@ -22,7 +22,7 @@ - - \ No newline at end of file diff --git a/Habitica/res/layout/activity_adventure_guide.xml b/Habitica/res/layout/activity_adventure_guide.xml index c533f56342..c2fd7d5dfc 100644 --- a/Habitica/res/layout/activity_adventure_guide.xml +++ b/Habitica/res/layout/activity_adventure_guide.xml @@ -1,13 +1,13 @@ + android:orientation="vertical"> @@ -22,7 +22,8 @@ - + android:textColor="@color/text_brand_neon" /> + android:progressTint="@color/brand_400" /> - - \ No newline at end of file + + diff --git a/Habitica/res/layout/activity_armoire.xml b/Habitica/res/layout/activity_armoire.xml new file mode 100644 index 0000000000..5913cbc89c --- /dev/null +++ b/Habitica/res/layout/activity_armoire.xml @@ -0,0 +1,299 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml index 7c70142de7..c414bcfbaf 100644 --- a/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml +++ b/Habitica/res/layout/dialog_habitica_primary_destructive_button.xml @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/Habitica/res/layout/dialog_hatch_pet_button.xml b/Habitica/res/layout/dialog_hatch_pet_button.xml index 3511c41c24..534f6d62bb 100644 --- a/Habitica/res/layout/dialog_hatch_pet_button.xml +++ b/Habitica/res/layout/dialog_hatch_pet_button.xml @@ -1,8 +1,13 @@ + android:minWidth="220dp" + android:layout_height="60dp" + android:background="@drawable/button_background_primary" + android:gravity="center" + android:paddingHorizontal="6dp"> + android:layout_height="wrap_content" + android:textColor="@color/white" + app:fontFamily="sans-serif-medium"/> \ No newline at end of file diff --git a/Habitica/res/layout/dialog_insufficient_currency.xml b/Habitica/res/layout/dialog_insufficient_currency.xml index 048b23d474..c75e7da1b3 100644 --- a/Habitica/res/layout/dialog_insufficient_currency.xml +++ b/Habitica/res/layout/dialog_insufficient_currency.xml @@ -9,10 +9,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:scaleType="center" /> + android:scaleType="center" + android:importantForAccessibility="no" /> - \ No newline at end of file + diff --git a/Habitica/res/layout/dialog_insufficient_gems.xml b/Habitica/res/layout/dialog_insufficient_gems.xml index 5d9029955f..a9c2df31c9 100644 --- a/Habitica/res/layout/dialog_insufficient_gems.xml +++ b/Habitica/res/layout/dialog_insufficient_gems.xml @@ -5,43 +5,101 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical"> - - + android:background="@color/brand_400" + android:gravity="center" + android:orientation="vertical"> + + - -