From e6f01dfadac3337f9ff9acdb3860ff03dc46bf90 Mon Sep 17 00:00:00 2001
From: hanriaca <callistehanriat@gmail.com>
Date: Tue, 31 May 2016 17:17:50 +0200
Subject: [PATCH] Adding Image mode for elicitation, works with progression
 saving mode

---
 Aikuma/AndroidManifest.xml                    |   4 +-
 Aikuma/res/drawable/type_folder_image.png     | Bin 0 -> 8154 bytes
 .../content_dialog_selected_folder_frag.xml   |  29 ++
 .../res/layout-xlarge/elicitation_image.xml   | 173 ++++++++
 Aikuma/res/layout/elicitation_image.xml       | 173 ++++++++
 Aikuma/res/values/strings.xml                 |   1 +
 .../org/lp20/aikuma/ui/ElicitationMode.java   | 127 ++++--
 .../org/lp20/aikuma/ui/ListFolderAdapter.java | 112 ++++++
 .../org/lp20/aikuma/ui/RecordElicitation.java | 368 +++++++++++++-----
 .../lp20/aikuma/ui/RecordingMetadataLig.java  |   3 +
 .../lp20/aikuma/ui/RespeakingSelection.java   |   1 -
 11 files changed, 864 insertions(+), 127 deletions(-)
 create mode 100644 Aikuma/res/drawable/type_folder_image.png
 create mode 100644 Aikuma/res/layout-xlarge/content_dialog_selected_folder_frag.xml
 create mode 100644 Aikuma/res/layout-xlarge/elicitation_image.xml
 create mode 100644 Aikuma/res/layout/elicitation_image.xml
 create mode 100644 Aikuma/src/org/lp20/aikuma/ui/ListFolderAdapter.java

diff --git a/Aikuma/AndroidManifest.xml b/Aikuma/AndroidManifest.xml
index 1a66e4b0..e7809931 100644
--- a/Aikuma/AndroidManifest.xml
+++ b/Aikuma/AndroidManifest.xml
@@ -3,7 +3,7 @@
       package="org.lp20.aikuma2"
       android:versionCode="010005"
       android:versionName="0.8.4">
-	<uses-sdk android:minSdkVersion="14"/>
+	<uses-sdk android:minSdkVersion="16"/>
 	<uses-permission android:name="android.permission.RECORD_AUDIO"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -197,6 +197,8 @@
 		<activity android:name="org.lp20.aikuma.ui.TranslationSelection"></activity>
 		<activity android:name="org.lp20.aikuma.ui.RecordElicitation"
 		    	android:configChanges="orientation|screenSize"></activity>
+		<activity android:name="org.lp20.aikuma.ui.RecordElicitationImage"
+		    	android:configChanges="orientation|screenSize"></activity>
 		<activity android:name="org.lp20.aikuma.ui.CheckMode"
 		    	android:configChanges="orientation|screenSize" ></activity>
 		<activity android:name="org.lp20.aikuma.ui.CheckWordVariant"
diff --git a/Aikuma/res/drawable/type_folder_image.png b/Aikuma/res/drawable/type_folder_image.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8cf07aad69071fc63c695ccdf03634bb67d2b54
GIT binary patch
literal 8154
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

literal 0
HcmV?d00001

