julian/EndlessRoll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Finished implementing Tutorials

Browse Source
This commit is contained in:
= 2018-01-01 17:28:09 +01:00
parent 4282c0fdfd
commit e5ce11150c
9 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build/intermediates/incremental/mergeDebugResources/merger.xml
View File

File diff suppressed because one or more lines are too long

49
app/build/intermediates/symbols/debug/R.txt
View File

@ -535,30 +535,31 @@ int drawable tutorial_place_ramp_air_2 0x7f07007f
int drawable tutorial_place_ramp_gap 0x7f070080 int drawable tutorial_place_ramp_gap 0x7f070080
int drawable tutorial_place_ramp_obstacle 0x7f070081 int drawable tutorial_place_ramp_obstacle 0x7f070081
int drawable tutorial_place_tools 0x7f070082 int drawable tutorial_place_tools 0x7f070082
int drawable tutorial_to_toolshop 0x7f070083 int drawable tutorial_switch_tools 0x7f070083
int drawable tutorial_toolshop_all_tools 0x7f070084 int drawable tutorial_to_toolshop 0x7f070084
int drawable tutorial_toolshop_equip_spring 0x7f070085 int drawable tutorial_toolshop_all_tools 0x7f070085
int drawable tutorial_toolshop_inspector 0x7f070086 int drawable tutorial_toolshop_equip_spring 0x7f070086
int drawable tutorial_toolshop_select_buy_spring 0x7f070087 int drawable tutorial_toolshop_inspector 0x7f070087
int drawable tutorial_toolshop_toolbar 0x7f070088 int drawable tutorial_toolshop_select_buy_spring 0x7f070088
int drawable world_previews_grass 0x7f070089 int drawable tutorial_toolshop_toolbar 0x7f070089
int drawable xml_background_bountymessage 0x7f07008a int drawable world_previews_grass 0x7f07008a
int drawable xml_background_dialog_button 0x7f07008b int drawable xml_background_bountymessage 0x7f07008b
int drawable xml_background_exit_confirm_dialog 0x7f07008c int drawable xml_background_dialog_button 0x7f07008c
int drawable xml_background_game_over_message_button 0x7f07008d int drawable xml_background_exit_confirm_dialog 0x7f07008d
int drawable xml_background_levelbutton 0x7f07008e int drawable xml_background_game_over_message_button 0x7f07008e
int drawable xml_background_toolslot 0x7f07008f int drawable xml_background_levelbutton 0x7f07008f
int drawable xml_background_toolupgrade 0x7f070090 int drawable xml_background_toolslot 0x7f070090
int drawable xml_background_tutorialtextview 0x7f070091 int drawable xml_background_toolupgrade 0x7f070091
int drawable xml_background_worldbutton 0x7f070092 int drawable xml_background_tutorialtextview 0x7f070092
int drawable xml_layers_toolprogressbar 0x7f070093 int drawable xml_background_worldbutton 0x7f070093
int drawable xml_selector_gamebutton 0x7f070094 int drawable xml_layers_toolprogressbar 0x7f070094
int drawable xml_selector_pricebutton 0x7f070095 int drawable xml_selector_gamebutton 0x7f070095
int drawable xml_selector_settingsbutton 0x7f070096 int drawable xml_selector_pricebutton 0x7f070096
int drawable xml_selector_shapeshopbutton 0x7f070097 int drawable xml_selector_settingsbutton 0x7f070097
int drawable xml_selector_sound 0x7f070098 int drawable xml_selector_shapeshopbutton 0x7f070098
int drawable xml_selector_toolshopbutton 0x7f070099 int drawable xml_selector_sound 0x7f070099
int drawable xml_shape_inspector_checkbox 0x7f07009a int drawable xml_selector_toolshopbutton 0x7f07009a
int drawable xml_shape_inspector_checkbox 0x7f07009b
int id action0 0x7f080000 int id action0 0x7f080000
int id action_bar 0x7f080001 int id action_bar 0x7f080001
int id action_bar_activity_content 0x7f080002 int id action_bar_activity_content 0x7f080002

2
app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialManager.java
View File

