MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-28 21:06:50 +01:00
Code Releases Wiki Activity

Fossil Hybrid HR: Fix up/back navigation and add titles

Browse Source
This commit is contained in:
Arjan Schrijver 2021-03-06 20:42:16 +01:00 committed by Gitea
parent fdea7ed24d
commit 627bf033c3
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,11 +69,11 @@
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round" android:roundIcon="@mipmap/ic_launcher_round"
android:theme="@style/GadgetbridgeTheme"> android:theme="@style/GadgetbridgeTheme">
<activity android:name=".devices.qhybrid.WidgetSettingsActivity" />
<activity <activity
android:name=".activities.ControlCenterv2" android:name=".activities.ControlCenterv2"
android:label="@string/title_activity_controlcenter" android:label="@string/title_activity_controlcenter"
android:theme="@style/SplashTheme"> android:theme="@style/SplashTheme"
android:launchMode="singleTop">
<intent-filter> <intent-filter>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
@ -481,7 +481,8 @@
android:parentActivityName=".activities.ControlCenterv2" /> android:parentActivityName=".activities.ControlCenterv2" />
<activity <activity
android:name=".activities.devicesettings.DeviceSettingsActivity" android:name=".activities.devicesettings.DeviceSettingsActivity"
android:label="@string/title_activity_device_specific_settings" /> android:label="@string/title_activity_device_specific_settings"
android:parentActivityName=".activities.ControlCenterv2" />
<activity <activity
android:name=".activities.AlarmDetails" android:name=".activities.AlarmDetails"
android:label="@string/title_activity_alarm_details" android:label="@string/title_activity_alarm_details"
@ -577,22 +578,40 @@
<activity <activity
android:name=".devices.qhybrid.ConfigActivity" android:name=".devices.qhybrid.ConfigActivity"
android:exported="true" /> android:label="@string/qhybrid_title_watchface_apps"
android:exported="true"
android:parentActivityName=".activities.ControlCenterv2" />
<activity <activity
android:name=".devices.qhybrid.QHybridAppChoserActivity" android:name=".devices.qhybrid.QHybridAppChoserActivity"
android:exported="true" /> android:label="@string/qhybrid_title_apps"
android:exported="true"
android:parentActivityName=".devices.qhybrid.ConfigActivity" />
<activity <activity
android:name=".devices.qhybrid.HRConfigActivity" android:name=".devices.qhybrid.HRConfigActivity"
android:exported="true" /> android:label="@string/qhybrid_title_watchface_apps"
android:exported="true"
android:parentActivityName=".activities.ControlCenterv2" />
<activity android:name=".devices.qhybrid.WidgetSettingsActivity"
android:label="@string/add_widget"
android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
<activity <activity
android:name=".devices.qhybrid.ImageEditActivity" android:name=".devices.qhybrid.ImageEditActivity"
android:exported="true" /> android:label="@string/qhybrid_title_background_image"
android:exported="true"
android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
<activity <activity
android:name=".devices.qhybrid.FileManagementActivity" android:name=".devices.qhybrid.FileManagementActivity"
android:exported="true" /> android:label="@string/qhybrid_title_file_management"
android:exported="true"
android:parentActivityName=".devices.qhybrid.HRConfigActivity"/>
<activity <activity
android:name=".devices.qhybrid.AppsManagementActivity" android:name=".devices.qhybrid.AppsManagementActivity"
android:exported="true" /> android:label="@string/qhybrid_title_apps_management"
<activity android:name=".devices.qhybrid.CalibrationActivity" /> android:exported="true"
android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
<activity
android:name=".devices.qhybrid.CalibrationActivity"
android:label="@string/qhybrid_title_calibration"
android:parentActivityName=".devices.qhybrid.HRConfigActivity" />
</application> </application>
</manifest> </manifest>

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/qhybrid/HRConfigActivity.java
View File

@ -421,13 +421,10 @@ public class HRConfigActivity extends AbstractGBActivity implements View.OnClick
.setTitle("create action") .setTitle("create action")
.show(); .show();
} else if(v.getId() == R.id.qhybrid_file_management_trigger) { } else if(v.getId() == R.id.qhybrid_file_management_trigger) {
finish();
startActivity(new Intent(getApplicationContext(), FileManagementActivity.class)); startActivity(new Intent(getApplicationContext(), FileManagementActivity.class));
} else if(v.getId() == R.id.qhybrid_apps_management_trigger) { } else if(v.getId() == R.id.qhybrid_apps_management_trigger) {
finish();
startActivity(new Intent(getApplicationContext(), AppsManagementActivity.class)); startActivity(new Intent(getApplicationContext(), AppsManagementActivity.class));
} else if(v.getId() == R.id.calibration_trigger) { } else if(v.getId() == R.id.calibration_trigger) {
finish();
startActivity(new Intent(getApplicationContext(), CalibrationActivity.class)); startActivity(new Intent(getApplicationContext(), CalibrationActivity.class));
} }
} }

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

@ -1146,4 +1146,10 @@
<string name="fossil_hr_synced_activity_data">Synchronised activity data</string> <string name="fossil_hr_synced_activity_data">Synchronised activity data</string>
<string name="fossil_hr_unavailable_unauthed">Not available in unauthenticated mode</string> <string name="fossil_hr_unavailable_unauthed">Not available in unauthenticated mode</string>
<string name="fossil_hr_auth_failed">Authentication failed, limited functionality</string> <string name="fossil_hr_auth_failed">Authentication failed, limited functionality</string>
<string name="qhybrid_title_watchface_apps">Watchface and apps</string>
<string name="qhybrid_title_apps">Apps</string>
<string name="qhybrid_title_background_image">Background image</string>
<string name="qhybrid_title_file_management">File management</string>
<string name="qhybrid_title_apps_management">Apps management</string>
<string name="qhybrid_title_calibration">Calibration</string>
</resources> </resources>