comparison src/uk/ac/qmul/eecs/ccmi/activities/CcmiEditorAppActivity.java @ 1:66b3a838feca logging tip

Added logging of user interaction

 import org.simpleframework.xml.core.Persister;
 
 import uk.ac.qmul.eecs.ccmi.accessibility.AccessibilityService;
 import uk.ac.qmul.eecs.ccmi.accessibility.AccessibilityService.SoundEvent;
 import uk.ac.qmul.eecs.ccmi.accessibility.AccessibleDialogBuilder;
+import uk.ac.qmul.eecs.ccmi.utilities.ILogger;
 import uk.ac.qmul.eecs.ccmi.xmlparser.Diagram;
 import android.content.Intent;
 import android.content.res.AssetManager;
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;
 import android.widget.ArrayAdapter;
+import android.widget.TextView;
 
 /**
  * 
  * The main activity. It displays the diagram through the hierarchical view 
  * of the <a href="http://ccmi.eecs.qmul.ac.uk"> CCmI Diagram Editor </a>      

 		super.onCreate(savedInstanceState);
         
 		list.setOnItemClickListener(this);
 		list.setOnItemLongClickListener(this);
 		
+
+		ILogger.log("--- APPLICATION STARTED ---");
+		
+		
 		/* init assets */
 		AssetManager assetManager = getAssets();
 		try {
 			file = assetManager.list("diagrams")[0];
 			in = assetManager.open("diagrams/"+file);

 	}
 	
 	/*----- listeners to implement the navigation ----*/
 	@Override
 	public void onItemClick(AdapterView<?> av, View v, int pos, long id) {
+		ILogger.logTap(((TextView)v).getText());
 		if(!navigation.goNext(pos)){
 			accessibilityService.playSound(AccessibilityService.SoundEvent.V_ERROR);
+			ILogger.logError("end of tree");
 			return;
 		}
 		accessibilityService.playSound(AccessibilityService.SoundEvent.V_EXPAND);
-		accessibilityService.speak("Displaying " + getHeaderText()); 
+		accessibilityService.speak("displaying " + getHeaderText());
+		ILogger.logActivity(getHeaderText());
 	}
 	
 	/**
 	 * The activity listens to long clicks performed on the list view.
 	 * 
 	 * When a user long clicks an item, a dialog is displayed accordingly. For example if the types of nodes and 
 	 * edges are listed when the user long clicks, then a dialog for insertion of a new node or edge is displayed.    
 	 */
 	@Override
 	public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+		ILogger.logLongTap(((TextView)view).getText());
 		boolean doneSomething = navigation.getController().performEditAction(parent, view, position, id, this);
-		if(!doneSomething)
+		if(!doneSomething){
 			accessibilityService.playSound(AccessibilityService.SoundEvent.V_ERROR);
+			ILogger.logError("no action available on this item");
+		}
 		return doneSomething;
 	}
 
 	/**
 	 * When the back button is pressed the activity will cursor back in the tree 
 	 * view, which means the parent of the currently displayed items will be displayed
 	 * together with its siblings. 
 	 */
 	@Override
 	public void onBackPressed() {
+		ILogger.logTap("back");
 		if(navigation.goPrevious()){
 			accessibilityService.playSound(SoundEvent.V_COLLAPSE);
 			accessibilityService.speak("Displaying "+getHeaderText());
+			ILogger.logActivity(getHeaderText());
 			update();
 		}else{
 			accessibilityService.playSound(SoundEvent.V_EDITING_MODE, true);
 			dialogBuilder.displayDialog(R.layout.alert_dialog_confirm_exit,"Exit Dialog",new AccessibleDialogBuilder.ButtonClickListener() {
 				@Override
 				public void onClick(View v, DialogFragment dialogFragment, String tag) {
 					if("EXIT".equals(v.getTag())){
+						ILogger.logButton("exit");
 						accessibilityService.speak(getResources().getString(R.string.exitMessage));
+						ILogger.log("--- EXIT ---");
+						ILogger.dispose();
 						finish();
 					}else if("CANCEL".equals(v.getTag())){
+						ILogger.logButton("cancel");
+						accessibilityService.playSound(SoundEvent.V_CANCEL);
 						accessibilityService.speak("Cancel");
 						accessibilityService.stopSound();
 						dialogFragment.dismiss();
 					}else if("OPEN".equals(v.getTag())){
+						ILogger.logButton("open");
 						/* start the activity to open a file */
 						Intent intent = new Intent(CcmiEditorAppActivity.this, FileSelectorActivity.Open.class);
 						intent.putExtra("extension", CCMI_EXTENSION);
 						startActivityForResult(intent,OPEN_REQUEST);
 						dialogFragment.dismiss();
 					}else if("SAVE".equals(v.getTag())){
+						ILogger.logButton("save");
 						Intent intent = new Intent(CcmiEditorAppActivity.this, FileSelectorActivity.Save.class);
 						intent.putExtra("extension", CCMI_EXTENSION);
 						startActivityForResult(intent,SAVE_REQUEST);
 						dialogFragment.dismiss();
 					}

 		if(resultCode == RESULT_OK){
 			if(requestCode == OPEN_REQUEST){			
 				try {
 					InputStream in = new FileInputStream(new File(data.getData().getPath()));
 					readXML(in);
+					ILogger.logActivity(navigation.getCurrentPath());
 				} catch (Exception e) {
 					accessibilityService.playSound(SoundEvent.V_ERROR);
 					accessibilityService.speak("File could not be open");
 				} 
 			}else if(requestCode == SAVE_REQUEST){