# HG changeset patch
# User Xeli
# Date 1313717605 -7200
# Node ID d3a3e80ad1da2be6b2d8a3bcccdd7d3098ed25ab
# Parent 31bd6e30df02a8e07e0d25b96153450eeecd4bf0
Added several graphics
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-large-mdpi/backbutton.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-large-mdpi/backbutton.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/backbutton.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/backbutton.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/box.9.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/box.9.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/dropdown.9.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/dropdown.9.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/dropdown.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/dropdown.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/savebutton.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/savebutton.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/startgamebutton.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/startgamebutton.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-mdpi/teams.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-mdpi/teams.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/drawable-normal-hdpi/backbutton.png
Binary file project_files/Android-build/SDL-android-project/res/drawable-normal-hdpi/backbutton.png has changed
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/backbutton.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/backbutton.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/backbutton.xml Fri Aug 19 03:33:25 2011 +0200
@@ -2,8 +2,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageButton
android:id="@+id/btnBack"
- android:layout_width="wrap_content"
- android:layout_height="50dip"
+ android:layout_width="120dip"
+ android:layout_height="40dip"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:adjustViewBounds="true"
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/listview_item.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/listview_item.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/listview_item.xml Fri Aug 19 03:33:25 2011 +0200
@@ -3,5 +3,5 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="10dip"
- android:textColor="#000"
+ android:textColor="#FFF"
android:gravity="center"/>
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/savebutton.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/savebutton.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/savebutton.xml Fri Aug 19 03:33:25 2011 +0200
@@ -2,8 +2,8 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<ImageButton
android:id="@+id/btnSave"
- android:layout_width="wrap_content"
- android:layout_height="50dip"
+ android:layout_width="120dip"
+ android:layout_height="40dip"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:adjustViewBounds="true"
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/spinner_textimg_entry.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/spinner_textimg_entry.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/spinner_textimg_entry.xml Fri Aug 19 03:33:25 2011 +0200
@@ -17,6 +17,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14dip"
- android:textColor="#000"
+ android:textColor="#FFF"
android:gravity="center"/>
</LinearLayout>
\ No newline at end of file
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/starting_game.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/starting_game.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/starting_game.xml Fri Aug 19 03:33:25 2011 +0200
@@ -20,7 +20,8 @@
android:layout_width="wrap_content"
android:layout_below="@id/mapPreview"
android:layout_alignRight="@id/mapPreview"
- android:layout_toRightOf="@+id/txtMap"/>
+ android:layout_toRightOf="@+id/txtMap"
+ android:background="@drawable/dropdown"/>
<TextView
android:id="@id/txtMap"
android:layout_width="wrap_content"
@@ -54,6 +55,7 @@
android:id="@+id/spinGameplay"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
+ android:background="@drawable/dropdown"
/>
</TableRow>
<TableRow>
@@ -65,7 +67,8 @@
<Spinner
android:id="@+id/spinGamescheme"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"/>
+ android:layout_width="wrap_content"
+ android:background="@drawable/dropdown"/>
<ImageButton
android:id="@+id/btnGamescheme"
android:layout_height="wrap_content"
@@ -88,7 +91,8 @@
<Spinner
android:id="@+id/spinweapons"
android:layout_height="wrap_content"
- android:layout_width="wrap_content"/>
+ android:layout_width="wrap_content"
+ android:background="@drawable/dropdown"/>
<ImageButton
android:id="@+id/btnweapons"
@@ -117,21 +121,24 @@
android:layout_width="wrap_content"
android:layout_toRightOf="@+id/imgTheme"
android:layout_alignParentRight="true"
- android:layout_below="@id/gameOptions"/>
+ android:layout_below="@id/gameOptions"
+ android:background="@drawable/dropdown"/>
<include layout="@layout/backbutton"/>
<ImageButton
android:id="@+id/btnTeams"
- android:layout_width="wrap_content"
- android:layout_height="50dip"
+ android:layout_width="120dip"
+ android:layout_height="40dip"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true"
- android:scaleType="centerInside"/>
+ android:scaleType="centerInside"
+ android:background="@android:color/transparent"
+ android:src="@drawable/teams"/>
<ImageButton
android:id="@+id/btnStart"
- android:layout_width="wrap_content"
- android:layout_height="50dip"
+ android:layout_width="120dip"
+ android:layout_height="40dip"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:adjustViewBounds="true"
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/team_creation.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/team_creation.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/team_creation.xml Fri Aug 19 03:33:25 2011 +0200
@@ -56,7 +56,8 @@
android:id="@id/spinType"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="3dip"/>
+ android:layout_marginLeft="3dip"
+ android:background="@drawable/dropdown"/>
</TableRow>
<TableRow android:padding="2dip">
<TextView
@@ -71,7 +72,8 @@
android:id="@id/spinGrave"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="3dip"/>
+ android:layout_marginLeft="3dip"
+ android:background="@drawable/dropdown"/>
</TableRow>
<TableRow android:padding="2dip">
<TextView
@@ -86,7 +88,8 @@
android:id="@id/spinFlag"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="3dip"/>
+ android:layout_marginLeft="3dip"
+ android:background="@drawable/dropdown"/>
</TableRow>
<TableRow android:padding="2dip">
<TextView
@@ -116,7 +119,8 @@
android:layout_height="fill_parent"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@id/btnPlay"/>
+ android:layout_toLeftOf="@id/btnPlay"
+ android:background="@drawable/dropdown"/>
</RelativeLayout>
</TableRow>
<TableRow android:padding="2dip">
@@ -135,7 +139,8 @@
android:id="@+id/spinFort"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"/>
+ android:layout_centerHorizontal="true"
+ android:background="@drawable/dropdown"/>
<ImageView
android:id="@+id/imgFort"
android:layout_width="128dip"
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/res/layout/team_creation_entry.xml
--- a/project_files/Android-build/SDL-android-project/res/layout/team_creation_entry.xml Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/res/layout/team_creation_entry.xml Fri Aug 19 03:33:25 2011 +0200
@@ -10,7 +10,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
- android:layout_toRightOf="@+id/btnTeam1"/>
+ android:layout_toRightOf="@+id/btnTeam1"
+ android:background="@drawable/dropdown"/>
<EditText
android:id="@+id/txtTeam1"
android:layout_width="fill_parent"
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/StartGameActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/StartGameActivity.java Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/StartGameActivity.java Fri Aug 19 03:33:25 2011 +0200
@@ -64,7 +64,7 @@
back.setOnClickListener(backClicker);
team.setOnClickListener(teamClicker);
- ArrayAdapter<?> adapter = new ArrayAdapter<Map>(this, android.R.layout.simple_spinner_item, FrontendDataUtils.getMaps(this));
+ ArrayAdapter<?> adapter = new ArrayAdapter<Map>(this, R.layout.listview_item, FrontendDataUtils.getMaps(this));
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
maps.setAdapter(adapter);
maps.setOnItemSelectedListener(mapsClicker);
diff -r 31bd6e30df02 -r d3a3e80ad1da project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/TeamCreatorActivity.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/TeamCreatorActivity.java Fri Aug 19 03:32:07 2011 +0200
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/mobile/TeamCreatorActivity.java Fri Aug 19 03:33:25 2011 +0200
@@ -79,6 +79,7 @@
}
ArrayList<HashMap<String, ?>> gravesData = FrontendDataUtils.getGraves(this);
SimpleAdapter sa = new SimpleAdapter(this, gravesData, R.layout.spinner_textimg_entry, new String[]{"txt", "img"}, new int[]{R.id.spinner_txt, R.id.spinner_img});
+
sa.setViewBinder(viewBinder);
grave.setAdapter(sa);
grave.setOnFocusChangeListener(focusser);
@@ -93,7 +94,7 @@
sa = new SimpleAdapter(this, typesData, R.layout.spinner_textimg_entry, new String[]{"txt", "img"}, new int[]{R.id.spinner_txt, R.id.spinner_img});
difficulty.setAdapter(sa);
difficulty.setOnFocusChangeListener(focusser);
-
+
ArrayList<HashMap<String, ?>> hatsData = FrontendDataUtils.getHats(this);
sa = new SimpleAdapter(this, hatsData, R.layout.spinner_textimg_entry, new String[]{"txt", "img"}, new int[]{R.id.spinner_txt, R.id.spinner_img});
sa.setViewBinder(viewBinder);
@@ -101,12 +102,12 @@
spin.setAdapter(sa);
}
- ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, FrontendDataUtils.getVoices(this));
+ ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, R.layout.listview_item, FrontendDataUtils.getVoices(this));
voice.setAdapter(adapter);
voice.setOnFocusChangeListener(focusser);
voiceButton.setOnClickListener(voiceClicker);
- adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, FrontendDataUtils.getForts(this));
+ adapter = new ArrayAdapter<String>(this, R.layout.listview_item, FrontendDataUtils.getForts(this));
fort.setAdapter(adapter);
fort.setOnItemSelectedListener(fortSelector);
fort.setOnFocusChangeListener(focusser);