Tidied up menus and button labels - call this version 4.0.0a - very alpha but it does most of what it needs to :)
This commit is contained in:
@@ -4,13 +4,25 @@
|
||||
android:layout_height="fill_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="64dp"
|
||||
android:background="#FFFFFF"
|
||||
android:contentDescription="@string/app_name"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/star_of_life_24x24" />
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#FFFFFF"
|
||||
android:contentDescription="@string/app_name"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/star_of_life_24x24" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="@string/login_to_osdapi" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/login_ui"
|
||||
@@ -59,12 +71,26 @@
|
||||
android:layout_weight="1"
|
||||
android:text="@string/authenticate" />
|
||||
</LinearLayout>
|
||||
<Button
|
||||
android:id="@+id/RegisterBtn"
|
||||
android:layout_width="wrap_content"
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/register" />
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/RegisterBtn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/register" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/ResetPasswordBtn"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/reset_password" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
@@ -90,7 +116,7 @@
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/cancel" />
|
||||
android:text="@string/back" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/logoutBtn"
|
||||
|
||||
@@ -46,13 +46,13 @@
|
||||
android:showAsAction="never|withText"
|
||||
android:title="@string/test_sms_alarm_notification" />
|
||||
|
||||
<item
|
||||
<!--<item
|
||||
android:enabled="false"
|
||||
android:id="@+id/action_test_phone_alarm"
|
||||
android:icon="@drawable/stop_server"
|
||||
android:showAsAction="never|withText"
|
||||
android:title="@string/test_phone_alarm_notification" />
|
||||
|
||||
-->
|
||||
<item
|
||||
android:enabled="true"
|
||||
android:id="@+id/action_report_seizure"
|
||||
@@ -69,14 +69,14 @@
|
||||
android:title="@string/data_log_manager"
|
||||
/>
|
||||
|
||||
<item
|
||||
<!-- <item
|
||||
android:enabled="true"
|
||||
android:id="@+id/action_authenticate_api"
|
||||
android:icon="@drawable/ic_action_settings"
|
||||
android:showAsAction="never|withText"
|
||||
android:title="@string/authenticate"
|
||||
/>
|
||||
|
||||
-->
|
||||
<item
|
||||
android:id="@+id/action_logs"
|
||||
android:icon="@drawable/ic_action_settings"
|
||||
@@ -84,7 +84,7 @@
|
||||
android:title="@string/view_log_entries"
|
||||
android:enabled="true"
|
||||
/>
|
||||
|
||||
<!--
|
||||
<item
|
||||
android:enabled="false"
|
||||
android:id="@+id/action_export"
|
||||
@@ -92,7 +92,7 @@
|
||||
android:showAsAction="never|withText"
|
||||
android:title="@string/export_data"
|
||||
/>
|
||||
|
||||
-->
|
||||
<item
|
||||
android:id="@+id/action_settings"
|
||||
android:icon="@drawable/ic_action_settings"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<resources>
|
||||
<string name="app_name">OpenSeizureDetector</string>
|
||||
<string name="changelog">
|
||||
"V3.9.x - Added logging of data to remote server
|
||||
"V4.0 - Added logging of data to remote server
|
||||
\nV3.7.0 - Added support for Garmin Blood Oxygen Saturation measurements
|
||||
\nV3.6.2 - Fix of issue with log file permissions on some Android 10 devices and added more translatable strings with polish translation.
|
||||
\nV3.6.1 - Possible fix for issue with shutting down system and expanded Polish translation to all settings screens.
|
||||
@@ -328,4 +328,6 @@
|
||||
<string name="back">Back</string>
|
||||
<string name="unvalidatedEventsTitle">Unvalidated Seizure Events</string>
|
||||
<string name="register">Register New User</string>
|
||||
<string name="reset_password">Reset Password</string>
|
||||
<string name="login_to_osdapi">Log in to osdApi Remote Database</string>
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user