From 43210ef0df9a23d4314da80c00a252486c4e2e4c Mon Sep 17 00:00:00 2001
From: Zachary <ZTherrien.work@gmail.com>
Date: Mon, 25 Mar 2024 18:11:18 -0400
Subject: [PATCH 01/76] Mock season data page created

A mockup for the season data page has been created. All the data is static, but it each page represents each individual season.
---
 .../opentracks/SeasonalActivity.java          |   9 +-
 .../opentracks/SeasonalActivityPerSeason.java |  20 +--
 .../activity_season_aggrgated_list_item.xml   | 125 ++++++++++++++++
 src/main/res/layout/activity_seasonal.xml     |  32 ++--
 .../layout/activity_seasonal_per_season.xml   | 137 ++++++++++++++++--
 .../res/layout/aggregated_stats_list_item.xml |   2 +-
 6 files changed, 285 insertions(+), 40 deletions(-)
 create mode 100644 src/main/res/layout/activity_season_aggrgated_list_item.xml

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
index 49d83a9e4..eeff40b52 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
@@ -2,8 +2,6 @@
 
 import static android.app.PendingIntent.getActivity;
 
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
@@ -30,9 +28,10 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTitle("Seasonal Activity!");
         seasonsRecyclerView = findViewById(R.id.seasons_recyclerView);
 
-        GoToIndividualSite(findViewById(R.id.activity_game_answer1_btn));
-        GoToIndividualSite(findViewById(R.id.activity_game_answer2_btn));
-        GoToIndividualSite(findViewById(R.id.activity_game_answer3_btn));
+        GoToIndividualSite(findViewById(R.id.LifeTime_button));
+        GoToIndividualSite(findViewById(R.id.Winter2024_Button));
+        GoToIndividualSite(findViewById(R.id.Winter2023_Button));
+        GoToIndividualSite(findViewById(R.id.Winter2022_Button));
 
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
index 18decc822..5b7a797e1 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
@@ -6,6 +6,7 @@
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Toolbar;
 
 import androidx.activity.EdgeToEdge;
 import androidx.appcompat.app.AppCompatActivity;
@@ -13,6 +14,8 @@
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 
+import com.google.android.material.appbar.MaterialToolbar;
+
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalPerSeasonBinding;
 
@@ -24,19 +27,13 @@ protected void onCreate(Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
 
-        EdgeToEdge.enable(this);
-        setContentView(R.layout.activity_seasonal_per_season);
-        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> {
-            Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars());
-            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom);
-            return insets;
-        });
-
         Bundle data = getIntent().getExtras();
         if (data != null)
         {
             changeTitle(data.getString("seasonTitle"));
         }
+
+        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
     private void MakeYesNoButton(Button button)
     {
@@ -49,11 +46,8 @@ private void MakeYesNoButton(Button button)
     }
     private void changeTitle(String newTitle)
     {
-        newTitle = newTitle.replaceAll("_", " ");
-        setContentView(R.layout.activity_seasonal_per_season);
-        TextView tv = (TextView)findViewById(R.id.pageTitle);
-        tv.setText(newTitle);
-        tv.setTextSize(32);
+        MaterialToolbar materialToolbar = (MaterialToolbar)findViewById(R.id.season_materialtoolbar);
+        materialToolbar.setTitle(newTitle);
     }
 
     @Override
diff --git a/src/main/res/layout/activity_season_aggrgated_list_item.xml b/src/main/res/layout/activity_season_aggrgated_list_item.xml
new file mode 100644
index 000000000..b176a606c
--- /dev/null
+++ b/src/main/res/layout/activity_season_aggrgated_list_item.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ImageView
+            android:id="@+id/activity_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:tint="?android:textColorPrimary"
+            tools:srcCompat="@drawable/ic_activity_skiing_24dp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView8"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="Total Distance Traveled" />
+
+            <TextView
+                android:id="@+id/distanceTraveled"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:text="10000" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="KM" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:gravity="center"
+                android:text="Total Time" />
+
+            <TextView
+                android:id="@+id/aggregatedTime"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="00:00:00" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView10"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="Average Speed" />
+
+            <TextView
+                android:id="@+id/avgSpeed"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:text="10" />
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="KM/h" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView11"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Max Speed" />
+
+            <TextView
+                android:id="@+id/maxSpeed"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:text="100" />
+
+            <TextView
+                android:id="@+id/textView7"
+                style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="KM/h" />
+        </LinearLayout>
+    </LinearLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_seasonal.xml b/src/main/res/layout/activity_seasonal.xml
index 050edfe2a..552f91734 100644
--- a/src/main/res/layout/activity_seasonal.xml
+++ b/src/main/res/layout/activity_seasonal.xml
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content">
 
             <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/track_list_toolbar"
+                android:id="@+id/season_list_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:navigationIcon="@drawable/ic_seasonal_activity_24dp"
@@ -31,45 +31,57 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/seasons_recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content" >
+
+        </androidx.recyclerview.widget.RecyclerView>
 
 
         <Button
-            android:id="@+id/activity_game_answer1_btn"
+            android:id="@+id/LifeTime_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="2023_Season"
+            android:text="Life_Time_Data"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             tools:ignore="HardcodedText" />
 
         <Button
-            android:id="@+id/activity_game_answer2_btn"
+            android:id="@+id/Winter2024_Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="2022_Season"
+            android:text="2024 Winter Season"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/activity_game_answer1_btn"
             tools:ignore="HardcodedText" />
 
         <Button
-            android:id="@+id/activity_game_answer3_btn"
+            android:id="@+id/Winter2023_Button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="Life_Time_Data"
+            android:text="2023 Winter Season"
+            android:textSize="20sp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:ignore="HardcodedText" />
+
+        <Button
+            android:id="@+id/Winter2022_Button"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:background="@android:color/white"
+            android:text="2022 Winter Season"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/activity_game_answer2_btn"
             tools:ignore="HardcodedText" />
 
     </LinearLayout>
diff --git a/src/main/res/layout/activity_seasonal_per_season.xml b/src/main/res/layout/activity_seasonal_per_season.xml
index d93b1f52d..4c874e9d2 100644
--- a/src/main/res/layout/activity_seasonal_per_season.xml
+++ b/src/main/res/layout/activity_seasonal_per_season.xml
@@ -7,15 +7,130 @@
     android:layout_height="match_parent"
     tools:context=".SeasonalActivityPerSeason">
 
-    <TextView
-        android:id="@+id/pageTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="182dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="183dp"
-        android:text="Season"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/season_materialtoolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                app:navigationIcon="@drawable/ic_activity_skiing_24dp"
+                app:title="Seasonal Data" />
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView8"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="Total Distance Traveled" />
+
+            <TextView
+                android:id="@+id/distanceTraveled"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:text="10000" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="KM" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView9"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+
+                android:gravity="center"
+                android:text="Total Time" />
+
+            <TextView
+                android:id="@+id/aggregatedTime"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="00:00:00" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView10"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:text="Average Speed" />
+
+            <TextView
+                android:id="@+id/avgSpeed"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:text="10" />
+
+            <TextView
+                android:id="@+id/textView5"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="KM/h" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/textView11"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="Max Speed" />
+
+            <TextView
+                android:id="@+id/maxSpeed"
+                style="@style/TextAppearance.OpenTracks.PrimaryValue"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="0dp"
+                android:text="100" />
+
+            <TextView
+                android:id="@+id/textView7"
+                style="@style/TextAppearance.OpenTracks.PrimaryUnit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:text="KM/h" />
+        </LinearLayout>
+
+    </LinearLayout>
+
+    <include
+        android:id="@+id/bottom_app_bar_layout"
+        layout="@layout/bottomappbar" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/aggregated_stats_list_item.xml b/src/main/res/layout/aggregated_stats_list_item.xml
index 0b7e490d0..277ead511 100644
--- a/src/main/res/layout/aggregated_stats_list_item.xml
+++ b/src/main/res/layout/aggregated_stats_list_item.xml
@@ -15,7 +15,7 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:orientation="vertical"
-        app:layout_constraintGuide_begin="8dp" />
+        app:layout_constraintGuide_end="395dp" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline2"

From 3a7424edf604054897de278e690eca227f546cd5 Mon Sep 17 00:00:00 2001
From: Zachary <ZTherrien.work@gmail.com>
Date: Mon, 25 Mar 2024 18:17:46 -0400
Subject: [PATCH 02/76] Fixed manifest file

---
 src/main/AndroidManifest.xml | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 4e2083fb3..8a18be78e 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -343,7 +343,20 @@
             android:finishOnTaskLaunch="true"
             android:launchMode="singleInstance"
             android:process=":crash" />
+        <activity android:name=".ui.aggregatedStatistics.StatisticsActivity"
+            android:exported="true">
+            <!--        <intent-filter>-->
+            <!--            <action android:name="android.intent.action.MAIN" />-->
 
+            <!--            <category android:name="android.intent.category.LAUNCHER" />-->
+            <!--        </intent-filter>-->
+        </activity>
+        <activity
+            android:name=".SeasonalActivityPerSeason"
+            android:exported="false" />
+        <activity
+            android:name=".SeasonalActivity"
+            android:exported="false" />
         <provider
             android:name=".data.ShareContentProvider"
             android:authorities="${applicationId}.content"
@@ -380,27 +393,9 @@
             android:permission="android.permission.BIND_JOB_SERVICE"/>
 
     </application>
-
-
     <queries>
         <intent>
             <action android:name="android.intent.action.TTS_SERVICE" />
         </intent>
     </queries>
 </manifest>
-
-
-        <activity android:name=".ui.aggregatedStatistics.StatisticsActivity"
-            android:exported="true">
-<!--        <intent-filter>-->
-<!--            <action android:name="android.intent.action.MAIN" />-->
-
-<!--            <category android:name="android.intent.category.LAUNCHER" />-->
-<!--        </intent-filter>-->
-    </activity>
-        <activity
-            android:name=".SeasonalActivityPerSeason"
-            android:exported="false" />
-        <activity
-            android:name=".SeasonalActivity"
-            android:exported="false" />

From f1308f1dd31ed5e84f56632cc941a51e9390c6e6 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Fri, 5 Apr 2024 16:12:35 -0400
Subject: [PATCH 03/76] implemented gradle changes

---
 build.gradle | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/build.gradle b/build.gradle
index b202f2756..9c86a27f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'com.android.application'
+apply plugin: 'com.google.gms.google-services'
 
 buildscript {
     repositories {
@@ -7,6 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.google.gms:google-services:4.4.1'
     }
 }
 
@@ -126,6 +128,7 @@ android {
 }
 
 dependencies {
+    implementation 'com.google.firebase:firebase-firestore:24.10.3'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
@@ -148,4 +151,6 @@ dependencies {
     androidTestImplementation 'org.mockito:mockito-android:5.8.0'
 
     androidTestUtil 'androidx.test:orchestrator:1.4.2'
+
+    implementation 'com.google.code.gson:gson:2.10.1'
 }

From 3c269333d7f95cc11140146e474bf9c7ee0adf18 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Fri, 5 Apr 2024 16:29:13 -0400
Subject: [PATCH 04/76] added color picker dependencies back

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 9c86a27f3..5abe1b892 100644
--- a/build.gradle
+++ b/build.gradle
@@ -142,6 +142,7 @@ dependencies {
     implementation 'androidx.mediarouter:mediarouter:1.6.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.github.dhaval2404:imagepicker:2.1'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

From 72c400cab0949ae1e0821e415b0828905802bbe9 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sat, 6 Apr 2024 17:09:48 -0400
Subject: [PATCH 05/76] updated user model

---
 .../opentracks/data/models/UserModel.java     | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 src/main/java/de/dennisguse/opentracks/data/models/UserModel.java

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
new file mode 100644
index 000000000..99a93c83c
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -0,0 +1,81 @@
+package de.dennisguse.opentracks.data.models;
+
+public class UserModel {
+
+    private String nickname; //User key that uniquely identifies user
+    private String country;
+    private long dateOfBirth;
+    private String gender;
+    private int height;
+    private int weight;
+    private boolean socialAllow; //Bool flag for leaderboard appearance permission
+    private String profilePicURL; //To be replaced by firestore path - https://
+
+    public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
+
+        this.nickname = nickname;
+        this.country = country;
+        this.dateOfBirth = dateOfBirth;
+        this.gender = gender;
+        this.height = height;
+        this.weight = weight;
+        this.socialAllow = socialAllow;
+        this.profilePicURL = profilePicURL;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public long getDateOfBirth() {
+        return dateOfBirth;
+    }
+    public void setDateOfBirth(long dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public boolean isSocialAllow() {
+        return socialAllow;
+    }
+    public void setSocialAllow(boolean socialAllow) {
+        this.socialAllow = socialAllow;
+    }
+
+    public String getPictureURL() {
+        return profilePicURL;
+    }
+    public void setPictureURL(String profilePicURL) {
+        this.profilePicURL = profilePicURL;
+    }
+}

From 69f8ed897f73cc63ded2245117e6fd2cc63fcdbc Mon Sep 17 00:00:00 2001
From: HaithmMasood <masoodhaithm@gmail.com>
Date: Sun, 7 Apr 2024 01:43:08 -0400
Subject: [PATCH 06/76] Enhanced edit profile form with date picker, gender &
 country dropdowns

---
 .../settings/UserProfileFragment.java         | 66 +++++++++++++++++--
 src/main/res/layout/edit_profile_form.xml     | 24 ++++---
 src/main/res/values/strings.xml               |  6 ++
 3 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 294b16bb1..5c145bbaf 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -12,6 +12,7 @@
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -42,6 +43,17 @@
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 
+import android.app.DatePickerDialog;
+import android.widget.DatePicker;
+import java.util.Calendar;
+import java.util.Locale;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import java.util.Arrays;
+import java.util.Locale;
+
+
+
  // You can choose any value for the request code
 
 
@@ -159,26 +171,46 @@ private void showEditProfileDialog() {
         // Inflate the custom layout for the edit dialog.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.edit_profile_form, null);
 
-        // Initialize all the EditText fields.
+        // Initialize all the EditText fields and Spinners.
         EditText editNickname = formView.findViewById(R.id.editNickname);
         EditText editDateOfBirth = formView.findViewById(R.id.editDateOfBirth);
         EditText editHeight = formView.findViewById(R.id.editHeight);
         EditText editWeight = formView.findViewById(R.id.editWeight);
-        EditText editGender = formView.findViewById(R.id.editGender);
-        EditText editLocation = formView.findViewById(R.id.editLocation);
 
-        // Create the AlertDialog.
+        Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
+        ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
+                R.array.gender_options, android.R.layout.simple_spinner_item);
+        genderAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinnerGender.setAdapter(genderAdapter);
+
+        Spinner spinnerLocation = formView.findViewById(R.id.spinnerLocation);
+        String[] isoCountryCodes = Locale.getISOCountries();
+        String[] countryNames = new String[isoCountryCodes.length];
+
+        for (int i = 0; i < isoCountryCodes.length; i++) {
+            Locale locale = new Locale("", isoCountryCodes[i]);
+            countryNames[i] = locale.getDisplayCountry();
+        }
+
+        Arrays.sort(countryNames); // Sort the country names alphabetically
+
+        ArrayAdapter<String> locationAdapter = new ArrayAdapter<>(getContext(),
+                android.R.layout.simple_spinner_item, countryNames);
+        locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinnerLocation.setAdapter(locationAdapter);
+
+        // Set up the AlertDialog.
         new AlertDialog.Builder(getContext())
                 .setTitle(R.string.edit_profile_title)
                 .setView(formView)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                    // Collect data from the EditText fields.
+                    // Collect data from the fields.
                     String nickname = editNickname.getText().toString();
                     String dateOfBirth = editDateOfBirth.getText().toString();
                     String height = editHeight.getText().toString();
                     String weight = editWeight.getText().toString();
-                    String gender = editGender.getText().toString();
-                    String location = editLocation.getText().toString();
+                    String gender = spinnerGender.getSelectedItem().toString();
+                    String location = spinnerLocation.getSelectedItem().toString();
 
                     // Validate and save the data if valid.
                     if (validateInputs(nickname, dateOfBirth, height, weight, gender, location)) {
@@ -190,6 +222,26 @@ private void showEditProfileDialog() {
                 })
                 .setNegativeButton(android.R.string.cancel, null)
                 .show();
+        editDateOfBirth.setOnClickListener(view -> {
+            // Use the current date as the default date in the picker
+            final Calendar c = Calendar.getInstance();
+            int year = c.get(Calendar.YEAR);
+            int month = c.get(Calendar.MONTH);
+            int day = c.get(Calendar.DAY_OF_MONTH);
+
+            // Create a new instance of DatePickerDialog and return it
+            DatePickerDialog datePickerDialog = new DatePickerDialog(getContext(), (view1, year1, monthOfYear, dayOfMonth) -> {
+                // The month value is 0-based, so we add 1 to it for display.
+                String selectedDate = String.format(Locale.getDefault(), "%02d-%02d-%04d", dayOfMonth, monthOfYear + 1, year1);
+                editDateOfBirth.setText(selectedDate);
+            }, year, month, day);
+
+            // Prevent future dates from being selected
+            datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis());
+
+            // Show the date picker dialog
+            datePickerDialog.show();
+        });
     }
 
     // A simple method to show toast messages.
diff --git a/src/main/res/layout/edit_profile_form.xml b/src/main/res/layout/edit_profile_form.xml
index b4635eab0..2cc14ff8b 100644
--- a/src/main/res/layout/edit_profile_form.xml
+++ b/src/main/res/layout/edit_profile_form.xml
@@ -43,38 +43,36 @@
 
     <EditText
         android:id="@+id/editDateOfBirth"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/date_of_birth"
-        android:inputType="date"
+        android:focusable="false"
         android:ems="10"
         android:layout_marginTop="8dp"
         app:layout_constraintTop_toBottomOf="@id/editWeight"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <EditText
-        android:id="@+id/editGender"
+
+    <Spinner
+        android:id="@+id/spinnerGender"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/gender"
-        android:inputType="text"
-        android:ems="10"
         android:layout_marginTop="8dp"
+        android:entries="@array/gender_options"
         app:layout_constraintTop_toBottomOf="@id/editDateOfBirth"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <EditText
-        android:id="@+id/editLocation"
+
+    <Spinner
+        android:id="@+id/spinnerLocation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/location"
-        android:inputType="text"
-        android:ems="10"
         android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/editGender"
+        app:layout_constraintTop_toBottomOf="@id/spinnerGender"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 44f608ea0..8a63ae12f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -841,6 +841,12 @@ limitations under the License.
     <string name="gender">Gender</string>
     <string name="location">Location/Country</string>
     <string name="profile_picture">Profile Picture</string>
+    <string-array name="gender_options">
+        <item>Male</item>
+        <item>Female</item>
+        <item>Other</item>
+    </string-array>
+
     <!-- HA -->
 
     <string name="title_activity_leaderboard">LeaderboardActivity</string>

From 6b8e215c11f9a7f3c95aee5009eb9e3ed4f07ca2 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 14:50:56 -0400
Subject: [PATCH 07/76] moved canada to beginning of dropdown

---
 .../opentracks/settings/UserProfileFragment.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 5c145bbaf..7c355cfe1 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -194,11 +194,22 @@ private void showEditProfileDialog() {
 
         Arrays.sort(countryNames); // Sort the country names alphabetically
 
+        // Move Canada to the beginning of the array
+        for (int i = 0; i < countryNames.length; i++) {
+            if (countryNames[i].equalsIgnoreCase("Canada")) {
+                String temp = countryNames[i];
+                System.arraycopy(countryNames, 0, countryNames, 1, i);
+                countryNames[0] = temp;
+                break;
+            }
+        }
+
         ArrayAdapter<String> locationAdapter = new ArrayAdapter<>(getContext(),
                 android.R.layout.simple_spinner_item, countryNames);
         locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinnerLocation.setAdapter(locationAdapter);
 
+
         // Set up the AlertDialog.
         new AlertDialog.Builder(getContext())
                 .setTitle(R.string.edit_profile_title)
@@ -321,6 +332,8 @@ private void displayCustomSharingDialog(){
     // TODO: Implement saving logic here.
     private void saveProfileData(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
 
+
+
     }
 
     @Override

From 0fb2ed8b9d5fc057266942464dc3eee81840891d Mon Sep 17 00:00:00 2001
From: tinatsl <91174232+tinatsl@users.noreply.github.com>
Date: Sun, 7 Apr 2024 15:41:54 -0400
Subject: [PATCH 08/76] added user model

---
 .../opentracks/data/models/UserModel.java     | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 src/main/java/de/dennisguse/opentracks/data/models/UserModel.java

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
new file mode 100644
index 000000000..99a93c83c
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -0,0 +1,81 @@
+package de.dennisguse.opentracks.data.models;
+
+public class UserModel {
+
+    private String nickname; //User key that uniquely identifies user
+    private String country;
+    private long dateOfBirth;
+    private String gender;
+    private int height;
+    private int weight;
+    private boolean socialAllow; //Bool flag for leaderboard appearance permission
+    private String profilePicURL; //To be replaced by firestore path - https://
+
+    public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
+
+        this.nickname = nickname;
+        this.country = country;
+        this.dateOfBirth = dateOfBirth;
+        this.gender = gender;
+        this.height = height;
+        this.weight = weight;
+        this.socialAllow = socialAllow;
+        this.profilePicURL = profilePicURL;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public long getDateOfBirth() {
+        return dateOfBirth;
+    }
+    public void setDateOfBirth(long dateOfBirth) {
+        this.dateOfBirth = dateOfBirth;
+    }
+
+    public String getGender() {
+        return gender;
+    }
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public boolean isSocialAllow() {
+        return socialAllow;
+    }
+    public void setSocialAllow(boolean socialAllow) {
+        this.socialAllow = socialAllow;
+    }
+
+    public String getPictureURL() {
+        return profilePicURL;
+    }
+    public void setPictureURL(String profilePicURL) {
+        this.profilePicURL = profilePicURL;
+    }
+}

From 979f7815bb8bf079e53a0907a7f233451f94fa63 Mon Sep 17 00:00:00 2001
From: tinatsl <91174232+tinatsl@users.noreply.github.com>
Date: Sun, 7 Apr 2024 15:50:07 -0400
Subject: [PATCH 09/76] default constructor UserModel.java

---
 .../dennisguse/opentracks/data/models/UserModel.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index 99a93c83c..ddb673dfc 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -11,6 +11,18 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
+    // Empty constructor
+    public UserModel() {
+        this.nickname = "";
+        this.country = "";
+        this.dateOfBirth = 0;
+        this.gender = "";
+        this.height = 0;
+        this.weight = 0;
+        this.socialAllow = false;
+        this.profilePicURL = ""; 
+    }
+
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
 
         this.nickname = nickname;

From f4472ef595924ae2484be465ebe81dda575fddc5 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Sun, 7 Apr 2024 16:09:29 -0400
Subject: [PATCH 10/76] starting implementation of user to db

---
 .../opentracks/data/models/UserModel.java     |  3 +++
 .../settings/UserProfileFragment.java         | 23 ++++++++++++++++---
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index ddb673dfc..34c37a80c 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -1,4 +1,7 @@
 package de.dennisguse.opentracks.data.models;
+import com.google.gson.JsonObject;
+
+import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 
 public class UserModel {
 
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 294b16bb1..cee95da21 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -31,6 +31,8 @@
 import androidx.core.app.ActivityCompat;
 
 import com.github.dhaval2404.imagepicker.ImagePicker;
+import com.google.gson.JsonObject;
+
 
 import java.util.Objects;
 
@@ -41,6 +43,13 @@
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
+import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
+import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
+import de.dennisguse.opentracks.data.adapters.FireStoreAdapter;
+
+import de.dennisguse.opentracks.data.models.UserModel;
+
+
 
  // You can choose any value for the request code
 
@@ -184,6 +193,7 @@ private void showEditProfileDialog() {
                     if (validateInputs(nickname, dateOfBirth, height, weight, gender, location)) {
                         saveProfileData(nickname, dateOfBirth, height, weight, gender, location);
                         showToast("Profile updated successfully!");
+
                     } else {
                         showToast("Please check your inputs.");
                     }
@@ -192,6 +202,16 @@ private void showEditProfileDialog() {
                 .show();
     }
 
+    // TODO: Implement saving logic here.
+    private void saveProfileData(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
+
+        UserModel user = new UserModel();
+        JsonObject userJson = user.toJSON();
+        UserModel userSerializable = JSONSerializable.fromJSON(userJson, user.class);
+
+        FirestoreCRUDUtil.getInstance().createEntry("users", nickname, user.toJSON(), null);
+    }
+
     // A simple method to show toast messages.
     private void showToast(String message) {
         Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
@@ -266,10 +286,7 @@ private void displayCustomSharingDialog(){
                 .show();
     }
 
-    // TODO: Implement saving logic here.
-    private void saveProfileData(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
 
-    }
 
     @Override
     public void onStart() {

From 67da4a9c1a5f0af80d1d6653426162c1d9c87e70 Mon Sep 17 00:00:00 2001
From: meliimoon <melissa.a.97@hotmail.com>
Date: Sun, 7 Apr 2024 19:01:02 -0400
Subject: [PATCH 11/76] Implemented saving profile pictures to internal storage
 ->Allows persistence of the uploaded profile picture on the profile page

---
 src/main/AndroidManifest.xml                  |  3 +-
 .../settings/UserProfileFragment.java         | 98 ++++++++++++++++++-
 2 files changed, 99 insertions(+), 2 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b4063be4a..fa7da6b7f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -66,7 +66,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/OpenTracksTheme">
+        android:theme="@style/OpenTracksTheme"
+        android:requestLegacyExternalStorage="true">
       <activity
             android:name=".ui.aggregatedStatistics.dailyStats.DailyStatsActivity"
             android:exported="false" />
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 7c355cfe1..1621ffaf9 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -4,15 +4,20 @@
 
 import android.app.AlertDialog;
 import android.app.Activity;
+import android.content.ContextWrapper;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.net.Uri;
+import android.provider.MediaStore;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -22,6 +27,8 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.Intent;
+
+import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import androidx.annotation.NonNull;
@@ -33,6 +40,9 @@
 
 import com.github.dhaval2404.imagepicker.ImagePicker;
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
@@ -165,6 +175,82 @@ private void updateProfilePicture(Uri imageUri) {
         // Load the image from the URI and set it to the profile picture ImageView
         ImageView profilePictureImageView = requireView().findViewById(R.id.profileImageView);
         profilePictureImageView.setImageURI(imageUri);
+
+        // Convert the image URI to a Bitmap
+        Bitmap bitmap = null;
+        try {
+            bitmap = MediaStore.Images.Media.getBitmap(requireActivity().getContentResolver(), imageUri);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        // Save the Bitmap to internal storage
+        if (bitmap != null) {
+            saveImageToInternalStorage(bitmap);
+            // Display the profile picture after saving
+            displayProfilePicture();
+
+        }
+    }
+
+    public void saveImageToInternalStorage(Bitmap bitmapImage){
+        ContextWrapper cw = new ContextWrapper(requireContext());
+        // Get the directory for the app's private pictures directory.
+        File directory = cw.getDir("profilePicDir", Context.MODE_PRIVATE);
+
+        Log.d("MyApp", "Directory Path: " + directory.getAbsolutePath());
+
+        // Create imageDir
+        File myPath = new File(directory, "profile.jpg");
+
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(myPath);
+            // Use the compress method on the Bitmap object to write image to the OutputStream
+            bitmapImage.compress(Bitmap.CompressFormat.PNG, 100, fos);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("MyApp", "Error saving image: " + e.getMessage());
+        } finally {
+            try {
+                if (fos != null)
+                    fos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+                Log.e("MyApp", "Error closing FileOutputStream: " + e.getMessage());
+            }
+        }
+
+    }
+
+    private void displayProfilePicture() {
+        View view = requireView();
+        if (view != null) {
+            // Get the directory for the app's private pictures directory
+            ContextWrapper cw = new ContextWrapper(requireContext());
+            File directory = cw.getDir("profilePicDir", Context.MODE_PRIVATE);
+
+            // Create image file
+            File myPath = new File(directory, "profile.jpg");
+
+            // Check if the file exists
+            if (myPath.exists()) {
+                // If the file exists, load the image from the file
+                Bitmap bitmap = BitmapFactory.decodeFile(myPath.getAbsolutePath());
+
+                // Set the loaded bitmap to the ImageView
+                ImageView profileImageView = view.findViewById(R.id.profileImageView);
+                if (profileImageView != null) {
+                    profileImageView.setImageBitmap(bitmap);
+                } else {
+                    Log.e("UserProfileFragment", "ImageView not found in the layout");
+                }
+            } else {
+                Log.e("UserProfileFragment", "Path does not exist");
+            }
+        } else {
+            Log.e("UserProfileFragment", "Fragment view is null");
+        }
     }
 
     private void showEditProfileDialog() {
@@ -356,6 +442,11 @@ public void onStart() {
 
             heightView.setText(heightStrings.first + heightStrings.second);
             weightView.setText(weightStrings.first + weightStrings.second);
+
+            //check if profile picture has been changed from default and load the new picture
+            if (ProfilePictureExists()) {
+                displayProfilePicture();
+            }
         }, 50);
     }
 
@@ -375,7 +466,12 @@ public void onDisplayPreferenceDialog(Preference preference) {
 
         super.onDisplayPreferenceDialog(preference);
     }
-
+    private boolean ProfilePictureExists() {
+        ContextWrapper cw = new ContextWrapper(requireContext());
+        File directory = cw.getDir("profilePicDir", Context.MODE_PRIVATE);
+        File myPath = new File(directory, "profile.jpg");
+        return myPath.exists();
+    }
 
 
 }

From e6dbe64ac17b315473d7da4893d4d6998057b063 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 21:16:02 -0400
Subject: [PATCH 12/76] annotated user model

---
 .../opentracks/data/models/UserModel.java     | 26 ++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index 34c37a80c..c92b6fa47 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -5,7 +5,9 @@
 
 public class UserModel {
 
-    private String nickname; //User key that uniquely identifies user
+    // Attributes of User class
+
+    private String nickname; //User key that identifies user
     private String country;
     private long dateOfBirth;
     private String gender;
@@ -14,8 +16,10 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
-    // Empty constructor
+    // Default Constructor
+
     public UserModel() {
+
         this.nickname = "";
         this.country = "";
         this.dateOfBirth = 0;
@@ -23,9 +27,23 @@ public UserModel() {
         this.height = 0;
         this.weight = 0;
         this.socialAllow = false;
-        this.profilePicURL = ""; 
+        this.profilePicURL = "";
     }
 
+    // Constructor
+
+    /**
+     * Constructs a new Car object with the given make, model, and year.
+     *
+     * @param nickname The nickname / username.
+     * @param country The country of user / not based on tracking.
+     * @param dateOfBirth The DOB.
+     * @param gender User gender.
+     * @param height User height unit default.
+     * @param weight User weight unit default.
+     * @param socialAllow Flags permission to share on leaderboard
+     * @param profilePicURL Stores path to blob.
+     */
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
 
         this.nickname = nickname;
@@ -38,6 +56,8 @@ public UserModel(String nickname, String country, long dateOfBirth, String gende
         this.profilePicURL = profilePicURL;
     }
 
+    // Methods
+
     public String getNickname() {
         return nickname;
     }

From 3246b0964adebf48c80c6b0df4d56f07d5b97183 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 22:53:15 -0400
Subject: [PATCH 13/76] edit form displays current contents

---
 .../opentracks/settings/UserProfileFragment.java  | 15 +++++++++++++++
 src/main/res/layout/edit_profile_form.xml         |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 1621ffaf9..51bb545e3 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -257,12 +257,27 @@ private void showEditProfileDialog() {
         // Inflate the custom layout for the edit dialog.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.edit_profile_form, null);
 
+        // Get current profile content
+        TextView nicknameText = getView().findViewById(R.id.nickname);
+        TextView DOBText = getView().findViewById(R.id.dateOfBirth);
+        TextView heightText = getView().findViewById(R.id.userHeight);
+        TextView weightText = getView().findViewById(R.id.userWeight);
+//        TextView countryText = getView().findViewById(R.id.userLocation);
+//        TextView genderText = getView().findViewById(R.id.gender);
+
+
         // Initialize all the EditText fields and Spinners.
         EditText editNickname = formView.findViewById(R.id.editNickname);
         EditText editDateOfBirth = formView.findViewById(R.id.editDateOfBirth);
         EditText editHeight = formView.findViewById(R.id.editHeight);
         EditText editWeight = formView.findViewById(R.id.editWeight);
 
+        // Write user data to profile
+        editNickname.setText(nicknameText.getText().toString());
+        editDateOfBirth.setText(DOBText.getText().toString());
+        editHeight.setText(heightText.getText().toString());
+        editWeight.setText(weightText.getText().toString());
+
         Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
         ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
                 R.array.gender_options, android.R.layout.simple_spinner_item);
diff --git a/src/main/res/layout/edit_profile_form.xml b/src/main/res/layout/edit_profile_form.xml
index 2cc14ff8b..7de84743a 100644
--- a/src/main/res/layout/edit_profile_form.xml
+++ b/src/main/res/layout/edit_profile_form.xml
@@ -10,6 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/nickname"
+        android:text="@string/nickname"
         android:inputType="text"
         android:ems="10"
         android:layout_marginTop="16dp"
@@ -22,6 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/height"
+        android:text="@string/height"
         android:inputType="numberDecimal"
         android:ems="10"
         android:layout_marginTop="8dp"
@@ -34,6 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/weight"
+        android:text="@string/weight"
         android:inputType="numberDecimal"
         android:ems="10"
         android:layout_marginTop="8dp"
@@ -46,6 +49,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/date_of_birth"
+        android:text="@string/date_of_birth"
         android:focusable="false"
         android:ems="10"
         android:layout_marginTop="8dp"

From 5802e4a602056ccd75d3a68e7a8f9ed0d9173c9d Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 23:04:32 -0400
Subject: [PATCH 14/76] fixed edit info display for empty values

---
 .../opentracks/settings/UserProfileFragment.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 51bb545e3..89c1680d5 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -273,8 +273,13 @@ private void showEditProfileDialog() {
         EditText editWeight = formView.findViewById(R.id.editWeight);
 
         // Write user data to profile
-        editNickname.setText(nicknameText.getText().toString());
-        editDateOfBirth.setText(DOBText.getText().toString());
+        if (nicknameText.getText().toString().equalsIgnoreCase("Nickname")) {
+            editNickname.setText("");
+        }
+        if (DOBText.getText().toString().equalsIgnoreCase("Date of Birth")) {
+            editDateOfBirth.setText("");
+        }
+
         editHeight.setText(heightText.getText().toString());
         editWeight.setText(weightText.getText().toString());
 

From 9dfb85481a736304dd3639c4785dc67268f47dd9 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 23:16:42 -0400
Subject: [PATCH 15/76] fixed nickname & dob edit bug

---
 .../opentracks/settings/UserProfileFragment.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 89c1680d5..973d8ebeb 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -276,10 +276,17 @@ private void showEditProfileDialog() {
         if (nicknameText.getText().toString().equalsIgnoreCase("Nickname")) {
             editNickname.setText("");
         }
+        else
+        {
+            editNickname.setText(nicknameText.getText().toString());
+        }
         if (DOBText.getText().toString().equalsIgnoreCase("Date of Birth")) {
             editDateOfBirth.setText("");
         }
-
+        else
+        {
+            editDateOfBirth.setText(DOBText.getText().toString());
+        }
         editHeight.setText(heightText.getText().toString());
         editWeight.setText(weightText.getText().toString());
 

From 0b75cc8470178bc819b5ce4a0e637d63eabaa100 Mon Sep 17 00:00:00 2001
From: HaithmMasood <masoodhaithm@gmail.com>
Date: Mon, 8 Apr 2024 01:32:38 -0400
Subject: [PATCH 16/76] User preferences update for leaderboard sharing

---
 .../opentracks/data/models/UserModel.java     | 26 +++++++++++++++++++
 .../settings/UserProfileFragment.java         | 18 ++++++++-----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index 99a93c83c..9614555d1 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -1,4 +1,6 @@
 package de.dennisguse.opentracks.data.models;
+import android.content.Context;
+import android.content.SharedPreferences;
 
 public class UserModel {
 
@@ -11,6 +13,10 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
+    private static final String SHARED_PREFS_NAME = "UserPrefs";
+    private static final String PREF_SOCIAL_ALLOW = "socialAllow";
+    private transient Context context;
+
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
 
         this.nickname = nickname;
@@ -23,6 +29,26 @@ public UserModel(String nickname, String country, long dateOfBirth, String gende
         this.profilePicURL = profilePicURL;
     }
 
+
+    public void setContext(Context context) {
+        this.context = context.getApplicationContext();
+    }
+
+    public void saveSharingPreference(boolean socialAllow) {
+        this.socialAllow = socialAllow;
+        SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(PREF_SOCIAL_ALLOW, socialAllow);
+        editor.apply();
+    }
+
+    // Method to get the user's sharing preference
+    public boolean getSharingPreference() {
+        SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+        // Default value is false if not set
+        return prefs.getBoolean(PREF_SOCIAL_ALLOW, false);
+    }
+
     public String getNickname() {
         return nickname;
     }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 973d8ebeb..3b10dbccf 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -50,6 +50,7 @@
 import de.dennisguse.opentracks.data.models.HeightFormatter;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
+import de.dennisguse.opentracks.data.models.UserModel;
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 
@@ -64,7 +65,6 @@
 
 
 
- // You can choose any value for the request code
 
 
 public class UserProfileFragment extends PreferenceFragmentCompat {
@@ -428,16 +428,20 @@ private void displayCustomSharingDialog(){
 
                 .setMessage(alertMessage)
                 .setPositiveButton("ALLOW", (dialog, which) -> {
+//                    UserModel userModel = new UserModel(); // Assume you have a way to initialize or get the current UserModel
+//                    userModel.setSocialAllow(true);
+                    showToast("Updated sharing permissions and data will be shared on the leaderboard.");
+                    leaderboardSwitch.setChecked(true); // Visually indicate sharing is enabled
 
-                    showToast("Updated sharing permissions");
-
-                    // TODO: Implement saving sharing permissions here.
-
+                    // TODO: Save the updated UserModel to the database
                 })
                 .setNegativeButton("CANCEL", (dialog, which) -> {
-                    // Un-toggle leaderboard switch
+//                    UserModel userModel = new UserModel(); // we need to get current UserID and initialize.
+ //                   userModel.setSocialAllow(false);
+                    showToast("Sharing not enabled. Data will remain private.");
+                    leaderboardSwitch.setChecked(false); // Visually indicate sharing is not enabled
 
-                    leaderboardSwitch.setChecked(false);
+                    // TODO: Save the updated UserModel to the database
                 })
                 .show();
     }

From 5aa334896d61df5789ad4a20123247e3b08431f4 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Mon, 8 Apr 2024 13:25:18 -0400
Subject: [PATCH 17/76] added conversion method to user

---
 .../settings/UserProfileFragment.java         | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 3b10dbccf..029f2ee40 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -43,6 +43,11 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
@@ -62,9 +67,8 @@
 import android.widget.Spinner;
 import java.util.Arrays;
 import java.util.Locale;
-
-
-
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class UserProfileFragment extends PreferenceFragmentCompat {
@@ -375,8 +379,10 @@ private void showToast(String message) {
 
     // A method to validate the user inputs.
     private boolean validateInputs(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
-        if (nickname.isEmpty() || gender.isEmpty()) {
-            showToast("Nickname and gender cannot be empty.");
+
+        if (nickname.isEmpty() || gender.isEmpty() || dateOfBirth.isEmpty())
+        {
+            showToast("Fields cannot be empty.");
             return false;
         }
         try {
@@ -395,6 +401,48 @@ private boolean validateInputs(String nickname, String dateOfBirth, String heigh
 
         return true;
     }
+
+    /*
+    * Conversion method to appropriate data types for user object
+    * */
+    private UserModel createUserFromInput(String nickname, String dateOfBirth, String height, String weight, String gender, String location, boolean socialAllow, String path) {
+
+        // Get long date
+        DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", Locale.getDefault());
+        Timestamp DOBlong = null;
+        long userDOB = 0;
+
+        try {
+            Date date = formatter.parse(dateOfBirth);
+            if (date != null) {
+                DOBlong = new Timestamp(date.getTime());
+                userDOB = DOBlong.getTime();
+            }
+        } catch (ParseException e) {
+            showToast("Error DOB format error");
+        }
+
+        // Height and weight conversion
+        int userHeight = 0;
+        int userWeight = 0;
+
+        Pattern pattern = Pattern.compile("\\d+");
+        Matcher matcherHeight = pattern.matcher(height);
+        Matcher matcherWeight = pattern.matcher(weight);
+
+        if (matcherHeight.find() && matcherWeight.find()) {
+            userHeight = Integer.parseInt(matcherHeight.group());
+            userWeight = Integer.parseInt(matcherWeight.group());
+        }
+
+        // Gender, Location correct format due to spinner handling
+
+        // Create UserModel object
+        UserModel userObject = new UserModel(nickname, location, userDOB, gender, userHeight, userWeight, socialAllow, path);
+
+        return userObject;
+    }
+
     private void displayCustomSharingDialog(){
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

From 6154a0a2e3a0ade058101c6a798527105fec09ab Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Mon, 8 Apr 2024 13:49:16 -0400
Subject: [PATCH 18/76] implement saving and uploading to the db.

---
 src/main/AndroidManifest.xml                  |  1 +
 .../opentracks/data/models/UserModel.java     | 33 ++++++-
 .../settings/UserProfileFragment.java         | 91 ++++++++++++++-----
 .../laprofile_picture_preference_layout.xml   | 11 ++-
 4 files changed, 105 insertions(+), 31 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 1483c04c2..3af280be1 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -33,6 +33,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> -->
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission
         android:name="android.permission.BLUETOOTH"
         android:maxSdkVersion="30" />
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index 34c37a80c..95c591b26 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -1,6 +1,13 @@
 package de.dennisguse.opentracks.data.models;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 
+import java.time.Duration;
+import java.time.Instant;
+
+import de.dennisguse.opentracks.data.adapters.Gson_DurationTypeAdapter;
+import de.dennisguse.opentracks.data.adapters.Gson_InstantTypeAdapter;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 
 public class UserModel {
@@ -23,7 +30,7 @@ public UserModel() {
         this.height = 0;
         this.weight = 0;
         this.socialAllow = false;
-        this.profilePicURL = ""; 
+        this.profilePicURL = "";
     }
 
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
@@ -38,6 +45,16 @@ public UserModel(String nickname, String country, long dateOfBirth, String gende
         this.profilePicURL = profilePicURL;
     }
 
+    public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight) {
+
+        this.nickname = nickname;
+        this.country = country;
+        this.dateOfBirth = dateOfBirth;
+        this.gender = gender;
+        this.height = height;
+        this.weight = weight;
+    }
+
     public String getNickname() {
         return nickname;
     }
@@ -93,4 +110,18 @@ public String getPictureURL() {
     public void setPictureURL(String profilePicURL) {
         this.profilePicURL = profilePicURL;
     }
+
+    public JsonObject toJSON() {
+        // Create a GsonBuilder and configure it to serialize special floating point values
+        Gson gson = new GsonBuilder()
+                .serializeSpecialFloatingPointValues()
+                .registerTypeAdapter(Instant.class, new Gson_InstantTypeAdapter())
+                .registerTypeAdapter(Duration.class, new Gson_DurationTypeAdapter())
+                .create();
+
+        // Convert the object to JsonObject using Gson
+        String jsonString = gson.toJson(this);
+        return gson.fromJson(jsonString, JsonObject.class);
+    }
+
 }
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index cee95da21..24deecff3 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -1,13 +1,16 @@
 package de.dennisguse.opentracks.settings;
 
+import static android.provider.Settings.Secure.ANDROID_ID;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.getUnitSystem;
 
 import android.app.AlertDialog;
 import android.app.Activity;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.net.Uri;
+import android.provider.Settings;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
@@ -45,7 +48,12 @@
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
+import de.dennisguse.opentracks.data.interfaces.ReadCallback;
+import de.dennisguse.opentracks.data.interfaces.ActionCallback;
 import de.dennisguse.opentracks.data.adapters.FireStoreAdapter;
+import de.dennisguse.opentracks.data.models.CRUDConstants;
+
+
 
 import de.dennisguse.opentracks.data.models.UserModel;
 
@@ -61,6 +69,7 @@ public class UserProfileFragment extends PreferenceFragmentCompat {
 
 
     SwitchPreference leaderboardSwitch;
+    private Context applicationContext;
 
     private void startImagePicker() {
         try {
@@ -189,9 +198,11 @@ private void showEditProfileDialog() {
                     String gender = editGender.getText().toString();
                     String location = editLocation.getText().toString();
 
-                    // Validate and save the data if valid.
-                    if (validateInputs(nickname, dateOfBirth, height, weight, gender, location)) {
-                        saveProfileData(nickname, dateOfBirth, height, weight, gender, location);
+                    // Validate and save the data if valid
+//TODO: Add back validation
+                    if(true){
+                    //if (validateInputs(nickname, dateOfBirth, height, weight, gender, location)) {
+                        saveProfileData(nickname, location, dateOfBirth, gender, height, weight);
                         showToast("Profile updated successfully!");
 
                     } else {
@@ -203,15 +214,50 @@ private void showEditProfileDialog() {
     }
 
     // TODO: Implement saving logic here.
-    private void saveProfileData(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
+    private void saveProfileData(String nickname, String location, String dateOfBirth, String gender, String height, String weight) {
 
-        UserModel user = new UserModel();
-        JsonObject userJson = user.toJSON();
-        UserModel userSerializable = JSONSerializable.fromJSON(userJson, user.class);
+        UserModel user = new UserModel(nickname, location, (long)Integer.valueOf(dateOfBirth), gender, Integer.valueOf(height), Integer.valueOf(weight));
 
-        FirestoreCRUDUtil.getInstance().createEntry("users", nickname, user.toJSON(), null);
+        FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
+        FirestoreCRUDUtil.getInstance().getEntry("users", systemID(), callback);
     }
 
+    ReadCallback callback = new ReadCallback() {
+        @Override
+        public void onSuccess(JsonObject data) {
+
+            UserModel readUser = JSONSerializable.fromJSON(data, UserModel.class);
+
+            TextView textView_nickname = getView().findViewById(R.id.nickname);
+            TextView textView_location = getView().findViewById(R.id.userLocation);
+            TextView textView_DOB = getView().findViewById(R.id.dateOfBirth);
+            TextView textView_height = getView().findViewById(R.id.userHeight);
+            TextView textView_weight = getView().findViewById(R.id.userWeight);
+
+            //TODO: create separate unit conversion method.
+            UnitSystem unitSystem = getUnitSystem();
+            Height height = new Height(readUser.getHeight());
+            Pair<String, String> heightStrings = HeightFormatter.Builder().setUnit(unitSystem).build(getContext()).getHeightParts(height);
+
+            Weight weight = new Weight(readUser.getWeight());
+            Pair<String, String> weightStrings = WeightFormatter.Builder().setUnit(unitSystem).build(getContext()).getWeightParts(weight);
+
+            textView_nickname.setText(readUser.getNickname());
+            textView_location.setText(readUser.getCountry());
+            textView_DOB.setText(Long.toString(readUser.getDateOfBirth()));
+            textView_height.setText(heightStrings.first + heightStrings.second);
+            textView_weight.setText(weightStrings.first + weightStrings.second);
+
+        }
+
+        @Override
+        public void onFailure() {
+            showToast("User profile was not saved!");
+        }
+    };
+
+
+
     // A simple method to show toast messages.
     private void showToast(String message) {
         Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
@@ -292,25 +338,9 @@ private void displayCustomSharingDialog(){
     public void onStart() {
         super.onStart();
         ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_ui_title);
-
-        final Handler handler = new Handler(Looper.getMainLooper());
-        handler.postDelayed(() -> {
-            TextView heightView = getView().findViewById(R.id.userHeight);
-            TextView weightView = getView().findViewById(R.id.userWeight);
-
-            UnitSystem unitSystem = getUnitSystem();
-
-            Height height = new Height(180);
-            Pair<String, String> heightStrings = HeightFormatter.Builder().setUnit(unitSystem).build(getContext()).getHeightParts(height);
-
-            Weight weight = new Weight(80);
-            Pair<String, String> weightStrings = WeightFormatter.Builder().setUnit(unitSystem).build(getContext()).getWeightParts(weight);
-
-            heightView.setText(heightStrings.first + heightStrings.second);
-            weightView.setText(weightStrings.first + weightStrings.second);
-        }, 50);
     }
 
+
     @Override
     public void onDisplayPreferenceDialog(Preference preference) {
         DialogFragment dialogFragment = null;
@@ -328,6 +358,17 @@ public void onDisplayPreferenceDialog(Preference preference) {
         super.onDisplayPreferenceDialog(preference);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        FirestoreCRUDUtil.getInstance().getEntry("users", systemID(), callback);
+    }
 
+    //TODO: Remove once there is offline data persistence through Firestore
+    public static String systemID() {
+        String id = System.getProperty("http.agent");
+        id = id.replace(" ", "");
+        return id;
+    }
 
 }
diff --git a/src/main/res/layout/laprofile_picture_preference_layout.xml b/src/main/res/layout/laprofile_picture_preference_layout.xml
index f593d8b68..8fb1c0567 100644
--- a/src/main/res/layout/laprofile_picture_preference_layout.xml
+++ b/src/main/res/layout/laprofile_picture_preference_layout.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="21dp"
             android:layout_marginBottom="5dp"
-            android:text="@string/nickname"
+            android:text="Nickname"
             android:textColor="#FF5722"
             android:textSize="20sp"
             android:textStyle="bold"
@@ -84,8 +84,9 @@
             android:id="@+id/dateOfBirth"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/date_of_birth"
+            android:text="DOB"
             android:textSize="16sp" />
+        <!--android:text="@string/date_of_birth"-->
 
     </LinearLayout>
 
@@ -112,7 +113,7 @@
             android:id="@+id/gender"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/gender"
+            android:text="Gender"
             android:textSize="16sp" />
 
     </LinearLayout>
@@ -140,7 +141,7 @@
             android:id="@+id/userHeight"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/stats_empty_value_integer"
+            android:text="0"
             android:textSize="16sp" />
 
     </LinearLayout>
@@ -168,7 +169,7 @@
             android:id="@+id/userWeight"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/stats_empty_value_integer"
+            android:text="0"
             android:textSize="16sp" />
 
     </LinearLayout>

From 5cde164e98c2213f5cb88cedb8c172710f990a1d Mon Sep 17 00:00:00 2001
From: HaithmMasood <masoodhaithm@gmail.com>
Date: Sun, 7 Apr 2024 01:43:08 -0400
Subject: [PATCH 19/76] Enhanced edit profile form with date picker, gender &
 country dropdowns

---
 .../settings/UserProfileFragment.java         | 66 +++++++++++++++++--
 src/main/res/layout/edit_profile_form.xml     | 24 ++++---
 src/main/res/values/strings.xml               |  6 ++
 3 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 24deecff3..bb94c9df7 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -15,6 +15,7 @@
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -59,6 +60,17 @@
 
 
 
+import android.app.DatePickerDialog;
+import android.widget.DatePicker;
+import java.util.Calendar;
+import java.util.Locale;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import java.util.Arrays;
+import java.util.Locale;
+
+
+
  // You can choose any value for the request code
 
 
@@ -177,26 +189,46 @@ private void showEditProfileDialog() {
         // Inflate the custom layout for the edit dialog.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.edit_profile_form, null);
 
-        // Initialize all the EditText fields.
+        // Initialize all the EditText fields and Spinners.
         EditText editNickname = formView.findViewById(R.id.editNickname);
         EditText editDateOfBirth = formView.findViewById(R.id.editDateOfBirth);
         EditText editHeight = formView.findViewById(R.id.editHeight);
         EditText editWeight = formView.findViewById(R.id.editWeight);
-        EditText editGender = formView.findViewById(R.id.editGender);
-        EditText editLocation = formView.findViewById(R.id.editLocation);
 
-        // Create the AlertDialog.
+        Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
+        ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
+                R.array.gender_options, android.R.layout.simple_spinner_item);
+        genderAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinnerGender.setAdapter(genderAdapter);
+
+        Spinner spinnerLocation = formView.findViewById(R.id.spinnerLocation);
+        String[] isoCountryCodes = Locale.getISOCountries();
+        String[] countryNames = new String[isoCountryCodes.length];
+
+        for (int i = 0; i < isoCountryCodes.length; i++) {
+            Locale locale = new Locale("", isoCountryCodes[i]);
+            countryNames[i] = locale.getDisplayCountry();
+        }
+
+        Arrays.sort(countryNames); // Sort the country names alphabetically
+
+        ArrayAdapter<String> locationAdapter = new ArrayAdapter<>(getContext(),
+                android.R.layout.simple_spinner_item, countryNames);
+        locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        spinnerLocation.setAdapter(locationAdapter);
+
+        // Set up the AlertDialog.
         new AlertDialog.Builder(getContext())
                 .setTitle(R.string.edit_profile_title)
                 .setView(formView)
                 .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                    // Collect data from the EditText fields.
+                    // Collect data from the fields.
                     String nickname = editNickname.getText().toString();
                     String dateOfBirth = editDateOfBirth.getText().toString();
                     String height = editHeight.getText().toString();
                     String weight = editWeight.getText().toString();
-                    String gender = editGender.getText().toString();
-                    String location = editLocation.getText().toString();
+                    String gender = spinnerGender.getSelectedItem().toString();
+                    String location = spinnerLocation.getSelectedItem().toString();
 
                     // Validate and save the data if valid
 //TODO: Add back validation
@@ -211,6 +243,26 @@ private void showEditProfileDialog() {
                 })
                 .setNegativeButton(android.R.string.cancel, null)
                 .show();
+        editDateOfBirth.setOnClickListener(view -> {
+            // Use the current date as the default date in the picker
+            final Calendar c = Calendar.getInstance();
+            int year = c.get(Calendar.YEAR);
+            int month = c.get(Calendar.MONTH);
+            int day = c.get(Calendar.DAY_OF_MONTH);
+
+            // Create a new instance of DatePickerDialog and return it
+            DatePickerDialog datePickerDialog = new DatePickerDialog(getContext(), (view1, year1, monthOfYear, dayOfMonth) -> {
+                // The month value is 0-based, so we add 1 to it for display.
+                String selectedDate = String.format(Locale.getDefault(), "%02d-%02d-%04d", dayOfMonth, monthOfYear + 1, year1);
+                editDateOfBirth.setText(selectedDate);
+            }, year, month, day);
+
+            // Prevent future dates from being selected
+            datePickerDialog.getDatePicker().setMaxDate(System.currentTimeMillis());
+
+            // Show the date picker dialog
+            datePickerDialog.show();
+        });
     }
 
     // TODO: Implement saving logic here.
diff --git a/src/main/res/layout/edit_profile_form.xml b/src/main/res/layout/edit_profile_form.xml
index b4635eab0..2cc14ff8b 100644
--- a/src/main/res/layout/edit_profile_form.xml
+++ b/src/main/res/layout/edit_profile_form.xml
@@ -43,38 +43,36 @@
 
     <EditText
         android:id="@+id/editDateOfBirth"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/date_of_birth"
-        android:inputType="date"
+        android:focusable="false"
         android:ems="10"
         android:layout_marginTop="8dp"
         app:layout_constraintTop_toBottomOf="@id/editWeight"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <EditText
-        android:id="@+id/editGender"
+
+    <Spinner
+        android:id="@+id/spinnerGender"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/gender"
-        android:inputType="text"
-        android:ems="10"
         android:layout_marginTop="8dp"
+        android:entries="@array/gender_options"
         app:layout_constraintTop_toBottomOf="@id/editDateOfBirth"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
-    <EditText
-        android:id="@+id/editLocation"
+
+    <Spinner
+        android:id="@+id/spinnerLocation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:hint="@string/location"
-        android:inputType="text"
-        android:ems="10"
         android:layout_marginTop="8dp"
-        app:layout_constraintTop_toBottomOf="@id/editGender"
+        app:layout_constraintTop_toBottomOf="@id/spinnerGender"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 44f608ea0..8a63ae12f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -841,6 +841,12 @@ limitations under the License.
     <string name="gender">Gender</string>
     <string name="location">Location/Country</string>
     <string name="profile_picture">Profile Picture</string>
+    <string-array name="gender_options">
+        <item>Male</item>
+        <item>Female</item>
+        <item>Other</item>
+    </string-array>
+
     <!-- HA -->
 
     <string name="title_activity_leaderboard">LeaderboardActivity</string>

From 7bd36ce3554eea4dd411c1d4c013236d1a9962a5 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 14:50:56 -0400
Subject: [PATCH 20/76] moved canada to beginning of dropdown

---
 .../opentracks/settings/UserProfileFragment.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index bb94c9df7..940d32b40 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -212,11 +212,22 @@ private void showEditProfileDialog() {
 
         Arrays.sort(countryNames); // Sort the country names alphabetically
 
+        // Move Canada to the beginning of the array
+        for (int i = 0; i < countryNames.length; i++) {
+            if (countryNames[i].equalsIgnoreCase("Canada")) {
+                String temp = countryNames[i];
+                System.arraycopy(countryNames, 0, countryNames, 1, i);
+                countryNames[0] = temp;
+                break;
+            }
+        }
+
         ArrayAdapter<String> locationAdapter = new ArrayAdapter<>(getContext(),
                 android.R.layout.simple_spinner_item, countryNames);
         locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spinnerLocation.setAdapter(locationAdapter);
 
+
         // Set up the AlertDialog.
         new AlertDialog.Builder(getContext())
                 .setTitle(R.string.edit_profile_title)
@@ -384,8 +395,6 @@ private void displayCustomSharingDialog(){
                 .show();
     }
 
-
-
     @Override
     public void onStart() {
         super.onStart();

From 8279bd470bff7d837a64f8faa3a3a609040de0ea Mon Sep 17 00:00:00 2001
From: meliimoon <melissa.a.97@hotmail.com>
Date: Sun, 7 Apr 2024 19:01:02 -0400
Subject: [PATCH 21/76] Implemented saving profile pictures to internal storage
 ->Allows persistence of the uploaded profile picture on the profile page

---
 src/main/AndroidManifest.xml                  |  3 +-
 .../settings/UserProfileFragment.java         | 92 +++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 3af280be1..40cd6e26b 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -67,7 +67,8 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:supportsRtl="true"
-        android:theme="@style/OpenTracksTheme">
+        android:theme="@style/OpenTracksTheme"
+        android:requestLegacyExternalStorage="true">
       <activity
             android:name=".ui.aggregatedStatistics.dailyStats.DailyStatsActivity"
             android:exported="false" />
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 940d32b40..bcc786877 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -5,17 +5,22 @@
 
 import android.app.AlertDialog;
 import android.app.Activity;
+import android.content.ContextWrapper;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.net.Uri;
+import android.provider.MediaStore;
 import android.provider.Settings;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -25,6 +30,8 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.content.Intent;
+
+import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import androidx.annotation.NonNull;
@@ -38,6 +45,9 @@
 import com.google.gson.JsonObject;
 
 
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
@@ -183,6 +193,82 @@ private void updateProfilePicture(Uri imageUri) {
         // Load the image from the URI and set it to the profile picture ImageView
         ImageView profilePictureImageView = requireView().findViewById(R.id.profileImageView);
         profilePictureImageView.setImageURI(imageUri);
+
+        // Convert the image URI to a Bitmap
+        Bitmap bitmap = null;
+        try {
+            bitmap = MediaStore.Images.Media.getBitmap(requireActivity().getContentResolver(), imageUri);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        // Save the Bitmap to internal storage
+        if (bitmap != null) {
+            saveImageToInternalStorage(bitmap);
+            // Display the profile picture after saving
+            displayProfilePicture();
+
+        }
+    }
+
+    public void saveImageToInternalStorage(Bitmap bitmapImage){
+        ContextWrapper cw = new ContextWrapper(requireContext());
+        // Get the directory for the app's private pictures directory.
+        File directory = cw.getDir("profilePicDir", Context.MODE_PRIVATE);
+
+        Log.d("MyApp", "Directory Path: " + directory.getAbsolutePath());
+
+        // Create imageDir
+        File myPath = new File(directory, "profile.jpg");
+
+        FileOutputStream fos = null;
+        try {
+            fos = new FileOutputStream(myPath);
+            // Use the compress method on the Bitmap object to write image to the OutputStream
+            bitmapImage.compress(Bitmap.CompressFormat.PNG, 100, fos);
+        } catch (Exception e) {
+            e.printStackTrace();
+            Log.e("MyApp", "Error saving image: " + e.getMessage());
+        } finally {
+            try {
+                if (fos != null)
+                    fos.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+                Log.e("MyApp", "Error closing FileOutputStream: " + e.getMessage());
+            }
+        }
+
+    }
+
+    private void displayProfilePicture() {
+        View view = requireView();
+        if (view != null) {
+            // Get the directory for the app's private pictures directory
+            ContextWrapper cw = new ContextWrapper(requireContext());
+            File directory = cw.getDir("profilePicDir", Context.MODE_PRIVATE);
+
+            // Create image file
+            File myPath = new File(directory, "profile.jpg");
+
+            // Check if the file exists
+            if (myPath.exists()) {
+                // If the file exists, load the image from the file
+                Bitmap bitmap = BitmapFactory.decodeFile(myPath.getAbsolutePath());
+
+                // Set the loaded bitmap to the ImageView
+                ImageView profileImageView = view.findViewById(R.id.profileImageView);
+                if (profileImageView != null) {
+                    profileImageView.setImageBitmap(bitmap);
+                } else {
+                    Log.e("UserProfileFragment", "ImageView not found in the layout");
+                }
+            } else {
+                Log.e("UserProfileFragment", "Path does not exist");
+            }
+        } else {
+            Log.e("UserProfileFragment", "Fragment view is null");
+        }
     }
 
     private void showEditProfileDialog() {
@@ -424,6 +510,12 @@ public void onResume() {
         super.onResume();
         FirestoreCRUDUtil.getInstance().getEntry("users", systemID(), callback);
     }
+    private boolean ProfilePictureExists() {
+        ContextWrapper cw = new ContextWrapper(requireContext());
+        File directory = cw.getDir("profilePicDir", Context.MODE_PRIVATE);
+        File myPath = new File(directory, "profile.jpg");
+        return myPath.exists();
+    }
 
     //TODO: Remove once there is offline data persistence through Firestore
     public static String systemID() {

From af12d9e813bedb026ec42cc68239c63f95caee44 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 22:53:15 -0400
Subject: [PATCH 22/76] edit form displays current contents

---
 .../opentracks/settings/UserProfileFragment.java  | 15 +++++++++++++++
 src/main/res/layout/edit_profile_form.xml         |  4 ++++
 2 files changed, 19 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index bcc786877..acb09259d 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -275,12 +275,27 @@ private void showEditProfileDialog() {
         // Inflate the custom layout for the edit dialog.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.edit_profile_form, null);
 
+        // Get current profile content
+        TextView nicknameText = getView().findViewById(R.id.nickname);
+        TextView DOBText = getView().findViewById(R.id.dateOfBirth);
+        TextView heightText = getView().findViewById(R.id.userHeight);
+        TextView weightText = getView().findViewById(R.id.userWeight);
+//        TextView countryText = getView().findViewById(R.id.userLocation);
+//        TextView genderText = getView().findViewById(R.id.gender);
+
+
         // Initialize all the EditText fields and Spinners.
         EditText editNickname = formView.findViewById(R.id.editNickname);
         EditText editDateOfBirth = formView.findViewById(R.id.editDateOfBirth);
         EditText editHeight = formView.findViewById(R.id.editHeight);
         EditText editWeight = formView.findViewById(R.id.editWeight);
 
+        // Write user data to profile
+        editNickname.setText(nicknameText.getText().toString());
+        editDateOfBirth.setText(DOBText.getText().toString());
+        editHeight.setText(heightText.getText().toString());
+        editWeight.setText(weightText.getText().toString());
+
         Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
         ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
                 R.array.gender_options, android.R.layout.simple_spinner_item);
diff --git a/src/main/res/layout/edit_profile_form.xml b/src/main/res/layout/edit_profile_form.xml
index 2cc14ff8b..7de84743a 100644
--- a/src/main/res/layout/edit_profile_form.xml
+++ b/src/main/res/layout/edit_profile_form.xml
@@ -10,6 +10,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/nickname"
+        android:text="@string/nickname"
         android:inputType="text"
         android:ems="10"
         android:layout_marginTop="16dp"
@@ -22,6 +23,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/height"
+        android:text="@string/height"
         android:inputType="numberDecimal"
         android:ems="10"
         android:layout_marginTop="8dp"
@@ -34,6 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:hint="@string/weight"
+        android:text="@string/weight"
         android:inputType="numberDecimal"
         android:ems="10"
         android:layout_marginTop="8dp"
@@ -46,6 +49,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/date_of_birth"
+        android:text="@string/date_of_birth"
         android:focusable="false"
         android:ems="10"
         android:layout_marginTop="8dp"

From ec92a5da59fad0bc823be9bf785f977612d57a42 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 23:04:32 -0400
Subject: [PATCH 23/76] fixed edit info display for empty values

---
 .../opentracks/settings/UserProfileFragment.java         | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index acb09259d..16c19c677 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -291,8 +291,13 @@ private void showEditProfileDialog() {
         EditText editWeight = formView.findViewById(R.id.editWeight);
 
         // Write user data to profile
-        editNickname.setText(nicknameText.getText().toString());
-        editDateOfBirth.setText(DOBText.getText().toString());
+        if (nicknameText.getText().toString().equalsIgnoreCase("Nickname")) {
+            editNickname.setText("");
+        }
+        if (DOBText.getText().toString().equalsIgnoreCase("Date of Birth")) {
+            editDateOfBirth.setText("");
+        }
+
         editHeight.setText(heightText.getText().toString());
         editWeight.setText(weightText.getText().toString());
 

From 8d17b886d822eb4388e393996c1548bf5ab09fc3 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 23:16:42 -0400
Subject: [PATCH 24/76] fixed nickname & dob edit bug

---
 .../opentracks/settings/UserProfileFragment.java         | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 16c19c677..56965a2ba 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -294,10 +294,17 @@ private void showEditProfileDialog() {
         if (nicknameText.getText().toString().equalsIgnoreCase("Nickname")) {
             editNickname.setText("");
         }
+        else
+        {
+            editNickname.setText(nicknameText.getText().toString());
+        }
         if (DOBText.getText().toString().equalsIgnoreCase("Date of Birth")) {
             editDateOfBirth.setText("");
         }
-
+        else
+        {
+            editDateOfBirth.setText(DOBText.getText().toString());
+        }
         editHeight.setText(heightText.getText().toString());
         editWeight.setText(weightText.getText().toString());
 

From 60cf5adfbb45e0e48fe3e8e2badd9cf318f494b6 Mon Sep 17 00:00:00 2001
From: HaithmMasood <masoodhaithm@gmail.com>
Date: Mon, 8 Apr 2024 01:32:38 -0400
Subject: [PATCH 25/76] User preferences update for leaderboard sharing

---
 .../opentracks/data/models/UserModel.java     | 26 +++++++++++++++++++
 .../settings/UserProfileFragment.java         | 18 ++++++++-----
 2 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index 7c5df8589..f2e5432c8 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -1,4 +1,6 @@
 package de.dennisguse.opentracks.data.models;
+import android.content.Context;
+import android.content.SharedPreferences;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
@@ -23,6 +25,10 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
+    private static final String SHARED_PREFS_NAME = "UserPrefs";
+    private static final String PREF_SOCIAL_ALLOW = "socialAllow";
+    private transient Context context;
+
     // Default Constructor
 
     public UserModel() {
@@ -63,6 +69,26 @@ public UserModel(String nickname, String country, long dateOfBirth, String gende
         this.profilePicURL = profilePicURL;
     }
 
+
+    public void setContext(Context context) {
+        this.context = context.getApplicationContext();
+    }
+
+    public void saveSharingPreference(boolean socialAllow) {
+        this.socialAllow = socialAllow;
+        SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+        SharedPreferences.Editor editor = prefs.edit();
+        editor.putBoolean(PREF_SOCIAL_ALLOW, socialAllow);
+        editor.apply();
+    }
+
+    // Method to get the user's sharing preference
+    public boolean getSharingPreference() {
+        SharedPreferences prefs = context.getSharedPreferences(SHARED_PREFS_NAME, Context.MODE_PRIVATE);
+        // Default value is false if not set
+        return prefs.getBoolean(PREF_SOCIAL_ALLOW, false);
+    }
+
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight) {
 
         this.nickname = nickname;
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 56965a2ba..d7de944f9 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -55,6 +55,7 @@
 import de.dennisguse.opentracks.data.models.HeightFormatter;
 import de.dennisguse.opentracks.data.models.Speed;
 import de.dennisguse.opentracks.data.models.SpeedFormatter;
+import de.dennisguse.opentracks.data.models.UserModel;
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
@@ -81,7 +82,6 @@
 
 
 
- // You can choose any value for the request code
 
 
 public class UserProfileFragment extends PreferenceFragmentCompat {
@@ -494,16 +494,20 @@ private void displayCustomSharingDialog(){
 
                 .setMessage(alertMessage)
                 .setPositiveButton("ALLOW", (dialog, which) -> {
+//                    UserModel userModel = new UserModel(); // Assume you have a way to initialize or get the current UserModel
+//                    userModel.setSocialAllow(true);
+                    showToast("Updated sharing permissions and data will be shared on the leaderboard.");
+                    leaderboardSwitch.setChecked(true); // Visually indicate sharing is enabled
 
-                    showToast("Updated sharing permissions");
-
-                    // TODO: Implement saving sharing permissions here.
-
+                    // TODO: Save the updated UserModel to the database
                 })
                 .setNegativeButton("CANCEL", (dialog, which) -> {
-                    // Un-toggle leaderboard switch
+//                    UserModel userModel = new UserModel(); // we need to get current UserID and initialize.
+ //                   userModel.setSocialAllow(false);
+                    showToast("Sharing not enabled. Data will remain private.");
+                    leaderboardSwitch.setChecked(false); // Visually indicate sharing is not enabled
 
-                    leaderboardSwitch.setChecked(false);
+                    // TODO: Save the updated UserModel to the database
                 })
                 .show();
     }

From fb7f2d6962a8158da094e0e06af6852867e46213 Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Mon, 8 Apr 2024 13:25:18 -0400
Subject: [PATCH 26/76] added conversion method to user

---
 .../settings/UserProfileFragment.java         | 58 +++++++++++++++++--
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index d7de944f9..275933758 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -48,6 +48,11 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.sql.Timestamp;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
@@ -79,9 +84,8 @@
 import android.widget.Spinner;
 import java.util.Arrays;
 import java.util.Locale;
-
-
-
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 
 public class UserProfileFragment extends PreferenceFragmentCompat {
@@ -441,8 +445,10 @@ private void showToast(String message) {
 
     // A method to validate the user inputs.
     private boolean validateInputs(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
-        if (nickname.isEmpty() || gender.isEmpty()) {
-            showToast("Nickname and gender cannot be empty.");
+
+        if (nickname.isEmpty() || gender.isEmpty() || dateOfBirth.isEmpty())
+        {
+            showToast("Fields cannot be empty.");
             return false;
         }
         try {
@@ -461,6 +467,48 @@ private boolean validateInputs(String nickname, String dateOfBirth, String heigh
 
         return true;
     }
+
+    /*
+    * Conversion method to appropriate data types for user object
+    * */
+    private UserModel createUserFromInput(String nickname, String dateOfBirth, String height, String weight, String gender, String location, boolean socialAllow, String path) {
+
+        // Get long date
+        DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", Locale.getDefault());
+        Timestamp DOBlong = null;
+        long userDOB = 0;
+
+        try {
+            Date date = formatter.parse(dateOfBirth);
+            if (date != null) {
+                DOBlong = new Timestamp(date.getTime());
+                userDOB = DOBlong.getTime();
+            }
+        } catch (ParseException e) {
+            showToast("Error DOB format error");
+        }
+
+        // Height and weight conversion
+        int userHeight = 0;
+        int userWeight = 0;
+
+        Pattern pattern = Pattern.compile("\\d+");
+        Matcher matcherHeight = pattern.matcher(height);
+        Matcher matcherWeight = pattern.matcher(weight);
+
+        if (matcherHeight.find() && matcherWeight.find()) {
+            userHeight = Integer.parseInt(matcherHeight.group());
+            userWeight = Integer.parseInt(matcherWeight.group());
+        }
+
+        // Gender, Location correct format due to spinner handling
+
+        // Create UserModel object
+        UserModel userObject = new UserModel(nickname, location, userDOB, gender, userHeight, userWeight, socialAllow, path);
+
+        return userObject;
+    }
+
     private void displayCustomSharingDialog(){
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

From d4af7f67bab5940d71c59e1c8ea1b9adf2a8652c Mon Sep 17 00:00:00 2001
From: Ali Lezzeik <56936736+aliL123@users.noreply.github.com>
Date: Sat, 16 Mar 2024 16:31:37 -0400
Subject: [PATCH 27/76] Added Firebase (Firestore db) dependencies to the
 project.

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index 5abe1b892..dea77c3da 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,6 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
+        classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.android.tools.build:gradle:8.2.2'
         classpath 'com.google.gms:google-services:4.4.1'
     }

From 74fd58915e4900aac2b26ada6e97e0b068364edd Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 14:57:47 -0400
Subject: [PATCH 28/76] Seasonal Activity per season

---
 .../opentracks/SeasonalActivityPerSeason.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
index 5b7a797e1..2ff239e32 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
@@ -18,13 +18,13 @@
 
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalPerSeasonBinding;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.DummyDataGenerator;
 
 public class SeasonalActivityPerSeason extends AbstractActivity
 {
     private ActivitySeasonalPerSeasonBinding viewBinding;
     @Override
-    protected void onCreate(Bundle savedInstanceState)
-    {
+    protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         Bundle data = getIntent().getExtras();
@@ -33,10 +33,16 @@ protected void onCreate(Bundle savedInstanceState)
             changeTitle(data.getString("seasonTitle"));
         }
 
+        TextView distanceTraveledTextView = findViewById(R.id.distanceTraveled);
+        TextView totalTimeTextView = findViewById(R.id.totalTime);
+        TextView averageSpeedTextView = findViewById(R.id.avgSpeed);
+        TextView maxSpeedTextView = findViewById(R.id.maxSpeed);
+
+
+
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
-    private void MakeYesNoButton(Button button)
-    {
+    private void MakeYesNoButton(Button button) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this)
                 .setTitle("Heading to " + button.getText()).setMessage("Is this okay?")
                 .setPositiveButton("Yes", (dialogInterface, i) -> {
@@ -44,15 +50,13 @@ private void MakeYesNoButton(Button button)
                 })
                 .setNegativeButton("No", (dialogInterface, i) -> dialogInterface.cancel());
     }
-    private void changeTitle(String newTitle)
-    {
+    private void changeTitle(String newTitle) {
         MaterialToolbar materialToolbar = (MaterialToolbar)findViewById(R.id.season_materialtoolbar);
         materialToolbar.setTitle(newTitle);
     }
 
     @Override
-    protected View getRootView()
-    {
+    protected View getRootView() {
         viewBinding = ActivitySeasonalPerSeasonBinding.inflate(getLayoutInflater());
         return viewBinding.getRoot();
     }

From 7a1734825b2fdbf34aefc0e675ad8df8d5296fcc Mon Sep 17 00:00:00 2001
From: Jean Robatto <robatto.jeanmarie@gmail.com>
Date: Mon, 18 Mar 2024 12:33:58 -0400
Subject: [PATCH 29/76] Added JSON serialization to Track model

---
 build.gradle                                      |  3 +--
 .../opentracks/TrackStoppedActivity.java          | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index dea77c3da..4e47dd0dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,8 +8,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.google.gms:google-services:4.4.1'
-        classpath 'com.android.tools.build:gradle:8.2.2'
-        classpath 'com.google.gms:google-services:4.4.1'
+        classpath 'com.android.tools.build:gradle:8.3.1'
     }
 }
 
diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
index 6ce4ba689..ff37bfad4 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -56,6 +56,21 @@ protected void onCreate(Bundle savedInstanceState) {
         ContentProviderUtils contentProviderUtils = new ContentProviderUtils(this);
         Track track = contentProviderUtils.getTrack(trackId);
 
+        //Temporary code to illustrate JSON serialization and loading of Track model
+        //TODO! - Remove
+        //Assignee - Jean Robatto
+
+        final String JSON_SERIALIZER_LOG_TAG = "JSONSerializerTest";
+
+        final String trackJSONString = track.toJSON();
+        Log.i(JSON_SERIALIZER_LOG_TAG, trackJSONString);
+
+        final Track trackCopy = JSONSerializable.fromJSON(trackJSONString, Track.class);
+        Log.i(JSON_SERIALIZER_LOG_TAG, trackCopy.toString());
+        Log.i(JSON_SERIALIZER_LOG_TAG, trackCopy.getName());
+
+        //End
+
         viewBinding.trackEditName.setText(track.getName());
 
         viewBinding.trackEditActivityType.setText(track.getActivityTypeLocalized());

From 98b8ad612735e5b46e848b02ca95ef340c3910cb Mon Sep 17 00:00:00 2001
From: Terryl <teforyoung@gmail.com>
Date: Sat, 23 Mar 2024 02:10:14 -0400
Subject: [PATCH 30/76] Merge branch 'CRUD-operations-runs' of
 https://github.com/Picard4/OpenTracks-Winter-2024-COMP-354-Groups-13-14-15
 into CRUD-operations-runs

---
 build.gradle                                  |  3 +
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 .../dennisguse/opentracks/AboutActivity.java  | 32 ++++----
 .../opentracks/data/models/Rankings.java      | 77 +++++++++++++++++++
 .../leaderboard/LeaderboardListAdapter.java   | 60 +++++++++++++++
 .../leaderboard/LeaderboardListFragment.java  | 72 +++++++++++++++++
 .../res/layout/fragment_leaderboard_list.xml  | 20 +++++
 .../layout/fragment_leaderboard_list_list.xml | 13 ++++
 8 files changed, 262 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/de/dennisguse/opentracks/data/models/Rankings.java
 create mode 100644 src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java
 create mode 100644 src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java
 create mode 100644 src/main/res/layout/fragment_leaderboard_list.xml
 create mode 100644 src/main/res/layout/fragment_leaderboard_list_list.xml

diff --git a/build.gradle b/build.gradle
index 4e47dd0dc..9701ec34d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,6 +128,9 @@ android {
 }
 
 dependencies {
+    implementation 'com.google.firebase:firebase-firestore:24.10.3'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'com.google.firebase:firebase-firestore:24.10.3'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1af9e0930..9f4197d5f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/de/dennisguse/opentracks/AboutActivity.java b/src/main/java/de/dennisguse/opentracks/AboutActivity.java
index bb666a0d0..66776909a 100644
--- a/src/main/java/de/dennisguse/opentracks/AboutActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/AboutActivity.java
@@ -23,22 +23,22 @@ public class AboutActivity extends AbstractActivity {
 
     private AboutBinding viewBinding;
 
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setTitle(getString(R.string.about_preference_title));
-        //checkDBConnection("FirstName","LastName");
-
-        viewBinding.aboutTextDescription.setText(getString(R.string.about_description));
-        viewBinding.aboutTextVersionName.setText(getString(R.string.about_version_name, SystemUtils.getAppVersionName(this)));
-        viewBinding.aboutTextVersionCode.setText(getString(R.string.about_version_code, SystemUtils.getAppVersionCode(this)));
-        viewBinding.aboutAppUrl.setText(getString(R.string.about_url, getString(R.string.app_web_url)));
-
-        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
-
-        ViewUtils.makeClickableLinks(findViewById(android.R.id.content));
-    }
+//    @Override
+//    protected void onCreate(@Nullable Bundle savedInstanceState) {
+//        super.onCreate(savedInstanceState);
+//
+//        setTitle(getString(R.string.about_preference_title));
+//        //checkDBConnection("FirstName","LastName");
+//
+//        viewBinding.aboutTextDescription.setText(getString(R.string.about_description));
+//        viewBinding.aboutTextVersionName.setText(getString(R.string.about_version_name, SystemUtils.getAppVersionName(this)));
+//        viewBinding.aboutTextVersionCode.setText(getString(R.string.about_version_code, SystemUtils.getAppVersionCode(this)));
+//        viewBinding.aboutAppUrl.setText(getString(R.string.about_url, getString(R.string.app_web_url)));
+//
+//        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
+//
+//        ViewUtils.makeClickableLinks(findViewById(android.R.id.content));
+//    }
 
     protected View getRootView() {
         viewBinding = AboutBinding.inflate(getLayoutInflater());
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Rankings.java b/src/main/java/de/dennisguse/opentracks/data/models/Rankings.java
new file mode 100644
index 000000000..fd1c84e90
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Rankings.java
@@ -0,0 +1,77 @@
+package de.dennisguse.opentracks.data.models;
+
+import android.graphics.Bitmap;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Model class for the Rankings displayed on a Leaderboard.
+ */
+public class Rankings {
+
+    /**
+     * An array of sample Rankings.
+     */
+    public static final List<Ranking> RANKINGS = new ArrayList<Ranking>();
+
+    /**
+     * A map of sample Rankings, by rank.
+     */
+    public static final Map<Integer, Ranking> RANKING_MAP = new HashMap<Integer, Ranking>();
+
+    static {
+        // Add some sample Rankings, until we can get refresh working.
+        addItem(new Ranking(1, null, "Da bes", "Steamboat Springs",  25));
+        addItem(new Ranking(2, null, "Second place", "North California CA",  24));
+        addItem(new Ranking(3, null, "Tertiary", "Steamboat Springs, Color Red",  23));
+        addItem(new Ranking(4, null, "Quad Runner", "Montreal",  22));
+        addItem(new Ranking(5, null, "Quintuple champ", "Steamboat Springs",  21));
+        addItem(new Ranking(6, null, "Gang of Six", "Montreal",  20));
+        addItem(new Ranking(7, null, "Seven", "Steamboat Springs",  19));
+        addItem(new Ranking(8, null, "Eight", "Montreal",  18));
+        addItem(new Ranking(9, null, "Ninth", "Montreal",  17));
+        addItem(new Ranking(10, null, "DoubleDigits", "Steamboat Springs",  16));
+        addItem(new Ranking(11, null, "El e Ven", "Montreal",  15));
+        addItem(new Ranking(12, null, "Twelve", "Montreal",  14));
+        addItem(new Ranking(13, null, "XIII", "Montreal",  13));
+        addItem(new Ranking(14, null, "Four Teen", "Steamboat Springs",  12));
+        addItem(new Ranking(15, null, "Fif Teen", "Montreal",  11));
+        addItem(new Ranking(16, null, "Six Teen", "Steamboat Springs",  10));
+        addItem(new Ranking(17, null, "Seven+10", "Montreal",  9));
+        addItem(new Ranking(18, null, "Eight een", "Montreal",  8));
+        addItem(new Ranking(19, null, "Nineteen", "Steamboat Springs",  7));
+        addItem(new Ranking(20, null, "10+10", "Steamboat Springs",  6));
+        addItem(new Ranking(21, null, "Twenty-first", "Montreal",  5));
+        addItem(new Ranking(22, null, "TwoTwo", "Montreal",  4));
+        addItem(new Ranking(23, null, "TwoThree", "Steamboat Springs",  3));
+        addItem(new Ranking(24, null, "The day", "Montreal",  2));
+        addItem(new Ranking(25, null, "The saved day", "Montreal",  1));
+    }
+
+    private static void addItem(Ranking item) {
+        RANKINGS.add(item);
+        RANKING_MAP.put(item.rank, item);
+    }
+
+    /**
+     * An individual user's Ranking on a Leaderboard, designed to work with any type of Leaderboard.
+     */
+    public static class Ranking {
+        public final int rank;
+        public final Bitmap profilePicture;
+        public final String username;
+        public final String location;
+        public final double score;
+
+        public Ranking(int rank, Bitmap profilePicture, String username, String location, double score) {
+            this.rank = rank;
+            this.profilePicture = profilePicture;
+            this.username = username;
+            this.location = location;
+            this.score = score;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java
new file mode 100644
index 000000000..910d2b7e3
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java
@@ -0,0 +1,60 @@
+package de.dennisguse.opentracks.ui.leaderboard;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import de.dennisguse.opentracks.data.models.Rankings.Ranking;
+import de.dennisguse.opentracks.databinding.FragmentLeaderboardListBinding;
+
+import java.util.List;
+
+/**
+ * {@link RecyclerView.Adapter} that can display a {@link Ranking}.
+ */
+public class LeaderboardListAdapter extends RecyclerView.Adapter<LeaderboardListAdapter.ViewHolder> {
+
+    private final List<Ranking> mValues;
+
+    public LeaderboardListAdapter(List<Ranking> rankings) {
+        mValues = rankings;
+    }
+
+    @Override
+    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+
+        return new ViewHolder(FragmentLeaderboardListBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
+
+    }
+
+    @Override
+    public void onBindViewHolder(final ViewHolder holder, int position) {
+        holder.mItem = mValues.get(position);
+        holder.mIdView.setText(mValues.get(position).rank);
+        holder.mContentView.setText(mValues.get(position).username);
+    }
+
+    @Override
+    public int getItemCount() {
+        return mValues.size();
+    }
+
+    public class ViewHolder extends RecyclerView.ViewHolder {
+        public final TextView mIdView;
+        public final TextView mContentView;
+        public Ranking mItem;
+
+        public ViewHolder(FragmentLeaderboardListBinding binding) {
+            super(binding.getRoot());
+            mIdView = binding.itemNumber;
+            mContentView = binding.content;
+        }
+
+        @Override
+        public String toString() {
+            return super.toString() + " '" + mContentView.getText() + "'";
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java
new file mode 100644
index 000000000..0e2b4fc65
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java
@@ -0,0 +1,72 @@
+package de.dennisguse.opentracks.ui.leaderboard;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.data.models.Rankings;
+
+/**
+ * A fragment representing a list of Rankings; a Leaderboard, in other words.
+ */
+public class LeaderboardListFragment extends Fragment {
+
+    // TODO: Customize parameter argument names
+    private static final String ARG_COLUMN_COUNT = "column-count";
+    // TODO: Customize parameters
+    private int mColumnCount = 1;
+
+    /**
+     * Mandatory empty constructor for the fragment manager to instantiate the
+     * fragment (e.g. upon screen orientation changes).
+     */
+    public LeaderboardListFragment() {
+    }
+
+    // TODO: Customize parameter initialization
+    @SuppressWarnings("unused")
+    public static LeaderboardListFragment newInstance(int columnCount) {
+        LeaderboardListFragment fragment = new LeaderboardListFragment();
+        Bundle args = new Bundle();
+        args.putInt(ARG_COLUMN_COUNT, columnCount);
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (getArguments() != null) {
+            mColumnCount = getArguments().getInt(ARG_COLUMN_COUNT);
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_leaderboard_list_list, container, false);
+
+        // Set the adapter
+        if (view instanceof RecyclerView) {
+            Context context = view.getContext();
+            RecyclerView recyclerView = (RecyclerView) view;
+            if (mColumnCount <= 1) {
+                recyclerView.setLayoutManager(new LinearLayoutManager(context));
+            } else {
+                recyclerView.setLayoutManager(new GridLayoutManager(context, mColumnCount));
+            }
+            recyclerView.setAdapter(new LeaderboardListAdapter(Rankings.RANKINGS));
+        }
+        return view;
+    }
+}
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_leaderboard_list.xml b/src/main/res/layout/fragment_leaderboard_list.xml
new file mode 100644
index 000000000..18775687a
--- /dev/null
+++ b/src/main/res/layout/fragment_leaderboard_list.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal">
+
+    <TextView
+        android:id="@+id/item_number"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/text_margin"
+        android:textAppearance="?attr/textAppearanceListItem" />
+
+    <TextView
+        android:id="@+id/content"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="@dimen/text_margin"
+        android:textAppearance="?attr/textAppearanceListItem" />
+</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_leaderboard_list_list.xml b/src/main/res/layout/fragment_leaderboard_list_list.xml
new file mode 100644
index 000000000..5a11af814
--- /dev/null
+++ b/src/main/res/layout/fragment_leaderboard_list_list.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/list"
+    android:name="de.dennisguse.opentracks.ui.leaderboard.LeaderboardListFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginLeft="16dp"
+    android:layout_marginRight="16dp"
+    app:layoutManager="LinearLayoutManager"
+    tools:context=".ui.leaderboard.LeaderboardListFragment"
+    tools:listitem="@layout/fragment_leaderboard_list" />
\ No newline at end of file

From 2e887812a1f42ad36d48eed4aa87875a5c2d0d8c Mon Sep 17 00:00:00 2001
From: Terryl <teforyoung@gmail.com>
Date: Sat, 23 Mar 2024 02:45:04 -0400
Subject: [PATCH 31/76] Revert "Merge branch 'CRUD-operations-runs' of
 https://github.com/Picard4/OpenTracks-Winter-2024-COMP-354-Groups-13-14-15
 into CRUD-operations-runs"

This reverts commit af180168bfc8cf8f4eb72bf7c7458c3e2d9e6dc2.
---
 .idea/migrations.xml                          |  10 ---
 build.gradle                                  |   3 -
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 .../dennisguse/opentracks/AboutActivity.java  |  32 ++++----
 .../opentracks/data/models/Rankings.java      |  77 ------------------
 .../opentracks/data/models/Track.java         |   3 +-
 .../leaderboard/LeaderboardListAdapter.java   |  60 --------------
 .../leaderboard/LeaderboardListFragment.java  |  72 ----------------
 src/main/res/drawable/podium.png              | Bin 8627 -> 0 bytes
 .../res/layout/fragment_leaderboard_list.xml  |  20 -----
 .../layout/fragment_leaderboard_list_list.xml |  13 ---
 11 files changed, 18 insertions(+), 274 deletions(-)
 delete mode 100644 .idea/migrations.xml
 delete mode 100644 src/main/java/de/dennisguse/opentracks/data/models/Rankings.java
 delete mode 100644 src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java
 delete mode 100644 src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java
 delete mode 100644 src/main/res/drawable/podium.png
 delete mode 100644 src/main/res/layout/fragment_leaderboard_list.xml
 delete mode 100644 src/main/res/layout/fragment_leaderboard_list_list.xml

diff --git a/.idea/migrations.xml b/.idea/migrations.xml
deleted file mode 100644
index f8051a6f9..000000000
--- a/.idea/migrations.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectMigrations">
-    <option name="MigrateToGradleLocalJavaHome">
-      <set>
-        <option value="$PROJECT_DIR$" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 9701ec34d..4e47dd0dc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -128,9 +128,6 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.firebase:firebase-firestore:24.10.3'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'com.google.firebase:firebase-firestore:24.10.3'
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9f4197d5f..1af9e0930 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/de/dennisguse/opentracks/AboutActivity.java b/src/main/java/de/dennisguse/opentracks/AboutActivity.java
index 66776909a..bb666a0d0 100644
--- a/src/main/java/de/dennisguse/opentracks/AboutActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/AboutActivity.java
@@ -23,22 +23,22 @@ public class AboutActivity extends AbstractActivity {
 
     private AboutBinding viewBinding;
 
-//    @Override
-//    protected void onCreate(@Nullable Bundle savedInstanceState) {
-//        super.onCreate(savedInstanceState);
-//
-//        setTitle(getString(R.string.about_preference_title));
-//        //checkDBConnection("FirstName","LastName");
-//
-//        viewBinding.aboutTextDescription.setText(getString(R.string.about_description));
-//        viewBinding.aboutTextVersionName.setText(getString(R.string.about_version_name, SystemUtils.getAppVersionName(this)));
-//        viewBinding.aboutTextVersionCode.setText(getString(R.string.about_version_code, SystemUtils.getAppVersionCode(this)));
-//        viewBinding.aboutAppUrl.setText(getString(R.string.about_url, getString(R.string.app_web_url)));
-//
-//        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
-//
-//        ViewUtils.makeClickableLinks(findViewById(android.R.id.content));
-//    }
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setTitle(getString(R.string.about_preference_title));
+        //checkDBConnection("FirstName","LastName");
+
+        viewBinding.aboutTextDescription.setText(getString(R.string.about_description));
+        viewBinding.aboutTextVersionName.setText(getString(R.string.about_version_name, SystemUtils.getAppVersionName(this)));
+        viewBinding.aboutTextVersionCode.setText(getString(R.string.about_version_code, SystemUtils.getAppVersionCode(this)));
+        viewBinding.aboutAppUrl.setText(getString(R.string.about_url, getString(R.string.app_web_url)));
+
+        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
+
+        ViewUtils.makeClickableLinks(findViewById(android.R.id.content));
+    }
 
     protected View getRootView() {
         viewBinding = AboutBinding.inflate(getLayoutInflater());
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Rankings.java b/src/main/java/de/dennisguse/opentracks/data/models/Rankings.java
deleted file mode 100644
index fd1c84e90..000000000
--- a/src/main/java/de/dennisguse/opentracks/data/models/Rankings.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package de.dennisguse.opentracks.data.models;
-
-import android.graphics.Bitmap;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Model class for the Rankings displayed on a Leaderboard.
- */
-public class Rankings {
-
-    /**
-     * An array of sample Rankings.
-     */
-    public static final List<Ranking> RANKINGS = new ArrayList<Ranking>();
-
-    /**
-     * A map of sample Rankings, by rank.
-     */
-    public static final Map<Integer, Ranking> RANKING_MAP = new HashMap<Integer, Ranking>();
-
-    static {
-        // Add some sample Rankings, until we can get refresh working.
-        addItem(new Ranking(1, null, "Da bes", "Steamboat Springs",  25));
-        addItem(new Ranking(2, null, "Second place", "North California CA",  24));
-        addItem(new Ranking(3, null, "Tertiary", "Steamboat Springs, Color Red",  23));
-        addItem(new Ranking(4, null, "Quad Runner", "Montreal",  22));
-        addItem(new Ranking(5, null, "Quintuple champ", "Steamboat Springs",  21));
-        addItem(new Ranking(6, null, "Gang of Six", "Montreal",  20));
-        addItem(new Ranking(7, null, "Seven", "Steamboat Springs",  19));
-        addItem(new Ranking(8, null, "Eight", "Montreal",  18));
-        addItem(new Ranking(9, null, "Ninth", "Montreal",  17));
-        addItem(new Ranking(10, null, "DoubleDigits", "Steamboat Springs",  16));
-        addItem(new Ranking(11, null, "El e Ven", "Montreal",  15));
-        addItem(new Ranking(12, null, "Twelve", "Montreal",  14));
-        addItem(new Ranking(13, null, "XIII", "Montreal",  13));
-        addItem(new Ranking(14, null, "Four Teen", "Steamboat Springs",  12));
-        addItem(new Ranking(15, null, "Fif Teen", "Montreal",  11));
-        addItem(new Ranking(16, null, "Six Teen", "Steamboat Springs",  10));
-        addItem(new Ranking(17, null, "Seven+10", "Montreal",  9));
-        addItem(new Ranking(18, null, "Eight een", "Montreal",  8));
-        addItem(new Ranking(19, null, "Nineteen", "Steamboat Springs",  7));
-        addItem(new Ranking(20, null, "10+10", "Steamboat Springs",  6));
-        addItem(new Ranking(21, null, "Twenty-first", "Montreal",  5));
-        addItem(new Ranking(22, null, "TwoTwo", "Montreal",  4));
-        addItem(new Ranking(23, null, "TwoThree", "Steamboat Springs",  3));
-        addItem(new Ranking(24, null, "The day", "Montreal",  2));
-        addItem(new Ranking(25, null, "The saved day", "Montreal",  1));
-    }
-
-    private static void addItem(Ranking item) {
-        RANKINGS.add(item);
-        RANKING_MAP.put(item.rank, item);
-    }
-
-    /**
-     * An individual user's Ranking on a Leaderboard, designed to work with any type of Leaderboard.
-     */
-    public static class Ranking {
-        public final int rank;
-        public final Bitmap profilePicture;
-        public final String username;
-        public final String location;
-        public final double score;
-
-        public Ranking(int rank, Bitmap profilePicture, String username, String location, double score) {
-            this.rank = rank;
-            this.profilePicture = profilePicture;
-            this.username = username;
-            this.location = location;
-            this.score = score;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
index d96abc482..ee306f279 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
@@ -28,7 +28,6 @@
 import java.util.Objects;
 import java.util.UUID;
 
-import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 import de.dennisguse.opentracks.stats.TrackStatistics;
 
 /**
@@ -38,7 +37,7 @@
  * @author Rodrigo Damazio
  */
 //TODO Do not default initialize attributes; might be confusing for debugging
-public class Track implements JSONSerializable<Track> {
+public class Track {
 
     private Track.Id id;
 
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java
deleted file mode 100644
index 910d2b7e3..000000000
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListAdapter.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package de.dennisguse.opentracks.ui.leaderboard;
-
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import de.dennisguse.opentracks.data.models.Rankings.Ranking;
-import de.dennisguse.opentracks.databinding.FragmentLeaderboardListBinding;
-
-import java.util.List;
-
-/**
- * {@link RecyclerView.Adapter} that can display a {@link Ranking}.
- */
-public class LeaderboardListAdapter extends RecyclerView.Adapter<LeaderboardListAdapter.ViewHolder> {
-
-    private final List<Ranking> mValues;
-
-    public LeaderboardListAdapter(List<Ranking> rankings) {
-        mValues = rankings;
-    }
-
-    @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-
-        return new ViewHolder(FragmentLeaderboardListBinding.inflate(LayoutInflater.from(parent.getContext()), parent, false));
-
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
-        holder.mItem = mValues.get(position);
-        holder.mIdView.setText(mValues.get(position).rank);
-        holder.mContentView.setText(mValues.get(position).username);
-    }
-
-    @Override
-    public int getItemCount() {
-        return mValues.size();
-    }
-
-    public class ViewHolder extends RecyclerView.ViewHolder {
-        public final TextView mIdView;
-        public final TextView mContentView;
-        public Ranking mItem;
-
-        public ViewHolder(FragmentLeaderboardListBinding binding) {
-            super(binding.getRoot());
-            mIdView = binding.itemNumber;
-            mContentView = binding.content;
-        }
-
-        @Override
-        public String toString() {
-            return super.toString() + " '" + mContentView.getText() + "'";
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java b/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java
deleted file mode 100644
index 0e2b4fc65..000000000
--- a/src/main/java/de/dennisguse/opentracks/ui/leaderboard/LeaderboardListFragment.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package de.dennisguse.opentracks.ui.leaderboard;
-
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import de.dennisguse.opentracks.R;
-import de.dennisguse.opentracks.data.models.Rankings;
-
-/**
- * A fragment representing a list of Rankings; a Leaderboard, in other words.
- */
-public class LeaderboardListFragment extends Fragment {
-
-    // TODO: Customize parameter argument names
-    private static final String ARG_COLUMN_COUNT = "column-count";
-    // TODO: Customize parameters
-    private int mColumnCount = 1;
-
-    /**
-     * Mandatory empty constructor for the fragment manager to instantiate the
-     * fragment (e.g. upon screen orientation changes).
-     */
-    public LeaderboardListFragment() {
-    }
-
-    // TODO: Customize parameter initialization
-    @SuppressWarnings("unused")
-    public static LeaderboardListFragment newInstance(int columnCount) {
-        LeaderboardListFragment fragment = new LeaderboardListFragment();
-        Bundle args = new Bundle();
-        args.putInt(ARG_COLUMN_COUNT, columnCount);
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (getArguments() != null) {
-            mColumnCount = getArguments().getInt(ARG_COLUMN_COUNT);
-        }
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-        View view = inflater.inflate(R.layout.fragment_leaderboard_list_list, container, false);
-
-        // Set the adapter
-        if (view instanceof RecyclerView) {
-            Context context = view.getContext();
-            RecyclerView recyclerView = (RecyclerView) view;
-            if (mColumnCount <= 1) {
-                recyclerView.setLayoutManager(new LinearLayoutManager(context));
-            } else {
-                recyclerView.setLayoutManager(new GridLayoutManager(context, mColumnCount));
-            }
-            recyclerView.setAdapter(new LeaderboardListAdapter(Rankings.RANKINGS));
-        }
-        return view;
-    }
-}
\ No newline at end of file
diff --git a/src/main/res/drawable/podium.png b/src/main/res/drawable/podium.png
deleted file mode 100644
index dc6311417ee6c89bb17fe05858bb265fc8e44d30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8627
zcmeHt`9GBH+y6B)wh|gLl_-rw)-psAsv%33EQJ&*Qz%9=LWxm#neGZHH1_W7m8FQv
zG8JhV(b!rHR}_sR?n#UW-(&hb_w)UH|AFuG`Qh<;dAY9hI?m%f*7tFq$LWHr^A5R%
zDhm+=k+ZiWyCDb`9<hjw6#V%S)j0!yBxu|0J!Ie~M&=L`-WO2qylFt+BmTu~)6R^7
z!R2%tFS>geg&rAjJP?VDj5G)e4WS(jpavR*9Y35oW}$*0>WDpgt4CDUDDTvdz`)b}
z6H}4PmR!(Q);0Q~jUC{TThLF$_jdK2pY3+tvTbraQg;cj?=+y?bW+RPqtgEJtC!o{
zmDg!{c5K|A;$yQexMFvx&Y5sJTNdBBD?#`(>9o}O2NRk7-|BPgbBAYrzUu9hjXfOK
zJuzXCE8zY5ro_6CKV#E0$5x6j!YUxULj|=9r<aTep?`6DeRYcR!~c-9F5OG+T^gk{
zF5y3~DSC049f$N~v3e9(PHvkBNXY^Gga=yB#=M#qtipsz^|4r)C*{_bn8`9cZZN$T
z)X7CfE4WO>#cLfJiaZ%*V6PN_N!D3{Uxi8hKC!M*&cc$^*gZ&d&^cnmM^a{#@mk#P
zLkd(EG;T+e#>v?I_UFuiUJ-wbZ~HS+<;!9}>6Ixgs})~_nwOgvFgz|WWzf@$YJ@md
zOkFs8INexL3vtsV4%pEB`d7Rspr#~&Ktt7$YpsX4NfHN6uuU1KF43PizTm`Jax2%!
zvE30jwVbC>nO5vd`~-?m(keMjK!S#d2Uej;3sq;7B@@?`Xu-%_j%{Rk-`gBze54`O
z*M3U{Vkek-xviyMt)ij5Qgc+(5POZHN6e8B)tte{BE22Iuy%q$3G0lSJ<67ITiF-R
zk?ee=v=Hu2o2HxbF6pl^zL;La)1)hu<^>F6zXGe-un0fYzF@oEdlD>no?!Koc9gIB
zVO%$!%ke_;qcdI>&EHw6hHu<${zrbnJ;aWrgjYbiQ(spqIb-sdSAskO2X%*pw-@4+
z@d;`2tAm2{5bh;%QvjRfF#Pu1>G<@22J1wtEAG;nyy;oybSiiC8s0`(hOrVpTxPtE
zyD9W(JX_$HkWBvo(_`wewWs-u9mnr7$Lnn}%)U!#w_1~XC2Lh`5AyXKe;ASkB499@
zp}#L9!OGt<(`q`^I_U2##7=1`J~IE;kGOQM_s{k>tms|*#VIFVgQ}+u55;C$nMo$E
zZH2c0eE2C;2TkUBrv;FxQI!4e=FEJxO_=1u(P$1$kT4c28RrTLXVb9iP9Egj5@m?I
zZg!xdXj$zJN}nqb?-hUPAzhz>sL?{F91@bNG{DRfHe|$4a;2-eqe5BXBLZ5;-MWVN
z1XgtVT6|C-UAvST0}_RbW!Q=j$B#3)n@;{X$B8*49{mV@yUsLAd$=)<aZ_W!6qwRw
z!A4ukb=3UT`<B^dEOx=zDJkMZ;@eVRZ%Ec>UttMbVFj_^h21Xm?e+b2x9KwWY9I-j
z+_atH=rFwO?Pc~Bl3<3rHNRU-H<((0yM!jP#Xdg{I&34WVtl2(xtqU|nZuarkxbL&
ziPapCPcDwU0^)NEqbOZ|bv4+~!;9RDo0g(J;(FWuXy*93oBz>i1aTi-)ZRU$Fh0&S
zE2PVm1Ue)6XNUu3bgQ&`aeO^Vktd~0S8ZExsuEIi`)UwPARXmKR`rItI*_Y&<lY5Q
z_Iy>zJ9)a+DGMRIKi4fYtDrNV<gCC)u7i13B&~JSiDO7z9X)Zu+f`8k{Kak;A+44h
zB4fMFo5;75nB5JMtCbI9l5Gk2U)cHkK(|RE$`<HCAeN?MmwN3pZ)&Rhi;k3-^hsN*
z>>}Sr8l+S`&0k4u*+{Yyi?R?5R-4$;8n-74Yo`HbxvWiWkP!LsRh3fNIFf)1)*}ES
z*ec>(*sXDq*hZCgm!E-=Qkc_=#`hM`cJ{9IkD%<|W6t#047_BB12y3SzdvUgOH;vk
zY@j^DoDM-J3TT|BYPvfk7p&YRwsHkCYFX&qsew@TJ&69`VF~LIZ*uR-T2pFn^WZzS
zh9f28#(X+UK}T&{DNEAY=RC7^bIsB54_3S1?0ZvIPm>y7j=G_ltZ4U-7H*!PuQM57
zHQ-y!S*u00+aJ)KW+bVa)aCnDzn#fVKRo2(Aa!-<B{pxZe&~x++K>7^DHx<XpHhzx
zqkVOwuA_QW_U|>iZX7{CJavg<P5QZSYx>dea??sx5x-V%c3xy4*^tWG3p@(h*t~at
zGEaYr^$h#)Msz<@wDmJL=*dRRo(f(QQcEPo?FK$;Wf^PriDOR^hx=>hrn=ZKkMliP
z`s}W6BKi{r;Bwv{<GKqUz8T&B?c~))+5<Ybwd`Qag~tVK6Mkkf1?1eN|LkX@bL7FS
z7Mz0g&vhyeJ`K6p^m_+4)p9p44<6A&RGJ5d%*rMAV^zJ(5{;`e8Moes9}w%|XLP+P
zRnq$GUeV&$e#nm0*F-1wRBgfH82t1RN~qond;Pn}5m)?#7QJy|EPEn9`vW!xQ;V3H
zk{Z3ul2igP?f%38`oqe``~smQ)qK1gDwFx85elYVoj9-t<rUEEND&*T2Pm<3=!?5v
zVe|TInl`YtCPrd|!bGZ3zLdFreD%_+lGgPXnQfR5$Khn1aUA-EBeI3zwm-QTk94LP
z!8ESKP#Ux9vP>AWpwAoWtZ{dgPS&AWq1gr7i!F1ou3^LhnTP#H(>u#E85%}{y#;5B
zS2`n|MJ5F}yVUp6W(9Pau4ZhW<(4`K?*nZ~%tvYRH%@vXomv1KS(}lTYyWyJigPn(
zcs!6!m(LS_En1Z(ukJavwE$PVl7LLUz^coAjsLfoSAJa{VS30&N4f*ZGgS}bD#$Ws
z=mxwtmV?T9(5ezCHf0I7qk~`w<$Le~Y({56D&=3_#f;_%jFZZEU4{#iv@YAGl+(pN
zZA5bf-Onl^lfe^1KlJ<o%iRL|28YTmH~qG1BxC-9ru)d#HooO-n6?^ua=g|1>~oF_
zw%j0lduh`}o~X-ImLYYO6^7aGXP#h8`~I3U1?tX3Ewny+k=em;2P;#)5Yb&Mp@6&9
zW0e-7;!DXne-#OG*(a|$JXC(e3o%~k$f(+3aO2mf@6mB`&#-xKys-J2LhSf;PThU*
zWUDyn9N2tNOKGx(eUK#B0XB~%AeRkDF3pPS$G#7;m5c<>xLZ4=WEp=}NZ8f<jYrq9
z9+c1*S3kw(9nixlBHwX2S6GdDYUE>JCT&NC%9H^rgdF9o2Pa8dHv|6_4#UZ|KhrqA
zxqX+N&Vg79SVD6>OmItxksuX(f2?nz*HuM)5w2W6d%KDqR_pN4W(VmjdPs(<BSWWJ
z((J{mpKm;1o_!kPIh4+Z={EqR?f}7UW)yBbgS#oezG^{~4<)vWzBp(v0ddOEv?fg{
zp)Xj%5}+LQMvSA=kk-ygwh~G31V*weks|~>Oa|*Kqa|=C-BJ3=35cwB6%t3*Zfu|Z
ztG}S&tlgu*%M9ZcETIp284UC&TzULM=v)R)mO;@Z`JL6Y?w~K{4b4MM$}gxuj+_8)
zd5(;OMuN>S*D(;&uIG(4UY#qwGMm+tCQlq)025y+<}H{urXGcqHD^{8fdbVw3!>cl
zs=?eAe#3CwLB2ZoI4F9GB@EWXsPsHwyBpEKlHB9oh=-&j!}f<I%3=v$!J72}7*`XZ
zdF;&=kOWYB^XmgKuAVT`zSl@lz#nz@gcVEgX=B15qCBG`C=GX^WVt}BmMY`JurVFo
zeRk+4PRtIzx?8^<QVJ$J6(CD>qcqfj5oG`t+Z6Kxr!}eDD6z#bqD??d9xLW;srYY0
z+rh|F#XQaF1>>JMA`cL=T@ML%AlEIQ9^`H^w(sfSy`K_Wdjn)4xbnn+IU3Fqeuj}s
z7+K@UxL=8h0%Q1?GmY1VN#p}kkNlm+-Q>~h$qsuYyk!H~U&Wj@8oyOQD`vj>VkwL(
zqAxCy&_aTF^^Vf6_;e)cxM0sKSamnKR~Bliyz;~Zr>+bXT_elz`PmM+%$Wt4ae%B1
zBrs0!$^klz;nPra+^D$)@u$ApHk}vPytGZ2BRvi5kFZhD1Zc`<njy6=d{v#79Y}D7
zr1hPX>lZ_yY8y&;biiV%!}Fgdtet?TXU=@O5@G_0wA&l`1Y?34q%(`@h3Q4U`I%q*
z^HD+#ZuhM$q}XQ1z)*RjJ7NOpN!T>kvwOdE9tBn+$};XB$Nu-@U8LBXfK)#}g&fg!
z!4!MP%33>JV4h`sPk(*G{sE0LS4)=(Itpe{X_<eYQ-tXht9cO9{u8810XZi`jrWHm
z{`DM=%^Tf>alHzkY{}m)=KieG==me#5XRMUOraM{<n;RE#pBv05cg?ObAFreDVo)Z
znZxo;g8BE#F1TVid{j4K^Y%?_vo>h~GB2b`7uHslWn?VICtxEXU9W;6S|Rb3V`qBC
z#BK(8pq`AWR$N!KZ>@k21cXN@$GN(L80V&t_G1&qjEn;q*Gb}mIP^J$Ni;+e$Uv}=
z>3JBMS%h>h>0i=?ZJQ5S2WDFb60imHK7V@R!;849f5#103-Qq@LV^LAJufnmm2Tz<
zl&4>j&PB3};K*fEYyRR4IfxMWTrCha{`>>{16cJwdd}|@>`pTvZ$|Zy_eu#nni{~}
z2SLUY1Z4C=DjWY_uRi$j!)RXt?Z^oWxxBSrhzH4P_PbA-{Q7|XGR42&W!Z_b7||xG
zAzH#t4IJE=0&6_R=4E&zp_R*{6sY~2m|c|E&7?NmN~CVtTQ6f?l^MoW39^heg)lN1
z_u_9F3Gz90CqKkpXJwKEZC?yxHp|t9i<nnw9(;tmjM(8GU+O~sw!MZmy2spc^<IVo
zw!Dp_n>MopA8v|zplk9zmp|o^Nb@(qXLinr$E}-3XaX117k$hUK00+*h&wb?%@Qi2
z@fU}KQhPAPCkaSbX|rH{UU|BU6LXRhdn_zRn^ex>6ybK@;(8n(MuQiB6BP*NSK(IX
zumBkM%)|_E>a<C#<SZ6U2j{kJ2?q;|02bXMtVQN=X6B^aYb-yNzpYuq4G(*M2(4v@
zpJfA^{Sw7GHcgT7kJ4f5?t&?Q#c4}3iz0uMu3I#H5M?Vaw;ktkd_B$oFoyUoy;qx3
z|Ll8p-1*SK`48N!2ywuGeTy;49+hob{v@6yOai}bpIE{Ork8UuCx1qxZ#glY9&m8r
zhyo}%+ompGq<v{P>7@h_8w^?=nFp%l8^)VBzL~6CZ8gdsBf$tKMt*$#!>@|L;QlV~
z!<+JJ@)hZGE4|WLNzXZr25OWNBS8u$#$wzHy;valf#z{B`Kv+Gn-2(#a_+2k+fyS!
zxkG|?8Ar5cTn6=Ko65GlTk-3fyt*9Vhf3?{%kEc<!&rq@j^OSYUD`cCF2BKL-U$75
zPD8)t<v+~YQspbie$qKOi}fU{>#XX1<Q<ebBB>vvDqn}64*F;(4$)Ey#x=r-hNDLF
zRiW(g<RZp$S;L*R6Jds=xGYvVCQ)MU%-EiVMPpj92iXpou{+m5&0niQPGre*5zG~d
zw{PuljcD5`b0O$swq${z_k80zHER`si0TZk4SmIz&@>vE(y*Bn=WXs9#EK50SV~Uo
z7e>Dv`oMa}4O>;b74Sc3V)6ku7u|?8l$LMfL<SBSE*xfMaYRQcb8D%pyyj&0i3w2b
zMzpTKcnd8ZBl$M+)AqPkQ7gvFI9VMwVKz2RmTXx@2V?uo!jIQEB0o5xp9QoF4jc+(
zvou!zoj{*@W~E2!9~){sY$Pb;#F$bg#(mK9+jd!^L*;M^aqS`=@I$xLHHL18G{%eA
zQ2YilNgdai(?xU}^xP%WW+9&1$f-M#KWN_!nOYD15RvA1RZi}V6xxrAOJVg)iF$pQ
z%sW$yqs$lMR*gxrgnjWztDVkBT041V`Nb-X_pZzt(_(wGKad2{TP$+Z)QR0lnB?3$
z#3h%lYeeI?+q&%njM5~=CWQLVCkKjzZ44`1-w3ldiy39H5AXGQ{`}^9%cJ&F8XAj+
zuTlUAhK|yzg^uykcYjs>O+ZQPgm@ZB@bIJ3$bE9tLi8Pb1*7ZKghxMi|8<th?4`=8
zHNan=D34t!sftr|h%BGU<(_`usAy(IYTRRR<AfG5)Fm>qd1=LArTCEeIBC(2?``6O
zv&M5Zaizo5phMfCmR~Y!sFGAXFI&1lmt~rm>6$^1W#o_OHOxh;QxBsEs?%7qng_Kk
zC0{C9%i2Cg<q#%$O$qq<fBsQdT%nmvWwwvMT7{HXb(E^BQMyzlt|DNfc3CY_yPj0D
z#7R?mG0WThtZ@eOt%8?A7FN~QEU_>^gDOScO$pUevsJk$Y2C_X4l+pbT?O}!q?BQt
zUvmVovwMb`Af@~1&bZf4Tm2s0S1~grI$vaJ!;B0i#PisMZR|$sHojg)DvhDkVQS|I
zN7dj+ozS`WG_CeKY9&4Zu6LR@%?ps02R?}siBlO!7o65~^vixWs<sJ3zWd@-KiA+q
zG@xGZ{u(am>D%j6la@aM!5cv^6~1Hi3-(xT#NMj&P7a1{m5I;A%*GkodR|6KDU`v>
z-Kp|<BejJdYEZqZ3h9Vvi%G!<MDk5fI9ZsNt@DJ!t0JV_X?OrMjgomI<UcO@)W6yp
zrd?19r}Y025B~p(qN=-e#Qx?3>@+g&jkd7m*q5!bA@MDGE2j*VUAa+2lH=iIIEopJ
z?Cq7Qlb*Jw?613K#bj=ecaQJK9bg~5m%?fwl>RAc-BpS7ep5vGtmx+Bb7sU?wWy^P
zg*_f5*h3$yld>-D$i*f3jtwa!vzB6Z;N}Z!JW|#^4MFlB9+k?;WUcx#_`--LJ6?pZ
zTs8j8GRK{34Ck`0py?%Sig<&5Wp$1Pv2VfcRRa%(q5oNW85RtxLKZy~;=};Zh<rV7
z{_Gl5mlaU{I{Y!qVg&s<#6-jZ_jCD-m-|7n5HhYAHE(_wIdkgRvX&HMJuRfvdAky0
zm+AZ+;=pQlf5+P`SlA<Ngf3LH&hLu9hv9PRw6Fc_U1(Lh9~JaJn_m}o^k1D+qjRmR
z9`-9I8y|$;r)A+?;aN%Rj4g0*R&akWdW=<X&FROwM(BtL?9PpGc`tjSYeWQwIAAmG
z+lS7j47EZ3EIqR^|1oq*gN_T*jkU$yI`|?5-KfImRzI#bbY$qYLPr(QHbcrZ&i*Ed
z@%aG^WJ6!;RjZ#H9-7&z@BxrI->6rlsT_z&el|R0C~jpN8^DLF{xC2&WEf<$+u*a`
zpZ|^s>wS%#n&jB$n+Fe|So8^}*Uh*~1gm9Sd)_<ga&kvgEc+z71Vt;i1^vAddl)$!
zI8?|DxNrKnzoh)QAQ$~=QOvo-U7l|_dKV!#g|k`gkzGnb&i|mqyY8lqg*v8j*L%NO
zfHcAPo|+(UHp!VOn8uCv1*3ILGkszVt#?;7m_YcbOTvF*tr#{c$r-l*HfWK<*KCch
zxD+n1&?Q-UnLl@3`?q-#G|htV%}Ssiy`pLhz>-xF&gIcyxj0i7gfJ{>!ySF#QznsU
zc-o0AVadvInKHljdPDJoy4N?MM!qLgLhIkpAGa7TuaA_Ydb|jeUeb3xR!Wt{>R)#~
zU<r7!?|u%}D+$n~G9z?L^~i0)#yESyQo5!;F1F2Y_MOaaorrsRXL5I%;t~!GP06ao
zd59zB!^s3I)3`~#|HFu`jJE2#V8TXadd*boO!vUU885gZsPfSLGB#>Bd8avIQpm-u
z2`bs$K3kmBSwraQiUg?6FMxKEwtkr|6qt8j@mBm>0kvgof}Wh1-k@&(>V(~I7T{_t
zK!tm77cnDv{+kPQGUMjNcMw$`Tc>10-M%~U%)9ntlAi9xI0}ZK8`$Q6DzsSmlP#h-
zgZ8BfN{C$H;|0j2X&M_pu>^g}ihgt>srure>0}?YkE_G6>XTpP*_$;Ew6_w8i8#we
z-!^{=UjzLq^~vvMXy*;c!9;1xKfq)4=sMu_#vR$K30<t5j^V4eO(X{GOPT2x`OcqT
zEmQ!z#c32EK|Mjv>TcmPzGO*>G(Q}jOR4g8MvRwPvHHHnpark$*RLnaOZM4E1_wwt
zydI>2p8$l<N2*c-$#u~Fd)R69C-aeQ(+7s`yXGN7`&V#0Iy-Td?|e+kQaWbQv<1&a
zCTw>3$L)lq9bBI0xT)8Z+WwwsRj4rl1yY00jOG1?!*@P_5MAi6Um@>>yX|8k@*bPv
zAxFI|45SPY0}e;OW-@_*$UVCpqzW=zKY(E}XJNa%j{W%D;1TnGf`8wv<G&I4V7z)4
zjqLP~fI@dWgmD#a6|!fy!;MP*@^?eJH-<kBmGkz>W!2m&*Vqj0K+z%d-+}~SE25OF
zR+!zO6Ix$yqMK?x63*8+BWr>zogw94(XbzQfAuZ^!L>TVr_GaY{*dqwe?4#UaOzml
zCPlN@uO^uPD}%N-LfG@mFL78@JynKDe93Xj!6xVP_x=;X&={ls*Sbq$viG#}J~e+A
z-ZESf?<rpJeK#DSW7QVju14&*Rd;mNtUY}IdGdqyx|=gftDa%i?K|$5Lj8OZ0@MT0
zEq$T`<??Y<#Ee-?cFV`Fx5b|N4=<N+D>lF&z<rpX_&#j6$?=``Tf|rnidMA%yo&Aw
zeY&1<5_WDwVf!>%u65o-psCZfj&!prT;s25lX^+7RMv_XGcU60qN9103X97QcNLb*
z;~Z0cFj+<e6V8vP<b!@@AxGB79#H98ixzY0D9_K5n}X5f{*9}XNH#$Kj9}OmV1;s+
z%Z^_4v6x~R1IU_y5R+!|Q9MT5{KMuAYdoQ-sa(?NAS#+|Ahq!Y_8J2c=+TE$m)1VW
z@mvA-B>S*tn~Bb&gLG@UbHPNbU+EP{=4UQDo3j<N>Uw2yOP7kWFC2_xPu`vZuZ%>f
zQlrUrrzd!`n$Ydg7#OAR`SnQXm<l-fc=|$++kIpyb}6#7gZKRK(}CPOJ{H~WypLh}
zv1V`Mzj{|gFK>NAK<Qes@M(tjZfEt7lr<*LAtL_w@juB9yAf09(Cei7?kNkJY@NLQ
zzPAGV*46x6smJks4+^_Xd+r6_gTvE}>GLHSwK<-da=MI*jzzAi4rRJMRWm~;cONs@
zkMaF~C(yRG?~|#;nAK93bsf~G&>_`agGNJbVV9Pe8{Vt>KxJ{8cDAkOrnWO*sR)8u
zBmQ52o1K}Oj1ZqKv@N$b9zHab_IxMtfEDCG1m7d0K7?@-nyxPvgOE*PA?phFAbNzU
z7uJN!1rHq2Pu#FHG-J1+Z(C{Wo$ep4kys8#5Z~cg;HK>Ccl)M2)hWafvLJKs9scvW
z0#{oyau}zzM5Zu$v$WZUntiTHXhye@m_V)j$DLSN{|N<WiTz18*XlcQ@1(z|_dXNi
zbBY7&emm~eQq~<sR+Y}Wur&KfPuY#lxyGyw{IS}?h!x_+LwkN0$RfQlpZT!y5y_W^
zR$dtku|Mqe5nHn5V@9{L*o2yQ_&fq5bG~5Ac1cKl1Y5<wYara(aF<D-X*=(aLpYwk
ty&+<tC#?TsSzDO-8BCm3UpQ}dVdcw*A-r9!@DCP<y^S-uY@7d?{{yfY|6%|D

diff --git a/src/main/res/layout/fragment_leaderboard_list.xml b/src/main/res/layout/fragment_leaderboard_list.xml
deleted file mode 100644
index 18775687a..000000000
--- a/src/main/res/layout/fragment_leaderboard_list.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal">
-
-    <TextView
-        android:id="@+id/item_number"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-
-    <TextView
-        android:id="@+id/content"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="@dimen/text_margin"
-        android:textAppearance="?attr/textAppearanceListItem" />
-</LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment_leaderboard_list_list.xml b/src/main/res/layout/fragment_leaderboard_list_list.xml
deleted file mode 100644
index 5a11af814..000000000
--- a/src/main/res/layout/fragment_leaderboard_list_list.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/list"
-    android:name="de.dennisguse.opentracks.ui.leaderboard.LeaderboardListFragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginLeft="16dp"
-    android:layout_marginRight="16dp"
-    app:layoutManager="LinearLayoutManager"
-    tools:context=".ui.leaderboard.LeaderboardListFragment"
-    tools:listitem="@layout/fragment_leaderboard_list" />
\ No newline at end of file

From ddeb9330bfdf7b3e137065ac7996ae35e434a641 Mon Sep 17 00:00:00 2001
From: Jean Robatto <robatto.jeanmarie@gmail.com>
Date: Sun, 31 Mar 2024 02:03:25 -0400
Subject: [PATCH 32/76] Fixed CRUD logic

---
 src/main/java/de/dennisguse/opentracks/data/models/Track.java   | 2 +-
 .../java/de/dennisguse/opentracks/stats/TrackStatistics.java    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
index ee306f279..3e88ba345 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
@@ -46,7 +46,7 @@ public class Track {
     private UUID uuid = UUID.randomUUID();
 
     private String name = "";
-    private String description = "";
+    String description = "";
     private String activityTypeLocalized = "";
 
     private ActivityType activityType;
diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
index f76a9c125..e4bf88ae4 100644
--- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
@@ -20,6 +20,8 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
+import com.google.gson.annotations.Expose;
+
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;

From c8f3c5bb8d55c8365b1ff6e0652db6ba6529ea84 Mon Sep 17 00:00:00 2001
From: Jean Robatto <robatto.jeanmarie@gmail.com>
Date: Sun, 31 Mar 2024 02:17:20 -0400
Subject: [PATCH 33/76] clean up

---
 src/main/java/de/dennisguse/opentracks/data/models/Track.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
index 3e88ba345..ee306f279 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
@@ -46,7 +46,7 @@ public class Track {
     private UUID uuid = UUID.randomUUID();
 
     private String name = "";
-    String description = "";
+    private String description = "";
     private String activityTypeLocalized = "";
 
     private ActivityType activityType;

From 436264c87d554c1895cf0db758f80fbca463ac14 Mon Sep 17 00:00:00 2001
From: Jean Robatto <robatto.jeanmarie@gmail.com>
Date: Sun, 31 Mar 2024 02:18:41 -0400
Subject: [PATCH 34/76] clean up 2

---
 .../java/de/dennisguse/opentracks/stats/TrackStatistics.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
index e4bf88ae4..f76a9c125 100644
--- a/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
+++ b/src/main/java/de/dennisguse/opentracks/stats/TrackStatistics.java
@@ -20,8 +20,6 @@
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 
-import com.google.gson.annotations.Expose;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;

From 69b5cade7e583c3edf085a9472f7866e41887c3c Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 15:00:27 -0400
Subject: [PATCH 35/76] Button fixed

---
 .../de/dennisguse/opentracks/SeasonalActivityPerSeason.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
index 2ff239e32..222e7dc0d 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
@@ -33,7 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
             changeTitle(data.getString("seasonTitle"));
         }
 
-        TextView distanceTraveledTextView = findViewById(R.id.distanceTraveled);
+        TextView distanceTraveledTextView = findViewById(R.id.LifeTime_button);
         TextView totalTimeTextView = findViewById(R.id.totalTime);
         TextView averageSpeedTextView = findViewById(R.id.avgSpeed);
         TextView maxSpeedTextView = findViewById(R.id.maxSpeed);

From 1489544e58d0edd6dadcd8a000b86518bfd970a1 Mon Sep 17 00:00:00 2001
From: Jean Robatto <robatto.jeanmarie@gmail.com>
Date: Fri, 5 Apr 2024 15:10:19 -0400
Subject: [PATCH 36/76] Added custom adapters for Duration and Instant

---
 .../java/de/dennisguse/opentracks/TrackStoppedActivity.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
index ff37bfad4..b0b9cca93 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -11,6 +11,8 @@
 
 import java.util.UUID;
 
+import java.util.UUID;
+
 import de.dennisguse.opentracks.data.ContentProviderUtils;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 import de.dennisguse.opentracks.data.models.ActivityType;
@@ -134,6 +136,10 @@ private void storeTrackMetaData(ContentProviderUtils contentProviderUtils, Track
         //NOTE - The UI should be augmented to display success/failure to the user
         FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
 
+        //Save run on the external DB
+        //NOTE - The UI should be augmented to display success/failure to the user
+        FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
+
         TrackUtils.updateTrack(TrackStoppedActivity.this, track, viewBinding.trackEditName.getText().toString(),
                 viewBinding.trackEditActivityType.getText().toString(), viewBinding.trackEditDescription.getText().toString(),
                 contentProviderUtils);

From dd18b0c74ab89fa9e3ffc93133d6f4521732d2e6 Mon Sep 17 00:00:00 2001
From: tinatsl <91174232+tinatsl@users.noreply.github.com>
Date: Sun, 7 Apr 2024 15:50:07 -0400
Subject: [PATCH 37/76] default constructor UserModel.java

---
 .../dennisguse/opentracks/data/models/UserModel.java | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index f2e5432c8..c8a29eabb 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -25,6 +25,18 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
+    // Empty constructor
+    public UserModel() {
+        this.nickname = "";
+        this.country = "";
+        this.dateOfBirth = 0;
+        this.gender = "";
+        this.height = 0;
+        this.weight = 0;
+        this.socialAllow = false;
+        this.profilePicURL = "";
+    }
+
     private static final String SHARED_PREFS_NAME = "UserPrefs";
     private static final String PREF_SOCIAL_ALLOW = "socialAllow";
     private transient Context context;

From 461aef6b7659e3e777e8e120863a224fa3680ea7 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Sun, 7 Apr 2024 16:09:29 -0400
Subject: [PATCH 38/76] starting implementation of user to db

---
 .../de/dennisguse/opentracks/data/models/UserModel.java    | 3 +++
 .../opentracks/settings/UserProfileFragment.java           | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index c8a29eabb..cff8e1267 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -1,6 +1,9 @@
 package de.dennisguse.opentracks.data.models;
 import android.content.Context;
 import android.content.SharedPreferences;
+import com.google.gson.JsonObject;
+
+import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 275933758..ea0240f19 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -63,6 +63,13 @@
 import de.dennisguse.opentracks.data.models.UserModel;
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
+import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
+import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
+import de.dennisguse.opentracks.data.adapters.FireStoreAdapter;
+
+import de.dennisguse.opentracks.data.models.UserModel;
+
+
 import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 import de.dennisguse.opentracks.data.interfaces.ReadCallback;

From 3102451c6b8476ce9bcc56ec6cd6ae916f8dff28 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Mon, 8 Apr 2024 13:49:16 -0400
Subject: [PATCH 39/76] implement saving and uploading to the db.

---
 .../opentracks/data/models/UserModel.java       | 17 +++++++++++++++++
 .../settings/UserProfileFragment.java           | 13 +++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index cff8e1267..6a67019d7 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -1,8 +1,15 @@
 package de.dennisguse.opentracks.data.models;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import android.content.Context;
 import android.content.SharedPreferences;
 import com.google.gson.JsonObject;
 
+import java.time.Duration;
+import java.time.Instant;
+
+import de.dennisguse.opentracks.data.adapters.Gson_DurationTypeAdapter;
+import de.dennisguse.opentracks.data.adapters.Gson_InstantTypeAdapter;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -84,6 +91,16 @@ public UserModel(String nickname, String country, long dateOfBirth, String gende
         this.profilePicURL = profilePicURL;
     }
 
+    public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight) {
+
+        this.nickname = nickname;
+        this.country = country;
+        this.dateOfBirth = dateOfBirth;
+        this.gender = gender;
+        this.height = height;
+        this.weight = weight;
+    }
+
 
     public void setContext(Context context) {
         this.context = context.getApplicationContext();
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index ea0240f19..f19e821d0 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -5,6 +5,7 @@
 
 import android.app.AlertDialog;
 import android.app.Activity;
+import android.os.Build;
 import android.content.ContextWrapper;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -13,6 +14,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.net.Uri;
+import android.provider.Settings;
 import android.provider.MediaStore;
 import android.provider.Settings;
 import android.util.Log;
@@ -65,7 +67,12 @@
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
+import de.dennisguse.opentracks.data.interfaces.ReadCallback;
+import de.dennisguse.opentracks.data.interfaces.ActionCallback;
 import de.dennisguse.opentracks.data.adapters.FireStoreAdapter;
+import de.dennisguse.opentracks.data.models.CRUDConstants;
+
+
 
 import de.dennisguse.opentracks.data.models.UserModel;
 
@@ -568,6 +575,12 @@ private void displayCustomSharingDialog(){
     }
 
     @Override
+
+    // TODO: Implement saving logic here.
+    private void saveProfileData(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
+
+    }
+    //TODO: fix this
     public void onStart() {
         super.onStart();
         ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_ui_title);

From c300d8c3ca5d87aaa9bf9c388f50fea7048fda3c Mon Sep 17 00:00:00 2001
From: tinatsl <v_tsilin@live.concordia.ca>
Date: Sun, 7 Apr 2024 21:16:02 -0400
Subject: [PATCH 40/76] annotated user model

---
 .../opentracks/data/models/UserModel.java     | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index 6a67019d7..f801ac572 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -35,8 +35,10 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
-    // Empty constructor
+    // Default Constructor
+
     public UserModel() {
+
         this.nickname = "";
         this.country = "";
         this.dateOfBirth = 0;
@@ -47,6 +49,20 @@ public UserModel() {
         this.profilePicURL = "";
     }
 
+    // Constructor
+
+    /**
+     * Constructs a new Car object with the given make, model, and year.
+     *
+     * @param nickname The nickname / username.
+     * @param country The country of user / not based on tracking.
+     * @param dateOfBirth The DOB.
+     * @param gender User gender.
+     * @param height User height unit default.
+     * @param weight User weight unit default.
+     * @param socialAllow Flags permission to share on leaderboard
+     * @param profilePicURL Stores path to blob.
+     */
     private static final String SHARED_PREFS_NAME = "UserPrefs";
     private static final String PREF_SOCIAL_ALLOW = "socialAllow";
     private transient Context context;
@@ -91,6 +107,8 @@ public UserModel(String nickname, String country, long dateOfBirth, String gende
         this.profilePicURL = profilePicURL;
     }
 
+    // Methods
+
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight) {
 
         this.nickname = nickname;

From f53483e9542cc425916cc3f17c94c87a3b432bfa Mon Sep 17 00:00:00 2001
From: mobeenulhaq <raomobeen@hotmail.co.uk>
Date: Mon, 8 Apr 2024 16:06:16 -0400
Subject: [PATCH 41/76] Issue 41: Toggle switch initial

---
 .../opentracks/settings/SkiProfileFragment.java        | 10 ++++++++++
 src/main/res/xml/settings_ski_profile.xml              |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
index 081674176..25374ecc8 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
@@ -14,6 +14,7 @@
 
 import androidx.preference.PreferenceFragmentCompat; // Assuming you're using this
 import androidx.fragment.app.DialogFragment;
+import androidx.preference.SwitchPreferenceCompat;
 
 public class SkiProfileFragment extends PreferenceFragmentCompat {
 
@@ -29,6 +30,15 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
              return true;
          });
        }
+
+        SwitchPreferenceCompat leaderboardParticipationPref = findPreference("leaderboard_participation");
+        if (leaderboardParticipationPref != null) {
+            leaderboardParticipationPref.setOnPreferenceChangeListener((preference, newValue) -> {
+                boolean optedIn = (Boolean) newValue;
+                // function call for confirmatory pop-up here
+                return true;
+            });
+        }
     }
 
     private void showEditSharingPreferencesDialog() {
diff --git a/src/main/res/xml/settings_ski_profile.xml b/src/main/res/xml/settings_ski_profile.xml
index 42987593e..5bbd6c0f1 100644
--- a/src/main/res/xml/settings_ski_profile.xml
+++ b/src/main/res/xml/settings_ski_profile.xml
@@ -15,4 +15,10 @@
         android:entryValues="@array/sharing_location_values"
         android:entries="@array/sharing_location_entries" />
 
+    <SwitchPreferenceCompat
+        android:key="leaderboard_participation"
+        android:title="Participate In Leaderboard"
+        android:summary="Toggle leaderboard participation"
+        android:defaultValue="false" />
+
 </androidx.preference.PreferenceScreen>

From 8e9244062a8fd14b0e95d285ada7b955e810b116 Mon Sep 17 00:00:00 2001
From: abhex10 <86022987+abhex10@users.noreply.github.com>
Date: Mon, 8 Apr 2024 16:27:21 -0400
Subject: [PATCH 42/76] Group 4: Add an option in the Ski Profile section of
 settings for the user to choose their type of skiing

---
 src/main/res/values/settings.xml          | 16 ++++++++++++++++
 src/main/res/values/strings.xml           |  7 ++++++-
 src/main/res/xml/settings_ski_profile.xml | 11 ++++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index fc116b292..3d21fe054 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -430,4 +430,20 @@
 
     <string name="prefs_last_version_key" translatable="false">lastVersionKey</string>
 
+    <string name="skiing_type_key" translatable="false">skiingType</string>
+    <string name="skiing_type_default" translatable="false">@string/skiing_type_value_1</string>
+    <string name="skiing_type_value_1" translatable="false">1</string>
+    <string name="skiing_type_value_2" translatable="false">2</string>
+    <string name="skiing_type_value_3" translatable="false">3</string>
+    <string-array name="skiing_type_values">
+        <item>@string/skiing_type_value_1</item>
+        <item>@string/skiing_type_value_2</item>
+        <item>@string/skiing_type_value_3</item>
+    </string-array>
+    <string-array name="skiing_type_options">
+        <item>@string/settings_skiing_type_option_1</item>
+        <item>@string/settings_skiing_type_option_2</item>
+        <item>@string/settings_skiing_type_option_3</item>
+    </string-array>
+
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8a63ae12f..48eca0507 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -852,5 +852,10 @@ limitations under the License.
     <string name="title_activity_leaderboard">LeaderboardActivity</string>
     <string name="tab_text_1">Tab 1</string>
     <string name="tab_text_2">Tab 2</string>
-    <string name="calculate_moving_average">Moving Average</string>
+    <string name="calculate_moving_average">Moving Average</string>\
+
+    <string name="settings_skiing_type_title">Type of Skiing</string>
+    <string name="settings_skiing_type_option_1">Downhill</string>
+    <string name="settings_skiing_type_option_2">Touring</string>
+    <string name="settings_skiing_type_option_3">Snowpark</string>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/xml/settings_ski_profile.xml b/src/main/res/xml/settings_ski_profile.xml
index 42987593e..c09d94081 100644
--- a/src/main/res/xml/settings_ski_profile.xml
+++ b/src/main/res/xml/settings_ski_profile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <SwitchPreferenceCompat
@@ -15,4 +16,12 @@
         android:entryValues="@array/sharing_location_values"
         android:entries="@array/sharing_location_entries" />
 
+    <ListPreference
+        android:key="@string/skiing_type_key"
+        android:title="@string/settings_skiing_type_title"
+        android:defaultValue="@string/skiing_type_default"
+        android:entries="@array/skiing_type_options"
+        android:entryValues="@array/skiing_type_values"
+        app:useSimpleSummaryProvider="true" />
+
 </androidx.preference.PreferenceScreen>

From cddf6fb1110f57f49cdcab2d712adba7285eb070 Mon Sep 17 00:00:00 2001
From: MAX96811 <maxmaxarseneau@gmail.com>
Date: Mon, 8 Apr 2024 17:59:32 -0400
Subject: [PATCH 43/76] Shows terms and condition when Activating participate
 in Leaderboard toggle

---
 .../settings/SkiProfileFragment.java          | 93 +++++++++++++++----
 src/main/res/xml/settings_ski_profile.xml     |  3 +-
 2 files changed, 76 insertions(+), 20 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
index 25374ecc8..34a92652f 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
@@ -1,46 +1,101 @@
 package de.dennisguse.opentracks.settings;
-import androidx.preference.Preference;
-import androidx.preference.ListPreference;
-import android.os.Bundle;
-import androidx.preference.PreferenceFragmentCompat;
-import de.dennisguse.opentracks.R;
+
 import android.app.AlertDialog;
+import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.RadioButton;
 import android.widget.RadioGroup;
-import android.widget.TextView;
 
-import androidx.preference.PreferenceFragmentCompat; // Assuming you're using this
-import androidx.fragment.app.DialogFragment;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceManager;
 import androidx.preference.SwitchPreferenceCompat;
+import de.dennisguse.opentracks.R;
 
 public class SkiProfileFragment extends PreferenceFragmentCompat {
+    private static final String PREF_LEADERBOARD_TERMS_ACCEPTED = "leaderboard_terms_accepted";
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.settings_ski_profile);
 
-        Preference sharingPref =(ListPreference) findPreference("sharing_location");
-
-       if(sharingPref != null){
-         sharingPref.setOnPreferenceClickListener(preference -> {
-             showEditSharingPreferencesDialog();
-             return true;
-         });
-       }
+        // Handle Sharing Location preference click
+        Preference sharingPref = findPreference("sharing_location");
+        if (sharingPref != null) {
+            sharingPref.setOnPreferenceClickListener(preference -> {
+                showEditSharingPreferencesDialog();
+                return true;
+            });
+        }
 
+        // Handle Leaderboard Participation preference change
         SwitchPreferenceCompat leaderboardParticipationPref = findPreference("leaderboard_participation");
         if (leaderboardParticipationPref != null) {
             leaderboardParticipationPref.setOnPreferenceChangeListener((preference, newValue) -> {
                 boolean optedIn = (Boolean) newValue;
-                // function call for confirmatory pop-up here
-                return true;
+                if (optedIn && !getTermsAccepted()) {
+                    showTermsAndConditionsDialog();
+                    return false; // Do not toggle yet
+                }
+                return true; // Toggle as usual
             });
         }
     }
 
+    private boolean getTermsAccepted() {
+        // Check if the terms have already been accepted
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+        return prefs.getBoolean(PREF_LEADERBOARD_TERMS_ACCEPTED, false);
+    }
+
+    private void setTermsAccepted(boolean accepted) {
+        // Save the acceptance of the terms in the preferences
+        SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(getContext()).edit();
+        editor.putBoolean(PREF_LEADERBOARD_TERMS_ACCEPTED, accepted);
+        editor.apply();
+    }
+
+    private void showTermsAndConditionsDialog() {
+        // Show an AlertDialog for the Terms and Conditions
+        new AlertDialog.Builder(getContext())
+                .setMessage("Terms and Conditions for Participating in the Leaderboard.\n" +
+                        "\n" +
+                        "Welcome to our app's leaderboard participation feature! Before you proceed, please take a moment to review and accept the following terms and conditions:\n" +
+                        "\n" +
+                        "Eligibility: Participation in the leaderboard is voluntary and open to all registered users of the app who are 18 years of age or older. By opting into the leaderboard, you confirm that you meet these eligibility requirements.\n" +
+                        "\n" +
+                        "Data Usage: By participating in the leaderboard, you agree to the collection and use of your activity data (such as scores, achievements, and ranks) for the purpose of displaying your standing on the leaderboard. Your profile name and scores will be visible to other users.\n" +
+                        "\n" +
+                        "Privacy: We are committed to protecting your privacy. Other than the information shared on the leaderboard (as described above), no other personal data will be disclosed without your explicit consent. Please refer to our Privacy Policy for more details.\n" +
+                        "\n" +
+                        "Changes and Termination: We reserve the right to modify these terms, the criteria for ranking on the leaderboard, or terminate the leaderboard feature at any time without prior notice. Continued participation in the leaderboard after any such changes constitutes your acceptance of the new terms.\n" +
+                        "\n" +
+                        "Liability: We shall not be liable for any damages or losses arising from your participation in the leaderboard, to the fullest extent permitted by law.\n" +
+                        "\n" +
+                        "Acceptance: By toggling the \"Participate In Leaderboard\" switch to ON, you acknowledge that you have read, understood, and agree to be bound by these Terms and Conditions.")
+                .setPositiveButton("Accept", (dialogInterface, i) -> {
+                    // User accepted the terms
+                    setTermsAccepted(true);
+                    updateLeaderboardParticipationPreference(true);
+                })
+                .setNegativeButton("Decline", (dialogInterface, i) -> {
+                    // User declined the terms
+                    dialogInterface.dismiss();
+                    updateLeaderboardParticipationPreference(false);
+                })
+                .create()
+                .show();
+    }
+
+    private void updateLeaderboardParticipationPreference(boolean participate) {
+        SwitchPreferenceCompat leaderboardParticipationPref = findPreference("leaderboard_participation");
+        if (leaderboardParticipationPref != null) {
+            leaderboardParticipationPref.setChecked(participate);
+        }
+    }
+
     private void showEditSharingPreferencesDialog() {
         // Inflate the layout.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.sharing_preferences_form, null);
diff --git a/src/main/res/xml/settings_ski_profile.xml b/src/main/res/xml/settings_ski_profile.xml
index aa1712ac3..457ff9cf8 100644
--- a/src/main/res/xml/settings_ski_profile.xml
+++ b/src/main/res/xml/settings_ski_profile.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
 
     <SwitchPreferenceCompat

From 5c66e9934bf29b0e82b108316ef3a18bc163647c Mon Sep 17 00:00:00 2001
From: Charles-Philippe La Richeliere <chaphilar@gmail.com>
Date: Mon, 8 Apr 2024 18:21:11 -0400
Subject: [PATCH 44/76] Changed feature for sharing location now only shows a
 switch, no button

---
 src/main/res/layout/sharing_preferences_form.xml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/res/layout/sharing_preferences_form.xml b/src/main/res/layout/sharing_preferences_form.xml
index 49f2ea5e8..ab09ba53a 100644
--- a/src/main/res/layout/sharing_preferences_form.xml
+++ b/src/main/res/layout/sharing_preferences_form.xml
@@ -13,29 +13,21 @@
         android:id="@+id/radioGroup" 
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
-
         <RadioButton
             android:id="@+id/radio_friends"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sharing_option_no_one" />
-
-
+            android:text="@string/sharing_option_public" />
         <RadioButton
             android:id="@+id/radio_public"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sharing_option_no_one" />
-        <RadioButton
-            android:id="@+id/radio_no_one"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/sharing_option_no_one" />
+            android:text="@string/sharing_option_friends" />
         <RadioButton
             android:id="@+id/radio_share_with"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/sharing_option_no_one" />
+            android:text="@string/sharing_option_select" />
 
 
         </RadioGroup>

From 82f49dcb6300bac230c7e2be32d75792486d4f68 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Mon, 8 Apr 2024 19:18:04 -0400
Subject: [PATCH 45/76] merge group 3 main with group3+13 successful

---
 .../opentracks/TrackStoppedActivity.java      |  20 +--
 .../opentracks/data/models/UserModel.java     |  47 ------
 .../settings/UserProfileFragment.java         | 144 +++++++++++-------
 3 files changed, 95 insertions(+), 116 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
index b0b9cca93..85f61d40b 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -62,14 +62,14 @@ protected void onCreate(Bundle savedInstanceState) {
         //TODO! - Remove
         //Assignee - Jean Robatto
 
-        final String JSON_SERIALIZER_LOG_TAG = "JSONSerializerTest";
-
-        final String trackJSONString = track.toJSON();
-        Log.i(JSON_SERIALIZER_LOG_TAG, trackJSONString);
-
-        final Track trackCopy = JSONSerializable.fromJSON(trackJSONString, Track.class);
-        Log.i(JSON_SERIALIZER_LOG_TAG, trackCopy.toString());
-        Log.i(JSON_SERIALIZER_LOG_TAG, trackCopy.getName());
+//        final String JSON_SERIALIZER_LOG_TAG = "JSONSerializerTest";
+//
+//        final String trackJSONString = track.toJSON();
+//        Log.i(JSON_SERIALIZER_LOG_TAG, trackJSONString);
+//
+//        final Track trackCopy = JSONSerializable.fromJSON(trackJSONString, Track.class);
+//        Log.i(JSON_SERIALIZER_LOG_TAG, trackCopy.toString());
+//        Log.i(JSON_SERIALIZER_LOG_TAG, trackCopy.getName());
 
         //End
 
@@ -134,11 +134,11 @@ private void storeTrackMetaData(ContentProviderUtils contentProviderUtils, Track
 
         //Save run on the external DB
         //NOTE - The UI should be augmented to display success/failure to the user
-        FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
+        //FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
 
         //Save run on the external DB
         //NOTE - The UI should be augmented to display success/failure to the user
-        FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
+        //FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
 
         TrackUtils.updateTrack(TrackStoppedActivity.this, track, viewBinding.trackEditName.getText().toString(),
                 viewBinding.trackEditActivityType.getText().toString(), viewBinding.trackEditDescription.getText().toString(),
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
index f801ac572..c729f7221 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/UserModel.java
@@ -10,17 +10,6 @@
 
 import de.dennisguse.opentracks.data.adapters.Gson_DurationTypeAdapter;
 import de.dennisguse.opentracks.data.adapters.Gson_InstantTypeAdapter;
-import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
-
-import java.time.Duration;
-import java.time.Instant;
-
-import de.dennisguse.opentracks.data.adapters.Gson_DurationTypeAdapter;
-import de.dennisguse.opentracks.data.adapters.Gson_InstantTypeAdapter;
-import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 
 public class UserModel {
 
@@ -35,20 +24,6 @@ public class UserModel {
     private boolean socialAllow; //Bool flag for leaderboard appearance permission
     private String profilePicURL; //To be replaced by firestore path - https://
 
-    // Default Constructor
-
-    public UserModel() {
-
-        this.nickname = "";
-        this.country = "";
-        this.dateOfBirth = 0;
-        this.gender = "";
-        this.height = 0;
-        this.weight = 0;
-        this.socialAllow = false;
-        this.profilePicURL = "";
-    }
-
     // Constructor
 
     /**
@@ -83,18 +58,6 @@ public UserModel() {
 
     // Constructor
 
-    /**
-     * Constructs a new Car object with the given make, model, and year.
-     *
-     * @param nickname The nickname / username.
-     * @param country The country of user / not based on tracking.
-     * @param dateOfBirth The DOB.
-     * @param gender User gender.
-     * @param height User height unit default.
-     * @param weight User weight unit default.
-     * @param socialAllow Flags permission to share on leaderboard
-     * @param profilePicURL Stores path to blob.
-     */
     public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight, boolean socialAllow, String profilePicURL) {
 
         this.nickname = nickname;
@@ -139,16 +102,6 @@ public boolean getSharingPreference() {
         return prefs.getBoolean(PREF_SOCIAL_ALLOW, false);
     }
 
-    public UserModel(String nickname, String country, long dateOfBirth, String gender, int height, int weight) {
-
-        this.nickname = nickname;
-        this.country = country;
-        this.dateOfBirth = dateOfBirth;
-        this.gender = gender;
-        this.height = height;
-        this.weight = weight;
-    }
-
     // Methods
 
     public String getNickname() {
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index f19e821d0..877c828d6 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -1,29 +1,19 @@
 package de.dennisguse.opentracks.settings;
 
-import static android.provider.Settings.Secure.ANDROID_ID;
 import static de.dennisguse.opentracks.settings.PreferencesUtils.getUnitSystem;
 
 import android.app.AlertDialog;
-import android.app.Activity;
-import android.os.Build;
 import android.content.ContextWrapper;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
 import android.net.Uri;
-import android.provider.Settings;
 import android.provider.MediaStore;
-import android.provider.Settings;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -33,7 +23,6 @@
 import android.content.pm.PackageManager;
 import android.content.Intent;
 
-import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import androidx.annotation.NonNull;
@@ -55,49 +44,25 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Height;
 import de.dennisguse.opentracks.data.models.HeightFormatter;
-import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.UserModel;
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
-import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
 import de.dennisguse.opentracks.data.interfaces.ReadCallback;
-import de.dennisguse.opentracks.data.interfaces.ActionCallback;
-import de.dennisguse.opentracks.data.adapters.FireStoreAdapter;
-import de.dennisguse.opentracks.data.models.CRUDConstants;
-
-
-
-import de.dennisguse.opentracks.data.models.UserModel;
-
-
-import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
-import de.dennisguse.opentracks.data.interfaces.ReadCallback;
-import de.dennisguse.opentracks.data.interfaces.ActionCallback;
-import de.dennisguse.opentracks.data.adapters.FireStoreAdapter;
-import de.dennisguse.opentracks.data.models.CRUDConstants;
-
-
-
-import de.dennisguse.opentracks.data.models.UserModel;
-
 
 
 import android.app.DatePickerDialog;
-import android.widget.DatePicker;
+
 import java.util.Calendar;
 import java.util.Locale;
-import android.widget.ArrayAdapter;
+
 import android.widget.Spinner;
 import java.util.Arrays;
-import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -170,6 +135,9 @@ public boolean onPreferenceClick(@NonNull Preference preference) {
                     displayCustomSharingDialog();
 
                 }
+                else{
+                    displayCustomSharingDialog();
+                }
                 return false;
             }
         });
@@ -289,6 +257,17 @@ private void displayProfilePicture() {
         }
     }
 
+    public String removeCharsFromString(String stringToConvert) {
+        StringBuilder str = new StringBuilder();
+        for (char c : stringToConvert.toCharArray()) {
+            if (Character.isDigit(c)) {
+                str.append(c);
+            }
+        }
+        String newstr = str.toString();
+        return newstr;
+    }
+
     private void showEditProfileDialog() {
         // Inflate the custom layout for the edit dialog.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.edit_profile_form, null);
@@ -297,7 +276,11 @@ private void showEditProfileDialog() {
         TextView nicknameText = getView().findViewById(R.id.nickname);
         TextView DOBText = getView().findViewById(R.id.dateOfBirth);
         TextView heightText = getView().findViewById(R.id.userHeight);
+         String heightToEdit = heightText.getText().toString();
+         heightToEdit = removeCharsFromString(heightToEdit);
         TextView weightText = getView().findViewById(R.id.userWeight);
+        String weightToEdit = weightText.getText().toString();
+        weightToEdit= removeCharsFromString(weightToEdit);
 //        TextView countryText = getView().findViewById(R.id.userLocation);
 //        TextView genderText = getView().findViewById(R.id.gender);
 
@@ -323,8 +306,8 @@ private void showEditProfileDialog() {
         {
             editDateOfBirth.setText(DOBText.getText().toString());
         }
-        editHeight.setText(heightText.getText().toString());
-        editWeight.setText(weightText.getText().toString());
+        editHeight.setText(heightToEdit);
+        editWeight.setText(weightToEdit);
 
         Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
         ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
@@ -373,10 +356,8 @@ private void showEditProfileDialog() {
                     String location = spinnerLocation.getSelectedItem().toString();
 
                     // Validate and save the data if valid
-//TODO: Add back validation
-                    if(true){
-                    //if (validateInputs(nickname, dateOfBirth, height, weight, gender, location)) {
-                        saveProfileData(nickname, location, dateOfBirth, gender, height, weight);
+                    if (validateInputs(nickname, dateOfBirth, height, weight, gender, location)) {
+                        saveProfileData( nickname,  location,  dateOfBirth,  gender,  height,  weight);
                         showToast("Profile updated successfully!");
 
                     } else {
@@ -405,12 +386,13 @@ private void showEditProfileDialog() {
             // Show the date picker dialog
             datePickerDialog.show();
         });
+
+
     }
 
-    // TODO: Implement saving logic here.
     private void saveProfileData(String nickname, String location, String dateOfBirth, String gender, String height, String weight) {
 
-        UserModel user = new UserModel(nickname, location, (long)Integer.valueOf(dateOfBirth), gender, Integer.valueOf(height), Integer.valueOf(weight));
+        UserModel user = new UserModel(nickname, location, dateToLong(dateOfBirth), gender, Integer.valueOf(height), Integer.valueOf(weight));
 
         FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
         FirestoreCRUDUtil.getInstance().getEntry("users", systemID(), callback);
@@ -427,6 +409,7 @@ public void onSuccess(JsonObject data) {
             TextView textView_DOB = getView().findViewById(R.id.dateOfBirth);
             TextView textView_height = getView().findViewById(R.id.userHeight);
             TextView textView_weight = getView().findViewById(R.id.userWeight);
+            TextView textView_gender = getView().findViewById(R.id.gender);
 
             //TODO: create separate unit conversion method.
             UnitSystem unitSystem = getUnitSystem();
@@ -436,12 +419,14 @@ public void onSuccess(JsonObject data) {
             Weight weight = new Weight(readUser.getWeight());
             Pair<String, String> weightStrings = WeightFormatter.Builder().setUnit(unitSystem).build(getContext()).getWeightParts(weight);
 
+            String dateInStringFormat = longToDateString(readUser.getDateOfBirth());
+
             textView_nickname.setText(readUser.getNickname());
             textView_location.setText(readUser.getCountry());
-            textView_DOB.setText(Long.toString(readUser.getDateOfBirth()));
+            textView_DOB.setText(dateInStringFormat);
             textView_height.setText(heightStrings.first + heightStrings.second);
             textView_weight.setText(weightStrings.first + weightStrings.second);
-
+            textView_gender.setText(readUser.getGender());
         }
 
         @Override
@@ -523,16 +508,50 @@ private UserModel createUserFromInput(String nickname, String dateOfBirth, Strin
         return userObject;
     }
 
+    public long dateToLong(String dateOfBirth){
+        // Get long date
+        DateFormat formatter = new SimpleDateFormat("dd-MM-yyyy", Locale.getDefault());
+        Timestamp DOBlong = null;
+        long userDOB = 0;
+
+        try {
+            Date date = formatter.parse(dateOfBirth);
+            if (date != null) {
+                DOBlong = new Timestamp(date.getTime());
+                userDOB = DOBlong.getTime();
+            }
+        } catch (ParseException e) {
+            showToast("Error DOB format error");
+        }
+        return userDOB;
+    }
+
+    public String longToDateString(long milli){
+        // Milliseconds since epoch (obtained from date.getTime())
+        long milliseconds = milli; // Example milliseconds (15th April 2024)
+
+        // Create a Date object from milliseconds
+        Date date = new Date(milliseconds);
+
+        // Create a SimpleDateFormat object for formatting the date
+        SimpleDateFormat sdf = new SimpleDateFormat("dd-MM-yyyy");
+
+        // Format the date into a legible string
+        String formattedDate = sdf.format(date);
+        return formattedDate;
+    }
+
+
     private void displayCustomSharingDialog(){
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
         // Array to store user information
-        String[] userInfo = new String[5];
-        int[] textViewIds = {R.id.nickname, R.id.userLocation, R.id.dateOfBirth, R.id.userHeight, R.id.userWeight};
+        String[] userInfo = new String[6];
+        int[] textViewIds = {R.id.nickname, R.id.userLocation, R.id.dateOfBirth, R.id.userHeight, R.id.userWeight, R.id.gender};
 
         // Array to store detail labels
-        String[] detailNames = {"Nickname", "Location", "Date of Birth", "Height", "Weight"};
+        String[] detailNames = {"Nickname", "Location", "Date of Birth", "Height", "Weight", "Gender"};
 
         StringBuilder alertMessageBuilder = new StringBuilder("Do you allow OpenTracks to store and display the following information on the leaderboard?\n\n");
 
@@ -550,6 +569,17 @@ private void displayCustomSharingDialog(){
             }
         }
 
+
+        TextView heightText = getView().findViewById(R.id.userHeight);
+        String heightToEdit = heightText.getText().toString();
+        heightToEdit = removeCharsFromString(heightToEdit);
+        TextView weightText = getView().findViewById(R.id.userWeight);
+        String weightToEdit = weightText.getText().toString();
+        weightToEdit= removeCharsFromString(weightToEdit);
+
+        UserModel user = new UserModel(userInfo[0], userInfo[1], dateToLong(userInfo[2]), userInfo[5], Integer.valueOf(heightToEdit), Integer.valueOf(weightToEdit));
+
+
         String alertMessage = alertMessageBuilder.toString();
 
         builder.setTitle("Confirm Selection")
@@ -560,26 +590,22 @@ private void displayCustomSharingDialog(){
 //                    userModel.setSocialAllow(true);
                     showToast("Updated sharing permissions and data will be shared on the leaderboard.");
                     leaderboardSwitch.setChecked(true); // Visually indicate sharing is enabled
-
-                    // TODO: Save the updated UserModel to the database
+                    user.setSocialAllow(true);
+                    FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
                 })
-                .setNegativeButton("CANCEL", (dialog, which) -> {
+                .setNegativeButton("DENY", (dialog, which) -> {
 //                    UserModel userModel = new UserModel(); // we need to get current UserID and initialize.
  //                   userModel.setSocialAllow(false);
                     showToast("Sharing not enabled. Data will remain private.");
                     leaderboardSwitch.setChecked(false); // Visually indicate sharing is not enabled
-
-                    // TODO: Save the updated UserModel to the database
+                    user.setSocialAllow(false);
+                    FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
                 })
                 .show();
     }
 
     @Override
 
-    // TODO: Implement saving logic here.
-    private void saveProfileData(String nickname, String dateOfBirth, String height, String weight, String gender, String location) {
-
-    }
     //TODO: fix this
     public void onStart() {
         super.onStart();

From 0606d31348355092c57c28393f6238b10ee9491c Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Mon, 8 Apr 2024 20:08:41 -0400
Subject: [PATCH 46/76] added comments for master pull. This file is group
 13's.

---
 .../java/de/dennisguse/opentracks/TrackStoppedActivity.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
index 85f61d40b..40cd803ba 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackStoppedActivity.java
@@ -134,10 +134,12 @@ private void storeTrackMetaData(ContentProviderUtils contentProviderUtils, Track
 
         //Save run on the external DB
         //NOTE - The UI should be augmented to display success/failure to the user
+        //TODO: The next line should not be commented out
         //FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
 
         //Save run on the external DB
         //NOTE - The UI should be augmented to display success/failure to the user
+        //TODO: The next line should not be commented out
         //FirestoreCRUDUtil.getInstance().createEntry(CRUDConstants.RUNS_TABLE, track.getUuid().toString(), track.toJSON(), null);
 
         TrackUtils.updateTrack(TrackStoppedActivity.this, track, viewBinding.trackEditName.getText().toString(),

From e2e51f3be9f920298efe739be8372253560ed3a2 Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 20:12:54 -0400
Subject: [PATCH 47/76] Buttons fixed, for real this time

---
 .../opentracks/SeasonalActivity.java          | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
index 0e208f89b..99ce1f7c0 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
@@ -8,9 +8,20 @@
 import android.widget.Button;
 
 import androidx.annotation.Nullable;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.chrono.ChronoLocalDate;
+import java.util.List;
+
+import de.dennisguse.opentracks.data.TrackSelection;
+import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsAdapter;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsModel;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.StatisticsActivity;
 
 
@@ -20,7 +31,11 @@
  * @author Woo Jun Ann, Zachary Therrien
  * */
 public class SeasonalActivity extends AbstractActivity {
+    public static final String EXTRA_TRACK_IDS = "track_ids";
+    private final TrackSelection selection = new TrackSelection();
     private ActivitySeasonalBinding viewBinding;
+    private AggregatedStatisticsModel viewModel;
+    private AggregatedStatisticsAdapter adapter;
     private RecyclerView seasonsRecyclerView;
 
     @Override
@@ -29,17 +44,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setTitle("Seasonal Activity!");
         seasonsRecyclerView = findViewById(R.id.seasons_recyclerView);
 
-        GoToIndividualSite(findViewById(R.id.activity_game_answer1_btn));
-        GoToIndividualSite(findViewById(R.id.activity_game_answer2_btn));
-        GoToAllTimeStats(findViewById(R.id.activity_game_answer3_btn));
+        GoToIndividualSite(findViewById(R.id.Winter2022_Button));
+        GoToIndividualSite(findViewById(R.id.Winter2023_Button));
+        GoToIndividualSite(findViewById(R.id.Winter2024_Button));
+        GoToAllTimeStats(findViewById(R.id.LifeTime_button));
 
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 
-    private void GoToIndividualSite(Button button)
-    {
-        button.setOnClickListener(view ->
-        {
+    private void GoToIndividualSite(Button button) {
+        button.setOnClickListener(view -> {
             Intent intent = new Intent(SeasonalActivity.this, SeasonalActivityPerSeason.class);
             intent.putExtra("seasonTitle", button.getText());
             startActivity(intent);
@@ -47,17 +61,15 @@ private void GoToIndividualSite(Button button)
     }
 
     private void GoToAllTimeStats(Button button) {
-        button.setOnClickListener(view ->
-        {
-            Intent intent = new Intent(SeasonalActivity.this, StatisticsActivity.class);
+        button.setOnClickListener(view -> {
+            Intent intent = new Intent(SeasonalActivity.this, SeasonalActivityPerSeason.class);
             intent.putExtra("seasonTitle", button.getText());
             startActivity(intent);
         });
     }
 
     @Override
-    protected View getRootView()
-    {
+    protected View getRootView() {
         viewBinding = ActivitySeasonalBinding.inflate(getLayoutInflater());
         return viewBinding.getRoot();
     }

From 83c73c24430353d200588bf525dc453248907948 Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 20:24:35 -0400
Subject: [PATCH 48/76] Updates for seasons pages

---
 .../opentracks/SeasonalActivityPerSeason.java |  53 ++++++++-
 .../activity_season_aggrgated_list_item.xml   |   2 +-
 src/main/res/layout/activity_seasonal.xml     |  11 +-
 .../layout/activity_seasonal_per_season.xml   | 104 +-----------------
 4 files changed, 64 insertions(+), 106 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
index 222e7dc0d..32c1cd918 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
@@ -13,15 +13,27 @@
 import androidx.core.graphics.Insets;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.google.android.material.appbar.MaterialToolbar;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+
+import de.dennisguse.opentracks.data.TrackSelection;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalPerSeasonBinding;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsAdapter;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsModel;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.DummyDataGenerator;
 
 public class SeasonalActivityPerSeason extends AbstractActivity
 {
+    public static final String EXTRA_TRACK_IDS = "track_ids";
+    private final TrackSelection selection = new TrackSelection();
+    private AggregatedStatisticsModel viewModel;
+    private AggregatedStatisticsAdapter adapter;
     private ActivitySeasonalPerSeasonBinding viewBinding;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -33,15 +45,53 @@ protected void onCreate(Bundle savedInstanceState) {
             changeTitle(data.getString("seasonTitle"));
         }
 
-        TextView distanceTraveledTextView = findViewById(R.id.LifeTime_button);
+        TextView distanceTraveledTextView = findViewById(R.id.distanceTraveled);
         TextView totalTimeTextView = findViewById(R.id.totalTime);
         TextView averageSpeedTextView = findViewById(R.id.avgSpeed);
         TextView maxSpeedTextView = findViewById(R.id.maxSpeed);
 
+        //        List<Track.Id> trackIds = getIntent().getParcelableArrayListExtra(EXTRA_TRACK_IDS);
+//        if (trackIds != null && !trackIds.isEmpty()) {
+//            trackIds.forEach(selection::addTrackId);
+//        }
+
+//        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+//        adapter = new AggregatedStatisticsAdapter(this, null);
+//        viewBinding.seasonsRecyclerView.setLayoutManager(layoutManager);
+//        viewBinding.seasonsRecyclerView.setAdapter(adapter);
+//
+//        viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
+//        viewModel.getAggregatedStats(selection).observe(this, aggregatedStatistics -> {
+////            if ((aggregatedStatistics == null || aggregatedStatistics.getCount() == 0) && !selection.isEmpty()) {
+////                viewBinding.seasonalEmptyText.
+////            }
+//            if (aggregatedStatistics != null) {
+//                adapter.swapData(aggregatedStatistics);
+//            }
+//            checkListEmpty();
+//        });
+//
+//        LocalDateTime from = LocalDateTime.parse("");
+//        LocalDateTime to = LocalDateTime.parse("");
+//
+//        selection.addDateRange(from.atZone(ZoneId.systemDefault()).toInstant(), to.atZone(ZoneId.systemDefault()).toInstant());
+//        filterItems.stream().filter(fi -> fi.isChecked).forEach(fi -> selection.addActivityType(fi.value));
+//        viewModel.updateSelection(selection);
 
 
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
+
+//    private void checkListEmpty() {
+//        if (adapter.getItemCount() == 0) {
+//            viewBinding.seasonsRecyclerView.setVisibility(View.GONE);
+//            viewBinding.seasonalEmptyText.setVisibility(View.VISIBLE);
+//        } else {
+//            viewBinding.seasonsRecyclerView.setVisibility(View.VISIBLE);
+//            viewBinding.seasonalEmptyText.setVisibility(View.GONE);
+//        }
+//    }
+
     private void MakeYesNoButton(Button button) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this)
                 .setTitle("Heading to " + button.getText()).setMessage("Is this okay?")
@@ -50,6 +100,7 @@ private void MakeYesNoButton(Button button) {
                 })
                 .setNegativeButton("No", (dialogInterface, i) -> dialogInterface.cancel());
     }
+
     private void changeTitle(String newTitle) {
         MaterialToolbar materialToolbar = (MaterialToolbar)findViewById(R.id.season_materialtoolbar);
         materialToolbar.setTitle(newTitle);
diff --git a/src/main/res/layout/activity_season_aggrgated_list_item.xml b/src/main/res/layout/activity_season_aggrgated_list_item.xml
index b176a606c..96c48e771 100644
--- a/src/main/res/layout/activity_season_aggrgated_list_item.xml
+++ b/src/main/res/layout/activity_season_aggrgated_list_item.xml
@@ -59,7 +59,7 @@
                 android:text="Total Time" />
 
             <TextView
-                android:id="@+id/aggregatedTime"
+                android:id="@+id/totalTime"
                 style="@style/TextAppearance.OpenTracks.PrimaryValue"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/main/res/layout/activity_seasonal.xml b/src/main/res/layout/activity_seasonal.xml
index 552f91734..8bd4d50a3 100644
--- a/src/main/res/layout/activity_seasonal.xml
+++ b/src/main/res/layout/activity_seasonal.xml
@@ -2,13 +2,13 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/seasonalActivityView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:context=".SeasonalActivity">
 
 
-
     <LinearLayout
         android:id="@+id/seasons_list"
         android:layout_width="match_parent"
@@ -28,10 +28,17 @@
                 app:title="Seasonal Data" />
         </com.google.android.material.appbar.AppBarLayout>
 
+        <TextView
+            android:id="@+id/seasonalEmptyText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="There is no data for any season."
+            android:textAlignment="center" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/seasons_recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content">
 
         </androidx.recyclerview.widget.RecyclerView>
 
diff --git a/src/main/res/layout/activity_seasonal_per_season.xml b/src/main/res/layout/activity_seasonal_per_season.xml
index 4c874e9d2..a60821cab 100644
--- a/src/main/res/layout/activity_seasonal_per_season.xml
+++ b/src/main/res/layout/activity_seasonal_per_season.xml
@@ -24,109 +24,9 @@
                 app:title="Seasonal Data" />
         </com.google.android.material.appbar.AppBarLayout>
 
-        <LinearLayout
+        <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textView8"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:text="Total Distance Traveled" />
-
-            <TextView
-                android:id="@+id/distanceTraveled"
-                style="@style/TextAppearance.OpenTracks.PrimaryValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="0dp"
-                android:text="10000" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="KM" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textView9"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-
-                android:gravity="center"
-                android:text="Total Time" />
-
-            <TextView
-                android:id="@+id/aggregatedTime"
-                style="@style/TextAppearance.OpenTracks.PrimaryValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="00:00:00" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textView10"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="Average Speed" />
-
-            <TextView
-                android:id="@+id/avgSpeed"
-                style="@style/TextAppearance.OpenTracks.PrimaryValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="0dp"
-                android:text="10" />
-
-            <TextView
-                android:id="@+id/textView5"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="KM/h" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/textView11"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Max Speed" />
-
-            <TextView
-                android:id="@+id/maxSpeed"
-                style="@style/TextAppearance.OpenTracks.PrimaryValue"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="0dp"
-                android:text="100" />
-
-            <TextView
-                android:id="@+id/textView7"
-                style="@style/TextAppearance.OpenTracks.PrimaryUnit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="KM/h" />
-        </LinearLayout>
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 

From 0abbc21563396195000b56deea8b9b9722c94fbf Mon Sep 17 00:00:00 2001
From: Charles-Philippe La Richeliere <chaphilar@gmail.com>
Date: Mon, 8 Apr 2024 20:41:02 -0400
Subject: [PATCH 49/76] Changed feature for sharing location now only shows a
 switch, no button

---
 .../settings/SkiProfileFragment.java          | 32 +++++++++++++++----
 src/main/res/values/strings.xml               |  2 +-
 src/main/res/xml/settings_ski_profile.xml     |  9 +-----
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
index 34a92652f..2248fbc14 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/SkiProfileFragment.java
@@ -14,6 +14,7 @@
 import androidx.preference.SwitchPreferenceCompat;
 import de.dennisguse.opentracks.R;
 
+
 public class SkiProfileFragment extends PreferenceFragmentCompat {
     private static final String PREF_LEADERBOARD_TERMS_ACCEPTED = "leaderboard_terms_accepted";
 
@@ -21,14 +22,20 @@ public class SkiProfileFragment extends PreferenceFragmentCompat {
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.settings_ski_profile);
 
-        // Handle Sharing Location preference click
-        Preference sharingPref = findPreference("sharing_location");
-        if (sharingPref != null) {
-            sharingPref.setOnPreferenceClickListener(preference -> {
-                showEditSharingPreferencesDialog();
+
+        SwitchPreferenceCompat shareLocationSwitch = (SwitchPreferenceCompat) findPreference("live_location_sharing");
+
+        shareLocationSwitch.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                boolean isChecked = (boolean) newValue; // Extract new state
+                if (isChecked) {
+                    showEditSharingPreferencesDialog();
+                }
                 return true;
-            });
-        }
+            }
+        });
+
 
         // Handle Leaderboard Participation preference change
         SwitchPreferenceCompat leaderboardParticipationPref = findPreference("leaderboard_participation");
@@ -114,6 +121,17 @@ private void showEditSharingPreferencesDialog() {
                 radioGroup.check(R.id.radio_public);
                 break;
         }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setView(formView); // Set the inflated formView as the dialog's content
+        // (Optionally set title, buttons, etc.)
+
+        // Create the dialog object
+        AlertDialog dialog = builder.create();
+
+        // Display the dialog
+        dialog.show();
+
     }
 
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 48eca0507..231d701d3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -37,7 +37,7 @@ limitations under the License.
     <string name="sharing_option_share_with">Share With</string>
     <string name="sharing_option_public">Public</string>
     <string name="sharing_option_friends">Friends</string>
-    <string name="sharing_option_no_one">No One</string>
+    <string name="sharing_option_select">Choose from contacts</string>
     <string name="sharing_location_key">sharing_location</string>
     <string name="sharing_location_title">Sharing Location</string>
     <string name="sharing_location_summary">Choose who can see your location</string>
diff --git a/src/main/res/xml/settings_ski_profile.xml b/src/main/res/xml/settings_ski_profile.xml
index 457ff9cf8..f814df874 100644
--- a/src/main/res/xml/settings_ski_profile.xml
+++ b/src/main/res/xml/settings_ski_profile.xml
@@ -9,13 +9,6 @@
         android:summary="Toggle location being shared"
         android:defaultValue="false" />
 
-    <ListPreference
-        android:key="sharing_location"
-        android:title="@string/sharing_location_title"
-        android:summary="@string/sharing_location_summary"
-        android:entryValues="@array/sharing_location_values"
-        android:entries="@array/sharing_location_entries" />
-
     <SwitchPreferenceCompat
         android:key="leaderboard_participation"
         android:title="Participate In Leaderboard"
@@ -30,4 +23,4 @@
         android:entryValues="@array/skiing_type_values"
         app:useSimpleSummaryProvider="true" />
 
-</androidx.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>
\ No newline at end of file

From c63cbec095f69c824c29954ad5d7e19eb83f6e31 Mon Sep 17 00:00:00 2001
From: kalo2711 <kalo2711@gmail.com>
Date: Mon, 8 Apr 2024 21:00:48 -0400
Subject: [PATCH 50/76] feat: ski lodge ratings

---
 .../opentracks/viewmodels/SkiLodge.java       |  29 +++++
 .../viewmodels/SkiLodgeReviewActivity.java    | 111 ++++++++++++++++++
 2 files changed, 140 insertions(+)
 create mode 100644 src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodge.java
 create mode 100644 src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodgeReviewActivity.java

diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodge.java b/src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodge.java
new file mode 100644
index 000000000..b1ea92315
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodge.java
@@ -0,0 +1,29 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SkiLodge {
+    String name;
+    double averageRating;
+    List<Double> ratings;
+
+    public SkiLodge(String name) {
+        this.name = name;
+        this.ratings = new ArrayList<>();
+        this.averageRating = 0.0;
+    }
+
+    public void addRating(double rating) {
+        ratings.add(rating);
+        averageRating = ratings.stream().mapToDouble(val -> val).average().orElse(0.0);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public double getAverageRating() {
+        return averageRating;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodgeReviewActivity.java b/src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodgeReviewActivity.java
new file mode 100644
index 000000000..3a2ac1148
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/viewmodels/SkiLodgeReviewActivity.java
@@ -0,0 +1,111 @@
+package de.dennisguse.opentracks.viewmodels;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import java.util.Scanner;
+public class SkiLodgeReviewActivity {
+    private List<SkiLodge> lodges = new ArrayList<>();
+    private Scanner scanner;
+
+    public SkiLodgeReviewActivity() {
+        scanner = new Scanner(System.in);
+
+        addInitialLodges();
+    }
+
+    private void addInitialLodges() {
+        for (int i = 1; i <= 5; i++) {
+            lodges.add(new SkiLodge("Lodge " + i));
+        }
+    }
+
+    public void getUserInput() {
+        while (true) {
+            System.out.println("Choose an option: \n1. Add a Lodge \n2. Add Review Rating \n3. Display Lodges \n4. Recommended Lodges \n5. Exit");
+            String choice = scanner.nextLine().trim();
+
+            switch (choice) {
+                case "1":
+                    addNewLodge();
+                    break;
+                case "2":
+                    getUserInputForReviews();
+                    break;
+                case "3":
+                    displayLodgesBasedOnRatings();
+                    break;
+                case "4":
+                    recommendRandomLodges();
+                    break;
+                case "5":
+                    return;
+                default:
+                    System.out.println("Invalid choice. Please enter a number between 1 and 5.");
+            }
+        }
+    }
+
+    private void addNewLodge() {
+        System.out.println("Enter new Lodge's name:");
+        String lodgeName = scanner.nextLine().trim();
+
+        if (lodges.stream().anyMatch(lodge -> lodge.getName().equalsIgnoreCase(lodgeName))) {
+            System.out.println("Lodge already exists.");
+        } else {
+            lodges.add(new SkiLodge(lodgeName));
+            System.out.println("New lodge added: " + lodgeName);
+        }
+    }
+
+    private void getUserInputForReviews() {
+        System.out.println("Enter lodge name for review:");
+        String lodgeName = scanner.nextLine().trim();
+
+        SkiLodge lodge = lodges.stream()
+                .filter(l -> l.getName().equalsIgnoreCase(lodgeName))
+                .findFirst()
+                .orElse(null);
+
+        if (lodge == null) {
+            System.out.println("Lodge not found.");
+            return;
+        }
+
+        System.out.println("Enter ratings for " + lodge.getName() + ": (Enter a number between 1 and 5, or 'done' to finish)");
+        while(scanner.hasNextLine()) {
+            String input = scanner.nextLine().trim();
+
+            if("done".equalsIgnoreCase(input)) break;
+
+            try {
+                double score = Double.parseDouble(input);
+                if (score >= 1.0 && score <= 5.0) {
+                    lodge.addRating(score);
+                } else {
+                    System.out.println("Rating must be between 1 and 5. Try again.");
+                }
+            } catch (NumberFormatException e) {
+                System.out.println("Invalid input. Please enter a valid number or 'done' to finish.");
+            }
+        }
+    }
+
+    void displayLodgesBasedOnRatings() {
+        Collections.sort(lodges, (lodge1, lodge2) -> Double.compare(lodge2.getAverageRating(), lodge1.getAverageRating()));
+
+        for (SkiLodge lodge : lodges) {
+            System.out.println("Lodge: " + lodge.getName() + " | Average Rating: " + String.format("%.2f", lodge.getAverageRating()));
+        }
+    }
+
+    void recommendRandomLodges() {
+        Random rand = new Random();
+        for (int i = 0; i < 3; i++) {
+            int randomIndex = rand.nextInt(lodges.size());
+            SkiLodge lodge = lodges.get(randomIndex);
+            System.out.println("Random Lodge Recommendation: " + lodge.getName() + " | Average Rating: " + String.format("%.2f", lodge.getAverageRating()));
+        }
+    }
+}

From 9db8201716f00bcb5cfc9edc4d7100f0de2220e9 Mon Sep 17 00:00:00 2001
From: Etienne Plante <zerox029@gmail.com>
Date: Mon, 8 Apr 2024 21:38:57 -0400
Subject: [PATCH 51/76] Fixed reverted changes

---
 .../settings/UserProfileFragment.java         | 56 +++++++------------
 1 file changed, 19 insertions(+), 37 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 029f2ee40..b9f6910c1 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -3,7 +3,6 @@
 import static de.dennisguse.opentracks.settings.PreferencesUtils.getUnitSystem;
 
 import android.app.AlertDialog;
-import android.app.Activity;
 import android.content.ContextWrapper;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -12,13 +11,12 @@
 import android.os.Looper;
 import android.net.Uri;
 import android.provider.MediaStore;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -28,7 +26,6 @@
 import android.content.pm.PackageManager;
 import android.content.Intent;
 
-import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 
 import androidx.annotation.NonNull;
@@ -48,25 +45,23 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Height;
 import de.dennisguse.opentracks.data.models.HeightFormatter;
-import de.dennisguse.opentracks.data.models.Speed;
-import de.dennisguse.opentracks.data.models.SpeedFormatter;
 import de.dennisguse.opentracks.data.models.UserModel;
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 
 import android.app.DatePickerDialog;
-import android.widget.DatePicker;
+
 import java.util.Calendar;
 import java.util.Locale;
-import android.widget.ArrayAdapter;
+
 import android.widget.Spinner;
-import java.util.Arrays;
-import java.util.Locale;
+
+import java.util.SortedSet;
+import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -266,8 +261,6 @@ private void showEditProfileDialog() {
         TextView DOBText = getView().findViewById(R.id.dateOfBirth);
         TextView heightText = getView().findViewById(R.id.userHeight);
         TextView weightText = getView().findViewById(R.id.userWeight);
-//        TextView countryText = getView().findViewById(R.id.userLocation);
-//        TextView genderText = getView().findViewById(R.id.gender);
 
 
         // Initialize all the EditText fields and Spinners.
@@ -294,37 +287,26 @@ private void showEditProfileDialog() {
         editHeight.setText(heightText.getText().toString());
         editWeight.setText(weightText.getText().toString());
 
+        // Gender spinner
         Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
-        ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
-                R.array.gender_options, android.R.layout.simple_spinner_item);
-        genderAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        String[] genderOptions = new String[]{"Male", "Female", "Other"};
+        ArrayAdapter<String> genderAdapter = new ArrayAdapter<>(formView.getContext(), android.R.layout.simple_spinner_dropdown_item, genderOptions);
         spinnerGender.setAdapter(genderAdapter);
 
+        // Location spinner
         Spinner spinnerLocation = formView.findViewById(R.id.spinnerLocation);
-        String[] isoCountryCodes = Locale.getISOCountries();
-        String[] countryNames = new String[isoCountryCodes.length];
-
-        for (int i = 0; i < isoCountryCodes.length; i++) {
-            Locale locale = new Locale("", isoCountryCodes[i]);
-            countryNames[i] = locale.getDisplayCountry();
-        }
-
-        Arrays.sort(countryNames); // Sort the country names alphabetically
-
-        // Move Canada to the beginning of the array
-        for (int i = 0; i < countryNames.length; i++) {
-            if (countryNames[i].equalsIgnoreCase("Canada")) {
-                String temp = countryNames[i];
-                System.arraycopy(countryNames, 0, countryNames, 1, i);
-                countryNames[0] = temp;
-                break;
+        SortedSet<String> countryOptions = new TreeSet<>();
+        for(Locale locale : Locale.getAvailableLocales()) {
+            if (!TextUtils.isEmpty(locale.getDisplayCountry()) && !locale.getDisplayCountry().equals("Canada")) {
+                countryOptions.add(locale.getDisplayCountry());
             }
         }
+        String[] countries = new String[countryOptions.size() + 1];
+        countries[0] = "Canada";
+        System.arraycopy(countryOptions.toArray(new String[0]), 0, countries, 1, countryOptions.size());
 
-        ArrayAdapter<String> locationAdapter = new ArrayAdapter<>(getContext(),
-                android.R.layout.simple_spinner_item, countryNames);
-        locationAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        spinnerLocation.setAdapter(locationAdapter);
+        ArrayAdapter<String> countryAdapter = new ArrayAdapter<>(formView.getContext(), android.R.layout.simple_spinner_dropdown_item, countries);
+        spinnerLocation.setAdapter(countryAdapter);
 
 
         // Set up the AlertDialog.

From 02d5bb42299c52ffb6d9c5c2c38bec40566d9400 Mon Sep 17 00:00:00 2001
From: JamesMolinari <james.molinari@hotmail.com>
Date: Mon, 8 Apr 2024 21:46:04 -0400
Subject: [PATCH 52/76] removed units from editform and updated uniqueId
 creation.

---
 .../settings/UserProfileFragment.java         | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index f98abeed3..a2a3a3a74 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -12,6 +12,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.MediaStore;
+import android.provider.Settings;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
@@ -61,6 +62,7 @@
 import de.dennisguse.opentracks.data.FirestoreCRUDUtil;
 import de.dennisguse.opentracks.data.interfaces.ReadCallback;
 import de.dennisguse.opentracks.data.interfaces.JSONSerializable;
+import android.content.ContentResolver;
 
 
 import android.app.DatePickerDialog;
@@ -314,8 +316,8 @@ private void showEditProfileDialog() {
         {
             editDateOfBirth.setText(DOBText.getText().toString());
         }
-        editHeight.setText(heightText.getText().toString());
-        editWeight.setText(weightText.getText().toString());
+        editHeight.setText(heightToEdit);
+        editWeight.setText(weightToEdit);
 
         Spinner spinnerGender = formView.findViewById(R.id.spinnerGender);
         ArrayAdapter<CharSequence> genderAdapter = ArrayAdapter.createFromResource(getContext(),
@@ -402,8 +404,8 @@ private void saveProfileData(String nickname, String location, String dateOfBirt
 
         UserModel user = new UserModel(nickname, location, dateToLong(dateOfBirth), gender, Integer.valueOf(height), Integer.valueOf(weight));
 
-        FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
-        FirestoreCRUDUtil.getInstance().getEntry("users", systemID(), callback);
+        FirestoreCRUDUtil.getInstance().createEntry("users", uniqueId(), user.toJSON(), null);
+        FirestoreCRUDUtil.getInstance().getEntry("users", uniqueId(), callback);
     }
 
     ReadCallback callback = new ReadCallback() {
@@ -599,7 +601,7 @@ private void displayCustomSharingDialog(){
                     showToast("Updated sharing permissions and data will be shared on the leaderboard.");
                     leaderboardSwitch.setChecked(true); // Visually indicate sharing is enabled
                     user.setSocialAllow(true);
-                    FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
+                    FirestoreCRUDUtil.getInstance().createEntry("users", uniqueId(), user.toJSON(), null);
                 })
                 .setNegativeButton("DENY", (dialog, which) -> {
 //                    UserModel userModel = new UserModel(); // we need to get current UserID and initialize.
@@ -607,7 +609,7 @@ private void displayCustomSharingDialog(){
                     showToast("Sharing not enabled. Data will remain private.");
                     leaderboardSwitch.setChecked(false); // Visually indicate sharing is not enabled
                     user.setSocialAllow(false);
-                    FirestoreCRUDUtil.getInstance().createEntry("users", systemID(), user.toJSON(), null);
+                    FirestoreCRUDUtil.getInstance().createEntry("users", uniqueId(), user.toJSON(), null);
                 })
                 .show();
     }
@@ -652,14 +654,20 @@ private boolean ProfilePictureExists() {
     @Override
     public void onResume() {
         super.onResume();
-        FirestoreCRUDUtil.getInstance().getEntry("users", systemID(), callback);
+        FirestoreCRUDUtil.getInstance().getEntry("users", uniqueId(), callback);
     }
 
     //TODO: Remove once there is offline data persistence through Firestore
-    public static String systemID() {
+    public String uniqueId() {
         String id = System.getProperty("http.agent");
         id = id.replace(" ", "");
-        return id;
+
+        ContentResolver contentResolver = requireActivity().getContentResolver();
+        String androidId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID);
+
+        String uniqueId = id + androidId;
+
+        return uniqueId;
     }
 
 }

From 63b7aa581ec55c09d3deaea28c37db4f09b29c7b Mon Sep 17 00:00:00 2001
From: DaHoodratTaco <97303999+DaHoodratTaco@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:46:21 -0400
Subject: [PATCH 53/76] Added mockup of Favorite resort and favorite lifts to
 seasonal data page

---
 .../layout/activity_seasonal_per_season.xml   | 96 ++++++++++++++++++-
 1 file changed, 91 insertions(+), 5 deletions(-)

diff --git a/src/main/res/layout/activity_seasonal_per_season.xml b/src/main/res/layout/activity_seasonal_per_season.xml
index a60821cab..8e68273a9 100644
--- a/src/main/res/layout/activity_seasonal_per_season.xml
+++ b/src/main/res/layout/activity_seasonal_per_season.xml
@@ -5,6 +5,7 @@
     android:id="@+id/main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    app:layout_gravity="center"
     tools:context=".SeasonalActivityPerSeason">
 
     <LinearLayout
@@ -14,7 +15,8 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:gravity="center">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/season_materialtoolbar"
@@ -24,13 +26,97 @@
                 app:title="Seasonal Data" />
         </com.google.android.material.appbar.AppBarLayout>
 
+        <TextView
+            android:id="@+id/textView15"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Favorite Resort"
+            android:theme="@style/OpenTracksTheme" />
+
+        <TextView
+            android:id="@+id/textView16"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="Resort Name"
+            android:textSize="36sp"
+            android:textStyle="bold"
+            android:theme="@style/OpenTracksTheme" />
+
+        <TextView
+            android:id="@+id/textView17"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="137"
+            android:textSize="34sp"
+            android:textStyle="bold" />
+
+        <TextView
+            android:id="@+id/textView18"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="Runs"
+            android:theme="@style/OpenTracksTheme" />
+
+        <TextView
+            android:id="@+id/textView19"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="Favorite Lifts"
+            android:theme="@style/OpenTracksTheme" />
+
+        <TextView
+            android:id="@+id/textView20"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="1. t-bar"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/textView21"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="2. magic carpet"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/textView22"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="3. summit chair"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/textView23"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="4. pine chair"
+            android:textSize="25sp" />
+
+        <TextView
+            android:id="@+id/textView24"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="5. Maple chair"
+            android:textSize="25sp" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="496dp">
+
+        </androidx.recyclerview.widget.RecyclerView>
+
+        <include
+            android:id="@+id/bottom_app_bar_layout"
+            layout="@layout/bottomappbar" />
 
     </LinearLayout>
 
-    <include
-        android:id="@+id/bottom_app_bar_layout"
-        layout="@layout/bottomappbar" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 162f155b59fad1906ae2785ee555f1d09e4fb927 Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 21:57:10 -0400
Subject: [PATCH 54/76] Progress of filtering dates

Filtering the dates work. Now to make it work dynamically based on the season.
---
 .../opentracks/SeasonalActivityPerSeason.java | 66 ++++++++++---------
 .../drawable/ic_seasonal_activity_24dp.xml    | 15 +++--
 .../layout/activity_seasonal_per_season.xml   |  1 +
 3 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
index 32c1cd918..3538195d5 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
@@ -3,6 +3,7 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
@@ -20,6 +21,7 @@
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
+import java.util.ArrayList;
 
 import de.dennisguse.opentracks.data.TrackSelection;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
@@ -27,6 +29,7 @@
 import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsAdapter;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsModel;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.DummyDataGenerator;
+import de.dennisguse.opentracks.ui.aggregatedStatistics.FilterDialogFragment;
 
 public class SeasonalActivityPerSeason extends AbstractActivity
 {
@@ -34,6 +37,7 @@ public class SeasonalActivityPerSeason extends AbstractActivity
     private final TrackSelection selection = new TrackSelection();
     private AggregatedStatisticsModel viewModel;
     private AggregatedStatisticsAdapter adapter;
+    private MenuItem filterItem;
     private ActivitySeasonalPerSeasonBinding viewBinding;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -50,47 +54,45 @@ protected void onCreate(Bundle savedInstanceState) {
         TextView averageSpeedTextView = findViewById(R.id.avgSpeed);
         TextView maxSpeedTextView = findViewById(R.id.maxSpeed);
 
-        //        List<Track.Id> trackIds = getIntent().getParcelableArrayListExtra(EXTRA_TRACK_IDS);
+//        List<Track.Id> trackIds = getIntent().getParcelableArrayListExtra(EXTRA_TRACK_IDS);
 //        if (trackIds != null && !trackIds.isEmpty()) {
 //            trackIds.forEach(selection::addTrackId);
 //        }
 
-//        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
-//        adapter = new AggregatedStatisticsAdapter(this, null);
-//        viewBinding.seasonsRecyclerView.setLayoutManager(layoutManager);
-//        viewBinding.seasonsRecyclerView.setAdapter(adapter);
-//
-//        viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
-//        viewModel.getAggregatedStats(selection).observe(this, aggregatedStatistics -> {
-////            if ((aggregatedStatistics == null || aggregatedStatistics.getCount() == 0) && !selection.isEmpty()) {
-////                viewBinding.seasonalEmptyText.
-////            }
-//            if (aggregatedStatistics != null) {
-//                adapter.swapData(aggregatedStatistics);
-//            }
-//            checkListEmpty();
-//        });
-//
-//        LocalDateTime from = LocalDateTime.parse("");
-//        LocalDateTime to = LocalDateTime.parse("");
-//
-//        selection.addDateRange(from.atZone(ZoneId.systemDefault()).toInstant(), to.atZone(ZoneId.systemDefault()).toInstant());
-//        filterItems.stream().filter(fi -> fi.isChecked).forEach(fi -> selection.addActivityType(fi.value));
-//        viewModel.updateSelection(selection);
+        LinearLayoutManager layoutManager = new LinearLayoutManager(this);
+        adapter = new AggregatedStatisticsAdapter(this, null);
+        viewBinding.aggregatedRecyclerView.setLayoutManager(layoutManager);
+        viewBinding.aggregatedRecyclerView.setAdapter(adapter);
+
+        viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
 
+        LocalDateTime from = LocalDateTime.of(2024, 4, 1, 0, 0);
+        LocalDateTime to = LocalDateTime.of(2024, 4, 8, 20, 0);;
+
+        selection.addDateRange(from.atZone(ZoneId.systemDefault()).toInstant(), to.atZone(ZoneId.systemDefault()).toInstant());
+        viewModel.updateSelection(selection);
+        viewModel.getAggregatedStats(selection).observe(this, aggregatedStatistics -> {
+//            if ((aggregatedStatistics == null || aggregatedStatistics.getCount() == 0) && !selection.isEmpty()) {
+//                viewBinding.seasonalEmptyText.setText("");
+//            }
+            if (aggregatedStatistics != null) {
+                adapter.swapData(aggregatedStatistics);
+            }
+            checkListEmpty();
+        });
 
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 
-//    private void checkListEmpty() {
-//        if (adapter.getItemCount() == 0) {
-//            viewBinding.seasonsRecyclerView.setVisibility(View.GONE);
-//            viewBinding.seasonalEmptyText.setVisibility(View.VISIBLE);
-//        } else {
-//            viewBinding.seasonsRecyclerView.setVisibility(View.VISIBLE);
-//            viewBinding.seasonalEmptyText.setVisibility(View.GONE);
-//        }
-//    }
+    private void checkListEmpty() {
+        if (adapter.getItemCount() == 0) {
+            viewBinding.aggregatedRecyclerView.setVisibility(View.GONE);
+            //viewBinding.seasonalEmptyText.setVisibility(View.VISIBLE);
+        } else {
+            viewBinding.aggregatedRecyclerView.setVisibility(View.VISIBLE);
+            //viewBinding.seasonalEmptyText.setVisibility(View.GONE);
+        }
+    }
 
     private void MakeYesNoButton(Button button) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this)
diff --git a/src/main/res/drawable/ic_seasonal_activity_24dp.xml b/src/main/res/drawable/ic_seasonal_activity_24dp.xml
index c8cd21d48..ffa4052eb 100644
--- a/src/main/res/drawable/ic_seasonal_activity_24dp.xml
+++ b/src/main/res/drawable/ic_seasonal_activity_24dp.xml
@@ -1,11 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
     android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+    android:viewportWidth="32"
+    android:viewportHeight="32">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M11.65 17L11.65, 19L12.65, 19L12.65, 17zM11.65 3L11.65, 5L12.65, 5L12.65, 3z                   M12,6c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM12,14.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z" />
-<!--    M12,6c-2.8,0 -5,2.2 -5,5s2.2,5 5,5 5,-2.2 5,-5 -2.2,-5 -5,-5zM12,14.5c-1.9,0 -3.5,-1.6 -3.5,-3.5s1.6,-3.5 3.5,-3.5 3.5,1.6 3.5,3.5 -1.6,3.5 -3.5,3.5z-->
+        android:pathData="M19.4,7.6c-0.3,0-0.5-0.1-0.7-0.3c-0.4-0.4-0.4-1,0-1.4l1.4-1.4c0.4-0.4,1-0.4,1.4,0s0.4,1,0,1.4l-1.4,1.4 C19.9,7.5,19.6,7.6,19.4,7.6zM13,5c-0.6,0-1-0.4-1-1V2c0-0.6,0.4-1,1-1s1,0.4,1,1v2C14,4.6,13.6,5,13,5zM6.6,7.6c-0.3,0-0.5-0.1-0.7-0.3L4.5,5.9c-0.4-0.4-0.4-1,0-1.4c0.4-0.4,1-0.4,1.4,0l1.4,1.4c0.4,0.4,0.4,1,0,1.4 C7.1,7.5,6.9,7.6,6.6,7.6zM27,25c-0.1-0.5-0.7-0.9-1.2-0.7l-1.5,0.4L23,24l1.2-0.7l1.5,0.4c0.1,0,0.2,0,0.3,0c0.4,0,0.8-0.3,1-0.7 c0.1-0.5-0.2-1.1-0.7-1.2l-1-0.3l0.3-1c0.1-0.5-0.2-1.1-0.7-1.2c-0.5-0.1-1.1,0.2-1.2,0.7l-0.4,1.5L22,22.3v-1.4l1.1-1.1 c0.4-0.4,0.4-1,0-1.4s-1-0.4-1.4,0L21,19.1l-0.7-0.7c-0.4-0.4-1-0.4-1.4,0s-0.4,1,0,1.4l1.1,1.1v1.4l-1.2-0.7l-0.4-1.5 c-0.1-0.5-0.7-0.9-1.2-0.7c-0.5,0.1-0.9,0.7-0.7,1.2l0.3,1l-1,0.3c-0.5,0.1-0.9,0.7-0.7,1.2c0.1,0.4,0.5,0.7,1,0.7 c0.1,0,0.2,0,0.3,0l1.5-0.4L19,24l-1.2,0.7l-1.5-0.4c-0.5-0.1-1.1,0.2-1.2,0.7c-0.1,0.5,0.2,1.1,0.7,1.2l1,0.3l-0.3,1 c-0.1,0.5,0.2,1.1,0.7,1.2c0.1,0,0.2,0,0.3,0c0.4,0,0.8-0.3,1-0.7l0.4-1.5l1.2-0.7v1.4l-1.1,1.1c-0.4,0.4-0.4,1,0,1.4s1,0.4,1.4,0 L21,29l0.7,0.7c0.2,0.2,0.5,0.3,0.7,0.3s0.5-0.1,0.7-0.3c0.4-0.4,0.4-1,0-1.4L22,27.2v-1.4l1.2,0.7l0.4,1.5c0.1,0.4,0.5,0.7,1,0.7 c0.1,0,0.2,0,0.3,0c0.5-0.1,0.9-0.7,0.7-1.2l-0.3-1l1-0.3C26.8,26.1,27.1,25.6,27,25zM22.3,11c-3.4,0-6.3,2-7.3,5.1c-2.7,0.1-4.9,2.3-4.9,5c0,1.7,0.9,3.2,2.3,4.1c0.2,0.1,0.4,0.2,0.5,0.2c0.1,0,0.1,0,0.2,0 c0-0.3,0-0.5,0.1-0.8c0-0.2,0.1-0.3,0.2-0.5c-0.1-0.2-0.1-0.3-0.2-0.5c-0.2-0.8-0.1-1.6,0.3-2.3c0.3-0.4,0.6-0.8,1-1 c0-0.5,0.2-1,0.4-1.4c0.4-0.7,1-1.2,1.8-1.4c0.2,0,0.3-0.1,0.5-0.1c0.1-0.1,0.2-0.3,0.3-0.4c1-1,2.4-1.1,3.5-0.5 c1.1-0.6,2.6-0.4,3.5,0.5c0.1,0.1,0.2,0.3,0.3,0.4c0.2,0,0.3,0,0.5,0.1c0.8,0.2,1.4,0.7,1.8,1.4c0.3,0.4,0.4,0.9,0.4,1.4 c0.4,0.3,0.8,0.6,1,1c0.1,0.2,0.2,0.4,0.3,0.6c0.2-0.1,0.5-0.3,0.6-0.5c0.4-0.9,0.6-1.9,0.6-2.9C30,14.4,26.5,11,22.3,11zM8.5,18.4c0.9-2.1,2.7-3.7,5-4.2c1.1-2.2,3.1-3.9,5.5-4.7C17.8,7.4,15.6,6,13,6c-3.9,0-7,3.1-7,7C6,15.1,7,17.1,8.5,18.4z"
+        android:strokeWidth="1"
+        tools:ignore="VectorPath" />
+    <!-- Icon taken from: https://www.svgrepo.com/svg/390813/sunny-snow-cloud-day?edit=true -->
 </vector>
diff --git a/src/main/res/layout/activity_seasonal_per_season.xml b/src/main/res/layout/activity_seasonal_per_season.xml
index a60821cab..d0d89b3ce 100644
--- a/src/main/res/layout/activity_seasonal_per_season.xml
+++ b/src/main/res/layout/activity_seasonal_per_season.xml
@@ -25,6 +25,7 @@
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/aggregated_recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 

From 36687fec7cb575724b996b58b637a4235bb7dc9d Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 22:49:06 -0400
Subject: [PATCH 55/76] Seasonal Aggregation copmlete

While the buttons aren't dynamic, you can aggregate based on the current hard-coded options available. It will work similarly to the aggregate page, but now only for the time frame of the given season. On top of that, it will only display stats for skiing. Also, an icon for seasonal aggregation was created last commit
---
 .../opentracks/SeasonalActivityPerSeason.java | 53 ++++++++++---------
 src/main/res/layout/activity_seasonal.xml     |  8 +--
 .../layout/activity_seasonal_per_season.xml   |  9 ++++
 src/main/res/values/strings.xml               |  6 +++
 4 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
index 3538195d5..7a333c90a 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivityPerSeason.java
@@ -22,6 +22,7 @@
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.Objects;
 
 import de.dennisguse.opentracks.data.TrackSelection;
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
@@ -31,50 +32,37 @@
 import de.dennisguse.opentracks.ui.aggregatedStatistics.DummyDataGenerator;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.FilterDialogFragment;
 
-public class SeasonalActivityPerSeason extends AbstractActivity
-{
-    public static final String EXTRA_TRACK_IDS = "track_ids";
+public class SeasonalActivityPerSeason extends AbstractActivity {
     private final TrackSelection selection = new TrackSelection();
     private AggregatedStatisticsModel viewModel;
     private AggregatedStatisticsAdapter adapter;
-    private MenuItem filterItem;
     private ActivitySeasonalPerSeasonBinding viewBinding;
+    private LocalDateTime from;
+    private LocalDateTime to;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-
         Bundle data = getIntent().getExtras();
+
         if (data != null)
         {
             changeTitle(data.getString("seasonTitle"));
         }
 
-        TextView distanceTraveledTextView = findViewById(R.id.distanceTraveled);
-        TextView totalTimeTextView = findViewById(R.id.totalTime);
-        TextView averageSpeedTextView = findViewById(R.id.avgSpeed);
-        TextView maxSpeedTextView = findViewById(R.id.maxSpeed);
-
-//        List<Track.Id> trackIds = getIntent().getParcelableArrayListExtra(EXTRA_TRACK_IDS);
-//        if (trackIds != null && !trackIds.isEmpty()) {
-//            trackIds.forEach(selection::addTrackId);
-//        }
-
         LinearLayoutManager layoutManager = new LinearLayoutManager(this);
         adapter = new AggregatedStatisticsAdapter(this, null);
         viewBinding.aggregatedRecyclerView.setLayoutManager(layoutManager);
         viewBinding.aggregatedRecyclerView.setAdapter(adapter);
-
         viewModel = new ViewModelProvider(this).get(AggregatedStatisticsModel.class);
+        selection.addActivityType("skiing");
 
-        LocalDateTime from = LocalDateTime.of(2024, 4, 1, 0, 0);
-        LocalDateTime to = LocalDateTime.of(2024, 4, 8, 20, 0);;
+        if(data != null && !Objects.equals(data.getString("seasonTitle"), getResources().getString(R.string.Life_Time_Data))){
+            setFromToDate(data.getString("seasonTitle"));
+            selection.addDateRange(from.atZone(ZoneId.systemDefault()).toInstant(), to.atZone(ZoneId.systemDefault()).toInstant());
+            viewModel.updateSelection(selection);
+        }
 
-        selection.addDateRange(from.atZone(ZoneId.systemDefault()).toInstant(), to.atZone(ZoneId.systemDefault()).toInstant());
-        viewModel.updateSelection(selection);
         viewModel.getAggregatedStats(selection).observe(this, aggregatedStatistics -> {
-//            if ((aggregatedStatistics == null || aggregatedStatistics.getCount() == 0) && !selection.isEmpty()) {
-//                viewBinding.seasonalEmptyText.setText("");
-//            }
             if (aggregatedStatistics != null) {
                 adapter.swapData(aggregatedStatistics);
             }
@@ -87,10 +75,10 @@ protected void onCreate(Bundle savedInstanceState) {
     private void checkListEmpty() {
         if (adapter.getItemCount() == 0) {
             viewBinding.aggregatedRecyclerView.setVisibility(View.GONE);
-            //viewBinding.seasonalEmptyText.setVisibility(View.VISIBLE);
+            viewBinding.seasonPerSeasonEmptyText.setVisibility(View.VISIBLE);
         } else {
             viewBinding.aggregatedRecyclerView.setVisibility(View.VISIBLE);
-            //viewBinding.seasonalEmptyText.setVisibility(View.GONE);
+            viewBinding.seasonPerSeasonEmptyText.setVisibility(View.GONE);
         }
     }
 
@@ -113,4 +101,19 @@ protected View getRootView() {
         viewBinding = ActivitySeasonalPerSeasonBinding.inflate(getLayoutInflater());
         return viewBinding.getRoot();
     }
+
+    private void setFromToDate(String title){
+        if(Objects.equals(title, getResources().getString(R.string.Winter_2024))){
+            from = LocalDateTime.of(2024, 1, 1, 0, 0);
+            to = LocalDateTime.of(2024, 4, 8, 23, 59);
+        }
+        else if(Objects.equals(title, getResources().getString(R.string.Winter_2023))){
+            from = LocalDateTime.of(2023, 1, 1, 0, 0);
+            to = LocalDateTime.of(2023, 4, 8, 23, 59);
+        }
+        else if(Objects.equals(title, getResources().getString(R.string.Winter_2022))){
+            from = LocalDateTime.of(2022, 1, 1, 0, 0);
+            to = LocalDateTime.of(2022, 4, 8, 23, 59);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/res/layout/activity_seasonal.xml b/src/main/res/layout/activity_seasonal.xml
index 8bd4d50a3..68e645099 100644
--- a/src/main/res/layout/activity_seasonal.xml
+++ b/src/main/res/layout/activity_seasonal.xml
@@ -49,7 +49,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="Life_Time_Data"
+            android:text="@string/Life_Time_Data"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -61,7 +61,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="2024 Winter Season"
+            android:text="@string/Winter_2024"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="2023 Winter Season"
+            android:text="@string/Winter_2023"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -85,7 +85,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:background="@android:color/white"
-            android:text="2022 Winter Season"
+            android:text="@string/Winter_2022"
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/src/main/res/layout/activity_seasonal_per_season.xml b/src/main/res/layout/activity_seasonal_per_season.xml
index d466df37c..2bb35109e 100644
--- a/src/main/res/layout/activity_seasonal_per_season.xml
+++ b/src/main/res/layout/activity_seasonal_per_season.xml
@@ -30,6 +30,7 @@
             android:id="@+id/textView15"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingLeft="15px"
             android:text="Favorite Resort"
             android:theme="@style/OpenTracksTheme" />
 
@@ -64,6 +65,7 @@
             android:id="@+id/textView19"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:paddingLeft="15px"
             android:text="Favorite Lifts"
             android:theme="@style/OpenTracksTheme" />
 
@@ -107,6 +109,13 @@
             android:text="5. Maple chair"
             android:textSize="25sp" />
 
+        <TextView
+            android:id="@+id/seasonPerSeasonEmptyText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="No Data for this season"
+            android:textAlignment="center" />
+
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/aggregated_recyclerView"
             android:layout_width="match_parent"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 44f608ea0..ca9d8b954 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -847,4 +847,10 @@ limitations under the License.
     <string name="tab_text_1">Tab 1</string>
     <string name="tab_text_2">Tab 2</string>
     <string name="calculate_moving_average">Moving Average</string>
+
+    <!-- Name of seasons & lifetime -->
+    <string name="Life_Time_Data">Life Time Data</string>
+    <string name="Winter_2024">Winter 2024 Season</string>
+    <string name="Winter_2023">Winter 2023 Season</string>
+    <string name="Winter_2022">Winter 2022 Season</string>
 </resources>
\ No newline at end of file

From 2b2723c89e88011bfadcca9ce19e127338597ad6 Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Mon, 8 Apr 2024 23:19:41 -0400
Subject: [PATCH 56/76] GUI elements fixed/changed

Fixed the per season page where the bottom appbar wasn't appear. Removed the icon from task list and moved it to the aggregated stats page. Among other fixed and small changes.
---
 .../java/de/dennisguse/opentracks/TrackListActivity.java  | 1 -
 .../AggregatedStatisticsActivity.java                     | 5 +++++
 src/main/res/layout/activity_seasonal.xml                 | 5 ++++-
 src/main/res/layout/activity_seasonal_per_season.xml      | 2 +-
 src/main/res/layout/track_list.xml                        | 8 --------
 src/main/res/menu/aggregated_statistics.xml               | 7 +++++++
 src/main/res/values/strings.xml                           | 1 +
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index 5a6559e39..2a11fe283 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -154,7 +154,6 @@ protected void onCreate(Bundle savedInstanceState) {
 
         viewBinding.friendsButton.setOnClickListener((view)->startActivity(IntentUtils.newIntent(this, FriendsActivity.class)));
         viewBinding.aggregatedStatsButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, AggregatedStatisticsActivity.class)));
-        viewBinding.aggregatedSeasonalStatsButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, SeasonalActivity.class)));
         viewBinding.leaderboardButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, LeaderboardActivity.class)));
         viewBinding.sensorStartButton.setOnClickListener((view) -> {
             LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
diff --git a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java
index 5e62c654d..731d61636 100644
--- a/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/ui/aggregatedStatistics/AggregatedStatisticsActivity.java
@@ -21,6 +21,7 @@
 
 import de.dennisguse.opentracks.AbstractActivity;
 import de.dennisguse.opentracks.R;
+import de.dennisguse.opentracks.SeasonalActivity;
 import de.dennisguse.opentracks.data.TrackSelection;
 import de.dennisguse.opentracks.data.models.Track;
 import de.dennisguse.opentracks.databinding.AggregatedStatsBinding;
@@ -125,6 +126,10 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
             return true;
         }
 
+        if(item.getItemId() == R.id.seasons_page){
+            startActivity(IntentUtils.newIntent(this, SeasonalActivity.class));
+        }
+
         return super.onOptionsItemSelected(item);
     }
 
diff --git a/src/main/res/layout/activity_seasonal.xml b/src/main/res/layout/activity_seasonal.xml
index 68e645099..98e4628a1 100644
--- a/src/main/res/layout/activity_seasonal.xml
+++ b/src/main/res/layout/activity_seasonal.xml
@@ -6,6 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:visibility="visible"
     tools:context=".SeasonalActivity">
 
 
@@ -24,6 +25,7 @@
                 android:id="@+id/season_list_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
+                android:visibility="visible"
                 app:navigationIcon="@drawable/ic_seasonal_activity_24dp"
                 app:title="Seasonal Data" />
         </com.google.android.material.appbar.AppBarLayout>
@@ -33,7 +35,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="There is no data for any season."
-            android:textAlignment="center" />
+            android:textAlignment="center"
+            android:visibility="invisible" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/seasons_recyclerView"
diff --git a/src/main/res/layout/activity_seasonal_per_season.xml b/src/main/res/layout/activity_seasonal_per_season.xml
index 2bb35109e..3cd553322 100644
--- a/src/main/res/layout/activity_seasonal_per_season.xml
+++ b/src/main/res/layout/activity_seasonal_per_season.xml
@@ -119,7 +119,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/aggregated_recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="496dp">
+            android:layout_height="wrap_content">
 
         </androidx.recyclerview.widget.RecyclerView>
 
diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index b06e15020..530ad34aa 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -116,14 +116,6 @@ limitations under the License.
             app:icon="@drawable/ic_statistics_24dp"
             app:iconTint="?attr/colorOnBackground" />
 
-        <com.google.android.material.button.MaterialButton
-            style="@style/Widget.Material3.Button.IconButton"
-            android:id="@+id/aggregated__seasonal_stats_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            app:icon="@drawable/ic_seasonal_activity_24dp"
-            app:iconTint="?attr/colorOnBackground" />
-
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sensor_start_button"
             style="@style/Widget.Material3.Button.IconButton"
diff --git a/src/main/res/menu/aggregated_statistics.xml b/src/main/res/menu/aggregated_statistics.xml
index a9c50b04d..6eec799b9 100644
--- a/src/main/res/menu/aggregated_statistics.xml
+++ b/src/main/res/menu/aggregated_statistics.xml
@@ -20,4 +20,11 @@
         app:iconTint="?attr/colorOnBackground"
         android:title="@string/daily_stats_name"
         />
+    <item
+        android:id="@+id/seasons_page"
+        android:icon="@drawable/ic_seasonal_activity_24dp"
+        app:showAsAction="always"
+        app:iconTint="?attr/colorOnBackground"
+        android:title="@string/icon_seasons_name"
+        />
 </menu>
\ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ca9d8b954..5483cdc1a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -849,6 +849,7 @@ limitations under the License.
     <string name="calculate_moving_average">Moving Average</string>
 
     <!-- Name of seasons & lifetime -->
+    <string name="icon_seasons_name">Seasonal Data</string>
     <string name="Life_Time_Data">Life Time Data</string>
     <string name="Winter_2024">Winter 2024 Season</string>
     <string name="Winter_2023">Winter 2023 Season</string>

From 6f44257c9da811c5534412fc38956bcdc60e2235 Mon Sep 17 00:00:00 2001
From: Etienne Plante <zerox029@gmail.com>
Date: Sat, 27 Apr 2024 12:44:57 -0400
Subject: [PATCH 57/76] Social toggle fix

---
 .../settings/UserProfileFragment.java         | 94 ++++++++++---------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index f3e9095b3..170b4facd 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -68,6 +68,7 @@
 import java.util.Arrays;
 import java.util.SortedSet;
 import java.util.TreeSet;
+import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -536,66 +537,67 @@ public String longToDateString(long milli){
     }
 
 
-    private void displayCustomSharingDialog(){
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-
-        // Array to store user information
-        String[] userInfo = new String[6];
-        int[] textViewIds = {R.id.nickname, R.id.userLocation, R.id.dateOfBirth, R.id.userHeight, R.id.userWeight, R.id.gender};
-
-        // Array to store detail labels
-        String[] detailNames = {"Nickname", "Location", "Date of Birth", "Height", "Weight", "Gender"};
+    private void displayCustomSharingDialog() {
+        ReadCallback sharingCallback = new ReadCallback() {
+            @Override
+            public void onSuccess(JsonObject data) {
+                UserModel user = JSONSerializable.fromJSON(data, UserModel.class);
 
-        StringBuilder alertMessageBuilder = new StringBuilder("Do you allow OpenTracks to store and display the following information on the leaderboard?\n\n");
+                AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 
-        // Retrieve values from TextViews and populate user info
-        for (int i = 0; i < textViewIds.length; i++) {
+                // Array to store user information
+                String[] userInfo = new String[6];
+                int[] textViewIds = {R.id.nickname, R.id.userLocation, R.id.dateOfBirth, R.id.userHeight, R.id.userWeight, R.id.gender};
 
-            TextView textView = getView().findViewById(textViewIds[i]);
+                // Array to store detail labels
+                String[] detailNames = {"Nickname", "Location", "Date of Birth", "Height", "Weight", "Gender"};
 
-            if(textView!=null) {
-                userInfo[i] = textView.getText().toString();
+                StringBuilder alertMessageBuilder = new StringBuilder("Do you allow OpenTracks to store and display the following information on the leaderboard?\n\n");
 
-                // Construct custom message
-                alertMessageBuilder.append(detailNames[i]).append(": ").append(userInfo[i]).append("\n");
+                // Retrieve values from TextViews and populate user info
+                for (int i = 0; i < textViewIds.length; i++) {
 
-            }
-        }
-
-
-        TextView heightText = getView().findViewById(R.id.userHeight);
-        String heightToEdit = heightText.getText().toString();
-        heightToEdit = removeCharsFromString(heightToEdit);
-        TextView weightText = getView().findViewById(R.id.userWeight);
-        String weightToEdit = weightText.getText().toString();
-        weightToEdit= removeCharsFromString(weightToEdit);
+                    TextView textView = getView().findViewById(textViewIds[i]);
 
-        UserModel user = new UserModel(userInfo[0], userInfo[1], dateToLong(userInfo[2]), userInfo[5], Integer.valueOf(heightToEdit), Integer.valueOf(weightToEdit));
+                    if(textView!=null) {
+                        userInfo[i] = textView.getText().toString();
 
+                        // Construct custom message
+                        alertMessageBuilder.append(detailNames[i]).append(": ").append(userInfo[i]).append("\n");
 
-        String alertMessage = alertMessageBuilder.toString();
+                    }
+                }
 
-        builder.setTitle("Confirm Selection")
+                String alertMessage = alertMessageBuilder.toString();
 
-                .setMessage(alertMessage)
-                .setPositiveButton("ALLOW", (dialog, which) -> {
+                builder.setTitle("Confirm Selection")
+                        .setMessage(alertMessage)
+                        .setPositiveButton("ALLOW", (dialog, which) -> {
 //                    UserModel userModel = new UserModel(); // Assume you have a way to initialize or get the current UserModel
 //                    userModel.setSocialAllow(true);
-                    showToast("Updated sharing permissions and data will be shared on the leaderboard.");
-                    leaderboardSwitch.setChecked(true); // Visually indicate sharing is enabled
-                    user.setSocialAllow(true);
-                    FirestoreCRUDUtil.getInstance().createEntry("users", uniqueId(), user.toJSON(), null);
-                })
-                .setNegativeButton("DENY", (dialog, which) -> {
+                            showToast("Updated sharing permissions and data will be shared on the leaderboard.");
+                            leaderboardSwitch.setChecked(true); // Visually indicate sharing is enabled
+                            user.setSocialAllow(true);
+                            FirestoreCRUDUtil.getInstance().updateEntry("users", uniqueId(), user.toJSON(), null);
+                        })
+                        .setNegativeButton("DENY", (dialog, which) -> {
 //                    UserModel userModel = new UserModel(); // we need to get current UserID and initialize.
- //                   userModel.setSocialAllow(false);
-                    showToast("Sharing not enabled. Data will remain private.");
-                    leaderboardSwitch.setChecked(false); // Visually indicate sharing is not enabled
-                    user.setSocialAllow(false);
-                    FirestoreCRUDUtil.getInstance().createEntry("users", uniqueId(), user.toJSON(), null);
-                })
-                .show();
+                            //                   userModel.setSocialAllow(false);
+                            showToast("Sharing not enabled. Data will remain private.");
+                            leaderboardSwitch.setChecked(false); // Visually indicate sharing is not enabled
+                            user.setSocialAllow(false);
+                            FirestoreCRUDUtil.getInstance().updateEntry("users", uniqueId(), user.toJSON(), null);
+                        })
+                        .show();
+            }
+
+            @Override
+            public void onFailure() {
+                showToast("Please save your user profile first");
+            }
+        };
+
+        FirestoreCRUDUtil.getInstance().getEntry("users", uniqueId(), sharingCallback);
     }
     @Override
     //TODO: fix this

From 9b4ebb12f333af630352aca5706d8d0618cb80bb Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 15:16:19 -0400
Subject: [PATCH 58/76] Begun issue 84 implementation

---
 .../opentracks/TrackEditActivity.java         |  4 ++
 .../opentracks/data/models/Track.java         | 10 ++++
 .../opentracks/data/models/TrackSkiGear.java  | 34 ++++++++++++
 src/main/res/layout/track_edit_fields.xml     | 53 +++++++++++++++++--
 4 files changed, 96 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/de/dennisguse/opentracks/data/models/TrackSkiGear.java

diff --git a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
index bb0f90303..16f66886a 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackEditActivity.java
@@ -93,6 +93,10 @@ protected void onCreate(Bundle bundle) {
             activityType = track.getActivityType();
         }
 
+        if (activityType != ActivityType.SKIING) {
+            viewBinding.fields.trackEditGear.setVisibility(View.INVISIBLE);
+        }
+
         setActivityTypeIcon(activityType);
         viewBinding.fields.trackEditActivityTypeIcon.setOnClickListener(v -> ChooseActivityTypeDialogFragment.showDialog(getSupportFragmentManager(), this, viewBinding.fields.trackEditActivityType.getText().toString()));
 
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/Track.java b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
index 7dcaa44c9..e560e4a95 100644
--- a/src/main/java/de/dennisguse/opentracks/data/models/Track.java
+++ b/src/main/java/de/dennisguse/opentracks/data/models/Track.java
@@ -52,6 +52,8 @@ public class Track {
 
     private TrackStatistics trackStatistics = new TrackStatistics();
 
+    private TrackSkiGear trackSkiGear = new TrackSkiGear();
+
     @VisibleForTesting
     public Track() {
         this(ZoneOffset.UTC);
@@ -130,6 +132,14 @@ public void setTrackStatistics(@NonNull TrackStatistics trackStatistics) {
         this.trackStatistics = trackStatistics;
     }
 
+    public TrackSkiGear getTrackSkiGear() {
+        return trackSkiGear;
+    }
+
+    public void setTrackSkiGear(TrackSkiGear trackSkiGear) {
+        this.trackSkiGear = trackSkiGear;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/src/main/java/de/dennisguse/opentracks/data/models/TrackSkiGear.java b/src/main/java/de/dennisguse/opentracks/data/models/TrackSkiGear.java
new file mode 100644
index 000000000..8db90963c
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/data/models/TrackSkiGear.java
@@ -0,0 +1,34 @@
+package de.dennisguse.opentracks.data.models;
+
+public class TrackSkiGear {
+
+    private String skis;
+
+    private String boots;
+
+    private String poles;
+
+    public String getSkis() {
+        return skis;
+    }
+
+    public void setSkis(String skis) {
+        this.skis = skis;
+    }
+
+    public String getBoots() {
+        return boots;
+    }
+
+    public void setBoots(String boots) {
+        this.boots = boots;
+    }
+
+    public String getPoles() {
+        return poles;
+    }
+
+    public void setPoles(String poles) {
+        this.poles = poles;
+    }
+}
diff --git a/src/main/res/layout/track_edit_fields.xml b/src/main/res/layout/track_edit_fields.xml
index 4aa4af6e6..5918a7eab 100644
--- a/src/main/res/layout/track_edit_fields.xml
+++ b/src/main/res/layout/track_edit_fields.xml
@@ -34,13 +34,13 @@
             android:orientation="horizontal">
 
             <com.google.android.material.textfield.TextInputLayout
+                style="?attr/textInputOutlinedExposedDropdownMenuStyle"
                 android:layout_width="0dp"
-                android:layout_weight="1"
                 android:layout_height="wrap_content"
-                style="?attr/textInputOutlinedExposedDropdownMenuStyle"
+                android:layout_marginBottom="16dp"
+                android:layout_weight="1"
                 android:imeOptions="actionNext"
-                android:importantForAutofill="no"
-                android:layout_marginBottom="16dp">
+                android:importantForAutofill="no">
 
                 <com.google.android.material.textfield.MaterialAutoCompleteTextView
                     android:id="@+id/track_edit_activity_type"
@@ -58,7 +58,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:layout_gravity="bottom"
-                tools:src="@drawable/ic_activity_bike_24dp"/>
+                tools:src="@drawable/ic_activity_bike_24dp" />
 
         </LinearLayout>
 
@@ -80,5 +80,48 @@
 
         </com.google.android.material.textfield.TextInputLayout>
 
+        <LinearLayout
+            android:id="@+id/track_edit_gear"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="16dp">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/track_edit_skis"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Skis" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="16dp">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/track_edit_boots"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Boots" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="16dp">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/track_edit_poles"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="Poles" />
+            </com.google.android.material.textfield.TextInputLayout>
+        </LinearLayout>
+
     </LinearLayout>
 </ScrollView>

From 38cf65a755601ee7ba17be0b0de0387b952c1cc0 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 15:49:30 -0400
Subject: [PATCH 59/76] Got the image picker for the profile to work

---
 build.gradle                                  |  1 +
 .../settings/UserProfileFragment.java         | 97 ++++++++++++++++++-
 src/main/res/layout/track_view_gear.xml       |  6 ++
 3 files changed, 102 insertions(+), 2 deletions(-)
 create mode 100644 src/main/res/layout/track_view_gear.xml

diff --git a/build.gradle b/build.gradle
index b202f2756..41c6009e8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -139,6 +139,7 @@ dependencies {
     implementation 'androidx.mediarouter:mediarouter:1.6.0'
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
     implementation 'com.google.code.gson:gson:2.10.1'
+    implementation 'com.github.dhaval2404:imagepicker:2.1'
 
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 2672d856a..d17ea4cd3 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -3,22 +3,36 @@
 import static de.dennisguse.opentracks.settings.PreferencesUtils.getUnitSystem;
 
 import android.app.AlertDialog;
+import android.app.Activity;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.net.Uri;
 import android.util.Log;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.Button;
 import android.widget.EditText;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.Intent;
+import androidx.core.content.ContextCompat;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.DialogFragment;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.SwitchPreference;
+import androidx.core.app.ActivityCompat;
+
+import com.github.dhaval2404.imagepicker.ImagePicker;
+
+import java.util.Objects;
 
 import de.dennisguse.opentracks.R;
 import de.dennisguse.opentracks.data.models.Height;
@@ -28,10 +42,29 @@
 import de.dennisguse.opentracks.data.models.Weight;
 import de.dennisguse.opentracks.data.models.WeightFormatter;
 
+// You can choose any value for the request code
+
+
 public class UserProfileFragment extends PreferenceFragmentCompat {
 
+    private static final int PERMISSION_REQUEST_CODE = 1001;
+    private static final int IMAGE_PICKER_REQUEST_CODE = 101;
+
+
     SwitchPreference leaderboardSwitch;
 
+    private void startImagePicker() {
+        try {
+            ImagePicker.with(this)
+                    .crop()
+                    .compress(1024)
+                    .maxResultSize(1080, 1080)
+                    .start();
+        } catch (Exception e) {
+            Log.e("UserProfileFragment", "Error starting image picker: " + e.getMessage());
+        }
+    }
+
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.settings_user_profile);
@@ -44,6 +77,28 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
             });
         }
 
+        Preference editProfilePic = findPreference("edit_profile_pic");
+        if (editProfilePic != null) {
+            editProfilePic.setOnPreferenceClickListener(preference -> {
+                Log.d("UserProfileFragment", "Edit profile picture button clicked");
+                // Check if permission is granted
+                if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED ||
+                        ContextCompat.checkSelfPermission(getContext(), Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED) {
+                    // Permission is not granted, request it from the user
+                    ActivityCompat.requestPermissions(getActivity(),
+                            new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.CAMERA},
+                            PERMISSION_REQUEST_CODE);
+                    if (ContextCompat.checkSelfPermission(getContext(), Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED ||
+                            ContextCompat.checkSelfPermission(getContext(), Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
+                        // Permission is already granted, start the image picker
+                        Log.d("UserProfileFragment", "Calling startImagePicker()");
+                        startImagePicker();
+                    }
+                }
+                return true;
+            });
+        }
+
         // Check toggle status for leaderboard preferences
         leaderboardSwitch = findPreference("leaderboard_switch");
         assert leaderboardSwitch != null;
@@ -62,6 +117,44 @@ public boolean onPreferenceClick(@NonNull Preference preference) {
         });
     }
 
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (requestCode == PERMISSION_REQUEST_CODE) {
+            boolean allPermissionsGranted = true;
+            for (int grantResult : grantResults) {
+                if (grantResult != PackageManager.PERMISSION_GRANTED) {
+                    allPermissionsGranted = false;
+                    break;
+                }
+            }
+
+            if (allPermissionsGranted) {
+                Log.d("UserProfileFragment", "Permissions granted, starting image picker");
+                startImagePicker();
+            } else {
+                Toast.makeText(getContext(), "Permission denied", Toast.LENGTH_SHORT).show();
+            }
+        } else {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        }
+    }
+
+    @Override
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        Uri imageUri = data.getData();
+        if (imageUri != null) {
+            // Update the profile picture with the selected image
+            updateProfilePicture(imageUri);
+        }
+    }
+
+    private void updateProfilePicture(Uri imageUri) {
+        // Load the image from the URI and set it to the profile picture ImageView
+        ImageView profilePictureImageView = requireView().findViewById(R.id.profileImageView);
+        profilePictureImageView.setImageURI(imageUri);
+    }
+
     private void showEditProfileDialog() {
         // Inflate the custom layout for the edit dialog.
         View formView = LayoutInflater.from(getContext()).inflate(R.layout.edit_profile_form, null);
@@ -126,7 +219,6 @@ private boolean validateInputs(String nickname, String dateOfBirth, String heigh
 
         return true;
     }
-
     private void displayCustomSharingDialog(){
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
@@ -220,4 +312,5 @@ public void onDisplayPreferenceDialog(Preference preference) {
     }
 
 
-}
+
+}
\ No newline at end of file
diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
new file mode 100644
index 000000000..77d9ef65f
--- /dev/null
+++ b/src/main/res/layout/track_view_gear.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From c2d85fe61c3fef64d582e77a6d99362e342dfdf5 Mon Sep 17 00:00:00 2001
From: Etienne Plante <zerox029@gmail.com>
Date: Sat, 27 Apr 2024 16:31:12 -0400
Subject: [PATCH 60/76] Fixed issues introduced by merge conflict resolution

---
 .../opentracks/settings/UserProfileFragment.java     | 12 ------------
 src/main/res/values/strings.xml                      |  2 --
 2 files changed, 14 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
index 11db29a42..6fe9b1821 100644
--- a/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
+++ b/src/main/java/de/dennisguse/opentracks/settings/UserProfileFragment.java
@@ -100,18 +100,6 @@ private void startImagePicker() {
         }
     }
 
-    private void startImagePicker() {
-        try {
-            ImagePicker.with(this)
-                    .crop()
-                    .compress(1024)
-                    .maxResultSize(1080, 1080)
-                    .start();
-        } catch (Exception e) {
-            Log.e("UserProfileFragment", "Error starting image picker: " + e.getMessage());
-        }
-    }
-
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
         addPreferencesFromResource(R.xml.settings_user_profile);
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ede5b509d..68ba027ba 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -900,8 +900,6 @@ limitations under the License.
     <string name="tab_text_1">Tab 1</string>
     <string name="tab_text_2">Tab 2</string>
 
-    <string name="calculate_moving_average">Moving Average</string>\
-
     <string name="settings_skiing_type_title">Type of Skiing</string>
     <string name="settings_skiing_type_option_1">Downhill</string>
     <string name="settings_skiing_type_option_2">Touring</string>

From 85f611a9a6eb6b4190f3d67fc2d432dae3192933 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 16:39:06 -0400
Subject: [PATCH 61/76] Made some stuff for the view_gear

---
 src/main/res/layout/track_view_gear.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 77d9ef65f..727451421 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:layout_marginEnd="20dp"
+        android:text="Ski Gear Tracker"
+        android:textSize="40sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 8c2c2bbca54e82e754d7a6f8c6c96e01d8f6a800 Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Sat, 27 Apr 2024 16:39:37 -0400
Subject: [PATCH 62/76] Ski Gear icon

---
 src/main/res/drawable/ic_ski_gear.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 src/main/res/drawable/ic_ski_gear.xml

diff --git a/src/main/res/drawable/ic_ski_gear.xml b/src/main/res/drawable/ic_ski_gear.xml
new file mode 100644
index 000000000..7a789ed45
--- /dev/null
+++ b/src/main/res/drawable/ic_ski_gear.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="222.92"
+    android:viewportHeight="222.92"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M96.13,0h-0.14c-6.67,0 -12.1,5.43 -12.1,12.1v205.82c0,2.76 2.24,5 5,5h14.34c2.76,0 5,-2.24 5,-5V12.1C108.23,5.43 102.8,0 96.13,0zM103.23,157.77c0,3.96 -3.21,7.17 -7.17,7.17c-3.96,0 -7.17,-3.21 -7.17,-7.17V124.87c0,-3.96 3.21,-7.17 7.17,-7.17c3.96,0 7.17,3.21 7.17,7.17V157.77zM127.93,0h-0.14c-6.67,0 -12.1,5.43 -12.1,12.1v205.82c0,2.76 2.24,5 5,5h14.34c2.76,0 5,-2.24 5,-5V12.1C140.03,5.43 134.6,0 127.93,0zM135.03,157.77c0,3.96 -3.21,7.17 -7.17,7.17c-3.96,0 -7.17,-3.21 -7.17,-7.17V124.87c0,-3.96 3.21,-7.17 7.17,-7.17c3.96,0 7.17,3.21 7.17,7.17V157.77zM66.57,195.57c-1.54,-2.29 -4.65,-2.9 -6.94,-1.37l-0.27,0.18V46.96h0.37c2.76,0 5,-2.24 5,-5V10.77c0,-5.69 -4.63,-10.32 -10.32,-10.32h-0.11c-5.69,0 -10.32,4.63 -10.32,10.32v26.84c-5.85,1.12 -15.7,4.13 -21.34,12.12c-3.41,4.83 -3.95,10.6 -1.44,15.45c2.27,4.39 6.66,7.11 11.44,7.11c0,0 0,0 0,0c4.26,0 8.43,-2.17 11.73,-6.1c2.08,-2.48 3.7,-4.95 4.98,-7.32v142.24l-4.31,2.89c-2.29,1.54 -2.9,4.64 -1.37,6.94c0.96,1.44 2.55,2.21 4.16,2.21c0.51,0 1.02,-0.08 1.52,-0.24v5.01c0,2.76 2.24,5 5,5s5,-2.24 5,-5v-11.48l5.85,-3.92C67.49,200.98 68.11,197.87 66.57,195.57zM36.71,59.76c-1.37,1.63 -2.81,2.53 -4.06,2.53c-1.24,0 -2.13,-0.89 -2.57,-1.72c-0.77,-1.48 -0.5,-3.34 0.73,-5.08c2.94,-4.16 8.1,-6.32 12.23,-7.43C42.12,51.29 40.3,55.49 36.71,59.76zM200.27,49.73c-5.64,-7.99 -15.5,-11.01 -21.34,-12.12V10.77c0,-5.69 -4.63,-10.32 -10.32,-10.32h-0.11c-5.69,0 -10.32,4.63 -10.32,10.32v31.19c0,2.76 2.24,5 5,5h0.37v147.43l-0.27,-0.18c-2.29,-1.54 -5.4,-0.93 -6.94,1.37s-0.93,5.4 1.37,6.94l5.85,3.92v11.48c0,2.76 2.24,5 5,5s5,-2.24 5,-5v-5.01c0.5,0.16 1.01,0.24 1.52,0.24c1.61,0 3.19,-0.78 4.16,-2.21c1.54,-2.29 0.93,-5.4 -1.37,-6.94l-4.31,-2.89V58.85c1.28,2.38 2.9,4.85 4.98,7.33c3.3,3.94 7.46,6.1 11.73,6.1c0,0 0,0 0,0c4.78,0 9.17,-2.73 11.44,-7.11C204.22,60.33 203.68,54.56 200.27,49.73zM192.83,60.58c-0.43,0.83 -1.33,1.71 -2.56,1.71c0,0 0,0 0,0c-1.26,0 -2.7,-0.9 -4.06,-2.53c-3.61,-4.3 -5.43,-8.49 -6.35,-11.7c4.13,1.1 9.3,3.26 12.25,7.43C193.34,57.24 193.6,59.09 192.83,60.58z"
+      android:fillColor="#FF000000"/>
+    <!-- Icon taken from: https://www.svgrepo.com/svg/168304/ski-equipment -->
+</vector>

From f81188dd03f2c821bf1216266c3aad9baa48d3cf Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 16:44:43 -0400
Subject: [PATCH 63/76] Implemented the gear icon

---
 src/main/res/layout/track_list.xml      |  8 ++++++++
 src/main/res/layout/track_view_gear.xml | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/main/res/layout/track_list.xml b/src/main/res/layout/track_list.xml
index 530ad34aa..90c0074d8 100644
--- a/src/main/res/layout/track_list.xml
+++ b/src/main/res/layout/track_list.xml
@@ -150,6 +150,14 @@ limitations under the License.
             app:icon="@drawable/profile_icon"
             app:iconTint="?attr/colorOnBackground" />
 
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/gear_button"
+            style="@style/Widget.Material3.Button.IconButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:icon="@drawable/ic_ski_gear"
+            app:iconTint="?attr/colorOnBackground" />
+
     </com.google.android.material.bottomappbar.BottomAppBar>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 727451421..f06826c1e 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -15,4 +15,15 @@
         android:textSize="40sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/textView6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:text="Select gear that was rented"
+        android:textSize="18sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d56e7bc2f77f22d52fdf8aab699ef4b18bcc6692 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:05:43 -0400
Subject: [PATCH 64/76] Created the main layout for 84

---
 src/main/res/layout/track_view_gear.xml | 142 ++++++++++++++++++++++--
 1 file changed, 130 insertions(+), 12 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index f06826c1e..c51785085 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -6,24 +6,142 @@
     android:layout_height="match_parent">
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/infoSkiGear"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="20dp"
-        android:text="Ski Gear Tracker"
-        android:textSize="40sp"
+        android:layout_marginTop="10dp"
+        android:text="Select gear that was rented"
+        android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
-        android:id="@+id/textView6"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+    <LinearLayout
+        android:layout_width="409dp"
+        android:layout_height="540dp"
         android:layout_marginTop="10dp"
-        android:text="Select gear that was rented"
-        android:textSize="18sp"
+        android:orientation="vertical"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
+        app:layout_constraintTop_toBottomOf="@+id/infoSkiGear">
+
+        <LinearLayout
+            android:id="@+id/skiLinearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="visible">
+
+            <LinearLayout
+                android:id="@+id/skiLeftLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10sp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/skiTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Skis"
+                    android:textSize="18sp" />
+
+                <Spinner
+                    android:id="@+id/skiDropDown"
+                    android:layout_width="190dp"
+                    android:layout_height="wrap_content"
+                    android:background="@android:drawable/btn_dropdown"
+                    android:spinnerMode="dropdown" />
+            </LinearLayout>
+
+            <Switch
+                android:id="@+id/skiRentedSwitch"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="10sp"
+                android:layout_weight="1"
+                android:text="Rented?" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/bootLinearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="visible">
+
+            <LinearLayout
+                android:id="@+id/bootLeftLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10sp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/bootTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Boots"
+                    android:textSize="18sp" />
+
+                <Spinner
+                    android:id="@+id/bootDropDown"
+                    android:layout_width="190dp"
+                    android:layout_height="wrap_content"
+                    android:background="@android:drawable/btn_dropdown"
+                    android:spinnerMode="dropdown" />
+            </LinearLayout>
+
+            <Switch
+                android:id="@+id/bootRentedSwitch"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="10sp"
+                android:layout_weight="1"
+                android:text="Rented?" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/poleLinearLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="visible">
+
+            <LinearLayout
+                android:id="@+id/poleLeftLayout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_margin="10sp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/poleTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Poles"
+                    android:textSize="18sp" />
+
+                <Spinner
+                    android:id="@+id/poleDropDown"
+                    android:layout_width="190dp"
+                    android:layout_height="wrap_content"
+                    android:background="@android:drawable/btn_dropdown"
+                    android:spinnerMode="dropdown" />
+            </LinearLayout>
+
+            <Switch
+                android:id="@+id/poleRentedSwitch"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="10sp"
+                android:layout_weight="1"
+                android:text="Rented?" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b33f49cc648d8795b5d6d550e4cfc1430c25381f Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Sat, 27 Apr 2024 17:35:01 -0400
Subject: [PATCH 65/76] Added activity for Gear Track

Added the icon to track list. Made the intent to the track gear page. Created the activity for track gear, and added the activity to the manifest file
---
 src/main/AndroidManifest.xml                  |  2 +
 .../opentracks/SeasonalActivity.java          | 11 +++---
 .../opentracks/TrackListActivity.java         |  1 +
 .../opentracks/TrackViewGearActivity.java     | 32 ++++++++++++++++
 src/main/res/layout/track_view_gear.xml       | 37 +++++++++++++------
 5 files changed, 65 insertions(+), 18 deletions(-)
 create mode 100644 src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b4361b738..0c2dc56f4 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -382,6 +382,8 @@
         <activity
             android:name=".SeasonalActivity"
             android:exported="false" />
+        <activity android:name=".TrackViewGearActivity"
+            android:exported="false" />
         <provider
             android:name=".data.ShareContentProvider"
             android:authorities="${applicationId}.content"
diff --git a/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java b/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
index 99ce1f7c0..ec78b7822 100644
--- a/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/SeasonalActivity.java
@@ -1,9 +1,5 @@
 package de.dennisguse.opentracks;
-
-import static android.app.PendingIntent.getActivity;
-
 import android.content.Intent;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
 
@@ -22,7 +18,10 @@
 import de.dennisguse.opentracks.databinding.ActivitySeasonalBinding;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsAdapter;
 import de.dennisguse.opentracks.ui.aggregatedStatistics.AggregatedStatisticsModel;
-import de.dennisguse.opentracks.ui.aggregatedStatistics.StatisticsActivity;
+
+import static android.app.PendingIntent.getActivity;
+
+import android.os.Bundle;
 
 
 /**
@@ -41,7 +40,7 @@ public class SeasonalActivity extends AbstractActivity {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setTitle("Seasonal Activity!");
+        setTitle("Seasonal Activity");
         seasonsRecyclerView = findViewById(R.id.seasons_recyclerView);
 
         GoToIndividualSite(findViewById(R.id.Winter2022_Button));
diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index 2a11fe283..8492389fe 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -154,6 +154,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         viewBinding.friendsButton.setOnClickListener((view)->startActivity(IntentUtils.newIntent(this, FriendsActivity.class)));
         viewBinding.aggregatedStatsButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, AggregatedStatisticsActivity.class)));
+        viewBinding.gearButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, TrackViewGearActivity.class)));
         viewBinding.leaderboardButton.setOnClickListener((view) -> startActivity(IntentUtils.newIntent(this, LeaderboardActivity.class)));
         viewBinding.sensorStartButton.setOnClickListener((view) -> {
             LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE);
diff --git a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
new file mode 100644
index 000000000..dfc4825ea
--- /dev/null
+++ b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
@@ -0,0 +1,32 @@
+package de.dennisguse.opentracks;
+
+import android.os.Bundle;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import de.dennisguse.opentracks.databinding.TrackViewGearBinding;
+
+/**
+ * Allow the user to select their gear for the resort they went to at what date.
+ *
+ * @author Sean Gregory, Zachary Therrien
+ * */
+public class TrackViewGearActivity extends AbstractActivity{
+
+    private TrackViewGearBinding viewBinding;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setTitle("Ski Gear Tracker");
+
+        setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
+    }
+
+    @Override
+    protected View getRootView() {
+        viewBinding = TrackViewGearBinding.inflate(getLayoutInflater());
+        return viewBinding.getRoot();
+    }
+}
diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index c51785085..9fbd0ba7d 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -5,17 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/infoSkiGear"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:text="Select gear that was rented"
-        android:textSize="18sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <LinearLayout
         android:layout_width="409dp"
         android:layout_height="540dp"
@@ -25,6 +14,28 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/infoSkiGear">
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/season_list_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:visibility="visible"
+                app:navigationIcon="@drawable/ic_seasonal_activity_24dp"
+                app:title="Seasonal Data" />
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <TextView
+            android:id="@+id/infoSkiGear"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="Select gear that was rented"
+            android:textAlignment="center"
+            android:textSize="18sp" />
+
         <LinearLayout
             android:id="@+id/skiLinearLayout"
             android:layout_width="match_parent"
@@ -143,5 +154,7 @@
         </LinearLayout>
 
     </LinearLayout>
-
+    <include
+        android:id="@+id/bottom_app_bar_layout"
+        layout="@layout/bottomappbar" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From a6f21a3ff96b843876d458c4b5c7cc6a4bb95680 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:35:51 -0400
Subject: [PATCH 66/76] Updated with proper padding

---
 src/main/res/layout/track_view_gear.xml | 64 +++++++++++++++++++++----
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index c51785085..5014b716f 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -17,13 +17,58 @@
         app:layout_constraintTop_toTopOf="parent" />
 
     <LinearLayout
-        android:layout_width="409dp"
-        android:layout_height="540dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
         android:layout_marginTop="10dp"
         android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/infoSkiGear">
+        app:layout_constraintTop_toBottomOf="@+id/infoSkiGear"
+        tools:layout_editor_absoluteX="10dp">
+
+        <LinearLayout
+            android:id="@+id/resortDateLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:paddingBottom="30px">
+
+            <LinearLayout
+                android:id="@+id/resortLayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/resortTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Resort"
+                    android:textAlignment="center" />
+
+                <Spinner
+                    android:id="@+id/resortDropDown"
+                    android:layout_width="190dp"
+                    android:layout_height="wrap_content"
+                    android:background="@android:drawable/btn_dropdown"
+                    android:spinnerMode="dropdown"
+                    android:textAlignment="center" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/dateTitle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="Date"
+                    android:textAlignment="center" />
+            </LinearLayout>
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/skiLinearLayout"
@@ -51,7 +96,8 @@
                     android:layout_width="190dp"
                     android:layout_height="wrap_content"
                     android:background="@android:drawable/btn_dropdown"
-                    android:spinnerMode="dropdown" />
+                    android:spinnerMode="dropdown"
+                    android:textAlignment="center" />
             </LinearLayout>
 
             <Switch
@@ -90,7 +136,8 @@
                     android:layout_width="190dp"
                     android:layout_height="wrap_content"
                     android:background="@android:drawable/btn_dropdown"
-                    android:spinnerMode="dropdown" />
+                    android:spinnerMode="dropdown"
+                    android:textAlignment="center" />
             </LinearLayout>
 
             <Switch
@@ -129,7 +176,8 @@
                     android:layout_width="190dp"
                     android:layout_height="wrap_content"
                     android:background="@android:drawable/btn_dropdown"
-                    android:spinnerMode="dropdown" />
+                    android:spinnerMode="dropdown"
+                    android:textAlignment="center" />
             </LinearLayout>
 
             <Switch

From 7edc928a0d0ede13c597e574107f524c64f6a2f9 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:37:24 -0400
Subject: [PATCH 67/76] Reformatted it properly

---
 src/main/res/layout/track_view_gear.xml | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index af5c6f242..fdab6b288 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -14,6 +14,20 @@
         app:layout_constraintTop_toBottomOf="@+id/infoSkiGear"
         tools:layout_editor_absoluteX="10dp">
 
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/season_list_toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:visibility="visible"
+                app:navigationIcon="@drawable/ic_seasonal_activity_24dp"
+                app:title="Seasonal Data" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
         <LinearLayout
             android:id="@+id/resortDateLayout"
             android:layout_width="match_parent"
@@ -59,19 +73,6 @@
             </LinearLayout>
         </LinearLayout>
 
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/season_list_toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:visibility="visible"
-                app:navigationIcon="@drawable/ic_seasonal_activity_24dp"
-                app:title="Seasonal Data" />
-        </com.google.android.material.appbar.AppBarLayout>
-
         <TextView
             android:id="@+id/infoSkiGear"
             android:layout_width="match_parent"

From afd23e43b7f25dbdccbe41532e218613bebb93da Mon Sep 17 00:00:00 2001
From: Zachary Therrien <ZTherrien.work@gmail.com>
Date: Sat, 27 Apr 2024 17:41:07 -0400
Subject: [PATCH 68/76] Small fix to the Track Gear view

---
 src/main/res/layout/track_view_gear.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index fdab6b288..30eee484f 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -11,7 +11,6 @@
         android:layout_margin="10dp"
         android:layout_marginTop="10dp"
         android:orientation="vertical"
-        app:layout_constraintTop_toBottomOf="@+id/infoSkiGear"
         tools:layout_editor_absoluteX="10dp">
 
         <com.google.android.material.appbar.AppBarLayout
@@ -23,8 +22,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 android:visibility="visible"
-                app:navigationIcon="@drawable/ic_seasonal_activity_24dp"
-                app:title="Seasonal Data" />
+                app:navigationIcon="@drawable/ic_ski_gear"
+                app:title="Ski Gear Tracker" />
 
         </com.google.android.material.appbar.AppBarLayout>
 

From d69f4de0039af9723f168c46d8b00ebe37ace4a5 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:42:22 -0400
Subject: [PATCH 69/76] Found out how to populate dropdown

---
 .../dennisguse/opentracks/TrackViewGearActivity.java | 12 ++++++++++++
 src/main/res/layout/track_view_gear.xml              |  8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
index dfc4825ea..1d78d16ab 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
@@ -2,6 +2,8 @@
 
 import android.os.Bundle;
 import android.view.View;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
 
 import androidx.annotation.Nullable;
 
@@ -21,6 +23,16 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle("Ski Gear Tracker");
 
+        //get the spinner from the xml.
+        Spinner skiDropdown = findViewById(R.id.skiDropDown);
+        //create a list of items for the spinner.
+        String[] items = new String[]{"coolSki", "epicSki", "ski3"};
+        //create an adapter to describe how the items are displayed, adapters are used in several places in android.
+        //There are multiple variations of this, but this is the basic variant.
+        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items);
+        //set the spinners adapter to the previously created one.
+        skiDropdown.setAdapter(adapter);
+
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 
diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index fdab6b288..cf72701f6 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -150,6 +150,10 @@
                     android:background="@android:drawable/btn_dropdown"
                     android:spinnerMode="dropdown"
                     android:textAlignment="center" />
+
+                <include
+                    android:id="@+id/bottom_app_bar_layout"
+                    layout="@layout/bottomappbar" />
             </LinearLayout>
 
             <Switch
@@ -203,7 +207,5 @@
         </LinearLayout>
 
     </LinearLayout>
-    <include
-        android:id="@+id/bottom_app_bar_layout"
-        layout="@layout/bottomappbar" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From b1d3f73c990faa8aed0b12ff92f32db161806dcb Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:44:00 -0400
Subject: [PATCH 70/76] Fixed the bottom portion

---
 src/main/res/layout/track_view_gear.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 0281f6d97..19f385933 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -7,11 +7,11 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:layout_margin="10dp"
-        android:layout_marginTop="10dp"
         android:orientation="vertical"
-        tools:layout_editor_absoluteX="10dp">
+        tools:layout_editor_absoluteX="10dp"
+        tools:layout_editor_absoluteY="10dp">
 
         <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
@@ -150,9 +150,6 @@
                     android:spinnerMode="dropdown"
                     android:textAlignment="center" />
 
-                <include
-                    android:id="@+id/bottom_app_bar_layout"
-                    layout="@layout/bottomappbar" />
             </LinearLayout>
 
             <Switch
@@ -207,4 +204,10 @@
 
     </LinearLayout>
 
+    <include
+        android:id="@+id/bottom_app_bar_layout"
+        layout="@layout/bottomappbar"
+        tools:layout_editor_absoluteX="10dp"
+        tools:layout_editor_absoluteY="463dp" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From 54a38e1d66ac81c03157092a7c8b7685e105f65a Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:47:53 -0400
Subject: [PATCH 71/76] Fixed the format

---
 src/main/res/layout/track_view_gear.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 19f385933..9dae09ea8 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -90,9 +90,9 @@
 
             <LinearLayout
                 android:id="@+id/skiLeftLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="10sp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
                 android:orientation="vertical">
 
                 <TextView
@@ -116,7 +116,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_margin="10sp"
-                android:layout_weight="1"
+                android:layout_weight="2"
                 android:text="Rented?" />
 
         </LinearLayout>
@@ -130,9 +130,9 @@
 
             <LinearLayout
                 android:id="@+id/bootLeftLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="10sp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
                 android:orientation="vertical">
 
                 <TextView
@@ -157,7 +157,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_margin="10sp"
-                android:layout_weight="1"
+                android:layout_weight="2"
                 android:text="Rented?" />
 
         </LinearLayout>
@@ -171,9 +171,9 @@
 
             <LinearLayout
                 android:id="@+id/poleLeftLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="10sp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_weight="2"
                 android:orientation="vertical">
 
                 <TextView
@@ -197,7 +197,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_margin="10sp"
-                android:layout_weight="1"
+                android:layout_weight="2"
                 android:text="Rented?" />
 
         </LinearLayout>

From 02035b1ce28fea64158853fd179673a78404484a Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 17:50:14 -0400
Subject: [PATCH 72/76] Did more formatting

---
 src/main/res/layout/track_view_gear.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 9dae09ea8..694d79628 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -92,7 +92,7 @@
                 android:id="@+id/skiLeftLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="2"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
@@ -104,8 +104,8 @@
 
                 <Spinner
                     android:id="@+id/skiDropDown"
-                    android:layout_width="190dp"
-                    android:layout_height="wrap_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
                     android:background="@android:drawable/btn_dropdown"
                     android:spinnerMode="dropdown"
                     android:textAlignment="center" />
@@ -132,7 +132,7 @@
                 android:id="@+id/bootLeftLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="2"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
@@ -144,7 +144,7 @@
 
                 <Spinner
                     android:id="@+id/bootDropDown"
-                    android:layout_width="190dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@android:drawable/btn_dropdown"
                     android:spinnerMode="dropdown"
@@ -173,7 +173,7 @@
                 android:id="@+id/poleLeftLayout"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_weight="2"
+                android:layout_weight="1"
                 android:orientation="vertical">
 
                 <TextView
@@ -185,7 +185,7 @@
 
                 <Spinner
                     android:id="@+id/poleDropDown"
-                    android:layout_width="190dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@android:drawable/btn_dropdown"
                     android:spinnerMode="dropdown"

From 0e4bd2b36760a8cdcffe38f2cd9487bf177bd980 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 18:08:27 -0400
Subject: [PATCH 73/76] Populated the data and added in a save button

---
 .../opentracks/TrackViewGearActivity.java     | 23 ++++++++++++-------
 src/main/res/layout/track_view_gear.xml       | 14 +++++++++++
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
index 1d78d16ab..63d4dbf37 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
@@ -23,15 +23,22 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setTitle("Ski Gear Tracker");
 
-        //get the spinner from the xml.
+        // Credit: https://stackoverflow.com/questions/13377361/how-to-create-a-drop-down-list
         Spinner skiDropdown = findViewById(R.id.skiDropDown);
-        //create a list of items for the spinner.
-        String[] items = new String[]{"coolSki", "epicSki", "ski3"};
-        //create an adapter to describe how the items are displayed, adapters are used in several places in android.
-        //There are multiple variations of this, but this is the basic variant.
-        ArrayAdapter<String> adapter = new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item, items);
-        //set the spinners adapter to the previously created one.
-        skiDropdown.setAdapter(adapter);
+        skiDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
+                new String[]{"Cross-Country Skis", "Downhill Skis", "Miscellaneous Skis", "Child Skis"}));
+
+        Spinner bootDropdown = findViewById(R.id.bootDropDown);
+        bootDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
+                new String[]{"Snow Boots", "Spiky Boots", "Leather Boots", "Iron Boots"}));
+
+        Spinner poleDropdown = findViewById(R.id.poleDropDown);
+        poleDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
+                new String[]{"Cool Poles", "Grounded Poles", "/pol/"}));
+
+        Spinner resortDropdown = findViewById(R.id.poleDropDown);
+        resortDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
+                new String[]{"Printre Noi Resort", "Big White Ski Resort", "Jackson Hole Resort", "Lake Louise Ski Resort", "Romanian Resort"}));
 
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 694d79628..561e7f992 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -202,6 +202,20 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="bottom|center"
+            android:orientation="vertical"
+            android:paddingBottom="70sp">
+
+            <Button
+                android:id="@+id/saveButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom"
+                android:text="Save Changes" />
+        </LinearLayout>
     </LinearLayout>
 
     <include

From 1e2f569fc75dc8e02b748a7d77a4b050f27fa11b Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 18:10:16 -0400
Subject: [PATCH 74/76] Small overlook fixed

---
 .../java/de/dennisguse/opentracks/TrackViewGearActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
index 63d4dbf37..2d515728d 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
@@ -36,7 +36,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         poleDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
                 new String[]{"Cool Poles", "Grounded Poles", "/pol/"}));
 
-        Spinner resortDropdown = findViewById(R.id.poleDropDown);
+        Spinner resortDropdown = findViewById(R.id.resortDropDown);
         resortDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
                 new String[]{"Printre Noi Resort", "Big White Ski Resort", "Jackson Hole Resort", "Lake Louise Ski Resort", "Romanian Resort"}));
 

From 2634b1f9666e646b941787cfb6c10b0e24e618f8 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 18:28:06 -0400
Subject: [PATCH 75/76] Finalized date

---
 .../opentracks/TrackViewGearActivity.java     | 78 ++++++++++++++++++-
 src/main/res/layout/track_view_gear.xml       | 14 +++-
 2 files changed, 88 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
index 2d515728d..908e33c66 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
@@ -1,12 +1,18 @@
 package de.dennisguse.opentracks;
 
+import android.app.AlertDialog;
+import android.app.DatePickerDialog;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.DatePicker;
 import android.widget.Spinner;
 
 import androidx.annotation.Nullable;
 
+import java.util.Calendar;
+
 import de.dennisguse.opentracks.databinding.TrackViewGearBinding;
 
 /**
@@ -14,15 +20,80 @@
  *
  * @author Sean Gregory, Zachary Therrien
  * */
-public class TrackViewGearActivity extends AbstractActivity{
-
+public class TrackViewGearActivity extends AbstractActivity
+{
     private TrackViewGearBinding viewBinding;
+    private DatePickerDialog datePickerDialog;
+    private Button dateButton;
+    private void InitDatePicker()
+    {
+        DatePickerDialog.OnDateSetListener dateSetListener = (datePicker, year, month, day) -> {
+            month++;
+            String date = makeDateString(day, month, year);
+            dateButton.setText(date);
+        };
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        int month = cal.get(Calendar.MONTH);
+        int day = cal.get(Calendar.DAY_OF_MONTH);
+
+
+        int style = AlertDialog.THEME_HOLO_LIGHT;
+
+        datePickerDialog = new DatePickerDialog(this, style, dateSetListener, year, month, day);
+    }
+
+    private String getTodaysDate()
+    {
+        Calendar cal = Calendar.getInstance();
+        int year = cal.get(Calendar.YEAR);
+        int month = cal.get(Calendar.MONTH);
+        int day = cal.get(Calendar.DAY_OF_MONTH);
+        month++;
+        return makeDateString(year, month, day);
+    }
+
+    private String makeDateString(int day, int month, int year)
+    {
+        return getMonthFormat(month) + " " + day + " " + year;
+    }
+
+    private String getMonthFormat(int month)
+    {
+        switch (month)
+        {
+            case 1: return "JAN";
+            case 2: return "FEB";
+            case 3: return "MAR";
+            case 4: return "APR";
+            case 5: return "MAY";
+            case 6: return "JUN";
+            case 7: return "JUL";
+            case 8: return "AUG";
+            case 9: return "SEP";
+            case 10: return "OCT";
+            case 11: return "NOV";
+            case 12: return "DEC";
+        }
+        return "ERR";
+    }
+
+    public void openDatePicker(View view)
+    {
+        datePickerDialog.show();
+    }
 
     @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
+    protected void onCreate(@Nullable Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
         setTitle("Ski Gear Tracker");
 
+        // Credit: https://www.youtube.com/watch?v=qCoidM98zNk
+        InitDatePicker();
+        dateButton = findViewById(R.id.datePickerButton);
+        dateButton.setText(getTodaysDate());
+
         // Credit: https://stackoverflow.com/questions/13377361/how-to-create-a-drop-down-list
         Spinner skiDropdown = findViewById(R.id.skiDropDown);
         skiDropdown.setAdapter(new ArrayAdapter<>(this, android.R.layout.simple_spinner_dropdown_item,
@@ -43,6 +114,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setSupportActionBar(viewBinding.bottomAppBarLayout.bottomAppBar);
     }
 
+
     @Override
     protected View getRootView() {
         viewBinding = TrackViewGearBinding.inflate(getLayoutInflater());
diff --git a/src/main/res/layout/track_view_gear.xml b/src/main/res/layout/track_view_gear.xml
index 561e7f992..060d1b489 100644
--- a/src/main/res/layout/track_view_gear.xml
+++ b/src/main/res/layout/track_view_gear.xml
@@ -69,6 +69,18 @@
                     android:layout_height="wrap_content"
                     android:text="Date"
                     android:textAlignment="center" />
+
+                <Button
+                    android:id="@+id/datePickerButton"
+                    style="?android:spinnerStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:onClick="openDatePicker"
+                    android:text="JAN 01 2020"
+                    android:textColor="#000000"
+                    android:textSize="20sp" />
+
+
             </LinearLayout>
         </LinearLayout>
 
@@ -79,7 +91,7 @@
             android:layout_marginTop="10dp"
             android:text="Select gear that was rented"
             android:textAlignment="center"
-            android:textSize="18sp" />
+            android:textSize="18sp"/>
 
         <LinearLayout
             android:id="@+id/skiLinearLayout"

From e3e20436fabd91f755c970d36b32eaf822e3d213 Mon Sep 17 00:00:00 2001
From: Sean Gregory <chiefsgreg2622@gmail.com>
Date: Sat, 27 Apr 2024 18:42:52 -0400
Subject: [PATCH 76/76] Fixed small bug

---
 .../java/de/dennisguse/opentracks/TrackViewGearActivity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
index 908e33c66..1b06a1009 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackViewGearActivity.java
@@ -50,7 +50,7 @@ private String getTodaysDate()
         int month = cal.get(Calendar.MONTH);
         int day = cal.get(Calendar.DAY_OF_MONTH);
         month++;
-        return makeDateString(year, month, day);
+        return makeDateString(day, month, year);
     }
 
     private String makeDateString(int day, int month, int year)