auto advancing between stimuli/cards

fixes FieldDB/FieldDB#1538
cesine · Aug 21, 2014 · Jun 12, 2014 · Jun 12, 2014 · Jun 12, 2014 · Jun 12, 2014
commit 9f991fed9b66b1da4ce404e5daa420ac2e85c0f9
diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailFragment.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumDetailFragment.java
@@ -22,6 +22,7 @@
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.NavUtils;
+import android.support.v4.view.ViewPager;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
@@ -61,6 +62,8 @@ public class DatumDetailFragment extends Fragment {
 	 */
 	public static final String ARG_ITEM_ID = "item_id";
 
+	public static final String ARG_TOTAL_DATUM_IN_LIST = "total_datum_count_in_list";
+
 	/**
 	 * The content this fragment is presenting.
 	 */
@@ -80,13 +83,17 @@ public DatumDetailFragment() {
 	protected VideoView mVideoView;
 	protected ImageView mImageView;
 	protected MediaController mMediaController;
-	MediaPlayer mAudioPlayer;
+	protected MediaPlayer mAudioPlayer;
 	protected DeviceDetails mDeviceDetails;
 	protected HashMap<String, Integer> mDatumEditCounts;
 	protected ImageButton mSpeechRecognizerFeedback;
 	protected TextView mSpeechRecognizerInstructions;
 	protected boolean isPlaying = false;
 
+	protected ViewPager mDatumPager;
+
+	private int mLastDatumIndex;
+
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -98,15 +105,17 @@ public void onCreate(Bundle savedInstanceState) {
 
 		if (getArguments().containsKey(ARG_ITEM_ID)) {
 			String id = getArguments().getString(ARG_ITEM_ID);
+			this.mLastDatumIndex = getArguments().getInt(
+					ARG_TOTAL_DATUM_IN_LIST);
 			Log.d(Config.TAG, "Will get id " + id);
 			String selection = null;
 			String[] selectionArgs = null;
 			String sortOrder = null;
 
 			String[] datumProjection = {DatumTable.COLUMN_ORTHOGRAPHY,
-					DatumTable.COLUMN_MORPHEMES, DatumTable.COLUMN_GLOSS,
-					DatumTable.COLUMN_TRANSLATION, DatumTable.COLUMN_CONTEXT,
-					DatumTable.COLUMN_IMAGE_FILES,
+					DatumTable.COLUMN_UTTERANCE, DatumTable.COLUMN_MORPHEMES,
+					DatumTable.COLUMN_GLOSS, DatumTable.COLUMN_TRANSLATION,
+					DatumTable.COLUMN_CONTEXT, DatumTable.COLUMN_IMAGE_FILES,
 					DatumTable.COLUMN_AUDIO_VIDEO_FILES, DatumTable.COLUMN_TAGS};
 			mUri = Uri.withAppendedPath(DatumContentProvider.CONTENT_URI, id);
 			CursorLoader cursorLoader = new CursorLoader(getActivity(), mUri,
@@ -127,6 +136,8 @@ public void onCreate(Bundle savedInstanceState) {
 						cursor.getString(cursor
 								.getColumnIndexOrThrow(DatumTable.COLUMN_CONTEXT)));
 				datum.setId(id);
+				datum.setUtterance(cursor.getString(cursor
+						.getColumnIndexOrThrow(DatumTable.COLUMN_UTTERANCE)));
 				datum.addMediaFiles(cursor.getString(cursor
 						.getColumnIndexOrThrow(DatumTable.COLUMN_IMAGE_FILES)));
 				datum.addMediaFiles((cursor.getString(cursor
@@ -344,6 +355,8 @@ public void onClick(View v) {
 			mSpeechRecognizerInstructions.setText("");
 		}
 
+		this.mDatumPager = (ViewPager) getActivity().findViewById(
+				R.id.viewpager);
 	}
 
 	@Override
@@ -443,7 +456,26 @@ public boolean toggleAudioRecording(MenuItem item) {
 			}
 
 			if (mSpeechRecognizerInstructions != null) {
-				mSpeechRecognizerInstructions.setText("Tap to speak");
+				mSpeechRecognizerInstructions.setText("Tap to speak again");
+			}
+			if (Config.APP_TYPE.equals("speechrec")) {
+				autoAdvanceAfterRecordingAudio();
+			}
+
+		}
+		return true;
+	}
+
+	protected boolean autoAdvanceAfterRecordingAudio() {
+		if (this.mDatumPager != null) {
+			int currentStimulusIndex = this.mDatumPager.getCurrentItem();
+			if (currentStimulusIndex == this.mLastDatumIndex) {
+				Intent openTrainer = new Intent(getActivity(),
+						DatumListActivity.class);
+				startActivity(openTrainer);
+			} else {
+				this.mDatumPager.setCurrentItem(this.mDatumPager
+						.getCurrentItem() + 1);
 			}
 		}
 		return true;

diff --git a/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumFragmentPagerAdapter.java b/src/com/github/opensourcefieldlinguistics/fielddb/lessons/ui/DatumFragmentPagerAdapter.java
@@ -67,6 +67,8 @@ public Fragment getItem(int position) {
 		arguments.putParcelable(DatumContentProvider.CONTENT_ITEM_TYPE,
 				mVisibleDatumUri);
 		arguments.putString(DatumDetailFragment.ARG_ITEM_ID, id);
+		arguments.putInt(DatumDetailFragment.ARG_TOTAL_DATUM_IN_LIST,
+				mDatumsIds.size() - 1);
 
 		fragment.mTwoPane = false;
 		fragment.setArguments(arguments);

diff --git a/...thub/opensourcefieldlinguistics/fielddb/lessons/ui/DatumProductionExperimentFragment.java b/...thub/opensourcefieldlinguistics/fielddb/lessons/ui/DatumProductionExperimentFragment.java
@@ -18,10 +18,12 @@
 public class DatumProductionExperimentFragment extends DatumDetailFragment {
 
 	private int mAudioPromptResource;
-	private boolean isInstructions = false;
+	private boolean mIsInstructions = false;
+	private long WAIT_TO_RECORD_AFTER_PROMPT_START = 300;
+
 	@Override
 	public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-		//no menu
+		// no menu
 	}
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -57,7 +59,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 			String id = mItem.getId();
 			Log.d(Config.TAG, "Prompt for this datum will be " + id);
 			if ("instructions".equals(id)) {
-				this.isInstructions = true;
+				this.mIsInstructions = true;
 				mAudioPromptResource = R.raw.instructions;
 				mImageView.setImageResource(R.drawable.instructions);
 				mSpeechRecognizerFeedback.setVisibility(View.GONE);
@@ -95,17 +97,6 @@ protected void playPromptContext() {
 
 						@Override
 						public void onCompletion(MediaPlayer mp) {
-							Handler mainHandler = new Handler(getActivity()
-									.getMainLooper());
-							Runnable myRunnable = new Runnable() {
-								@Override
-								public void run() {
-									if(!isInstructions){
-										toggleAudioRecording(null);
-									}
-								}
-							};
-							mainHandler.post(myRunnable);
 							mp.release();
 						}
 					});
@@ -125,10 +116,25 @@ public void onPrepared(MediaPlayer mp) {
 						}
 					});
 
-			if (mSpeechRecognizerInstructions != null && !isInstructions ) {
-				mSpeechRecognizerInstructions.setText("Speak now");
+			if (mSpeechRecognizerInstructions != null && !mIsInstructions) {
+				mSpeechRecognizerInstructions.setText("Speak after beep");
 			}
 		}
+		/*
+		 * begin recording almost immediately so that the user wont speak too
+		 * early
+		 */
+		Handler mainHandler = new Handler(getActivity().getMainLooper());
+		Runnable myRunnable = new Runnable() {
+
+			@Override
+			public void run() {
+				if (!mIsInstructions) {
+					toggleAudioRecording(null);
+				}
+			}
+		};
+		mainHandler.postDelayed(myRunnable, WAIT_TO_RECORD_AFTER_PROMPT_START);
 	}
 
 }
diff --git a/...rcefieldlinguistics/fielddb/lessons/ui/ProductionExperimentViewPagerFragmentActivity.java b/...rcefieldlinguistics/fielddb/lessons/ui/ProductionExperimentViewPagerFragmentActivity.java
@@ -18,6 +18,7 @@
 public class ProductionExperimentViewPagerFragmentActivity
 		extends
 			FragmentActivity implements LoaderManager.LoaderCallbacks<Cursor> {
+
 	private DatumFragmentPagerAdapter mPagerAdapter;
 
 	@Override