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

Error Correction

Browse source
This commit is contained in:
kauron 2015-02-20 23:36:01 +01:00
commit 9aeb975ffb
9 changed files with 152 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

56
app/src/main/res/layout/activity_introduction.xml
View file

@ -23,10 +23,10 @@
android:inputType="textPersonName"
android:ems="10"
android:id="@+id/editRaceIntro"
android:layout_below="@+id/editClassIntro"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:hint="@string/race_name" />
android:hint="@string/race_name"
android:layout_below="@+id/editNameIntro"
android:layout_toRightOf="@+id/editClassIntro"
android:layout_toEndOf="@+id/editClassIntro" />
<EditText
android:layout_width="wrap_content"
@ -46,12 +46,10 @@
android:ems="10"
android:id="@+id/editLevelIntro"
android:hint="@string/level"
android:width="70dp"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignLeft="@+id/editMaxPgIntro"
android:layout_alignStart="@+id/editMaxPgIntro" />
android:layout_toRightOf="@+id/editNameIntro"
android:layout_alignRight="@+id/editRaceIntro"
android:layout_alignEnd="@+id/editRaceIntro" />
<EditText
android:layout_width="wrap_content"
@ -59,10 +57,13 @@
android:inputType="number"
android:ems="10"
android:id="@+id/editMaxPgIntro"
android:layout_below="@+id/editLevelIntro"
android:hint="@string/max_pg"
android:layout_alignLeft="@+id/editMaxEffortIntro"
android:layout_alignStart="@+id/editMaxEffortIntro" />
android:width="70dp"
android:layout_below="@+id/editClassIntro"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@+id/editMaxEffortIntro"
android:layout_toStartOf="@+id/editMaxEffortIntro" />
<EditText
android:layout_width="wrap_content"
@ -70,8 +71,33 @@
android:inputType="number"
android:ems="10"
android:id="@+id/editMaxEffortIntro"
android:layout_alignTop="@+id/editRaceIntro"
android:layout_toEndOf="@+id/editRaceIntro"
android:hint="@string/max_curative_efforts"
android:layout_toRightOf="@+id/editRaceIntro" />
android:layout_below="@+id/editRaceIntro"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="number"
android:ems="10"
android:id="@+id/editPgIntro"
android:width="70dp"
android:hint="@string/pg"
android:layout_below="@+id/editMaxPgIntro"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_toLeftOf="@+id/editEffortIntro"
android:layout_toStartOf="@+id/editEffortIntro" />
<EditText
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="number"
android:ems="10"
android:id="@+id/editEffortIntro"
android:layout_below="@+id/editMaxEffortIntro"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:hint="@string/curative_efforts" />
</RelativeLayout>

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

@ -23,12 +23,13 @@
android:layout_alignParentTop="true"
android:layout_toLeftOf="@+id/pgCurrent"
android:layout_toStartOf="@+id/pgCurrent"
android:id="@+id/linearLayout">
android:id="@+id/linearLayout"
android:layout_alignBottom="@+id/pgCurrent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/adventurer_name"
android:id="@+id/nameText"
android:layout_alignParentTop="true"
@ -38,7 +39,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/race_name"
android:id="@+id/raceText"
android:layout_alignTop="@+id/classText"
@ -49,7 +50,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/class_name"
android:id="@+id/classText"
android:layout_below="@+id/nameText"
@ -59,7 +60,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/level"
android:id="@+id/lvlText"
android:layout_alignParentBottom="false"
@ -71,7 +72,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceLarge"
android:id="@+id/lvl"
android:layout_alignParentBottom="false"
android:layout_toRightOf="@+id/lvlText"

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

@ -4,6 +4,8 @@
<string name="app_name" translatable="false">DungeonManager</string>
<string name="action_cure">Cure</string>
<string name="action_undo">Undo</string>
<string name="pg">PG</string>
<string name="curative_efforts">Curative efforts</string>
<string name="dungeons_and_dragons">Dungeons and Dragons</string>
<string name="action_save">Save</string>
<string name="action_calendar_activity">Create event</string>
@ -26,7 +28,7 @@
<string name="action_finish">Done</string>
<string name="level">Level</string>
<string name="max_curative_efforts">Curative efforts</string>
<string name="max_curative_efforts">Max curative efforts</string>
<string name="max_pg">Max PG</string>
<string name="missing_info_error">You need to fill all the information</string>
<string name="no_curative_efforts_error">You don\'t have any curative efforts left!</string>