OboeTester: use string placeholders (#1604)
Experiment with string formatting using resources.
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AutomatedTestRunner.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AutomatedTestRunner.java
index 1848a93..8341780 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AutomatedTestRunner.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/AutomatedTestRunner.java
@@ -3,7 +3,6 @@
import android.content.Context;
import android.content.Intent;
import android.os.Build;
-import android.text.method.ScrollingMovementMethod;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
@@ -266,7 +265,7 @@
logClear();
log("=== STARTED at " + new Date());
log(mActivity.getTestName());
- log(MainActivity.getVersiontext());
+ log(MainActivity.getVersionText());
log(Build.MANUFACTURER + ", " + Build.MODEL + ", " + Build.PRODUCT);
log(Build.DISPLAY);
appendFailedSummary("Summary\n");
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java
index 9b0f1cb..1fd46f9 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/DeviceReportActivity.java
@@ -25,9 +25,6 @@
import android.media.MicrophoneInfo;
import android.os.Build;
import android.os.Bundle;
-import android.text.method.ScrollingMovementMethod;
-import android.view.View;
-import android.widget.ScrollView;
import android.widget.TextView;
import com.mobileer.audio_device.AudioDeviceInfoConverter;
@@ -103,7 +100,7 @@
logClear();
StringBuffer report = new StringBuffer();
report.append("Device Report:\n");
- report.append("App: ").append(MainActivity.getVersiontext()).append("\n");
+ report.append("App: ").append(MainActivity.getVersionText()).append("\n");
report.append("Device: ").append(Build.MANUFACTURER).append(", ").append(Build.MODEL)
.append(", ").append(Build.PRODUCT).append("\n");
diff --git a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
index 1bd6049..b8cd43b 100644
--- a/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
+++ b/apps/OboeTester/app/src/main/java/com/mobileer/oboetester/MainActivity.java
@@ -99,8 +99,9 @@
int oboeMajor = (oboeVersion >> 24) & 0xFF;
int oboeMinor = (oboeVersion >> 16) & 0xFF;
int oboePatch = oboeVersion & 0xFF;
- mVersionText = "OboeTester (" + pinfo.versionCode + ") v " + pinfo.versionName
- + ", Oboe v " + oboeMajor + "." + oboeMinor + "." + oboePatch;
+ mVersionText = getString(R.string.app_name_version,
+ pinfo.versionCode, pinfo.versionName,
+ oboeMajor, oboeMinor, oboePatch);
mVersionTextView.setText(mVersionText);
} catch (PackageManager.NameNotFoundException e) {
mVersionTextView.setText(e.getMessage());
@@ -134,7 +135,7 @@
saveIntentBundleForLaterProcessing(getIntent());
}
- public static String getVersiontext() {
+ public static String getVersionText() {
return mVersionText;
}
diff --git a/apps/OboeTester/app/src/main/res/values/strings.xml b/apps/OboeTester/app/src/main/res/values/strings.xml
index e7d4367..ae03a60 100644
--- a/apps/OboeTester/app/src/main/res/values/strings.xml
+++ b/apps/OboeTester/app/src/main/res/values/strings.xml
@@ -1,5 +1,6 @@
<resources>
<string name="app_name">Oboe Tester</string>
+ <string name="app_name_version">Oboe Tester,(%d) v %s, Oboe v %d.%d.%d"</string>
<string name="init_device">Device:</string>
<string name="init_status">Status:</string>
<string name="tap_help">Click START button!</string>
