Put all strings into res -> German translation should be relatively easy

This commit is contained in:
=
2017-08-03 14:07:53 +02:00
parent 50cbdb6688
commit 0437b0178e
40 changed files with 4469 additions and 7325 deletions

View File

@ -1,6 +1,7 @@
package de.frajul.endlessroll.entities.tools;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import de.frajul.endlessroll.R;
@ -10,21 +11,23 @@ import de.frajul.endlessroll.R;
public enum ToolUpgradeType {
NONE("None", "", R.drawable.tools_rampbutton), TIME("Time", "s", R.drawable.clock), RADIUS(
"Radius", "%", R.drawable.radius), FORCE("Force", "%", R.drawable.magnet_field);
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);
private String name;
@StringRes
private int name;
private String unit;
@DrawableRes
private int drawable;
ToolUpgradeType(String name, String unit, @DrawableRes int drawable) {
ToolUpgradeType(@StringRes int name, String unit, @DrawableRes int drawable) {
this.name = name;
this.unit = unit;
this.drawable = drawable;
}
public String getName() {
@StringRes
public int getName() {
return name;
}

View File

@ -3,6 +3,7 @@ package de.frajul.endlessroll.views;
import android.content.Context;
import android.graphics.Typeface;
import android.support.annotation.DrawableRes;
import android.support.annotation.StringRes;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageView;
@ -34,7 +35,7 @@ public class PriceButton {
currencyView = (ImageView) layout.findViewById(R.id.price_button_currency);
}
public void init(String title, int price, @DrawableRes int currencyDrawable) {
public void init(@StringRes int title, int price, @DrawableRes int currencyDrawable) {
this.title.setText(title);
this.price.setText(price + "");
this.currencyView.setImageDrawable(context.getResources().getDrawable(currencyDrawable));

View File

@ -47,10 +47,10 @@ public class ToolInspector implements View.OnClickListener {
public void update(ToolType toolType, boolean locked) {
this.toolType = toolType;
this.locked = locked;
this.title.setText(locked ? "???" : toolType.getName());
this.title.setText(locked ? R.string.tool_name_unknown : toolType.getName());
this.imageView.setImageDrawable(gameActivity.getResources().getDrawable(
locked ? R.drawable.tools_lockedbutton : toolType.getButtonDrawable()));
priceButton.init("Buy", toolType.getPrice(), R.drawable.currency_star);
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());

View File

@ -48,12 +48,13 @@ public class ToolUpgradeView implements View.OnClickListener {
this.upgrade = toolUpgrade;
this.toolBought = toolBought;
this.availableEnergy = availableEnergy;
this.title.setText(
toolUpgrade.getType().getName() + " (Lv" + toolUpgrade.getCurrentLevel() + ")");
this.title.setText(context.getString(R.string.tool_upgrade_title_format_sd,
context.getString(toolUpgrade.getType().getName()), toolUpgrade.getCurrentLevel()));
this.imageView.setImageDrawable(
context.getResources().getDrawable(toolUpgrade.getType().getDrawable()));
updateValueViews();
priceButton.init("Upgrade", toolUpgrade.getPrice(), R.drawable.currency_energy);
priceButton.init(R.string.price_button_upgrade, toolUpgrade.getPrice(),
R.drawable.currency_energy);
priceButton.setLayoutVisible(isAtMaxLevel() ? View.GONE : View.VISIBLE);
priceButton.setLayoutEnabled(toolBought && toolUpgrade.getPrice() <= availableEnergy);
}
@ -66,8 +67,8 @@ public class ToolUpgradeView implements View.OnClickListener {
String unit = upgrade.getType().getUnit();
valueOld.setText(upgrade.getValueAtCurrentLevel() + unit);
valueNew.setText(upgrade.getValueAtNextLevel() + unit);
if(isAtMaxLevel())
valueNew.setText("Max.");
if (isAtMaxLevel())
valueNew.setText(R.string.tool_upgrade_value_max);
}
private boolean isAtMaxLevel() {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -28,8 +28,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:text="0.0m"
android:textColor="#ffb405"
android:text="@string/game_playerprogress_placeholder"
android:textColor="@color/game_progress_text"
android:textSize="22sp"/>
<TextView
@ -39,8 +39,8 @@
android:layout_alignLeft="@+id/game_playerprogress"
android:layout_alignStart="@+id/game_playerprogress"
android:layout_below="@+id/game_playerprogress"
android:text="0.0m/s"
android:textColor="#ffb405"
android:text="@string/game_playerspeed_placeholder"
android:textColor="@color/game_progress_text"
android:textSize="22sp"/>
<TextView
@ -50,7 +50,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:text="Fps: 00"
android:text="@string/game_fps_placeholder"
android:textColor="@android:color/white"
android:textSize="15sp"/>
@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:text="3"
android:text="@string/game_countdown_placeholder"
android:textColor="@color/countdown3"
android:textSize="100sp"
android:textStyle="bold"

View File

@ -9,8 +9,7 @@
android:id="@+id/levelbutton_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Button"
android:textColor="#000000"
android:text="@string/button_placeholder"
android:textSize="30sp"
android:layout_centerHorizontal="true"/>

View File

@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="4"
android:text="@string/number_placeholder"
android:textColor="#ffae00"
android:textSize="60sp"
android:textStyle="bold"
@ -28,7 +28,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Level Up"
android:text="@string/levelup"
android:textColor="#ffe100"
android:textSize="50sp"
android:textStyle="bold"/>

View File

@ -6,7 +6,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Game Over"
android:text="@string/message_game_over"
android:id="@+id/message_title"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
@ -24,16 +24,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="200dp"
android:text="Tools"
android:textColor="#daf10d"
android:text="@string/message_tools"
android:textColor="@color/message_views"
android:textSize="40sp"/>
<TextView
android:id="@+id/message_to_menu"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="To menu"
android:textColor="#daf10d"
android:text="@string/message_to_menu"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</LinearLayout>
@ -49,8 +49,8 @@
android:id="@+id/message_restart"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Restart"
android:textColor="#daf10d"
android:text="@string/message_restart"
android:textColor="@color/message_views"
android:textSize="40sp"
android:layout_marginEnd="120dp"/>
@ -58,8 +58,8 @@
android:id="@+id/message_next_level"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Next level"
android:textColor="#daf10d"
android:text="@string/message_next_level"
android:textColor="@color/message_views"
android:textSize="40sp"/>
</LinearLayout>

View File

@ -8,7 +8,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="LOADING"
android:text="@string/pre_start_screen_loading"
android:textAllCaps="false"
android:textSize="30sp"
android:textStyle="bold"/>

View File

@ -13,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="Upgrade"
android:text="@string/button_placeholder"
android:textSize="13sp"/>
<LinearLayout
@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="2dp"
android:text="1000"
android:text="@string/number_placeholder"
android:textSize="15sp"/>
<ImageView

View File

@ -21,7 +21,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Continue"
android:text="@string/short_menu_continue"
android:textSize="40sp"
android:textColor="@color/win"
android:id="@+id/shortmenu_continue"/>
@ -29,7 +29,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Restart"
android:text="@string/message_restart"
android:textSize="40sp"
android:textColor="@color/win"
android:id="@+id/shortmenu_restart"/>
@ -37,7 +37,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Exit"
android:text="@string/short_menu_exit"
android:textSize="40sp"
android:textColor="@color/win"
android:id="@+id/shortmenu_exit"/>

View File

@ -7,15 +7,12 @@
android:id="@+id/startscreen_sound"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/startscreen_play"
android:layout_marginLeft="75dp"
android:layout_marginStart="75dp"
android:layout_marginTop="34dp"
android:layout_toEndOf="@+id/startscreen_play"
android:layout_toRightOf="@+id/startscreen_play"
android:background="@drawable/xml_selector_sound"
android:textOff=""
android:textOn=""/>
android:textOn=""
android:layout_alignParentBottom="true"
android:layout_alignRight="@+id/startscreen_play"
android:layout_alignEnd="@+id/startscreen_play"/>
<Button
android:id="@+id/startscreen_play"
@ -26,7 +23,7 @@
android:layout_marginTop="38dp"
android:background="@drawable/playershapes_ball"
android:gravity="center"
android:text="Play"
android:text="@string/start_screen_play"
android:textAlignment="gravity"
android:textColor="#ffffff"
android:textSize="26sp"/>
@ -36,24 +33,20 @@
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/startscreen_play"
android:layout_alignEnd="@+id/startscreen_sound"
android:layout_alignRight="@+id/startscreen_sound"
android:layout_marginBottom="26dp"
android:text="Unlock all levels"
android:visibility="visible"/>
android:text="@string/start_screen_unlock_all_levels"
android:visibility="visible"
android:layout_below="@+id/startscreen_play"
android:layout_alignParentRight="true"/>
<Button
android:id="@+id/startscreen_gain_90_ep"
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:text="@string/start_screen_gain_90_ep"
android:visibility="visible"
android:layout_below="@+id/startscreen_play"
android:layout_marginLeft="48dp"
android:layout_marginStart="48dp"
android:text="Gain 90 ep"
android:visibility="visible"/>
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"/>
</RelativeLayout>

View File

@ -11,7 +11,7 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:text="Ramp"
android:text="@string/textview_placeholder"
android:textSize="28sp"/>
<LinearLayout

View File

@ -8,9 +8,8 @@
android:id="@+id/toolofferslot_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ramp"
android:text="@string/textview_placeholder"
android:layout_gravity="center_horizontal"
android:textColor="#000000"
android:textSize="25sp"/>
<include

View File

@ -12,7 +12,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Time (Lv12)"
android:text="@string/tool_upgrade_title_placeholder"
android:textSize="17sp"/>
<LinearLayout
@ -44,7 +44,7 @@
android:id="@+id/tool_upgrade_value_old"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="80%"
android:text="@string/percent_placeholder"
android:textSize="16sp"/>
<ImageView
@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="90%"
android:text="@string/percent_placeholder"
android:textSize="16sp"/>
</LinearLayout>

View File

@ -21,8 +21,7 @@
android:id="@+id/topbar_leveldisplay"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Level: 1"
android:textColor="#000000"
android:text="@string/topbar_level_placeholder"
android:textSize="25sp"/>
<ProgressBar
@ -59,8 +58,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/topbar_starview"
android:text="100"
android:textColor="#000000"
android:text="@string/number_placeholder"
android:textSize="25sp"/>
<TextView
@ -69,8 +67,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/topbar_energyview"
android:text="100"
android:textColor="#000000"
android:text="@string/number_placeholder"
android:textSize="25sp"/>
<ToggleButton
@ -93,15 +90,14 @@
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:text="Tool-Shop"/>
android:text="@string/topbar_toolshop"/>
<TextView
android:id="@+id/topbar_starcount_decrease"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-200"
android:text="@string/number_placeholder"
android:visibility="invisible"
android:textColor="#000000"
android:textSize="20sp"
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/topbar_starcount"/>
@ -110,9 +106,8 @@
android:id="@+id/topbar_energycount_decrease"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-200"
android:text="@string/number_placeholder"
android:visibility="invisible"
android:textColor="#000000"
android:textSize="20sp"
android:layout_centerVertical="true"
android:layout_alignEnd="@+id/topbar_energycount"/>
@ -122,7 +117,7 @@
style="@style/GameButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Reset"
android:text="@string/topbar_reset"
android:layout_marginLeft="64dp"
android:layout_marginStart="64dp"
android:layout_alignBaseline="@+id/topbar_soundtoggle"

View File

@ -2,7 +2,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<!--android:background="@drawable/backgrounds_menu_shortmenu">-->
<RelativeLayout
android:layout_width="wrap_content"
@ -16,7 +15,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="Welcome to Endless Roll!\nHave fun!"
android:text="@string/tutorial_placeholder"
android:textAlignment="center"/>
<ImageView

View File

@ -15,10 +15,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ramp unlocked"
android:text="@string/unlock_message_placeholder"
android:id="@+id/unlockmessage_message"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:textColor="#000000"
android:textSize="20sp"/>
</LinearLayout>

View File

@ -10,7 +10,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="Unknown"
android:text="@string/world_button_title_placeholder"
android:textColor="#ff2200"
android:textSize="30sp"
android:textStyle="bold|italic"/>
@ -50,8 +50,7 @@
android:id="@+id/worldbutton_levelcount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="9/35"
android:textColor="#000000"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"
android:layout_centerVertical="true"
@ -75,8 +74,7 @@
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/levelbutton_starView"
android:layout_toRightOf="@+id/levelbutton_starView"
android:text="7/105"
android:textColor="#000000"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"
android:layout_marginRight="10dp"/>
@ -88,8 +86,7 @@
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/imageView4"
android:layout_toRightOf="@+id/imageView4"
android:text="9/35"
android:textColor="#000000"
android:text="@string/world_button_progress_placeholder"
android:textSize="20sp"
android:textStyle="bold"/>

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string-array name="world_names">
<item>World zer0</item>
<item>Grasslands</item>
<item>Icy Mountains</item>
<item>Testcave</item>
<item>Mysterious fireworld</item>
</string-array>
</resources>

View File

@ -3,6 +3,8 @@
<color name="win">#ffda45</color>
<color name="loose">#891e4e</color>
<color name="retry">#39be27</color>
<color name="game_progress_text">#ffb405</color>
<color name="message_views">#daf10d</color>
<color name="toolbuttonInactiveNotReady">#db911c0f</color>
<color name="toolbuttonInactiveReady">#dbfff200</color>
<color name="toolbuttonActiveNotReady">#e5dc1522</color>

View File

@ -1,5 +1,59 @@
<resources>
<string name="app_name">Endless Roll</string>
<string name="button_placeholder">Click me!</string>
<string name="textview_placeholder">I\'m a text!</string>
<string name="number_placeholder">997.5</string>
<string name="percent_placeholder">85.1%</string>
<string name="game_playerprogress_placeholder">0.0m</string>
<string name="game_playerprogress_format_f">%.2fm</string>
<string name="game_playerspeed_placeholder">0.0m/s</string>
<string name="game_playerspeed_format_f">%.1fm/s</string>
<string name="game_fps_placeholder">Fps: 00</string>
<string name="game_fps_format_d">Fps: %d</string>
<string name="game_countdown_placeholder">3</string>
<string name="levelup">Level Up</string>
<string name="message_game_over">GAME OVER</string>
<string name="message_win">YOU DID IT</string>
<string name="message_tools">Tools</string>
<string name="message_to_menu">To menu</string>
<string name="message_restart">Restart</string>
<string name="message_try_again">Try again</string>
<string name="message_next_level">Next level</string>
<string name="pre_start_screen_loading">LOADING...</string>
<string name="short_menu_continue">Continue</string>
<string name="short_menu_restart">Restart</string>
<string name="short_menu_exit">Exit</string>
<string name="start_screen_play">Play</string>
<string name="start_screen_unlock_all_levels">Unlock all levels (Yes! It\'s magic!)</string>
<string name="start_screen_gain_90_ep">Gain 90 ep (Nope! No magic at all!)</string>
<string name="tool_upgrade_title_placeholder">Time (Lv12)</string>
<string name="topbar_level_placeholder">Level: 24</string>
<string name="topbar_level_format_d">Level: %d</string>
<string name="topbar_reset">Reset</string>
<string name="topbar_toolshop">Toolshop</string>
<string name="unlock_message_placeholder">Ramp unlocked</string>
<string name="world_button_title_placeholder">Great world</string>
<string name="world_button_progress_placeholder">21/15</string>
<string name="bounty_message_resource_format_s">%s</string>
<string name="bounty_message_tool_format_s">%s unlocked!</string>
<string name="bounty_message_tool_slot">You unlocked a Toolslot</string>
<string name="level_button_format_d">Level: %d</string>
<string name="price_button_buy">Buy</string>
<string name="price_button_upgrade">Upgrade</string>
<string name="tool_name_unknown">\?\?\?</string>
<string name="tool_name_ramp">Ramp</string>
<string name="tool_name_spring">Spring</string>
<string name="tool_name_magnet">Magnet</string>
<string name="tool_name_bomb">Bomb</string>
<string name="tool_upgrade_title_format_sd">%1$s (Lv%2$d)</string>
<string name="tool_upgrade_none">None</string>
<string name="tool_upgrade_time">Time</string>
<string name="tool_upgrade_radius">Radius</string>
<string name="tool_upgrade_force">Force</string>
<string name="tool_upgrade_value_max">Max.</string>
<string name="tutorial_placeholder">This is a multiline placeholder\nfor all the tutorials I made!!!\nAwesome! - Isn\'t it?</string>
<string name="tutorial_welcome">Welcome to Endless Roll!\nHave fun!</string>
<string name="tutorial_toolbar">This is the toolbar. Here you can select the tool you currently want to use.</string>
<string name="tutorial_place_tools">You can use the selected tool by clicking on the wanted position on the screen.</string>