From 64cff1f5770f752a48e170a9cf879fb09a0c1990 Mon Sep 17 00:00:00 2001
From: yashvadaria <yashvadaria@gmail.com>
Date: Sat, 18 Nov 2023 22:40:34 -0500
Subject: [PATCH 1/9] Changed AggregatedStatics with the Elevation Gain (UI +
 Controller)

---
 build.gradle                                  |  4 +--
 .../AggregatedStatisticsAdapter.java          | 20 +++++++++--
 .../res/layout/aggregated_stats_list_item.xml | 35 ++++++++++++++++++-
 3 files changed, 54 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8823dc5fd..01dc59700 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,8 +21,8 @@ apply plugin: 'org.sonarqube'
 
 sonarqube {
     properties {
-        property "sonar.projectName", "Group 8 SOEN 6431"
-        property "sonar.projectKey", "Group-8-SOEN-6431"
+        property "sonar.projectName", "Group 11 SOEN 6431"
+        property "sonar.projectKey", "Group-11-SOEN-6431"
         property "sonar.host.url", "http://localhost:9000"
         property "sonar.login", "sqp_7f8adc6706b839b752be96c5d687384252602ab5"
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index 9cb2e7c8f..f8a148bb2 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -20,6 +20,7 @@
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.settings.PreferencesUtils;
 import de.dennisguse.opentracks.settings.UnitSystem;
+import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
@@ -48,6 +49,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
         String type = aggregatedStatistic.getActivityTypeLocalized();
         if (ActivityType.findByLocalizedString(context, type).isShowSpeedPreferred()) {
             viewHolder.setSpeed(aggregatedStatistic);
+            viewHolder.setElevation(aggregatedStatistic);
+
+
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -89,6 +93,10 @@ private class ViewHolder extends RecyclerView.ViewHolder {
         private final TextView maxSpeedUnit;
         private final TextView maxSpeedLabel;
 
+        private final TextView elevationGain;
+        private final TextView elevationLabel;
+        private final TextView elevationUnit;
+
         private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();
         private boolean reportSpeed;
 
@@ -100,15 +108,23 @@ public ViewHolder(View view) {
             distance = view.findViewById(R.id.aggregated_stats_distance);
             distanceUnit = view.findViewById(R.id.aggregated_stats_distance_unit);
             time = view.findViewById(R.id.aggregated_stats_time);
-
             avgSpeed = view.findViewById(R.id.aggregated_stats_avg_rate);
             avgSpeedUnit = view.findViewById(R.id.aggregated_stats_avg_rate_unit);
             avgSpeedLabel = view.findViewById(R.id.aggregated_stats_avg_rate_label);
             maxSpeed = view.findViewById(R.id.aggregated_stats_max_rate);
             maxSpeedUnit = view.findViewById(R.id.aggregated_stats_max_rate_unit);
             maxSpeedLabel = view.findViewById(R.id.aggregated_stats_max_rate_label);
-        }
+            elevationGain = view.findViewById(R.id.aggregated_stats_elevation_gain);
+            elevationLabel = view.findViewById(R.id.aggregated_stats_elevation_gain_label);
+            elevationUnit = view.findViewById(R.id.aggregated_stats_elevation_gain_unit);
+
+            elevationLabel.setText("Elevation Gain");
+            elevationUnit.setText("ft");
 
+        }
+        public void setElevation(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
+                elevationGain.setText(aggregatedStatistic.getTrackStatistics().getTotalAltitudeGain().toString());
+        }
         public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             setCommonValues(aggregatedStatistic);
 
diff --git a/src/main/res/layout/aggregated_stats_list_item.xml b/src/main/res/layout/aggregated_stats_list_item.xml
index 7b148cb0f..99087e414 100644
--- a/src/main/res/layout/aggregated_stats_list_item.xml
+++ b/src/main/res/layout/aggregated_stats_list_item.xml
@@ -66,6 +66,7 @@
         app:layout_constraintTop_toTopOf="@+id/aggregated_stats_type_label"
         tools:text="(1)" />
 
+
     <!-- Distance -->
     <TextView
         android:id="@+id/aggregated_stats_distance"
@@ -166,12 +167,44 @@
         app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_max_rate"
         tools:text="@string/stats_max_speed" />
 
+    <!-- Elevation Gain -->
+    <TextView
+        android:id="@+id/aggregated_stats_elevation_gain"
+        style="@style/TextAppearance.OpenTracks.SecondaryValue"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="@id/guideline2"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
+        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_avg_rate_label"
+        tools:text="500" />
+
+    <TextView
+        android:id="@+id/aggregated_stats_elevation_gain_label"
+        style="@style/TextAppearance.OpenTracks.SecondaryHeader"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="@id/guideline2"
+        app:layout_constraintStart_toEndOf="@id/guideline1"
+        app:layout_constraintTop_toBottomOf="@+id/aggregated_stats_elevation_gain"
+        tools:text="Elevation Gain" />
+
+    <TextView
+        android:id="@+id/aggregated_stats_elevation_gain_unit"
+        style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="@+id/aggregated_stats_elevation_gain"
+        app:layout_constraintStart_toEndOf="@+id/aggregated_stats_elevation_gain"
+        tools:text="ft" />
+
     <View
         android:id="@+id/aggregated_stats_horizontal_line"
         style="@style/HorizontalLine"
         android:layout_marginTop="8dp"
         app:layout_constraintStart_toEndOf="@id/guideline1"
         app:layout_constraintEnd_toStartOf="@id/guideline3"
-        app:layout_constraintTop_toBottomOf="@id/aggregated_stats_max_rate_label" />
+        app:layout_constraintTop_toBottomOf="@id/aggregated_stats_elevation_gain_label" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 327b3389e63e669258679cb03e79776cc3495259 Mon Sep 17 00:00:00 2001
From: alekhya-2000 <jahnavialekhya2000@gmail.com>
Date: Sun, 19 Nov 2023 19:06:21 -0500
Subject: [PATCH 2/9] Created Aggregated stats in settings and implemented for
 elevation gain

---
 src/.DS_Store                                 | Bin 0 -> 6148 bytes
 src/main/.DS_Store                            | Bin 0 -> 8196 bytes
 src/main/java/.DS_Store                       | Bin 0 -> 6148 bytes
 src/main/java/de/.DS_Store                    | Bin 0 -> 6148 bytes
 src/main/java/de/dennisguse/.DS_Store         | Bin 0 -> 8196 bytes
 .../java/de/dennisguse/opentracks/.DS_Store   | Bin 0 -> 8196 bytes
 .../AggregatedStatsSettingsFragment.java      |  23 ++++++++++++++++
 .../settings/MainSettingsFragment.java        |   5 ++++
 .../opentracks/settings/PreferencesUtils.java |   9 +++++++
 .../opentracks/settings/SettingsActivity.java |   2 ++
 .../de/dennisguse/opentracks/ui/.DS_Store     | Bin 0 -> 6148 bytes
 .../AggregatedStatisticsAdapter.java          |  20 +++++++-------
 src/main/res/.DS_Store                        | Bin 0 -> 6148 bytes
 src/main/res/values/settings.xml              |   4 +++
 src/main/res/values/strings.xml               |   5 ++++
 src/main/res/xml/settings.xml                 |   6 +++++
 .../res/xml/settings_aggregated_stats.xml     |  25 ++++++++++++++++++
 17 files changed, 90 insertions(+), 9 deletions(-)
 create mode 100644 src/.DS_Store
 create mode 100644 src/main/.DS_Store
 create mode 100644 src/main/java/.DS_Store
 create mode 100644 src/main/java/de/.DS_Store
 create mode 100644 src/main/java/de/dennisguse/.DS_Store
 create mode 100644 src/main/java/de/dennisguse/opentracks/.DS_Store
 create mode 100644 src/main/java/de/dennisguse/opentracks/settings/AggregatedStatsSettingsFragment.java
 create mode 100644 src/main/java/de/dennisguse/opentracks/ui/.DS_Store
 create mode 100644 src/main/res/.DS_Store
 create mode 100644 src/main/res/xml/settings_aggregated_stats.xml

diff --git a/src/.DS_Store b/src/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..125d765cc36113d51073171429c3e4a7d8a4ffd1
GIT binary patch
literal 6148
zcmeHK%}T>S5Z-O0O({YS3Oz1(E!dV)EnY&bFJMFuDm5WRgK4%jsXdfJ&iX<=iO=KA
z?nW%utB9R}-EV$(vma!C7-QU<M;*o-#+VHak)yIf(7iEKG0BJ=#|RhMG)!a&_M3_Q
zb--`8*n|ZvX6e`O52s0-<?Z%6uT-s_-I`sq8}^<5C>MSn<nzo6W;bYEN|}VE9)wr%
zcrkMJ&t#ehaXOx<f;bvO%I$TWMsnfFc^YM^*4F{MZr4XnbGbb3oU}y0J6N^Ea?owJ
zM6cglt?Kr{;nC^E=qZ_`@<kKMfo~;y21|Ga<#RpH{wz&o`T)K%zsw^f28aP-fEd_b
z2F#gYH@24oS~)R54E(?V?hgVQqHD0wsJ0I1@cN8#3lRl$d`ln-gRa3sBSb*BE(O%3
z+&nS3E(gCbd9J}iqb_G$%?#t1najruSF?j(sC33%jnoqZ#K1ZORc$(W{-47yv+<F?
zUP2ZzKn(md2Dml!haN1-oUPxMhi9#Tb`K2&^9oczKwrBAfPwo+Qw4QgpbmMi!9pXB
Tf__yFNEZP`2zA83FEH={#HvbC

literal 0
HcmV?d00001

diff --git a/src/main/.DS_Store b/src/main/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..eb93551afaeca9bb66c93bf7e641252be4f5477a
GIT binary patch
literal 8196
zcmeHMZ)_Ar6rbO=ls&u9Ef!mrE1Xn8@j_d`QV{go0tE^}xNCbYXx+PA=)!il-tOHY
zq_IS!5&h)9uNaAm`T>o95)&1pQDb6^(GU`<AM}IK#7`zB$`|9Cojsr}Bz!OtWha?=
z^WMBSv+vFC?cD4!#?W0f+8JwNjLB3vRcooaLgC}Q&MHzUsUZroXSuRBp0nK?@$b#j
zjs#Hzq6kD0h$0Y0Ad0~C5CJ-~d6BPj?u*f=jUo_5;D(F<e?KIsa+(V1q@cm8gPPz9
zK(v~~L7~3NJ46#9O@(w)P#U2EVM<h(BD`Win3Fsa>ZL+DDX1`K2rnN9S4Mb4L9jZ_
zp9s_$Qi4Wp6oDuLvm?Oo?$zuN(^-k>m*3xW<F@7bZEfcuRaMWanJdqgYvl*hqi#9v
z>weMe)(iVMmvLP?SLy4y0n03ps0}@?<Lj1V76JpyFiB<qpye2Dx!Wx|h8NhT#ef`>
zV<T$Qv19AnJCliy)$1pciDT<mw<Qy6JJwE2#N>r7t@rF5Ic$$P?g`-n!q)(sH^Zf;
zFZZXEE;zR993&anuVMveGVg!lW$2CVm3qWCm#USOJ)5fRS?s1-WuBJl&kQKptd)12
zv~|=RQR_U~xb4L5DVQbNu)(}*7sniLM6J*3cD`uqzS(8lT$yBbUcTVk_8!->e9Lu)
zvc7r5uS_&;C_C)A1-~blY(!Oyp1IegxvY}8nP#M^7Vy<}kMn7~0khx{ZArC>EsUL>
z-x$C3_LZ$`*Kg|Hy5s({b!z>Bn;R5mm{8*Q)&a{b^p`EeA05)Yyy+O0b8xU^c~;Ig
zGmbuH)*~5<1y)UqG%Z`qSq~R2{}HuCmIG<?5>44}(1Yx94L+NpzAFp;WlJ<|A0O!{
znA94f!SWTFlJO`Asvaudl~k0>VS=&hg-f-yD_Xy;=S*8QVq%@UI}~lOB)n7mLg9u6
zMa$;hu`zPR3uX7-r)dxJWq0bHzkA$t=#jn%*Y2UQVQ*9~n7hlAMxnHqq`~%)oEvR1
zEZ?mR_K_Due7Y{f2z*$e*4Jr!w7s(WtxVftIVFoymtrn5SZ)!4XRIZ)Qgnkj#u_T}
zkn*#+nJs6X^eZ644ltJ;XV0*c>>c(YJHx(W=h%<zXZ9Pr!2SXtp$ZBXq7hA4gk@+&
zJ62;2HewsLV+Yd6Vi^0dA0`gL#uyxwF@Z-hiQ_ndXYo8<z>7GESMeHN$J_V>pW-uo
zj;}F=@9;f-!XNk(7bHniq<PYOsZnZ@G-<K4N@|rlr7mf!)GMA`s=OtJrh6o1iNBOT
z;Wta^)Rprm-n*@LyV7^v=g;~1B4ZZb(wN|B)VZnaBH{!@E2z92>jA*0r9}Yn00}d|
zd6x2OalBbsT1mT^>DW)1VIGlrBC2zR_A=!*nKDD2BiI$noigQwS|iwGe3eXDs7e8=
zw8z)PDA&{~!6xJDVzLUsY*04FDC^W}!8R+YSWIOB6Yq&{ktuUj`5%JxH*AXiz<y!B
zvkRy}EmSPU9cV)bQrL=K0&yR9VE}^|A}DhpAHXOq9EOh~f%yoI;xRmqC-5YmB0xV!
zkmi7X2`}RmUcqU+fj99M-p2<xgOBhrLHtXc#d%E40PfD|z{RhZfIH)Go340GT$Rvj
z;`je8SO5NhO>;#`Q3Rq0{5K<j>dooR-Sq60<8r1O{H~p#`VduKxZb3ofeAIib)0B$
q9VdG64@2rFNR`{9LOLlZNvQlA9|EHD|I%;W==`7kllDe9|NjP-GRL+6

literal 0
HcmV?d00001

diff --git a/src/main/java/.DS_Store b/src/main/java/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..eaf3024af8516fb924ffdf171518aee82133b181
GIT binary patch
literal 6148
zcmeHKQA@)x5Kgw~GKSCxg*^s*9k`7#9ln%0|9};JP?;?)TCB}jJNGaKebztZFY)(y
zm!#ly&mwXM$#<8#OPUXwOBiF^TSR@v9LAV{hR9LbA~?L&RkOi}9OnpA6@vaA&eFvC
z{yN~d*I2~jaGB4(et%x{dLO)2Z|v+gMN_oJo&Ttoei0Ol+zaM6Xk99mhLs+KS4q5_
zI{RlTD}p48=Q<&YVhFjtPO?ZXJ+;W9T<7}6AzGp}bvmonasQ+%M}zUYD_7$|uPcY6
z;d<Q?2Zu+e7t^QoIa9BOOb%RY*|S)|8z_1&FaA7BRrUaO6<fs+5(C5lF+dCu1GYAZ
zHc>$g5Cg=(HwN&0kkAlai={z*bU=sKXY@A^Q9#GH1fsO)S}YBM2ZWncK$FVt6N8&{
z7?(EAwOAT7>5S`@VII43^?2cWbr_dAoN?D6^~3-%u*pE(m=4zebNFSpKJqtH$RY-a
zfq%vTZ%q7&2b;3B^~d(G)=Fsi&`>b0L<I!&jY|L+c#d?m)A%Lo5a(Jf4dN^~uG0bO
OBA^MOju`j_20j6=z(|1r

literal 0
HcmV?d00001

diff --git a/src/main/java/de/.DS_Store b/src/main/java/de/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..43ed06e61169f26245cfb39145cfcae63442a7d3
GIT binary patch
literal 6148
zcmeHKPfNov6i>G4T8FTM!j1v21Gh1z;-$>_1+3^nWv;Z$Vr|B{+QS(1tY64a;^*<b
zBo)Wz!HbA{ue|q5-k*m2Qj&%-#`~$?W~|N_vp^9`HkdVnanuzl84n^??+97K#w-OJ
ztYnkpFEW5@x5Io`uNa;$>*r<3#EYZ{@i%W0g~_bddgrBbWox@?RjrzJ=RU~HosDK`
z(jQH4uy-kC<Q46acNGTNu)cRD<Jl;TgQ+SA{Qy#Kufy1vSzo5HpQu__2Q1sNhxNvM
ze$+m0ieBer(G>HOPOB-pz3yURTl)uxrx(M==qZ*jnothko|0XI1-wFI?cAQ-X&lLT
z4Dq72s39Z<hyh|?6BsaipH<t0$<iE&0b<}s4B-ACKoK2-xkj~hfWhBKj8_m*ppAD4
zL}Ab|m}`Ux2-l^6x|EwM2G`}_7bed!m}}JKjH{91J!WKXZYW%h4t}B18Fw_2B?gFr
zWd_Q+TgUVN{QLX=auM~20b<}^F~BPWchH9^nX`3ea(LDX(0fo6%*!=?mOw)t#gL0f
daRXEd_yslq9fP?>@PN>dfTDp6G4QJld;oQEP5uA?

literal 0
HcmV?d00001

diff --git a/src/main/java/de/dennisguse/.DS_Store b/src/main/java/de/dennisguse/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..cfe91c46eda21f2eb46c99727a9cbdd22f168488
GIT binary patch
literal 8196
zcmeHMYitx%6u#fIz)U;PDHN#V78a@!aU(61mWSZd7J1X!ZD}dUc6Mik3DcRfGrL7=
zV`E}a@e%!Hd?o(UXe4TU5dEp*BkB)D4aWEbHBl3ziT*J$(R1g{5@>0Ri7}#cleuT^
zdE7ha%y;hHGs_r5d(muWte!C@)5WP)P2EKrm-A~%lOj$fQII`j0V^<r<=J88PtlGU
zaRlNB#1V)i5Jw=6z`r2^bY}A=Pjl`IY23#Vh$Ha7i~!#sl5}yJj_8D-;nqQ2SOO5`
zB|zBdp6Y<mCK=ImL?;9dO=(V1Js>hgRANAwlRU}QiKZhuA*e8C5atZg%7`iygsYQX
zGE`?s3mW%v1mXxxjQ~%dD(0~fW-<5t`aL)5kK`OLNAi=o5y$p}rlwCJRaDNHIZK`;
zSIakL4tb-QzzB+dyHVK3N4=is<jVI(ZjWt^X0^Hw&kYRQwF;quZCa$Vzu$IEZ?xSj
zx~3o6W`saiWF@QBkBzmptV$(YS2d5Pl4EOEHl>m+tu5o@iaft@#rmG?VQ1L&?h)=F
z+7j68N$wq=&Ns&|bqL=oR+oMIyzHA&Rjtm}d;9kE52#sfZi$@e8VPLA_4il>pJ-OA
z@yXe3dC%=GSX|zp_nhLe>u0svyy4`FjuBX!94BMnY7wu-&lfz$>Gph^PqTL*u#N^?
zHbpcr=zE2rBb;o&rul`IR`jhNizc;8RwqsE*G+O1%85A(6HBgKzM^IAhV~n_?>=3l
z)y|z)r>cV#RX4D2wyi?nsBH#^_8NZPa!uPk*k7`JJLg!vt}$%YBBdyyRsChUK2Xfr
zM~ZfEi`FR1A-7?XuI@K!?OmS9XEU{zWud=xk*@FKl8%B!y%`x?wM<ugeR5JWBE@S`
zs@i*)Uc2T;OEopCdY@zDEJrgHvCisNRqro}IBPp1=DIpnAIN*d!{mw|@itzs>j(I<
zI}JbR8nIk@q<5mVJ4iO@A2JG7*C@d*;%*^s`09wyjW(Nh;FX0t$cw#vx=p4T`Y>0k
zt<k&n9$EWH&T5+NmTZDLy*`0>xiNiEyoAQ|^5~}gQo?{XrkliAp@Xe~tz?~SCmW*A
zV`J<-_Aq;ry~N&Pr`RX#OZFZ6k^Kr_CKObm8g*#EVkEHy%h86lScmoKL^p0k5B6aQ
zIpkqt7zG3<qJ-OVCywDR+>M9u2p+@Zcmhx1dAxuZ@jBka`}hDK;xnAZSNIw~;CG2h
zkgB9QX}+{TS}Y}{rBb8RDz!;zX`9p|^-DwI(WP=?4VGPt_y*C7ZW@$W(WW7txOieE
zwrt(DeaEGfSZC&lRGPnFVUp+9nhl%IK~Z404A=9MAVmHJ`4S>OM8+i4o~DGmJkg*o
zF6ZOqJnf^Dv5v|-L$z5#d#QSbOev$y5W{8a)iNcEHd72!iECv_PfZGkYI9<hLP@Aq
zh+!(xrpOw^V4ZrMLg}bgieZDARuqkegG5JSvrH+a$$uBt&#<%XTlN$Cjj%ok^H7gv
zXu=w7#8&J^7oj_YJ{&+624S2d+{Flvz{hPECzMa%4jjk5xE~MTK|=bYgmsSer|}G)
z#dCNCui_+L!y9-Lr|>r3CG3BUFYpb%$Ip`xz3W0m<Cp0WUCI<($8&kIm$TtQ(@S_%
zA)dXS*Z-TR|Negodl)}@9Dz6je-;5$c4j);No%?tj@Q~rx`ycDjq6Pa8k$fSmg7Xj
oa-8V7KMd(UNvhl?9nlFvi9_ul{}Axkeptune|-M`C(r*s00Ts29{>OV

literal 0
HcmV?d00001

diff --git a/src/main/java/de/dennisguse/opentracks/.DS_Store b/src/main/java/de/dennisguse/opentracks/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d78f262859951c513ba9836477a4bc01f4a4827f
GIT binary patch
literal 8196
zcmeHMU2GIp6u#fIlo>nFDHdCXEv!^QaYI{L%a5Sj7AQ~<LbvU<pmld=pd-_nx-+|r
zkj4^;M)b+QSB%6&eL&++VxnR+YD|nV8bU(#K_84JKAD&(FUE7{&JwyUZ^jUq+uVER
zoO92;bIyEc?w%=Q3_S&-ov|jym`t5ht(Jy)8rSnar%9othA7CMF^f6u2=lTfZ*tD;
zNDxIJia->BC<0Lgq6l0M5uh`hH~AXpzR*Tv6oDuLH)RC)`yo!9(_~1e1r1&uGz298
z(P|P0jjpK<2yEgZO@?$@(7=?|6x9PlQ-mc3ggNQsd^*u&NT&rA<_yA|A>0{Zg@Ryr
zvWo}P8IpoVV-$fX0&^q4Yj>G>%w#_OT~)tlZ8uB053-ZC<@s%G7a>(uFQ{24FO+NL
zhX%&o(tw}w3tmqqe~@!2*R`|d>r8gYGD~AxL$B-j8Ot&Afq`Y1H098+<rr?M$1OO9
z7uXI6g{;WRnAUXS#D>m}M7*n`eJT+@v1xr<BHr26IW?uoOIup+J1}<Co^agL!WD$C
z1GcEbwP)w^%l3-B!mp~eWxr<1ekr%qs*Cj0U}{KBr>&gp3|Pm_F|E!c=XMdhKW`Sv
zso|V!7bYBUOsmgj>|DXl_-40l^T{Nu^KyCDw)eZ9<y)>ZlJ?DGetDr;s`RMm=KbDa
zu`x|6c;*3<*0PG`Hd>LETEchRH_4arhRnQ2v?bXl+*HmjZj9Z2=i1iJO<Q|*?0)b<
zomRi()&^A_rARuyb=WfVgC)!G$44?=&U6gRIWk<dJS%IPDJL^w)+3=PfmPEoT~8OX
z)?)?Be_U&k<v`lJLRSwNbR&CRgRf?2@5^HTsuj9^kZXGLCXGgDuzHQIraTIQmI)``
zlTg*vQF_#x7jD(ouIht!CTrT7p@@C%?NasOqVP`Z4~3f>R6U(@Cnm@hFO=Q?fUZBx
zx80NR{C$(AL$~x*xOXq<M!oS&-rQFrsD;u#k_L~D<lJbxVfk)Z*-u`K@a4J<Bk*B~
zR$r&@*AK|r_cA>W%PCp}Z;H7<x!h95S4(oOxD4W`G?e8b<>y#4Tg^7oxs_svnafVH
z=hzwc9{ZS`XWy`k>}U2X`-5F({{WCs1r<xth$bw<Dzu^<>(PNN*oj@(jRB-Fii0==
z6OY2i1RRtwg(onLlQ@m%@giQr%Q%DA@dn<+yZ8*B;|qL=Z!v=(@FRY~U-%oBB}r1H
zMbcuaQEHNOX}PpcYLzxh-O>)JPu#gw&ZLpq9!Y89=e!{(lO{zbNoVKJq*&k1zFlhn
zb)QL>7K_|jdRt?hC)CER-B++Dz*@%V)u<1kJ}W^2s0Wy+fawLwu;sC4b!9mLD-&~&
za>P6)^OV#UirK5wJ7mfcZGm9dsCUbh9a@cG6R~wN<)bDAtlA#yP$=uPD#0dV8x&cC
zU^c5;6v{uXTCmM(Qc*M(FtOg)cA0WWlm8=df5&FnPwY4LC%cRq)I!5b+=VuDA&DL6
zBRKbCFNQFT5dt-b^kIy{!cq7r5Uh{kIG)5QJcXz63_<$^0yl^DD|i)W@fyzIExe6)
z@F70Jd3=IT3G83v0xn^u0>XP{Lm0o$2jSvC-mzWh2<bTVC01Y-|8RW+9DIQ<75>c*
zNx)SJSrf1Sw_p4F|2&qFD2hN7fg2?PsNOcPt%tlR{{*OXjMv(6>W@(8jnA7FG%%ro
rPvP>Q94C6^ABJ=t4|U0qP76vJYXAF(fQnzz(fJ>p{~U=o+xh=5W5dU-

literal 0
HcmV?d00001

diff --git a/src/main/java/de/dennisguse/opentracks/settings/AggregatedStatsSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/AggregatedStatsSettingsFragment.java
new file mode 100644
index 000000000..ede8f270e
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/settings/AggregatedStatsSettingsFragment.java
@@ -0,0 +1,23 @@
+package de.dennisguse.opentracks.settings;
+
+import android.os.Bundle;
+
+import androidx.preference.PreferenceFragmentCompat;
+
+import de.dennisguse.opentracks.BuildConfig;
+import de.dennisguse.opentracks.R;
+
+public class AggregatedStatsSettingsFragment extends PreferenceFragmentCompat {
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        addPreferencesFromResource(R.xml.settings_aggregated_stats);
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_aggregated_stats);
+        findPreference(getString(R.string.settings_aggregated_stats_key));
+    }
+}
diff --git a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
index f2fd0bfbf..16157f543 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/MainSettingsFragment.java
@@ -49,6 +49,11 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_api_key));
             return true;
         });
+
+        findPreference(getString(R.string.settings_aggregated_stats_key)).setOnPreferenceClickListener(preference -> {
+            ((SettingsActivity) getActivity()).openScreen(getString(R.string.settings_aggregated_stats_key));
+            return true;
+        });
     }
 
     @Override
diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 2df14dd95..192bf533d 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -451,6 +451,15 @@ public static void setVoiceAnnounceAverageHeartRate(boolean value) {
         setBoolean(R.string.voice_announce_average_heart_rate_key, value);
     }
 
+    public static boolean shouldElevationGain() {
+        return getBoolean(R.string.aggregated_stats_package_key, false);
+    }
+
+    @VisibleForTesting
+    public static void setElevationGain(boolean value) {
+        setBoolean(R.string.aggregated_stats_package_key, value);
+    }
+
     public static Distance getRecordingDistanceInterval() {
         return Distance.of(getInt(R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefaultInternal()));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
index 2f22e0d45..4d30563eb 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SettingsActivity.java
@@ -94,6 +94,8 @@ private PreferenceFragmentCompat getPreferenceScreen(String key) {
             fragment = new ImportExportSettingsFragment();
         } else if (key.equals(getString(R.string.settings_api_key))) {
             fragment = new PublicAPISettingsFragment();
+        } else if (key.equals(getString(R.string.settings_aggregated_stats_key))) {
+            fragment = new AggregatedStatsSettingsFragment();
         }
 
         return fragment;
diff --git a/src/main/java/de/dennisguse/opentracks/ui/.DS_Store b/src/main/java/de/dennisguse/opentracks/ui/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..28a20b109bb44e28d45450696302cfb33f8fc983
GIT binary patch
literal 6148
zcmeHKQA@)x5WZ~Fb%?MBg*^s*9XQ>Xh%aT%KVU^4RAy_-EY?QW&OMAlpY;#<OZ+|F
zC7Cj&;ESSiS1w<2xl5YwO40y;=#9f2fI0v;sDz~&79R-plP*cgS_p+6BZ49LkV6FF
zk~bTEBLkGX4b0gPpAqKmJ%1kNk#ZSBrps%{f=PBCBr3p|=iokxv%J-M5v6ivWwq*5
zoi*puyHOJ__w#Yq^GD~@I#DVK=5;?fjibq+zHzA1+>g^}qyyqGLYIrPI1SaLr^acR
z=~&NnI5np>s5hq5y-vF+yX~D>Q%?7HTTR*Nc4o7hv$?f>a6Gt8?o#z=NEY}#YFW29
zhbOFjdA$$bC{0v4#F+Vb^KlrN0cL<1_{$8~J<VDB%ZuQ5X9k#oZ()G;2Z>7PS}Y9e
ztpf}CeWd;hAqm#$E<q?Qx)uwA*n=WWD541!_KG1)INGK4b1fDIO*jZWGmc|t7WRfB
z^z3Mt+8u;zkV|HO8CYbXY?^gC|BpVu|1Sn{iy2@B{uKkF()ap3T#`Lomlj87twg;-
qB_Y4U;9Ce*^ihnybQCvGwV+*61<|!w7(@#S{|IOrxL^i;lz~_I_f_Qp

literal 0
HcmV?d00001

diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index f8a148bb2..bf80046c4 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -22,6 +22,7 @@
 import de.dennisguse.opentracks.settings.UnitSystem;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldElevationGain;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -49,9 +50,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
         String type = aggregatedStatistic.getActivityTypeLocalized();
         if (ActivityType.findByLocalizedString(context, type).isShowSpeedPreferred()) {
             viewHolder.setSpeed(aggregatedStatistic);
-            viewHolder.setElevation(aggregatedStatistic);
-
-
+            if(shouldElevationGain()) {
+                viewHolder.setElevation(aggregatedStatistic);
+            }
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -114,13 +115,14 @@ public ViewHolder(View view) {
             maxSpeed = view.findViewById(R.id.aggregated_stats_max_rate);
             maxSpeedUnit = view.findViewById(R.id.aggregated_stats_max_rate_unit);
             maxSpeedLabel = view.findViewById(R.id.aggregated_stats_max_rate_label);
-            elevationGain = view.findViewById(R.id.aggregated_stats_elevation_gain);
-            elevationLabel = view.findViewById(R.id.aggregated_stats_elevation_gain_label);
-            elevationUnit = view.findViewById(R.id.aggregated_stats_elevation_gain_unit);
-
-            elevationLabel.setText("Elevation Gain");
-            elevationUnit.setText("ft");
+            if(shouldElevationGain()) {
+                elevationGain = view.findViewById(R.id.aggregated_stats_elevation_gain);
+                elevationLabel = view.findViewById(R.id.aggregated_stats_elevation_gain_label);
+                elevationUnit = view.findViewById(R.id.aggregated_stats_elevation_gain_unit);
 
+                elevationLabel.setText("Elevation Gain");
+                elevationUnit.setText("ft");
+            }
         }
         public void setElevation(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
                 elevationGain.setText(aggregatedStatistic.getTrackStatistics().getTotalAltitudeGain().toString());
diff --git a/src/main/res/.DS_Store b/src/main/res/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f4ef853dbb2df3c125298d9e5476c87767965f1f
GIT binary patch
literal 6148
zcmeHK%}T>S5T0$TrijpkLXQhx3)WiugO^b23mDOZN=<0dV9ZL>AE6X-))(?gd>&_Z
zw_<HQ2`V}Rv)}IQOu~Fwb}|4UTEp%xKmh<8RKiRihb2P$qzjU<mK>tc&*(uCjFbBy
zQo({Z8-61L^zBw*1U^JCg!%9H9Nb4?GANf{L?)YCSzUA1oOS2YyHR6r;17mL%kQ7l
z>O`q1n9cp*H0+H#h0Q}15BxCh^>skl?V-!XSr~WKxTS`1H_@@4*>LhszEdbpCiUG$
zN!BXOX-Q6+m2yc|Yt`vA?`&=F92|FUqq|r=8X^UrIV~F&XYhoRxtvB`KaNy<jdqI3
z!UNnv^zNkoNTz#@dP(lrt6$92X7eG(85fMq05iZ0EMvglpU(QSO|~%u%)q~9fbIv0
zO6Xcl4eF}{2i*c7(r=^|oKr7BG18)IF*S%gD8hsynowa|3}M32F0G$yF*RtyLD=R)
z*f$H?p$PqUe7@A~AY6kyG6T%OJOf#?EKvPF`n><258@RwzzqB;21KsywOg2yt*r~m
wQLUAzSEwZ9ml}Kv!HF)#=u4%zh^htck|v0*#nd2LQ20kc)4&5W@U0BI0>9aZl>h($

literal 0
HcmV?d00001

diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 2148a83d0..b63b107f8 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -23,6 +23,8 @@
 
     <string name="settings_import_export_key" translatable="false">settingsImportExport</string>
 
+    <string name="settings_aggregated_stats_key" translatable="false">settingsAggregatedStats</string>
+
     <!-- Setting's categories -->
 
     <string name="settings_reset_key" translatable="false">settingsReset</string>
@@ -286,6 +288,8 @@
     <string name="settings_api_key" translatable="false">settingsAPI</string>
     <string name="publicapi_package_key" translatable="false">apiPackageKey</string>
     <string name="publicapi_enabled_key" translatable="false">apiEnabledKey</string>
+    <string name="aggregated_stats_package_key" translatable="false">AggregatedStatsPackageKey</string>
+    <bool name="aggregated_stats_enabled_default">false</bool>
     <bool name="publicapi_enabled_default">false</bool>
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6b16d3ffa..444c8494c 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -449,6 +449,11 @@ limitations under the License.
     <string name="settings_stats_units_nautical">Nautical (NM, ft)</string>
     <string name="settings_stats_units_title">Preferred units</string>
 
+    <!-- Settings Aggregated stats -->
+    <string name="settings_aggregated_stats">Aggregated Stats</string>
+    <string name="settings_aggregated_stats_summary">Choose your own stats</string>
+    <string name="settings_elevation_gain">Elevation Gain</string>
+
     <!-- Settings public api -->
     <string name="settings_api_title">Public API</string>
     <string name="settings_api_summary">Remote control and statistics API for other apps</string>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index 69cb5e7e7..9cd1901cb 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -56,6 +56,12 @@
         android:summary="@string/settings_api_summary"
         android:title="@string/settings_api_title" />
 
+    <Preference
+        android:icon="@drawable/ic_statistics_24dp"
+        android:key="@string/settings_aggregated_stats_key"
+        android:summary="@string/settings_aggregated_stats_summary"
+        android:title="@string/settings_aggregated_stats" />
+
     <Preference
         android:icon="@drawable/ic_baseline_info_24"
         android:summary="@string/settings_open_tracks_summary"
diff --git a/src/main/res/xml/settings_aggregated_stats.xml b/src/main/res/xml/settings_aggregated_stats.xml
new file mode 100644
index 000000000..15b09bc83
--- /dev/null
+++ b/src/main/res/xml/settings_aggregated_stats.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+android:title="@string/settings_aggregated_stats">
+
+<Preference
+    android:key="@string/aggregated_stats_package_key"
+    android:selectable="false"
+    android:persistent="false"
+    android:title="@string/settings_aggregated_stats" />
+
+
+<SwitchPreference
+    android:defaultValue="false"
+    android:key="@string/aggregated_stats_package_key"
+    android:title="@string/settings_elevation_gain" />
+
+<!--<SwitchPreferenceCompat-->
+<!--    android:title="@string/settings_public_api_dashboard_enabled_title"-->
+<!--    android:summaryOn="@string/settings_public_api_dashboard_enabled_summary_on"-->
+<!--    android:summaryOff="@string/settings_public_api_dashboard_enabled_summary_off"-->
+<!--    android:defaultValue="@bool/publicapi_dashboard_enabled_default"-->
+<!--    android:key="@string/publicapi_dashboard_enabled_key" />-->
+
+</PreferenceScreen>
\ No newline at end of file

From 626b908a672162d0002845b8619b040524a2297d Mon Sep 17 00:00:00 2001
From: alekhya-2000 <54909278+alekhya-2000@users.noreply.github.com>
Date: Sun, 19 Nov 2023 19:55:36 -0500
Subject: [PATCH 3/9] Update AggregatedStatisticsAdapter.java

---
 .../aggregatedStatistics/AggregatedStatisticsAdapter.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index bf80046c4..e08f12d02 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -94,9 +94,9 @@ private class ViewHolder extends RecyclerView.ViewHolder {
         private final TextView maxSpeedUnit;
         private final TextView maxSpeedLabel;
 
-        private final TextView elevationGain;
-        private final TextView elevationLabel;
-        private final TextView elevationUnit;
+        private final TextView elevationGain = null;
+        private final TextView elevationLabel = null;
+        private final TextView elevationUnit = null;
 
         private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();
         private boolean reportSpeed;

From c6653e0b9d74446bd1a4581c0fbdef4eea5fab36 Mon Sep 17 00:00:00 2001
From: alekhya-2000 <54909278+alekhya-2000@users.noreply.github.com>
Date: Sun, 19 Nov 2023 20:07:36 -0500
Subject: [PATCH 4/9] Update AggregatedStatisticsAdapter.java

---
 .../aggregatedStatistics/AggregatedStatisticsAdapter.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index e08f12d02..80b5ca94b 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -94,9 +94,9 @@ private class ViewHolder extends RecyclerView.ViewHolder {
         private final TextView maxSpeedUnit;
         private final TextView maxSpeedLabel;
 
-        private final TextView elevationGain = null;
-        private final TextView elevationLabel = null;
-        private final TextView elevationUnit = null;
+        private TextView elevationGain = null;
+        private TextView elevationLabel = null;
+        private TextView elevationUnit = null;
 
         private UnitSystem unitSystem = UnitSystem.defaultUnitSystem();
         private boolean reportSpeed;

From 6cb2ea516bb45f85343fee407f9c78d8d1afd576 Mon Sep 17 00:00:00 2001
From: yashvadaria <yashvadaria@gmail.com>
Date: Mon, 20 Nov 2023 18:52:05 -0500
Subject: [PATCH 5/9] Exception for null value

---
 .../ui/aggregatedStatistics/AggregatedStatisticsAdapter.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index f8a148bb2..83dc21069 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -123,7 +123,11 @@ public ViewHolder(View view) {
 
         }
         public void setElevation(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
+            if(aggregatedStatistic.getTrackStatistics().getTotalAltitudeGain()==null)
+                elevationGain.setText("0.0");
+            else
                 elevationGain.setText(aggregatedStatistic.getTrackStatistics().getTotalAltitudeGain().toString());
+            System.out.println();
         }
         public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             setCommonValues(aggregatedStatistic);

From 042d75ce5f58a795a7b1d0cb2e7413aae467527f Mon Sep 17 00:00:00 2001
From: raghavmanchanda2 <raghavmanchanda2@gmail.com>
Date: Thu, 23 Nov 2023 14:31:28 -0500
Subject: [PATCH 6/9] [Issue-258][SubTask-3][Add toggle Distance in the
 aggregated stats option under settings][Fixed ByRaghav-40276920]

---
 .../opentracks/settings/PreferencesUtils.java | 10 ++++++
 .../AggregatedStatisticsAdapter.java          | 32 +++++++++++++++++++
 src/main/res/values/settings.xml              |  1 +
 .../res/xml/settings_aggregated_stats.xml     |  4 +++
 4 files changed, 47 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 192bf533d..af171efd3 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -460,6 +460,16 @@ public static void setElevationGain(boolean value) {
         setBoolean(R.string.aggregated_stats_package_key, value);
     }
 
+    public static boolean shouldDistance() {
+        Log.d("myLogs", String.valueOf(R.string.distance_preference_key));
+        return getBoolean(R.string.distance_preference_key, false);
+    }
+
+    @VisibleForTesting
+    public static void setDistance(boolean value) {
+        setBoolean(R.string.distance_preference_key, value);
+    }
+
     public static Distance getRecordingDistanceInterval() {
         return Distance.of(getInt(R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefaultInternal()));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index 0ee06cd4c..1d5c29fc2 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -1,6 +1,7 @@
 package de.dennisguse.opentracks.ui.aggregatedStatistics;
 
 import android.content.Context;
+import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -23,6 +24,7 @@
 import de.dennisguse.opentracks.stats.TrackStatistics;
 import de.dennisguse.opentracks.util.StringUtils;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldElevationGain;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldDistance;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -53,6 +55,14 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             if(shouldElevationGain()) {
                 viewHolder.setElevation(aggregatedStatistic);
             }
+            if(shouldDistance()) {
+                Log.d("myLogs", "ShouldDistance is called");
+                viewHolder.setDistance(aggregatedStatistic, true);
+            }
+            else {
+                Log.d("myLogs", "Inside Else");
+                viewHolder.setDistance(aggregatedStatistic, false);
+            }
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -131,6 +141,28 @@ public void setElevation(AggregatedStatistics.AggregatedStatistic aggregatedStat
                 elevationGain.setText(aggregatedStatistic.getTrackStatistics().getTotalAltitudeGain().toString());
             System.out.println();
         }
+
+        public void setDistance(AggregatedStatistics.AggregatedStatistic aggregatedStatistic, Boolean visibility) {
+            if(visibility) {
+                if (aggregatedStatistic.getTrackStatistics().getTotalDistance() == null) {
+                    Log.d("myLogs", "aggregate value is null");
+                    distance.setText("0.0");
+                } else {
+                    Log.d("myLogs", "Visibility true, setting value in else");
+                    Pair<String, String> parts = DistanceFormatter.Builder()
+                            .setUnit(unitSystem)
+                            .build(context).getDistanceParts(aggregatedStatistic.getTrackStatistics().getTotalDistance());
+                    distance.setText(parts.first);
+                    distanceUnit.setText(parts.second);
+                }
+            }
+            else{
+                Log.d("myLogs", "Visibility is false");
+                distance.setText("");
+                distanceUnit.setText("");
+            }
+        }
+
         public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             setCommonValues(aggregatedStatistic);
 
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index b63b107f8..8243c56f5 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -290,6 +290,7 @@
     <string name="publicapi_enabled_key" translatable="false">apiEnabledKey</string>
     <string name="aggregated_stats_package_key" translatable="false">AggregatedStatsPackageKey</string>
     <bool name="aggregated_stats_enabled_default">false</bool>
+    <string name="distance_preference_key" translatable="false">DistancePreferenceKey</string>
     <bool name="publicapi_enabled_default">false</bool>
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>
diff --git a/src/main/res/xml/settings_aggregated_stats.xml b/src/main/res/xml/settings_aggregated_stats.xml
index 15b09bc83..9eeb1b5dc 100644
--- a/src/main/res/xml/settings_aggregated_stats.xml
+++ b/src/main/res/xml/settings_aggregated_stats.xml
@@ -14,6 +14,10 @@ android:title="@string/settings_aggregated_stats">
     android:defaultValue="false"
     android:key="@string/aggregated_stats_package_key"
     android:title="@string/settings_elevation_gain" />
+<SwitchPreference
+    android:defaultValue="false"
+    android:key="@string/distance_preference_key"
+    android:title="@string/stats_distance" />
 
 <!--<SwitchPreferenceCompat-->
 <!--    android:title="@string/settings_public_api_dashboard_enabled_title"-->

From 70780644b38f2b3d0f59b52fce2a135a69d64422 Mon Sep 17 00:00:00 2001
From: bhavyabugude <bhavyab0610@gmail.com>
Date: Thu, 23 Nov 2023 15:57:40 -0500
Subject: [PATCH 7/9] =?UTF-8?q?Issue=20259-=20Subtask=204:=20Add=20toggle?=
 =?UTF-8?q?=20=E2=80=9CMax=20Speed=E2=80=9D=20in=20the=20aggregated=20stat?=
 =?UTF-8?q?s=20option=20under=20settings.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../opentracks/settings/PreferencesUtils.java |  9 ++++++
 .../AggregatedStatisticsAdapter.java          | 29 +++++++++++++++++++
 src/main/res/values/settings.xml              |  1 +
 .../res/xml/settings_aggregated_stats.xml     |  4 +++
 4 files changed, 43 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index af171efd3..2dceb27a8 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -470,6 +470,15 @@ public static void setDistance(boolean value) {
         setBoolean(R.string.distance_preference_key, value);
     }
 
+    public static boolean shouldMaxSpeed() {
+        return getBoolean(R.string.max_speed_preference_key, false);
+    }
+
+    @VisibleForTesting
+    public static void setMaxSpeed(boolean value) {
+        setBoolean(R.string.distance_preference_key, value);
+    }
+
     public static Distance getRecordingDistanceInterval() {
         return Distance.of(getInt(R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefaultInternal()));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index 1d5c29fc2..fcabf66e6 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -25,6 +25,7 @@
 import de.dennisguse.opentracks.util.StringUtils;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldElevationGain;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldDistance;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldMaxSpeed;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -63,6 +64,12 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
                 Log.d("myLogs", "Inside Else");
                 viewHolder.setDistance(aggregatedStatistic, false);
             }
+            if(shouldMaxSpeed()) {
+                viewHolder.setMaxSpeed(aggregatedStatistic, true);
+            }
+            else {
+                viewHolder.setMaxSpeed(aggregatedStatistic, false);
+            }
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -163,6 +170,28 @@ public void setDistance(AggregatedStatistics.AggregatedStatistic aggregatedStati
             }
         }
 
+        public void setMaxSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic, Boolean visibility) {
+            SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(reportSpeed).build(context);
+            if(visibility){
+                if(aggregatedStatistic.getTrackStatistics().getMaxSpeed() ==null)
+                    maxSpeed.setText("0.0");
+
+                else
+                {
+                    Pair<String, String> parts = formatter.getSpeedParts(aggregatedStatistic.getTrackStatistics().getMaxSpeed());
+                    maxSpeed.setText(parts.first);
+                    maxSpeedUnit.setText(parts.second);
+                    maxSpeedLabel.setText(context.getString(R.string.stats_max_speed));
+                }
+            }
+            else{
+                maxSpeed.setText("");
+                maxSpeedUnit.setText("");
+                maxSpeedLabel.setText("");
+            }
+
+        }
+
         public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             setCommonValues(aggregatedStatistic);
 
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 8243c56f5..e53b6ee7d 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -291,6 +291,7 @@
     <string name="aggregated_stats_package_key" translatable="false">AggregatedStatsPackageKey</string>
     <bool name="aggregated_stats_enabled_default">false</bool>
     <string name="distance_preference_key" translatable="false">DistancePreferenceKey</string>
+    <string name="max_speed_preference_key" translatable="false">MaxSpeedPreferenceKey</string>
     <bool name="publicapi_enabled_default">false</bool>
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>
diff --git a/src/main/res/xml/settings_aggregated_stats.xml b/src/main/res/xml/settings_aggregated_stats.xml
index 9eeb1b5dc..9be87de54 100644
--- a/src/main/res/xml/settings_aggregated_stats.xml
+++ b/src/main/res/xml/settings_aggregated_stats.xml
@@ -18,6 +18,10 @@ android:title="@string/settings_aggregated_stats">
     android:defaultValue="false"
     android:key="@string/distance_preference_key"
     android:title="@string/stats_distance" />
+<SwitchPreference
+    android:defaultValue="false"
+    android:key="@string/max_speed_preference_key"
+    android:title="@string/stats_max_speed" />
 
 <!--<SwitchPreferenceCompat-->
 <!--    android:title="@string/settings_public_api_dashboard_enabled_title"-->

From 534d6d37a03697c1d923954a602f122b46d1a337 Mon Sep 17 00:00:00 2001
From: udisha0606 <udishakaura@gmail.com>
Date: Sun, 26 Nov 2023 16:22:21 -0500
Subject: [PATCH 8/9] Added toggle for moving speed

---
 .../opentracks/settings/PreferencesUtils.java |  8 ++++++
 .../AggregatedStatisticsAdapter.java          | 28 +++++++++++++++++++
 src/main/res/values/settings.xml              |  2 ++
 .../res/xml/settings_aggregated_stats.xml     |  5 ++++
 4 files changed, 43 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 2dceb27a8..8eb01895c 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -479,6 +479,14 @@ public static void setMaxSpeed(boolean value) {
         setBoolean(R.string.distance_preference_key, value);
     }
 
+    public static boolean shouldMovingSpeed() {
+        return getBoolean(R.string.moving_speed_preference_key, false);
+    }
+
+    @VisibleForTesting
+    public static void setMovingSpeed(boolean value) {
+        setBoolean(R.string.moving_speed_preference_key, value);
+    }
     public static Distance getRecordingDistanceInterval() {
         return Distance.of(getInt(R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefaultInternal()));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index fcabf66e6..68f5a44ce 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -26,6 +26,8 @@
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldElevationGain;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldDistance;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldMaxSpeed;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldMovingSpeed;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.setMovingSpeed;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -70,6 +72,12 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             else {
                 viewHolder.setMaxSpeed(aggregatedStatistic, false);
             }
+            if(shouldMovingSpeed()){
+                viewHolder.setMovingSpeed(aggregatedStatistic, true);
+            }
+            else {
+                viewHolder.setMovingSpeed(aggregatedStatistic, false);
+            }
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -192,6 +200,26 @@ public void setMaxSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStati
 
         }
 
+        public void setMovingSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic, Boolean visibility) {
+            SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(reportSpeed).build(context);
+            if(visibility){
+                if(aggregatedStatistic.getTrackStatistics().getMaxSpeed() ==null)
+                    avgSpeed.setText("0.0");
+                else
+                {
+                    Pair<String, String> parts = formatter.getSpeedParts(aggregatedStatistic.getTrackStatistics().getMaxSpeed());
+                    avgSpeed.setText(parts.first);
+                    avgSpeedUnit.setText(parts.second);
+                    avgSpeedLabel.setText(context.getString(R.string.stats_max_speed));
+                }
+            }
+            else{
+                avgSpeed.setText("");
+                avgSpeedUnit.setText("");
+                avgSpeedLabel.setText("");
+            }
+
+        }
         public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             setCommonValues(aggregatedStatistic);
 
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index e53b6ee7d..4af511fce 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -292,6 +292,8 @@
     <bool name="aggregated_stats_enabled_default">false</bool>
     <string name="distance_preference_key" translatable="false">DistancePreferenceKey</string>
     <string name="max_speed_preference_key" translatable="false">MaxSpeedPreferenceKey</string>
+    <string name="moving_speed_preference_key" translatable="false">MovingSpeedPreferenceKey</string>
+    <string name="stats_moving_speed" translatable="false">Moving Speed</string>
     <bool name="publicapi_enabled_default">false</bool>
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>
diff --git a/src/main/res/xml/settings_aggregated_stats.xml b/src/main/res/xml/settings_aggregated_stats.xml
index 9be87de54..23f067632 100644
--- a/src/main/res/xml/settings_aggregated_stats.xml
+++ b/src/main/res/xml/settings_aggregated_stats.xml
@@ -23,6 +23,11 @@ android:title="@string/settings_aggregated_stats">
     android:key="@string/max_speed_preference_key"
     android:title="@string/stats_max_speed" />
 
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="@string/moving_speed_preference_key"
+        android:title="@string/stats_moving_speed" />
+
 <!--<SwitchPreferenceCompat-->
 <!--    android:title="@string/settings_public_api_dashboard_enabled_title"-->
 <!--    android:summaryOn="@string/settings_public_api_dashboard_enabled_summary_on"-->

From c8317e9c9eb3fdbb1fe0610c29a38bd74d23e5d6 Mon Sep 17 00:00:00 2001
From: khushaliparmar <parmarkhushali2000@gmail.com>
Date: Sun, 26 Nov 2023 19:06:42 -0500
Subject: [PATCH 9/9] Added toggle for moving time

---
 .../opentracks/settings/PreferencesUtils.java |  4 ++++
 .../AggregatedStatisticsAdapter.java          | 23 ++++++++++++++++++-
 src/main/res/values/settings.xml              |  4 ++++
 .../res/xml/settings_aggregated_stats.xml     | 13 +++++++----
 4 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
index 8eb01895c..828599258 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/PreferencesUtils.java
@@ -487,6 +487,10 @@ public static boolean shouldMovingSpeed() {
     public static void setMovingSpeed(boolean value) {
         setBoolean(R.string.moving_speed_preference_key, value);
     }
+    public static boolean shouldMovingTime() {
+        return getBoolean(R.string.moving_time_preference_key, false);
+    }
+
     public static Distance getRecordingDistanceInterval() {
         return Distance.of(getInt(R.string.recording_distance_interval_key, getRecordingDistanceIntervalDefaultInternal()));
     }
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
index 68f5a44ce..add67c6fc 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsAdapter.java
@@ -27,7 +27,7 @@
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldDistance;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldMaxSpeed;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldMovingSpeed;
-import static de.dennisguse.opentracks.settings.PreferencesUtils.setMovingSpeed;
+import static de.dennisguse.opentracks.settings.PreferencesUtils.shouldMovingTime;
 
 public class AggregatedStatisticsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -78,6 +78,12 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi
             else {
                 viewHolder.setMovingSpeed(aggregatedStatistic, false);
             }
+            if(shouldMovingTime()){
+                viewHolder.setMovingTime(aggregatedStatistic, true);
+            }
+            else {
+                viewHolder.setMovingTime(aggregatedStatistic, false);
+            }
         } else {
             viewHolder.setPace(aggregatedStatistic);
         }
@@ -219,6 +225,21 @@ public void setMovingSpeed(AggregatedStatistics.AggregatedStatistic aggregatedSt
                 avgSpeedLabel.setText("");
             }
 
+        }
+        public void setMovingTime(AggregatedStatistics.AggregatedStatistic aggregatedStatistic, Boolean visibility) {
+            SpeedFormatter formatter = SpeedFormatter.Builder().setUnit(unitSystem).setReportSpeedOrPace(reportSpeed).build(context);
+            if(visibility){
+                if(aggregatedStatistic.getTrackStatistics().getMaxSpeed() ==null)
+                    time.setText("0.0");
+                else
+                {
+                    time.setText(StringUtils.formatElapsedTime(aggregatedStatistic.getTrackStatistics().getMovingTime()));
+                }
+            }
+            else{
+                time.setText("");
+            }
+
         }
         public void setSpeed(AggregatedStatistics.AggregatedStatistic aggregatedStatistic) {
             setCommonValues(aggregatedStatistic);
diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 4af511fce..066f6ecf4 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -294,6 +294,10 @@
     <string name="max_speed_preference_key" translatable="false">MaxSpeedPreferenceKey</string>
     <string name="moving_speed_preference_key" translatable="false">MovingSpeedPreferenceKey</string>
     <string name="stats_moving_speed" translatable="false">Moving Speed</string>
+    <string name="moving_time_preference_key" translatable="false">MovingTimePreferenceKey</string>
+    <string name="stats_time_speed" translatable="false">Average Moving Time</string>
+
+
     <bool name="publicapi_enabled_default">false</bool>
     <string name="publicapi_dashboard_enabled_key" translatable="false">apiDashboardEnabledKey</string>
     <bool name="publicapi_dashboard_enabled_default">false</bool>
diff --git a/src/main/res/xml/settings_aggregated_stats.xml b/src/main/res/xml/settings_aggregated_stats.xml
index 23f067632..6693c8f4c 100644
--- a/src/main/res/xml/settings_aggregated_stats.xml
+++ b/src/main/res/xml/settings_aggregated_stats.xml
@@ -22,11 +22,14 @@ android:title="@string/settings_aggregated_stats">
     android:defaultValue="false"
     android:key="@string/max_speed_preference_key"
     android:title="@string/stats_max_speed" />
-
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/moving_speed_preference_key"
-        android:title="@string/stats_moving_speed" />
+<SwitchPreference
+    android:defaultValue="false"
+    android:key="@string/moving_speed_preference_key"
+    android:title="@string/stats_moving_speed" />
+<SwitchPreference
+    android:defaultValue="false"
+    android:key="@string/moving_time_preference_key"
+    android:title="@string/stats_moving_time" />
 
 <!--<SwitchPreferenceCompat-->
 <!--    android:title="@string/settings_public_api_dashboard_enabled_title"-->