Commit 1b81bed3 authored by Elodie Gauthier's avatar Elodie Gauthier
Browse files

Fix minor correctives. Ready to be delivery to partners.

parent 97d8a0a7
...@@ -398,9 +398,9 @@ ...@@ -398,9 +398,9 @@
android:layout_width="200dp" android:layout_width="200dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/speaker_name" android:text="@string/speaker_name"
style="@style/respeak_TextviewMetadata2"
android:textColor="#6FA9C8" android:textColor="#6FA9C8"
android:textStyle="bold" android:textStyle="bold"/>
android:textSize="15sp"/>
<EditText <EditText
android:id="@+id/respeak_edit_spkr_name" android:id="@+id/respeak_edit_spkr_name"
......
...@@ -411,6 +411,7 @@ ...@@ -411,6 +411,7 @@
<TextView <TextView
android:id="@+id/textView17" android:id="@+id/textView17"
android:text="@string/speaker_name" android:text="@string/speaker_name"
android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="@style/respeak_TextviewMetadata2"/> style="@style/respeak_TextviewMetadata2"/>
......
...@@ -291,18 +291,20 @@ public class RecordingLig extends Recording { ...@@ -291,18 +291,20 @@ public class RecordingLig extends Recording {
* @return a recording path * @return a recording path
*/ */
public File getIndividualRecordingPath() { public File getIndividualRecordingPath() {
File path; File path = null;
String[] dir = this.getRespeakingId().split("_"); String[] dir = this.getRespeakingId().split("_");
if (this.name.contains("rspk") || this.name.contains("trsl")) { if (this.name.contains("rspk") || this.name.contains("trsl")) {
if (dir[3].equals("elicit")) { if (dir.length < 4) {
Log.d(TAG, "elicitation path -> "+this.getRespeakingId());
path = new File(getRecordingsPath(),
dir[0] + "_" + dir[1] + "_" + dir[2] + "_" + dir[3] + "/");
} else {
Log.d(TAG, "path -> "+this.getRespeakingId()); Log.d(TAG, "path -> "+this.getRespeakingId());
path = new File(getRecordingsPath(), path = new File(getRecordingsPath(),
dir[0] + "_" + dir[1] + "_" + dir[2] + "/"); dir[0] + "_" + dir[1] + "_" + dir[2] + "/");
} } else {
if (dir[3].equals("elicit")) {
Log.d(TAG, "elicitation path -> "+this.getRespeakingId());
path = new File(getRecordingsPath(),
dir[0] + "_" + dir[1] + "_" + dir[2] + "_" + dir[3] + "/");
}
}
} else if (isElicit()) { } else if (isElicit()) {
Log.d(TAG, "elicitation path -> "+this.getRespeakingId()); Log.d(TAG, "elicitation path -> "+this.getRespeakingId());
path = new File(getRecordingsPath(), path = new File(getRecordingsPath(),
......
...@@ -99,12 +99,20 @@ public class RespeakingMetadataLig extends AikumaActivity implements OnClickList ...@@ -99,12 +99,20 @@ public class RespeakingMetadataLig extends AikumaActivity implements OnClickList
List<Language> languages= (List<Language>) Language.decodeJSONArray((JSONArray)metaJSON.get("languages")); List<Language> languages= (List<Language>) Language.decodeJSONArray((JSONArray)metaJSON.get("languages"));
// ArrayList<Language> languages = (ArrayList<Language>)metaJSON.get("languages"); // ArrayList<Language> languages = (ArrayList<Language>)metaJSON.get("languages");
tv = (TextView) findViewById(R.id.record_edit_extra_lang); tv = (TextView) findViewById(R.id.record_edit_extra_lang);
if (languages.size() > 1) { Log.d(TAG,"extra spoken languages: "+languages.size());
StringBuilder s = new StringBuilder(); if (languages.size() > 0) {
// for (Language l : languages.subList(0, languages.size())) if (languages.size() == 1 ) {
for (Language l : languages) StringBuilder s = new StringBuilder();
s.append(l.getName() + ";"); for (Language l : languages)
tv.setText(s.toString()); s.append(l.getName());
tv.setText(s.toString());
} else {
StringBuilder s = new StringBuilder();
// for (Language l : languages.subList(0, languages.size()))
for (Language l : languages)
s.append(l.getName() + ";");
tv.setText(s.toString());
}
} else { } else {
tv.setText("None"); tv.setText("None");
} }
......
Markdown is supported
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