diff --git a/app/build.gradle b/app/build.gradle index 0bc1625..286a855 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -5,7 +5,7 @@ android { buildToolsVersion "21.1.2" defaultConfig { applicationId 'com.kauron.dungeonmanager' - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 21 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java index d1d7f8c..bec0bd3 100644 --- a/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java +++ b/app/src/main/java/com/kauron/dungeonmanager/MainActivity.java @@ -300,7 +300,6 @@ public class MainActivity extends ActionBarActivity player.setClassName(p.getString("className", getString(com.kauron.dungeonmanager.R.string.class_name))); player.setRaceName(p.getString("raceName", getString(com.kauron.dungeonmanager.R.string.race_name))); player.setLevel(p.getInt("level", 1)); - //TODO: restore pg player.setAtk(new int[]{ p.getInt("fue", 10), p.getInt("con", 10), @@ -348,10 +347,10 @@ public class MainActivity extends ActionBarActivity getString(com.kauron.dungeonmanager.R.string.CA) + ": " + player.getCa() ); ((TextView) findViewById(com.kauron.dungeonmanager.R.id.FORT)).setText( - getString(com.kauron.dungeonmanager.R.string.FORT) + ": " + player.getFort() + getString(com.kauron.dungeonmanager.R.string.FORT) + ":" + player.getFort() ); ((TextView) findViewById(com.kauron.dungeonmanager.R.id.REF)).setText( - getString(com.kauron.dungeonmanager.R.string.REF) + ": " + player.getRef() + getString(com.kauron.dungeonmanager.R.string.REF) + ":" + player.getRef() ); ((TextView) findViewById(com.kauron.dungeonmanager.R.id.VOL)).setText( getString(com.kauron.dungeonmanager.R.string.VOL) + ": " + player.getVol() @@ -380,6 +379,10 @@ public class MainActivity extends ActionBarActivity ); } + public void selectPlayer(View view) { + //TODO: implement players and switch between them + } + private void undo() { String message = ""; if(undoObject == CURRENT_PG){ diff --git a/app/src/main/res/drawable-hdpi/ic_action_done.png b/app/src/main/res/drawable-hdpi/ic_action_done.png deleted file mode 100644 index f33c5df..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_done.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_done.png b/app/src/main/res/drawable-mdpi/ic_action_done.png deleted file mode 100644 index bb20ba8..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_done.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_done.png b/app/src/main/res/drawable-xhdpi/ic_action_done.png deleted file mode 100644 index 65ea256..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_done.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_done.png b/app/src/main/res/drawable-xxhdpi/ic_action_done.png deleted file mode 100644 index c329d01..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_done.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b7e16e7..1398e6d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,6 +20,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignBottom="@+id/pgCurrent" + android:onClick="selectPlayer" android:id="@+id/scroll1"> \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 1de207d..4acb6ab 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -11,23 +11,13 @@ android:id="@+id/action_cure" android:title="@string/action_cure" android:orderInCategory="2" - app:showAsAction="always" - android:icon="@drawable/ic_action_heal"/> - - - - - - - - - - + app:showAsAction="always"/> +