diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index b628f9aa5..e2b87b51c 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -82,12 +82,12 @@
-
-
+
+
-
-
+
+
@@ -110,18 +110,17 @@
-
+
-
-
+
@@ -130,11 +129,10 @@
-
-
+
@@ -145,7 +143,9 @@
+
+
diff --git a/Habitica/assets/paperboy/changelog.json b/Habitica/assets/paperboy/changelog.json
index 947399e15..1963780e1 100644
--- a/Habitica/assets/paperboy/changelog.json
+++ b/Habitica/assets/paperboy/changelog.json
@@ -6,6 +6,10 @@
"type": "F",
"title": "Ability to add / edit / delete / check Checklists!"
},
+ {
+ "type": "F",
+ "title": "You can toggle the sleep-state!"
+ },
{
"type": "B",
"title": "Fixed crash while the device is offline"
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 6896836b7..4ff357d0c 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -43,7 +43,7 @@ dependencies {
// View Elements Injection :)
compile 'com.jakewharton:butterknife:6.1.0'
- compile('com.mikepenz:materialdrawer:3.0.5@aar') {
+ compile('com.mikepenz:materialdrawer:3.0.8@aar') {
transitive = true
}
@@ -58,7 +58,7 @@ dependencies {
// Icons
dependencies {
- compile 'com.mikepenz:iconics:1.0.2@aar'
+ compile 'com.mikepenz:iconics:1.1.0@aar'
}
compile 'com.rengwuxian.materialedittext:library:2.1.4'
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index b116c4740..769747f77 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -9,7 +9,7 @@
XP
HP
%1$d-%2$d-%3$d
- A new task have been added
+ Task added
LVL UP!
Scan a barcode
Prefs couldn\'t be loaded from the barcode
@@ -42,7 +42,7 @@
Add a note
- Creation of a new %s
+ Add new %s
Task:
Note:
Due date:
@@ -106,12 +106,11 @@
Close
SP_last_version
- See the changelog
MP
Update
About
- Changelog
+ Version history
Connection Error
You are not connected to the internet.
diff --git a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java
index ecf9198c6..b141c5323 100644
--- a/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/AboutActivity.java
@@ -133,7 +133,7 @@ public class AboutActivity extends AppCompatActivity {
if(position == 0)
return getString(R.string.about_title);
- return getString(R.string.about_changelog);
+ return getString(R.string.about_versionhistory);
}
@Override
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java b/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java
index 48846dc14..8cddb1235 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java
@@ -44,7 +44,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Random;
import butterknife.ButterKnife;
import butterknife.InjectView;
@@ -99,12 +98,14 @@ public class MainActivityNew extends InstabugAppCompatActivity
setSupportActionBar(toolbar);
ActionBar actionBar = getSupportActionBar();
- actionBar.setDisplayHomeAsUpEnabled(true);
- actionBar.setDisplayShowHomeEnabled(false);
- actionBar.setDisplayShowTitleEnabled(true);
- actionBar.setDisplayUseLogoEnabled(false);
- actionBar.setHomeButtonEnabled(false);
+ if(actionBar != null) {
+ actionBar.setDisplayHomeAsUpEnabled(true);
+ actionBar.setDisplayShowHomeEnabled(false);
+ actionBar.setDisplayShowTitleEnabled(true);
+ actionBar.setDisplayUseLogoEnabled(false);
+ actionBar.setHomeButtonEnabled(false);
+ }
toolbar.setPadding(0, getResources().getDimensionPixelSize(R.dimen.tool_bar_top_padding), 0, 0);
}