@ -42,7 +42,7 @@ public class TutorialManager {
toolShopTutorial = new ToolShopTutorial(gameActivity); toolShopTutorial = new ToolShopTutorial(gameActivity);
switchToolsTutorial = new Tutorial(gameActivity, switchToolsTutorial = new Tutorial(gameActivity,
new BreakPoint(0, R.string.tutorial_switch_tools_two_neccessary, -1), new BreakPoint(0, R.string.tutorial_switch_tools_two_neccessary, -1),
new BreakPoint(0, R.string.tutorial_switch_tools_switch, -1)); new BreakPoint(0, R.string.tutorial_switch_tools_switch, R.drawable.tutorial_switch_tools));
} }
public void update(Level level, float playerProgress) { public void update(Level level, float playerProgress) {

2
app/src/main/java/de/frajul/endlessroll/main/tutorial/TutorialView.java
View File

@ -64,7 +64,7 @@ public class TutorialView implements View.OnClickListener {
textView.setText(textId); textView.setText(textId);
} }
if (imageId == -1) if (imageId == -1)
imageView.setVisibility(View.INVISIBLE); imageView.setVisibility(View.GONE);
else { else {
imageView.setVisibility(View.VISIBLE); imageView.setVisibility(View.VISIBLE);
imageView.setImageResource(imageId); imageView.setImageResource(imageId);

6
app/src/main/java/de/frajul/endlessroll/views/TopBar.java
View File

@ -47,12 +47,12 @@ public class TopBar implements View.OnClickListener {
Typeface typeface = gameActivity.getTypeface(); Typeface typeface = gameActivity.getTypeface();
levelDisplay = (TextView) layout.findViewById(R.id.topbar_leveldisplay); levelDisplay = (TextView) layout.findViewById(R.id.topbar_leveldisplay);
// levelDisplay.setTypeface(typeface); levelDisplay.setTypeface(typeface);
levelProgress = (ProgressBar) layout.findViewById(R.id.topbar_levelprogress); levelProgress = (ProgressBar) layout.findViewById(R.id.topbar_levelprogress);
starCount = (TextView) layout.findViewById(R.id.topbar_starcount); starCount = (TextView) layout.findViewById(R.id.topbar_starcount);
// starCount.setTypeface(typeface); starCount.setTypeface(typeface);
energyCount = (TextView) layout.findViewById(R.id.topbar_energycount); energyCount = (TextView) layout.findViewById(R.id.topbar_energycount);
// energyCount.setTypeface(typeface); energyCount.setTypeface(typeface);
settingsButton = (Button) layout.findViewById(R.id.topbar_settings); settingsButton = (Button) layout.findViewById(R.id.topbar_settings);
settingsButton.setOnClickListener(this); settingsButton.setOnClickListener(this);
toolshopButton = (Button) layout.findViewById(R.id.topbar_toolshop); toolshopButton = (Button) layout.findViewById(R.id.topbar_toolshop);

BIN
app/src/main/res/drawable/tutorial_switch_tools.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
app/src/main/res/drawable/tutorial_to_toolshop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 157 KiB

After

Width:  |  Height:  |  Size: 145 KiB

6
app/src/main/res/layout/tutorial.xml
View File

@ -22,13 +22,13 @@
<ImageView <ImageView
android:id="@+id/tutorial_image_view" android:id="@+id/tutorial_image_view"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="200dp" android:layout_height="wrap_content"
android:layout_below="@+id/tutorial_text_view" android:layout_below="@+id/tutorial_text_view"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="15dp" android:layout_marginTop="15dp"
android:padding="2dp" android:padding="2dp"
android:background="#000000" android:scaleType="centerCrop"
android:scaleType="fitXY" android:adjustViewBounds="true"
android:src="@drawable/backgrounds_menu_grass"/> android:src="@drawable/backgrounds_menu_grass"/>
</RelativeLayout> </RelativeLayout>

2
app/src/main/res/values/strings.xml
View File

@ -107,7 +107,7 @@
<string name="tutorial_place_ramp_air_2">Now try again!</string> <string name="tutorial_place_ramp_air_2">Now try again!</string>
<string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string> <string name="tutorial_leveled_up_to_toolshop">Congratulations! You have leveled up!\nNow go to the toolshop</string>
<string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string> <string name="tutorial_switch_tools_two_neccessary">For this level you will need two tools equipped</string>
<string name="tutorial_switch_tools_switch">To switch between the tools click here</string> <string name="tutorial_switch_tools_switch">To select a tool just click on it</string>
<string name="tutorial_toolshop_welcome">Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.</string> <string name="tutorial_toolshop_welcome">Welcome to the toolshop!\nHere you can buy and upgrade all tools and you can customize your toolbar.</string>
<string name="tutorial_toolshop_toolbar">Right! That is your toolbar.</string> <string name="tutorial_toolshop_toolbar">Right! That is your toolbar.</string>
<string name="tutorial_toolshop_all_tools">Here you can see all the tools you will be able to buy and use.</string> <string name="tutorial_toolshop_all_tools">Here you can see all the tools you will be able to buy and use.</string>