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

Used Android Studio Refactor tool to convert to AppCompat (had to change some references back to just Activity to get it to compile

Browse Source
This commit is contained in:
Graham Jones
2022-03-01 23:48:30 +00:00
parent 938b9c1f29
commit a8d3b5cc4d
12 changed files with 71 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/res/layout/activity_authenticate.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical">
@@ -15,7 +16,7 @@
android:background="#FFFFFF"
android:contentDescription="@string/app_name"
android:scaleType="center"
android:src="@drawable/star_of_life_24x24" />
app:srcCompat="@drawable/star_of_life_24x24" />
<TextView
android:layout_width="wrap_content"

3
app/src/main/res/layout/startup_activity.xml
View File

@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -15,7 +16,7 @@
android:layout_height="wrap_content"
android:id="@+id/imageView"
android:layout_gravity="center_horizontal"
android:src="@drawable/star_of_life_48x48" />
app:srcCompat="@drawable/star_of_life_48x48" />
<TextView
android:layout_width="wrap_content"

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

@@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/grp1">
<item
android:id="@+id/pruneDatabaseMenuItem"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/prune_database" />
</group>
@@ -11,7 +12,7 @@
android:id="@+id/action_report_seizure"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/report_seizure" />
@@ -19,7 +20,7 @@
android:id="@+id/action_authenticate_api"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/data_sharing_log_in" />
</group>

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

@@ -1,8 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<menu xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android">
<group android:id="@+id/grp1">
<item
android:id="@+id/action_accept_alarm"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/accept_alarm" />
</group>
@@ -10,7 +11,7 @@
<item
android:id="@+id/action_start_stop"
android:icon="@drawable/stop_server"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/start_stop_server" />
</group>
<group android:id="@+id/grp3">
@@ -18,53 +19,53 @@
android:id="@+id/action_report_seizure"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
app: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"
app: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"
app:showAsAction="never|withText"
android:title="@string/data_sharing_log_in" />
<item
android:id="@+id/action_about_datasharing"
android:enabled="true"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="About Data Sharing..." />
</group>
<group android:id="@+id/grp4">
<item
android:id="@+id/action_install_watch_app"
android:showAsAction="never|withText"
app: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"
app: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"
app: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"
app:showAsAction="never|withText"
android:title="@string/test_sms_alarm_notification" />
</group>
<group android:id="@+id/grp5">
@@ -86,7 +87,7 @@
<item
android:id="@+id/action_settings"
android:icon="@drawable/ic_action_settings"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/settings" />
</group>
@@ -95,7 +96,7 @@
<item
android:id="@+id/action_about"
android:showAsAction="never|withText"
app:showAsAction="never|withText"
android:title="@string/about" />
</group>