Commit aa71a9e2 authored by CallisteHanriat's avatar CallisteHanriat

Changing file names in shorter way

parent 7d46add9
......@@ -65,8 +65,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/spoken_languages"
android:layout_marginBottom="30dp"
android:layout_alignParentTop="true" />
android:layout_marginBottom="30dp"/>
<LinearLayout
android:id="@+id/layout_languages"
......@@ -168,7 +167,7 @@
android:id="@+id/et_secondLanguage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_wersoneight="1"
android:ems="10"
android:hint="@string/add_custom_language_or"
android:textSize="12sp" />
......@@ -254,7 +253,8 @@
android:layout_marginRight="20dp"
android:layout_weight="1"
android:ems="10"
android:textSize="18sp" />
android:textSize="18sp"
android:inputType="text"/>
</LinearLayout>
</LinearLayout>
......@@ -297,7 +297,7 @@
android:layout_weight="1"
android:ems="10"
android:inputType="textPersonName"
android:textSize="18sp" />
android:textSize="18sp"/>
</LinearLayout>
......@@ -320,7 +320,8 @@
android:layout_marginRight="20dp"
android:layout_weight="1"
android:ems="10"
android:textSize="18sp" />
android:textSize="18sp"
android:inputType="number" />
</LinearLayout>
......
......@@ -11,6 +11,8 @@ import android.content.Context;
import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.preference.PreferenceManager;
import android.provider.Settings.Secure;
......@@ -83,6 +85,14 @@ public class Aikuma extends android.app.Application {
getContext().getContentResolver(), Secure.ANDROID_ID);
}
/**
* A function which return 3 first charactes of ANDROID_ID address
* @return 3 first characters of ANDROID_ID Address
*/
public static String getDeviceId() {
return getAndroidID().substring(0, 3);
}
/**
* Checks whether the device is currently connected to a network
* @return boolean for status
......
......@@ -173,11 +173,15 @@ public class RecordActivityLig extends RecordActivity {
int duration = super.recorder.getCurrentMsec();
String deviceName = Aikuma.getDeviceName();
String androidID = Aikuma.getAndroidID();
String idDevice = Aikuma.getDeviceId();
Log.d("androidID", androidID);
ArrayList<String> speakerIds = new ArrayList<String>();
Double latitude = MainActivity.locationDetector.getLatitude();
Double longitude = MainActivity.locationDetector.getLongitude();
String name = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(date)
+ "_" + deviceName + "_" + recordLang.getCode();
String name = new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(date) + "_" + recordLang.getCode()
+ "_" + idDevice;
Log.d("new_name", name);
// + "_" + deviceName + "_" + selectedLanguages.get(0).getCode();
String gender = "";
if (speakerGender == RecordingMetadataLig.GENDER_MALE)
......
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