Rename joystick resources

android/app/src/main/java/org/arianne/stendhal/client/input/DPadArrows.java

@@ -186,20 +186,20 @@ public ArrowView(final Context ctx, final Dir dir) {
 
 			switch (dir) {
 				case LEFT:
-					id = R.drawable.dpad_arrow_left;
-					id_active = R.drawable.dpad_arrow_left_active;
+					id = R.drawable.dpad_left;
+					id_active = R.drawable.dpad_left_active;
 					break;
 				case RIGHT:
-					id = R.drawable.dpad_arrow_right;
-					id_active = R.drawable.dpad_arrow_right_active;
+					id = R.drawable.dpad_right;
+					id_active = R.drawable.dpad_right_active;
 					break;
 				case UP:
-					id = R.drawable.dpad_arrow_up;
-					id_active = R.drawable.dpad_arrow_up_active;
+					id = R.drawable.dpad_up;
+					id_active = R.drawable.dpad_up_active;
 					break;
 				default:
-					id = R.drawable.dpad_arrow_down;
-					id_active = R.drawable.dpad_arrow_down_active;
+					id = R.drawable.dpad_down;
+					id_active = R.drawable.dpad_down_active;
 					break;
 			}
 

android/app/src/main/java/org/arianne/stendhal/client/input/DPadJoy.java

@@ -141,11 +141,11 @@ public OuterButton(final Context ctx) {
 			pressedKeys = new ArrayList<>();
 
 			setBackgroundColor(android.graphics.Color.TRANSPARENT);
-			setImageResource(R.drawable.dpad_circle_outer);
+			setImageResource(R.drawable.joystick_outer);
 
 			innerButton = new InnerButton(ctx);
 			innerButton.setBackgroundColor(android.graphics.Color.TRANSPARENT);
-			innerButton.setImageResource(R.drawable.dpad_circle_inner);
+			innerButton.setImageResource(R.drawable.joystick_inner);
 
 			setOnTouchListener(new View.OnTouchListener() {
 				@Override
@@ -156,7 +156,7 @@ public boolean onTouch(final View view, final MotionEvent event) {
 
 					if (action == MotionEvent.ACTION_DOWN && !keyDown) {
 						keyDown = true;
-						innerButton.setImageResource(R.drawable.dpad_circle_inner_active);
+						innerButton.setImageResource(R.drawable.joystick_inner_active);
 						innerButton.setRelativeX(event.getX());
 						innerButton.setRelativeY(event.getY());
 
@@ -167,7 +167,7 @@ public boolean onTouch(final View view, final MotionEvent event) {
 						}
 					} else if (action == MotionEvent.ACTION_UP && keyDown) {
 						keyDown = false;
-						innerButton.setImageResource(R.drawable.dpad_circle_inner);
+						innerButton.setImageResource(R.drawable.joystick_inner);
 						innerButton.centerOn((JoyPadButton) view);
 
 						clearPresses();

srcjs/stendhal/ui/joystick/DirectionPad.ts

@@ -104,19 +104,19 @@ export class DirectionPad extends JoystickBase {
 			let action: {[index: string]: string} = {type: "move"};
 			switch(e.target) {
 				case this.up:
-					this.up.src = this.getResource("dpad_arrow_up_active");
+					this.up.src = this.getResource("dpad_up_active");
 					action.dir = "1";
 					break;
 				case this.right:
-					this.right.src = this.getResource("dpad_arrow_right_active");
+					this.right.src = this.getResource("dpad_right_active");
 					action.dir = "2";
 					break;
 				case this.down:
-					this.down.src = this.getResource("dpad_arrow_down_active");
+					this.down.src = this.getResource("dpad_down_active");
 					action.dir = "3";
 					break;
 				case this.left:
-					this.left.src = this.getResource("dpad_arrow_left_active");
+					this.left.src = this.getResource("dpad_left_active");
 					action.dir = "4";
 					break;
 			}
@@ -135,10 +135,10 @@ export class DirectionPad extends JoystickBase {
 
 	public override reset() {
 		// reset images
-		this.up.src = this.getResource("dpad_arrow_up");
-		this.down.src = this.getResource("dpad_arrow_down");
-		this.left.src = this.getResource("dpad_arrow_left");
-		this.right.src = this.getResource("dpad_arrow_right");
+		this.up.src = this.getResource("dpad_up");
+		this.down.src = this.getResource("dpad_down");
+		this.left.src = this.getResource("dpad_left");
+		this.right.src = this.getResource("dpad_right");
 	}
 
 	public override onRemoved() {