Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added an inventory tab to the shop activity #8

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AndorsTrail/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<string name="shop_yourgold">Deine Goldmünzen: %1$d</string>
<string name="shop_item_bought">%1$s gekauft.</string>
<string name="shop_item_sold">%1$s verkauft.</string>
<string name="shop_inventory">Inventar</string>

<string name="levelup_title">Aufsteigen</string>
<string name="levelup_description">Du hast Level %1$d erreicht!</string>
Expand Down
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
<string name="shop_yourgold">Votre or : %1$d</string>
<string name="shop_item_bought">%1$s acheté.</string>
<string name="shop_item_sold">%1$s vendu.</string>

<string name="shop_inventory">Inventaire</string>

<string name="levelup_title">Niveau supérieur</string>
<string name="levelup_description">Bienvenue au niveau %1$d !</string>
<string name="levelup_buttontext">Niveau supérieur</string>
Expand Down
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@
<string name="shop_yourgold">Tuo Oro: %1$d</string>
<string name="shop_item_bought">%1$s Comprato.</string>
<string name="shop_item_sold">%1$s Venduo.</string>

<string name="shop_inventory">Inventario</string>

<string name="levelup_title">Nuovo Livello</string>
<string name="levelup_description">Benvenuto nel livello %1$d!</string>
<string name="levelup_buttontext">Nuovo Livello</string>
Expand Down
2 changes: 2 additions & 0 deletions AndorsTrail/res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,7 @@
<string name="actorinfo_attack">תקיפה:</string>
<string name="actorinfo_defense">הגנה:</string>
<string name="actorinfo_movecost">עלות תנועה (פעילות):</string>

<string name="shop_inventory">ציוד</string>

</resources>
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
<string name="shop_yourgold">所持金: %1$d gold</string>
<string name="shop_item_bought">%1$s を買った。</string>
<string name="shop_item_sold">%1$s を売った。</string>

<string name="shop_inventory">アイテム</string>

<string name="levelup_title">Level up</string>
<string name="levelup_description">Level %1$d に到達しました!</string>
<string name="levelup_buttontext">Level up</string>
Expand Down
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
<string name="shop_yourgold">Twoje złoto: %1$d</string>
<string name="shop_item_bought">Kupiłeś %1$s.</string>
<string name="shop_item_sold">Sprzedałeś %1$s.</string>

<string name="shop_inventory">Inwentarz</string>

<string name="levelup_title">Podnieś poziom</string>
<string name="levelup_description">Witaj na poziomie %1$d!</string>
<string name="levelup_buttontext">Podnieś poziom</string>
Expand Down
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
<string name="shop_yourgold">As suas moedas: %1$d</string>
<string name="shop_item_bought">%1$s comprados.</string>
<string name="shop_item_sold">%1$s vendidos.</string>

<string name="shop_inventory">Inventário</string>

<string name="levelup_title">Aumento de nível</string>
<string name="levelup_description">Benvindo ao nível %1$d!</string>
<string name="levelup_buttontext">Aumento de nível</string>
Expand Down
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-pt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
<string name="shop_yourgold">As tuas moedas: %1$d</string>
<string name="shop_item_bought">%1$s comprados.</string>
<string name="shop_item_sold">%1$s vendidos.</string>

<string name="shop_inventory">Inventário</string>

<string name="levelup_title">Aumento de nível</string>
<string name="levelup_description">Benvindo ao nível %1$d!</string>
<string name="levelup_buttontext">Aumento de nível</string>
Expand Down
3 changes: 2 additions & 1 deletion AndorsTrail/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,8 @@
<string name="shop_yourgold">Ваше золото: %1$d</string>
<string name="shop_item_bought">%1$s куплен.</string>
<string name="shop_item_sold">%1$s продан.</string>

<string name="shop_inventory">Инвентарь</string>

<string name="levelup_title">Уровень повышен</string>
<string name="levelup_description">Добро пожаловать на уровень %1$d!</string>
<string name="levelup_buttontext">Новый уровень</string>
Expand Down
1 change: 1 addition & 0 deletions AndorsTrail/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@
<string name="shop_yourgold">Your gold: %1$d</string>
<string name="shop_item_bought">%1$s bought.</string>
<string name="shop_item_sold">%1$s sold.</string>
<string name="shop_inventory">Inventory</string>

<string name="levelup_title">Level up</string>
<string name="levelup_description">Welcome to level %1$d!</string>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
import com.gpl.rpg.AndorsTrail.R;
import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Buy;
import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Inventory;
import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;

public final class ShopActivity extends FragmentActivity {
Expand All @@ -32,5 +33,8 @@ public void onCreate(Bundle savedInstanceState) {
tabHost.addTab(tabHost.newTabSpec("sell")
.setIndicator(res.getString(R.string.shop_sell))
,ShopActivity_Sell.class, null);
tabHost.addTab(tabHost.newTabSpec("inventory")
.setIndicator(res.getString(R.string.shop_inventory))
,ShopActivity_Inventory.class, null);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;

public final class HeroinfoActivity_Inventory extends Fragment {
public class HeroinfoActivity_Inventory extends Fragment {

private static final int INTENTREQUEST_ITEMINFO = 3;
private static final int INTENTREQUEST_BULKSELECT_DROP = 11;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.gpl.rpg.AndorsTrail.activity.fragment;


public final class ShopActivity_Inventory extends HeroinfoActivity_Inventory {
}