sorted and renamed all drawables

This commit is contained in:
=
2017-10-20 15:39:10 +02:00
parent 71406b3fe2
commit 2d74599749
40 changed files with 190 additions and 195 deletions

View File

@ -11,8 +11,8 @@ import de.frajul.endlessroll.R;
public enum ToolUpgradeType {
NONE(R.string.tool_upgrade_none, "", R.drawable.tools_rampbutton), TIME(R.string.tool_upgrade_time, "s", R.drawable.clock), RADIUS(
R.string.tool_upgrade_radius, "%", R.drawable.radius), FORCE(R.string.tool_upgrade_force, "%", R.drawable.magnet_field);
NONE(R.string.tool_upgrade_none, "", R.drawable.tools_ramp_button), TIME(R.string.tool_upgrade_time, "s", R.drawable.guis_clock), RADIUS(
R.string.tool_upgrade_radius, "%", R.drawable.guis_radius), FORCE(R.string.tool_upgrade_force, "%", R.drawable.guis_magnet_field);
@StringRes
private int name;

View File

@ -49,7 +49,7 @@ public class ToolInspector implements View.OnClickListener {
this.locked = locked;
this.title.setText(locked ? R.string.tool_name_unknown : toolType.getName());
this.imageView.setImageDrawable(gameActivity.getResources().getDrawable(
locked ? R.drawable.tools_lockedbutton : toolType.getButtonDrawable()));
locked ? R.drawable.tools_button_locked : toolType.getButtonDrawable()));
priceButton.init(R.string.price_button_buy, toolType.getPrice(), R.drawable.currency_star);
priceButton.setLayoutVisible(toolType.isBought() || locked ? View.GONE : View.VISIBLE);
priceButton.setLayoutEnabled(toolType.getPrice() <= gameActivity.getUser().getStarCount());

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 278 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context=".main.GameActivity">
<item android:state_enabled="true">
<bitmap android:src="@drawable/settings_enabled"/>
<bitmap android:src="@drawable/guis_settings_enabled"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/settings_disabled"/>
<bitmap android:src="@drawable/guis_settings_disabled"/>
</item>
</selector>

View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" tools:context=".main.GameActivity">
<item android:state_enabled="true">
<bitmap android:src="@drawable/shop_enabled"/>
<bitmap android:src="@drawable/guis_shop_enabled"/>
</item>
<item android:state_enabled="false">
<bitmap android:src="@drawable/shop_disabled"/>
<bitmap android:src="@drawable/guis_shop_disabled"/>
</item>
</selector>

View File

@ -54,7 +54,7 @@
android:id="@+id/levelbutton_lock"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@drawable/lock_locked"
android:src="@drawable/guis_lock_locked"
android:layout_centerInParent="true"
android:visibility="invisible"
android:layout_weight="1"/>

View File

@ -38,7 +38,7 @@
android:layout_height="10dp"
android:id="@+id/imageView"
android:layout_gravity="center_horizontal"
android:src="@drawable/splitter"
android:src="@drawable/guis_splitter"
android:layout_marginTop="10dp"/>
<LinearLayout

View File

@ -28,7 +28,7 @@
android:layout_height="45dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:src="@drawable/tools_rampbutton"/>
android:src="@drawable/tools_ramp_button"/>
<include
android:id="@+id/tool_inspector_pricebutton"

View File

@ -9,6 +9,6 @@
android:layout_height="70dp"
android:layout_gravity="center"
android:background="@drawable/xml_background_toolslot"
android:src="@drawable/tools_rampbutton"/>
android:src="@drawable/tools_ramp_button"/>
</FrameLayout>

View File

@ -27,7 +27,7 @@
android:layout_gravity="center"
android:layout_marginRight="3dp"
android:layout_weight="1"
android:src="@drawable/tools_rampbutton"/>
android:src="@drawable/tools_ramp_button"/>
<LinearLayout
android:layout_width="wrap_content"
@ -53,7 +53,7 @@
android:layout_gravity="center_vertical|center_horizontal"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:src="@drawable/arrow_green"/>
android:src="@drawable/guis_arrow_green"/>
<TextView
android:id="@+id/tool_upgrade_value_new"

View File

@ -8,13 +8,13 @@
android:layout_width="70dp"
android:layout_height="60dp"
android:layout_centerInParent="true"
android:src="@drawable/tools_rampbutton"/>
android:src="@drawable/tools_ramp_button"/>
<ImageView
android:id="@+id/toolProgressButtonAnimation"
android:layout_width="70dp"
android:layout_height="60dp"
android:src="@drawable/tools_rampbutton"
android:src="@drawable/tools_ramp_button"
android:visibility="invisible"/>
<ProgressBar

View File

@ -9,7 +9,7 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:id="@+id/unlockmessage_toolimage"
android:src="@drawable/tools_rampbutton"
android:src="@drawable/tools_ramp_button"
android:layout_gravity="center_vertical"/>
<TextView

View File

@ -22,7 +22,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:adjustViewBounds="true"
android:src="@drawable/previews_grass"
android:src="@drawable/world_previews_grass"
android:layout_width="150dp"/>
<RelativeLayout
@ -44,7 +44,7 @@
android:layout_width="30sp"
android:layout_height="30sp"
android:layout_alignParentStart="true"
android:src="@drawable/tick"/>
android:src="@drawable/guis_tick"/>
<TextView
android:id="@+id/worldbutton_levelcount"
@ -106,7 +106,7 @@
android:id="@+id/worldbutton_lock"
android:layout_width="150dp"
android:layout_height="150dp"
android:src="@drawable/lock_locked"
android:src="@drawable/guis_lock_locked"
android:visibility="visible"
android:layout_alignBottom="@+id/worldbutton_preview"
android:layout_alignLeft="@+id/worldbutton_preview"