Tidied up menus and button labels - call this version 4.0.0a - very alpha but it does most of what it needs to :)

app/src/main/AndroidManifest.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
     android:versionCode="92"
-    android:versionName="3.9.0a">
+    android:versionName="4.0.0a">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

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

@@ -50,6 +50,8 @@ public class AuthenticateActivity extends AppCompatActivity {
         logoutBtn.setOnClickListener(onLogout);
         Button registerBtn = (Button) findViewById(R.id.RegisterBtn);
         registerBtn.setOnClickListener(onRegister);
+        Button resetPasswordBtn = (Button) findViewById(R.id.ResetPasswordBtn);
+        resetPasswordBtn.setOnClickListener(onResetPassword);
 
         mUnameEt = (EditText) findViewById(R.id.username);
         mPasswdEt = (EditText) findViewById(R.id.password);
@@ -178,6 +180,23 @@ public class AuthenticateActivity extends AppCompatActivity {
                 }
             };
 
+    View.OnClickListener onResetPassword =
+            new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    Log.d(TAG, "onResetPasswordBtn");
+                    //Intent i;
+                    //i = new Intent(getApplicationContext(), RemoteDbActivity.class);
+                    //i.putExtra("url", "https://osdapi.ddns.net/static/register.html");
+                    //startActivity(i);
+                    String url = "https://osdapi.ddns.net/static/request_password_reset.html";
+                    Intent i = new Intent(Intent.ACTION_VIEW);
+                    i.setData(Uri.parse(url));
+                    startActivity(i);
+                }
+            };
+
+
     private void saveAuthToken(String tokenStr) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         prefs.edit().putString(TOKEN_ID, tokenStr).commit();

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

@@ -270,13 +270,16 @@ public class MainActivity extends AppCompatActivity {
                     mConnection.mSdServer.sendSMSAlarm();
                 }
                 return true;
-            case R.id.action_test_phone_alarm:
+
+            /*case R.id.action_test_phone_alarm:
                 Log.i(TAG, "action_test_phone_alarm");
                 if (mConnection.mBound) {
                     mConnection.mSdServer.sendPhoneAlarm();
                 }
                 return true;
-            case R.id.action_authenticate_api:
+                */
+
+/*            case R.id.action_authenticate_api:
                 Log.i(TAG, "action_autheticate_api");
                 try {
                     Intent i = new Intent(
@@ -287,6 +290,8 @@ public class MainActivity extends AppCompatActivity {
                     Log.i(TAG, "exception starting export activity " + ex.toString());
                 }
                 return true;
+                */
+            /*
             case R.id.action_export:
                 Log.i(TAG, "action_export");
                 try {
@@ -298,6 +303,7 @@ public class MainActivity extends AppCompatActivity {
                     Log.i(TAG, "exception starting export activity " + ex.toString());
                 }
                 return true;
+             */
             case R.id.action_logs:
                 Log.i(TAG, "action_logs");
                 try {

app/src/main/res/layout/activity_authenticate.xml

@@ -4,14 +4,26 @@
     android:layout_height="fill_parent"
     android:orientation="vertical">
 
+    <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="match_parent"
+            android:layout_width="wrap_content"
-        android:layout_height="64dp"
+            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"
         android:layout_width="fill_parent"
@@ -59,12 +71,26 @@
                 android:layout_weight="1"
                 android:text="@string/authenticate" />
         </LinearLayout>
+
+        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            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"

app/src/main/res/menu/main_activity_actions.xml

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

app/src/main/res/values/strings.xml

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