diff --git a/Aikuma/res/layout-xlarge/content_dialog_selected_folder_frag.xml b/Aikuma/res/layout-xlarge/content_dialog_selected_folder_frag.xml
new file mode 100644
index 00000000..9eca78f0
--- /dev/null
+++ b/Aikuma/res/layout-xlarge/content_dialog_selected_folder_frag.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" 
+    android:id="@+id/layoutListView">
+    
+    <ImageView 
+     	android:layout_width="75dp"
+     	android:layout_height="50dp"
+     	android:src="@drawable/folder_close_icon"
+     	android:id="@+id/image_file_type" 	
+    />
+	<TextView 
+	    android:layout_width="match_parent"
+	    android:layout_height="50dp"
+	    android:textSize = "16dp"
+	    android:layout_toRightOf="@+id/image_file_type"
+	    android:gravity="center_vertical"
+	    android:id="@+id/textFolderName"/>
+    
+    <ImageView 
+     	android:layout_width="50dp"
+     	android:layout_height="50dp"
+     	android:id="@+id/image_folder_type"
+     	android:layout_alignParentRight="true"
+     	android:src="@drawable/type_folder_image"
+     	android:visibility="invisible"
+    />
+</RelativeLayout>
diff --git a/Aikuma/res/layout-xlarge/elicitation_image.xml b/Aikuma/res/layout-xlarge/elicitation_image.xml
new file mode 100644
index 00000000..5a633595
--- /dev/null
+++ b/Aikuma/res/layout-xlarge/elicitation_image.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+    
+	<RelativeLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="fill_parent"
+	    android:gravity="center_horizontal"
+	    android:orientation="vertical"
+	    android:paddingBottom="@dimen/activity_vertical_margin"
+	    android:paddingLeft="@dimen/activity_horizontal_margin"
+	    android:paddingRight="@dimen/activity_horizontal_margin">
+	    	
+	    <!-- Back button -->
+	    <GridLayout
+	       	android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_gravity="left">
+			<Button
+				android:id="@+id/btn_goBack"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:drawableLeft="@drawable/ic_undo_black_24dp"
+				android:onClick="onButtonBackPressed"
+				android:text="@string/goBack"
+				android:textColor="#D32F2F"
+				android:layout_marginBottom="20dp" 
+				android:layout_marginTop="20dp" />
+		</GridLayout>
+		
+	    <TableLayout
+			    android:layout_width="fill_parent"
+		    	android:layout_height="wrap_content" 
+		    	android:id="@+id/tableLayoutTitleActivityElicitationIMG"> 
+		    
+			    <TextView
+			        style="@style/MainTitle" 
+		            android:layout_width="wrap_content"
+		            android:layout_height="wrap_content"
+		            android:text="Elicitation mode"
+		            android:layout_marginBottom="20dp"/>
+			    <View
+			       android:layout_width="match_parent"
+			       android:layout_height="0.2dp"
+			       android:id="@+id/separator"
+			       android:visibility="visible"
+			       android:background="@android:color/darker_gray"
+			       android:layout_marginBottom="50dp"/> 
+			       
+			    <TextView
+		        android:id="@+id/maintextView2"
+		        style="@style/SecondTitle"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:text="Please, read the bold line."
+		        android:layout_marginBottom="25dp" />
+		</TableLayout>
+		
+	    <LinearLayout
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content" 
+	        android:layout_below="@+id/tableLayoutTitleActivityElicitationIMG"
+	        android:id="@+id/linearLayoutTopActivityElicitationIMG">
+	        
+	        <TextView
+	            android:id="@+id/image_x"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:text="TextView"
+	            android:textSize="20sp"
+	            android:typeface="serif" />
+	
+	        <View
+	            android:id="@+id/view1"
+	            android:layout_width="0.2dp"
+	            android:layout_height="40dp"
+			    android:visibility="visible"
+			    android:background="@android:color/darker_gray"
+			    android:layout_marginLeft="10dp"
+			    android:layout_marginRight="10dp" />
+	
+	        <fragment
+	            android:id="@+id/phrase_player"
+	            android:name="org.lp20.aikuma.ui.ListenFragment"
+	            android:layout_width="wrap_content"
+	            android:layout_height="match_parent" />
+	    </LinearLayout>
+	
+
+	    <ImageView
+	        android:layout_below="@+id/linearLayoutTopActivityElicitationIMG"
+	        android:id="@+id/img_orig"
+	        android:layout_width="800px"
+	        android:layout_height="450px"
+	        android:paddingBottom="10dp"
+    	 />
+	    
+	    <RelativeLayout
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:id="@+id/relativeTowBottomsElicitIMG"
+	        android:layout_below="@+id/linearLayoutTopActivityElicitationIMG"
+	        android:layout_toRightOf="@+id/img_orig">
+	        
+			<LinearLayout 	        
+			    android:layout_width="match_parent"
+	        	android:layout_height="match_parent"
+	      		android:orientation="horizontal"
+	      		android:id="@+id/linearTowBottomsElicitIMG">
+		        <ImageButton
+		            android:id="@+id/btn_record_elicit"
+		            android:layout_width="fill_parent"
+		            android:layout_height="match_parent"
+		            android:layout_weight="3"
+		            android:onClick="onRecordClick"
+		            android:src="@drawable/record" />
+		
+		        <ImageButton
+		            android:id="@+id/btn_next"
+		            android:layout_toRightOf="@+id/btn_record_elicit"
+		            android:layout_width="fill_parent"
+		            android:layout_height="match_parent"
+		            android:layout_weight="3"
+		            android:onClick="onNextClick"
+		            android:src="@drawable/arrow_circle_o_right" />
+	        </LinearLayout>
+
+       	    <ImageButton
+		        android:id="@+id/btn_validate"
+		        android:layout_width="match_parent"
+		        android:layout_height="match_parent"
+		        android:layout_weight="2"
+		        android:onClick="onValidate"
+		        android:layout_below="@+id/linearTowBottomsElicitIMG"
+		        android:src="@drawable/ok_32" />
+	    </RelativeLayout>
+	
+
+	
+           <LinearLayout 
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:orientation="horizontal" 
+               android:layout_alignParentBottom="true"
+               android:layout_below="@+id/img_orig">
+               
+               <TextView
+                   android:id="@+id/elicit_phrase_number"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text="1" 
+                   />
+        
+               <TextView
+                   android:id="@+id/elicit_total_number"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text=" / " />               
+               
+               <view class="org.lp20.aikuma.ui.InterleavedSeekBar"
+                       style="@android:style/Widget.ProgressBar.Horizontal"
+                       android:id="@+id/seek_elicit_progression"
+                       android:layout_width="fill_parent"
+                       android:layout_height="wrap_content"
+                       android:maxHeight="3dp"
+                       />
+              </LinearLayout>
+	    
+	
+
+	</RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/Aikuma/res/layout/elicitation_image.xml b/Aikuma/res/layout/elicitation_image.xml
new file mode 100644
index 00000000..5a633595
--- /dev/null
+++ b/Aikuma/res/layout/elicitation_image.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" >
+    
+	<RelativeLayout
+	    android:layout_width="match_parent"
+	    android:layout_height="fill_parent"
+	    android:gravity="center_horizontal"
+	    android:orientation="vertical"
+	    android:paddingBottom="@dimen/activity_vertical_margin"
+	    android:paddingLeft="@dimen/activity_horizontal_margin"
+	    android:paddingRight="@dimen/activity_horizontal_margin">
+	    	
+	    <!-- Back button -->
+	    <GridLayout
+	       	android:layout_width="wrap_content"
+			android:layout_height="wrap_content" 
+			android:layout_gravity="left">
+			<Button
+				android:id="@+id/btn_goBack"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:drawableLeft="@drawable/ic_undo_black_24dp"
+				android:onClick="onButtonBackPressed"
+				android:text="@string/goBack"
+				android:textColor="#D32F2F"
+				android:layout_marginBottom="20dp" 
+				android:layout_marginTop="20dp" />
+		</GridLayout>
+		
+	    <TableLayout
+			    android:layout_width="fill_parent"
+		    	android:layout_height="wrap_content" 
+		    	android:id="@+id/tableLayoutTitleActivityElicitationIMG"> 
+		    
+			    <TextView
+			        style="@style/MainTitle" 
+		            android:layout_width="wrap_content"
+		            android:layout_height="wrap_content"
+		            android:text="Elicitation mode"
+		            android:layout_marginBottom="20dp"/>
+			    <View
+			       android:layout_width="match_parent"
+			       android:layout_height="0.2dp"
+			       android:id="@+id/separator"
+			       android:visibility="visible"
+			       android:background="@android:color/darker_gray"
+			       android:layout_marginBottom="50dp"/> 
+			       
+			    <TextView
+		        android:id="@+id/maintextView2"
+		        style="@style/SecondTitle"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:text="Please, read the bold line."
+		        android:layout_marginBottom="25dp" />
+		</TableLayout>
+		
+	    <LinearLayout
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content" 
+	        android:layout_below="@+id/tableLayoutTitleActivityElicitationIMG"
+	        android:id="@+id/linearLayoutTopActivityElicitationIMG">
+	        
+	        <TextView
+	            android:id="@+id/image_x"
+	            android:layout_width="wrap_content"
+	            android:layout_height="wrap_content"
+	            android:text="TextView"
+	            android:textSize="20sp"
+	            android:typeface="serif" />
+	
+	        <View
+	            android:id="@+id/view1"
+	            android:layout_width="0.2dp"
+	            android:layout_height="40dp"
+			    android:visibility="visible"
+			    android:background="@android:color/darker_gray"
+			    android:layout_marginLeft="10dp"
+			    android:layout_marginRight="10dp" />
+	
+	        <fragment
+	            android:id="@+id/phrase_player"
+	            android:name="org.lp20.aikuma.ui.ListenFragment"
+	            android:layout_width="wrap_content"
+	            android:layout_height="match_parent" />
+	    </LinearLayout>
+	
+
+	    <ImageView
+	        android:layout_below="@+id/linearLayoutTopActivityElicitationIMG"
+	        android:id="@+id/img_orig"
+	        android:layout_width="800px"
+	        android:layout_height="450px"
+	        android:paddingBottom="10dp"
+    	 />
+	    
+	    <RelativeLayout
+	        android:layout_width="match_parent"
+	        android:layout_height="wrap_content"
+	        android:id="@+id/relativeTowBottomsElicitIMG"
+	        android:layout_below="@+id/linearLayoutTopActivityElicitationIMG"
+	        android:layout_toRightOf="@+id/img_orig">
+	        
+			<LinearLayout 	        
+			    android:layout_width="match_parent"
+	        	android:layout_height="match_parent"
+	      		android:orientation="horizontal"
+	      		android:id="@+id/linearTowBottomsElicitIMG">
+		        <ImageButton
+		            android:id="@+id/btn_record_elicit"
+		            android:layout_width="fill_parent"
+		            android:layout_height="match_parent"
+		            android:layout_weight="3"
+		            android:onClick="onRecordClick"
+		            android:src="@drawable/record" />
+		
+		        <ImageButton
+		            android:id="@+id/btn_next"
+		            android:layout_toRightOf="@+id/btn_record_elicit"
+		            android:layout_width="fill_parent"
+		            android:layout_height="match_parent"
+		            android:layout_weight="3"
+		            android:onClick="onNextClick"
+		            android:src="@drawable/arrow_circle_o_right" />
+	        </LinearLayout>
+
+       	    <ImageButton
+		        android:id="@+id/btn_validate"
+		        android:layout_width="match_parent"
+		        android:layout_height="match_parent"
+		        android:layout_weight="2"
+		        android:onClick="onValidate"
+		        android:layout_below="@+id/linearTowBottomsElicitIMG"
+		        android:src="@drawable/ok_32" />
+	    </RelativeLayout>
+	
+
+	
+           <LinearLayout 
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:orientation="horizontal" 
+               android:layout_alignParentBottom="true"
+               android:layout_below="@+id/img_orig">
+               
+               <TextView
+                   android:id="@+id/elicit_phrase_number"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text="1" 
+                   />
+        
+               <TextView
+                   android:id="@+id/elicit_total_number"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text=" / " />               
+               
+               <view class="org.lp20.aikuma.ui.InterleavedSeekBar"
+                       style="@android:style/Widget.ProgressBar.Horizontal"
+                       android:id="@+id/seek_elicit_progression"
+                       android:layout_width="fill_parent"
+                       android:layout_height="wrap_content"
+                       android:maxHeight="3dp"
+                       />
+              </LinearLayout>
+	    
+	
+
+	</RelativeLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/Aikuma/res/values/strings.xml b/Aikuma/res/values/strings.xml
index 7fd11b68..f0a44b93 100644
--- a/Aikuma/res/values/strings.xml
+++ b/Aikuma/res/values/strings.xml
@@ -138,4 +138,5 @@
     <string name="currentLine">currentLine</string>
     <string name="recordDuration">duration</string>
     <string name="translation">translation</string>
