diff --git a/.idea/misc.xml b/.idea/misc.xml index 76d2651d2..6f14772c8 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - @@ -19,93 +16,4 @@ - - - - - - - - - - - - - - - - - - - - - - - localhost - 5050 - - - - + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index ddab5125e..479c73955 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,9 +2,8 @@ - + - - + \ No newline at end of file diff --git a/HabitAndroRPG/AndroidManifest.xml b/Habitica/AndroidManifest.xml similarity index 97% rename from HabitAndroRPG/AndroidManifest.xml rename to Habitica/AndroidManifest.xml index e10ff5243..722cadb27 100644 --- a/HabitAndroRPG/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -1,63 +1,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/HabitAndroRPG-HabitAndroRPG.iml b/Habitica/HabitAndroRPG-HabitAndroRPG.iml similarity index 98% rename from HabitAndroRPG/HabitAndroRPG-HabitAndroRPG.iml rename to Habitica/HabitAndroRPG-HabitAndroRPG.iml index 0a0592692..f3510a619 100644 --- a/HabitAndroRPG/HabitAndroRPG-HabitAndroRPG.iml +++ b/Habitica/HabitAndroRPG-HabitAndroRPG.iml @@ -1,76 +1,76 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HabitAndroRPG/HabitAndroRPG.iml b/Habitica/Habitica.iml similarity index 93% rename from HabitAndroRPG/HabitAndroRPG.iml rename to Habitica/Habitica.iml index a4350883a..fe27c4a56 100644 --- a/HabitAndroRPG/HabitAndroRPG.iml +++ b/Habitica/Habitica.iml @@ -1,9 +1,9 @@ - + - @@ -12,8 +12,9 @@ - - + \ No newline at end of file diff --git a/HabitAndroRPG/build.gradle b/Habitica/build.gradle similarity index 96% rename from HabitAndroRPG/build.gradle rename to Habitica/build.gradle index c5db9e62a..a239906ba 100644 --- a/HabitAndroRPG/build.gradle +++ b/Habitica/build.gradle @@ -1,90 +1,90 @@ -buildscript { - repositories { - mavenLocal() - mavenCentral() - maven { url 'https://maven.fabric.io/public' } - } - dependencies { - classpath 'com.android.tools.build:gradle:1.0.1' - classpath 'io.fabric.tools:gradle:1.+' - } -} -apply plugin: 'com.android.application' -apply plugin: 'io.fabric' -apply plugin: 'aar-link-sources' - -repositories { - mavenLocal() - mavenCentral() - maven { - url "https://oss.sonatype.org/content/repositories/snapshots" - } - maven { url 'https://maven.fabric.io/public' } -} - -dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.magicmicky.habitrpgwrapper:lib:1.7' - aarLinkSources 'com.magicmicky.habitrpgwrapper:lib:1.7:sources@jar' - - compile 'com.android.support:appcompat-v7:18.0.+' - compile('com.crashlytics.sdk.android:crashlytics:2.2.4@aar') { - transitive = true; - } -} - -android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" - lintOptions { - abortOnError false - } - signingConfigs { - release - } - - buildTypes { - debug { - applicationIdSuffix ".debug" - debuggable true - } - release { - signingConfig signingConfigs.release - debuggable false - } - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - release.setRoot('build-types/release') - instrumentTest.setRoot('tests') - } -} - -def 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 -} +buildscript { + repositories { + mavenLocal() + mavenCentral() + maven { url 'https://maven.fabric.io/public' } + } + dependencies { + classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'io.fabric.tools:gradle:1.+' + } +} +apply plugin: 'com.android.application' +apply plugin: 'io.fabric' +apply plugin: 'aar-link-sources' + +repositories { + mavenLocal() + mavenCentral() + maven { + url "https://oss.sonatype.org/content/repositories/snapshots" + } + maven { url 'https://maven.fabric.io/public' } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.magicmicky.habitrpgwrapper:lib:1.7' + aarLinkSources 'com.magicmicky.habitrpgwrapper:lib:1.7:sources@jar' + + compile 'com.android.support:appcompat-v7:18.0.+' + compile('com.crashlytics.sdk.android:crashlytics:2.2.4@aar') { + transitive = true; + } +} + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" + lintOptions { + abortOnError false + } + signingConfigs { + release + } + + buildTypes { + debug { + applicationIdSuffix ".debug" + debuggable true + } + release { + signingConfig signingConfigs.release + debuggable false + } + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + release.setRoot('build-types/release') + instrumentTest.setRoot('tests') + } +} + +def 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 +} diff --git a/HabitAndroRPG/gradle/wrapper/gradle-wrapper.jar b/Habitica/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from HabitAndroRPG/gradle/wrapper/gradle-wrapper.jar rename to Habitica/gradle/wrapper/gradle-wrapper.jar diff --git a/HabitAndroRPG/gradle/wrapper/gradle-wrapper.properties b/Habitica/gradle/wrapper/gradle-wrapper.properties similarity index 97% rename from HabitAndroRPG/gradle/wrapper/gradle-wrapper.properties rename to Habitica/gradle/wrapper/gradle-wrapper.properties index 02b0fa4a0..d48578ca5 100644 --- a/HabitAndroRPG/gradle/wrapper/gradle-wrapper.properties +++ b/Habitica/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip +#Wed Apr 10 15:27:10 PDT 2013 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-bin.zip diff --git a/HabitAndroRPG/ic_launcher-web.png b/Habitica/ic_launcher-web.png similarity index 100% rename from HabitAndroRPG/ic_launcher-web.png rename to Habitica/ic_launcher-web.png diff --git a/HabitAndroRPG/libs/crouton-1.8.1.jar b/Habitica/libs/crouton-1.8.1.jar similarity index 100% rename from HabitAndroRPG/libs/crouton-1.8.1.jar rename to Habitica/libs/crouton-1.8.1.jar diff --git a/HabitAndroRPG/lint.xml b/Habitica/lint.xml similarity index 96% rename from HabitAndroRPG/lint.xml rename to Habitica/lint.xml index 694ca087b..ee0eead5b 100644 --- a/HabitAndroRPG/lint.xml +++ b/Habitica/lint.xml @@ -1,3 +1,3 @@ - - + + \ No newline at end of file diff --git a/HabitAndroRPG/proguard-project.txt b/Habitica/proguard-project.txt similarity index 97% rename from HabitAndroRPG/proguard-project.txt rename to Habitica/proguard-project.txt index b60ae7ea0..f2fe1559a 100644 --- a/HabitAndroRPG/proguard-project.txt +++ b/Habitica/proguard-project.txt @@ -1,20 +1,20 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} +# To enable ProGuard in your project, edit project.properties +# to define the proguard.config property as described in that file. +# +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in ${sdk.dir}/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the ProGuard +# include property in project.properties. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/HabitAndroRPG/project.properties b/Habitica/project.properties similarity index 97% rename from HabitAndroRPG/project.properties rename to Habitica/project.properties index b1195e4c5..4e8c167ac 100644 --- a/HabitAndroRPG/project.properties +++ b/Habitica/project.properties @@ -1,15 +1,15 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-17 - +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-17 + diff --git a/HabitAndroRPG/res/anim/appear.xml b/Habitica/res/anim/appear.xml similarity index 96% rename from HabitAndroRPG/res/anim/appear.xml rename to Habitica/res/anim/appear.xml index 32205fa5e..212dde6e7 100644 --- a/HabitAndroRPG/res/anim/appear.xml +++ b/Habitica/res/anim/appear.xml @@ -1,17 +1,17 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/anim/disappear.xml b/Habitica/res/anim/disappear.xml similarity index 95% rename from HabitAndroRPG/res/anim/disappear.xml rename to Habitica/res/anim/disappear.xml index 9ab39df4c..81ca65b6d 100644 --- a/HabitAndroRPG/res/anim/disappear.xml +++ b/Habitica/res/anim/disappear.xml @@ -1,18 +1,18 @@ - - - - - - - + + + + + + + diff --git a/HabitAndroRPG/res/drawable-hdpi/Thumbs.db b/Habitica/res/drawable-hdpi/Thumbs.db similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/Thumbs.db rename to Habitica/res/drawable-hdpi/Thumbs.db diff --git a/HabitAndroRPG/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/Habitica/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to Habitica/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_off_disabled_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_off_disabled_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_off_disabled_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_off_disabled_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_off_focused_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_off_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_off_focused_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_off_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_off_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_off_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_off_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_off_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_off_pressed_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_off_pressed_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_off_pressed_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_off_pressed_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_on_disabled_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_on_disabled_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_on_disabled_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_on_disabled_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_on_focused_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_on_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_on_focused_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_on_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_on_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_on_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_on_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_on_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/btn_check_on_pressed_holo_light.png b/Habitica/res/drawable-hdpi/btn_check_on_pressed_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/btn_check_on_pressed_holo_light.png rename to Habitica/res/drawable-hdpi/btn_check_on_pressed_holo_light.png diff --git a/HabitAndroRPG/res/drawable-hdpi/dialog_full_holo_light.9.png b/Habitica/res/drawable-hdpi/dialog_full_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/dialog_full_holo_light.9.png rename to Habitica/res/drawable-hdpi/dialog_full_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/divider_horizontal_bright.9.png b/Habitica/res/drawable-hdpi/divider_horizontal_bright.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/divider_horizontal_bright.9.png rename to Habitica/res/drawable-hdpi/divider_horizontal_bright.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/divider_vertical_bright.9.png b/Habitica/res/drawable-hdpi/divider_vertical_bright.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/divider_vertical_bright.9.png rename to Habitica/res/drawable-hdpi/divider_vertical_bright.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/drawer_shadow.9.png b/Habitica/res/drawable-hdpi/drawer_shadow.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/drawer_shadow.9.png rename to Habitica/res/drawable-hdpi/drawer_shadow.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_action_barcode.png b/Habitica/res/drawable-hdpi/ic_action_barcode.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_action_barcode.png rename to Habitica/res/drawable-hdpi/ic_action_barcode.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_action_barcode_dark.png b/Habitica/res/drawable-hdpi/ic_action_barcode_dark.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_action_barcode_dark.png rename to Habitica/res/drawable-hdpi/ic_action_barcode_dark.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_action_computer.png b/Habitica/res/drawable-hdpi/ic_action_computer.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_action_computer.png rename to Habitica/res/drawable-hdpi/ic_action_computer.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_action_twitter.png b/Habitica/res/drawable-hdpi/ic_action_twitter.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_action_twitter.png rename to Habitica/res/drawable-hdpi/ic_action_twitter.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_drawer.png b/Habitica/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_drawer.png rename to Habitica/res/drawable-hdpi/ic_drawer.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_launcher.png b/Habitica/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_launcher.png rename to Habitica/res/drawable-hdpi/ic_launcher.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_menu_delete.png b/Habitica/res/drawable-hdpi/ic_menu_delete.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_menu_delete.png rename to Habitica/res/drawable-hdpi/ic_menu_delete.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_menu_edit.png b/Habitica/res/drawable-hdpi/ic_menu_edit.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_menu_edit.png rename to Habitica/res/drawable-hdpi/ic_menu_edit.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_menu_info.png b/Habitica/res/drawable-hdpi/ic_menu_info.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_menu_info.png rename to Habitica/res/drawable-hdpi/ic_menu_info.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_menu_refresh.png b/Habitica/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_menu_refresh.png rename to Habitica/res/drawable-hdpi/ic_menu_refresh.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_menu_send.png b/Habitica/res/drawable-hdpi/ic_menu_send.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_menu_send.png rename to Habitica/res/drawable-hdpi/ic_menu_send.png diff --git a/HabitAndroRPG/res/drawable-hdpi/ic_navigation_cancel.png b/Habitica/res/drawable-hdpi/ic_navigation_cancel.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/ic_navigation_cancel.png rename to Habitica/res/drawable-hdpi/ic_navigation_cancel.png diff --git a/HabitAndroRPG/res/drawable-hdpi/list_focused_holo.9.png b/Habitica/res/drawable-hdpi/list_focused_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/list_focused_holo.9.png rename to Habitica/res/drawable-hdpi/list_focused_holo.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/list_longpressed_holo.9.png b/Habitica/res/drawable-hdpi/list_longpressed_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/list_longpressed_holo.9.png rename to Habitica/res/drawable-hdpi/list_longpressed_holo.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/list_pressed_holo_light.9.png b/Habitica/res/drawable-hdpi/list_pressed_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/list_pressed_holo_light.9.png rename to Habitica/res/drawable-hdpi/list_pressed_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/list_selector_disabled_holo_light.9.png b/Habitica/res/drawable-hdpi/list_selector_disabled_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/list_selector_disabled_holo_light.9.png rename to Habitica/res/drawable-hdpi/list_selector_disabled_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/toggle_underline_activated.9.png b/Habitica/res/drawable-hdpi/toggle_underline_activated.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/toggle_underline_activated.9.png rename to Habitica/res/drawable-hdpi/toggle_underline_activated.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/toggle_underline_normal.9.png b/Habitica/res/drawable-hdpi/toggle_underline_normal.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/toggle_underline_normal.9.png rename to Habitica/res/drawable-hdpi/toggle_underline_normal.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_bad.9.png b/Habitica/res/drawable-hdpi/triangle_bad.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_bad.9.png rename to Habitica/res/drawable-hdpi/triangle_bad.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_best.9.png b/Habitica/res/drawable-hdpi/triangle_best.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_best.9.png rename to Habitica/res/drawable-hdpi/triangle_best.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_better.9.png b/Habitica/res/drawable-hdpi/triangle_better.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_better.9.png rename to Habitica/res/drawable-hdpi/triangle_better.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_completed.9.png b/Habitica/res/drawable-hdpi/triangle_completed.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_completed.9.png rename to Habitica/res/drawable-hdpi/triangle_completed.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_good.9.png b/Habitica/res/drawable-hdpi/triangle_good.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_good.9.png rename to Habitica/res/drawable-hdpi/triangle_good.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_neutral.9.png b/Habitica/res/drawable-hdpi/triangle_neutral.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_neutral.9.png rename to Habitica/res/drawable-hdpi/triangle_neutral.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_worse.9.png b/Habitica/res/drawable-hdpi/triangle_worse.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_worse.9.png rename to Habitica/res/drawable-hdpi/triangle_worse.9.png diff --git a/HabitAndroRPG/res/drawable-hdpi/triangle_worst.9.png b/Habitica/res/drawable-hdpi/triangle_worst.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-hdpi/triangle_worst.9.png rename to Habitica/res/drawable-hdpi/triangle_worst.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/Thumbs.db b/Habitica/res/drawable-ldpi/Thumbs.db similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/Thumbs.db rename to Habitica/res/drawable-ldpi/Thumbs.db diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_bad.9.png b/Habitica/res/drawable-ldpi/triangle_bad.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_bad.9.png rename to Habitica/res/drawable-ldpi/triangle_bad.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_best.9.png b/Habitica/res/drawable-ldpi/triangle_best.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_best.9.png rename to Habitica/res/drawable-ldpi/triangle_best.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_better.9.png b/Habitica/res/drawable-ldpi/triangle_better.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_better.9.png rename to Habitica/res/drawable-ldpi/triangle_better.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_completed.9.png b/Habitica/res/drawable-ldpi/triangle_completed.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_completed.9.png rename to Habitica/res/drawable-ldpi/triangle_completed.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_good.9.png b/Habitica/res/drawable-ldpi/triangle_good.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_good.9.png rename to Habitica/res/drawable-ldpi/triangle_good.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_neutral.9.png b/Habitica/res/drawable-ldpi/triangle_neutral.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_neutral.9.png rename to Habitica/res/drawable-ldpi/triangle_neutral.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_worse.9.png b/Habitica/res/drawable-ldpi/triangle_worse.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_worse.9.png rename to Habitica/res/drawable-ldpi/triangle_worse.9.png diff --git a/HabitAndroRPG/res/drawable-ldpi/triangle_worst.9.png b/Habitica/res/drawable-ldpi/triangle_worst.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-ldpi/triangle_worst.9.png rename to Habitica/res/drawable-ldpi/triangle_worst.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/Thumbs.db b/Habitica/res/drawable-mdpi/Thumbs.db similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/Thumbs.db rename to Habitica/res/drawable-mdpi/Thumbs.db diff --git a/HabitAndroRPG/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/Habitica/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to Habitica/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_off_disabled_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_off_disabled_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_off_disabled_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_off_disabled_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_off_focused_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_off_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_off_focused_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_off_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_off_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_off_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_off_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_off_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_off_pressed_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_off_pressed_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_off_pressed_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_off_pressed_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_on_disabled_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_on_disabled_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_on_disabled_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_on_disabled_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_on_focused_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_on_focused_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_on_focused_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_on_focused_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_on_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_on_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_on_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_on_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/btn_check_on_pressed_holo_light.png b/Habitica/res/drawable-mdpi/btn_check_on_pressed_holo_light.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/btn_check_on_pressed_holo_light.png rename to Habitica/res/drawable-mdpi/btn_check_on_pressed_holo_light.png diff --git a/HabitAndroRPG/res/drawable-mdpi/dialog_full_holo_light.9.png b/Habitica/res/drawable-mdpi/dialog_full_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/dialog_full_holo_light.9.png rename to Habitica/res/drawable-mdpi/dialog_full_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/divider_horizontal_bright.9.png b/Habitica/res/drawable-mdpi/divider_horizontal_bright.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/divider_horizontal_bright.9.png rename to Habitica/res/drawable-mdpi/divider_horizontal_bright.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/divider_vertical_bright.9.png b/Habitica/res/drawable-mdpi/divider_vertical_bright.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/divider_vertical_bright.9.png rename to Habitica/res/drawable-mdpi/divider_vertical_bright.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/drawer_shadow.9.png b/Habitica/res/drawable-mdpi/drawer_shadow.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/drawer_shadow.9.png rename to Habitica/res/drawable-mdpi/drawer_shadow.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_action_barcode.png b/Habitica/res/drawable-mdpi/ic_action_barcode.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_action_barcode.png rename to Habitica/res/drawable-mdpi/ic_action_barcode.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_action_barcode_dark.png b/Habitica/res/drawable-mdpi/ic_action_barcode_dark.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_action_barcode_dark.png rename to Habitica/res/drawable-mdpi/ic_action_barcode_dark.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_action_computer.png b/Habitica/res/drawable-mdpi/ic_action_computer.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_action_computer.png rename to Habitica/res/drawable-mdpi/ic_action_computer.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_action_twitter.png b/Habitica/res/drawable-mdpi/ic_action_twitter.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_action_twitter.png rename to Habitica/res/drawable-mdpi/ic_action_twitter.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_drawer.png b/Habitica/res/drawable-mdpi/ic_drawer.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_drawer.png rename to Habitica/res/drawable-mdpi/ic_drawer.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_launcher.png b/Habitica/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_launcher.png rename to Habitica/res/drawable-mdpi/ic_launcher.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_menu_delete.png b/Habitica/res/drawable-mdpi/ic_menu_delete.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_menu_delete.png rename to Habitica/res/drawable-mdpi/ic_menu_delete.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_menu_edit.png b/Habitica/res/drawable-mdpi/ic_menu_edit.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_menu_edit.png rename to Habitica/res/drawable-mdpi/ic_menu_edit.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_menu_info.png b/Habitica/res/drawable-mdpi/ic_menu_info.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_menu_info.png rename to Habitica/res/drawable-mdpi/ic_menu_info.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_menu_refresh.png b/Habitica/res/drawable-mdpi/ic_menu_refresh.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_menu_refresh.png rename to Habitica/res/drawable-mdpi/ic_menu_refresh.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_menu_send.png b/Habitica/res/drawable-mdpi/ic_menu_send.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_menu_send.png rename to Habitica/res/drawable-mdpi/ic_menu_send.png diff --git a/HabitAndroRPG/res/drawable-mdpi/ic_navigation_cancel.png b/Habitica/res/drawable-mdpi/ic_navigation_cancel.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/ic_navigation_cancel.png rename to Habitica/res/drawable-mdpi/ic_navigation_cancel.png diff --git a/HabitAndroRPG/res/drawable-mdpi/list_focused_holo.9.png b/Habitica/res/drawable-mdpi/list_focused_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/list_focused_holo.9.png rename to Habitica/res/drawable-mdpi/list_focused_holo.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/list_longpressed_holo.9.png b/Habitica/res/drawable-mdpi/list_longpressed_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/list_longpressed_holo.9.png rename to Habitica/res/drawable-mdpi/list_longpressed_holo.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/list_pressed_holo_light.9.png b/Habitica/res/drawable-mdpi/list_pressed_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/list_pressed_holo_light.9.png rename to Habitica/res/drawable-mdpi/list_pressed_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/list_selector_disabled_holo_light.9.png b/Habitica/res/drawable-mdpi/list_selector_disabled_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/list_selector_disabled_holo_light.9.png rename to Habitica/res/drawable-mdpi/list_selector_disabled_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/toggle_underline_activated.9.png b/Habitica/res/drawable-mdpi/toggle_underline_activated.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/toggle_underline_activated.9.png rename to Habitica/res/drawable-mdpi/toggle_underline_activated.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/toggle_underline_normal.9.png b/Habitica/res/drawable-mdpi/toggle_underline_normal.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/toggle_underline_normal.9.png rename to Habitica/res/drawable-mdpi/toggle_underline_normal.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_bad.9.png b/Habitica/res/drawable-mdpi/triangle_bad.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_bad.9.png rename to Habitica/res/drawable-mdpi/triangle_bad.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_best.9.png b/Habitica/res/drawable-mdpi/triangle_best.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_best.9.png rename to Habitica/res/drawable-mdpi/triangle_best.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_better.9.png b/Habitica/res/drawable-mdpi/triangle_better.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_better.9.png rename to Habitica/res/drawable-mdpi/triangle_better.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_completed.9.png b/Habitica/res/drawable-mdpi/triangle_completed.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_completed.9.png rename to Habitica/res/drawable-mdpi/triangle_completed.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_good.9.png b/Habitica/res/drawable-mdpi/triangle_good.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_good.9.png rename to Habitica/res/drawable-mdpi/triangle_good.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_neutral.9.png b/Habitica/res/drawable-mdpi/triangle_neutral.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_neutral.9.png rename to Habitica/res/drawable-mdpi/triangle_neutral.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_worse.9.png b/Habitica/res/drawable-mdpi/triangle_worse.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_worse.9.png rename to Habitica/res/drawable-mdpi/triangle_worse.9.png diff --git a/HabitAndroRPG/res/drawable-mdpi/triangle_worst.9.png b/Habitica/res/drawable-mdpi/triangle_worst.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-mdpi/triangle_worst.9.png rename to Habitica/res/drawable-mdpi/triangle_worst.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/Thumbs.db b/Habitica/res/drawable-xhdpi/Thumbs.db similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/Thumbs.db rename to Habitica/res/drawable-xhdpi/Thumbs.db diff --git a/HabitAndroRPG/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/Habitica/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to Habitica/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/dialog_full_holo_light.9.png b/Habitica/res/drawable-xhdpi/dialog_full_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/dialog_full_holo_light.9.png rename to Habitica/res/drawable-xhdpi/dialog_full_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/divider_horizontal_bright.9.png b/Habitica/res/drawable-xhdpi/divider_horizontal_bright.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/divider_horizontal_bright.9.png rename to Habitica/res/drawable-xhdpi/divider_horizontal_bright.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/divider_vertical_bright.9.png b/Habitica/res/drawable-xhdpi/divider_vertical_bright.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/divider_vertical_bright.9.png rename to Habitica/res/drawable-xhdpi/divider_vertical_bright.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/drawer_shadow.9.png b/Habitica/res/drawable-xhdpi/drawer_shadow.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/drawer_shadow.9.png rename to Habitica/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_action_barcode.png b/Habitica/res/drawable-xhdpi/ic_action_barcode.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_action_barcode.png rename to Habitica/res/drawable-xhdpi/ic_action_barcode.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_action_barcode_dark.png b/Habitica/res/drawable-xhdpi/ic_action_barcode_dark.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_action_barcode_dark.png rename to Habitica/res/drawable-xhdpi/ic_action_barcode_dark.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_action_computer.png b/Habitica/res/drawable-xhdpi/ic_action_computer.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_action_computer.png rename to Habitica/res/drawable-xhdpi/ic_action_computer.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_action_twitter.png b/Habitica/res/drawable-xhdpi/ic_action_twitter.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_action_twitter.png rename to Habitica/res/drawable-xhdpi/ic_action_twitter.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_drawer.png b/Habitica/res/drawable-xhdpi/ic_drawer.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_drawer.png rename to Habitica/res/drawable-xhdpi/ic_drawer.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_launcher.png b/Habitica/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_launcher.png rename to Habitica/res/drawable-xhdpi/ic_launcher.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_menu_delete.png b/Habitica/res/drawable-xhdpi/ic_menu_delete.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_menu_delete.png rename to Habitica/res/drawable-xhdpi/ic_menu_delete.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_menu_edit.png b/Habitica/res/drawable-xhdpi/ic_menu_edit.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_menu_edit.png rename to Habitica/res/drawable-xhdpi/ic_menu_edit.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_menu_info.png b/Habitica/res/drawable-xhdpi/ic_menu_info.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_menu_info.png rename to Habitica/res/drawable-xhdpi/ic_menu_info.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_menu_refresh.png b/Habitica/res/drawable-xhdpi/ic_menu_refresh.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_menu_refresh.png rename to Habitica/res/drawable-xhdpi/ic_menu_refresh.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_menu_send.png b/Habitica/res/drawable-xhdpi/ic_menu_send.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_menu_send.png rename to Habitica/res/drawable-xhdpi/ic_menu_send.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/ic_navigation_cancel.png b/Habitica/res/drawable-xhdpi/ic_navigation_cancel.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/ic_navigation_cancel.png rename to Habitica/res/drawable-xhdpi/ic_navigation_cancel.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/list_focused_holo.9.png b/Habitica/res/drawable-xhdpi/list_focused_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/list_focused_holo.9.png rename to Habitica/res/drawable-xhdpi/list_focused_holo.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/list_longpressed_holo.9.png b/Habitica/res/drawable-xhdpi/list_longpressed_holo.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/list_longpressed_holo.9.png rename to Habitica/res/drawable-xhdpi/list_longpressed_holo.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/list_pressed_holo_light.9.png b/Habitica/res/drawable-xhdpi/list_pressed_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/list_pressed_holo_light.9.png rename to Habitica/res/drawable-xhdpi/list_pressed_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/list_selector_disabled_holo_light.9.png b/Habitica/res/drawable-xhdpi/list_selector_disabled_holo_light.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/list_selector_disabled_holo_light.9.png rename to Habitica/res/drawable-xhdpi/list_selector_disabled_holo_light.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/toggle_underline_activated.9.png b/Habitica/res/drawable-xhdpi/toggle_underline_activated.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/toggle_underline_activated.9.png rename to Habitica/res/drawable-xhdpi/toggle_underline_activated.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/toggle_underline_normal.9.png b/Habitica/res/drawable-xhdpi/toggle_underline_normal.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/toggle_underline_normal.9.png rename to Habitica/res/drawable-xhdpi/toggle_underline_normal.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_bad.9.png b/Habitica/res/drawable-xhdpi/triangle_bad.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_bad.9.png rename to Habitica/res/drawable-xhdpi/triangle_bad.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_best.9.png b/Habitica/res/drawable-xhdpi/triangle_best.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_best.9.png rename to Habitica/res/drawable-xhdpi/triangle_best.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_better.9.png b/Habitica/res/drawable-xhdpi/triangle_better.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_better.9.png rename to Habitica/res/drawable-xhdpi/triangle_better.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_completed.9.png b/Habitica/res/drawable-xhdpi/triangle_completed.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_completed.9.png rename to Habitica/res/drawable-xhdpi/triangle_completed.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_good.9.png b/Habitica/res/drawable-xhdpi/triangle_good.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_good.9.png rename to Habitica/res/drawable-xhdpi/triangle_good.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_neutral.9.png b/Habitica/res/drawable-xhdpi/triangle_neutral.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_neutral.9.png rename to Habitica/res/drawable-xhdpi/triangle_neutral.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_worse.9.png b/Habitica/res/drawable-xhdpi/triangle_worse.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_worse.9.png rename to Habitica/res/drawable-xhdpi/triangle_worse.9.png diff --git a/HabitAndroRPG/res/drawable-xhdpi/triangle_worst.9.png b/Habitica/res/drawable-xhdpi/triangle_worst.9.png similarity index 100% rename from HabitAndroRPG/res/drawable-xhdpi/triangle_worst.9.png rename to Habitica/res/drawable-xhdpi/triangle_worst.9.png diff --git a/HabitAndroRPG/res/drawable/Thumbs.db b/Habitica/res/drawable/Thumbs.db similarity index 100% rename from HabitAndroRPG/res/drawable/Thumbs.db rename to Habitica/res/drawable/Thumbs.db diff --git a/HabitAndroRPG/res/drawable/border.xml b/Habitica/res/drawable/border.xml similarity index 96% rename from HabitAndroRPG/res/drawable/border.xml rename to Habitica/res/drawable/border.xml index 0f9f9774e..d5e67c243 100644 --- a/HabitAndroRPG/res/drawable/border.xml +++ b/Habitica/res/drawable/border.xml @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/HabitAndroRPG/res/drawable/border_lightgray.xml b/Habitica/res/drawable/border_lightgray.xml similarity index 96% rename from HabitAndroRPG/res/drawable/border_lightgray.xml rename to Habitica/res/drawable/border_lightgray.xml index 3ee4f1fec..ffd73ae60 100644 --- a/HabitAndroRPG/res/drawable/border_lightgray.xml +++ b/Habitica/res/drawable/border_lightgray.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/drawable/bottom_bar_bg.xml b/Habitica/res/drawable/bottom_bar_bg.xml similarity index 96% rename from HabitAndroRPG/res/drawable/bottom_bar_bg.xml rename to Habitica/res/drawable/bottom_bar_bg.xml index 0d081bb78..4ce604c49 100644 --- a/HabitAndroRPG/res/drawable/bottom_bar_bg.xml +++ b/Habitica/res/drawable/bottom_bar_bg.xml @@ -1,20 +1,20 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/drawable/btn_check_holo_light.xml b/Habitica/res/drawable/btn_check_holo_light.xml similarity index 97% rename from HabitAndroRPG/res/drawable/btn_check_holo_light.xml rename to Habitica/res/drawable/btn_check_holo_light.xml index adb98e4ba..c8c2bee04 100644 --- a/HabitAndroRPG/res/drawable/btn_check_holo_light.xml +++ b/Habitica/res/drawable/btn_check_holo_light.xml @@ -1,65 +1,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HabitAndroRPG/res/drawable/card_background_shadow.9.png b/Habitica/res/drawable/card_background_shadow.9.png similarity index 100% rename from HabitAndroRPG/res/drawable/card_background_shadow.9.png rename to Habitica/res/drawable/card_background_shadow.9.png diff --git a/HabitAndroRPG/res/drawable/chest.png b/Habitica/res/drawable/chest.png similarity index 100% rename from HabitAndroRPG/res/drawable/chest.png rename to Habitica/res/drawable/chest.png diff --git a/HabitAndroRPG/res/drawable/drawer_activated_background.xml b/Habitica/res/drawable/drawer_activated_background.xml similarity index 98% rename from HabitAndroRPG/res/drawable/drawer_activated_background.xml rename to Habitica/res/drawable/drawer_activated_background.xml index ea162993d..c620d2931 100644 --- a/HabitAndroRPG/res/drawable/drawer_activated_background.xml +++ b/Habitica/res/drawable/drawer_activated_background.xml @@ -1,28 +1,28 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/drawable/female_sprites.png b/Habitica/res/drawable/female_sprites.png similarity index 100% rename from HabitAndroRPG/res/drawable/female_sprites.png rename to Habitica/res/drawable/female_sprites.png diff --git a/HabitAndroRPG/res/drawable/gold.png b/Habitica/res/drawable/gold.png similarity index 100% rename from HabitAndroRPG/res/drawable/gold.png rename to Habitica/res/drawable/gold.png diff --git a/HabitAndroRPG/res/drawable/item_background.xml b/Habitica/res/drawable/item_background.xml similarity index 98% rename from HabitAndroRPG/res/drawable/item_background.xml rename to Habitica/res/drawable/item_background.xml index 5239f32a4..57e8a6419 100644 --- a/HabitAndroRPG/res/drawable/item_background.xml +++ b/Habitica/res/drawable/item_background.xml @@ -1,29 +1,29 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/drawable/list_selector_background_transition_holo_light.xml b/Habitica/res/drawable/list_selector_background_transition_holo_light.xml similarity index 97% rename from HabitAndroRPG/res/drawable/list_selector_background_transition_holo_light.xml rename to Habitica/res/drawable/list_selector_background_transition_holo_light.xml index a8080c740..4deefc83e 100644 --- a/HabitAndroRPG/res/drawable/list_selector_background_transition_holo_light.xml +++ b/Habitica/res/drawable/list_selector_background_transition_holo_light.xml @@ -1,20 +1,20 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/drawable/male_sprites.png b/Habitica/res/drawable/male_sprites.png similarity index 100% rename from HabitAndroRPG/res/drawable/male_sprites.png rename to Habitica/res/drawable/male_sprites.png diff --git a/HabitAndroRPG/res/drawable/progress_indeterminate_horizontal.xml b/Habitica/res/drawable/progress_indeterminate_horizontal.xml similarity index 98% rename from HabitAndroRPG/res/drawable/progress_indeterminate_horizontal.xml rename to Habitica/res/drawable/progress_indeterminate_horizontal.xml index 306c9c0a7..da784b876 100644 --- a/HabitAndroRPG/res/drawable/progress_indeterminate_horizontal.xml +++ b/Habitica/res/drawable/progress_indeterminate_horizontal.xml @@ -1,12 +1,12 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo1.png b/Habitica/res/drawable/progressbar_indeterminate_holo1.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo1.png rename to Habitica/res/drawable/progressbar_indeterminate_holo1.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo2.png b/Habitica/res/drawable/progressbar_indeterminate_holo2.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo2.png rename to Habitica/res/drawable/progressbar_indeterminate_holo2.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo3.png b/Habitica/res/drawable/progressbar_indeterminate_holo3.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo3.png rename to Habitica/res/drawable/progressbar_indeterminate_holo3.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo4.png b/Habitica/res/drawable/progressbar_indeterminate_holo4.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo4.png rename to Habitica/res/drawable/progressbar_indeterminate_holo4.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo5.png b/Habitica/res/drawable/progressbar_indeterminate_holo5.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo5.png rename to Habitica/res/drawable/progressbar_indeterminate_holo5.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo6.png b/Habitica/res/drawable/progressbar_indeterminate_holo6.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo6.png rename to Habitica/res/drawable/progressbar_indeterminate_holo6.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo7.png b/Habitica/res/drawable/progressbar_indeterminate_holo7.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo7.png rename to Habitica/res/drawable/progressbar_indeterminate_holo7.png diff --git a/HabitAndroRPG/res/drawable/progressbar_indeterminate_holo8.png b/Habitica/res/drawable/progressbar_indeterminate_holo8.png similarity index 100% rename from HabitAndroRPG/res/drawable/progressbar_indeterminate_holo8.png rename to Habitica/res/drawable/progressbar_indeterminate_holo8.png diff --git a/HabitAndroRPG/res/drawable/progressbar_red.xml b/Habitica/res/drawable/progressbar_red.xml similarity index 95% rename from HabitAndroRPG/res/drawable/progressbar_red.xml rename to Habitica/res/drawable/progressbar_red.xml index bd6fc9b5a..2bfe2e477 100644 --- a/HabitAndroRPG/res/drawable/progressbar_red.xml +++ b/Habitica/res/drawable/progressbar_red.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/HabitAndroRPG/res/drawable/progressbar_yellow.xml b/Habitica/res/drawable/progressbar_yellow.xml similarity index 95% rename from HabitAndroRPG/res/drawable/progressbar_yellow.xml rename to Habitica/res/drawable/progressbar_yellow.xml index 78ffc2827..f2b263efc 100644 --- a/HabitAndroRPG/res/drawable/progressbar_yellow.xml +++ b/Habitica/res/drawable/progressbar_yellow.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/HabitAndroRPG/res/drawable/selectable_background_cardbank.xml b/Habitica/res/drawable/selectable_background_cardbank.xml similarity index 98% rename from HabitAndroRPG/res/drawable/selectable_background_cardbank.xml rename to Habitica/res/drawable/selectable_background_cardbank.xml index 6935dbf67..7db3f1ff0 100644 --- a/HabitAndroRPG/res/drawable/selectable_background_cardbank.xml +++ b/Habitica/res/drawable/selectable_background_cardbank.xml @@ -1,24 +1,24 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/drawable/shop_sprites.png b/Habitica/res/drawable/shop_sprites.png similarity index 100% rename from HabitAndroRPG/res/drawable/shop_sprites.png rename to Habitica/res/drawable/shop_sprites.png diff --git a/HabitAndroRPG/res/drawable/silver.png b/Habitica/res/drawable/silver.png similarity index 100% rename from HabitAndroRPG/res/drawable/silver.png rename to Habitica/res/drawable/silver.png diff --git a/HabitAndroRPG/res/drawable/spritesmith.png b/Habitica/res/drawable/spritesmith.png similarity index 100% rename from HabitAndroRPG/res/drawable/spritesmith.png rename to Habitica/res/drawable/spritesmith.png diff --git a/HabitAndroRPG/res/drawable/toggle_underline.xml b/Habitica/res/drawable/toggle_underline.xml similarity index 98% rename from HabitAndroRPG/res/drawable/toggle_underline.xml rename to Habitica/res/drawable/toggle_underline.xml index 7cbe4231c..013d282c6 100644 --- a/HabitAndroRPG/res/drawable/toggle_underline.xml +++ b/Habitica/res/drawable/toggle_underline.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + diff --git a/HabitAndroRPG/res/layout-land/activity_main.xml b/Habitica/res/layout-land/activity_main.xml similarity index 97% rename from HabitAndroRPG/res/layout-land/activity_main.xml rename to Habitica/res/layout-land/activity_main.xml index a36a24dbd..34baeb728 100644 --- a/HabitAndroRPG/res/layout-land/activity_main.xml +++ b/Habitica/res/layout-land/activity_main.xml @@ -1,146 +1,146 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout-v11/drawer_list_item.xml b/Habitica/res/layout-v11/drawer_list_item.xml similarity index 97% rename from HabitAndroRPG/res/layout-v11/drawer_list_item.xml rename to Habitica/res/layout-v11/drawer_list_item.xml index 1821111e9..070667072 100644 --- a/HabitAndroRPG/res/layout-v11/drawer_list_item.xml +++ b/Habitica/res/layout-v11/drawer_list_item.xml @@ -1,27 +1,27 @@ - - - + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml similarity index 97% rename from HabitAndroRPG/res/layout/activity_main.xml rename to Habitica/res/layout/activity_main.xml index 68a735bb5..f822676e5 100644 --- a/HabitAndroRPG/res/layout/activity_main.xml +++ b/Habitica/res/layout/activity_main.xml @@ -1,130 +1,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/add_task_dialog.xml b/Habitica/res/layout/add_task_dialog.xml similarity index 97% rename from HabitAndroRPG/res/layout/add_task_dialog.xml rename to Habitica/res/layout/add_task_dialog.xml index 062bb10a3..70df24bd8 100644 --- a/HabitAndroRPG/res/layout/add_task_dialog.xml +++ b/Habitica/res/layout/add_task_dialog.xml @@ -1,126 +1,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HabitAndroRPG/res/layout/button_day_of_week.xml b/Habitica/res/layout/button_day_of_week.xml similarity index 97% rename from HabitAndroRPG/res/layout/button_day_of_week.xml rename to Habitica/res/layout/button_day_of_week.xml index 961eefd01..d3ea59a00 100644 --- a/HabitAndroRPG/res/layout/button_day_of_week.xml +++ b/Habitica/res/layout/button_day_of_week.xml @@ -1,22 +1,22 @@ - - - + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/card_ex.xml b/Habitica/res/layout/card_ex.xml similarity index 97% rename from HabitAndroRPG/res/layout/card_ex.xml rename to Habitica/res/layout/card_ex.xml index b46f7607b..5c6e10b07 100644 --- a/HabitAndroRPG/res/layout/card_ex.xml +++ b/Habitica/res/layout/card_ex.xml @@ -1,96 +1,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/custom_list_preference_row.xml b/Habitica/res/layout/custom_list_preference_row.xml similarity index 96% rename from HabitAndroRPG/res/layout/custom_list_preference_row.xml rename to Habitica/res/layout/custom_list_preference_row.xml index 38c3eacc4..deee48516 100644 --- a/HabitAndroRPG/res/layout/custom_list_preference_row.xml +++ b/Habitica/res/layout/custom_list_preference_row.xml @@ -1,29 +1,29 @@ - - - - - - - - - + + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/daily_not_today.xml b/Habitica/res/layout/daily_not_today.xml similarity index 98% rename from HabitAndroRPG/res/layout/daily_not_today.xml rename to Habitica/res/layout/daily_not_today.xml index d790ff61f..d083a08d2 100644 --- a/HabitAndroRPG/res/layout/daily_not_today.xml +++ b/Habitica/res/layout/daily_not_today.xml @@ -1,7 +1,7 @@ - - + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/drawer.xml b/Habitica/res/layout/drawer.xml similarity index 97% rename from HabitAndroRPG/res/layout/drawer.xml rename to Habitica/res/layout/drawer.xml index 25f75a0f2..be0cae978 100644 --- a/HabitAndroRPG/res/layout/drawer.xml +++ b/Habitica/res/layout/drawer.xml @@ -1,40 +1,40 @@ - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/drawer_list_item.xml b/Habitica/res/layout/drawer_list_item.xml similarity index 97% rename from HabitAndroRPG/res/layout/drawer_list_item.xml rename to Habitica/res/layout/drawer_list_item.xml index 856b14414..62d4d533f 100644 --- a/HabitAndroRPG/res/layout/drawer_list_item.xml +++ b/Habitica/res/layout/drawer_list_item.xml @@ -1,27 +1,27 @@ - - - + + \ No newline at end of file diff --git a/HabitAndroRPG/res/layout/habit.xml b/Habitica/res/layout/habit.xml similarity index 97% rename from HabitAndroRPG/res/layout/habit.xml rename to Habitica/res/layout/habit.xml index cc0eee69d..ade1a9770 100644 --- a/HabitAndroRPG/res/layout/habit.xml +++ b/Habitica/res/layout/habit.xml @@ -1,74 +1,74 @@ - - - -