package com.mmm.findtherythm;

import android.os.Bundle;
import android.app.Activity;
import android.view.Menu;
<<<<<<< HEAD
import android.widget.TextView;
=======
import android.view.View;
import android.widget.Button;
import android.view.View.OnClickListener;
>>>>>>> b89ed0821ae383d5a34a7b6a741d1f1b222db07f

public class IndexActivity extends Activity {

	@Override
	protected void onCreate(Bundle savedInstanceState) {
		super.onCreate(savedInstanceState);
		setContentView(R.layout.activity_index);
<<<<<<< HEAD
		TextView tv = new TextView(this);
        tv.setText("Hello, Android oui Android");
		setContentView(tv);
=======
		
		// Component declaration
		Button buttonJouer = (Button) findViewById(R.id.buttonJouer);
		Button buttonScore = (Button) findViewById(R.id.buttonScore);
		
		// Handler declaration
		buttonJouer.setOnClickListener(buttonJouerHandler);
		buttonScore.setOnClickListener(buttonScoreHandler);
		
>>>>>>> b89ed0821ae383d5a34a7b6a741d1f1b222db07f
	}
	
	OnClickListener buttonJouerHandler = new OnClickListener() {

		@Override
		public void onClick(View v) {
			setContentView(R.layout.activity_game);	
		}
		
	};
	
	OnClickListener buttonScoreHandler = new OnClickListener() {

		@Override
		public void onClick(View v) {
			// TODO Redirect to Score Layout
			
		}
		
	};

	@Override
	public boolean onCreateOptionsMenu(Menu menu) {
		// Inflate the menu; this adds items to the action bar if it is present.
		getMenuInflater().inflate(R.menu.index, menu);
		return true;
	}

}

@@ -109,61 +109,8 @@
 nu;%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0Aimport android.widget.TextView;%0A=======%0A
 impo
@@ -207,57 +207,9 @@
 er;%0A
-%3E%3E%3E%3E%3E%3E%3E b89ed0821ae383d5a34a7b6a741d1f1b222db07f
 %0A
+
 %0Apub
@@ -402,137 +402,9 @@
 x);%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A%09%09TextView tv = new TextView(this);%0A        tv.setText(%22Hello, Android oui Android%22);%0A%09%09setContentView(tv);%0A=======
 %0A
+
 %09%09%0A%09
@@ -700,56 +700,8 @@
 %0A%09%09%0A
-%3E%3E%3E%3E%3E%3E%3E b89ed0821ae383d5a34a7b6a741d1f1b222db07f
 %0A%09%7D%0A

fix conflicts