Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Laurent Besacier
lig-aikuma
Commits
1b81bed3
Commit
1b81bed3
authored
Jul 25, 2016
by
Elodie Gauthier
Browse files
Fix minor correctives. Ready to be delivery to partners.
parent
97d8a0a7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Aikuma/res/layout-xlarge/respeaking_metadata.xml
View file @
1b81bed3
...
...
@@ -398,9 +398,9 @@
android:layout_width=
"200dp"
android:layout_height=
"wrap_content"
android:text=
"@string/speaker_name"
style=
"@style/respeak_TextviewMetadata2"
android:textColor=
"#6FA9C8"
android:textStyle=
"bold"
android:textSize=
"15sp"
/>
android:textStyle=
"bold"
/>
<EditText
android:id=
"@+id/respeak_edit_spkr_name"
...
...
Aikuma/res/layout/respeaking_metadata.xml
View file @
1b81bed3
...
...
@@ -411,6 +411,7 @@
<TextView
android:id=
"@+id/textView17"
android:text=
"@string/speaker_name"
android:layout_width=
"100dp"
android:layout_height=
"wrap_content"
style=
"@style/respeak_TextviewMetadata2"
/>
...
...
Aikuma/src/org/lp20/aikuma/model/RecordingLig.java
View file @
1b81bed3
...
...
@@ -291,18 +291,20 @@ public class RecordingLig extends Recording {
* @return a recording path
*/
public
File
getIndividualRecordingPath
()
{
File
path
;
File
path
=
null
;
String
[]
dir
=
this
.
getRespeakingId
().
split
(
"_"
);
if
(
this
.
name
.
contains
(
"rspk"
)
||
this
.
name
.
contains
(
"trsl"
))
{
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
(
dir
.
length
<
4
)
{
Log
.
d
(
TAG
,
"path -> "
+
this
.
getRespeakingId
());
path
=
new
File
(
getRecordingsPath
(),
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
())
{
Log
.
d
(
TAG
,
"elicitation path -> "
+
this
.
getRespeakingId
());
path
=
new
File
(
getRecordingsPath
(),
...
...
Aikuma/src/org/lp20/aikuma/ui/RespeakingMetadataLig.java
View file @
1b81bed3
...
...
@@ -99,12 +99,20 @@ public class RespeakingMetadataLig extends AikumaActivity implements OnClickList
List
<
Language
>
languages
=
(
List
<
Language
>)
Language
.
decodeJSONArray
((
JSONArray
)
metaJSON
.
get
(
"languages"
));
// ArrayList<Language> languages = (ArrayList<Language>)metaJSON.get("languages");
tv
=
(
TextView
)
findViewById
(
R
.
id
.
record_edit_extra_lang
);
if
(
languages
.
size
()
>
1
)
{
StringBuilder
s
=
new
StringBuilder
();
// for (Language l : languages.subList(0, languages.size()))
for
(
Language
l
:
languages
)
s
.
append
(
l
.
getName
()
+
";"
);
tv
.
setText
(
s
.
toString
());
Log
.
d
(
TAG
,
"extra spoken languages: "
+
languages
.
size
());
if
(
languages
.
size
()
>
0
)
{
if
(
languages
.
size
()
==
1
)
{
StringBuilder
s
=
new
StringBuilder
();
for
(
Language
l
:
languages
)
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
{
tv
.
setText
(
"None"
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment