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

Added dividers in main activity menu

Browse Source
This commit is contained in:
Graham Jones
2022-01-31 21:18:43 +00:00
parent 93e68dfb0b
commit d2874cc031
4 changed files with 99 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

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

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

@@ -36,6 +36,7 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.view.MenuCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.util.Log; import android.util.Log;
import android.view.Menu; import android.view.Menu;
@@ -200,6 +201,7 @@ public class MainActivity extends AppCompatActivity {
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
Log.i(TAG, "onCreateOptionsMenu()"); Log.i(TAG, "onCreateOptionsMenu()");
getMenuInflater().inflate(R.menu.main_activity_actions, menu); getMenuInflater().inflate(R.menu.main_activity_actions, menu);
MenuCompat.setGroupDividerEnabled(menu, true);
//mOptionsMenu = menu; //mOptionsMenu = menu;
//if (mConnection.mSdServer.mSdDataSourceName != "Pebble") { //if (mConnection.mSdServer.mSdDataSourceName != "Pebble") {
// Log.v(TAG,"Disabling Pebble Specific Menu Items"); // Log.v(TAG,"Disabling Pebble Specific Menu Items");
@@ -279,7 +281,7 @@ public class MainActivity extends AppCompatActivity {
return true; return true;
*/ */
/* case R.id.action_authenticate_api: case R.id.action_authenticate_api:
Log.i(TAG, "action_autheticate_api"); Log.i(TAG, "action_autheticate_api");
try { try {
Intent i = new Intent( Intent i = new Intent(
@@ -290,7 +292,7 @@ public class MainActivity extends AppCompatActivity {
Log.i(TAG, "exception starting export activity " + ex.toString()); Log.i(TAG, "exception starting export activity " + ex.toString());
} }
return true; return true;
*/
/* /*
case R.id.action_export: case R.id.action_export:
Log.i(TAG, "action_export"); Log.i(TAG, "action_export");

198
app/src/main/res/menu/main_activity_actions.xml
View File

@@ -1,108 +1,96 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<item <group android:id="@+id/grp1">
android:id="@+id/action_accept_alarm" <item
android:showAsAction="never|withText" android:id="@+id/action_accept_alarm"
android:title="@string/accept_alarm" /> android:showAsAction="never|withText"
android:title="@string/accept_alarm" />
</group>
<group android:id="@+id/grp2">
<item
android:id="@+id/action_start_stop"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/start_stop_server" />
</group>
<group android:id="@+id/grp3">
<item
android:id="@+id/action_report_seizure"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/report_seizure" />
<item
android:id="@+id/action_logmanager"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/data_log_manager" />
<item
android:id="@+id/action_authenticate_api"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/data_sharing_log_in" />
</group>
<group android:id="@+id/grp4">
<item
android:id="@+id/action_install_watch_app"
android:showAsAction="never|withText"
android:title="@string/install_watch_app" />
<item
android:id="@+id/action_test_alarm_beep"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/test_alarm_beep" />
<item
android:id="@+id/action_test_warning_beep"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/test_warning_beep" />
<item
android:id="@+id/action_test_sms_alarm"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/test_sms_alarm_notification" />
</group>
<group android:id="@+id/grp5">
<item
android:id="@+id/action_logs"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/view_log_entries" />
<!--
<item
android:enabled="false"
android:id="@+id/action_export"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/export_data"
/>
-->
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/settings" />
</group>
<group android:id="@+id/grp6">
<item
android:id="@+id/action_about"
android:showAsAction="never|withText"
android:title="@string/about" />
</group>
<item </menu>
android:id="@+id/action_start_stop"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/start_stop_server" />
<!-- fault beep test does not work because of fault timer so don't show menu option
<item
android:id="@+id/action_test_fault_beep"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="Test Fault Beep" />
-->
<!-- <item
android:id="@+id/action_launch_pebble_app"
android:showAsAction="never|withText"
android:title="Launch Pebble App" />
-->
<item
android:id="@+id/action_install_watch_app"
android:showAsAction="never|withText"
android:title="@string/install_watch_app" />
<item
android:id="@+id/action_test_alarm_beep"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/test_alarm_beep" />
<item
android:id="@+id/action_test_warning_beep"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/test_warning_beep" />
<item
android:id="@+id/action_test_sms_alarm"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
android:title="@string/test_sms_alarm_notification" />
<!--<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"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/report_seizure"
/>
<item
android:enabled="true"
android:id="@+id/action_logmanager"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/data_log_manager"
/>
<!-- <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"
android:showAsAction="never|withText"
android:title="@string/view_log_entries"
android:enabled="true"
/>
<!--
<item
android:enabled="false"
android:id="@+id/action_export"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/export_data"
/>
-->
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
android:title="@string/settings"
/>
<item
android:id="@+id/action_about"
android:showAsAction="never|withText"
android:title="@string/about" />
</menu>

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

@@ -337,4 +337,5 @@
<string name="not_logged_in">Not Logged In</string> <string name="not_logged_in">Not Logged In</string>
<string name="data_sharing_setup_ok">Data Sharing Setup OK</string> <string name="data_sharing_setup_ok">Data Sharing Setup OK</string>
<string name="please_confirm_seizure_events">Please Check your Shared Seizure Events</string> <string name="please_confirm_seizure_events">Please Check your Shared Seizure Events</string>
<string name="data_sharing_log_in">Data Sharing Log-In</string>
</resources> </resources>