|
@@ -1,5 +1,6 @@
|
|
|
package app.brest.testmin3d;
|
|
|
|
|
|
+import android.app.Activity;
|
|
|
import android.content.Intent;
|
|
|
import android.graphics.Point;
|
|
|
import android.os.Bundle;
|
|
@@ -10,6 +11,7 @@ import android.support.v7.widget.Toolbar;
|
|
|
import android.util.Log;
|
|
|
import android.view.Display;
|
|
|
import android.view.View;
|
|
|
+import android.view.ViewGroup;
|
|
|
import android.widget.ImageButton;
|
|
|
import android.widget.LinearLayout;
|
|
|
import android.widget.Toast;
|
|
@@ -20,7 +22,7 @@ import app.brest.utils.app.brest.game.Game;
|
|
|
import app.brest.utils.app.brest.game.Resource;
|
|
|
import app.brest.utils.app.brest.game.Stage;
|
|
|
|
|
|
-public class MenuActivity extends AppCompatActivity {
|
|
|
+public class MenuActivity extends Activity {
|
|
|
protected Game mGame;
|
|
|
protected ImageButton mICarte;
|
|
|
protected ImageButton mIInventaire;
|
|
@@ -40,7 +42,7 @@ public class MenuActivity extends AppCompatActivity {
|
|
|
mIOptions = (ImageButton) findViewById(R.id.ib_options);
|
|
|
mIScanner = (ImageButton) findViewById(R.id.ib_scanner);
|
|
|
mIBriefing = (ImageButton) findViewById(R.id.ib_briefing);
|
|
|
-
|
|
|
+ mINextStage = (ImageButton) findViewById(R.id.ib_send);
|
|
|
|
|
|
Game g = null;//Game.load(this);
|
|
|
|
|
@@ -79,13 +81,15 @@ public class MenuActivity extends AppCompatActivity {
|
|
|
display.getSize(size);
|
|
|
int width = size.x;
|
|
|
int height = size.y;
|
|
|
- int buttonHieght = (height-5*40)/6;
|
|
|
+ int buttonHieght = mGame.canSendData()?((height)-6*40)/7:((height-40)-5*40)/6;
|
|
|
+ ((ViewGroup)mINextStage.getParent()).setVisibility(mGame.canSendData()?View.VISIBLE:View.INVISIBLE);
|
|
|
|
|
|
mICarte.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
|
|
|
mIInventaire.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
|
|
|
mIOptions.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
|
|
|
mIScanner.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
|
|
|
mIBriefing.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
|
|
|
+ if(mGame.canSendData())mINextStage.setLayoutParams(new LinearLayout.LayoutParams(buttonHieght, buttonHieght));
|
|
|
}
|
|
|
|
|
|
public void onOptionsClick(View v)
|
|
@@ -132,5 +136,17 @@ public class MenuActivity extends AppCompatActivity {
|
|
|
public void onSendClick(View v)
|
|
|
{
|
|
|
//TODO : Transmssion des donnes
|
|
|
+ boolean finished = mGame.nextStage();
|
|
|
+
|
|
|
+ Stage s = mGame.getCurrentStageObj();
|
|
|
+ Resource stageRes = s.getResource();
|
|
|
+
|
|
|
+ Intent intent = new Intent(this, ViewerActivity.class);
|
|
|
+ intent.putExtra("resource", stageRes );
|
|
|
+ startActivity(intent);
|
|
|
+
|
|
|
+
|
|
|
+ Intent intent2 = new Intent(this, TransferActivity.class);
|
|
|
+ startActivity(intent2);
|
|
|
}
|
|
|
}
|