Player load improved
This commit is contained in:
parent
30515a5384
commit
8451167c94
20 changed files with 733 additions and 453 deletions
BIN
app/src/main/res/drawable-hdpi/fab_ic_add.png
Normal file
BIN
app/src/main/res/drawable-hdpi/fab_ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 300 B |
BIN
app/src/main/res/drawable-mdpi/fab_ic_add.png
Normal file
BIN
app/src/main/res/drawable-mdpi/fab_ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 269 B |
BIN
app/src/main/res/drawable-xhdpi/fab_ic_add.png
Normal file
BIN
app/src/main/res/drawable-xhdpi/fab_ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 376 B |
BIN
app/src/main/res/drawable-xxhdpi/fab_ic_add.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/fab_ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 611 B |
BIN
app/src/main/res/drawable-xxxhdpi/fab_ic_add.png
Normal file
BIN
app/src/main/res/drawable-xxxhdpi/fab_ic_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 594 B |
237
app/src/main/res/drawable/fab_button.xml
Normal file
237
app/src/main/res/drawable/fab_button.xml
Normal file
|
@ -0,0 +1,237 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:state_pressed="true">
|
||||
<layer-list>
|
||||
<!-- Shadow -->
|
||||
<item android:top="1dp" android:right="1dp">
|
||||
<layer-list>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#08000000"/>
|
||||
<padding
|
||||
android:bottom="3px"
|
||||
android:left="3px"
|
||||
android:right="3px"
|
||||
android:top="3px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#09000000"/>
|
||||
<padding
|
||||
android:bottom="2px"
|
||||
android:left="2px"
|
||||
android:right="2px"
|
||||
android:top="2px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#10000000"/>
|
||||
<padding
|
||||
android:bottom="2px"
|
||||
android:left="2px"
|
||||
android:right="2px"
|
||||
android:top="2px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#11000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#12000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#13000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#14000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#15000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#16000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
</item>
|
||||
|
||||
<!-- Blue button pressed -->
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#90CAF9"/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
</item>
|
||||
|
||||
<item android:state_enabled="true">
|
||||
|
||||
<layer-list>
|
||||
<!-- Shadow -->
|
||||
<item android:top="2dp" android:right="1dp">
|
||||
<layer-list>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#08000000"/>
|
||||
<padding
|
||||
android:bottom="4px"
|
||||
android:left="4px"
|
||||
android:right="4px"
|
||||
android:top="4px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#09000000"/>
|
||||
<padding
|
||||
android:bottom="2px"
|
||||
android:left="2px"
|
||||
android:right="2px"
|
||||
android:top="2px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#10000000"/>
|
||||
<padding
|
||||
android:bottom="2px"
|
||||
android:left="2px"
|
||||
android:right="2px"
|
||||
android:top="2px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#11000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#12000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#13000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#14000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#15000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#16000000"/>
|
||||
<padding
|
||||
android:bottom="1px"
|
||||
android:left="1px"
|
||||
android:right="1px"
|
||||
android:top="1px"
|
||||
/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
</item>
|
||||
|
||||
<!-- Blue button -->
|
||||
<item>
|
||||
<shape android:shape="oval">
|
||||
<solid android:color="#03A9F4"/>
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
||||
</item>
|
||||
|
||||
</selector>
|
|
@ -13,191 +13,186 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="Character creation"/>
|
||||
</RelativeLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="@string/character_creation"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
</android.support.v7.widget.Toolbar>
|
||||
|
||||
<ScrollView
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin">
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/firstLayout"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/firstLayout"
|
||||
android:orientation="horizontal">
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:layout_weight="0.5"
|
||||
android:id="@+id/editNameIntro"
|
||||
android:hint="@string/adventurer_name"
|
||||
android:nextFocusDown="@+id/editPxIntro"
|
||||
android:nextFocusForward="@+id/editPxIntro"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textPersonName|textCapWords"
|
||||
android:layout_weight="0.5"
|
||||
android:id="@+id/editNameIntro"
|
||||
android:hint="@string/adventurer_name"
|
||||
android:nextFocusDown="@+id/editPxIntro"
|
||||
android:nextFocusForward="@+id/editPxIntro"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:id="@+id/editPxIntro"
|
||||
android:hint="@string/px"
|
||||
android:layout_weight="1"
|
||||
android:nextFocusDown="@+id/FUE"
|
||||
android:nextFocusForward="@+id/FUE"
|
||||
android:nextFocusLeft="@+id/FUE"
|
||||
android:nextFocusRight="@+id/FUE"
|
||||
android:nextFocusUp="@+id/FUE"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
<EditText
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:id="@+id/secondLayout"
|
||||
android:layout_below="@+id/firstLayout">
|
||||
|
||||
<Spinner
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/classSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/raceSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
</LinearLayout>
|
||||
|
||||
<GridLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/secondLayout"
|
||||
android:id="@+id/thirdLayout"
|
||||
android:columnCount="3">
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/FUE"
|
||||
android:hint="@string/FUE"
|
||||
android:nextFocusDown="@+id/DES"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/CON"
|
||||
android:hint="@string/CON"
|
||||
android:nextFocusDown="@+id/INT" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/DES"
|
||||
android:hint="@string/DES"
|
||||
android:nextFocusDown="@+id/SAB"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/INT"
|
||||
android:hint="@string/INT"
|
||||
android:nextFocusDown="@+id/CAR"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/SAB"
|
||||
android:hint="@string/SAB"
|
||||
android:nextFocusDown="@+id/CON"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
android:imeOptions="actionDone"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/CAR"
|
||||
android:hint="@string/CAR"/>
|
||||
</GridLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_below="@+id/thirdLayout"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:visibility="gone">
|
||||
|
||||
<Button
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/new_attack"
|
||||
android:id="@+id/new_attack_button" />
|
||||
|
||||
<ListView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/listView" />
|
||||
android:inputType="number"
|
||||
android:id="@+id/editPxIntro"
|
||||
android:hint="@string/px"
|
||||
android:layout_weight="1"
|
||||
android:nextFocusDown="@+id/FUE"
|
||||
android:nextFocusForward="@+id/FUE"
|
||||
android:nextFocusLeft="@+id/FUE"
|
||||
android:nextFocusRight="@+id/FUE"
|
||||
android:nextFocusUp="@+id/FUE"/>
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
</ScrollView>
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:id="@+id/secondLayout"
|
||||
android:layout_below="@+id/firstLayout">
|
||||
|
||||
<Spinner
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/classSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:id="@+id/raceSpinner"
|
||||
tools:listitem="@android:layout/simple_spinner_dropdown_item"
|
||||
android:spinnerMode="dropdown" />
|
||||
</LinearLayout>
|
||||
|
||||
<GridLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/secondLayout"
|
||||
android:id="@+id/thirdLayout"
|
||||
android:columnCount="3">
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/FUE"
|
||||
android:hint="@string/FUE"
|
||||
android:nextFocusDown="@+id/DES"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="0"
|
||||
|
||||
android:id="@+id/CON"
|
||||
android:hint="@string/CON"
|
||||
android:nextFocusDown="@+id/INT" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/DES"
|
||||
android:hint="@string/DES"
|
||||
android:nextFocusDown="@+id/SAB"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="1"
|
||||
|
||||
android:id="@+id/INT"
|
||||
android:hint="@string/INT"
|
||||
android:nextFocusDown="@+id/CAR"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
|
||||
android:layout_row="0"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/SAB"
|
||||
android:hint="@string/SAB"
|
||||
android:nextFocusDown="@+id/CON"/>
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="3"
|
||||
android:imeOptions="actionDone"
|
||||
|
||||
android:layout_row="1"
|
||||
android:layout_column="2"
|
||||
|
||||
android:id="@+id/CAR"
|
||||
android:hint="@string/CAR"/>
|
||||
</GridLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_below="@+id/thirdLayout"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:visibility="visible"
|
||||
android:id="@+id/fourthLayout">
|
||||
|
||||
<Button
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/new_attack"
|
||||
android:id="@+id/new_attack_button" />
|
||||
|
||||
<ListView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/powerList"
|
||||
android:choiceMode="none" />
|
||||
</LinearLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
|
@ -1,42 +1,230 @@
|
|||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
tools:context="com.kauron.dungeonmanager.PowerEditor">
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/editText"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:capitalize="words" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/editText2"
|
||||
android:capitalize="words"
|
||||
android:layout_below="@+id/editText"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignRight="@+id/editText"
|
||||
android:layout_alignEnd="@+id/editText" />
|
||||
|
||||
<EditText
|
||||
<android.support.v7.widget.Toolbar
|
||||
android:id="@+id/toolbar"
|
||||
android:minHeight="?attr/actionBarSize"
|
||||
android:background="@color/primary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/editText3"
|
||||
android:capitalize="words"
|
||||
android:layout_below="@+id/editText2"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignRight="@+id/editText2"
|
||||
android:layout_alignEnd="@+id/editText2" />
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
</RelativeLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="@string/power_editor"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
</android.support.v7.widget.Toolbar>
|
||||
<ScrollView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:paddingTop="@dimen/activity_vertical_margin"
|
||||
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||
tools:context="com.kauron.dungeonmanager.PowerEditor">
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/nameEdit"
|
||||
android:capitalize="words"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_toEndOf="@+id/keywordsText"
|
||||
android:layout_toRightOf="@+id/keywordsText"
|
||||
android:hint="@string/powerNameHint" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/keywordsEdit"
|
||||
android:capitalize="words"
|
||||
android:layout_below="@+id/nameEdit"
|
||||
android:layout_alignRight="@+id/nameEdit"
|
||||
android:layout_alignEnd="@+id/nameEdit"
|
||||
android:layout_toRightOf="@+id/keywordsText"
|
||||
android:layout_toEndOf="@+id/keywordsText"
|
||||
android:hint="@string/keywordsPowerHint" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/name"
|
||||
android:id="@+id/nameText"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_above="@+id/keywordsEdit"
|
||||
android:layout_toLeftOf="@+id/nameEdit"
|
||||
android:layout_toStartOf="@+id/nameEdit"
|
||||
android:gravity="center_vertical" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/keywords"
|
||||
android:id="@+id/keywordsText"
|
||||
android:layout_below="@+id/nameEdit"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignBottom="@+id/keywordsEdit"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginRight="10dp" />
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/keywordsEdit"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:id="@+id/linearLayout">
|
||||
|
||||
<Spinner
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/freqSpinner"
|
||||
android:layout_weight="1"
|
||||
android:spinnerMode="dropdown" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/rangeSpinner"
|
||||
android:layout_weight="1"
|
||||
android:spinnerMode="dropdown" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="number"
|
||||
android:ems="10"
|
||||
android:id="@+id/distanceNumEdit"
|
||||
android:layout_weight="0.75"
|
||||
android:hint="@string/number10"
|
||||
android:focusableInTouchMode="true" />
|
||||
</LinearLayout>
|
||||
|
||||
<Spinner
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/atkSpinner"
|
||||
android:spinnerMode="dropdown"
|
||||
android:layout_below="@+id/linearLayout"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_toLeftOf="@+id/vsText"
|
||||
android:layout_toStartOf="@+id/vsText" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/defSpinner"
|
||||
android:spinnerMode="dropdown"
|
||||
android:layout_below="@+id/linearLayout"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_toRightOf="@+id/vsText"
|
||||
android:layout_toEndOf="@+id/vsText" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/vs"
|
||||
android:id="@+id/vsText"
|
||||
android:gravity="center"
|
||||
android:layout_below="@+id/linearLayout"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_alignBottom="@+id/atkSpinner" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine"
|
||||
android:ems="10"
|
||||
android:id="@+id/impactEdit"
|
||||
android:layout_below="@+id/defSpinner"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:hint="@string/impactEditHint"
|
||||
android:layout_toRightOf="@+id/impactText"
|
||||
android:layout_toEndOf="@+id/impactText" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/impact"
|
||||
android:id="@+id/impactText"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_below="@+id/atkSpinner"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignBottom="@+id/impactEdit"
|
||||
android:layout_marginRight="10dp" />
|
||||
|
||||
<Spinner
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/actionTypeSpinner"
|
||||
android:layout_below="@+id/impactEdit"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:spinnerMode="dropdown" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="@string/objective"
|
||||
android:id="@+id/objectiveText"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_below="@+id/actionTypeSpinner"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_marginRight="10dp"
|
||||
android:layout_alignBottom="@+id/objectiveEdit" />
|
||||
|
||||
<EditText
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/objectiveEdit"
|
||||
android:capitalize="words"
|
||||
android:hint="@string/objectiveHint"
|
||||
android:layout_below="@+id/actionTypeSpinner"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_toRightOf="@+id/objectiveText"
|
||||
android:layout_toEndOf="@+id/objectiveText" />
|
||||
|
||||
<Button
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/save"
|
||||
android:id="@+id/saveButton"
|
||||
android:layout_below="@+id/objectiveEdit"
|
||||
android:layout_alignRight="@+id/impactEdit"
|
||||
android:layout_alignEnd="@+id/impactEdit"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:background="@android:color/transparent"
|
||||
android:onClick="saveClick"/>
|
||||
|
||||
</RelativeLayout>
|
||||
</ScrollView>
|
||||
</LinearLayout>
|
|
@ -18,6 +18,7 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#EEEEEE"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="@string/app_name"
|
||||
android:id="@+id/title" />
|
||||
|
|
|
@ -2,6 +2,4 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
tools:context="com.kauron.dungeonmanager.PowerEditor">
|
||||
<item android:id="@+id/action_settings" android:title="@string/action_settings"
|
||||
android:orderInCategory="100" app:showAsAction="never" />
|
||||
</menu>
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
<color name="icons">#FFFFFF</color>
|
||||
<color name="divider">#B6B6B6</color>
|
||||
|
||||
<color name="red">#F00</color>
|
||||
<color name="yellow">#ff0</color>
|
||||
<color name="red">#9F0D0A</color>
|
||||
<color name="yellow">#FFBB00</color>
|
||||
<color name="green">#0f0</color>
|
||||
|
||||
<color name="surges_bar">#FFD700</color>
|
||||
<color name="px_bar">#62BACE</color>
|
||||
<color name="surges_bar">#989F2B</color>
|
||||
<color name="px_bar">#005874</color>
|
||||
<!--<color name="primary">#5D4037</color>-->
|
||||
<!--<color name="primaryDark">#3E2723</color>-->
|
||||
</resources>
|
|
@ -2,4 +2,10 @@
|
|||
<!-- Default screen margins, per the Android Design guidelines. -->
|
||||
<dimen name="activity_horizontal_margin">16dp</dimen>
|
||||
<dimen name="activity_vertical_margin">16dp</dimen>
|
||||
|
||||
<dimen name="fab_button_diameter">56dp</dimen>
|
||||
<dimen name="fab_button_margin_bottom">16dp</dimen>
|
||||
<dimen name="fab_button_margin_right">16dp</dimen>
|
||||
<dimen name="elevation_low">1dp</dimen>
|
||||
<dimen name="elevation_high">8dp</dimen>
|
||||
</resources>
|
||||
|
|
|
@ -91,4 +91,18 @@
|
|||
<string name="zero" translatable="false">0</string>
|
||||
<string name="no_players">No players, please add one</string>
|
||||
<string name="help_welcome_text">Press a player to open, long press for options</string>
|
||||
<string name="character_creation">Character creation</string>
|
||||
<string name="name">Name</string>
|
||||
<string name="keywords">Keywords</string>
|
||||
<string name="powerNameHint">Mordedura visual</string>
|
||||
<string name="keywordsPowerHint">Arcano, hechizo, psíquico</string>
|
||||
<string name="number10">10</string>
|
||||
<string name="vs">VS</string>
|
||||
<string name="save">Save</string>
|
||||
<string name="impactEditHint">1d6 + mod. CAR y eres invisible hasta el comienzo del siguiente turno</string>
|
||||
<string name="impact">Impact</string>
|
||||
<string name="objective">Objective</string>
|
||||
<string name="objectiveHint">One creature</string>
|
||||
<string name="power_editor">Power Editor</string>
|
||||
<string name="save_player">Save player</string>
|
||||
</resources>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<resources>
|
||||
|
||||
<!-- Base application theme. -->
|
||||
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
|
||||
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<!-- Customize your theme here. -->
|
||||
<item name="colorPrimaryDark">@color/primary_dark</item>
|
||||
<item name="colorPrimary">@color/primary</item>
|
||||
|
|
Reference in a new issue