diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index e69a2933b..14dcfe5d7 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -12,32 +12,36 @@
-
-
-
-
+
+
+
+ generateDebugAndroidTestSources
+ generateDebugSources
+
-
+
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -64,6 +68,27 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -76,21 +101,57 @@
+
-
+
-
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 054b08738..de56696db 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -1,3 +1,8 @@
+apply plugin: 'com.android.application'
+apply plugin: 'aar-link-sources'
+apply plugin: 'com.android.databinding'
+apply plugin: 'io.fabric'
+
buildscript {
repositories {
mavenLocal()
@@ -5,13 +10,9 @@ buildscript {
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()
@@ -20,39 +21,72 @@ repositories {
url "https://oss.sonatype.org/content/repositories/snapshots"
}
maven { url 'https://maven.fabric.io/public' }
+
+ // Material View Pager
+ maven {
+ url "http://dl.bintray.com/florent37/maven"
+ }
}
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.magicmicky.habitrpgwrapper:lib:1.8'
+ aarLinkSources 'com.magicmicky.habitrpgwrapper:lib:1.8:sources@jar'
+
- compile 'com.android.support:appcompat-v7:18.0.+'
compile('com.crashlytics.sdk.android:crashlytics:2.3.0@aar') {
transitive = true;
}
+
+ // View Elements Injection :)
+ compile 'com.jakewharton:butterknife:6.1.0'
+
+ compile('com.mikepenz:materialdrawer:3.0.5@aar') {
+ transitive = true
+ }
+
+ compile('com.github.florent37:materialviewpager:1.0.5@aar') {
+ transitive = true
+ }
+
+ compile 'com.android.support:appcompat-v7:22.2.0'
+ compile 'com.android.support:design:22.2.0'
+ compile 'com.android.support:gridlayout-v7:22.2.0'
+ compile 'com.android.support:recyclerview-v7:22.2.0'
+
+ // Icons
+ dependencies {
+ compile 'com.mikepenz:iconics:1.0.2@aar'
+ }
+
+ compile 'com.rengwuxian.materialedittext:library:2.1.4'
+
+ // Instabug / In-App-Feedback
+ compile 'com.instabug.library:instabugsupport:1+'
}
android {
- compileSdkVersion 21
- buildToolsVersion "21.1.2"
- lintOptions {
- abortOnError false
- }
- signingConfigs {
- release
- }
+ compileSdkVersion 22
+ //buildToolsVersion "23.0.0-rc2"
+ buildToolsVersion "22.0.1"
- buildTypes {
- debug {
- applicationIdSuffix ".debug"
- debuggable true
- }
- release {
- signingConfig signingConfigs.release
- debuggable false
- }
+ lintOptions {
+ abortOnError false
+ }
+ signingConfigs {
+ release
+ }
+
+ buildTypes {
+ debug {
+ applicationIdSuffix ".debug"
+ debuggable true
}
+ release {
+ signingConfig signingConfigs.release
+ debuggable false
+ }
+ }
sourceSets {
main {
@@ -71,10 +105,10 @@ android {
def Properties props = new Properties()
def propFile = new File('signingrelease.properties')
-if (propFile.canRead()){
+if (propFile.canRead()) {
props.load(new FileInputStream(propFile))
- if (props!=null && props.containsKey('STORE_FILE') && props.containsKey('STORE_PASSWORD') &&
+ 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']
@@ -84,7 +118,7 @@ if (propFile.canRead()){
println 'signing.properties found but some entries are missing'
android.buildTypes.release.signingConfig = null
}
-}else {
+} else {
println 'signing.properties not found'
android.buildTypes.release.signingConfig = null
}
diff --git a/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
new file mode 100644
index 000000000..b386236bd
--- /dev/null
+++ b/Habitica/src/com/habitrpg/android/habitica/HabiticaApplication.java
@@ -0,0 +1,18 @@
+package com.habitrpg.android.habitica;
+
+import android.app.Application;
+
+import com.instabug.library.Instabug;
+
+/**
+ * Created by Negue on 14.06.2015.
+ */
+public class HabiticaApplication extends Application {
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+
+ Instabug.initialize(this, "a5aa5f471a9cd8a958c0c55181172655");
+ }
+}
diff --git a/build.gradle b/build.gradle
index 6293e6e5a..68777538f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,9 @@ buildscript {
}
dependencies {
- classpath 'com.android.tools.build:gradle:1.0.0'
+ classpath 'com.android.tools.build:gradle:1.2.3'
+ classpath 'com.android.databinding:dataBinder:1.0-rc0'
+
//Class path for the plugin to auto download sources
classpath 'com.github.xujiaao:aarLinkSources:1.0.0'
@@ -16,3 +18,9 @@ buildscript {
// in the individual module build.gradle files
}
}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3240c8a3e..6f04ca10c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip