kauron/DungeonManager
kauron/DungeonManager
Archived
1
0
Fork 0
Code Releases Activity

Bug fixing and further development

Browse source
This commit is contained in:
Carlos Galindo 2015-02-21 00:13:39 +01:00
commit 91e8eed8b0
8 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/res/layout/activity_main.xml
View file

@ -23,7 +23,7 @@
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/pgCurrent"
android:layout_toStartOf="@+id/pgCurrent"
android:id="@+id/linearLayout"
android:id="@+id/basicInfoContainer"
android:layout_alignBottom="@+id/pgCurrent">
<TextView
@ -80,4 +80,21 @@
android:layout_alignTop="@+id/lvlText"
android:layout_marginLeft="10dp" />
</RelativeLayout>
<LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/basicInfoContainer"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:id="@+id/curativeEffortsContainer">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/curativeEffortsText"/>
</LinearLayout>
</RelativeLayout>

14
app/src/main/res/menu/menu_main.xml
View file

@ -13,22 +13,26 @@
android:orderInCategory="2"
app:showAsAction="always"
android:icon="@drawable/ic_action_heal"/>
<item
android:id="@+id/action_load"
android:title="@string/action_load"
android:orderInCategory="10"
app:showAsAction="never"/>
<item
android:id="@+id/action_save"
android:title="@string/action_save"
android:orderInCategory="3"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_save"/>
android:orderInCategory="11"
app:showAsAction="never"/>
<item
android:id="@+id/action_edit_basics"
android:title="@string/action_edit_basics"
android:orderInCategory="4"
android:orderInCategory="20"
app:showAsAction="ifRoom"
android:icon="@drawable/ic_action_edit"/>
<item
android:id="@+id/action_calendar_activity"
android:title="@string/action_calendar_activity"
android:orderInCategory="5"
android:orderInCategory="30"
app:showAsAction="never" />
</menu>

3
app/src/main/res/values-es/strings.xml
View file

@ -29,4 +29,7 @@
<string name="action_save">Guardar</string>
<string name="action_undo_current_pg">Acción deshecha</string>
<string name="dungeons_and_dragons">Dragones y Mazmorras</string>
<string name="action_load">Cargar</string>
<string name="curative_efforts">Esfuerzos curativos</string>
<string name="pg">PG</string>
</resources>

5
app/src/main/res/values/strings.xml
View file

@ -6,6 +6,10 @@
<string name="action_undo">Undo</string>
<string name="pg">PG</string>
<string name="curative_efforts">Curative efforts</string>
<string name="curative_display_text1">You have</string>
<string name="curative_display_text2">out of</string>
<string name="curative_display_text3">daily curative efforts.</string>
<string name="action_load">Load</string>
<string name="dungeons_and_dragons">Dungeons and Dragons</string>
<string name="action_save">Save</string>
<string name="action_calendar_activity">Create event</string>
@ -21,6 +25,7 @@
<string name="no">No</string>
<string name="edit_PG_Title">Suffer damage</string>
<string name="message_death">Your character has died</string>
<string name="new_energies1">You have</string>
<string name="new_energies2">curative efforts</string>
<string name="new_energies_title">Use a curative effort?</string>