+    <string name="selectedFileType">selectedFileType</string>
 </resources>
diff --git a/Aikuma/src/org/lp20/aikuma/ui/ElicitationMode.java b/Aikuma/src/org/lp20/aikuma/ui/ElicitationMode.java
index 70c4787c..b34d1955 100644
--- a/Aikuma/src/org/lp20/aikuma/ui/ElicitationMode.java
+++ b/Aikuma/src/org/lp20/aikuma/ui/ElicitationMode.java
@@ -1,6 +1,7 @@
 package org.lp20.aikuma.ui;
 
 import java.io.File;
+import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FilenameFilter;
@@ -27,8 +28,11 @@ import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.AdapterView;
 import android.widget.Button;
+import android.widget.ListView;
 import android.widget.Toast;
+import android.widget.AdapterView.OnItemClickListener;
 
 public class ElicitationMode extends AikumaActivity{
 	
@@ -41,6 +45,16 @@ public class ElicitationMode extends AikumaActivity{
 	private String fileType;
 	private String title;
 	
+	public static final int TEXT_MODE = 0;
+	public static final int IMAGE_MODE = 1;
+	public static final int VIDEO_MODE = 2;
+	
+	/**
+	 * used to know if the user press text, image or video button
+	 * this field contains 0 (text), 1 (image) or 2(video)
+	 */
+	private int selectedFileType;
+	
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -51,6 +65,7 @@ public class ElicitationMode extends AikumaActivity{
 	public void onImportClick(View _view) {
 		switch (_view.getId()) {
 		case R.id.button_byText:
+			selectedFileType = TEXT_MODE;
 			Log.i(TAG, "Import text; view id: " + _view.getId());
 			mPath = Environment.getExternalStorageDirectory();
 			fileType = ".txt";
@@ -58,14 +73,15 @@ public class ElicitationMode extends AikumaActivity{
 			importContent();
 			break;
 		case R.id.button_byImage:
+			selectedFileType = IMAGE_MODE;
 			Log.i(TAG, "Import image; view id: " + _view.getId());
 			mPath = Environment.getExternalStorageDirectory();
 			fileType = ".jpg";
 			title = "Import image file";
-			Toast.makeText(this, "This feature is not yet available...", Toast.LENGTH_LONG).show();
-//			importContent();
+			importContent();
 			break;
 		case R.id.button_byVideo:
+			selectedFileType = VIDEO_MODE;
 			Log.i(TAG, "Import video; view id: " + _view.getId());
 			mPath = Environment.getExternalStorageDirectory();
 			fileType = ".avi";
@@ -98,7 +114,16 @@ public class ElicitationMode extends AikumaActivity{
 					return filename.contains(fileType) || sel.isDirectory();
 				}
 			};
-			mFileList = mPath.list(filter);
+			if (selectedFileType == ElicitationMode.TEXT_MODE)
+				mFileList = mPath.list(filter);
+			else {
+				mFileList = mPath.list(new FilenameFilter() {
+					@Override
+					public boolean accept(File dir, String filename) {
+						return new File(dir, filename).isDirectory();
+					}
+				});
+			}
 		}
 		else {
 			mFileList= new String[0];
@@ -120,50 +145,94 @@ public class ElicitationMode extends AikumaActivity{
 	 * Copied from RespeakingSelection.java
 	 */
 	public class FilebrowserDialogFragment extends DialogFragment {
+		ListView listElement;
+		
 		@Override
 		public Dialog onCreateDialog(Bundle savedInstanceState) {
-			Dialog dialog = null;
-			AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-			builder.setTitle(title);
-			if(mFileList == null) {
-				Log.e(TAG, "import file - Showing file picker before loading the file list");
-				dialog = builder.create();
-				return dialog;
-			}
-			builder.setItems(mFileList, new DialogInterface.OnClickListener() {
-				public void onClick(DialogInterface dialog, int which) {
-					mChosenFile = mFileList[which];
+			View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_select_file_frag, null);
+			listElement = (ListView) view.findViewById(R.id.listItemFile);
+			ListFolderAdapter adapter = new ListFolderAdapter(getActivity(), mFileList, mPath, selectedFileType);
+			listElement.setAdapter(adapter);;
+			
+			listElement.setOnItemClickListener(new OnItemClickListener() {
+				@Override
+				public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+					dismiss();
+					mChosenFile = mFileList[position];
 					Log.i(TAG, "mChosenFile: " + mChosenFile);
 					mPath = new File(mPath, mChosenFile);
 					if (mPath.isDirectory()) {
-						loadFileList(mPath, fileType);
-						showAudioFilebrowserDialog();
-					} else {
-						if (fileType==".txt") {
-							Toast.makeText(ElicitationMode.this, "Selected text: " + mPath, Toast.LENGTH_LONG).show();
+						if (!isSelectionnable(mPath)) {
+							Log.d("mPath", mPath.getAbsolutePath() + " is not selectionnable");
+							loadFileList(mPath, fileType);
+							showAudioFilebrowserDialog();
+						} else {
+							Log.d("mPath", mPath.getAbsolutePath() + " is selectionnable");
+							actionSelectedFile();
 						}
+					} else {
 						if (fileType==".jpg") {
-							Toast.makeText(ElicitationMode.this, "Selected image: " + mPath, Toast.LENGTH_LONG).show();
+							Toast.makeText(ElicitationMode.this, "Selected folder: " + mPath, Toast.LENGTH_LONG).show();
 						}
 						if (fileType==".avi") {
 							Toast.makeText(ElicitationMode.this, "Selected video: " + mPath, Toast.LENGTH_LONG).show();
 						}
-
-						Intent intent = new Intent(getActivity(), RecordingMetadataLig.class);						
-						intent.putExtra(importFileName, mPath.getAbsolutePath());	
-						Log.i(TAG, "selected file: " + mPath.getAbsolutePath());
-						intent.putExtra(ELICITATION, true);
-						startActivity(intent);
-							
+						actionSelectedFile();
 					}
 				}
 			});
-			dialog = builder.show();
+			
+			AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+			builder.setTitle(title);
+			Dialog dialog = new Dialog(getActivity());
+			
+			if(mFileList == null) {
+				Toast.makeText(getActivity(), "No files to display", Toast.LENGTH_SHORT).show();
+				Log.e(TAG, "import file - Showing file picker before loading the file list");
+				dialog = builder.create();
+				return dialog;
+			}
+			
+			dialog.setContentView(view);
+			dialog.show();
 			return dialog;
 		}
 	}
+	
+	/**
+	 * Function called when we need to know if an entity is queryable
+	 * @param f the selected file (the entity)
+	 * @return true if the file is queryable, false if not.
+	 */
+	private boolean isSelectionnable(File f) {
+		int i = 0;
+		File[] files = f.listFiles();
+		switch (selectedFileType) {
+		case 1:
+			while( i < files.length && files[i].isFile() && (files[i].getAbsolutePath().contains(".jpg") || files[i].getAbsolutePath().contains("jpeg"))) {
+				i++;
+			}	
+			return files.length == i && i>0;
+		case 2:
+			while(files[i].isFile() && files[i].getAbsolutePath().contains(".mp4")) {
+				i++;
+			}	
+			return files.length == i;
 
+		default :
+			return false;
+		}
+	}
+	
+	private void actionSelectedFile() {
+		Intent intent = new Intent(this, RecordingMetadataLig.class);						
+		intent.putExtra(importFileName, mPath.getAbsolutePath());	
+		Log.i(TAG, "selected file: " + mPath.getAbsolutePath());
+		intent.putExtra(ELICITATION, true);
+		intent.putExtra(getString(R.string.selectedFileType), selectedFileType);
+		startActivity(intent);
+	}
+	
 	public void onBackPressed(View v) {
 		this.finish();
 	}
diff --git a/Aikuma/src/org/lp20/aikuma/ui/ListFolderAdapter.java b/Aikuma/src/org/lp20/aikuma/ui/ListFolderAdapter.java
new file mode 100644
index 00000000..6acf69f7
--- /dev/null
+++ b/Aikuma/src/org/lp20/aikuma/ui/ListFolderAdapter.java
@@ -0,0 +1,112 @@
+package org.lp20.aikuma.ui;
+
+import java.io.File;
+
+import org.lp20.aikuma2.R;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.AsyncTask;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+public class ListFolderAdapter  extends ArrayAdapter {
+	private LayoutInflater layoutInflater;
+	private File parentFile;
+	private int mode;
+	
+	static class ViewFolderHolder {
+		public TextView textFolderName;
+		public ImageView imageType;
+		public ImageView imageTypeOfFolder;
+	}
+	
+	public  ListFolderAdapter(Context context, String[] files, File parentFile, int mode) {
+		super(context, R.layout.content_dialog_selected_folder_frag, files);
+		this.layoutInflater = LayoutInflater.from(context);
+		this.parentFile = parentFile;
+		this.mode = mode;
+	}
+	
+	@Override
+	public View getView(int position, View convertView, ViewGroup parent) {
+		ViewFolderHolder holder;
+		View rowView = convertView;
+		
+		if (rowView == null) {
+			rowView = this.layoutInflater.inflate(R.layout.content_dialog_selected_folder_frag, null);
+			holder = new ViewFolderHolder();
+			holder.textFolderName = (TextView) rowView.findViewById(R.id.textFolderName);
+			holder.imageType = (ImageView) rowView.findViewById(R.id.image_file_type);
+			holder.imageTypeOfFolder = (ImageView) rowView.findViewById(R.id.image_folder_type);
+			rowView.setTag(holder);
+		} else {
+			holder = (ViewFolderHolder) rowView.getTag();
+		}
+		
+		String fileName = (String) getItem(position);
+		File file = new File(parentFile.getAbsolutePath()+"/"+fileName);
+		holder.textFolderName.setText(fileName);
+		RelativeLayout relativeListFile = (RelativeLayout) rowView.findViewById(R.id.layoutListView);
+		holder.imageType.setVisibility(ImageView.INVISIBLE);
+		
+		if (!file.isDirectory()) {
+			holder.imageType.setImageResource(R.drawable.file_icon);
+			holder.imageType.setVisibility(ImageView.VISIBLE);
+			holder.imageTypeOfFolder.setVisibility(ImageView.INVISIBLE);
+		}  else {
+			relativeListFile.setBackgroundColor(Color.TRANSPARENT);
+			holder.imageType.setImageResource(R.drawable.folder_close_icon);
+			holder.imageType.setVisibility(ImageView.VISIBLE);
+			ListFolderTask task = new ListFolderTask();
+			task.setHolder(holder);
+			task.setMode(this.mode);
+			task.execute(file);
+		}
+		return rowView;
+	}
+
+	private class ListFolderTask extends AsyncTask<File, Integer, File[]> {
+		ViewFolderHolder holder;
+		int mode;
+		protected void setHolder (ViewFolderHolder viewHolder) {
+			holder = viewHolder;
+		}
+		
+		protected void setMode(int mode) {
+			this.mode = mode;
+		}
+		@Override
+		protected File[] doInBackground(File... f) {
+			return f[0].listFiles();
+		}
+		
+		@Override
+		protected void onPostExecute(File[] files) {
+			int i = 0;
+			
+			switch (this.mode) {
+			case 1:
+				while(i < files.length && (files[i].isFile() && (files[i].getAbsolutePath().contains(".jpg") || files[i].getAbsolutePath().contains(".jpeg")))) {
+					i++;
+				}
+				if (i == files.length && i>0)
+					holder.imageTypeOfFolder.setVisibility(ImageView.VISIBLE);
+				else
+					holder.imageTypeOfFolder.setVisibility(ImageView.INVISIBLE);
+				break;
+
+			default:
+				break;
+			}				
+		}
+	}
+}
+
+
diff --git a/Aikuma/src/org/lp20/aikuma/ui/RecordElicitation.java b/Aikuma/src/org/lp20/aikuma/ui/RecordElicitation.java
index a9d03216..ad791393 100644
--- a/Aikuma/src/org/lp20/aikuma/ui/RecordElicitation.java
+++ b/Aikuma/src/org/lp20/aikuma/ui/RecordElicitation.java
@@ -9,6 +9,8 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.lang.ref.WeakReference;
+import java.security.spec.EllipticCurve;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -32,85 +34,94 @@ import org.lp20.aikuma.util.AikumaSettings;
 import org.lp20.aikuma.util.FileIO;
 import org.lp20.aikuma2.R;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.FragmentTransaction;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
-import android.view.ViewDebug.FlagToString;
 import android.widget.ImageButton;
+import android.widget.ImageView;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
 public class RecordElicitation extends AikumaActivity {
-	
 	public static final String TAG = "RecordElicitation";
 	private UUID recordUUID;
 	private Recorder recorder;
 	protected long sampleRate = 16000l;
 	private boolean recording = false;
 	private BufferedReader reader;
-	private int phraseId = 0;
-	private String eliciTextFile;
+	private int entityId = 0;
+	private String ptrSelectedReference;
 	private ListenFragment fragment;
-
+	private File[] images;
 	private Boolean isNewSession = true;
 	private Date date;
 	private SharedPreferences prefsUserSession;
 	private String strFolderDate;
 	private RecordingLig recordingLig;
+	
+	private int choiceMode;
 	/**
 	 * the progress bar used to display the user's progression.
 	 */
 	private InterleavedSeekBar progressBar;
-	private int numberOfLines;
+	private int numberOfEntities;
 	private Language recordLang;
 
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 	    super.onCreate(savedInstanceState);
-	    setContentView(R.layout.elicitation);
+	    
 	    recordUUID = UUID.randomUUID();
 	    
-		ImageButton nextButton = (ImageButton) findViewById(R.id.btn_next);
-		nextButton.setEnabled(false);
 	    // retrieving metadata
 		prefsUserSession = getSharedPreferences(getString(R.string.userSession), MODE_PRIVATE);
 		initSession();
-		initProgressBars();
-
+		switch (choiceMode) {
+		case ElicitationMode.TEXT_MODE:
+			setContentView(R.layout.elicitation);
+			break;
+		case ElicitationMode.IMAGE_MODE:
+			setContentView(R.layout.elicitation_image);
+			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+			break;
+		default:
+			setContentView(R.layout.elicitation);
+			break;
+		}
+		
+		
+        ImageButton nextButton = (ImageButton) findViewById(R.id.btn_next);
+        nextButton.setEnabled(false);
+        setProgressBarsAtNotTouchableState();
 	    
 	    try {
-			
-//			String phrase = reader.readLine();
-			// test on the lines read:
-			// check that the file is not empty by ensuring that the phrase is not null (end of file reached)
-			// check that the sentence is correctly formatted (no empty line and '##' delimited found)
-			String phrase;
-			while ((phrase = reader.readLine()) != null && (phrase.isEmpty() || phrase.split("##").length <= 1)) { continue; }  
-			if (phrase == null) { throw new IOException("Empty text file"); }
-			numberOfLines = countNumberOfLines();
-			TextView tv = (TextView) findViewById(R.id.elicit_phrase_number);
-			tv.setText("" + phraseId);
-			
-			TextView tv_total = (TextView) findViewById(R.id.elicit_total_number);
-			tv_total.setText(" / " + numberOfLines);
-			
-//			progressBar.setProgress((int) ((float)phraseId/(float)numberOfLines * 100));
-
-			String[] phrasePair = phrase.split("##");
-			TextView tvFrPhrase = (TextView) findViewById(R.id.tv_elicit_phrase);
-			tvFrPhrase.setText(phrasePair[0]);
-			tvFrPhrase = (TextView) findViewById(R.id.tv_orig_phrase);
-			tvFrPhrase.setText(phrasePair[1]);
-			TextView tv2 = (TextView) findViewById(R.id.phrase_x);
-			tv2.setText("Phrase" + phraseId);
+	    	switch (choiceMode) {
+			case ElicitationMode.TEXT_MODE:
+				initProgressText();
+				loadTextViews();
+				break;
+			case ElicitationMode.IMAGE_MODE:
+				initProgressText();
+				loadImage();
+				break;
+			default:
+				initProgressText();
+				loadTextViews();
+				break;
+			}
+	    	updateProgressBar();
 		} catch (FileNotFoundException e1) {
 			// TODO Auto-generated catch block
 			Log.e(TAG,"text file could not be found: " + e1);
@@ -125,6 +136,68 @@ public class RecordElicitation extends AikumaActivity {
 	    fragment = (ListenFragment) getFragmentManager().findFragmentById(R.id.phrase_player);
 	}
 	
+	private void updateProgressBar() {
+		progressBar.setProgress((int) (((float)entityId)/(float)numberOfEntities * 100));
+	}
+	
+	private void initProgressText() throws IOException {
+		numberOfEntities = countNumberOfEntities();
+		TextView tv = (TextView) findViewById(R.id.elicit_phrase_number);
+		tv.setText("" + entityId);
+		
+		TextView tv_total = (TextView) findViewById(R.id.elicit_total_number);
+		tv_total.setText(" / " + numberOfEntities);
+	}
+	
+	private void loadTextViews() throws IOException {
+		String phrase;
+		while ((phrase = reader.readLine()) != null && (phrase.isEmpty() || phrase.split("##").length <= 1)) { continue; }  
+		if (phrase == null) { throw new IOException("Empty text file"); }
+		
+		String[] phrasePair = phrase.split("##");
+		TextView tvFrPhrase = (TextView) findViewById(R.id.tv_elicit_phrase);
+		tvFrPhrase.setText(phrasePair[0]);
+		tvFrPhrase = (TextView) findViewById(R.id.tv_orig_phrase);
+		tvFrPhrase.setText(phrasePair[1]);
+		TextView tv2 = (TextView) findViewById(R.id.phrase_x);
+		tv2.setText("Phrase" + entityId);
+	}
+	
+	private void loadImage() {
+		if (entityId >= numberOfEntities){
+			Toast.makeText(this, "No more images to display", Toast.LENGTH_LONG).show();
+			this.finish();
+		} else {
+			ImageView selected_photo = (ImageView) findViewById(R.id.img_orig);
+		    BitmapFactory.Options options = new BitmapFactory.Options();
+			options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+			//Bitmap bitmap = BitmapFactory.decodeFile(images[entityId].getAbsolutePath(), options);
+			//Bitmap bitmap = decodeSampledBitmapFromResource(images[entityId], 800, 450);
+			//int nh = (int) ( bitmap.getHeight() * (512.0 / bitmap.getWidth()) );
+			//Bitmap scaled = Bitmap.createScaledBitmap(bitmap, 512, nh, true);
+		    BitmapWorkerTask task = new BitmapWorkerTask(selected_photo);
+		    task.execute(images[entityId]);
+
+			//selected_photo.setImageBitmap(scaled);
+		}
+	}
+	
+	public static Bitmap decodeSampledBitmapFromResource(File file,
+	        int reqWidth, int reqHeight) {
+
+	    // First decode with inJustDecodeBounds=true to check dimensions
+	    final BitmapFactory.Options options = new BitmapFactory.Options();
+	    options.inJustDecodeBounds = true;
+	    BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+
+	    // Calculate inSampleSize
+	    options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+
+	    // Decode bitmap with inSampleSize set
+	    options.inJustDecodeBounds = false;
+	    return BitmapFactory.decodeFile(file.getAbsolutePath(), options);
+	}
+	
 	@SuppressWarnings("unchecked")
 	private void initSession() {
 
@@ -141,25 +214,46 @@ public class RecordElicitation extends AikumaActivity {
 
 	 
 	    	SharedPreferences.Editor ed = prefsUserSession.edit();
-	    	eliciTextFile = prefsUserSession.getString(getString(R.string.sessionInputFile), "");
-	    	phraseId = prefsUserSession.getInt(getString(R.string.currentLine), 0);
+	    	ptrSelectedReference = prefsUserSession.getString(getString(R.string.sessionInputFile), "");
+	    	entityId = prefsUserSession.getInt(getString(R.string.currentLine), 0);
+	    	choiceMode = prefsUserSession.getInt(getString(R.string.selectedFileType), ElicitationMode.TEXT_MODE);
+	    	
 	    	ed.clear();
 	    	ed.commit();
 			try {
-				reader = new BufferedReader(new InputStreamReader(new FileInputStream(eliciTextFile)));
+				reader = new BufferedReader(new InputStreamReader(new FileInputStream(ptrSelectedReference)));
 			} catch (FileNotFoundException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
 			}
-
-			goToPreviousState();
+			
+		    if (choiceMode == ElicitationMode.IMAGE_MODE) {
+		        File f = new File(ptrSelectedReference);
+			    images = f.listFiles();
+		    }
+		    
+		    try {
+				numberOfEntities = countNumberOfEntities();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		    
+		    if (choiceMode == ElicitationMode.TEXT_MODE)
+		    	goToPreviousState();
+		    
 			isNewSession = false;
 	    } else {
-		    eliciTextFile = getIntent().getStringExtra(ElicitationMode.importFileName);
-		    Log.i(TAG, "Selected file: " + eliciTextFile);
-		    
+	    	ptrSelectedReference = getIntent().getStringExtra(ElicitationMode.importFileName);
+		    Log.i(TAG, "Selected file: " + ptrSelectedReference);
+		    choiceMode = getIntent().getIntExtra(getString(R.string.selectedFileType), 0);
+		    if (choiceMode == ElicitationMode.IMAGE_MODE) {
+		        File f = new File(ptrSelectedReference);
+			    images = f.listFiles();
+		    }
+		    	
 	    	try {
-				reader = new BufferedReader(new InputStreamReader(new FileInputStream(eliciTextFile)));
+				reader = new BufferedReader(new InputStreamReader(new FileInputStream(ptrSelectedReference)));
 			} catch (FileNotFoundException e1) {
 				// TODO Auto-generated catch block
 				e1.printStackTrace();
@@ -173,26 +267,30 @@ public class RecordElicitation extends AikumaActivity {
            } catch (ParseException e1) { 
                   date = new Date();
            }
+
 	    	strFolderDate = new SimpleDateFormat("yyMMdd-HHmmss").format(date);
 	    }
 	}
 	
 	/**
-	 * Called to going to the previous state (phraseID and others graphical attributes
+	 * Called to going to the previous state (phraseID and others graphical attributes)
 	 */
 	private void goToPreviousState() {
-		String phrase;
-		int i = 0;
-		while (i<phraseId) {
-			try {
-				if((phrase = reader.readLine()) != null && (phrase.isEmpty() || phrase.split("##").length <= 1))
-					continue;
-				else if(phrase != null) 
-					i = i+1;
-			} catch (IOException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
+		if (choiceMode == ElicitationMode.TEXT_MODE){
+			String phrase;
+			int i = 0;
+			while (i<entityId) {
+				try {
+					if((phrase = reader.readLine()) != null && (phrase.isEmpty() || phrase.split("##").length <= 1))
+						continue;
+					else if(phrase != null) 
+						i = i+1;
+				} catch (IOException e) {
+					// TODO Auto-generated catch block
+						e.printStackTrace();
+				}
 			}
+	
 		}
 	}
 	
@@ -212,22 +310,35 @@ public class RecordElicitation extends AikumaActivity {
 			// test on the lines read:
 			// check that the file is not empty by ensuring that the phrase is not null (end of file reached)
 			// check that the sentence is correctly formatted (no empty line and '##' delimited found)
-			String phrase;
-			while ((phrase = reader.readLine()) != null && (phrase.isEmpty() || phrase.split("##").length <= 1)) { continue; }  
-			if (phrase == null) { throw new IOException("End of text file reached."); }
+			
+			entityId++;
+			
+			switch (choiceMode) {
+			case ElicitationMode.TEXT_MODE:
+				String phrase;
+				while ((phrase = reader.readLine()) != null && (phrase.isEmpty() || phrase.split("##").length <= 1)) { continue; }  
+				if (phrase == null) { throw new IOException("End of text file reached."); }
+				String[] phrasePair = phrase.split("##");
+				TextView tvFrPhrase = (TextView) findViewById(R.id.tv_elicit_phrase);
+				tvFrPhrase.setText(phrasePair[0]);
+				tvFrPhrase = (TextView) findViewById(R.id.tv_orig_phrase);
+				tvFrPhrase.setText(phrasePair[1]);
+				TextView tv = (TextView) findViewById(R.id.phrase_x);
+				tv.setText("Phrase" + entityId);
+				break;
+			case ElicitationMode.IMAGE_MODE:
+				loadImage();
+				break;
+			default:
+				break;
+			}
+			
 			TextView tv2 = (TextView) findViewById(R.id.elicit_phrase_number);
-			tv2.setText(phraseId + 1 + "");
+			tv2.setText(entityId + "");
 			
-			progressBar.setProgress((int) (((float)phraseId + 1.0)/(float)numberOfLines * 100));
+			updateProgressBar();
 			
-			String[] phrasePair = phrase.split("##");
-			TextView tvFrPhrase = (TextView) findViewById(R.id.tv_elicit_phrase);
-			tvFrPhrase.setText(phrasePair[0]);
-			tvFrPhrase = (TextView) findViewById(R.id.tv_orig_phrase);
-			tvFrPhrase.setText(phrasePair[1]);
-			phraseId++;
-			TextView tv = (TextView) findViewById(R.id.phrase_x);
-			tv.setText("Phrase" + phraseId);
+
 		} catch (MicException e) {
 			this.finish();
 			Toast.makeText(getApplicationContext(),
@@ -244,7 +355,7 @@ public class RecordElicitation extends AikumaActivity {
     * called to set progressionBar behavior
     * progressionBar is not modifiable by hand
     */
-   private void initProgressBars() {
+   private void setProgressBarsAtNotTouchableState() {
 	   progressBar = (InterleavedSeekBar) findViewById(R.id.seek_elicit_progression);
 	   progressBar.setOnSeekBarChangeListener(
            new SeekBar.OnSeekBarChangeListener() {
@@ -300,9 +411,9 @@ public class RecordElicitation extends AikumaActivity {
 	 * Function called to restore the recordingLig by a json file.
 	 */
 	private void restoreMetaDataFromJson() {
-		if (phraseId > 0) {
+		if (entityId > 0) {
 			File metadataFile = new File(FileIO.getOwnerPath().getAbsolutePath() + "/"+ "recordings" + "/" +this.strFolderDate + "_"+recordLang.getCode()+"_"+Aikuma.getDeviceId(),
-					this.strFolderDate  + "_" + recordLang.getCode() + "_" + Aikuma.getDeviceId() + "_" + (phraseId-1) + RecordingLig.METADATA_SUFFIX);
+					this.strFolderDate  + "_" + recordLang.getCode() + "_" + Aikuma.getDeviceId() + "_" + (entityId-1) + RecordingLig.METADATA_SUFFIX);
 			Log.d("metadataFile : ", "metadataFile : " + metadataFile.getAbsolutePath());
 			try {
 				recordingLig = RecordingLig.read(metadataFile);
@@ -326,6 +437,8 @@ public class RecordElicitation extends AikumaActivity {
 			ArrayList<String> speakerIds = new ArrayList<String>(); 
 			Double latitude = MainActivity.locationDetector.getLatitude();
 			Double longitude = MainActivity.locationDetector.getLongitude();
+			String suffix = new File(ptrSelectedReference).getName().replace(".txt", "").length() >= 10 ? new File(ptrSelectedReference).getName().substring(0, 10)
+					: new File(ptrSelectedReference).getName().replace(".txt", "");
 			String idDevice = Aikuma.getDeviceId();
 			String name = strFolderDate + "_" + 
 					MetadataSession.getMetadataSession().getRecordLanguage().getCode()
@@ -342,18 +455,15 @@ public class RecordElicitation extends AikumaActivity {
 			
 			recordingLig = new RecordingLig(recordUUID, name, date, 
 					AikumaSettings.getLatestVersion(), 
-					AikumaSettings.getCurrentUserId(), recordLang, MetadataSession.getMetadataSession().getMotherTongue(),
+					AikumaSettings.getCurrentUserId(), MetadataSession.getMetadataSession().getRecordLanguage(), 
+					MetadataSession.getMetadataSession().getMotherTongue(),
 					MetadataSession.getMetadataSession().getExtraLanguages(), speakerIds, deviceName, androidID, 
 					null, null, sampleRate, duration, 
 					recorder.getFormat(), recorder.getNumChannels(), 
 					recorder.getBitsPerSample(), latitude, longitude,
-					MetadataSession.getMetadataSession().getRegionOrigin(),
-					MetadataSession.getMetadataSession().getSpeakerName(),
+					MetadataSession.getMetadataSession().getRegionOrigin(), MetadataSession.getMetadataSession().getSpeakerName(), 
 					MetadataSession.getMetadataSession().getSpeakerAge(), gender);
-			
-			Log.d("passage", "setRecordingLig first session");
 		} else{
-			Log.d("passage", "setRecordingLig restore session");
 			restoreMetaDataFromJson();
 		}
 	}
@@ -372,22 +482,22 @@ public class RecordElicitation extends AikumaActivity {
 		}
 
 		setRecordingLig();
-		
+
 		if (recorder != null && recorder.getFile().getPayloadSize() == 0) {
 			Log.d("recorder1", "recorder <= 50");
 			return false;
 		}
-		
+
 		try {
 			// Move the wave file from the nosync directory to
 			// the synced directory and write the metadata
 			recordingLig.write();
 			String filename = recordingLig.getFile().getAbsolutePath();
 			FileUtils.copyFile(recordingLig.getFile(), 
-					new File(filename.replace(".wav", "_" + phraseId + ".wav")));
+					new File(filename.replace(".wav", "_" + entityId + ".wav")));
 			FileIO.delete(new File(filename));
 			FileUtils.copyFile(new File(filename.replace(".wav", "-metadata.json")), 
-					new File(filename.replace(".wav", "_" + phraseId + "-metadata.json")));
+					new File(filename.replace(".wav", "_" + entityId + "-metadata.json")));
 			FileIO.delete(new File(filename.replace(".wav", "-metadata.json")));
 			recorder.release();
 			recorder = null;
@@ -464,14 +574,19 @@ public class RecordElicitation extends AikumaActivity {
     * @return the number of lines in good format in a txt file.
     * @throws IOException if the file cannot be read
     */
-   public int countNumberOfLines() throws IOException {
+   public int countNumberOfEntities() throws IOException {
 	   int nbLine = 0;
-	   BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(eliciTextFile)));
-	   String phrase;
-	   while ((phrase = bufferedReader.readLine()) != null) {
-		   if (!phrase.isEmpty() && phrase.split("##").length > 1)
-			   nbLine++;
-	   }	
+	   if (choiceMode == ElicitationMode.TEXT_MODE) {
+		   BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(ptrSelectedReference)));
+		   String phrase;
+		   while ((phrase = bufferedReader.readLine()) != null) {
+			   if (!phrase.isEmpty() && phrase.split("##").length > 1)
+				   nbLine++;
+		   }	
+	   } else if (choiceMode == ElicitationMode.IMAGE_MODE) {
+			File f = new File(ptrSelectedReference);
+			return f.listFiles().length;
+	   }
 	   return nbLine;
    }
 
@@ -488,10 +603,22 @@ public class RecordElicitation extends AikumaActivity {
 		ed.putString(getString(R.string.language_name), recordLang.getName());
 		ed.putString(getString(R.string.languageCode), recordLang.getCode());
 		ed.putString(getString(R.string.sessionDate), strFolderDate);
-		ed.putInt(getString(R.string.currentLine), phraseId);
-		ed.putString(getString(R.string.sessionInputFile), eliciTextFile);		
-		ed.putString(getString(R.string.sessionProgress), phraseId + " / " + numberOfLines);
-		ed.putString(getString(R.string.session_submode), "Text");
+		ed.putInt(getString(R.string.currentLine), entityId);
+		ed.putString(getString(R.string.sessionInputFile), ptrSelectedReference);		
+		ed.putString(getString(R.string.sessionProgress), entityId + " / " + numberOfEntities);
+		ed.putInt(getString(R.string.selectedFileType), choiceMode);
+		switch (choiceMode) {
+		case ElicitationMode.IMAGE_MODE:
+			ed.putString(getString(R.string.session_submode), "image");
+			break;
+		case ElicitationMode.TEXT_MODE:
+			ed.putString(getString(R.string.session_submode), "text");
+			break;
+
+		default:
+			ed.putString(getString(R.string.session_submode), "text");
+			break;
+		}
 		
 		ed.commit();
    }
@@ -508,7 +635,7 @@ public class RecordElicitation extends AikumaActivity {
 							@Override
 							public void onClick(DialogInterface dialog,
 									int which) {
-								if (phraseId<numberOfLines) {
+								if (entityId<numberOfEntities) {
 									saveCurrentState();
 								}
 
@@ -559,7 +686,7 @@ public class RecordElicitation extends AikumaActivity {
 								@Override
 								public void onClick(DialogInterface dialog,
 										int which) {
-									if (phraseId<numberOfLines) {
+									if (entityId<numberOfEntities) {
 										saveCurrentState();
 									}
 
@@ -596,4 +723,53 @@ public class RecordElicitation extends AikumaActivity {
 					.setNeutralButton("Cancel", null)
 					.show();
 	}
+	
+	public static int calculateInSampleSize(
+            BitmapFactory.Options options, int reqWidth, int reqHeight) {
+    // Raw height and width of image
+    final int height = options.outHeight;
+    final int width = options.outWidth;
+    int inSampleSize = 1;
+
+    if (height > reqHeight || width > reqWidth) {
+
+        final int halfHeight = height / 2;
+        final int halfWidth = width / 2;
+
+        // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+        // height and width larger than the requested height and width.
+        while ((halfHeight / inSampleSize) > reqHeight
+                && (halfWidth / inSampleSize) > reqWidth) {
+            inSampleSize *= 2;
+        }
+    }
+
+    return inSampleSize;
+	}
+}
+
+class BitmapWorkerTask extends AsyncTask<File, Void, Bitmap> {
+    private final WeakReference<ImageView> imageViewReference;
+
+    public BitmapWorkerTask(ImageView imageView) {
+        // Use a WeakReference to ensure the ImageView can be garbage collected
+        imageViewReference = new WeakReference<ImageView>(imageView);
+    }
+
+    // Decode image in background.
+    @Override
+    protected Bitmap doInBackground(File... params) {
+        return RecordElicitation.decodeSampledBitmapFromResource(params[0], 800, 450);
+    }
+
+    // Once complete, see if ImageView is still around and set bitmap.
+    @Override
+    protected void onPostExecute(Bitmap bitmap) {
+        if (imageViewReference != null && bitmap != null) {
+            final ImageView imageView = imageViewReference.get();
+            if (imageView != null) {
+                imageView.setImageBitmap(bitmap);
+            }
+        }
+    }
 }
diff --git a/Aikuma/src/org/lp20/aikuma/ui/RecordingMetadataLig.java b/Aikuma/src/org/lp20/aikuma/ui/RecordingMetadataLig.java
index cac87f78..b9ba0fd1 100644
--- a/Aikuma/src/org/lp20/aikuma/ui/RecordingMetadataLig.java
+++ b/Aikuma/src/org/lp20/aikuma/ui/RecordingMetadataLig.java
@@ -508,6 +508,8 @@ public class RecordingMetadataLig extends AikumaActivity implements OnClickListe
 					startActivity(intent);
 				} else if (!respeak && elicitation) {
 					intent = new Intent(RecordingMetadataLig.this, RecordElicitation.class);
+					int choiceMode = getIntent().getIntExtra(getString(R.string.selectedFileType), 0);
+
 					Bundle metadataBundle = new Bundle();
 					metadataBundle.putParcelable(metaRecordLang, recordLang);
 					metadataBundle.putParcelable(metaMotherTong, motherTongue);
@@ -518,6 +520,7 @@ public class RecordingMetadataLig extends AikumaActivity implements OnClickListe
 					metadataBundle.putInt(metaSpkrGender, speakerGender);
 					metadataBundle.putString(RecordingMetadataLig.metaDate, metaDate);
 					intent.putExtra(metaBundle, metadataBundle);
+					intent.putExtra(getString(R.string.selectedFileType), choiceMode);
 					intent.putExtra(ElicitationMode.importFileName, getIntent().getStringExtra(ElicitationMode.importFileName));
 					Log.i(TAG, "Selected file: " + getIntent().getStringExtra(ElicitationMode.importFileName));
 					startActivity(intent);
diff --git a/Aikuma/src/org/lp20/aikuma/ui/RespeakingSelection.java b/Aikuma/src/org/lp20/aikuma/ui/RespeakingSelection.java
index 91ce640e..0bbb4b1e 100644
--- a/Aikuma/src/org/lp20/aikuma/ui/RespeakingSelection.java
+++ b/Aikuma/src/org/lp20/aikuma/ui/RespeakingSelection.java
@@ -151,7 +151,6 @@ public class RespeakingSelection extends AikumaActivity {
 			Dialog dialog = new Dialog(getActivity());
 			dialog.setTitle("Import audio file");
 			if (mFileList == null) {
-				Log.d("passage", "mFileList==null");
 				dialog = builder.create();
 				return dialog;
 			} 
-- 
GitLab