V3.2.0 - Added multiple language support

CHANGELOG.md

@@ -1,8 +1,7 @@
 	OpenSeizureDetector Android App - Change Log
 	============================================
     V3.2.0 - mar2020
-        - Modified data logging to use sqlite database rather than text files.
+        - Added support for additional languages - Sweedish, German and Russian included in this release
-        - Added facility to upload data to remote server.
         - Added support for additional GarminSD settings data fields to record the watch app version number etc and
           log that info to the SysLog file.
         - Made only a subset of settings available by default, unless the user enables 'advanced mode' to make them all visible.

CREDITS.md

@@ -4,4 +4,4 @@ Thank you to the following people who have contributed to this app:
 
 Juergen Huebers - German Translation
 Pavel Losevsky - Russian Translation
-Andreas Ekstrom - Sweedish Translation
+Andreas & Marie Ekstrom - Swedish Translation

app/release/output.json

@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":69,"versionName":"3.1.15a","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":70,"versionName":"3.2.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release","dirName":""},"path":"app-release.apk","properties":{}}]

app/src/main/java/uk/org/openseizuredetector/MainActivity.java

@@ -311,7 +311,7 @@ public class MainActivity extends AppCompatActivity {
         TextView tv;
         tv = (TextView) findViewById(R.id.versionTv);
         String versionName = mUtil.getAppVersionName();
-        tv.setText(getString(R.string.AppTitleText) + versionName);
+        tv.setText(getString(R.string.AppTitleText) + " " + versionName);
 
         if (mUtil.isServerRunning()) {
             mUtil.writeToSysLogFile("MainActivity.onStart - Binding to Server");

app/src/main/java/uk/org/openseizuredetector/PrefActivity.java

@@ -66,7 +66,7 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
     @Override
     public void onBuildHeaders(List<Header> target) {
         loadHeadersFromResource(R.xml.preference_headers, target);
-
+        Log.v(TAG,"onBuildHeaders - target.size="+target.size());
         SharedPreferences SP = PreferenceManager
                 .getDefaultSharedPreferences(this.getApplicationContext());
         String dataSourceStr = SP.getString("DataSource", "Pebble");
@@ -106,7 +106,8 @@ public class PrefActivity extends PreferenceActivity implements SharedPreference
         } else {
             for (int i = 0; i < target.size(); i++) {
                 Header h = target.get(i);
-                Log.v(TAG, "found - " + h.title.toString());
+                Log.v(TAG,"i="+i+", h="+h.toString());
+                Log.v(TAG, "found - " + h.title);
                 if (!h.title.toString().equals("Basic")) {
                     if (!advancedMode) {
                         Log.v(TAG, "an Advanced Mode Header");

app/src/main/java/uk/org/openseizuredetector/SdServer.java

@@ -217,7 +217,7 @@ public class SdServer extends Service implements SdDataReceiver {
         // Create our log manager.
         //mLm = new LogManager(mLogDataRemote, mLogDataRemoteMobile,
         //        mOSDUname, mOSDPasswd, mOSDWearerId, mOSDUrl, this);
-        mLm = new LogManager(this);
+        //mLm = new LogManager(this);
 
         Log.v(TAG, "onStartCommand: Datasource =" + mSdDataSourceName);
         switch (mSdDataSourceName) {
@@ -1018,7 +1018,7 @@ public class SdServer extends Service implements SdDataReceiver {
         if (mLogData) {
             Log.v(TAG, "logData() - writing data to SD Card");
             writeToSD();
-            mLm.writeToLocalDb(mSdData);
+            //mLm.writeToLocalDb(mSdData);
         }
     }
 

app/src/main/res/xml/basic_prefs.xml

@@ -23,7 +23,7 @@
         android:title="@string/DataSourceTitle" />
 
     <PreferenceCategory android:title="Data Logging Settings">
-    <CheckBoxPreference
+<!--    <CheckBoxPreference
         android:defaultValue="false"
         android:key="LogDataRemote"
         android:summary="@string/LogRemoteSummary"
@@ -33,6 +33,7 @@
         android:key="LogDataRemoteMobile"
         android:summary="@string/UseMobileSummary"
         android:title="@string/UseMobileTitle" />
+-->
     </PreferenceCategory>
 
 

app/src/main/res/xml/preference_headers.xml

@@ -4,8 +4,8 @@
 
     <header android:fragment="uk.org.openseizuredetector.PrefActivity$BasicPrefsFragment"
         android:icon="@drawable/icon_24x24"
-        android:title="@string/BasicPrefTitle"
+        android:title="Basic"
-        android:summary="@string/BasicPrefSummary" />
+        android:summary="Basic Settings" />
 
     <header android:fragment="uk.org.openseizuredetector.PrefActivity$GeneralPrefsFragment"
         android:icon="@drawable/icon_24x24"