gudbjartur22/clinx02-androidpebble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V3.2.0 - Added multiple language support

Browse Source
This commit is contained in:
Graham Jones
2020-04-18 20:26:29 +01:00
parent 48ade0ba6f
commit b4c9d1d08d
10 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/release/app-release-3.2.0.apk Normal file
View File

Binary file not shown.

BIN
app/release/app-release.apk
View File

Binary file not shown.

2
app/release/output.json
View File

@@ -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":{}}]

2
app/src/main/java/uk/org/openseizuredetector/MainActivity.java
View File

@@ -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");

5
app/src/main/java/uk/org/openseizuredetector/PrefActivity.java
View File

@@ -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");

4
app/src/main/java/uk/org/openseizuredetector/SdServer.java
View File

@@ -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);
}
}

3
app/src/main/res/xml/basic_prefs.xml
View File

@@ -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>

4
app/src/main/res/xml/preference_headers.xml
View File

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