# 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 @@ 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 @@ \ 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"/> @@ -65,7 +67,8 @@ + android:layout_width="wrap_content" + android:background="@drawable/dropdown"/> + android:layout_width="wrap_content" + android:background="@drawable/dropdown"/> + android:layout_below="@id/gameOptions" + android:background="@drawable/dropdown"/> + android:scaleType="centerInside" + android:background="@android:color/transparent" + android:src="@drawable/teams"/> + android:layout_marginLeft="3dip" + android:background="@drawable/dropdown"/> + android:layout_marginLeft="3dip" + android:background="@drawable/dropdown"/> + android:layout_marginLeft="3dip" + android:background="@drawable/dropdown"/> + android:layout_toLeftOf="@id/btnPlay" + android:background="@drawable/dropdown"/> @@ -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"/> + android:layout_toRightOf="@+id/btnTeam1" + android:background="@drawable/dropdown"/> adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, FrontendDataUtils.getMaps(this)); + ArrayAdapter adapter = new ArrayAdapter(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> 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> 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 adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, FrontendDataUtils.getVoices(this)); + ArrayAdapter adapter = new ArrayAdapter(this, R.layout.listview_item, FrontendDataUtils.getVoices(this)); voice.setAdapter(adapter); voice.setOnFocusChangeListener(focusser); voiceButton.setOnClickListener(voiceClicker); - adapter = new ArrayAdapter(this, android.R.layout.simple_spinner_item, FrontendDataUtils.getForts(this)); + adapter = new ArrayAdapter(this, R.layout.listview_item, FrontendDataUtils.getForts(this)); fort.setAdapter(adapter); fort.setOnItemSelectedListener(fortSelector); fort.setOnFocusChangeListener(focusser);