From fc982d37ce18feb7e06bea9173b35b2d5a0a5c0f Mon Sep 17 00:00:00 2001 From: Graham Jones Date: Fri, 18 Dec 2020 13:32:41 +0000 Subject: [PATCH] V3.6.2b - extracted more strings for translation --- app/src/main/AndroidManifest.xml | 4 +-- .../org/openseizuredetector/MainActivity.java | 6 ++-- .../uk/org/openseizuredetector/OsdUtil.java | 6 ++-- .../SdDataSourceGarmin.java | 17 ----------- .../uk/org/openseizuredetector/SdServer.java | 28 +++++++++---------- app/src/main/res/layout/main.xml | 4 +-- app/src/main/res/layout/startup_activity.xml | 2 +- .../main/res/values-pl/datasource_list.xml | 10 +++++++ app/src/main/res/values-pl/strings.xml | 16 +++++++++++ app/src/main/res/values/strings.xml | 16 +++++++++++ 10 files changed, 67 insertions(+), 42 deletions(-) create mode 100644 app/src/main/res/values-pl/datasource_list.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 89a45ff..0181f1a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,8 +2,8 @@ + android:versionCode="84" + android:versionName="3.6.2b"> diff --git a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java index 4628262..ffa01d6 100644 --- a/app/src/main/java/uk/org/openseizuredetector/MainActivity.java +++ b/app/src/main/java/uk/org/openseizuredetector/MainActivity.java @@ -136,7 +136,7 @@ public class MainActivity extends AppCompatActivity { if ((mConnection.mSdServer.mSmsTimer != null) && (mConnection.mSdServer.mSmsTimer.mTimeLeft > 0 )){ Log.v(TAG, "acceptAlarmButton.onClick() - Stopping SMS Timer"); - mUtil.showToast("SMS Alarm Cancelled"); + mUtil.showToast(getString(R.string.SMSAlarmCancelledMsg)); mConnection.mSdServer.stopSmsTimer(); } else { @@ -357,7 +357,7 @@ public class MainActivity extends AppCompatActivity { Log.v(TAG, "Changing menu icons"); MenuItem menuItem = mOptionsMenu.findItem(R.id.action_start_stop); menuItem.setIcon(R.drawable.stop_server); - menuItem.setTitle("Stop Server"); + menuItem.setTitle(R.string.StopServerTitle); } else { Log.v(TAG, "mOptionsMenu is null - not changing icons!"); } @@ -371,7 +371,7 @@ public class MainActivity extends AppCompatActivity { if (mOptionsMenu != null) { Log.v(TAG, "Changing action bar icons"); mOptionsMenu.findItem(R.id.action_start_stop).setIcon(R.drawable.start_server); - mOptionsMenu.findItem(R.id.action_start_stop).setTitle("Start Server"); + mOptionsMenu.findItem(R.id.action_start_stop).setTitle(R.string.StartServerTitle); } else { Log.v(TAG, "mOptionsMenu is null, not changing icons!"); } diff --git a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java index d309b2d..6520b20 100644 --- a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java +++ b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java @@ -143,7 +143,7 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac } catch (Exception ex) { Log.v(TAG, "updatePrefs() - Problem parsing preferences!"); - showToast("Problem Parsing Preferences - Something won't work - Please go back to Settings and correct it!"); + showToast(mContext.getString(R.string.ParsePreferenceWarning)); } } @@ -401,7 +401,7 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac for (int i = 0; i < (ex.getStackTrace().length); i++) { Log.e(TAG, "writeToLogFile - error " + ex.getStackTrace()[i]); } - showToast("ERROR Writing to Log File" + ex.toString()); + showToast(mContext.getString(R.string.ErrorWritingLogFileWarning) + ex.toString()); } } else { Log.e(TAG, "ERROR - Can not Write to External Folder"); @@ -530,7 +530,7 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) { Log.i(TAG, "onRequestPermissionsResult - Permission" + permissions + " = " + grantResults); - showToast("Permissions Changed - restarting server"); + showToast(mContext.getString(R.string.RestartingServerMsg)); stopServer(); // Wait 0.1 second to give the server chance to shutdown, then re-start it mHandler.postDelayed(new Runnable() { diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java index 7dbf47d..eebc258 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourceGarmin.java @@ -23,27 +23,10 @@ */ package uk.org.openseizuredetector; -import android.content.BroadcastReceiver; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.content.SharedPreferences; import android.os.Handler; import android.preference.PreferenceManager; -import android.text.format.Time; import android.util.Log; -import android.widget.Toast; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.jtransforms.fft.DoubleFFT_1D; - -import java.util.Arrays; -import java.util.Timer; -import java.util.TimerTask; - -import static java.lang.Long.parseLong; /** diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java index e475d34..af4f07f 100644 --- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java +++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java @@ -256,11 +256,11 @@ public class SdServer extends Service implements SdDataReceiver { mSdDataSource = new SdDataSourcePhone(this.getApplicationContext(), mHandler, this); break; default: - Log.e(TAG, "Datasource " + mSdDataSourceName + " not recognised - Defaulting to Pebble"); - mUtil.writeToSysLogFile("SdServer.onStartCommand() - Datasource " + mSdDataSourceName + " not recognised - exiting"); - mUtil.showToast("Datasource " + mSdDataSourceName + " not recognised - Defaulting to Pebble"); - mUtil.writeToSysLogFile("SdServer.onStartCommand() - creating SdDataSourcePebble"); - mSdDataSource = new SdDataSourcePebble(this.getApplicationContext(), mHandler, this); + Log.e(TAG, "Datasource " + mSdDataSourceName + " not recognised - Defaulting to Phone"); + //mUtil.writeToSysLogFile("SdServer.onStartCommand() - Datasource " + mSdDataSourceName + " not recognised - exiting"); + mUtil.showToast(getString(R.string.DatasourceTitle) + " " + mSdDataSourceName + getString(R.string.DefaultingToPhoneMsg)); + mUtil.writeToSysLogFile("SdServer.onStartCommand() - creating SdDataSourcePhone"); + mSdDataSource = new SdDataSourcePhone(this.getApplicationContext(), mHandler, this); } if (mSMSAlarm) { @@ -349,7 +349,7 @@ public class SdServer extends Service implements SdDataReceiver { } catch (Exception e) { Log.e(TAG, "Error Releasing Wakelock - " + e.toString()); mUtil.writeToSysLogFile("SdServer.onDestroy() - Error releasing wakelock."); - mUtil.showToast("Error Releasing Wakelock"); + mUtil.showToast(getString(R.string.ErrorReleasingWakelockMsg)); } } else { Log.d(TAG, "mmm...mWakeLock is null, so not releasing lock. This shouldn't happen!"); @@ -589,11 +589,11 @@ public class SdServer extends Service implements SdDataReceiver { sendPhoneAlarm(); mSMSTime = tnow; } else { - mUtil.showToast("SMS Alarm already sent - not re-sending"); + mUtil.showToast(getString(R.string.SMSAlarmAlreadySentMsg)); Log.v(TAG, "SMS Alarm already sent - not re-sending"); } } else { - mUtil.showToast("mSMSAlarm is false - not sending"); + mUtil.showToast(getString(R.string.SMSAlarmDisabledNotSendingMsg)); Log.v(TAG, "mSMSAlarm is false - not sending"); } @@ -625,7 +625,7 @@ public class SdServer extends Service implements SdDataReceiver { sendSMSAlarm(); mSMSTime = tnow; } else { - mUtil.showToast("SMS Alarm already sent - not re-sending"); + mUtil.showToast(getString(R.string.SMSAlarmAlreadySentMsg)); Log.v(TAG, "SMS Alarm already sent - not re-sending"); } } else { @@ -663,7 +663,7 @@ public class SdServer extends Service implements SdDataReceiver { Log.v(TAG, "SMS Alarm already sent - not re-sending"); } } else { - mUtil.showToast("mSMSAlarm is false - not sending"); + mUtil.showToast(getString(R.string.SMSAlarmDisabledNotSendingMsg)); Log.v(TAG, "mSMSAlarm is false - not sending"); } @@ -724,7 +724,7 @@ public class SdServer extends Service implements SdDataReceiver { mToneGenerator.startTone(ToneGenerator.TONE_CDMA_ALERT_CALL_GUARD, duration); Log.v(TAG, "beep()"); } else { - mUtil.showToast("Warning mToneGenerator is null - not beeping!!!"); + mUtil.showToast(getString(R.string.PleaseForceStopOSDorRebootMsg)); Log.v(TAG, "beep() - Warming mToneGenerator is null - not beeping!!!"); mUtil.writeToSysLogFile("SdServer.beep() - mToneGenerator is null???"); } @@ -806,7 +806,7 @@ public class SdServer extends Service implements SdDataReceiver { if (mSMSAlarm) { if (!mCancelAudible) { if (!mUtil.areSMSPermissionsOK()) { - mUtil.showToast("ERROR - Permission for SMS or Location Denied - Not Sending SMS"); + mUtil.showToast(getString(R.string.SMSPermissionsDeniedMsg)); Log.e(TAG, "ERROR - Permission for SMS or Location Denied - Not Sending SMS"); } else { //mSMSAlertDialog = new AlertDialog.Builder(this); @@ -1100,7 +1100,7 @@ public class SdServer extends Service implements SdDataReceiver { } catch (Exception ex) { Log.v(TAG, "updatePrefs() - Problem with LatchAlarmTimerPeriod preference!"); mUtil.writeToSysLogFile( "updatePrefs() - Problem with LatchAlarmTimerPeriod preference!"); - mUtil.showToast("Problem Parsing LatchAlarmTimerPeriod Preference"); + mUtil.showToast(getString(R.string.problem_parsing_preferences)); } mAudibleFaultWarning = SP.getBoolean("AudibleFaultWarning", true); Log.v(TAG, "updatePrefs() - mAuidbleFaultWarning = " + mAudibleFaultWarning); @@ -1114,7 +1114,7 @@ public class SdServer extends Service implements SdDataReceiver { } catch (Exception ex) { Log.v(TAG, "updatePrefs() - Problem with FaultTimerPeriod preference!"); mUtil.writeToSysLogFile("updatePrefs() - Problem with FaultTimerPeriod preference!"); - mUtil.showToast("Problem Parsing FaultTimerPeriod Preference"); + mUtil.showToast(getString(R.string.problem_parsing_preferences)); } mAudibleAlarm = SP.getBoolean("AudibleAlarm", true); diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index 0cfbf24..0fdb82d 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -122,13 +122,13 @@ android:id="@+id/acceptAlarmButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Accept Alarm" /> + android:text="@string/AcceptAlarmBtnTxt" />