Skip to content
Snippets Groups Projects
Commit 796414f4 authored by Xavier Gibert's avatar Xavier Gibert
Browse files

New behavior for local simulator mission management buttons

parent 814894d9
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
res/values-es/strings.xml
+ 1
− 0
View file @ 796414f4
......@@ -192,6 +192,7 @@
<string name="sim_mission_ended">Misión terminada</string>
<string name="sim_mis_mission">Misión:</string>
<string name="sim_mis_description">Descripción:</string>
<string name="sim_stop_simulator_first">Pare el simulador primero</string>
<string name="pref_apk_install">Application install</string>
......
res/values-fr/strings.xml
+ 1
− 0
View file @ 796414f4
......@@ -193,6 +193,7 @@
<string name="sim_mission_ended">Mission terminée</string>
<string name="sim_mis_mission">Mission:</string>
<string name="sim_mis_description">Description:</string>
<string name="sim_stop_simulator_first">Arrêtez le simulateur avant</string>
<string name="pref_apk_install">Application install</string>
......
res/values/strings.xml
+ 1
− 0
View file @ 796414f4
......@@ -192,6 +192,7 @@
<string name="sim_mission_ended">Mission ended</string>
<string name="sim_mis_mission">Mission:</string>
<string name="sim_mis_description">Description:</string>
<string name="sim_stop_simulator_first">Stop the simulator first</string>
<string name="pref_apk_install">Application install</string>
......
src/cs/si/stavor/fragments/SimulatorFragment.java
+ 29
− 21
View file @ 796414f4
......@@ -34,7 +34,6 @@ import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.SimpleCursorAdapter;
import android.widget.Switch;
import android.widget.Toast;
......@@ -144,11 +143,9 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
host_view.setText(host);
port_view.setText(port);
RelativeLayout localSimLayout = (RelativeLayout) rootView.findViewById(R.id.RelativeLayoutLocalSim);
button_connect = (Button) rootView.findViewById(R.id.buttonConnect);
simulator.setButtonConnect(button_connect);
simulator.setSwitchAndListSelector(switch_remote,localSimLayout);
simulator.setSwitchView(switch_remote);
button_connect.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
if(simulator.getSimulatorStatus().equals(SimulatorStatus.Connected)){
......@@ -186,12 +183,16 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
button_delete.setOnClickListener(new OnClickListener(){
@Override
public void onClick(View arg0) {
if(activeMissionId==-1){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_select_first_a_mission), Toast.LENGTH_LONG).show();
}else if (activeMissionId==0 ||activeMissionId==1 ||activeMissionId==2 || activeMissionId==3 ){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_mission_not_removable), Toast.LENGTH_LONG).show();
if(simulator.getSimulatorStatus().equals(SimulatorStatus.Connected)){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_stop_simulator_first), Toast.LENGTH_LONG).show();
}else{
showDeleteMissionDialog(activeMissionId, activeMissionName);
if(activeMissionId==-1){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_select_first_a_mission), Toast.LENGTH_LONG).show();
}else if (activeMissionId==0 ||activeMissionId==1 ||activeMissionId==2 || activeMissionId==3 ){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_mission_not_removable), Toast.LENGTH_LONG).show();
}else{
showDeleteMissionDialog(activeMissionId, activeMissionName);
}
}
}
......@@ -202,7 +203,11 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
button_new.setOnClickListener(new OnClickListener(){
@Override
public void onClick(View arg0) {
((MainActivity)getActivity()).showMissionCreator();
if(simulator.getSimulatorStatus().equals(SimulatorStatus.Connected)){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_stop_simulator_first), Toast.LENGTH_LONG).show();
}else{
((MainActivity)getActivity()).showMissionCreator();
}
}
});
......@@ -212,19 +217,22 @@ public final class SimulatorFragment extends Fragment implements LoaderCallbacks
button_edit.setOnClickListener(new OnClickListener(){
@Override
public void onClick(View arg0) {
if(activeMissionId==-1){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_select_first_a_mission), Toast.LENGTH_LONG).show();
}else if (activeMissionId==0 ||activeMissionId==1 ||activeMissionId==2 ||activeMissionId==3){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_mission_not_editable), Toast.LENGTH_LONG).show();
if(simulator.getSimulatorStatus().equals(SimulatorStatus.Connected)){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_stop_simulator_first), Toast.LENGTH_LONG).show();
}else{
MissionAndId mis = getSelectedMission();
if(mis!=null){
((MainActivity)getActivity()).showMissionEditor(mis);
}else{
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_cannot_deserialize_selected_mission), Toast.LENGTH_LONG).show();
}
if(activeMissionId==-1){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_select_first_a_mission), Toast.LENGTH_LONG).show();
}else if (activeMissionId==0 ||activeMissionId==1 ||activeMissionId==2 ||activeMissionId==3){
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_mission_not_editable), Toast.LENGTH_LONG).show();
}else{
MissionAndId mis = getSelectedMission();
if(mis!=null){
((MainActivity)getActivity()).showMissionEditor(mis);
}else{
Toast.makeText(getActivity().getApplicationContext(), getString(R.string.sim_local_cannot_deserialize_selected_mission), Toast.LENGTH_LONG).show();
}
}
}
}
});
......
src/cs/si/stavor/simulator/Simulator.java
+ 3
− 16
View file @ 796414f4
......@@ -15,11 +15,8 @@ import android.content.SharedPreferences;
import android.os.ConditionVariable;
import android.preference.PreferenceManager;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageButton;
import android.widget.ListView;
import android.widget.RelativeLayout;
import android.widget.Switch;
import android.widget.Toast;
......@@ -47,7 +44,6 @@ public class Simulator {
//GUI views
private Button buttonConnect;
private Switch switchSelector;
private RelativeLayout localSimLayout;
//Mission
private Mission mission;
......@@ -122,9 +118,8 @@ public class Simulator {
* Set local/remote switch View
* @param st
*/
public void setSwitchAndListSelector(Switch st, RelativeLayout localSim){
public void setSwitchView(Switch st){
switchSelector=st;
localSimLayout = localSim;
enableCorrectSimulatorViews();
}
......@@ -421,18 +416,10 @@ public class Simulator {
else
switchSelector.setEnabled(true);
}
if(localSimLayout!=null){
if(simulatorStatus.equals(SimulatorStatus.Connected)){
enableView(localSimLayout, false);
//localSimLayout.setEnabled(false);
}else{
enableView(localSimLayout, true);
//localSimLayout.setEnabled(true);
}
}
}
});
}
/*
private static void enableView(ViewGroup layout, boolean enabled) {
layout.setEnabled(false);
for (int i = 0; i < layout.getChildCount(); i++) {
......@@ -443,7 +430,7 @@ public class Simulator {
child.setEnabled(enabled);
}
}
}
}*/
private String message = "";
public void showMessage(String string) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment