Merge branch 'rilling:main' into main

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Report issues of OpenTracks features
 title: ''
-labels: potential bug
+labels: ''
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/data_not_recorded.md

@@ -1,8 +1,8 @@
 ---
-name: Data not recorded 
-about: Somehow OpenTracks did not record GPS data 
+name: Data not recorded
+about: Somehow OpenTracks did not record GPS data
 title: ''
-labels: potential bug 
+labels: ''
 assignees: ''
 
 ---
@@ -21,4 +21,4 @@ assignees: ''
 - Device: [e.g. Nexus 7 (2013)]
 - OS: [e.g. LineageOS 15.1]
 - OpenTracks version: [e.g. v3.2.4]
-- OpenTracks commit id (only for nightly builds): [e.g. 4b333bb]
+- OpenTracks commit id (only for nightly builds): [e.g. 4b333bb]

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,8 +7,8 @@ assignees: ''
 
 ---
 
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+**Describe briefly your feature.**
+A clear and concise description of what is the general purpose of the feature is. E.g., adding new ski related statistics services that calculate... [...]. Also if you believe that it relates to other features. Create a link to these features
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -17,4 +17,4 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Additional context**
-Add any other context or screenshots about the feature request here.
+Add any other context or screenshots about the feature request here. .

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.1'
+        classpath 'com.android.tools.build:gradle:8.2.2'
     }
 }
 
@@ -56,6 +56,7 @@ android {
     buildFeatures {
         viewBinding true
         buildConfig true
+        dataBinding true
     }
 
     androidResources {
@@ -111,6 +112,10 @@ android {
         }
     }
 
+    viewBinding{
+        enabled = true
+    }
+
     applicationVariants.configureEach { variant ->
         variant.resValue "string", "applicationId", variant.applicationId
 
@@ -125,6 +130,9 @@ android {
 }
 
 dependencies {
+    implementation 'androidx.activity:activity:1.8.0'
+    implementation 'androidx.navigation:navigation-fragment:2.7.7'
+    implementation 'androidx.navigation:navigation-ui:2.7.7'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation 'androidx.appcompat:appcompat:1.6.1'

src/main/AndroidManifest.xml

@@ -49,19 +49,30 @@
 
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.TTS_SERVICE" />
+        </intent>
+    </queries>
+
     <application
         android:name=".Startup"
         android:allowBackup="true"
-        android:fullBackupContent="@xml/backup_rules_30_lower"
         android:dataExtractionRules="@xml/backup_rules_31_higher"
         android:enableOnBackInvokedCallback="true"
+        android:fullBackupContent="@xml/backup_rules_30_lower"
         android:hardwareAccelerated="true"
         android:hasFragileUserData="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/OpenTracksTheme">
-
+        <activity
+            android:name=".ui.aggregatedStatistics.SeasonStats.RunAndChairStatActivity"
+            android:exported="false" />
+        <activity
+            android:name=".ui.aggregatedStatistics.SeasonStats.SeasonStatActivity"
+            android:exported="false" />
         <activity
             android:name=".publicapi.StartRecording"
             android:exported="true"

src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java

@@ -109,8 +109,8 @@ private void storeTrackMetaData(ContentProviderUtils contentProviderUtils, Track
                 viewBinding.trackEditActivityType.getText().toString(), viewBinding.trackEditDescription.getText().toString(),
                 contentProviderUtils);
     }
-
-    @Override
+//Deprecated this method beacause its deprecated
+    @Deprecated
     public void onBackPressed() {
         if (isDiscarding) {
             return;

src/main/java/de/dennisguse/opentracks/chart/ChartFragment.java

@@ -88,7 +88,7 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
             }
             if (PreferencesUtils.isKey(R.string.stats_rate_key, key)) {
                 boolean reportSpeed = PreferencesUtils.isReportSpeed(activityTypeLocalized);
-                if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
+                if (reportSpeed != viewBinding.chartView.isReportSpeed()) {
                     viewBinding.chartView.setReportSpeed(reportSpeed);
                     viewBinding.chartView.applyReportSpeed();
 
@@ -105,17 +105,14 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
     /**
      * A runnable that will setFrequency the orange pointer as appropriate and redraw.
      */
-    private final Runnable updateChart = new Runnable() {
-        @Override
-        public void run() {
+    private final Runnable updateChart = ()->{
             if (!isResumed()) {
                 return;
             }
 
             viewBinding.chartView.setShowPointer(isSelectedTrackRecording());
             viewBinding.chartView.invalidate();
-        }
-    };
+        };
 
 
     @Override
@@ -166,7 +163,7 @@ public void onTrackUpdated(Track track) {
 
             activityTypeLocalized = track.getActivityTypeLocalized();
             boolean reportSpeed = PreferencesUtils.isReportSpeed(activityTypeLocalized);
-            if (reportSpeed != viewBinding.chartView.getReportSpeed()) {
+            if (reportSpeed != viewBinding.chartView.isReportSpeed()) {
                 viewBinding.chartView.setReportSpeed(reportSpeed);
                 viewBinding.chartView.applyReportSpeed();
             }
@@ -186,6 +183,7 @@ public void clearTrackPoints() {
         }
     }
 
+    @Override
     public void onSampledInTrackPoint(@NonNull TrackPoint trackPoint, @NonNull TrackStatistics trackStatistics) {
         if (isResumed()) {
             ChartPoint point = ChartPoint.create(trackStatistics, trackPoint, trackPoint.getSpeed(), chartByDistance, viewBinding.chartView.getUnitSystem());
@@ -256,7 +254,7 @@ private synchronized void pauseTrackDataHub() {
      * Returns true if the selected track is recording.
      * Needs to be synchronized because trackDataHub can be accessed by multiple threads.
      */
-    @Deprecated
+    @Deprecated(since = "verision x.x",forRemoval = true)
     //TODO Should not be dynamic but instead set while instantiating, i.e., newFragment().
     private synchronized boolean isSelectedTrackRecording() {
         return trackDataHub != null && trackDataHub.isSelectedTrackRecording();