Large diffs are not rendered by default.

@@ -6,8 +6,24 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="matthewallenlinsoftware.keepy_uppy.choose_background">

<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/imageView"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:src="@drawable/choose_background" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Choose Background"
android:id="@+id/textView"
android:textSize="36dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="46dp"
android:onClick="onClickBackArrow" />
</RelativeLayout>
<!-- From: file:/Users/Darthpwner/AndroidStudioProjects/Keepy-Uppy/app/src/main/res/layout/activity_choose_background.xml -->
@@ -6,8 +6,60 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="matthewallenlinsoftware.keepy_uppy.choose_ball">

<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Choose Ball"
android:id="@+id/choose_ball_title"
android:textIsSelectable="false"
android:textSize="36dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp" />

<ImageView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:id="@+id/choose_ball_background"
android:src="@drawable/choose_ball"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true" />

<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/beach_ball_button"
android:layout_centerVertical="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />

<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/basketball_button"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true" />

<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/bowling_ball_button"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/choose_ball_title"
android:layout_toEndOf="@+id/choose_ball_title" />

<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/back_arrow_button"
android:src="@drawable/back_arrow"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/beach_ball_button"
android:layout_toEndOf="@+id/beach_ball_button"
android:focusableInTouchMode="false"
android:onClick="onClickBackArrow" />

</RelativeLayout>
<!-- From: file:/Users/Darthpwner/AndroidStudioProjects/Keepy-Uppy/app/src/main/res/layout/activity_choose_ball.xml -->
@@ -6,8 +6,5 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="matthewallenlinsoftware.keepy_uppy.gameplay">

<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />

</RelativeLayout>
<!-- From: file:/Users/Darthpwner/AndroidStudioProjects/Keepy-Uppy/app/src/main/res/layout/activity_gameplay.xml -->
@@ -6,8 +6,5 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="matthewallenlinsoftware.keepy_uppy.rules">

<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />

</RelativeLayout>
<!-- From: file:/Users/Darthpwner/AndroidStudioProjects/Keepy-Uppy/app/src/main/res/layout/activity_rules.xml -->
Binary file not shown.
@@ -421,10 +421,10 @@ int drawable forest 0x7f020044
int drawable ic_launcher 0x7f020045
int drawable notification_template_icon_bg 0x7f020047
int drawable rules 0x7f020046
int id Start 0x7f0d0052
int id Title 0x7f0d0050
int id TitlePageScene 0x7f0d004f
int id action0 0x7f0d0053
int id Start 0x7f0d005a
int id Title 0x7f0d0058
int id TitlePageScene 0x7f0d0057
int id action0 0x7f0d005b
int id action_bar 0x7f0d0040
int id action_bar_activity_content 0x7f0d0000
int id action_bar_container 0x7f0d003f
@@ -433,21 +433,27 @@ int id action_bar_spinner 0x7f0d0001
int id action_bar_subtitle 0x7f0d0024
int id action_bar_title 0x7f0d0023
int id action_context_bar 0x7f0d0041
int id action_divider 0x7f0d0057
int id action_divider 0x7f0d005f
int id action_menu_divider 0x7f0d0002
int id action_menu_presenter 0x7f0d0003
int id action_mode_bar 0x7f0d003d
int id action_mode_bar_stub 0x7f0d003c
int id action_mode_close_button 0x7f0d0025
int id action_settings 0x7f0d0060
int id action_settings 0x7f0d0068
int id activity_chooser_view_content 0x7f0d0026
int id alertTitle 0x7f0d0030
int id always 0x7f0d0016
int id back_arrow_button 0x7f0d0056
int id basketball_button 0x7f0d0054
int id beach_ball_button 0x7f0d0053
int id beginning 0x7f0d0013
int id bowling_ball_button 0x7f0d0055
int id buttonPanel 0x7f0d0036
int id cancel_action 0x7f0d0054
int id cancel_action 0x7f0d005c
int id checkbox 0x7f0d0038
int id chronometer 0x7f0d005a
int id choose_ball_background 0x7f0d0052
int id choose_ball_title 0x7f0d0051
int id chronometer 0x7f0d0062
int id collapseActionView 0x7f0d0017
int id contentPanel 0x7f0d0031
int id custom 0x7f0d0035
@@ -459,20 +465,21 @@ int id disableHome 0x7f0d000c
int id dropdown 0x7f0d001c
int id edit_query 0x7f0d0042
int id end 0x7f0d0014
int id end_padder 0x7f0d005f
int id end_padder 0x7f0d0067
int id expand_activities_button 0x7f0d0027
int id expanded_menu 0x7f0d0037
int id home 0x7f0d0004
int id homeAsUp 0x7f0d000d
int id icon 0x7f0d002b
int id ifRoom 0x7f0d0018
int id image 0x7f0d0028
int id info 0x7f0d005e
int id line1 0x7f0d0058
int id line3 0x7f0d005c
int id imageView 0x7f0d004f
int id info 0x7f0d0066
int id line1 0x7f0d0060
int id line3 0x7f0d0064
int id listMode 0x7f0d0009
int id list_item 0x7f0d002a
int id media_actions 0x7f0d0056
int id media_actions 0x7f0d005e
int id middle 0x7f0d0015
int id multiply 0x7f0d001e
int id never 0x7f0d0019
@@ -503,19 +510,20 @@ int id split_action_bar 0x7f0d0007
int id src_atop 0x7f0d0020
int id src_in 0x7f0d0021
int id src_over 0x7f0d0022
int id status_bar_latest_event_content 0x7f0d0055
int id status_bar_latest_event_content 0x7f0d005d
int id submit_area 0x7f0d004b
int id tabMode 0x7f0d000b
int id text 0x7f0d005d
int id text2 0x7f0d005b
int id text 0x7f0d0065
int id text2 0x7f0d0063
int id textSpacerNoButtons 0x7f0d0033
int id time 0x7f0d0059
int id textView 0x7f0d0050
int id time 0x7f0d0061
int id title 0x7f0d002c
int id title_template 0x7f0d002f
int id topPanel 0x7f0d002e
int id up 0x7f0d0008
int id useLogo 0x7f0d0012
int id viewGif 0x7f0d0051
int id viewGif 0x7f0d0059
int id withText 0x7f0d001a
int id wrap_content 0x7f0d001d
int integer abc_config_activityDefaultDur 0x7f0b0001
Binary file not shown.
Binary file not shown.
@@ -1,9 +1,11 @@
package matthewallenlinsoftware.keepy_uppy;

import android.support.v7.app.ActionBarActivity;
import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;


public class choose_ball extends ActionBarActivity {
@@ -35,4 +37,12 @@ public boolean onOptionsItemSelected(MenuItem item) {

return super.onOptionsItemSelected(item);
}

public void onClickBackArrow(View view) {
//Starting a new Intent
Intent nextScreen = new Intent(getApplicationContext(), MainActivity.class);

//Sending data to another Activity
startActivity(nextScreen);
}
}
@@ -6,4 +6,23 @@
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="matthewallenlinsoftware.keepy_uppy.choose_background">

<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/imageView"
android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
android:src="@drawable/choose_background" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Choose Background"
android:id="@+id/textView"
android:textSize="36dp"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="46dp"
android:onClick="onClickBackArrow" />
</RelativeLayout>
@@ -50,4 +50,15 @@
android:layout_toRightOf="@+id/choose_ball_title"
android:layout_toEndOf="@+id/choose_ball_title" />

<ImageButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/back_arrow_button"
android:src="@drawable/back_arrow"
android:layout_alignParentBottom="true"
android:layout_toRightOf="@+id/beach_ball_button"
android:layout_toEndOf="@+id/beach_ball_button"
android:focusableInTouchMode="false"
android:onClick="onClickBackArrow" />

</RelativeLayout>