diff --git a/app/src/main/java/com/example/mastermind/MainActivity.java b/app/src/main/java/com/example/mastermind/MainActivity.java index b2f335a..8685123 100644 --- a/app/src/main/java/com/example/mastermind/MainActivity.java +++ b/app/src/main/java/com/example/mastermind/MainActivity.java @@ -1,13 +1,52 @@ package com.example.mastermind; import android.app.Activity; +import android.content.Intent; import android.os.Bundle; +import android.widget.Button; +import android.view.View; public class MainActivity extends Activity { - + private Button mHotSeat; + private Button mORDI; + private Button mSettings; + //private Button mRules; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); + + mHotSeat = findViewById(R.id.HotSeat); + mORDI = findViewById(R.id.ORDI); + mSettings = findViewById(R.id.Settings); + //mRules = findViewById(R.id.Rules); + /*mHotSeat.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent tp1Intent = new Intent(MainActivity.this, HotSeat.class); + startActivity(tp1Intent); + } + }); + mORDI.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent tp2Intent = new Intent(MainActivity.this, ORDI.class); + startActivity(tp2Intent); + } + });*/ + /*mSettings.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent tp3Intent = new Intent(MainActivity.this, Settings.class); + startActivity(tp3Intent); + } + });*/ + /*mTP4.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Intent tp4Intent = new Intent(MainActivity.this, TP4.class); + startActivity(tp4Intent); + } + });*/ } } \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d09d688..24bda5d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,6 +6,7 @@ android:layout_height="match_parent" android:background="#333" android:padding="10dp" + android:orientation="vertical" tools:context=".MainActivity" > @@ -15,44 +16,70 @@ android:scaleType="centerCrop" android:src="@drawable/brain"> - - - + android:layout_height="match_parent" + android:orientation="vertical"> - + + - + + + + + + + \ No newline at end of file