sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-04-14 19:56:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Dependencies / change some strings

Browse source
This commit is contained in:
Negue 2015-06-28 19:37:02 +02:00
parent 80e48529bd
commit 549281b969
6 changed files with 26 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Habitica/Habitica.iml
View file

@ -82,12 +82,12 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.florent37/materialviewpager/1.0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.ksoichiro/android-observablescrollview/1.5.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.negue/paperboy/0d4e14bbb5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugcore/1.4-SNAPSHOT/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugsupport/1.4-SNAPSHOT/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugcore/1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.instabug.library/instabugsupport/1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jpardogo.materialtabstrip/library/1.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/aboutlibraries/5.0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/iconics/1.0.2/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialdrawer/3.0.5/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/iconics/1.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.mikepenz/materialdrawer/3.0.8/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.rengwuxian.materialedittext/library/2.1.4/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/io.fabric.sdk.android/fabric/1.3.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@ -110,18 +110,17 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="design-22.2.0" level="project" />
<orderEntry type="library" exported="" name="aboutlibraries-5.0.5" level="project" />
<orderEntry type="library" exported="" name="iconics-1.0.2" level="project" />
<orderEntry type="library" exported="" name="instabugsupport-1.4" level="project" />
<orderEntry type="library" exported="" name="kotlin-runtime-0.11.91" level="project" />
<orderEntry type="library" exported="" name="org.abego.treelayout.core-1.0.1" level="project" />
<orderEntry type="library" exported="" name="library-2.1.4" level="project" />
<orderEntry type="library" exported="" name="instabugcore-1.4-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" name="picasso-2.5.2" level="project" />
<orderEntry type="library" exported="" name="paperboy-0d4e14bbb5" level="project" />
<orderEntry type="library" exported="" name="commons-io-2.4" level="project" />
<orderEntry type="library" exported="" name="retrofit-1.6.0" level="project" />
<orderEntry type="library" exported="" name="kenburnsview-1.0.6" level="project" />
<orderEntry type="library" exported="" name="adapters-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="library-1.0.16" level="project" />
<orderEntry type="library" exported="" name="adapters-1.0-rc0" level="project" />
<orderEntry type="library" exported="" name="mimecraft-1.1.1" level="project" />
<orderEntry type="library" exported="" name="antlr4-runtime-4.4" level="project" />
<orderEntry type="library" exported="" name="antlr4-annotations-4.4" level="project" />
@ -130,11 +129,10 @@
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="android-observablescrollview-1.5.2" level="project" />
<orderEntry type="library" exported="" name="antlr4-4.4" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-3.0.5" level="project" />
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
<orderEntry type="library" exported="" name="crashlytics-core-2.3.0" level="project" />
<orderEntry type="library" exported="" name="antlr-runtime-3.5.2" level="project" />
<orderEntry type="library" exported="" name="instabugsupport-1.4-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-3.0.8" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="gridlayout-v7-22.2.0" level="project" />
<orderEntry type="library" exported="" name="kotlin-stdlib-0.11.91" level="project" />
@ -145,7 +143,9 @@
<orderEntry type="library" exported="" name="commons-lang3-3.3.2" level="project" />
<orderEntry type="library" exported="" name="beta-1.1.2" level="project" />
<orderEntry type="library" exported="" name="crouton-1.8.1" level="project" />
<orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
<orderEntry type="library" exported="" name="guava-17.0" level="project" />
<orderEntry type="library" exported="" name="instabugcore-1.4" level="project" />
<orderEntry type="library" exported="" name="library-1.1.0" level="project" />
<orderEntry type="library" exported="" name="answers-1.2.0" level="project" />
<orderEntry type="library" exported="" name="commons-codec-1.10" level="project" />

4
Habitica/assets/paperboy/changelog.json
View file

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

4
Habitica/build.gradle
View file

@ -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'

7
Habitica/res/values/strings.xml
View file

@ -9,7 +9,7 @@
<string name="XP_default">XP</string>
<string name="HP_default">HP</string>
<string name="format_todo_date">%1$d-%2$d-%3$d</string>
<string name="new_task_added_message">A new task have been added</string>
<string name="new_task_added_message">Task added</string>
<string name="lvlup">LVL UP!</string>
<string name="action_barcode">Scan a barcode</string>
<string name="ERR_pb_barcode">Prefs couldn\'t be loaded from the barcode</string>
@ -42,7 +42,7 @@
<!-- Adding tasks -->
<string name="task_note_hint">Add a note</string>
<string name="new_task">Creation of a new %s</string>
<string name="new_task">Add new %s</string>
<string name="task_text">Task:</string>
<string name="task_note">Note:</string>
<string name="task_duedate">Due date:</string>
@ -106,12 +106,11 @@
    
<string name="close">Close</string>
<string name="SP_last_seen_version">SP_last_version</string>
<string name="SP_see_changelog">See the changelog</string>
<string name="MP_default">MP</string>
<string name="update_btn">Update</string>
<string name="about.title">About</string>
<string name="about.changelog">Changelog</string>
<string name="about.versionhistory">Version history</string>
<!-- Network Errors -->
<string name="network_error_title">Connection Error</string>
<string name="network_error_no_network_body">You are not connected to the internet.</string>

2
Habitica/src/com/habitrpg/android/habitica/AboutActivity.java
View file

@ -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

13
Habitica/src/com/habitrpg/android/habitica/MainActivityNew.java
View file

@ -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);
}