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

Merge branch 'V4.0.x' into V4.1.x

Browse Source
This commit is contained in:
Graham Jones
2022-10-26 23:08:21 +01:00
parent b450de56f3 b27653dcbb
commit eb9b0477e4
17 changed files with 367 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
app/src/main/res/layout/activity_log_manager_control.xml
View File

@@ -49,6 +49,25 @@
android:layout_height="wrap_content"
android:text="000" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/NDATimeRemaining" />
<TextView
android:id="@+id/nda_time_remaining_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="000" />
</LinearLayout>
<RadioGroup xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -80,22 +99,23 @@
</RadioGroup>
<LinearLayout
android:visibility="visible"
android:id="@+id/shared_data_ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="visible">
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/remote_database"
android:textAppearance="?android:attr/textAppearanceLarge" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/check_seizures_message"
/>
android:text="@string/check_seizures_message" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -112,24 +132,36 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/authenticate" />
<Button
android:id="@+id/refresh_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/refreshBtn" />
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/remoteAccessPb" />
<ProgressBar
android:id="@+id/remoteAccessPb"
android:layout_width="wrap_content"
android:layout_height="match_parent" />
</LinearLayout>
<CheckBox
android:id="@+id/include_warnings_cb"
android:layout_width="wrap_content"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/include_warnings">
</CheckBox>
android:orientation="horizontal">
<CheckBox
android:id="@+id/include_warnings_cb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/include_warnings"></CheckBox>
<CheckBox
android:id="@+id/include_nda_cb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/include_nda"></CheckBox>
</LinearLayout>
<ListView
android:id="@+id/remoteEventsLv"
@@ -141,11 +173,11 @@
<LinearLayout
android:visibility="gone"
android:id="@+id/local_data_ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="fill_parent"
@@ -161,11 +193,11 @@
</LinearLayout>
<LinearLayout
android:visibility="gone"
android:id="@+id/syslog_ll"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:visibility="gone">
<TextView
android:layout_width="fill_parent"

7
app/src/main/res/menu/log_manager_activity_menu.xml
View File

@@ -31,5 +31,12 @@
app:showAsAction="never|withText"
android:title="@string/data_sharing_log_in" />
<item
android:id="@+id/start_stop_nda"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
app:showAsAction="never|withText"
android:title="@string/start_nda" />
</group>
</menu>

13
app/src/main/res/values/strings.xml
View File

@@ -446,4 +446,17 @@
<string name="mark_unverified_events_false_alarm_dialog_title">Mark all Unverified Events as False Alarm</string>
<string name="mark_unverified_events_false_alarm_dialog_message">Please confirm that all genuine seizure events have been verified before marking all unverified events as type \'False Alarm\'. \n\nContinue to mark unverified events as False Alarm?</string>
<string name="mark_unverified_events_as_false_alarm">Mark all Unverified Events as False Alarm</string>
<string name="LogNDASummary">Continuously log data to the data sharing system to provide background \'normal daily activity\' data to help reduce false alarms.</string>
<string name="LogNDATitle">Log Normal Daily Activities (NDA)</string>
<string name="NDATimerStartTimeParseError">Error Parsing NDATimerStartTime</string>
<string name="include_nda">Include NDA</string>
<string name="start_nda">Start NDA Logging</string>
<string name="stop_nda">Stop NDA Logging</string>
<string name="stop_nda_logging_dialog_title">Stop NDA Logging?</string>
<string name="stop_nda_logging_dialog_meassage">Stop Normal Daily Activity (NDA) Logging?</string>
<string name="start_nda_logging_dialog_title">Start NDA Logging?</string>
<string name="start_nda_logging_dialog_meassage">Start Normal Daily Activity (NDA) Logging (will stop automatically after 24 hours)?</string>
<string name="NDATimeRemaining">"NDA Logging Time Remaining (hours): "</string>
<string name="stop_nda_menu_title">Stop NDA</string>
<string name="start_nda_menu_title">Start NDA</string>
</resources>

7
app/src/main/res/xml/logging_prefs.xml
View File

@@ -11,7 +11,7 @@
android:summary="@string/log_data_summary"
android:title="@string/log_data_title" /> -->
<EditTextPreference
android:defaultValue="150"
android:defaultValue="180"
android:key="EventDurationSec"
android:summary="@string/eventDurationSummary"
android:title="@string/eventDurationTitle" />
@@ -35,6 +35,11 @@
android:key="LogDataRemoteMobile"
android:summary="@string/log_data_remote_mobile_summary"
android:title="@string/log_data_remote_mobile_title" />
<CheckBoxPreference
android:defaultValue="false"
android:key="LogNDA"
android:summary="@string/LogNDASummary"
android:title="@string/LogNDATitle" />
<!--<EditTextPreference
android:defaultValue="60"
android:key="RemoteLogPeriod"